| author | mickeyl <mickeyl> | 2004-02-13 13:38:06 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2004-02-13 13:38:06 (UTC) |
| commit | 97bdea970b2fb017eef7d3b03d7a316eb216266b (patch) (side-by-side diff) | |
| tree | 21e9eb8986829cde04447a2018ba745a64640386 | |
| 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,3 +1 @@ -MOC_DIR = ./moc -OBJECTS_DIR = ./obj 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 @@ default "n" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBOPIE2CORE - comment "opie-camera needs a libqpe, libopie and libopie2core" - depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBOPIE2CORE) + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE + comment "opie-camera needs a libqpe, libopie2core" + depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE) 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 @@ -MOC_DIR = ./moc -OBJECTS_DIR = ./obj DESTDIR = $(OPIEDIR)/bin @@ -15,3 +13,3 @@ INCLUDEPATH += $(OPIEDIR)/include ../lib DEPENDPATH += $(OPIEDIR)/include ../lib -LIBS += -lqpe -lopie -lopiecore2 -lopiecam +LIBS += -lopiecore2 -lopieui2 -lopiecam 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 @@ +/* OPIE */ +#include <opie2/ofiledialog.h> +#include <opie2/odevice.h> +#include <opie2/oapplication.h> +#include <opie2/oconfig.h> +#include <opie2/odebug.h> +#include <qpe/global.h> +#include <qpe/resource.h> +#include <qpe/qcopenvelope_qws.h> +using namespace Opie; + +/* QT */ #include <qapplication.h> @@ -38,12 +50,4 @@ #include <qdirectpainter_qws.h> -#include <qpe/global.h> -#include <qpe/resource.h> -#include <qpe/qcopenvelope_qws.h> -#include <opie/ofiledialog.h> -#include <opie/odevice.h> -using namespace Opie; -#include <opie2/oapplication.h> -#include <opie2/oconfig.h> -#include <opie2/odebug.h> +/* STD */ #include <assert.h> @@ -440,3 +444,3 @@ void CameraMainWindow::shutterClicked() odebug << "Shutter has been pressed" << oendl; - ODevice::inst()->touchSound(); + ODevice::inst()->playTouchSound(); @@ -494,3 +498,3 @@ void CameraMainWindow::startVideoCapture() { - ODevice::inst()->touchSound(); + ODevice::inst()->playTouchSound(); ODevice::inst()->setLedState( Led_Mail, Led_BlinkSlow ); @@ -536,3 +540,3 @@ void CameraMainWindow::stopVideoCapture() killTimers(); - ODevice::inst()->touchSound(); + ODevice::inst()->playTouchSound(); 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 @@ -MOC_DIR = ./moc -OBJECTS_DIR = ./obj DESTDIR = $(OPIEDIR)/lib @@ -16,3 +14,3 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie -lopiecore2 +LIBS += -lopiecore2 INTERFACES = |