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
@@ -32,2 +32,3 @@
 #include <opie2/otabwidget.h>
+#include <opie2/odebug.h>
 
@@ -83,3 +84,3 @@ OSplitter::~OSplitter()
 {
-    qWarning("Deleted Splitter");
+    owarn << "Deleted Splitter" << oendl;
     m_splitter.setAutoDelete( true );
@@ -212,3 +213,3 @@ void OSplitter::addWidget( QWidget* wid, const QString& icon, const QString& lab
     {
-        qWarning("Widget is not valid!");
+        owarn << "Widget is not valid!" << oendl;
         return;
@@ -368,5 +369,5 @@ 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 &&
@@ -387,3 +388,3 @@ void OSplitter::resizeEvent( QResizeEvent* res )
     {
-        qWarning("Changng to vbox %s", name() );
+        owarn << "Changng to vbox " << name() << "" << oendl;
         changeVBox();
@@ -446,3 +447,3 @@ void OSplitter::changeTab()
 
-    qWarning(" New Tab Widget %s", name() );
+    owarn << " New Tab Widget " << name() << "" << oendl;
     /*
@@ -473,3 +474,3 @@ void OSplitter::changeTab()
     {
-        qWarning("Widget is %s", (*it).name.latin1() );
+        owarn << "Widget is " << (*it).name << "" << oendl;
         addToTab( (*it) );
@@ -506,3 +507,3 @@ void OSplitter::changeHBox()
 
-    qWarning("new HBox %s", name() );
+    owarn << "new HBox " << name() << "" << oendl;
     m_hbox = new QHBox( this );
@@ -519,3 +520,3 @@ void OSplitter::changeVBox()
 
-    qWarning("New VBOX %s", name() );
+    owarn << "New VBOX " << name() << "" << oendl;
     m_hbox = new QVBox( this );
@@ -534,3 +535,3 @@ void OSplitter::commonChangeBox()
 {
-    qWarning(" Name of Splitters is %s", name() );
+    owarn << " Name of Splitters is " << name() << "" << oendl;
 
@@ -541,3 +542,3 @@ void OSplitter::commonChangeBox()
             removeFromTab( (*it).widget );
-        qWarning("Adding to box %s", (*it).name.latin1() );
+        owarn << "Adding to box " << (*it).name << "" << oendl;
         addToBox( (*it) );
@@ -561,3 +562,3 @@ void OSplitter::commonChangeBox()
     {
-        qWarning(" setting Box geometry for %s", name() );
+        owarn << " setting Box geometry for " << name() << "" << oendl;
         m_hbox->setGeometry( frameRect() );
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
@@ -30,2 +30,5 @@
 
+/* OPIE */
+#include <opie2/odebug.h>
+
 /* QT */
@@ -309,3 +312,3 @@ 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 ) {
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
@@ -38,2 +38,3 @@
 #include <opie2/ofileselector.h>
+#include <opie2/odebug.h>
 
@@ -548,3 +549,3 @@ void OFileViewFileListView::slotCurrentChanged( QListViewItem* item)
         {
-            qWarning("slot Current Changed");
+            owarn << "slot Current Changed" << oendl;
             QStringList str = QStringList::split("->", sel->text(1) );
@@ -576,3 +577,3 @@ void OFileViewFileListView::slotClicked(int button , QListViewItem* item, const
         { // file
-            qWarning("slot Clicked");
+            owarn << "slot Clicked" << oendl;
             selector()->m_lneEdit->setText( 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
@@ -189,3 +189,3 @@ void OListView::serializeFrom( QDataStream& s )
         s >> coltext;
-        qDebug( "read text '%s' for column %d", (const char*) coltext, i );
+        odebug << "read text '" <<  coltext << "' for column " << i << "" << oendl; 
         setColumnText( i, coltext );
@@ -444,3 +444,3 @@ void OListViewItem::serializeFrom( QDataStream& s )
         s >> coltext;
-        qDebug( "read text '%s' for column %d", (const char*) coltext, i );
+        odebug << "read text '" <<  coltext << "' for column " << i << "" << oendl; 
         setText( i, coltext );
@@ -450,3 +450,3 @@ void OListViewItem::serializeFrom( QDataStream& s )
     s >> items;
-    qDebug( "read number of items = %d", items );
+    odebug << "read number of items = " << items << "" << oendl; 
 
@@ -617,3 +617,3 @@ void ONamedListView::addColumns( const QStringList& columns )
     {
-        qDebug( "adding column %s", (const char*) *it );
+        odebug << "adding column " <<  *it << "" << oendl; 
         addColumn( *it );
@@ -646,3 +646,3 @@ ONamedListViewItem* ONamedListView::find( ONamedListViewItem* item, int column,
     {
-        qDebug( "checked %s", (const char*) item->text( column ) );
+        odebug << "checked " <<  item->text( column ) << "" << oendl; 
 
@@ -650,3 +650,3 @@ ONamedListViewItem* ONamedListView::find( ONamedListViewItem* item, int column,
         {
-            qDebug( "recursion is %d - recursing into...", recurse );
+            odebug << "recursion is " << recurse << " - recursing into..." << oendl; 
             result = find( (ONamedListViewItem*) item->firstChild(), column, text, recurse-1 );
@@ -727,3 +727,3 @@ void ONamedListViewItem::setText( const QStringList& texts )
     {
-        qDebug( "setting column %d = text %s", col, (const char*) *it );
+        odebug << "setting column " << col << " = text " <<  *it << "" << oendl; 
         OListViewItem::setText( col++, *it );
@@ -743,3 +743,3 @@ void ONamedListViewItem::setText( const QString& column, const QString& 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
@@ -19,4 +19,8 @@
 
-/* QT */
+/* OPIE */
+#include <opie2/opopupmenu.h>
+#include <opie2/oconfig.h>
+#include <opie2/odebug.h>
 
+/* QT */
 #include <qdrawutil.h>
@@ -24,6 +28,2 @@
 
-/* OPIE */
-
-#include <opie2/opopupmenu.h>
-#include <opie2/oconfig.h>
 
@@ -134,3 +134,3 @@ public:
     {}
-    
+
     ~OPopupMenuPrivate ()
@@ -180,3 +180,3 @@ OPopupMenu::~OPopupMenu()
     }
-    
+
     delete d;
@@ -211,3 +211,3 @@ void OPopupMenu::changeTitle(int id, const QString &text)
         else
-            qWarning( "KPopupMenu: changeTitle() called with non-title id %d", id );
+            owarn << "KPopupMenu: changeTitle() called with non-title id " << id << "" << oendl;
 #endif
@@ -216,3 +216,3 @@ void OPopupMenu::changeTitle(int id, const QString &text)
     else
-        qWarning( "KPopupMenu: changeTitle() called with invalid id %d", id );
+        owarn << "KPopupMenu: changeTitle() called with invalid id " << id << "" << oendl;
 #endif
@@ -228,3 +228,3 @@ void OPopupMenu::changeTitle(int id, const QPixmap &icon, const QString &text)
         else
-            qWarning( "KPopupMenu: changeTitle() called with non-title id %d", id );
+            owarn << "KPopupMenu: changeTitle() called with non-title id " << id << "" << oendl;
 #endif
@@ -233,3 +233,3 @@ void OPopupMenu::changeTitle(int id, const QPixmap &icon, const QString &text)
     else
-        qWarning( "KPopupMenu: changeTitle() called with invalid id %d", id );
+        owarn << "KPopupMenu: changeTitle() called with invalid id " << id << "" << oendl;
 #endif
@@ -246,6 +246,6 @@ QString OPopupMenu::title(int id) const
         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);
@@ -260,6 +260,6 @@ QPixmap OPopupMenu::titlePixmap(int id) const
         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;
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
@@ -34,2 +34,5 @@
 
+/* OPIE */
+#include <opie2/odebug.h>
+
 #include <qpe/taskbarappletinterface.h>
@@ -37,2 +40,3 @@
 
+/* QT */
 #include <qwidget.h>
@@ -63,3 +67,3 @@ template<class T> class OTaskbarAppletWrapper : public TaskbarAppletInterface
     {
-        qDebug( "OTaskbarAppletWrapper::queryInterface()" );
+        odebug << "OTaskbarAppletWrapper::queryInterface()" << oendl;
         *iface = 0;
@@ -69,4 +73,4 @@ template<class T> class OTaskbarAppletWrapper : public TaskbarAppletInterface
             *iface = this;
-        else
-            return QS_FALSE;
+    else
+        return QS_FALSE;
 
diff --git a/libqtaux/oticker.cpp b/libqtaux/oticker.cpp
index e954cc8..29478fd 100644
--- a/libqtaux/oticker.cpp
+++ b/libqtaux/oticker.cpp
@@ -33,2 +33,4 @@
 /* OPIE */
+#include <opie2/odebug.h>
+
 #include <qpe/config.h>
@@ -74,3 +76,3 @@ void OTicker::setText( const QString& text )
     scrollText = text;
-    qDebug( scrollText );
+    odebug << scrollText << oendl;
 
@@ -81,3 +83,3 @@ void OTicker::setText( const QString& text )
     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 )
@@ -102,3 +104,3 @@ void OTicker::setText( const QString& text )
     killTimers();
-    //    qDebug("Scrollupdate %d", updateTimerTime);
+    //    odebug << "Scrollupdate " << updateTimerTime << "" << oendl;
     if ( bigger /*pixelTextLen > contWidth*/ )
@@ -125,3 +127,3 @@ void OTicker::mouseReleaseEvent( QMouseEvent * )
 {
-    //    qDebug("<<<<<<<>>>>>>>>>");
+    //    odebug << "<<<<<<<>>>>>>>>>" << oendl;
     emit mousePressed();