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/mainwindow.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/mainwindow.h')
| -rw-r--r-- | src/mainwindow.h | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/src/mainwindow.h b/src/mainwindow.h index 2ac7d82..3d47ffd 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -24,22 +24,20 @@ * 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" -#ifdef USE_GUI - #ifndef __MAINWINDOW_H__ #define __MAINWINDOW_H__ #include <string> using namespace std; -#include <qwidget.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qstatusbar.h> -#include <qtimer.h> -#include <qpixmap.h> -#include <qimage.h> +#include <QWidget> +#include <QLabel> +#include <QPushButton> +#include <QStatusBar> +#include <QTimer> +#include <QPixmap> +#include <QImage> +#include <QApplication> #include "videowidget.h" #include "camera.h" @@ -100,7 +98,7 @@ class MainWindow : public QWidget { Q_OBJECT public: - MainWindow(QApplication *qApp, QWidget* parent = 0, const char* name = 0); + MainWindow(QApplication *_qApp, QWidget* parent = 0, const char* name = 0); ~MainWindow(); void message(char* msg); @@ -129,8 +127,8 @@ private: Info *cam_info; // Image loading routines. - QImage *loadButtonIcon( char *name, int height = BUTTON_HEIGHT ); - QImage *loadImage( char *name ); + QImage *loadButtonIcon( const char *name, int height = BUTTON_HEIGHT ); + QImage *loadImage( const char *name ); QImage *img_unfreeze; QImage *img_freeze; @@ -183,11 +181,9 @@ private: int video_width; int video_height; - QPushButton *createButton(char *caption, int width = BUTTON_WIDTH, int height = BUTTON_HEIGHT); - QPushButton *createButton(char *caption, QWidget *parent, int width = BUTTON_WIDTH, int height = BUTTON_HEIGHT); - QLabel *createLabel(char *caption, int width, int height); + QPushButton *createButton(const char *caption, int width = BUTTON_WIDTH, int height = BUTTON_HEIGHT); + QPushButton *createButton(const char *caption, QWidget *parent, int width = BUTTON_WIDTH, int height = BUTTON_HEIGHT); + QLabel *createLabel(const char *caption, int width, int height); }; -#endif - -#endif /*USE_GUI*/ +#endif/*__MAINWINDOW_H__*/ |