- start cleaning up (lot of stuff left)

- use odebug classes

1 files changed, 13 insertions, 12 deletions

diff --git a/libopie2/opieui/oversatileview.cpp b/libopie2/opieui/oversatileview.cpp
index 6808539..65fe3d8 100644
--- a/libopie2/opieui/oversatileview.cpp
+++ b/libopie2/opieui/oversatileview.cpp
@@ -27,8 +27,15 @@
                              Boston, MA 02111-1307, USA.
 
 */
 
+/* OPIE */
+
+#include <opie2/odebug.h>
+#include <opie2/oversatileview.h>
+#include <opie2/oversatileviewitem.h>
+#include <opie2/olistview.h>
+
 /* QT */
 
 #include <qaction.h>
 #include <qbrush.h>
@@ -43,14 +50,8 @@
 #include <qsize.h>
 #include <qstring.h>
 #include <qwidgetstack.h>
 
-/* OPIE */
-
-#include <opie2/oversatileview.h>
-#include <opie2/oversatileviewitem.h>
-#include <opie2/olistview.h>
-
 /* XPM */
 static const char * view_icon_xpm[] = {
 "16 16 16 1",
 " 	c None",
@@ -288,9 +289,9 @@ void OVersatileView::setDefaultPixmaps( int mode, QPixmap& leaf, QPixmap& opened
         _iconclosed = closed;
     }
     else
     {
-        qDebug( "OVersatileView::setDefaultPixmaps(): invalid mode" );
+        odebug << "OVersatileView::setDefaultPixmaps(): invalid mode" << oendl;
     }
 }
 
 QIconView* OVersatileView::iconView() const
@@ -316,9 +317,9 @@ void OVersatileView::setViewMode( int mode )
         raiseWidget( _iconview );
     }
     else
     {
-        qDebug( "OVersatileView::setViewMode(): invalid mode" );
+        odebug << "OVersatileView::setViewMode(): invalid mode" << oendl;
     }
 }
 
 void OVersatileView::setIconViewMode()
@@ -342,23 +343,23 @@ bool OVersatileView::isValidViewMode( int mode ) const
         case OVersatileView::Warn:
         {
             if ( _viewmode != mode )
             {
-                qDebug( "OVersatileView::isValidViewMode(): Requested operation not valid in current mode." );
+                odebug << "OVersatileView::isValidViewMode(): Requested operation not valid in current mode." << oendl;
                 return true;
             }
         }
         case OVersatileView::WarnReturn:
         {
             if ( _viewmode != mode )
             {
-                qDebug( "OVersatileView::isValidViewMode(): Requested operation not valid in current mode." );
+                odebug << "OVersatileView::isValidViewMode(): Requested operation not valid in current mode." << oendl;
                 return false;
             }
         }
         default:
         {
-            qWarning( "OVersatileView::isValidViewMode(): Inconsistent object state!" );
+            owarn << "OVersatileView::isValidViewMode(): Inconsistent object state!" << oendl;
             return true;
         }
     }
 }
@@ -447,9 +448,9 @@ void OVersatileView::onItem( QIconViewItem * item )
 }
 
 void OVersatileView::expanded( QListViewItem *item ) // QListView
 {
-    //qDebug( "OVersatileView::expanded(): opening tree..." );
+    //odebug << "OVersatileView::expanded(): opening tree..." << oendl;
     if ( !_treeopened.isNull() )
         item->setPixmap( 0, _treeopened );
     emit( expanded( static_cast<OVersatileViewItem*>( item ) ) );
 }