diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2014-05-14 14:24:34 +0200 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2014-05-14 14:24:34 +0200 |
| commit | 0ff825e0e6fe5fc7238e3964d24779a07cb53518 (patch) | |
| tree | 7b47a9fe58a09e12ed99fdfacc84fff198ce5ce1 /src/info_gui.h | |
| parent | 29ae5ac36d4ffc520232ff393b2455130ec0227e (diff) | |
Split miav server and client apart. Port client to Qt4. Replace libraw1994 with libiec61883. Add unit tests for multiplexer and fix some bugs in it.
Diffstat (limited to 'src/info_gui.h')
| -rw-r--r-- | src/info_gui.h | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/info_gui.h b/src/info_gui.h index 75322a0..58fc67a 100644 --- a/src/info_gui.h +++ b/src/info_gui.h @@ -24,30 +24,28 @@ * along with MIaV; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include "config.h" #ifndef __MIAV_INFO_GUI_H__ #define __MIAV_INFO_GUI_H__ -#ifdef USE_GUI - #define TXT_ERROR_TITLE "Der er opstået en fejl!" #define TXT_WARNING_TITLE "Advarsel" #define TXT_INFO_TITLE "Information" -#include "info.h" - -#include "miav_config.h" - -#include <qwidget.h> -#include <qapplication.h> +#include <QWidget> +#include <QApplication> #include <pthread.h> #include <semaphore.h> +#include "info.h" + +#include "miav_config.h" + #include "messagebox.h" #define TYPE_SHOW_MESSAGEBOX 65432 +/* // TODO class ShowMessageEvent : public QCustomEvent { public: ShowMessageEvent( MessageBox* msgbox ) @@ -56,7 +54,7 @@ public: private: MessageBox *m;; }; - +*/ class InfoEventHandler : public QObject { protected: bool eventFilter( QObject *o, QEvent *e ); @@ -75,12 +73,10 @@ public: void setParent(QWidget *p); private: - void showmsg(char *msg, char *title, msg_icon icon); + void showmsg(const char *msg, const char *title, msg_icon icon); QApplication *qapp; QWidget *parent; }; #endif/*__MIAV_INFO_GUI_H__*/ - -#endif/*USE_GUI*/ |