- 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
@@ -23,38 +23,39 @@
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              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>
 #include <qfont.h>
 #include <qiconset.h>
 #include <qiconview.h>
 #include <qlistview.h>
 #include <qpalette.h>
 #include <qpoint.h>
 #include <qpopupmenu.h>
 #include <qrect.h>
 #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",
 ".	c #87BD88",
 "+	c #8BBE8B",
 "@	c #81BA81",
 "#	c #6DAF6D",
@@ -284,17 +285,17 @@ void OVersatileView::setDefaultPixmaps( int mode, QPixmap& leaf, QPixmap& opened
     else if ( mode == Icons )
     {
         _iconleaf = leaf;
         _iconopened = opened;
         _iconclosed = closed;
     }
     else
     {
-        qDebug( "OVersatileView::setDefaultPixmaps(): invalid mode" );
+        odebug << "OVersatileView::setDefaultPixmaps(): invalid mode" << oendl;
     }
 }
 
 QIconView* OVersatileView::iconView() const
 {
     return _iconview;
 }
 
@@ -312,17 +313,17 @@ void OVersatileView::setViewMode( int mode )
     }
     else if ( mode == Icons )
     {
         _viewmode = mode;
         raiseWidget( _iconview );
     }
     else
     {
-        qDebug( "OVersatileView::setViewMode(): invalid mode" );
+        odebug << "OVersatileView::setViewMode(): invalid mode" << oendl;
     }
 }
 
 void OVersatileView::setIconViewMode()
 {
     setViewMode( Icons );
 }
 
@@ -338,31 +339,31 @@ bool OVersatileView::isValidViewMode( int mode ) const
         case OVersatileView::None:
         {
             return true;
         }
         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;
         }
     }
 }
 void OVersatileView::setWarningPolicy( int policy ) const
 {
     _warningpolicy = policy;
 }
@@ -443,17 +444,17 @@ void OVersatileView::onItem( QListViewItem * item )
 
 void OVersatileView::onItem( QIconViewItem * item )
 {
     emit( onItem( static_cast<OVersatileViewItem*>( 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 ) ) );
 }
 void OVersatileView::collapsed( QListViewItem *item ) // QListView
 {
     if ( !_treeclosed.isNull() )
         item->setPixmap( 0, _treeclosed );