Diffstat (limited to 'noncore/multimedia/camera/gui/mainwindow.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/camera/gui/mainwindow.cpp | 28 |
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 @@ -20,4 +20,16 @@ #include "avi.h" +/* 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> #include <qaction.h> @@ -37,14 +49,6 @@ #include <qlayout.h> #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> #include <sys/types.h> @@ -439,5 +443,5 @@ void CameraMainWindow::shutterClicked() odebug << "Shutter has been pressed" << oendl; - ODevice::inst()->touchSound(); + ODevice::inst()->playTouchSound(); performCapture( captureFormat ); @@ -493,5 +497,5 @@ void CameraMainWindow::performCapture( const QString& format ) void CameraMainWindow::startVideoCapture() { - ODevice::inst()->touchSound(); + ODevice::inst()->playTouchSound(); ODevice::inst()->setLedState( Led_Mail, Led_BlinkSlow ); @@ -535,5 +539,5 @@ void CameraMainWindow::stopVideoCapture() { killTimers(); - ODevice::inst()->touchSound(); + ODevice::inst()->playTouchSound(); ODevice::inst()->setLedState( Led_Mail, Led_Off ); _capturing = false; |