summaryrefslogtreecommitdiff
path: root/noncore/multimedia/camera/gui/mainwindow.cpp
Side-by-side diff
Diffstat (limited to 'noncore/multimedia/camera/gui/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/camera/gui/mainwindow.cpp28
1 files changed, 16 insertions, 12 deletions
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 );