use odebug classes

7 files changed, 51 insertions, 30 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 36def67..95a0f45 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -35,7 +35,10 @@
 #include "audiowidget.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
-
+using namespace Opie::Core;
 using namespace Opie::Ui;
+
 namespace
 {
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 5c24dbe..1ab5c96 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -32,18 +32,20 @@
 */
 
+#include "xinevideowidget.h"
+#include "frame.h"
+#include "lib.h"
 
-#include <qtextstream.h>
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
+/* QT */
+#include <qtextstream.h>
 #include <qdir.h>
-
 #include <qgfx_qws.h>
 
+/* STD */
 #include <assert.h>
 
-#include "xinevideowidget.h"
-#include "frame.h"
-#include "lib.h"
-
-
 typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame,
                                       int  width, int height,int bytes );
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 7e38fc7..7b4bfd9 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -1,6 +1,2 @@
-#include <qpe/qpeapplication.h>
-#include <qpe/config.h>
-#include <qfileinfo.h>
-
 #include "mediaplayer.h"
 #include "audiowidget.h"
@@ -8,12 +4,18 @@
 #include "volumecontrol.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/qpeapplication.h>
+#include <qpe/config.h>
+
+/* QT */
+#include <qfileinfo.h>
 
- // for setBacklight()
+/* STD */
 #include <linux/fb.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 
-
-#define FBIOBLANK             0x4611
+#define FBIOBLANK 0x4611
 
 MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name )
diff --git a/noncore/multimedia/opieplayer2/om3u.cpp b/noncore/multimedia/opieplayer2/om3u.cpp
index 95dbab5..790fa09 100644
--- a/noncore/multimedia/opieplayer2/om3u.cpp
+++ b/noncore/multimedia/opieplayer2/om3u.cpp
@@ -32,5 +32,7 @@
 #include "om3u.h"
 
-
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
 //extern PlayListWidget *playList;
diff --git a/noncore/multimedia/opieplayer2/playlistselection.cpp b/noncore/multimedia/opieplayer2/playlistselection.cpp
index 3499837..678ebdf 100644
--- a/noncore/multimedia/opieplayer2/playlistselection.cpp
+++ b/noncore/multimedia/opieplayer2/playlistselection.cpp
@@ -18,9 +18,14 @@
 **
 **********************************************************************/
+#include "playlistselection.h"
 
-#include <qheader.h>
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
-#include "playlistselection.h"
+/* QT */
+#include <qheader.h>
 
+/* STD */
 #include <stdlib.h>
 
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 956d206..6a15134 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -32,10 +32,4 @@
 */
 
-#include <qtoolbar.h>
-
-#include <opie2/ofiledialog.h>
-
-#include <qmessagebox.h>
-
 #include "playlistselection.h"
 #include "playlistwidget.h"
@@ -45,8 +39,17 @@
 #include "playlistfileview.h"
 
-//only needed for the random play
+/* OPIE */
+#include <opie2/odebug.h>
+#include <opie2/ofiledialog.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
+
+/* QT */
+#include <qmessagebox.h>
+#include <qtoolbar.h>
+
+/* STD */
 #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/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 94f99f8..9f944d7 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -32,12 +32,16 @@
 */
 
+#include "xinecontrol.h"
+#include "xinevideowidget.h"
 
-#include <qtimer.h>
-#include <qmessagebox.h>
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
+using namespace Opie::Core;
 
-#include "xinecontrol.h"
-#include "xinevideowidget.h"
+/* QT */
+#include <qtimer.h>
+#include <qmessagebox.h>
 
 XineControl::XineControl( XineVideoWidget *xineWidget,