1 files changed, 8 insertions, 8 deletions

diff --git a/libopie2/opieui/olistview.cpp b/libopie2/opieui/olistview.cpp
index d7c92fd..0b3bdea 100644
--- a/libopie2/opieui/olistview.cpp
+++ b/libopie2/opieui/olistview.cpp
@@ -182,17 +182,17 @@ void OListView::serializeFrom( QDataStream& s )
     odebug << "read number of columns = " << cols << oendl;
 
     while ( columns() < cols ) addColumn( QString::null );
 
     for ( int i = 0; i < cols; ++i )
     {
         QString coltext;
         s >> coltext;
-        qDebug( "read text '%s' for column %d", (const char*) coltext, i );
+        odebug << "read text '" <<  coltext << "' for column " << i << "" << oendl; 
         setColumnText( i, coltext );
     }
 
     int items;
     s >> items;
     odebug << "read number of items = " << items << oendl;
 
     for ( int i = 0; i < items; ++i )
@@ -437,23 +437,23 @@ void OListViewItem::serializeFrom( QDataStream& s )
 {
     #warning Caution... the binary format is still under construction...
     odebug << "loading OListViewItem..." << oendl;
 
     for ( int i = 0; i < listView()->columns(); ++i )
     {
         QString coltext;
         s >> coltext;
-        qDebug( "read text '%s' for column %d", (const char*) coltext, i );
+        odebug << "read text '" <<  coltext << "' for column " << i << "" << oendl; 
         setText( i, coltext );
     }
 
     int items;
     s >> items;
-    qDebug( "read number of items = %d", items );
+    odebug << "read number of items = " << items << "" << oendl; 
 
     for ( int i = 0; i < items; ++i )
     {
         OListViewItem* item = childFactory();
         s >> (*item);
     }
 
     odebug << "OListViewItem loaded." << oendl;
@@ -610,17 +610,17 @@ ONamedListView::~ONamedListView()
 {
 }
 
 
 void ONamedListView::addColumns( const QStringList& columns )
 {
     for ( QStringList::ConstIterator it = columns.begin(); it != columns.end(); ++it )
     {
-        qDebug( "adding column %s", (const char*) *it );
+        odebug << "adding column " <<  *it << "" << oendl; 
         addColumn( *it );
     }
 }
 
 
 int ONamedListView::findColumn( const QString& text ) const
 {
     //FIXME: If used excessively, this will slow down performance of updates
@@ -639,21 +639,21 @@ ONamedListViewItem* ONamedListView::find( int column, const QString& text, int r
 }
 
 
 ONamedListViewItem* ONamedListView::find( ONamedListViewItem* item, int column, const QString& text, int recurse ) const
 {
     ONamedListViewItem* result;
     while ( item && item->text( column ) != text )
     {
-        qDebug( "checked %s", (const char*) item->text( column ) );
+        odebug << "checked " <<  item->text( column ) << "" << oendl; 
 
         if ( recurse < 0 || recurse > 0 )
         {
-            qDebug( "recursion is %d - recursing into...", recurse );
+            odebug << "recursion is " << recurse << " - recursing into..." << oendl; 
             result = find( (ONamedListViewItem*) item->firstChild(), column, text, recurse-1 );
             if ( result ) return result;
         }
 
 
         item = (ONamedListViewItem*) item->itemBelow();
     }
     if ( item && item->text( column ) == text )
@@ -720,33 +720,33 @@ ONamedListViewItem::~ONamedListViewItem()
 }
 
 
 void ONamedListViewItem::setText( const QStringList& texts )
 {
     int col = 0;
     for ( QStringList::ConstIterator it = texts.begin(); it != texts.end(); ++it )
     {
-        qDebug( "setting column %d = text %s", col, (const char*) *it );
+        odebug << "setting column " << col << " = text " <<  *it << "" << oendl; 
         OListViewItem::setText( col++, *it );
     }
 
 }
 
 
 void ONamedListViewItem::setText( const QString& column, const QString& text )
 {
     //FIXME: If used excessively, this will slow down performance of updates
     //FIXME: because of the linear search over all column texts.
     //FIXME: I will optimize later by using a hash map.
     int col = ( (ONamedListView*) listView() )->findColumn( column );
     if ( col != -1 )
         OListViewItem::setText( col, text );
     else
-        qWarning( "ONamedListViewItem::setText(): Warning! Columntext '%s' not found.", (const char*) column );
+        owarn << "ONamedListViewItem::setText(): Warning! Columntext '" <<  column << "' not found." << oendl; 
 }
 
 
 ONamedListViewItem* ONamedListViewItem::find( int column, const QString& text, int recurse ) const
 {
     return ( (ONamedListView*) listView() )->find( (ONamedListViewItem*) firstChild(), column, text, recurse );
 }