4 files changed, 8 insertions, 4 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
@@ -37,4 +37,5 @@
 #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
@@ -37,5 +37,5 @@
 #include <qlineedit.h>
 
-#include <opie/oticker.h>
+#include <opie2/oticker.h>
 
 #include "mediawidget.h"
@@ -84,5 +84,5 @@ private:
     QString skin;
 
-    OTicker  songInfo;
+    Opie::Ui::OTicker  songInfo;
     QSlider slider;
     QLineEdit time;
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
@@ -4,9 +4,11 @@
 
 
-#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
@@ -34,5 +34,5 @@
 #include <qtoolbar.h>
 
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
 
 #include <qmessagebox.h>
@@ -48,4 +48,5 @@
 #include <assert.h>
 
+using namespace Opie::Ui;
 PlayListWidget::PlayListWidget(QWidget* parent, const char* name, WFlags fl )
     : PlayListWidgetGui( parent, "playList" ) , currentFileListView( 0 )