summaryrefslogtreecommitdiff
authorzecke <zecke>2004-03-13 23:10:26 (UTC)
committer zecke <zecke>2004-03-13 23:10:26 (UTC)
commit6b5ec807e25094979f5631a3a46baf7415326d8a (patch) (unidiff)
treea5af190712e332d3b6869795cb944b98102fdb1f
parent874af2f5ce2d48a460d5d9fa1d6535b68e5966da (diff)
downloadopie-6b5ec807e25094979f5631a3a46baf7415326d8a.zip
opie-6b5ec807e25094979f5631a3a46baf7415326d8a.tar.gz
opie-6b5ec807e25094979f5631a3a46baf7415326d8a.tar.bz2
ODP changes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/camera/cmd/capture.cpp2
-rw-r--r--noncore/multimedia/camera/gui/main.cpp2
-rw-r--r--noncore/multimedia/camera/gui/mainwindow.cpp5
-rw-r--r--noncore/multimedia/camera/lib/imageio.cpp1
-rw-r--r--noncore/multimedia/camera/lib/zcameraio.cpp2
-rw-r--r--noncore/multimedia/opierec/helpwindow.cpp2
-rw-r--r--noncore/multimedia/opierec/main.cpp2
7 files changed, 14 insertions, 2 deletions
diff --git a/noncore/multimedia/camera/cmd/capture.cpp b/noncore/multimedia/camera/cmd/capture.cpp
index 64c223c..688622b 100644
--- a/noncore/multimedia/camera/cmd/capture.cpp
+++ b/noncore/multimedia/camera/cmd/capture.cpp
@@ -24,6 +24,8 @@
24 24
25#include <qimage.h> 25#include <qimage.h>
26 26
27using namespace Opie::Core;
28using namespace Opie::Core;
27Capturer::Capturer() 29Capturer::Capturer()
28 :QFrame( 0 ), height( 320 ), width( 240 ), zoom( 1 ), quality( 90 ), 30 :QFrame( 0 ), height( 320 ), width( 240 ), zoom( 1 ), quality( 90 ),
29 flip( "A" ), format( "JPEG" ), name( "Untitled" ) 31 flip( "A" ), format( "JPEG" ), name( "Untitled" )
diff --git a/noncore/multimedia/camera/gui/main.cpp b/noncore/multimedia/camera/gui/main.cpp
index f25475c..7d6b3bb 100644
--- a/noncore/multimedia/camera/gui/main.cpp
+++ b/noncore/multimedia/camera/gui/main.cpp
@@ -13,9 +13,11 @@
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16
16#include "mainwindow.h" 17#include "mainwindow.h"
17#include <opie2/oapplication.h> 18#include <opie2/oapplication.h>
18 19
20using namespace Opie::Core;
19int main( int argc, char **argv ) 21int main( int argc, char **argv )
20{ 22{
21 OApplication a( argc, argv, "Opie-Camera" ); 23 OApplication a( argc, argv, "Opie-Camera" );
diff --git a/noncore/multimedia/camera/gui/mainwindow.cpp b/noncore/multimedia/camera/gui/mainwindow.cpp
index e4e1b6c..7f2a9bd 100644
--- a/noncore/multimedia/camera/gui/mainwindow.cpp
+++ b/noncore/multimedia/camera/gui/mainwindow.cpp
@@ -28,7 +28,6 @@
28#include <qpe/global.h> 28#include <qpe/global.h>
29#include <qpe/resource.h> 29#include <qpe/resource.h>
30#include <qpe/qcopenvelope_qws.h> 30#include <qpe/qcopenvelope_qws.h>
31using namespace Opie;
32 31
33/* QT */ 32/* QT */
34#include <qapplication.h> 33#include <qapplication.h>
@@ -64,6 +63,10 @@ using namespace Opie;
64#define OUTPUT_TO_CUSTOM 250 63#define OUTPUT_TO_CUSTOM 250
65#define OUTPUT_TO_DOCFOLDER 251 64#define OUTPUT_TO_DOCFOLDER 251
66 65
66
67using namespace Opie::Ui;
68using namespace Opie::Core;
69
67CameraMainWindow::CameraMainWindow( QWidget * parent, const char * name, WFlags f ) 70CameraMainWindow::CameraMainWindow( QWidget * parent, const char * name, WFlags f )
68 :QMainWindow( parent, name, f ), 71 :QMainWindow( parent, name, f ),
69 _rotation( 270 ), // FIXME: get this from current settings (ODevice?) 72 _rotation( 270 ), // FIXME: get this from current settings (ODevice?)
diff --git a/noncore/multimedia/camera/lib/imageio.cpp b/noncore/multimedia/camera/lib/imageio.cpp
index ed0d39f..7d20848 100644
--- a/noncore/multimedia/camera/lib/imageio.cpp
+++ b/noncore/multimedia/camera/lib/imageio.cpp
@@ -18,6 +18,7 @@
18#include <opie2/odebug.h> 18#include <opie2/odebug.h>
19#include <qimage.h> 19#include <qimage.h>
20 20
21using namespace Opie::Core;
21 22
22void bufferToImage( int _width, int _height, unsigned char* bp, QImage* image ) 23void bufferToImage( int _width, int _height, unsigned char* bp, QImage* image )
23{ 24{
diff --git a/noncore/multimedia/camera/lib/zcameraio.cpp b/noncore/multimedia/camera/lib/zcameraio.cpp
index d59cbbb..c4be42f 100644
--- a/noncore/multimedia/camera/lib/zcameraio.cpp
+++ b/noncore/multimedia/camera/lib/zcameraio.cpp
@@ -30,6 +30,8 @@
30 30
31#define SHARPZDC "/dev/sharp_zdc" 31#define SHARPZDC "/dev/sharp_zdc"
32 32
33using namespace Opie::Core;
34
33ZCameraIO* ZCameraIO::_instance = 0; 35ZCameraIO* ZCameraIO::_instance = 0;
34 36
35ZCameraIO* ZCameraIO::instance() 37ZCameraIO* ZCameraIO::instance()
diff --git a/noncore/multimedia/opierec/helpwindow.cpp b/noncore/multimedia/opierec/helpwindow.cpp
index a3b29fa..6aebaa1 100644
--- a/noncore/multimedia/opierec/helpwindow.cpp
+++ b/noncore/multimedia/opierec/helpwindow.cpp
@@ -11,7 +11,7 @@
11#include "helpwindow.h" 11#include "helpwindow.h"
12#include <qlayout.h> 12#include <qlayout.h>
13 13
14#include <qpe/qpetoolbar.h> 14#include <qtoolbar.h>
15#include <qpe/resource.h> 15#include <qpe/resource.h>
16 16
17#include <qaction.h> 17#include <qaction.h>
diff --git a/noncore/multimedia/opierec/main.cpp b/noncore/multimedia/opierec/main.cpp
index bb51446..a435d8e 100644
--- a/noncore/multimedia/opierec/main.cpp
+++ b/noncore/multimedia/opierec/main.cpp
@@ -1,4 +1,5 @@
1/*************************************************************************** 1/***************************************************************************
2
2 main.cpp - main routine 3 main.cpp - main routine
3 ***************************************************************************/ 4 ***************************************************************************/
4//// main.cpp 5//// main.cpp
@@ -24,6 +25,7 @@ int main(int argc, char* argv[]) {
24 25
25#include <opie2/oapplicationfactory.h> 26#include <opie2/oapplicationfactory.h>
26 27
28using namespace Opie::Core;
27OPIE_EXPORT_APP( OApplicationFactory<QtRec> ) 29OPIE_EXPORT_APP( OApplicationFactory<QtRec> )
28 30
29#endif 31#endif