-rw-r--r-- | noncore/multimedia/camera/cmd/cmd.pro | 2 | ||||
-rw-r--r-- | noncore/multimedia/camera/config.in | 6 | ||||
-rw-r--r-- | noncore/multimedia/camera/gui/gui.pro | 4 | ||||
-rw-r--r-- | noncore/multimedia/camera/gui/mainwindow.cpp | 28 | ||||
-rw-r--r-- | noncore/multimedia/camera/lib/lib.pro | 4 |
5 files changed, 21 insertions, 23 deletions
diff --git a/noncore/multimedia/camera/cmd/cmd.pro b/noncore/multimedia/camera/cmd/cmd.pro index 7981e82..b90289b 100644 --- a/noncore/multimedia/camera/cmd/cmd.pro +++ b/noncore/multimedia/camera/cmd/cmd.pro | |||
@@ -1,3 +1 @@ | |||
1 | MOC_DIR = ./moc | ||
2 | OBJECTS_DIR = ./obj | ||
3 | DESTDIR = $(OPIEDIR)/bin | DESTDIR = $(OPIEDIR)/bin | |
diff --git a/noncore/multimedia/camera/config.in b/noncore/multimedia/camera/config.in index 861abcb..cfd71ad 100644 --- a/noncore/multimedia/camera/config.in +++ b/noncore/multimedia/camera/config.in | |||
@@ -3,5 +3,5 @@ | |||
3 | default "n" | 3 | default "n" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBOPIE2CORE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE |
5 | comment "opie-camera needs a libqpe, libopie and libopie2core" | 5 | comment "opie-camera needs a libqpe, libopie2core" |
6 | depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBOPIE2CORE) | 6 | depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE) |
7 | 7 | ||
diff --git a/noncore/multimedia/camera/gui/gui.pro b/noncore/multimedia/camera/gui/gui.pro index f587b57..d74f4b6 100644 --- a/noncore/multimedia/camera/gui/gui.pro +++ b/noncore/multimedia/camera/gui/gui.pro | |||
@@ -1,3 +1 @@ | |||
1 | MOC_DIR = ./moc | ||
2 | OBJECTS_DIR = ./obj | ||
3 | DESTDIR = $(OPIEDIR)/bin | DESTDIR = $(OPIEDIR)/bin | |
@@ -15,3 +13,3 @@ INCLUDEPATH += $(OPIEDIR)/include ../lib | |||
15 | DEPENDPATH += $(OPIEDIR)/include ../lib | 13 | DEPENDPATH += $(OPIEDIR)/include ../lib |
16 | LIBS += -lqpe -lopie -lopiecore2 -lopiecam | 14 | LIBS += -lopiecore2 -lopieui2 -lopiecam |
17 | INTERFACES = | 15 | INTERFACES = |
diff --git a/noncore/multimedia/camera/gui/mainwindow.cpp b/noncore/multimedia/camera/gui/mainwindow.cpp index 5da3757..2f42049 100644 --- a/noncore/multimedia/camera/gui/mainwindow.cpp +++ b/noncore/multimedia/camera/gui/mainwindow.cpp | |||
@@ -21,2 +21,14 @@ | |||
21 | 21 | ||
22 | /* OPIE */ | ||
23 | #include <opie2/ofiledialog.h> | ||
24 | #include <opie2/odevice.h> | ||
25 | #include <opie2/oapplication.h> | ||
26 | #include <opie2/oconfig.h> | ||
27 | #include <opie2/odebug.h> | ||
28 | #include <qpe/global.h> | ||
29 | #include <qpe/resource.h> | ||
30 | #include <qpe/qcopenvelope_qws.h> | ||
31 | using namespace Opie; | ||
32 | |||
33 | /* QT */ | ||
22 | #include <qapplication.h> | 34 | #include <qapplication.h> |
@@ -38,12 +50,4 @@ | |||
38 | #include <qdirectpainter_qws.h> | 50 | #include <qdirectpainter_qws.h> |
39 | #include <qpe/global.h> | ||
40 | #include <qpe/resource.h> | ||
41 | #include <qpe/qcopenvelope_qws.h> | ||
42 | #include <opie/ofiledialog.h> | ||
43 | #include <opie/odevice.h> | ||
44 | using namespace Opie; | ||
45 | #include <opie2/oapplication.h> | ||
46 | #include <opie2/oconfig.h> | ||
47 | #include <opie2/odebug.h> | ||
48 | 51 | ||
52 | /* STD */ | ||
49 | #include <assert.h> | 53 | #include <assert.h> |
@@ -440,3 +444,3 @@ void CameraMainWindow::shutterClicked() | |||
440 | odebug << "Shutter has been pressed" << oendl; | 444 | odebug << "Shutter has been pressed" << oendl; |
441 | ODevice::inst()->touchSound(); | 445 | ODevice::inst()->playTouchSound(); |
442 | 446 | ||
@@ -494,3 +498,3 @@ void CameraMainWindow::startVideoCapture() | |||
494 | { | 498 | { |
495 | ODevice::inst()->touchSound(); | 499 | ODevice::inst()->playTouchSound(); |
496 | ODevice::inst()->setLedState( Led_Mail, Led_BlinkSlow ); | 500 | ODevice::inst()->setLedState( Led_Mail, Led_BlinkSlow ); |
@@ -536,3 +540,3 @@ void CameraMainWindow::stopVideoCapture() | |||
536 | killTimers(); | 540 | killTimers(); |
537 | ODevice::inst()->touchSound(); | 541 | ODevice::inst()->playTouchSound(); |
538 | ODevice::inst()->setLedState( Led_Mail, Led_Off ); | 542 | ODevice::inst()->setLedState( Led_Mail, Led_Off ); |
diff --git a/noncore/multimedia/camera/lib/lib.pro b/noncore/multimedia/camera/lib/lib.pro index 3d2c59b..1e7346f 100644 --- a/noncore/multimedia/camera/lib/lib.pro +++ b/noncore/multimedia/camera/lib/lib.pro | |||
@@ -1,3 +1 @@ | |||
1 | MOC_DIR = ./moc | ||
2 | OBJECTS_DIR = ./obj | ||
3 | DESTDIR = $(OPIEDIR)/lib | DESTDIR = $(OPIEDIR)/lib | |
@@ -16,3 +14,3 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
16 | DEPENDPATH += $(OPIEDIR)/include | 14 | DEPENDPATH += $(OPIEDIR)/include |
17 | LIBS += -lqpe -lopie -lopiecore2 | 15 | LIBS += -lopiecore2 |
18 | INTERFACES = | 16 | INTERFACES = |