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 @@
 
 #include <qimage.h>
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 Capturer::Capturer()
          :QFrame( 0 ), height( 320 ), width( 240 ), zoom( 1 ), quality( 90 ),
          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 @@
 **
 **********************************************************************/
 
+
 #include "mainwindow.h"
 #include <opie2/oapplication.h>
 
+using namespace Opie::Core;
 int main( int argc, char **argv )
 {
     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 @@
 #include <qpe/global.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
-using namespace Opie;
 
 /* QT */
 #include <qapplication.h>
@@ -64,6 +63,10 @@ using namespace Opie;
 #define OUTPUT_TO_CUSTOM 250
 #define OUTPUT_TO_DOCFOLDER 251
 
+
+using namespace Opie::Ui;
+using namespace Opie::Core;
+
 CameraMainWindow::CameraMainWindow( QWidget * parent, const char * name, WFlags f )
            :QMainWindow( parent, name, f ),
            _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 @@
 #include <opie2/odebug.h>
 #include <qimage.h>
 
+using namespace Opie::Core;
 
 void bufferToImage( int _width, int _height, unsigned char* bp, QImage* image )
 {
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 @@
 
 #define SHARPZDC "/dev/sharp_zdc"
 
+using namespace Opie::Core;
+
 ZCameraIO* ZCameraIO::_instance = 0;
 
 ZCameraIO* 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 @@
 #include "helpwindow.h"
 #include <qlayout.h>
 
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qpe/resource.h>
 
 #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 @@
 /***************************************************************************
+
  main.cpp  -  main routine
  ***************************************************************************/
 //// main.cpp
@@ -24,6 +25,7 @@ int main(int argc, char* argv[]) {
 
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<QtRec> )
 
 #endif