7 files changed, 56 insertions, 45 deletions

diff --git a/libopie2/opieui/big-screen/osplitter.cpp b/libopie2/opieui/big-screen/osplitter.cpp
index f0287ed..f50e7f0 100644
--- a/libopie2/opieui/big-screen/osplitter.cpp
+++ b/libopie2/opieui/big-screen/osplitter.cpp
@@ -31,4 +31,5 @@
 /* OPIE */
 #include <opie2/otabwidget.h>
+#include <opie2/odebug.h>
 
 /* QT */
@@ -82,5 +83,5 @@ OSplitter::OSplitter( Orientation orient, QWidget* parent, const char* name, WFl
 OSplitter::~OSplitter()
 {
-    qWarning("Deleted Splitter");
+    owarn << "Deleted Splitter" << oendl;
     m_splitter.setAutoDelete( true );
     m_splitter.clear();
@@ -211,5 +212,5 @@ void OSplitter::addWidget( QWidget* wid, const QString& icon, const QString& lab
     if (!wid )
     {
-        qWarning("Widget is not valid!");
+        owarn << "Widget is not valid!" << oendl;
         return;
     }
@@ -367,7 +368,7 @@ void OSplitter::resizeEvent( QResizeEvent* res )
      *
      */
-    //    qWarning("Old size was width = %d height = %d", res->oldSize().width(), res->oldSize().height() );
+    //    owarn << "Old size was width = " << res->oldSize().width() << " height = " << res->oldSize().height() << "" << oendl;
     bool mode = true;
-    qWarning("New size is  width = %d height = %d  %s", res->size().width(), res->size().height(), name() );
+    owarn << "New size is  width = " << res->size().width() << " height = " << res->size().height() << "  " << name() << "" << oendl;
     if ( res->size().width() > m_size_policy &&
             m_orient == Horizontal )
@@ -386,5 +387,5 @@ void OSplitter::resizeEvent( QResizeEvent* res )
               m_orient == Vertical )
     {
-        qWarning("Changng to vbox %s", name() );
+        owarn << "Changng to vbox " << name() << "" << oendl;
         changeVBox();
         mode = false;
@@ -445,5 +446,5 @@ void OSplitter::changeTab()
     }
 
-    qWarning(" New Tab Widget %s", name() );
+    owarn << " New Tab Widget " << name() << "" << oendl;
     /*
      * and add all widgets this will reparent them
@@ -472,5 +473,5 @@ void OSplitter::changeTab()
     for ( ContainerList::Iterator it = m_container.begin(); it != m_container.end(); ++it )
     {
-        qWarning("Widget is %s", (*it).name.latin1() );
+        owarn << "Widget is " << (*it).name << "" << oendl;
         addToTab( (*it) );
     }
@@ -505,5 +506,5 @@ void OSplitter::changeHBox()
     }
 
-    qWarning("new HBox %s", name() );
+    owarn << "new HBox " << name() << "" << oendl;
     m_hbox = new QHBox( this );
     commonChangeBox();
@@ -518,5 +519,5 @@ void OSplitter::changeVBox()
     }
 
-    qWarning("New VBOX %s", name() );
+    owarn << "New VBOX " << name() << "" << oendl;
     m_hbox = new QVBox( this );
 
@@ -533,5 +534,5 @@ void OSplitter::changeVBox()
 void OSplitter::commonChangeBox()
 {
-    qWarning(" Name of Splitters is %s", name() );
+    owarn << " Name of Splitters is " << name() << "" << oendl;
 
     for (ContainerList::Iterator it = m_container.begin(); it != m_container.end(); ++it )
@@ -540,5 +541,5 @@ void OSplitter::commonChangeBox()
         if (m_parentTab )
             removeFromTab( (*it).widget );
-        qWarning("Adding to box %s", (*it).name.latin1() );
+        owarn << "Adding to box " << (*it).name << "" << oendl;
         addToBox( (*it) );
     }
@@ -560,5 +561,5 @@ void OSplitter::commonChangeBox()
     else
     {
-        qWarning(" setting Box geometry for %s", name() );
+        owarn << " setting Box geometry for " << name() << "" << oendl;
         m_hbox->setGeometry( frameRect() );
         m_hbox->show();
diff --git a/libopie2/opieui/big-screen/owidgetstack.cpp b/libopie2/opieui/big-screen/owidgetstack.cpp
index a0a6355..de7f83f 100644
--- a/libopie2/opieui/big-screen/owidgetstack.cpp
+++ b/libopie2/opieui/big-screen/owidgetstack.cpp
@@ -29,4 +29,7 @@
 #include "owidgetstack.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+
 /* QT */
 #include <qapplication.h>
@@ -308,5 +311,5 @@ void OWidgetStack::hideWidget( QWidget* wid) {
 
 bool OWidgetStack::eventFilter( QObject* obj, QEvent* e) {
-    qWarning(" %s %s", obj->name(), obj->className() );
+    owarn << " " << obj->name() << " " << obj->className() << "" << oendl;
     if ( e->type() == QEvent::Resize ) {
         QResizeEvent *res = static_cast<QResizeEvent*>( e );
diff --git a/libopie2/opieui/fileselector/ofileselector.cpp b/libopie2/opieui/fileselector/ofileselector.cpp
index a9ec8c4..1f6ca05 100644
--- a/libopie2/opieui/fileselector/ofileselector.cpp
+++ b/libopie2/opieui/fileselector/ofileselector.cpp
@@ -37,4 +37,5 @@
 /* OPIE */
 #include <opie2/ofileselector.h>
+#include <opie2/odebug.h>
 
 #include <qpe/qpeapplication.h>
@@ -547,5 +548,5 @@ void OFileViewFileListView::slotCurrentChanged( QListViewItem* item)
         if ( selector()->mode() == OFileSelector::FileSelector )
         {
-            qWarning("slot Current Changed");
+            owarn << "slot Current Changed" << oendl;
             QStringList str = QStringList::split("->", sel->text(1) );
             QString path = sel->directory() + "/" + str[0].stripWhiteSpace();
@@ -575,5 +576,5 @@ void OFileViewFileListView::slotClicked(int button , QListViewItem* item, const
         else
         { // file
-            qWarning("slot Clicked");
+            owarn << "slot Clicked" << oendl;
             selector()->m_lneEdit->setText( str[0].stripWhiteSpace() );
             QString path = sel->directory() + "/" + str[0].stripWhiteSpace();
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
@@ -188,5 +188,5 @@ void OListView::serializeFrom( QDataStream& s )
         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 );
     }
@@ -443,5 +443,5 @@ void OListViewItem::serializeFrom( QDataStream& s )
         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 );
     }
@@ -449,5 +449,5 @@ void OListViewItem::serializeFrom( QDataStream& s )
     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 )
@@ -616,5 +616,5 @@ 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 );
     }
@@ -645,9 +645,9 @@ ONamedListViewItem* ONamedListView::find( ONamedListViewItem* item, int column,
     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;
@@ -726,5 +726,5 @@ void ONamedListViewItem::setText( const QStringList& texts )
     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 );
     }
@@ -742,5 +742,5 @@ void ONamedListViewItem::setText( const QString& column, const QString& text )
         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; 
 }
 
diff --git a/libopie2/opieui/opopupmenu.cpp b/libopie2/opieui/opopupmenu.cpp
index 3ab8490..50c613f 100644
--- a/libopie2/opieui/opopupmenu.cpp
+++ b/libopie2/opieui/opopupmenu.cpp
@@ -18,13 +18,13 @@
 */
 
-/* QT */
+/* OPIE */
+#include <opie2/opopupmenu.h>
+#include <opie2/oconfig.h>
+#include <opie2/odebug.h>
 
+/* QT */
 #include <qdrawutil.h>
 #include <qtimer.h>
 
-/* OPIE */
-
-#include <opie2/opopupmenu.h>
-#include <opie2/oconfig.h>
 
 using namespace Opie::Core;
@@ -133,5 +133,5 @@ public:
         , m_ctxMenu(0)
     {}
-    
+
     ~OPopupMenuPrivate ()
     {
@@ -179,5 +179,5 @@ OPopupMenu::~OPopupMenu()
         OPopupMenuPrivate::s_highlightedItem = -1;
     }
-    
+
     delete d;
 }
@@ -210,10 +210,10 @@ void OPopupMenu::changeTitle(int id, const QString &text)
 #ifndef NDEBUG
         else
-            qWarning( "KPopupMenu: changeTitle() called with non-title id %d", id );
+            owarn << "KPopupMenu: changeTitle() called with non-title id " << id << "" << oendl;
 #endif
     }
 #ifndef NDEBUG
     else
-        qWarning( "KPopupMenu: changeTitle() called with invalid id %d", id );
+        owarn << "KPopupMenu: changeTitle() called with invalid id " << id << "" << oendl;
 #endif
 }
@@ -227,10 +227,10 @@ void OPopupMenu::changeTitle(int id, const QPixmap &icon, const QString &text)
 #ifndef NDEBUG
         else
-            qWarning( "KPopupMenu: changeTitle() called with non-title id %d", id );
+            owarn << "KPopupMenu: changeTitle() called with non-title id " << id << "" << oendl;
 #endif
     }
 #ifndef NDEBUG
     else
-        qWarning( "KPopupMenu: changeTitle() called with invalid id %d", id );
+        owarn << "KPopupMenu: changeTitle() called with invalid id " << id << "" << oendl;
 #endif
 }
@@ -245,8 +245,8 @@ QString OPopupMenu::title(int id) const
             return(((OPopupTitle *)item->widget())->title());
         else
-            qWarning("OPopupMenu: title() called with non-title id %d.", id);
+            owarn << "OPopupMenu: title() called with non-title id " << id << "." << oendl;
     }
     else
-        qWarning("OPopupMenu: title() called with invalid id %d.", id);
+        owarn << "OPopupMenu: title() called with invalid id " << id << "." << oendl;
     return(QString::null);
 }
@@ -259,8 +259,8 @@ QPixmap OPopupMenu::titlePixmap(int id) const
             return(((OPopupTitle *)item->widget())->icon());
         else
-            qWarning("KPopupMenu: titlePixmap() called with non-title id %d.", id);
+            owarn << "KPopupMenu: titlePixmap() called with non-title id " << id << "." << oendl;
     }
     else
-        qWarning("KPopupMenu: titlePixmap() called with invalid id %d.", id);
+        owarn << "KPopupMenu: titlePixmap() called with invalid id " << id << "." << oendl;
     QPixmap tmp;
     return(tmp);
diff --git a/libopie2/opieui/otaskbarapplet.h b/libopie2/opieui/otaskbarapplet.h
index 77cc461..75c07d1 100644
--- a/libopie2/opieui/otaskbarapplet.h
+++ b/libopie2/opieui/otaskbarapplet.h
@@ -33,7 +33,11 @@
 #define OTASKBARAPPLET_H
 
+/* OPIE */
+#include <opie2/odebug.h>
+
 #include <qpe/taskbarappletinterface.h>
 #include <qpe/qcom.h>
 
+/* QT */
 #include <qwidget.h>
 
@@ -62,5 +66,5 @@ template<class T> class OTaskbarAppletWrapper : public TaskbarAppletInterface
     QRESULT queryInterface( const QUuid& uuid, QUnknownInterface** iface )
     {
-        qDebug( "OTaskbarAppletWrapper::queryInterface()" );
+        odebug << "OTaskbarAppletWrapper::queryInterface()" << oendl;
         *iface = 0;
         if ( uuid == IID_QUnknown )
@@ -68,6 +72,6 @@ template<class T> class OTaskbarAppletWrapper : public TaskbarAppletInterface
         else if ( uuid == IID_TaskbarApplet )
             *iface = this;
-        else
-            return QS_FALSE;
+    else
+        return QS_FALSE;
 
         if ( *iface ) (*iface)->addRef();
diff --git a/libqtaux/oticker.cpp b/libqtaux/oticker.cpp
index e954cc8..29478fd 100644
--- a/libqtaux/oticker.cpp
+++ b/libqtaux/oticker.cpp
@@ -32,4 +32,6 @@
 
 /* OPIE */
+#include <opie2/odebug.h>
+
 #include <qpe/config.h>
 
@@ -73,5 +75,5 @@ void OTicker::setText( const QString& text )
     pos = 0; // reset it everytime the text is changed
     scrollText = text;
-    qDebug( scrollText );
+    odebug << scrollText << oendl;
 
     int pixelLen = 0;
@@ -80,5 +82,5 @@ void OTicker::setText( const QString& text )
     int contHeight = contentsRect().height();
     int pixelTextLen = fontMetrics().width( text );
-    qDebug( "<<<<<<<height %d, width %d, text width %d %d\n", contHeight, contWidth, pixelTextLen, scrollText.length() );
+    odebug << "<<<<<<<height " << contHeight << ", width " << contWidth << ", text width " << pixelTextLen << " " << scrollText.length() << "\n" << oendl;
     if ( pixelTextLen < contWidth )
     {
@@ -101,5 +103,5 @@ void OTicker::setText( const QString& text )
 
     killTimers();
-    //    qDebug("Scrollupdate %d", updateTimerTime);
+    //    odebug << "Scrollupdate " << updateTimerTime << "" << oendl;
     if ( bigger /*pixelTextLen > contWidth*/ )
         startTimer( updateTimerTime );
@@ -124,5 +126,5 @@ void OTicker::drawContents( QPainter *p )
 void OTicker::mouseReleaseEvent( QMouseEvent * )
 {
-    //    qDebug("<<<<<<<>>>>>>>>>");
+    //    odebug << "<<<<<<<>>>>>>>>>" << oendl;
     emit mousePressed();
 }