- convert qWarning to owarn

20 files changed, 209 insertions, 170 deletions

diff --git a/noncore/apps/opie-write/qrichtext_p.h b/noncore/apps/opie-write/qrichtext_p.h
index e368edb..3778feb 100644
--- a/noncore/apps/opie-write/qrichtext_p.h
+++ b/noncore/apps/opie-write/qrichtext_p.h
@@ -50,6 +50,9 @@
 //
 //
 
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
 #ifndef QT_H
 #include "qstring.h"
 #include "qlist.h"
@@ -1883,7 +1886,7 @@ inline void QTextParagraph::setParagId( int i )
 inline int QTextParagraph::paragId() const
 {
     if ( id == -1 )
-        qWarning( "invalid parag id!!!!!!!! (%p)", (void*)this );
+    owarn << "invalid parag id!!!!!!!! (" << (void*)this << ")" << oendl;
     return id;
 }
 
diff --git a/noncore/apps/tableviewer/browsekeyentry.cpp b/noncore/apps/tableviewer/browsekeyentry.cpp
index 04e7902..bab9af6 100644
--- a/noncore/apps/tableviewer/browsekeyentry.cpp
+++ b/noncore/apps/tableviewer/browsekeyentry.cpp
@@ -19,6 +19,11 @@
 **********************************************************************/ 
 #include "browsekeyentry.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qtoolbutton.h>
 #include <qwidgetstack.h>
 #include <qlayout.h>
@@ -28,9 +33,6 @@
 #include <qhbox.h>
 #include <qdatetime.h>
 
-//#include <iostream.h>
-#include <qheader.h>
-// For qWarning(const char *)
 
 /*!
     \class TVBrowseKeyEntry
@@ -228,8 +230,7 @@ void TVBrowseKeyEntry::searchOnText()
             break;
         }
         default:
-            qWarning("TVBrowseKeyEntry::searchOnText() "
-                     "cannot work out data type");
+            owarn << "TVBrowseKeyEntry::searchOnText() cannot work out data type" << oendl;
             return;
     }
     emit searchOnKey(ts->current_column, sendkey);
diff --git a/noncore/apps/tableviewer/db/common.cpp b/noncore/apps/tableviewer/db/common.cpp
index b58af85..c35dbea 100644
--- a/noncore/apps/tableviewer/db/common.cpp
+++ b/noncore/apps/tableviewer/db/common.cpp
@@ -860,8 +860,7 @@ int KeyList::addKey(QString name, TVVariant::KeyType type)
             return addKey(name, TVVariant(0).toInt());
             break;
         default:
-            qWarning(QObject::tr("KeyList::addKey() Cannot make default "
-                        "value for type %1, Key not added.").arg(type));
+            owarn << "KeyList::addKey() Cannot make default value for type " << type << ", Key not added." << oendl;
             break;
     }
     return -1;
@@ -1208,9 +1207,7 @@ void DataElem::setField(int i, QString q)
             return;
         }
         default:
-            qWarning(
-                QObject::tr("DataElem::setField(%1, %2) No valid type found").arg(i).arg(q)
-                );
+            owarn << "DataElem::setField(" << i << ", " << q << ") No valid type found" << oendl;
     }
 }
 
diff --git a/noncore/apps/tableviewer/db/datacache.cpp b/noncore/apps/tableviewer/db/datacache.cpp
index 6380e1b..de57961 100644
--- a/noncore/apps/tableviewer/db/datacache.cpp
+++ b/noncore/apps/tableviewer/db/datacache.cpp
@@ -156,7 +156,7 @@ void DBStore::addItem(DataElem *delem)
 
 void DBStore::addItemInternal(DataElem *delem)
 {
-    /* if already full, don't over fill, do a qWarning though */
+    /* if already full, don't over fill, do a owarn though */
     if (full) {
         owarn << "Attempted to add items to already full table" << oendl; 
         return;
diff --git a/noncore/apps/tableviewer/db/datacache.h b/noncore/apps/tableviewer/db/datacache.h
index c5dc637..e38050c 100644
--- a/noncore/apps/tableviewer/db/datacache.h
+++ b/noncore/apps/tableviewer/db/datacache.h
@@ -27,9 +27,15 @@
 #ifndef __DATACACHE_H__
 #define __DATACACHE_H__
 
+#include "common.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qstring.h>
 #include <qvector.h>
-#include "common.h"
 
 class DBStore;
 
@@ -45,12 +51,12 @@ public:
     }
 
     virtual bool openSource(QIODevice *) {
-        qWarning("DBAccess::openSource not yet implemented");
+        owarn << "DBAccess::openSource not yet implemented" << oendl;
         return false;
     }
 
     virtual bool saveSource(QIODevice *) {
-        qWarning("DBAccess::saveSource(QString) not yet implemented");
+        owarn << "DBAccess::saveSource(QString) not yet implemented" << oendl;
         return false;
     }
 
diff --git a/noncore/apps/tableviewer/ui/browsekeyentry.cpp b/noncore/apps/tableviewer/ui/browsekeyentry.cpp
index 42e24dd..6b78437 100644
--- a/noncore/apps/tableviewer/ui/browsekeyentry.cpp
+++ b/noncore/apps/tableviewer/ui/browsekeyentry.cpp
@@ -20,6 +20,9 @@
 #include "browsekeyentry.h"
 #include "commonwidgets.h"
 
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
 #include <qtoolbutton.h>
 #include <qwidgetstack.h>
 #include <qlayout.h>
@@ -29,9 +32,6 @@
 #include <qhbox.h>
 #include <qdatetime.h>
 
-#include <qheader.h>
-// For qWarning(const char *)
-
 /*!
     \class TVBrowseKeyEntry
     \brief a Widget used enter keys into the TVBrowseViewWidget
@@ -192,8 +192,7 @@ void TVBrowseKeyEntry::searchOnText()
         case TVVariant::Invalid:
             break;
         default:
-            qWarning("TVBrowseKeyEntry::searchOnText() "
-                     "cannot work out data type");
+            owarn << "TVBrowseKeyEntry::searchOnText() cannot work out data type" << oendl;
             return;
     }
     emit searchOnKey(ts->current_column, sendkey);
diff --git a/noncore/apps/tableviewer/ui/filterkeyentry.cpp b/noncore/apps/tableviewer/ui/filterkeyentry.cpp
index d108fbd..4d74d6b 100644
--- a/noncore/apps/tableviewer/ui/filterkeyentry.cpp
+++ b/noncore/apps/tableviewer/ui/filterkeyentry.cpp
@@ -20,6 +20,11 @@
 #include "filterkeyentry.h"
 #include "commonwidgets.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qwidgetstack.h>
 #include <qcombobox.h>
 #include <qlayout.h>
@@ -200,8 +205,7 @@ TVVariant TVFilterKeyEntry::getCompareValue()
         }
         default: {
             sendkey = TVVariant(0);
-            qWarning("TVFilterKeyEntry::getCompareValue() "
-                     "cannot work out data type");
+            owarn << "TVFilterKeyEntry::getCompareValue() cannot work out data type" << oendl;
         }
     }
     return sendkey;
diff --git a/noncore/apps/tableviewer/ui/tvfilterview.cpp b/noncore/apps/tableviewer/ui/tvfilterview.cpp
index 22f1fb7..198c8b5 100644
--- a/noncore/apps/tableviewer/ui/tvfilterview.cpp
+++ b/noncore/apps/tableviewer/ui/tvfilterview.cpp
@@ -18,6 +18,13 @@
 **
 **********************************************************************/
 #include "tvfilterview.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/qpeapplication.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qtoolbutton.h>
 #include <qcombobox.h>
 #include <qlistview.h>
@@ -26,7 +33,6 @@
 #include <qpushbutton.h>
 #include <qlabel.h>
 
-#include <qpe/qpeapplication.h>
 
 TVFilterView::TVFilterView(TableState *t, QWidget* parent,
                            const char *name, WFlags fl ) : QDialog(parent, name, TRUE, fl)
@@ -175,8 +181,7 @@ bool TVFilterView::passesFilter(DataElem *d) {
                     return false;
                 break;
             default:
-                qWarning("TVFilterView::passesFilter() "
-                         "unrecognized filter type");
+                owarn << "TVFilterView::passesFilter() unrecognized filter type" << oendl;
                 return false;
         }
     }
diff --git a/noncore/apps/tinykate/libkate/kateconfig.cpp b/noncore/apps/tinykate/libkate/kateconfig.cpp
index 782b629..4b8ce78 100644
--- a/noncore/apps/tinykate/libkate/kateconfig.cpp
+++ b/noncore/apps/tinykate/libkate/kateconfig.cpp
@@ -24,6 +24,7 @@
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qpe/global.h>
+using namespace Opie::Core;
 
 /* QT */
 #include <qdir.h>
@@ -556,8 +557,7 @@ void KateConfig::write( const QString &fn )
     f.close();
     // now rename the file...
     if ( rename( strNewFile, filename ) < 0 ) {
-    qWarning( "problem renaming the file %s to %s", strNewFile.latin1(),
-          filename.latin1() );
+    owarn << "problem renaming the file " << strNewFile.latin1() << " to " << filename.latin1() << oendl;
     QFile::remove( strNewFile );
     }
 }
diff --git a/noncore/apps/zsafe/main.cpp b/noncore/apps/zsafe/main.cpp
index 4fe319b..5f48f77 100644
--- a/noncore/apps/zsafe/main.cpp
+++ b/noncore/apps/zsafe/main.cpp
@@ -8,11 +8,19 @@
 
 
 #include "zsafe.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #ifdef DESKTOP
 #include <qapplication.h>
 #else
 #include <qpe/qpeapplication.h>
 #endif
+
+/* STD */
 #include <stdio.h>
 #include <signal.h>
 
@@ -74,9 +82,7 @@ int main( int argc, char ** argv )
     DeskW = a.desktop()->width();
     DeskH = a.desktop()->height();
 
-    char buf[128];
-    sprintf (buf, "Width: %d Height: %d\n", DeskW, DeskH);
-    qWarning (buf);
+    owarn << "Width: " << DeskW << " Height: " << DeskH << oendl;
 
 #ifdef JPATCH_HDE
     // nothings
@@ -85,8 +91,7 @@ int main( int argc, char ** argv )
     {
        DeskW -= 20;
        DeskH += 25;
-       sprintf (buf, "Changed width: %d Height: %d\n", DeskW, DeskH);
-       qWarning (buf);
+       owarn << "Changed width: " << DeskW << " Height: " << DeskH << oendl;
     }
 #endif
 
diff --git a/noncore/apps/zsafe/zlistview.cpp b/noncore/apps/zsafe/zlistview.cpp
index ba02a15..7d0b8c2 100644
--- a/noncore/apps/zsafe/zlistview.cpp
+++ b/noncore/apps/zsafe/zlistview.cpp
@@ -3,9 +3,14 @@
 */
 
 #include "zlistview.h"
-#include <stdio.h>
 #include "zsafe.h"
 
+/* OPIE */
+//#include <opie2/odebug.h>
+
+/* STD */
+#include <stdio.h>
+
 ZListView::ZListView (ZSafe *zsafe, const char *id) : QListView(zsafe, id)
 {
    zs = zsafe;
@@ -18,9 +23,7 @@ ZListView::~ZListView()
 void ZListView::keyPressEvent ( QKeyEvent *e )
 {
 /*
-   char buf[64];
-   sprintf (buf, "key: %d\n", e->key());
-   qWarning (buf);
+   owarn << "key: " << e->key() << oendl;
 */
 
    switch (e->key())
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index 6ff05ac..ca3ff52 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -881,7 +881,7 @@ void ZSafe::findPwd()
        name = dialog->NameField->text();
        username = dialog->UsernameField->text();
        comment = dialog->CommentField->text();
-       qWarning (name);
+       owarn << name << oendl;
     }
     else
     {
@@ -927,7 +927,7 @@ void ZSafe::findPwd()
          i != NULL;
          i = i->nextSibling())
     {
-       qWarning (i->text(0));
+       owarn << i->text(0) << oendl;
        i->setSelected(FALSE);
 
        // step through all subitems
@@ -941,7 +941,7 @@ void ZSafe::findPwd()
             si != NULL;
             si = si->nextSibling())
        {
-          qWarning (si->text(0));
+          owarn << si->text(0) << oendl;
           if (si->isSelected())
              si->setSelected(FALSE);
           // ListView->repaintItem(si);
@@ -958,7 +958,7 @@ void ZSafe::findPwd()
 
           if ((n && u && c ) && !found)
           {
-             qWarning ("Found");
+             owarn << "Found" << oendl;
              selectedItem = si;
              si->setSelected(TRUE);
              ListView->setCurrentItem(si);
@@ -1228,8 +1228,7 @@ void ZSafe::removeAsciiFile()
     QFile f( fn );
     if ( !f.remove() )
     {
-        qWarning( QString("Could not remove file %1").arg(fn),
-                      2000 );
+        owarn << "Could not remove file " << fn << oendl;
         QMessageBox::critical( 0, tr("ZSafe"),
                   tr("Could not remove text file.") );
         return;
@@ -1278,8 +1277,7 @@ void ZSafe::writeAllEntries()
    {
     QFile f( fn );
     if ( !f.open( IO_WriteOnly ) ) {
-        qWarning( QString("Could not write to file %1").arg(fn),
-                      2000 );
+        owarn << "Could not write to file " << fn << oendl;
         QMessageBox::critical( 0, "ZSafe",
                   QString("Could not export to text file.") );
         return;
@@ -1322,10 +1320,10 @@ void ZSafe::writeAllEntries()
           oneEntry += "\"";
           oneEntry += si->text(5);
           oneEntry += "\"";
-          // qWarning (oneEntry);
+          // owarn << oneEntry << oendl;
           t << oneEntry << endl;
 
-          // qWarning (si->text(0));
+          // owarn << si->text(0) << oendl;
        }
     }
     f.close();
@@ -1373,8 +1371,7 @@ void ZSafe::readAllEntries()
    QFile f( fn );
    if ( !f.open( IO_ReadOnly ) )
    {
-      qWarning( QString("Could not read file %1").arg(fn),
-                      2000 );
+      owarn << "Could not read file " << fn << oendl;
       QMessageBox::critical( 0, "ZSafe",
                   QString("Could not import text file.") );
       return;
@@ -1403,7 +1400,7 @@ void ZSafe::readAllEntries()
       }
    }
 
-   qWarning ("ReadAllEntries(): ");
+   owarn << "ReadAllEntries(): " << oendl;
 
    QTextStream t(&f);
    while ( !t.eof() )
@@ -1554,8 +1551,7 @@ void ZSafe::writeAllEntries()
     QString fn = filename + ".txt";
     QFile f( fn );
     if ( !f.open( IO_WriteOnly ) ) {
-        qWarning( QString("Could not write to file %1").arg(fn),
-                      2000 );
+        owarn << "Could not write to file " << fn << oendl;
         QMessageBox::critical( 0, tr("ZSafe"),
                   tr("Could not export to text file.") );
         return;
@@ -1593,10 +1589,10 @@ void ZSafe::writeAllEntries()
           comment.replace (QRegExp("\n"), "<br>");
           oneEntry += comment;
           oneEntry += "\"";
-          // qWarning (oneEntry);
+          // owarn << oneEntry << oendl;
           t << oneEntry << endl;
 
-          // qWarning (si->text(0));
+          // owarn << si->text(0) << oendl;
        }
     }
     f.close();
@@ -1608,8 +1604,7 @@ void ZSafe::readAllEntries()
    QFile f( fn );
    if ( !f.open( IO_ReadOnly ) )
    {
-      qWarning( QString("Could not read file %1").arg(fn),
-                      2000 );
+      owarn << "Could not read file " << fn << oendl;
       QMessageBox::critical( 0, tr("ZSafe"),
                   tr("Could not import text file.") );
       return;
@@ -1638,7 +1633,7 @@ void ZSafe::readAllEntries()
       }
    }
 
-   qWarning ("ReadAllEntries(): ");
+   owarn << "ReadAllEntries(): " << oendl;
 
    QTextStream t(&f);
    while ( !t.eof() )
@@ -1762,7 +1757,7 @@ void ZSafe::readAllEntries()
 
 void ZSafe::resume(int)
 {
-   qWarning ("Resume");
+   owarn << "Resume" << oendl;
    // hide the main window
 
    infoForm->hide();
@@ -1818,7 +1813,7 @@ bool ZSafe::openDocument(const char* _filename, const char* )
           getDocPassword(tr("Enter Password"));
        if (m_password.isEmpty() && validationFlag == 0)
            {
-              qWarning ("Wrong password");
+              owarn << "Wrong password" << oendl;
               QMessageBox::critical( 0, tr("ZSafe"),
                   tr("Wrong password.\n\nZSafe will now exit.") );
               exitZs (1);
@@ -1827,7 +1822,7 @@ bool ZSafe::openDocument(const char* _filename, const char* )
        retval = loadInit(_filename, m_password);
        if (retval != PWERR_GOOD)
            {
-                qWarning ("Error loading Document");
+                owarn << "Error loading Document" << oendl;
         return false;
        }
         }
@@ -2301,7 +2296,7 @@ void ZSafe::setPasswordDialogDone()
 
 void ZSafe::getDocPassword(QString title)
 {
-qWarning ("getDocPassword");
+    owarn << "getDocPassword" << oendl;
     // open the 'Password' dialog
     PasswordForm *dialog = new PasswordForm(this, title, TRUE);
     newPwdDialog = dialog;
@@ -2480,7 +2475,7 @@ int ZSafe::saveFinalize(void)
 
 void ZSafe::quitMe ()
 {
-    qWarning ("QUIT...");
+    owarn << "QUIT..." << oendl;
 
     if (modified)
     {
@@ -2684,7 +2679,7 @@ void ZSafe::addCategory()
            category = dialog->CategoryField->currentText();
            icon = dialog->IconField->currentText()+".png";
 
-           qWarning (category);
+           owarn << category << oendl;
 
            QListViewItem *li = new ShadedListItem( 1, ListView );
            Category *c1 = new Category();
@@ -3192,7 +3187,7 @@ void ZSafe::editCategory()
               QListViewItem *catItem = cat->getListItem();
               if (catItem)
               {
-                 qWarning (category);
+                 owarn << category << oendl;
                  catItem->setText( 0, tr( category ) );
                  cat->setCategoryName (tr(category));
 
@@ -3593,7 +3588,7 @@ void ZSafe::paintEvent( QPaintEvent * )
 
 void ZSafe::resizeEvent ( QResizeEvent * )
 {
-   // qWarning ("resizeEvent");
+   // owarn << "resizeEvent" << oendl;
 #ifndef DESKTOP
    DeskW = appl->desktop()->width();
    DeskH = appl->desktop()->height();
diff --git a/noncore/comm/keypebble/krfbdecoder.cpp b/noncore/comm/keypebble/krfbdecoder.cpp
index d61433f..837fcc5 100644
--- a/noncore/comm/keypebble/krfbdecoder.cpp
+++ b/noncore/comm/keypebble/krfbdecoder.cpp
@@ -187,12 +187,11 @@ void KRFBDecoder::gotServerInit()
   info->nameLength = Swap32IfLE( info->nameLength );
 
   owarn << "Width = " << info->width << ", Height = " << info->height << "" << oendl; 
-  qWarning( "Bpp = %d, Depth = %d, Big = %d, True = %d",
-           info->bpp, info->depth, info->bigEndian, info->trueColor );
-  qWarning( "RedMax = %d, GreenMax = %d, BlueMax = %d",
-           info->redMax, info->greenMax, info->blueMax );
-  qWarning( "RedShift = %d, GreenShift = %d, BlueShift = %d",
-           info->redShift, info->greenShift,info-> blueShift );
+  owarn << "Bpp = " << info->bpp << ", Depth = " << info->depth << ", Big = " << info->bigEndian
+        << ", True = " << info->trueColor << oendl;
+  owarn << "RedMax = " << info->redMax << ", GreenMax = " << info->greenMax << ", BlueMax = " << info->blueMax << oendl;
+  owarn << "RedShift = " << info->redShift << ", GreenShift = " << info->greenShift
+        << ", BlueShift = " << info-> blueShift << oendl;
 
   buf->resize( info->width/con->options()->scaleFactor, info->height /con->options()->scaleFactor);
 
@@ -264,12 +263,9 @@ void KRFBDecoder::decidePixelFormat()
   else
     chosenDepth = bestDepth;
 
-  qWarning( "Screen depth=%d, server depth=%d, best depth=%d, " \
-           "eight bit %d, chosenDepth=%d",
-           screenDepth,
-           info->depth,
-           bestDepth,
-           con->options()->colors256, chosenDepth );
+  owarn << "Screen depth=" << screenDepth << ", server depth=" << info->depth
+        << ", best depth=" << bestDepth << "eight bit " << con->options()->colors256
+        << ", chosenDepth=" << chosenDepth << oendl;
 
   format->depth = chosenDepth;
 
@@ -441,8 +437,8 @@ void KRFBDecoder::gotRectHeader()
   con->read( &encoding, 4 );
 
   //  CARD32 encodingLocal = Swap32IfLE( encoding );
-  //  qWarning( "Rect: x=%d, y= %d, w=%d, h=%d, encoding=%ld",
-          //   x, y, w, h, encodingLocal );
+  //  owarn << "Rect: x=" << x << ", y= " << y << ", w=" << w << ", h=" << h
+  //        << ", encoding= " << encodingLocal << oendl;
 
   //
   // Each encoding needs to be handled differently. Some require
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index 6c5f5ea..211314b 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -110,9 +110,9 @@ namespace {
     }
 
     inline QPixmap* IconViewItem::pixmap()const {
-//      qWarning(  "Name is " + m_path.right( 15 ) + " rect is %d %d %d %d | %d %d",
-//                 rect().x(),rect().y(),rect().width(),rect().height(),
-//                 iconView()->contentsX(), iconView()->contentsY());
+//      owarn << "Name is " << m_path.right( 15 ) << " rect is " << rect().x() << " " << rect().y()
+//            << " " << rect().width() << " " << rect().height() << " | " << iconView()->contentsX()
+//            << " " << iconView()->contentsY() << oendl;
 
         if (textOnly()&&!m_isDir) {
             if (!_emptyPix) _emptyPix = new QPixmap(0,0,1);
diff --git a/noncore/graphics/opie-eye/gui/viewmodebutton.cpp b/noncore/graphics/opie-eye/gui/viewmodebutton.cpp
index 36e5dcf..aa15d31 100644
--- a/noncore/graphics/opie-eye/gui/viewmodebutton.cpp
+++ b/noncore/graphics/opie-eye/gui/viewmodebutton.cpp
@@ -1,7 +1,10 @@
 #include "viewmodebutton.h"
 
+/* OPIE */
 #include <opie2/odebug.h>
+using namespace Opie::Core;
 
+/* QT */
 #include <qtoolbar.h>
 #include <qpopupmenu.h>
 
@@ -40,6 +43,6 @@ void ViewModeButton::slotChange( int i ) {
         break;
     }
 
-    qWarning("foo %d" +name, i );
+    owarn << "foo " << name << oendl;
     setIconSet( Resource::loadIconSet( name ) );
 }
diff --git a/noncore/net/opietooth/lib/device.cc b/noncore/net/opietooth/lib/device.cc
index 04c50d9..f81066e 100644
--- a/noncore/net/opietooth/lib/device.cc
+++ b/noncore/net/opietooth/lib/device.cc
@@ -1,9 +1,14 @@
 
-#include <signal.h>
+#include "device.h"
 
+/* OPIE */
 #include <opie2/oprocess.h>
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* STD */
+#include <signal.h>
 
-#include "device.h"
 
 using namespace OpieTooth;
 
@@ -14,7 +19,7 @@ namespace {
     QString string( par );
     QStringList list =  QStringList::split( '\n', string );
     for( QStringList::Iterator it = list.begin(); it != list.end(); ++it ){
-    qWarning("parsePID: %s", (*it).latin1() );
+    owarn << "parsePID: " << (*it).latin1() << oendl;
       if( !(*it).startsWith("CSR") ){
         id = (*it).toInt();
         break;
@@ -27,7 +32,7 @@ namespace {
 Device::Device(const QString &device, const QString &mode, const QString &speed )
   : QObject(0, "device") {
 
-  qWarning("OpieTooth::Device create" );
+  owarn << "OpieTooth::Device create" << oendl;
   m_hci = 0;
   m_process = 0;
   m_attached = false;
@@ -40,10 +45,10 @@ Device::~Device(){
   detach();
 }
 void Device::attach(){
-  qWarning("attaching %s %s %s", m_device.latin1(), m_mode.latin1(), m_speed.latin1() );
+  owarn << "attaching " << m_device.latin1() << " " << m_mode.latin1() << " " << m_speed.latin1() << oendl;
   if(m_process == 0 ){
     m_output.resize(0);
-    qWarning("new process to create" );
+    owarn << "new process to create" << oendl;
     m_process = new OProcess();
     *m_process << "hciattach";
     *m_process << "-p";
@@ -55,7 +60,7 @@ void Device::attach(){
     connect(m_process, SIGNAL(receivedStderr(Opie::Core::OProcess*, char*, int ) ),
             this, SLOT(slotStdErr(Opie::Core::OProcess*,char*,int) ) );
     if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ){
-      qWarning("Could not start" );
+      owarn << "Could not start" << oendl;
       delete m_process;
       m_process = 0;
     }
@@ -67,10 +72,10 @@ void Device::detach(){
   // kill the pid we got
   if(m_attached ){
     //kill the pid
-    qWarning( "killing" );
+    warn << "killing" << oendl;
     kill(pid, 9);
   }
-  qWarning("detached" );
+  owarn << "detached" << oendl;
 }
 bool Device::isLoaded()const{
   return m_attached;
@@ -80,17 +85,17 @@ QString Device::devName()const {
 };
 void Device::slotExited( OProcess* proc)
 {
-  qWarning("prcess exited" );
+  owarn << "prcess exited" << oendl;
   if(proc== m_process ){
-    qWarning("proc == m_process" );
+    owarn << "proc == m_process" << oendl;
     if( m_process->normalExit() ){ // normal exit
-      qWarning("normalExit" );
+      owarn << "normalExit" << oendl;
       int ret = m_process->exitStatus();
       if( ret == 0 ){ // attached
-        qWarning("attached" );
-        qWarning("Output: %s", m_output.data() );
+    owarn << "attached" << oendl;
+    owarn << "Output: " << m_output.data() << oendl;
         pid = parsePid( m_output );
-        qWarning("Pid = %d", pid );
+    owarn << "Pid = " << pid << oendl;
         // now hciconfig hci0 up ( determine hciX FIXME)
         // and call hciconfig hci0 up
         // FIXME hardcoded to hci0 now :(
@@ -100,12 +105,12 @@ void Device::slotExited( OProcess* proc)
         connect(m_hci, SIGNAL( processExited(Opie::Core::OProcess*) ),
                 this, SLOT( slotExited(Opie::Core::OProcess* ) ) );
         if(!m_hci->start() ){
-          qWarning("could not start" );
+      owarn << "could not start" << oendl;
           m_attached = false;
           emit device("hci0", false );
         }
       }else{
-        qWarning("crass" );
+        owarn << "crass" << oendl;
         m_attached = false;
         emit device("hci0", false );
 
@@ -114,16 +119,16 @@ void Device::slotExited( OProcess* proc)
     delete m_process;
     m_process = 0;
   }else if(proc== m_hci ){
-    qWarning("M HCI exited" );
+    owarn << "M HCI exited" << oendl;
     if( m_hci->normalExit() ){
-      qWarning("normal exit" );
+      owarn << "normal exit" << oendl;
       int ret = m_hci->exitStatus();
       if( ret == 0 ){
-        qWarning("attached really really attached" );
+    owarn << "attached really really attached" << oendl;
         m_attached = true;
         emit device("hci0", true );
       }else{
-        qWarning( "failed" );
+    owarn << "failed" << oendl;
         emit device("hci0", false );
         m_attached = false;
       }
@@ -134,19 +139,19 @@ void Device::slotExited( OProcess* proc)
 }
 void Device::slotStdOut(OProcess* proc, char* chars, int len)
 {
-  qWarning("std out" );
+  owarn << "std out" << oendl;
   if( len <1 ){
-    qWarning( "len < 1 " );
+    owarn << "len < 1 " << oendl;
     return;
   }
   if(proc == m_process ){
     QCString string( chars, len+1 ); // \0 == +1
-    qWarning("output: %s", string.data() );
+    owarn << "output: " << string.data() << oendl;
     m_output.append( string.data() );
   }
 }
 void Device::slotStdErr(OProcess* proc, char* chars, int len)
 {
-  qWarning("std err" );
+  owarn << "std err" << oendl;
   slotStdOut( proc, chars, len );
 }
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc
index 18e1df9..76d9127 100644
--- a/noncore/net/opietooth/lib/manager.cc
+++ b/noncore/net/opietooth/lib/manager.cc
@@ -1,10 +1,11 @@
 
-
-#include <opie2/oprocess.h>
-
 #include "parser.h"
 #include "manager.h"
 
+#include <opie2/oprocess.h>
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
 
 using namespace OpieTooth;
 
@@ -12,7 +13,7 @@ using Opie::Core::OProcess;
 Manager::Manager( const QString& dev )
   : QObject()
 {
-    qWarning("created");
+    owarn << "created" << oendl;
     m_device = dev;
     m_hcitool = 0;
     m_sdp = 0;
@@ -57,7 +58,7 @@ void Manager::isAvailable( Device* /*dev*/ ){
 
 }
 void Manager::searchDevices( const QString& device ){
-    qWarning("search devices");
+    owarn << "search devices" << oendl;
     OProcess* hcitool = new OProcess();
     hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() );
     *hcitool << "hcitool" << "scan";
@@ -66,7 +67,7 @@ void Manager::searchDevices( const QString& device ){
     connect( hcitool, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ),
              this, SLOT(slotHCIOut(Opie::Core::OProcess*, char*, int ) ) );
     if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
-        qWarning("could not start");
+        owarn << "could not start" << oendl;
         RemoteDevice::ValueList list;
         emit foundDevices( device, list );
         delete hcitool;
@@ -107,13 +108,13 @@ void Manager::searchServices( const QString& remDevice ){
     OProcess *m_sdp =new OProcess();
     *m_sdp << "sdptool" << "browse" << remDevice;
     m_sdp->setName( remDevice.latin1() );
-    qWarning("search Services for %s", remDevice.latin1() );
+    owarn << "search Services for " << remDevice.latin1() << oendl;
     connect(m_sdp, SIGNAL(processExited(Opie::Core::OProcess*) ),
             this, SLOT(slotSDPExited(Opie::Core::OProcess* ) ) );
     connect(m_sdp, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*,  int ) ),
             this, SLOT(slotSDPOut(Opie::Core::OProcess*, char*, int) ) );
     if (!m_sdp->start(OProcess::NotifyOnExit,  OProcess::AllOutput) ) {
-        qWarning("could not start sdptool" );
+        owarn << "could not start sdptool" << oendl;
         delete m_sdp;
         Services::ValueList list;
         emit foundServices( remDevice, list );
@@ -140,7 +141,7 @@ void Manager::slotProcessExited(OProcess* proc ) {
 void Manager::slotSDPOut(OProcess* proc, char* ch, int len)
 {
     QCString str(ch,  len+1 );
-    qWarning("SDP:%s", str.data() );
+    owarn << "SDP:" << str.data() << oendl;
     QMap<QString, QString>::Iterator it;
     it = m_out.find(proc->name() );
     QString string;
@@ -153,12 +154,12 @@ void Manager::slotSDPOut(OProcess* proc, char* ch, int len)
 }
 void Manager::slotSDPExited( OProcess* proc)
 {
-    qWarning("proc name %s", proc->name() );
+    owarn << "proc name " << proc->name() << oendl;
     Services::ValueList  list;
     if (proc->normalExit()  ) {
         QMap<QString, QString>::Iterator it = m_out.find( proc->name() );
         if ( it != m_out.end() ) {
-            qWarning("found process" );
+        owarn << "found process" << oendl;
             list = parseSDPOutput( it.data() );
             m_out.remove( it );
         }
@@ -168,20 +169,20 @@ void Manager::slotSDPExited( OProcess* proc)
 }
 Services::ValueList Manager::parseSDPOutput( const QString& out ) {
     Services::ValueList list;
-    qWarning("parsing output" );
+    owarn << "parsing output" << oendl;
     Parser parser( out );
     list = parser.services();
     return list;
 }
 
 void Manager::slotHCIExited(OProcess* proc ) {
-    qWarning("process exited");
+    owarn << "process exited" << oendl;
     RemoteDevice::ValueList list;
     if (proc->normalExit() ) {
-        qWarning("normalExit %s",  proc->name() );
+        owarn << "normalExit " << proc->name() << oendl;
         QMap<QString, QString>::Iterator it = m_devices.find(proc->name() );
         if (it != m_devices.end() ) {
-            qWarning("!= end ;)");
+            owarn << "!= end ;)" << oendl;
             list = parseHCIOutput( it.data() );
             m_devices.remove( it );
         }
@@ -191,13 +192,13 @@ void Manager::slotHCIExited(OProcess* proc ) {
 }
 void Manager::slotHCIOut(OProcess* proc,  char* ch,  int len) {
     QCString str( ch, len+1 );
-    qWarning("hci: %s",  str.data() );
+    owarn << "hci: " << str.data() oendl;
     QMap<QString, QString>::Iterator it;
     it = m_devices.find( proc->name() );
-    qWarning("proc->name %s", proc->name() );
+    owarn << "proc->name " << proc->name() << oendl;
     QString string;
     if (it != m_devices.end() ) {
-        qWarning("slotHCIOut ");
+        owarn << "slotHCIOut " << oendl;
         string = it.data();
     }
     string.append( str );
@@ -205,20 +206,20 @@ void Manager::slotHCIOut(OProcess* proc,  char* ch,  int len) {
     m_devices.replace( proc->name(),  string );
 }
 RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) {
-    qWarning("parseHCI %s",  output.latin1() );
+    owarn << "parseHCI " << output.latin1() << oendl;
     RemoteDevice::ValueList list;
     QStringList strList = QStringList::split('\n',  output );
     QStringList::Iterator it;
     QString str;
     for ( it = strList.begin(); it != strList.end(); ++it ) {
         str = (*it).stripWhiteSpace();
-        qWarning("OpieTooth %s", str.latin1() );
+        owarn << "OpieTooth " << str.latin1() << oendl;
         int pos = str.findRev(':' );
         if ( pos > 0 ) {
             QString mac = str.left(17 );
             str.remove( 0,  17 );
-            qWarning("mac %s",  mac.latin1() );
-            qWarning("rest:%s",  str.latin1() );
+            owarn << "mac " << mac.latin1() << oendl;
+            owarn << "rest: " << str.latin1() << oendl;
             RemoteDevice rem( mac , str.stripWhiteSpace() );
             list.append( rem );
         }
@@ -243,7 +244,7 @@ void Manager::connectTo( const QString& mac) {
 
 
 void Manager::searchConnections() {
-    qWarning("searching connections?");
+    owarn << "searching connections?" << oendl;
     OProcess* proc = new OProcess();
     m_hcitoolCon = QString::null;
 
@@ -281,15 +282,15 @@ ConnectionState::ValueList Manager::parseConnections( const QString& out ) {
     for (; it != list.end(); ++it ) {
         QString row = (*it).stripWhiteSpace();
         QStringList value = QStringList::split(' ', row );
-        qWarning("0: %s", value[0].latin1() );
-        qWarning("1: %s", value[1].latin1() );
-        qWarning("2: %s", value[2].latin1() );
-        qWarning("3: %s", value[3].latin1() );
-        qWarning("4: %s", value[4].latin1() );
-        qWarning("5: %s", value[5].latin1() );
-        qWarning("6: %s", value[6].latin1() );
-        qWarning("7: %s", value[7].latin1() );
-        qWarning("8: %s", value[8].latin1() );
+        owan << "0: %s" << value[0].latin1() << oendl;
+        owan << "1: %s" << value[1].latin1() << oendl;
+        owan << "2: %s" << value[2].latin1() << oendl;
+        owan << "3: %s" << value[3].latin1() << oendl;
+        owan << "4: %s" << value[4].latin1() << oendl;
+        owan << "5: %s" << value[5].latin1() << oendl;
+        owan << "6: %s" << value[6].latin1() << oendl;
+        owan << "7: %s" << value[7].latin1() << oendl;
+        owan << "8: %s" << value[8].latin1() << oendl;
         ConnectionState con;
         con.setDirection( value[0] == QString::fromLatin1("<") ? Outgoing : Incoming );
         con.setConnectionMode( value[1] );
diff --git a/noncore/net/opietooth/lib/parser.cc b/noncore/net/opietooth/lib/parser.cc
index 8baf284..7e95907 100644
--- a/noncore/net/opietooth/lib/parser.cc
+++ b/noncore/net/opietooth/lib/parser.cc
@@ -1,7 +1,13 @@
 
+#include "parser.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qstringlist.h>
 
-#include "parser.h"
 
 using namespace OpieTooth;
 
@@ -13,29 +19,29 @@ namespace {
     // @eturn 13398
     // tactic find " (
 int convert( const QString& line, QString& ret ) {
-//    qWarning("called");
+//    owarn << "called" << oendl;
     ret = QString::null;
     int i = 0;
     int pos = line.findRev("\" (");
     if ( pos > 0 ) { // it shouldn't be at pos 0
         ret = line.left(pos ).stripWhiteSpace();
-        //      qWarning("ret: %s",  ret.latin1() );
+        //      owarn << "ret: " << ret.latin1() << oendl;
         ret = ret.replace(QRegExp("[\"]"), "");
-        //qWarning("ret: %s", ret.latin1() );
+        //owarn << "ret: " << ret.latin1() << oendl;
         QString dummy = line.mid(pos + 5 );
-        //qWarning("dummy: %s",  dummy.latin1() );
+        //owarn << "dummy: " << dummy.latin1() << oendl;
         dummy = dummy.replace(QRegExp("[)]"), "");
-        //qWarning("dummy: %s", dummy.latin1() );
+        //owarn << "dummy: " << dummy.latin1() << oendl;
 //        dummy = dummy.remove( dummy.length() -2, 1 ); // remove the )
         bool ok;
         i = dummy.toInt(&ok, 16 );
         //if (ok ) {
-        //     qWarning("converted %d",  i);
-        //}else qWarning("failed" );
-        //qWarning("exiting");
+        //     owarn << "converted " << i << oendl;
+        //}else owarn << "failed" << oendl;
+        //owarn << "exiting" << oendl;
         return i;
     }
-    //qWarning("output %d", i );
+    //owarn << "output " << i << oendl;
     return i;
 }
 
@@ -57,11 +63,11 @@ void Parser::parse( const QString& string) {
     QStringList list = QStringList::split('\n', string,TRUE );
     QStringList::Iterator it;
     for (it = list.begin(); it != list.end(); ++it ) {
-        //qWarning("line:%s:line", (*it).latin1() );
+        //owarn << "line:" << (*it).latin1() << oendl;
         if ( (*it).startsWith("Browsing") ) continue;
 
         if ( (*it).stripWhiteSpace().isEmpty() ) { // line is empty because a new Service begins
-            qWarning("could add");
+            owarn << "could add" << oendl;
             // now see if complete and add
             if (m_complete ) {
                 if (!m_item.serviceName().isEmpty() )
@@ -80,22 +86,22 @@ void Parser::parse( const QString& string) {
     }
     // missed the last one
     if (m_complete) {
-//        qWarning("adding");
+//        owarn << "adding" << oendl;
         if (!m_item.serviceName().isEmpty() )
             m_list.append(m_item );
     }
     QValueList<Services>::Iterator it2;
 
     if (m_list.isEmpty() )
-        qWarning("m_list is empty");
+        owarn << "m_list is empty" << oendl;
     for (it2 = m_list.begin(); it2 != m_list.end(); ++it2 ) {
-        qWarning("name %s", (*it2).serviceName().latin1() );
+        owarn << "name " << (*it2).serviceName().latin1() << oendl;
     }
 }
 bool Parser::parseName( const QString& str) {
     if (str.startsWith("Service Name:") ) {
         m_item.setServiceName( str.mid(13).stripWhiteSpace() );
-        qWarning(m_item.serviceName() );
+        owarn << m_item.serviceName() << oendl;
         return true;
     }
     return false;
@@ -103,13 +109,13 @@ bool Parser::parseName( const QString& str) {
 bool Parser::parseRecHandle( const QString& str) {
     if (str.startsWith("Service RecHandle:" ) ) {
         QString out = str.mid(18 ).stripWhiteSpace();
-        qWarning("out %s", out.latin1() );
+        owarn << "out " << out.latin1() << oendl;
         int value = out.mid(2).toInt(&m_ok, 16 );
         if (m_ok && (value != -1) )
             m_complete = true;
         else
             m_complete = false;
-        qWarning("rec handle %d",  value);
+        owarn << "rec handle " << value << oendl;
         m_item.setRecHandle( value );
         return true;
 
@@ -118,13 +124,13 @@ bool Parser::parseRecHandle( const QString& str) {
 }
 bool Parser::parseClassId( const QString& str) {
     if (str.startsWith("Service Class ID List:") ) {
-        qWarning("found class id" );
-        qWarning("line:%s", str.latin1() );
+        owarn << "found class id" << oendl;
+        owarn << "line: " << str.latin1() << oendl;
         m_classOver = true;
         return true;
     }else if ( m_classOver && str.startsWith("  " )  ){ // ok now are the informations in place
-        qWarning("line with class id" );
-        qWarning("%s",str.latin1() );
+        owarn << "line with class id" << oendl;
+        owarn << str.latin1() << oendl;
 
         // "Obex Object Push" (0x1105)
         //  find backwards the " and the from 0 to pos and the mid pos+1
@@ -133,12 +139,12 @@ bool Parser::parseClassId( const QString& str) {
         QString classes;
         int ids;
         ids = convert( str, classes );
-        qWarning("ids %d", ids );
+        owarn << "ids " << ids << oendl;
         m_item.insertClassId( ids, classes );
 
         return true;
     }else{
-        qWarning("Else %d", m_classOver );
+        owarn << "Else " << m_classOver << oendl;
         m_classOver = false;
     }
     return false;
@@ -150,7 +156,7 @@ bool Parser::parseProtocol( const QString& str) {
         return true;
 
     }else if (m_protocolOver && str.startsWith("  ") ) { // "L2CAP" (0x0100)
-        qWarning("double protocol filter");
+        owarn << "double protocol filter" << oendl;
 
         if (!m_protocolAdded ) { // the protocol does neither supply a channel nor port so add it now
             Services::ProtocolDescriptor desc(  m_protName,  m_protId );
@@ -162,7 +168,7 @@ bool Parser::parseProtocol( const QString& str) {
         }
         return true;
     }else if (m_protocolOver && str.startsWith("   ") ) {
-        qWarning("tripple protocol filter");
+        owarn << "tripple protocol filter" << oendl;
         m_protocolAdded = true;
         QString dummy = str.stripWhiteSpace();
         int pos = dummy.findRev(':');
@@ -187,7 +193,7 @@ bool Parser::parseProfile( const QString& str) {
         int pos = str.findRev(':');
         if ( pos > 0 ) {
             int dummy = str.mid(pos+1 ).stripWhiteSpace().toInt();
-            qWarning("dummyInt:%d",  dummy );
+            owarn << "dummyInt: " << dummy << oendl;
             Services::ProfileDescriptor desc( m_profName, m_profId, dummy );
             m_item.insertProfileDescriptor(desc);
         }
diff --git a/noncore/settings/mediummount/mediumglobal.cc b/noncore/settings/mediummount/mediumglobal.cc
index ab0b3af..0c6cf12 100644
--- a/noncore/settings/mediummount/mediumglobal.cc
+++ b/noncore/settings/mediummount/mediumglobal.cc
@@ -1,5 +1,12 @@
 
+#include "mediumglobal.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+#include <qpe/config.h>
 
+/* QT */
 #include <qlineedit.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
@@ -9,9 +16,7 @@
 #include <qgroupbox.h>
 #include <qwhatsthis.h>
 
-#include <qpe/config.h>
 
-#include "mediumglobal.h"
 
 using namespace MediumMountSetting;
 
@@ -152,7 +157,7 @@ void MediumGlobalWidget::slotGlobalChanged()
     mode = GLOBAL_ENABLED;
   }else
     mode = GLOBAL_DISABLED;
-  qWarning("enabled = %d", enabled );
+  owarn << "enabled = " << enabled << oendl;
   m_all->setEnabled  ( enabled );
   m_audio->setEnabled( enabled );
   m_image->setEnabled( enabled );
diff --git a/noncore/styles/theme/othemebase.h b/noncore/styles/theme/othemebase.h
index e691692..5519798 100644
--- a/noncore/styles/theme/othemebase.h
+++ b/noncore/styles/theme/othemebase.h
@@ -18,6 +18,11 @@
 #ifndef __OTHEMEBASE_H
 #define __OTHEMEBASE_H
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qdatetime.h>
 #include <qtimer.h>
 #include <qwindowsstyle.h>
@@ -66,7 +71,7 @@ inline QPixmap* OThemePixmap::border( BorderType type )
 inline void OThemePixmap::setBorder( BorderType type, const QPixmap &p )
 {
         if ( b[ type ] ) {
-                qWarning( "OThemePixmap: Overwriting existing border!" );
+        owarn << "OThemePixmap: Overwriting existing border!" << oendl;
                 delete( b[ type ] );
         }
         b[ type ] = new QPixmap( p );