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
@@ -26,2 +26,4 @@
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 Capturer::Capturer()
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
@@ -15,2 +15,3 @@
 
+
 #include "mainwindow.h"
@@ -18,2 +19,3 @@
 
+using namespace Opie::Core;
 int main( int argc, char **argv )
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
@@ -30,3 +30,2 @@
 #include <qpe/qcopenvelope_qws.h>
-using namespace Opie;
 
@@ -66,2 +65,6 @@ using namespace Opie;
 
+
+using namespace Opie::Ui;
+using namespace Opie::Core;
+
 CameraMainWindow::CameraMainWindow( QWidget * parent, const char * name, WFlags f )
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
@@ -20,2 +20,3 @@
 
+using namespace Opie::Core;
 
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
@@ -32,2 +32,4 @@
 
+using namespace Opie::Core;
+
 ZCameraIO* ZCameraIO::_instance = 0;
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
@@ -13,3 +13,3 @@
 
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qpe/resource.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,2 +1,3 @@
 /***************************************************************************
+
  main.cpp  -  main routine
@@ -26,2 +27,3 @@ int main(int argc, char* argv[]) {
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<QtRec> )