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) (ignore 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
@@ -21,12 +21,14 @@
21 21
22#include <opie2/oapplication.h> 22#include <opie2/oapplication.h>
23#include <opie2/odebug.h> 23#include <opie2/odebug.h>
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" )
30{ 32{
31} 33}
32 34
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
@@ -10,15 +10,17 @@
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
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" );
22 CameraMainWindow* w = new CameraMainWindow(); 24 CameraMainWindow* w = new CameraMainWindow();
23 a.showMainWidget( w ); 25 a.showMainWidget( w );
24 a.exec(); 26 a.exec();
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
@@ -25,13 +25,12 @@
25#include <opie2/oapplication.h> 25#include <opie2/oapplication.h>
26#include <opie2/oconfig.h> 26#include <opie2/oconfig.h>
27#include <opie2/odebug.h> 27#include <opie2/odebug.h>
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>
35#include <qaction.h> 34#include <qaction.h>
36#include <qvbox.h> 35#include <qvbox.h>
37#include <qcombobox.h> 36#include <qcombobox.h>
@@ -61,12 +60,16 @@ using namespace Opie;
61#define CAPTUREFILE "/tmp/capture.dat" 60#define CAPTUREFILE "/tmp/capture.dat"
62#define OUTPUTFILE "/tmp/output.avi" 61#define OUTPUTFILE "/tmp/output.avi"
63 62
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?)
70 _capturing( false ), 73 _capturing( false ),
71 _pics( 1 ), _videos( 1 ) 74 _pics( 1 ), _videos( 1 )
72{ 75{
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
@@ -15,12 +15,13 @@
15 15
16#include "imageio.h" 16#include "imageio.h"
17 17
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{
24 unsigned char* p; 25 unsigned char* p;
25 26
26 image->create( _width, _height, 16 ); 27 image->create( _width, _height, 16 );
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
@@ -27,12 +27,14 @@
27#include <qdatetime.h> 27#include <qdatetime.h>
28 28
29#include <opie2/odebug.h> 29#include <opie2/odebug.h>
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()
36{ 38{
37 if ( !ZCameraIO::_instance ) 39 if ( !ZCameraIO::_instance )
38 { 40 {
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
@@ -8,13 +8,13 @@
8** 8**
9*****************************************************************************/ 9*****************************************************************************/
10 10
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>
18#include <qmenubar.h> 18#include <qmenubar.h>
19 19
20#include <ctype.h> 20#include <ctype.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,7 +1,8 @@
1/*************************************************************************** 1/***************************************************************************
2
2 main.cpp - main routine 3 main.cpp - main routine
3 ***************************************************************************/ 4 ***************************************************************************/
4//// main.cpp 5//// main.cpp
5//// copyright 2001, 2002, by L. J. Potter <ljp@llornkcor.com> 6//// copyright 2001, 2002, by L. J. Potter <ljp@llornkcor.com>
6/*************************************************************************** 7/***************************************************************************
7 * This program is free software; you can redistribute it and/or modify * 8 * This program is free software; you can redistribute it and/or modify *
@@ -21,11 +22,12 @@ int main(int argc, char* argv[]) {
21 22
22 23
23#else 24#else
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
30 32
31 33