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/camera.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/camera.h')
| -rw-r--r-- | src/camera.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/camera.h b/src/camera.h index a0b849a..d89d3c7 100644 --- a/src/camera.h +++ b/src/camera.h @@ -24,9 +24,6 @@ * 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 __CAMERA_H__ #define __CAMERA_H__ @@ -50,7 +47,7 @@ using namespace std; #include "thread.h" #include "frame.h" -#include <qwidget.h> +#include <QWidget> /** * This class represents the symbolic representation of the camera and @@ -103,7 +100,4 @@ private: pthread_mutex_t mutex;// = PTHREAD_MUTEX_INITIALIZER; }; - #endif/*__CAMERA_H__*/ - -#endif/* USE_GUI */ |