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
@@ -31,15 +31,18 @@
 
 */
 
 
 #include "audiowidget.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
-
+using namespace Opie::Core;
 using namespace Opie::Ui;
+
 namespace
 {
 
 const int xo = -2; // movable x offset
 const int yo = 22; // movable y offset
 
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
@@ -28,26 +28,28 @@
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
+#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 );
 
 extern "C" {
     xine_vo_driver_t* init_video_out_plugin( xine_t *xine, void* video, display_xine_frame_t, void * );
     int null_is_showing_video( const xine_vo_driver_t* self );
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,23 +1,25 @@
-#include <qpe/qpeapplication.h>
-#include <qpe/config.h>
-#include <qfileinfo.h>
-
 #include "mediaplayer.h"
 #include "audiowidget.h"
 #include "videowidget.h"
 #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 )
     : QObject( parent, name ), volumeDirection( 0 ), mediaPlayerState( _mediaPlayerState ), playList( _playList ) {
 
     m_audioUI = 0;
     m_videoUI = 0;
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
@@ -28,13 +28,15 @@
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "om3u.h"
 
-
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
 //extern PlayListWidget *playList;
 
 Om3u::Om3u( const QString &filePath, int mode)
       : QStringList (){
 odebug << "<<<<<<<new m3u "+filePath << oendl; 
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
@@ -14,17 +14,22 @@
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
+#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>
 
 class PlayListSelectionItem : public QListViewItem {
 public:
     PlayListSelectionItem( QListView *parent, const DocLnk *f ) : QListViewItem( parent ), fl( f ) {
   setText( 0, f->name() );
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
@@ -28,29 +28,32 @@
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
-#include <qtoolbar.h>
-
-#include <opie2/ofiledialog.h>
-
-#include <qmessagebox.h>
-
 #include "playlistselection.h"
 #include "playlistwidget.h"
 #include "mediaplayer.h"
 #include "inputDialog.h"
 #include "om3u.h"
 #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 )
 {
     mediaPlayerState = new MediaPlayerState(0, "mediaPlayerState" );
     m_mp = new MediaPlayer(*this, *mediaPlayerState, 0, "mediaPlayer");
 
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
@@ -28,20 +28,24 @@
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
+#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,
                           MediaPlayerState &_mediaPlayerState,
                           QObject *parent, const char *name )
     : QObject( parent, name ), mediaPlayerState( _mediaPlayerState ), xineVideoWidget( xineWidget )
 {