6 files changed, 13 insertions, 6 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 452117c..28a42eb 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -36,6 +36,7 @@
 
 #include <qpe/qpeapplication.h>
 
+using namespace Opie::Ui;
 namespace
 {
 
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index b436239..aea4146 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -36,7 +36,7 @@
 
 #include <qlineedit.h>
 
-#include <opie/oticker.h>
+#include <opie2/oticker.h>
 
 #include "mediawidget.h"
 
@@ -83,7 +83,7 @@ private:
     int skipDirection;
     QString skin;
 
-    OTicker  songInfo;
+    Opie::Ui::OTicker  songInfo;
     QSlider slider;
     QLineEdit time;
     bool isStreaming : 1;
diff --git a/noncore/multimedia/opieplayer2/main.cpp b/noncore/multimedia/opieplayer2/main.cpp
index 00f72d1..6283ae3 100644
--- a/noncore/multimedia/opieplayer2/main.cpp
+++ b/noncore/multimedia/opieplayer2/main.cpp
@@ -3,11 +3,13 @@
 
 
 
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<PlayListWidget> )
 
 #if 0
+using namespace Opie::Core;
 int main(int argc, char **argv) {
     QPEApplication a(argc,argv);
 
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 84aba55..1a5e474 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -33,7 +33,7 @@
 
 #include <qtoolbar.h>
 
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
 
 #include <qmessagebox.h>
 
@@ -47,6 +47,7 @@
 //only needed for the random play
 #include <assert.h>
 
+using namespace Opie::Ui;
 PlayListWidget::PlayListWidget(QWidget* parent, const char* name, WFlags fl )
     : PlayListWidgetGui( parent, "playList" ) , currentFileListView( 0 )
 {
diff --git a/noncore/multimedia/showimg/main.cpp b/noncore/multimedia/showimg/main.cpp
index b61cffb..b7ea071 100644
--- a/noncore/multimedia/showimg/main.cpp
+++ b/noncore/multimedia/showimg/main.cpp
@@ -23,4 +23,6 @@
 
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<ImageViewer> )
diff --git a/noncore/multimedia/showimg/showimg.cpp b/noncore/multimedia/showimg/showimg.cpp
index 6c0c4db..696a57b 100644
--- a/noncore/multimedia/showimg/showimg.cpp
+++ b/noncore/multimedia/showimg/showimg.cpp
@@ -32,7 +32,7 @@
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/resource.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 
 #include <qaction.h>
 #include <qfiledialog.h>
@@ -42,6 +42,7 @@
 #include <math.h>
 
 
+using namespace Opie::Ui;
 ControlsDialog::ControlsDialog(const QString &caption,QImage image,int *brightness,QWidget *parent)
         : QDialog(parent,0,true)
 {
@@ -523,7 +524,7 @@ void ImageViewer::openFile() {
     image << "image/*";
     types.insert("Images",  image);
 
-    QString str = Opie::OFileDialog::getOpenFileName( 1,QPEApplication::documentDir(),"", types, 0 );
+    QString str = OFileDialog::getOpenFileName( 1,QPEApplication::documentDir(),"", types, 0 );
     DocLnk link(str);
 //    if ( link.isValid() )
         openFile(link);