OpiePlayer -> ODP

12 files changed, 23 insertions, 7 deletions

diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index 8bcc567..7da2d54 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -36,2 +36,3 @@ static const int yo = 22; // movable y offset
 
+using namespace Opie::Ui;
 struct MediaButton {
diff --git a/core/multimedia/opieplayer/audiowidget.h b/core/multimedia/opieplayer/audiowidget.h
index 96bc55c..0a7cb26 100644
--- a/core/multimedia/opieplayer/audiowidget.h
+++ b/core/multimedia/opieplayer/audiowidget.h
@@ -33,3 +33,3 @@
 
-#include <opie/oticker.h>
+#include <opie2/oticker.h>
 
@@ -108,3 +108,3 @@ private:
     QPixmap *pixmaps[4];
-    OTicker  songInfo;
+    Opie::Ui::OTicker  songInfo;
     QSlider slider;
diff --git a/core/multimedia/opieplayer/config.in b/core/multimedia/opieplayer/config.in
index dc1b79a..d25b11f 100644
--- a/core/multimedia/opieplayer/config.in
+++ b/core/multimedia/opieplayer/config.in
@@ -3,3 +3,3 @@
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2
 
diff --git a/core/multimedia/opieplayer/inputDialog.cpp b/core/multimedia/opieplayer/inputDialog.cpp
index 38b8f53..44a1cdd 100644
--- a/core/multimedia/opieplayer/inputDialog.cpp
+++ b/core/multimedia/opieplayer/inputDialog.cpp
@@ -4,3 +4,3 @@
 
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
 
@@ -9,2 +9,3 @@
 
+using namespace Opie::Ui;
 InputDialog::InputDialog( QWidget* parent,  const char* name, bool modal, WFlags fl )
diff --git a/core/multimedia/opieplayer/libflash/libflashpluginimpl.cpp b/core/multimedia/opieplayer/libflash/libflashpluginimpl.cpp
index af2c07e..b2a1b5d 100644
--- a/core/multimedia/opieplayer/libflash/libflashpluginimpl.cpp
+++ b/core/multimedia/opieplayer/libflash/libflashpluginimpl.cpp
@@ -58,2 +58,4 @@ QRESULT LibFlashPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface
         *iface = this, (*iface)->addRef();
+    else
+        return QS_FALSE;
     return QS_OK;
diff --git a/core/multimedia/opieplayer/libmad/libmadpluginimpl.cpp b/core/multimedia/opieplayer/libmad/libmadpluginimpl.cpp
index 67779e8..b3e01e5 100644
--- a/core/multimedia/opieplayer/libmad/libmadpluginimpl.cpp
+++ b/core/multimedia/opieplayer/libmad/libmadpluginimpl.cpp
@@ -58,2 +58,4 @@ QRESULT LibMadPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface *
   *iface = this, (*iface)->addRef();
+    else
+        return QS_FALSE;
     return QS_OK;
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.cpp b/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.cpp
index bf3f372..f6d34b8 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.cpp
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3pluginimpl.cpp
@@ -58,2 +58,4 @@ QRESULT LibMpeg3PluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface
   *iface = this, (*iface)->addRef();
+    else
+        return QS_FALSE;
     return QS_OK;
diff --git a/core/multimedia/opieplayer/modplug/modpluginimpl.cpp b/core/multimedia/opieplayer/modplug/modpluginimpl.cpp
index 6e64e76..6205779 100644
--- a/core/multimedia/opieplayer/modplug/modpluginimpl.cpp
+++ b/core/multimedia/opieplayer/modplug/modpluginimpl.cpp
@@ -39,2 +39,4 @@ QRESULT ModPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface **if
     *iface = this,  (*iface)->addRef();
+    else
+        return QS_FALSE;
     return QS_OK;
diff --git a/core/multimedia/opieplayer/opieplayer.pro b/core/multimedia/opieplayer/opieplayer.pro
index 03d8a89..d7b0fb8 100644
--- a/core/multimedia/opieplayer/opieplayer.pro
+++ b/core/multimedia/opieplayer/opieplayer.pro
@@ -15,3 +15,3 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS            += -lqpe -lpthread -lopie
+LIBS            += -lqpe -lpthread -lopieui2
 
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index d002c42..164458b 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -567,6 +567,8 @@ bool VideoWidget::playVideo() {
                {
-                  ulong* lout = ((ulong *)out)++ + (w - 1)*spl;
+                  ulong* _out = (ulong *)out;
+                  ulong* lout = _out++ + (w - 1)*spl;
                   for (int y=0; y<w; y++)
                   {
-                     *lout=*((ulong*)in)++;
+                     ulong *_in = (ulong*)in;
+                     *lout=*_in++;
                      lout-=spl;
diff --git a/core/multimedia/opieplayer/vorbis/libtremorpluginimpl.cpp b/core/multimedia/opieplayer/vorbis/libtremorpluginimpl.cpp
index 440747a..0c7b1ea 100644
--- a/core/multimedia/opieplayer/vorbis/libtremorpluginimpl.cpp
+++ b/core/multimedia/opieplayer/vorbis/libtremorpluginimpl.cpp
@@ -59,2 +59,4 @@ QRESULT LibTremorPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterfac
         *iface = this, (*iface)->addRef();
+    else
+        return QS_FALSE;
     return QS_OK;
diff --git a/core/multimedia/opieplayer/wavplugin/wavpluginimpl.cpp b/core/multimedia/opieplayer/wavplugin/wavpluginimpl.cpp
index c232d7b..4280880 100644
--- a/core/multimedia/opieplayer/wavplugin/wavpluginimpl.cpp
+++ b/core/multimedia/opieplayer/wavplugin/wavpluginimpl.cpp
@@ -57,2 +57,4 @@ QRESULT WavPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface **if
   *iface = this, (*iface)->addRef();
+    else
+        return QS_FALSE;
     return QS_OK;