9 files changed, 140 insertions, 139 deletions

diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index da39113..bfdb20a 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -20,13 +20,15 @@
 /* OPIE */
 #include <opie2/onetwork.h>
 #ifdef QWS
 #include <opie2/oapplication.h>
 #include <opie2/oconfig.h>
 #include <opie2/odevice.h>
-using namespace Opie;
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+using namespace Opie::Net;
 #endif
 
 /* QT */
 #include <qapplication.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
@@ -37,21 +39,15 @@ using namespace Opie;
 #include <qpushbutton.h>
 #include <qtabwidget.h>
 #include <qtoolbutton.h>
 #include <qspinbox.h>
 #include <qtextstream.h>
 
-/* POSIX */
+/* STD */
 #include <assert.h>
 
-using namespace Opie::Core;
-using namespace Opie::Net;
-using namespace Opie::Core;
-using namespace Opie::Net;
-using namespace Opie::Core;
-using namespace Opie::Net;
 WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0;
 
 WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f )
            :WellenreiterConfigBase( parent, name, true, f )
 {
     _devicetype[ "cisco" ] = DEVTYPE_CISCO;
@@ -113,13 +109,13 @@ WellenreiterConfigWindow::~WellenreiterConfigWindow()
 void WellenreiterConfigWindow::performAutodetection()
 {
     //TODO: insert modal splash screen here
     //      and sleep a second, so that it looks
     //      like we're actually doing something fancy... ;-)
 
-    qDebug( "WellenreiterConfigWindow::performAutodetection()" );
+    odebug << "WellenreiterConfigWindow::performAutodetection()" << oendl; 
 
     // try to guess device type
     QFile m( "/proc/modules" );
     if ( m.open( IO_ReadOnly ) )
     {
         int devicetype(0);
@@ -134,13 +130,13 @@ void WellenreiterConfigWindow::performAutodetection()
             else if ( line.contains( "orinoco" ) ) devicetype = DEVTYPE_ORINOCO;
         }
         if ( devicetype )
         {
             deviceType->setCurrentItem( devicetype );
             _guess = devicetype;
-            qDebug( "Wellenreiter: guessed device type to be #%d", devicetype );
+            odebug << "Wellenreiter: guessed device type to be #" << devicetype << "" << oendl; 
         }
     }
 }
 
 
 int WellenreiterConfigWindow::driverType() const
@@ -238,13 +234,13 @@ void WellenreiterConfigWindow::changedStationAction(int t)
 }
 
 
 void WellenreiterConfigWindow::getCaptureFileNameClicked()
 {
     QString name = ( (WellenreiterMainWindow*) qApp->mainWidget() )->getFileName(true);
-    qDebug( "name = %s", (const char*) name );
+    odebug << "name = " << (const char*) name << "" << oendl; 
     if ( !name.isEmpty() )
     {
         captureFileName->setText( name );
     }
 }
 
@@ -313,17 +309,17 @@ void WellenreiterConfigWindow::performAction( const QString& type,
     {
         action = newStationAction->currentItem();
         script = newStationScript->text();
     }
     else
     {
-        qWarning( "WellenreiterConfigWindow::performAction(): unknown type '%s'", (const char*) type );
+        owarn << "WellenreiterConfigWindow::performAction(): unknown type '" << (const char*) type << "'" << oendl; 
         return;
     }
 
-    qDebug( "for event '%s' I'm going to perform action %d (script='%s')", (const char*) type, action, (const char*) script );
+    odebug << "for event '" << (const char*) type << "' I'm going to perform action " << action << " (script='" << (const char*) script << "')" << oendl; 
 
     switch( action )
     {
         case 0: /* Ignore */ return;
         case 1: /* Play Alarm */ ODevice::inst()->playAlarmSound(); return;
         case 2: /* Play Click */ ODevice::inst()->playTouchSound(); return;
@@ -342,15 +338,15 @@ void WellenreiterConfigWindow::performAction( const QString& type,
                 **/
             script = script.replace( QRegExp( "$SSID" ), essid );
             script = script.replace( QRegExp( "$MAC" ), mac );
             script = script.replace( QRegExp( "$WEP" ), wep ? QString( "true" ) : QString( "false" ) );
             script = script.replace( QRegExp( "$CHAN" ), QString::number( channel ) );
 
-            qDebug( "going to call script '%s'", (const char*) script );
+            odebug << "going to call script '" << (const char*) script << "'" << oendl; 
             ::system( script );
-            qDebug( "script returned." );
+            odebug << "script returned." << oendl; 
             return;
         }
         default: assert( false );
     }
 }
 
@@ -358,13 +354,13 @@ void WellenreiterConfigWindow::performAction( const QString& type,
 void WellenreiterConfigWindow::load()
 {
 #ifdef Q_WS_X11
     #warning Persistent Configuration not yet implemented for standalone X11 build
     performAutodetection();
 #else
-    qDebug( "loading configuration settings..." );
+    odebug << "loading configuration settings..." << oendl; 
 
     /* This is dumb monkey typing stuff... We _need_ to do this automatically! */
 
     OConfig* c = oApp->config();
 
     c->setGroup( "Interface" );
@@ -436,13 +432,13 @@ void WellenreiterConfigWindow::load()
 
 void WellenreiterConfigWindow::save()
 {
 #ifdef Q_WS_X11
     #warning Persistent Configuration not yet implemented for standalone X11 build
 #else
-    qDebug( "saving configuration settings..." );
+    odebug << "saving configuration settings..." << oendl; 
 
     /* This is dumb monkey typing stuff... We _need_ to do this automatically! */
 
     OConfig* c = oApp->config();
 
     c->setGroup( "Interface" );
diff --git a/noncore/net/wellenreiter/gui/gps.cpp b/noncore/net/wellenreiter/gui/gps.cpp
index a47b4ec..bd91e35 100644
--- a/noncore/net/wellenreiter/gui/gps.cpp
+++ b/noncore/net/wellenreiter/gui/gps.cpp
@@ -12,30 +12,34 @@
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "gps.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
 /* QT */
 #include <qtextstream.h>
 
 /* STD */
 #include <stdlib.h>
 #include <unistd.h>
 
 GPS::GPS( QObject* parent, const char * name )
     :QObject( parent, name )
 {
-    qDebug( "GPS::GPS()" );
+    odebug << "GPS::GPS()" << oendl; 
     _socket = new QSocket( this, "gpsd commsock" );
 }
 
 
 GPS::~GPS()
 {
-    qDebug( "GPS::~GPS()" );
+    odebug << "GPS::~GPS()" << oendl; 
 }
 
 
 bool GPS::open( const QString& host, int port )
 {
     _socket->connectToHost( host, port );
@@ -50,21 +54,21 @@ GpsLocation GPS::position() const
 
     int result = _socket->writeBlock( "p\r\n", 3 );
     _socket->flush();
     if ( result )
     {
         int numAvail = _socket->bytesAvailable();
-        qDebug( "GPS write succeeded, %d bytes available for reading...", numAvail );
+        odebug << "GPS write succeeded, " << numAvail << " bytes available for reading..." << oendl; 
         if ( numAvail )
         {                     
             int numRead = _socket->readBlock( &buf[0], sizeof buf );
             int numScan = ::sscanf( &buf[0], "GPSD,P=%lg %lg", &lat, &lon);
             
             if ( numRead < 7 || numScan != 2 )
             {
-                qDebug( "GPS read %d bytes succeeded, invalid response: '%s'", numRead, &buf[0] );
+                odebug << "GPS read " << numRead << " bytes succeeded, invalid response: '" << &buf[0] << "'" << oendl; 
                 return GpsLocation( -111, -111 );
             }
             else
             {
                 return GpsLocation( lat, lon );
             }
diff --git a/noncore/net/wellenreiter/gui/logwindow.cpp b/noncore/net/wellenreiter/gui/logwindow.cpp
index 1c72cf4..714a9a9 100644
--- a/noncore/net/wellenreiter/gui/logwindow.cpp
+++ b/noncore/net/wellenreiter/gui/logwindow.cpp
@@ -11,12 +11,18 @@
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "logwindow.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qmultilineedit.h>
 #include <qdatetime.h>
 
 MLogWindow* MLogWindow::_instance;
 
 MLogWindow::MLogWindow( QWidget * parent, const char * name, WFlags f )
@@ -35,13 +41,13 @@ void MLogWindow::log( QString text )
     QString line;
     line.sprintf( "[%s] %s\n", (const char*) time.toString(), (const char*) text );
     int col;
     int row;
     ledit->getCursorPosition( &col, &row );
     ledit->insertAt( line, col, row );
-    qDebug( line );
+    odebug << line << oendl; 
 }
 
 
 void MLogWindow::clear()
 {
     ledit->clear();
diff --git a/noncore/net/wellenreiter/gui/main.cpp b/noncore/net/wellenreiter/gui/main.cpp
index 6bbc39b..62db967 100644
--- a/noncore/net/wellenreiter/gui/main.cpp
+++ b/noncore/net/wellenreiter/gui/main.cpp
@@ -11,30 +11,33 @@
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "mainwindow.h"
+
 #ifdef QWS
+#include <opie2/odebug.h>
 #include <opie2/oapplication.h>
 #include <opie2/oprocess.h>
 #else
 #include <qapplication.h>
 #endif
 
+/* QT */
 #include <qmessagebox.h>
 #include <qstringlist.h>
 
+/* STD */
 #include <errno.h>
 #include <signal.h>
 #include <string.h>
 #include <unistd.h>
 
 using namespace Opie::Core;
-using namespace Opie::Core;
-using namespace Opie::Core;
+
 int main( int argc, char **argv )
 {
     #ifdef QWS
     OApplication a( argc, argv, "Wellenreiter II" );
     #else
     QApplication a( argc, argv );
@@ -52,27 +55,27 @@ int main( int argc, char **argv )
     int result = -1;
     static int killed = false;
 
     bool check = true;
     for ( int i = 1; i < argc; ++i )
     {
-        qDebug( "Wellenreiter::main() parsing argument %d = '%s'", i, argv[i] );
+        odebug << "Wellenreiter::main() parsing argument " << i << " = '" << argv[i] << "'" << oendl; 
         if ( !strcmp( "-nocheck", argv[i] ) )
         {
-            qDebug( "-nocheck found" );
+            odebug << "-nocheck found" << oendl; 
             check = false;
             break;
         }
     }
 
     if ( check )
     {
         // root check
         if ( getuid() )
         {
-            qWarning( QObject::tr( "Wellenreiter: trying to run as non-root!" ) );
+            owarn << QObject::tr( "Wellenreiter: trying to run as non-root!" ) << oendl; 
             result = QMessageBox::warning( w, " - Wellenreiter II -  (non-root)", QObject::tr( "You have started Wellenreiter II\n"
             "as non-root. You will have\nonly limited functionality.\nProceed anyway?" ),
             QMessageBox::Yes, QMessageBox::No );
             if ( result == QMessageBox::No ) return -1;
         }
 
@@ -83,13 +86,13 @@ int main( int argc, char **argv )
             result = QMessageBox::warning( w, " - Wellenreiter II -  (dhcp)", QObject::tr( "You have a dhcp client running.\n"
             "(PID = %1)\nThis can severly limit scanning!\nShould I kill it for you?" ).arg( dhcpid ),
             QMessageBox::Yes, QMessageBox::No );
             if ( result == QMessageBox::Yes )
             {
                 if ( -1 == ::kill( dhcpid, SIGTERM ) )
-                    qWarning( "Wellenreiter: can't kill process #%d (%s)", result, strerror( errno ) );
+                    owarn << "Wellenreiter: can't kill process #" << result << " (" << strerror( errno ) << ")" << oendl; 
                 else
                     killed = true;
             }
         }
     }
 
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index 7add6cd..a4b8839 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -18,12 +18,27 @@
 #include "logwindow.h"
 #include "packetview.h"
 #include "mainwindow.h"
 #include "wellenreiter.h"
 #include "scanlist.h"
 
+/* OPIE */
+#ifdef QWS
+#include <qpe/resource.h>
+#include <opie2/odebug.h>
+#include <opie2/ofiledialog.h>
+#else
+#include "resource.h"
+#include <qapplication.h>
+#include <qfiledialog.h> 
+#endif
+using namespace Opie::Core;
+using namespace Opie::Net;
+using namespace Opie::Ui;
+
+/* QT */
 #include <qcombobox.h>
 #include <qdatastream.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qlabel.h>
 #include <qlayout.h>
@@ -36,29 +51,15 @@
 #include <qstatusbar.h>
 #include <qspinbox.h>
 #include <qtextstream.h>
 #include <qtoolbutton.h>
 #include <qwhatsthis.h>
 
-#ifdef QWS
-#include <qpe/resource.h>
-#include <opie2/ofiledialog.h>
-using namespace Opie;
-#else
-#include "resource.h"
-#include <qapplication.h>
-#include <qfiledialog.h>
-#endif
-
+/* STD */
 #include <unistd.h>
 
-using namespace Opie::Ui;
-using namespace Opie::Net;
-using namespace Opie::Ui;
-using namespace Opie::Net;
-using namespace Opie::Net;
 WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f )
            :QMainWindow( parent, name, f )
 {
     cw = new WellenreiterConfigWindow( this );
     mw = new Wellenreiter( this );
     mw->setConfigWindow( cw );
@@ -185,13 +186,13 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
 };
 
 
 
 void WellenreiterMainWindow::showConfigure()
 {
-    qDebug( "show configure..." );
+    odebug << "show configure..." << oendl; 
     cw->setCaption( tr( "Configure" ) );
     int result = QPEApplication::execDialog( cw );
 
     if ( result ) updateToolButtonState();
 }
 
@@ -228,13 +229,13 @@ void WellenreiterMainWindow::changedSniffingState()
     }
 }
 
 
 WellenreiterMainWindow::~WellenreiterMainWindow()
 {
-    qDebug( "Wellenreiter: bye." );
+    odebug << "Wellenreiter: bye." << oendl; 
 };
 
 
 void WellenreiterMainWindow::demoAddStations()
 {
     //mw = 0; // test SIGSEGV handling
@@ -248,13 +249,13 @@ void WellenreiterMainWindow::demoAddStations()
 
 
 void WellenreiterMainWindow::demoReadFromGps()
 {
     WellenreiterConfigWindow* configwindow = WellenreiterConfigWindow::instance();
     GPS* gps = new GPS( this );
-    qDebug( "Wellenreiter::demoReadFromGps(): url=gps://%s:%d/", (const char*) configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() );
+    odebug << "Wellenreiter::demoReadFromGps(): url=gps://" << (const char*) configwindow->gpsdHost->currentText() << ":" << configwindow->gpsdPort->value() << "/" << oendl; 
     gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() );
     GpsLocation loc = gps->position();
     QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n%1" ).arg( loc.dmsPosition() ) );
     delete gps;
 }
 
@@ -302,17 +303,17 @@ void WellenreiterMainWindow::fileSaveLog()
         QFile f( fname );
         if ( f.open(IO_WriteOnly) )
         {
             QTextStream t( &f );
             t << mw->logWindow()->getLog();
             f.close();
-            qDebug( "Saved log to file '%s'", (const char*) fname );
+            odebug << "Saved log to file '" << (const char*) fname << "'" << oendl; 
         }
         else
         {
-            qDebug( "Problem saving log to file '%s'", (const char*) fname );
+            odebug << "Problem saving log to file '" << (const char*) fname << "'" << oendl; 
         }
     }
 }
 
 void WellenreiterMainWindow::fileSaveSession()
 {
@@ -323,17 +324,17 @@ void WellenreiterMainWindow::fileSaveSession()
         QFile f( fname );
         if ( f.open(IO_WriteOnly) )
         {
             QDataStream t( &f );
             t << *mw->netView();
             f.close();
-            qDebug( "Saved session to file '%s'", (const char*) fname );
+            odebug << "Saved session to file '" << (const char*) fname << "'" << oendl; 
         }
         else
         {
-            qDebug( "Problem saving session to file '%s'", (const char*) fname );
+            odebug << "Problem saving session to file '" << (const char*) fname << "'" << oendl; 
         }
     }
 }
 
 void WellenreiterMainWindow::fileSaveHex()
 {
@@ -345,17 +346,17 @@ void WellenreiterMainWindow::fileSaveHex()
         QFile f( fname );
         if ( f.open(IO_WriteOnly) )
         {
             QTextStream t( &f );
             t << mw->hexWindow()->getLog();
             f.close();
-            qDebug( "Saved hex log to file '%s'", (const char*) fname );
+            odebug << "Saved hex log to file '" << (const char*) fname << "'" << oendl; 
         }
         else
         {
-            qDebug( "Problem saving hex log to file '%s'", (const char*) fname );
+            odebug << "Problem saving hex log to file '" << (const char*) fname << "'" << oendl; 
         }
     }
     */
 }
 
 void WellenreiterMainWindow::fileLoadSession()
@@ -366,17 +367,17 @@ void WellenreiterMainWindow::fileLoadSession()
         QFile f( fname );
         if ( f.open(IO_ReadOnly) )
         {
             QDataStream t( &f );
             t >> *mw->netView();
             f.close();
-            qDebug( "Loaded session from file '%s'", (const char*) fname );
+            odebug << "Loaded session from file '" << (const char*) fname << "'" << oendl; 
         }
         else
         {
-            qDebug( "Problem loading session from file '%s'", (const char*) fname );
+            odebug << "Problem loading session from file '" << (const char*) fname << "'" << oendl; 
         }
     }
 }
 
 
 void WellenreiterMainWindow::fileNew()
@@ -435,17 +436,17 @@ void WellenreiterMainWindow::uploadSession()
     connect( accept, SIGNAL( clicked() ), d, SLOT( accept() ) );
     connect( reject, SIGNAL( clicked() ), d, SLOT( reject() ) );
     int result = d->exec();
 
     if ( !result )
     {
-        qDebug( "Session upload cancelled :(" );
+        odebug << "Session upload cancelled :(" << oendl; 
         return;
     }
 
-    qDebug( "Starting upload..." );
+    odebug << "Starting upload..." << oendl; 
 
     struct sockaddr_in raddr;
     struct hostent *rhost_info;
     int sock = -1;
     bool ok = false;
 
diff --git a/noncore/net/wellenreiter/gui/packetview.cpp b/noncore/net/wellenreiter/gui/packetview.cpp
index 3d3aa18..4df01da 100644
--- a/noncore/net/wellenreiter/gui/packetview.cpp
+++ b/noncore/net/wellenreiter/gui/packetview.cpp
@@ -81,13 +81,13 @@ void PacketView::showPacket( int number )
     {
         _doSubPackets( const_cast<QObjectList*>( p->children() ), 0 );
         _doHexPacket( p );
     }
     else
     {
-        qDebug( "D'oh! No packet!" );
+        odebug << "D'oh! No packet!" << oendl; 
     }
 }
 
 void PacketView::_doSubPackets( QObjectList* l, int counter )
 {
     if (!l) return;
diff --git a/noncore/net/wellenreiter/gui/resource.cpp b/noncore/net/wellenreiter/gui/resource.cpp
index d98ef0b..cb17f51 100644
--- a/noncore/net/wellenreiter/gui/resource.cpp
+++ b/noncore/net/wellenreiter/gui/resource.cpp
@@ -26,24 +26,24 @@ QPixmap loadPixmap( const QString& pix )
 {
     QString filename;
     filename.sprintf( "%s/%s.png", (const char*) PIXMAPPATH, (const char*) pix );
     QPixmap pixmap( filename );
     if ( pixmap.isNull() )
     {
-        qDebug( "Wellenreiter::Resource: can't find pixmap " + filename );
+        odebug << "Wellenreiter::Resource: can't find pixmap " + filename << oendl; 
     }
     return pixmap;
 };
 
 QIconSet loadIconSet( const QString& pix )
 {
     QString filename;
     filename.sprintf( "%s/%s.png", (const char*) PIXMAPPATH, (const char*) pix );
     QPixmap pixmap( filename );
     if ( pixmap.isNull() )
     {
-        qDebug( "Wellenreiter::Resource: can't find pixmap " + filename );
+        odebug << "Wellenreiter::Resource: can't find pixmap " + filename << oendl; 
     }
     return QIconSet( pixmap );
 };
 
 };
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index 3b7120a..a2be782 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -14,27 +14,32 @@
 **********************************************************************/
 
 #include "scanlist.h"
 #include "configwindow.h"
 #include "logwindow.h"
 
-#include <assert.h>
-#include <qcursor.h>
-#include <qdatetime.h>
-#include <qpopupmenu.h>
-#include <qcheckbox.h>
-
+/* OPIE */
 #ifdef QWS
+#include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
-#endif
-
-#ifdef QWS
 #include <qpe/resource.h>
 #else
 #include "resource.h"
 #endif
+using namespace Opie::Core;
+using namespace Opie::Ui;
+using namespace Opie::Net;
+
+/* QT */
+#include <qcursor.h>
+#include <qdatetime.h>
+#include <qpopupmenu.h>
+#include <qcheckbox.h>
+
+/* STD */
+#include <assert.h>
 
 const int col_type = 0;
 const int col_essid = 0;
 const int col_sig = 1;
 const int col_ap = 2;
 const int col_channel = 3;
@@ -43,18 +48,12 @@ const int col_traffic = 5;
 const int col_ip = 6;
 const int col_manuf = 7;
 const int col_firstseen = 8;
 const int col_lastseen = 9;
 const int col_location = 10;
 
-using namespace Opie::Net;
-using namespace Opie::Ui;
-using namespace Opie::Net;
-using namespace Opie::Ui;
-using namespace Opie::Ui;
-using namespace Opie::Net;
 MScanListView::MScanListView( QWidget* parent, const char* name )
               :OListView( parent, name )
 {
     setFrameShape( QListView::StyledPanel );
     setFrameShadow( QListView::Sunken );
 
@@ -103,20 +102,20 @@ OListViewItem* MScanListView::childFactory()
     return new MScanListItem( this );
 }
 
 
 void MScanListView::serializeTo( QDataStream& s) const
 {
-    qDebug( "serializing MScanListView" );
+    odebug << "serializing MScanListView" << oendl; 
     OListView::serializeTo( s );
 }
 
 
 void MScanListView::serializeFrom( QDataStream& s)
 {
-    qDebug( "serializing MScanListView" );
+    odebug << "serializing MScanListView" << oendl; 
     OListView::serializeFrom( s );
 }
 
 
 void MScanListView::addNewItem( const QString& type,
                                 const QString& essid,
@@ -140,13 +139,13 @@ void MScanListView::addNewItem( const QString& type,
     MScanListItem* network;
     MScanListItem* item = static_cast<MScanListItem*> ( firstChild() );
 
     while ( item && ( item->text( col_essid ) != essid ) )
     {
         #ifdef DEBUG
-        qDebug( "itemtext: %s", (const char*) item->text( col_essid ) );
+        odebug << "itemtext: " << (const char*) item->text( col_essid ) << "" << oendl; 
         #endif
         item = static_cast<MScanListItem*> ( item->nextSibling() );
     }
     if ( item )
     {
         // we have already seen this net, check all childs if MAC exists
@@ -156,22 +155,22 @@ void MScanListView::addNewItem( const QString& type,
         item = static_cast<MScanListItem*> ( item->firstChild() );
         assert( item ); // this shouldn't fail
 
         while ( item && ( item->text( col_ap ) != macaddr ) )
         {
             #ifdef DEBUG
-            qDebug( "subitemtext: %s", (const char*) item->text( col_ap ) );
+            odebug << "subitemtext: " << (const char*) item->text( col_ap ) << "" << oendl; 
             #endif
             item = static_cast<MScanListItem*> ( item->nextSibling() );
         }
 
         if ( item )
         {
             // we have already seen this item, it's a dupe
             #ifdef DEBUG
-            qDebug( "%s is a dupe - ignoring...", (const char*) macaddr );
+            odebug << "" << (const char*) macaddr << " is a dupe - ignoring..." << oendl; 
             #endif
             item->receivedBeacon();
             return;
         }
     }
     else
@@ -183,13 +182,13 @@ void MScanListView::addNewItem( const QString& type,
 
 
     // insert new station as child from network
     // no essid to reduce clutter, maybe later we have a nick or stationname to display!?
 
     #ifdef DEBUG
-    qDebug( "inserting new station %s", (const char*) macaddr );
+    odebug << "inserting new station " << (const char*) macaddr << "" << oendl; 
     #endif
 
     MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal );
     station->setManufacturer( mac.manufacturer() );
     station->setLocation( loc.dmsPosition() );
 
@@ -209,22 +208,22 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress&
 {
     MScanListItem* subitem = static_cast<MScanListItem*>( network->firstChild() );
 
     while ( subitem && ( subitem->text( col_ap ) != addr.toString(true) ) )
     {
         #ifdef DEBUG
-        qDebug( "subitemtext: %s", (const char*) subitem->text( col_ap ) );
+        odebug << "subitemtext: " << (const char*) subitem->text( col_ap ) << "" << oendl; 
         #endif
         subitem = static_cast<MScanListItem*> ( subitem->nextSibling() );
     }
 
     if ( subitem )
     {
         // we have already seen this item, it's a dupe
         #ifdef DEBUG
-        qDebug( "%s is a dupe - ignoring...", (const char*) addr.toString(true) );
+        odebug << "" << (const char*) addr.toString(true) << " is a dupe - ignoring..." << oendl; 
         #endif
         subitem->receivedBeacon(); //FIXME: sent data bit
         return;
     }
 
     // Hey, it seems to be a new item :-D
@@ -243,13 +242,13 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress&
     MLogWindow::logwindow()->log( s );
 }
 
 
 void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo )
 {
-    qDebug( "WDSTraffic: %s and %s seem to form a WDS", (const char*) viaFrom.toString(), (const char*) viaTo.toString() );
+    odebug << "WDSTraffic: " << (const char*) viaFrom.toString() << " and " << (const char*) viaTo.toString() << " seem to form a WDS" << oendl; 
     QString s;
     MScanListItem* network;
 
     QListViewItemIterator it( this );
     while ( it.current() &&
             it.current()->text( col_ap ) != viaFrom.toString(true) &&
@@ -261,13 +260,13 @@ void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to,
     {
         addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from );
         addIfNotExisting( static_cast<MScanListItem*>(item->parent()), to );
     }
     else
     {
-        qDebug( "D'Oh! Stations without AP... ignoring for now... will handle this in 1.1 version :-D" );
+        odebug << "D'Oh! Stations without AP... ignoring for now... will handle this in 1.1 version :-D" << oendl; 
         MLogWindow::logwindow()->log( "WARNING: Unhandled WSD traffic!" );
     }
 }
 
 
 void MScanListView::toDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via )
@@ -283,13 +282,13 @@ void MScanListView::toDStraffic( const OMacAddress& from, const OMacAddress& to,
     if ( item ) // AP has shown up yet, so just add our new "from" - station
     {
         addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from, "adhoc" );
     }
     else
     {
-        qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" );
+        odebug << "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" << oendl; 
         MLogWindow::logwindow()->log( "WARNING: Unhandled toDS traffic!" );
 
     }
 }
 
 
@@ -306,47 +305,47 @@ void MScanListView::fromDStraffic( const OMacAddress& from, const OMacAddress& t
     if ( item ) // AP has shown up yet, so just add our new "from" - station
     {
         addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from, "station" );
     }
     else
     {
-        qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" );
+        odebug << "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" << oendl; 
         MLogWindow::logwindow()->log( "WARNING: Unhandled fromDS traffic!" );
     }
 }
 
 
 void MScanListView::IBSStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via )
 {
-    qWarning( "D'oh! Not yet implemented..." );
+    owarn << "D'oh! Not yet implemented..." << oendl; 
     MLogWindow::logwindow()->log( "WARNING: Unhandled IBSS traffic!" );
 }
 
 
 void MScanListView::identify( const OMacAddress& macaddr, const QString& ip )
 {
-    qDebug( "identify %s = %s", (const char*) macaddr.toString(), (const char*) ip );
+    odebug << "identify " << (const char*) macaddr.toString() << " = " << (const char*) ip << "" << oendl; 
 
     QListViewItemIterator it( this );
     for ( ; it.current(); ++it )
     {
         if ( it.current()->text( col_ap ) == macaddr.toString(true) )
         {
             it.current()->setText( col_ip, ip );
             return;
         }
     }
-    qDebug( "D'oh! Received identification, but item not yet in list... ==> Handle this!" );
+    odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl; 
     MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled identification %s = %s!",
                                                      (const char*) macaddr.toString(), (const char*) ip ) );
 }
 
 
 void MScanListView::addService( const QString& name, const OMacAddress& macaddr, const QString& ip )
 {
-    qDebug( "addService '%s', Server = %s = %s", (const char*) name, (const char*) macaddr.toString(), (const char*) ip );
+    odebug << "addService '" << (const char*) name << "', Server = " << (const char*) macaddr.toString() << " = " << (const char*) ip << "" << oendl; 
 
     //TODO: Refactor that out, we need it all over the place.
     //      Best to do it in a more comfortable abstraction in OListView
     //      (Hmm, didn't I already start something in this direction?)
 
     QListViewItemIterator it( this );
@@ -357,22 +356,22 @@ void MScanListView::addService( const QString& name, const OMacAddress& macaddr,
 
             MScanListItem* subitem = static_cast<MScanListItem*>( it.current()->firstChild() );
 
             while ( subitem && ( subitem->text( col_essid ) != name ) )
             {
                 #ifdef DEBUG
-                qDebug( "subitemtext: %s", (const char*) subitem->text( col_essid ) );
+                odebug << "subitemtext: " << (const char*) subitem->text( col_essid ) << "" << oendl; 
                 #endif
                 subitem = static_cast<MScanListItem*> ( subitem->nextSibling() );
             }
 
             if ( subitem )
             {
                 // we have already seen this item, it's a dupe
                 #ifdef DEBUG
-                qDebug( "%s is a dupe - ignoring...", (const char*) name );
+                odebug << "" << (const char*) name << " is a dupe - ignoring..." << oendl; 
                 #endif
                 subitem->receivedBeacon(); //FIXME: sent data bit
                 return;
             }
 
             // never seen that - add new item
@@ -380,13 +379,13 @@ void MScanListView::addService( const QString& name, const OMacAddress& macaddr,
             MScanListItem* item = new MScanListItem( it.current(), "service", "N/A", " ", false, -1, -1 );
             item->setText( col_essid, name );
 
             return;
         }
     }
-    qDebug( "D'oh! Received identification, but item not yet in list... ==> Handle this!" );
+    odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl; 
     MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled service addition %s = %s!",
                                                      (const char*) macaddr.toString(), (const char*) ip ) );
 }
 
 
 void MScanListView::contextMenuRequested( QListViewItem* item, const QPoint&, int col )
@@ -418,13 +417,13 @@ MScanListItem::MScanListItem( QListView* parent, const QString& type, const QStr
                               bool wep, int channel, int signal, bool probed )
                :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ),
                 _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ),
                 _channel( channel ), _signal( signal ), _beacons( 1 )
 {
     #ifdef DEBUG
-    qDebug( "creating scanlist item" );
+    odebug << "creating scanlist item" << oendl; 
     #endif
 
     if ( WellenreiterConfigWindow::instance() )
         WellenreiterConfigWindow::instance()->performAction( type, essid, macaddr, wep, channel, signal ); // better use signal/slot combination here
 
     decorateItem( type, essid, macaddr, wep, channel, signal, probed );
@@ -432,13 +431,13 @@ MScanListItem::MScanListItem( QListView* parent, const QString& type, const QStr
 
 MScanListItem::MScanListItem( QListViewItem* parent, const QString& type, const QString& essid, const QString& macaddr,
                               bool wep, int channel, int signal )
                :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null )
 {
     #ifdef DEBUG
-    qDebug( "creating scanlist item" );
+    odebug << "creating scanlist item" << oendl; 
     #endif
     if ( WellenreiterConfigWindow::instance() )
         WellenreiterConfigWindow::instance()->performAction( type, essid, macaddr, wep, channel, signal ); // better use signal/slot combination here
 
     decorateItem( type, essid, macaddr, wep, channel, signal, false );
 }
@@ -456,24 +455,24 @@ OListViewItem* MScanListItem::childFactory()
     return new MScanListItem( this );
 }
 
 void MScanListItem::serializeTo( QDataStream& s ) const
 {
     #ifdef DEBUG
-    qDebug( "serializing MScanListItem" );
+    odebug << "serializing MScanListItem" << oendl; 
     #endif
     OListViewItem::serializeTo( s );
 
     s << _type;
     s << (Q_UINT8) ( _wep ? 'y' : 'n' );
 }
 
 void MScanListItem::serializeFrom( QDataStream& s )
 {
     #ifdef DEBUG
-    qDebug( "serializing MScanListItem" );
+    odebug << "serializing MScanListItem" << oendl; 
     #endif
     OListViewItem::serializeFrom( s );
 
     char wep;
     s >> _type;
     s >> (Q_UINT8) wep;
@@ -553,13 +552,13 @@ void MScanListItem::setLocation( const QString& location )
 
 
 void MScanListItem::receivedBeacon()
 {
     _beacons++;
     #ifdef DEBUG
-    qDebug( "MScanListItem %s: received beacon #%d", (const char*) _macaddr, _beacons );
+    odebug << "MScanListItem " << (const char*) _macaddr << ": received beacon #" << _beacons << "" << oendl; 
     #endif
     setText( col_sig, QString::number( _beacons ) );
     setText( col_lastseen, QTime::currentTime().toString() );
 
     MScanListItem* p = (MScanListItem*) parent();
     if ( p ) p->receivedBeacon();
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index fff7c35..fad6efd 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -8,40 +8,39 @@
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ***********************************************************************/
 
-// Local
-
 #include "gps.h"
 #include "wellenreiter.h"
 #include "scanlist.h"
 #include "logwindow.h"
 #include "packetview.h"
 #include "configwindow.h"
 #include "statwindow.h"
 #include "graphwindow.h"
 #include "protolistview.h"
 
-// Opie
-
+/* OPIE */
 #ifdef QWS
 #include <opie2/oapplication.h>
+#include <opie2/odebug.h>
 #include <opie2/odevice.h>
 #else
 #include <qapplication.h>
 #endif
 #include <opie2/omanufacturerdb.h>
 #include <opie2/onetwork.h>
 #include <opie2/opcap.h>
 #include <qpe/qcopenvelope_qws.h>
-using namespace Opie;
-
-// Qt
+using namespace Opie::Core;
+using namespace Opie::Net;
+using namespace Opie::Ui;
 
+/* QT */
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qdatetime.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qmessagebox.h>
@@ -49,27 +48,20 @@ using namespace Opie;
 #include <qregexp.h>
 #include <qspinbox.h>
 #include <qtimer.h>
 #include <qtoolbutton.h>
 #include <qmainwindow.h>
 
-// Standard
-
+/* STD */
 #include <assert.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
 #include <stdlib.h>
 
-using namespace Opie::Core;
-using namespace Opie::Net;
-using namespace Opie::Net;
-using namespace Opie::Core;
-using namespace Opie::Net;
-using namespace Opie::Core;
 Wellenreiter::Wellenreiter( QWidget* parent )
     : WellenreiterBase( parent, 0, 0 ),
       sniffing( false ), iface( 0 ), configwindow( 0 )
 {
 
     logwindow->log( "(i) Wellenreiter has been started." );
@@ -103,13 +95,13 @@ Wellenreiter::~Wellenreiter()
     delete pcap;
 }
 
 
 void Wellenreiter::initialTimer()
 {
-    qDebug( "Wellenreiter::preloading manufacturer database..." );
+    odebug << "Wellenreiter::preloading manufacturer database..." << oendl; 
     OManufacturerDB::instance();
 }
 
 
 void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* cw )
 {
@@ -146,30 +138,30 @@ void Wellenreiter::handleNotification( OPacket* p )
     while ( (o = it.current()) != 0 )
     {
         QString name = it.current()->name();
         if ( configwindow->parsePackets->isProtocolChecked( name ) )
         {
             QString action = configwindow->parsePackets->protocolAction( name );
-            qDebug( "parsePacket-action for '%s' seems to be '%s'", (const char*) name, (const char*) action );
+            odebug << "parsePacket-action for '" << (const char*) name << "' seems to be '" << (const char*) action << "'" << oendl; 
             doAction( action, name, p );
         }
         else
         {
-            qDebug( "protocol '%s' not checked in parsePackets.", (const char*) name );
+            odebug << "protocol '" << (const char*) name << "' not checked in parsePackets." << oendl; 
         }
     ++it;
     }
 }
 
 
 void Wellenreiter::handleManagementFrame( OPacket* p, OWaveLanManagementPacket* manage )
 {
     if ( manage->managementType() == "Beacon" ) handleManagementFrameBeacon( p, manage );
     else if ( manage->managementType() == "ProbeRequest" ) handleManagementFrameProbeRequest( p, manage );
     else if ( manage->managementType() == "ProbeResponse" ) handleManagementFrameProbeResponse( p, manage );
-    else qWarning( "Wellenreiter::handleManagementFrame(): '%s' - please handle me!", (const char*) manage->managementType() );
+    else owarn << "Wellenreiter::handleManagementFrame(): '" << (const char*) manage->managementType() << "' - please handle me!" << oendl; 
 }
 
 
 void Wellenreiter::handleManagementFrameProbeRequest( OPacket* p, OWaveLanManagementPacket* request )
 {
     OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) );
@@ -179,20 +171,20 @@ void Wellenreiter::handleManagementFrameProbeRequest( OPacket* p, OWaveLanManage
     OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) );
 
     GpsLocation loc( -111, -111 );
     if ( configwindow->enableGPS->isChecked() )
     {
         // TODO: add check if GPS is working!?
-        qDebug( "Wellenreiter::gathering GPS data..." );
+        odebug << "Wellenreiter::gathering GPS data..." << oendl; 
         loc = gps->position();
-        qDebug( "Wellenreiter::GPS data received is ( %f , %f ) - dms string = '%s'", loc.latitude(), loc.longitude(), loc.dmsPosition().latin1() );
+        odebug << "Wellenreiter::GPS data received is ( " << loc.latitude() << " , " << loc.longitude() << " ) - dms string = '" << loc.dmsPosition().latin1() << "'" << oendl; 
     }
 
     if ( essid.length() )
         netView()->addNewItem( "adhoc", essid, header->macAddress2(), false /* should check FrameControl field */, -1, 0, loc, true /* only probed */ );
-    qDebug( "Wellenreiter::invalid frame [possibly noise] detected!" );
+    odebug << "Wellenreiter::invalid frame [possibly noise] detected!" << oendl; 
 }
 
 
 void Wellenreiter::handleManagementFrameProbeResponse( OPacket* p, OWaveLanManagementPacket* response )
 {
 }
@@ -208,13 +200,13 @@ void Wellenreiter::handleManagementFrameBeacon( OPacket* p, OWaveLanManagementPa
     else if ( beacon->canESS() )
     {
         type = "managed";
     }
     else
     {
-        qWarning( "Wellenreiter::invalid frame [possibly noise] detected!" );
+        owarn << "Wellenreiter::invalid frame [possibly noise] detected!" << oendl; 
         return;
     }
 
     OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) );
     QString essid = ssid ? ssid->ID( true /* decloak */ ) : QString("<unknown>");
     OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) );
@@ -223,15 +215,15 @@ void Wellenreiter::handleManagementFrameBeacon( OPacket* p, OWaveLanManagementPa
     OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) );
 
     GpsLocation loc( -111, -111 );
     if ( configwindow->enableGPS->isChecked() )
     {
         // TODO: add check if GPS is working!?
-        qDebug( "Wellenreiter::gathering GPS data..." );
+        odebug << "Wellenreiter::gathering GPS data..." << oendl; 
         loc = gps->position();
-        qDebug( "Wellenreiter::GPS data received is ( %f , %f ) - dms string = '%s'", loc.latitude(), loc.longitude(), loc.dmsPosition().latin1() );
+        odebug << "Wellenreiter::GPS data received is ( " << loc.latitude() << " , " << loc.longitude() << " ) - dms string = '" << loc.dmsPosition().latin1() << "'" << oendl; 
     }
 
     netView()->addNewItem( type, essid, header->macAddress2(), beacon->canPrivacy(), channel, 0, loc );
 
     // update graph window
     if ( ds )
@@ -252,13 +244,13 @@ void Wellenreiter::handleControlFrame( OPacket* p, OWaveLanControlPacket* contro
     if ( control->controlType() == "Acknowledge" )
     {
         netView()->addNewItem( "adhoc", "<unknown>", header->macAddress1(), false, -1, 0, GpsLocation( -111, -111 ) );
     }
     else
     {
-        qDebug( "Wellenreiter::handleControlFrame - please handle %s in a future version! :D", (const char*) control->controlType()  );
+        odebug << "Wellenreiter::handleControlFrame - please handle " << (const char*) control->controlType() << " in a future version! :D" << oendl; 
     }
 }
 
 
 void Wellenreiter::handleWlanData( OPacket* p, OWaveLanDataPacket* data, OMacAddress& from, OMacAddress& to )
 {
@@ -301,13 +293,13 @@ void Wellenreiter::handleEthernetData( OPacket* p, OEthernetPacket* data, OMacAd
 
 void Wellenreiter::handleARPData( OPacket* p, OARPPacket*, OMacAddress& source, OMacAddress& dest )
 {
     OARPPacket* arp = (OARPPacket*) p->child( "ARP" );
     if ( arp )
     {
-        qDebug( "Received ARP traffic (type '%s'): ", (const char*) arp->type() );
+        odebug << "Received ARP traffic (type '" << (const char*) arp->type() << "'): " << oendl; 
         if ( arp->type() == "REQUEST" )
         {
             netView()->identify( arp->senderMacAddress(), arp->senderIPV4Address().toString() );
         }
         else if ( arp->type() == "REPLY" )
         {
@@ -322,22 +314,22 @@ void Wellenreiter::handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& source,
 {
     //TODO: Implement more IP based protocols
 
     ODHCPPacket* dhcp = (ODHCPPacket*) p->child( "DHCP" );
     if ( dhcp )
     {
-        qDebug( "Received DHCP '%s' packet", (const char*) dhcp->type() );
+        odebug << "Received DHCP '" << (const char*) dhcp->type() << "' packet" << oendl; 
         if ( dhcp->type() == "OFFER" )
         {
-            qDebug( "DHCP: '%s' ('%s') seems to be a DHCP server.", (const char*) source.toString(), (const char*) dhcp->serverAddress().toString() );
+            odebug << "DHCP: '" << (const char*) source.toString() << "' ('" << (const char*) dhcp->serverAddress().toString() << "') seems to be a DHCP server." << oendl; 
             netView()->identify( source, dhcp->serverAddress().toString() );
             netView()->addService( "DHCP", source, dhcp->serverAddress().toString() );
         }
         else if ( dhcp->type() == "ACK" )
         {
-            qDebug( "DHCP: '%s' ('%s') accepted the offered DHCP address.", (const char*) dhcp->clientMacAddress().toString(), (const char*) dhcp->yourAddress().toString() );
+            odebug << "DHCP: '" << (const char*) dhcp->clientMacAddress().toString() << "' ('" << (const char*) dhcp->yourAddress().toString() << "') accepted the offered DHCP address." << oendl; 
             netView()->identify( dhcp->clientMacAddress(), dhcp->yourAddress().toString() );
         }
     }
 }
 
 
@@ -365,22 +357,22 @@ bool Wellenreiter::checkDumpPacket( OPacket* p )
     while ( (o = it.current()) != 0 )
     {
         QString name = it.current()->name();
         if ( configwindow->capturePackets->isProtocolChecked( name ) )
         {
             QString action = configwindow->capturePackets->protocolAction( name );
-            qDebug( "capturePackets-action for '%s' seems to be '%s'", (const char*) name, (const char*) action );
+            odebug << "capturePackets-action for '" << (const char*) name << "' seems to be '" << (const char*) action << "'" << oendl; 
             if ( action == "Discard" )
             {
                 logwindow->log( QString().sprintf( "(i) dump-discarding of '%s' packet requested.", (const char*) name ) );
                 return false;
             }
         }
         else
         {
-            qDebug( "protocol '%s' not checked in capturePackets.", (const char*) name );
+            odebug << "protocol '" << (const char*) name << "' not checked in capturePackets." << oendl; 
         }
     ++it;
     }
     return true;
 }
 
@@ -548,13 +540,13 @@ void Wellenreiter::startClicked()
     {
         case DEVTYPE_CISCO: iface->setMonitoring( new OCiscoMonitoringInterface( iface, usePrism ) ); break;
         case DEVTYPE_WLAN_NG: iface->setMonitoring( new OWlanNGMonitoringInterface( iface, usePrism ) ); break;
         case DEVTYPE_HOSTAP: iface->setMonitoring( new OHostAPMonitoringInterface( iface, usePrism ) ); break;
         case DEVTYPE_ORINOCO: iface->setMonitoring( new OOrinocoMonitoringInterface( iface, usePrism ) ); break;
         case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", tr( "Bring your device into\nmonitor mode now." ) ); break;
-        case DEVTYPE_FILE: qDebug( "Wellenreiter: Capturing from file '%s'", (const char*) interface ); break;
+        case DEVTYPE_FILE: odebug << "Wellenreiter: Capturing from file '" << (const char*) interface << "'" << oendl;  break;
         default: assert( 0 ); // shouldn't reach this
     }
 
     // switch device into monitor mode
     if ( cardtype < DEVTYPE_FILE )
     {
@@ -569,13 +561,13 @@ void Wellenreiter::startClicked()
         }
     }
 
     // open GPS device
     if ( configwindow->enableGPS->isChecked() )
     {
-        qDebug( "Wellenreiter:GPS enabled @ %s:%d", (const char*) configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() );
+        odebug << "Wellenreiter:GPS enabled @ " << (const char*) configwindow->gpsdHost->currentText() << ":" << configwindow->gpsdPort->value() << "" << oendl; 
         gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() );
     }
 
     // open pcap and start sniffing
 
     if ( configwindow->writeCaptureFile->isChecked() ) // write to a user specified capture file?
@@ -593,13 +585,13 @@ void Wellenreiter::startClicked()
 
     if ( cardtype != DEVTYPE_FILE )
         pcap->open( interface );
     else
         pcap->open( QFile( interface ) );
 
-    qDebug( "Wellenreiter:: dumping to %s", (const char*) dumpname );
+    odebug << "Wellenreiter:: dumping to " << (const char*) dumpname << "" << oendl; 
     pcap->openDumpFile( dumpname );
 
     if ( !pcap->isOpen() )
     {
         QMessageBox::warning( this, "Wellenreiter II", tr( "Can't open packet capturer for\n'%1':\n" ).arg(
                               cardtype == DEVTYPE_FILE ? (const char*) interface : iface->name() ) + QString(strerror( errno ) ));
@@ -649,13 +641,13 @@ void Wellenreiter::startClicked()
     }   
 }
 
 
 void Wellenreiter::timerEvent( QTimerEvent* )
 {
-    qDebug( "Wellenreiter::timerEvent()" );
+    odebug << "Wellenreiter::timerEvent()" << oendl; 
     OPacket* p = pcap->next();
     if ( !p ) // no more packets available
     {
         stopClicked();
     }
     else
@@ -712,21 +704,21 @@ void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int ch
         (const char*) essid,
         channel,
         (const char*) macaddr );
 
     QCopEnvelope msg( "QPE/Application/networksettings", "wlan(QString,QString,QString)" );
     int count = 3;
-    qDebug("sending %d messages",count);
+    odebug << "sending " << count << " messages" << oendl; 
     msg << QString("count") << QString::number(count);
-    qDebug("msg >%s< Mode >%s<", iface->name(),type.latin1() );
+    odebug << "msg >" << iface->name() << "< Mode >" << type.latin1() << "<" << oendl; 
     msg << QString(iface->name()) << QString("Mode") << type;
-    qDebug("msg >%s< essid >%s<", iface->name(),essid.latin1());
+    odebug << "msg >" << iface->name() << "< essid >" << essid.latin1() << "<" << oendl; 
     msg << QString(iface->name()) << QString("ESSID") << essid;
-    qDebug("msg >%s< channel >%d<", iface->name(),channel);
+    odebug << "msg >" << iface->name() << "< channel >" << channel << "<" << oendl; 
     msg << QString(iface->name()) << QString("Channel") << channel;
-//    qDebug("msg >%s< mac >%s<", iface->name(),macaddr);
+//    odebug << "msg >" << iface->name() << "< mac >" << macaddr << "<" << oendl; 
 //    msg << QString(iface->name()) << QString("MacAddr") << macaddr;
     #else
     QMessageBox::warning( this, tr( "Can't do that!" ), tr( "Function only available on Embedded build" ) );
     #endif
 
 }