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
@@ -38,2 +38,3 @@
 
+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
@@ -38,3 +38,3 @@
 
-#include <opie/oticker.h>
+#include <opie2/oticker.h>
 
@@ -85,3 +85,3 @@ private:
 
-    OTicker  songInfo;
+    Opie::Ui::OTicker  songInfo;
     QSlider slider;
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
@@ -5,4 +5,5 @@
 
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<PlayListWidget> )
@@ -10,2 +11,3 @@ OPIE_EXPORT_APP( OApplicationFactory<PlayListWidget> )
 #if 0
+using namespace Opie::Core;
 int main(int argc, char **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
@@ -35,3 +35,3 @@
 
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
 
@@ -49,2 +49,3 @@
 
+using namespace Opie::Ui;
 PlayListWidget::PlayListWidget(QWidget* parent, const char* name, WFlags fl )