author | mickeyl <mickeyl> | 2004-02-13 13:38:06 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-02-13 13:38:06 (UTC) |
commit | 97bdea970b2fb017eef7d3b03d7a316eb216266b (patch) (unidiff) | |
tree | 21e9eb8986829cde04447a2018ba745a64640386 /noncore | |
parent | dba46ffd80c121aee412ec45f9bd6d0b9be5058e (diff) | |
download | opie-97bdea970b2fb017eef7d3b03d7a316eb216266b.zip opie-97bdea970b2fb017eef7d3b03d7a316eb216266b.tar.gz opie-97bdea970b2fb017eef7d3b03d7a316eb216266b.tar.bz2 |
opie-camera no longer needs libopie1
-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,4 +1,2 @@ | |||
1 | MOC_DIR = ./moc | ||
2 | OBJECTS_DIR = ./obj | ||
3 | DESTDIR = $(OPIEDIR)/bin | 1 | DESTDIR = $(OPIEDIR)/bin |
4 | TEMPLATE = app | 2 | TEMPLATE = app |
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 | |||
@@ -2,6 +2,6 @@ | |||
2 | boolean "opie-camera (camera app to use with the Sharp CE-AG06)" | 2 | boolean "opie-camera (camera app to use with the Sharp CE-AG06)" |
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,4 +1,2 @@ | |||
1 | MOC_DIR = ./moc | ||
2 | OBJECTS_DIR = ./obj | ||
3 | DESTDIR = $(OPIEDIR)/bin | 1 | DESTDIR = $(OPIEDIR)/bin |
4 | TEMPLATE = app | 2 | TEMPLATE = app |
@@ -14,5 +12,5 @@ SOURCES = previewwidget.cpp \ | |||
14 | INCLUDEPATH += $(OPIEDIR)/include ../lib | 12 | 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 = |
18 | TARGET = opiecam | 16 | TARGET = opiecam |
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 | |||
@@ -20,4 +20,16 @@ | |||
20 | #include "avi.h" | 20 | #include "avi.h" |
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> |
23 | #include <qaction.h> | 35 | #include <qaction.h> |
@@ -37,14 +49,6 @@ | |||
37 | #include <qlayout.h> | 49 | #include <qlayout.h> |
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> |
50 | #include <sys/types.h> | 54 | #include <sys/types.h> |
@@ -439,5 +443,5 @@ void CameraMainWindow::shutterClicked() | |||
439 | 443 | ||
440 | odebug << "Shutter has been pressed" << oendl; | 444 | odebug << "Shutter has been pressed" << oendl; |
441 | ODevice::inst()->touchSound(); | 445 | ODevice::inst()->playTouchSound(); |
442 | 446 | ||
443 | performCapture( captureFormat ); | 447 | performCapture( captureFormat ); |
@@ -493,5 +497,5 @@ void CameraMainWindow::performCapture( const QString& format ) | |||
493 | void CameraMainWindow::startVideoCapture() | 497 | 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 ); |
497 | 501 | ||
@@ -535,5 +539,5 @@ void CameraMainWindow::stopVideoCapture() | |||
535 | { | 539 | { |
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 ); |
539 | _capturing = false; | 543 | _capturing = false; |
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,4 +1,2 @@ | |||
1 | MOC_DIR = ./moc | ||
2 | OBJECTS_DIR = ./obj | ||
3 | DESTDIR = $(OPIEDIR)/lib | 1 | DESTDIR = $(OPIEDIR)/lib |
4 | TEMPLATE = lib | 2 | TEMPLATE = lib |
@@ -15,5 +13,5 @@ SOURCES = avi.c \ | |||
15 | INCLUDEPATH += $(OPIEDIR)/include | 13 | INCLUDEPATH += $(OPIEDIR)/include |
16 | DEPENDPATH += $(OPIEDIR)/include | 14 | DEPENDPATH += $(OPIEDIR)/include |
17 | LIBS += -lqpe -lopie -lopiecore2 | 15 | LIBS += -lopiecore2 |
18 | INTERFACES = | 16 | INTERFACES = |
19 | VERSION = 1.0.0 | 17 | VERSION = 1.0.0 |