slowly start to refactor & cleanup libopie2 before merging it with libopie1

36 files changed, 162 insertions, 115 deletions

diff --git a/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp b/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp
index 74886fa..e8bf04f 100644
--- a/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp
+++ b/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp
@@ -93,4 +93,5 @@ public slots:
     g->writeEntry( "debugMode", m );
     e->setText( OGlobalSettings::debugOutput() );
+    g->write();
   }
   void updateDebugOutput()
@@ -99,4 +100,5 @@ public slots:
     g->setGroup( "General" );
     g->writeEntry( "debugOutput"+QString::number(OGlobalSettings::debugMode()), e->text() );
+    g->write();
   }
   void emitInfoOutput()
diff --git a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp
index c49daa0..eb2e8e8 100644
--- a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp
+++ b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp
@@ -32,5 +32,5 @@ class Wellenreiter : public QApplication
 Q_OBJECT
 public:
-  Wellenreiter( int argc, char** argv ) : QApplication( argc, argv )
+  Wellenreiter( int argc, char** argv ) : QApplication( argc, argv ), channel( 1 )
   {
 
@@ -57,7 +57,7 @@ public:
     }
 
-    printf( "****************************************************\n" );
-    printf( "* Wellenreiter mini edition 1.0 (C) 2003 M-M-M *\n" );
-    printf( "****************************************************\n" );
+    printf( "*******************************************************************\n" );
+    printf( "* Wellenreiter mini edition 1.0.0 (C) 2003 Michael 'Mickey' Lauer *\n" );
+    printf( "*******************************************************************\n" );
     printf( "\n\n" );
 
@@ -106,4 +106,10 @@ public:
         new OOrinocoMonitoringInterface( wiface, false );
     else
+    if ( driver == "hostap" )
+        new OHostAPMonitoringInterface( wiface, false );
+    else
+    if ( driver == "wlan-ng" )
+        new OWlanNGMonitoringInterface( wiface, false );
+    else
     {
         printf( "Unknown driver. Exiting\n" );
@@ -113,5 +119,5 @@ public:
     // enable monitoring mode
     printf( "Enabling monitor mode...\n" );
-    //wiface->setMonitorMode( true );
+    wiface->setMode( "monitor" );
 
     // open a packet capturer
@@ -132,4 +138,6 @@ public:
     // connect
     connect( cap, SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) );
+    // timer
+    startTimer( 1000 );
 
   }
@@ -138,4 +146,10 @@ public:
 
 public slots:
+  virtual void timerEvent(QTimerEvent* e)
+  {
+    wiface->setChannel( channel++ );
+    if ( channel == 14 ) channel = 1;
+  }
+
   void receivePacket(OPacket* p)
   {
@@ -204,4 +218,5 @@ private:
   OPacketCapturer* cap;
   OWirelessNetworkInterface* wiface;
+  int channel;
 };
 
diff --git a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro
index 7ce535c..b2c5c14 100644
--- a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro
+++ b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro
@@ -7,6 +7,6 @@ DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lopiecore2 -lopienet2
 TARGET          = miniwellenreiter
-MOC_DIR     = moc
-OBJECTS_DIR = obj
+MOC_DIR         = moc
+OBJECTS_DIR     = obj
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
index 06b8b19..4763316 100644
--- a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
+++ b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp
@@ -111,5 +111,5 @@ int main( int argc, char** argv )
             // monitor test
 
-            /*
+            
 
             qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() );
@@ -117,7 +117,8 @@ int main( int argc, char** argv )
             qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() );
 
-            sleep( 1 ); */
+            sleep( 1 );
 
-            iface->setMode( "master" );
+            iface->setChannel( 1 );
+            iface->setMode( "managed" );
 
             //sleep( 1 );
diff --git a/libopie2/libopie2.control b/libopie2/libopie2.control
index 6e11cbf..f54efd8 100644
--- a/libopie2/libopie2.control
+++ b/libopie2/libopie2.control
@@ -5,6 +5,6 @@ Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Version: 1.8.1-$SUB_VERSION.2
-Depends: libopiecore2 (1.8.1), libopiedb2 (1.8.1), libopiemm2 (1.8.1), libopienet2 (1.8.1), libopiepim2 (1.8.1), libopieui2 (1.8.1)
+Version: 1.8.2-$SUB_VERSION.2
+Depends: libopiecore2 (1.8.2), libopiedb2 (1.8.2), libopiemm2 (1.8.2), libopienet2 (1.8.2), libopiepim2 (1.8.2), libopieui2 (1.8.2)
 Provides: libopie2
 Description: Opie library 2.0
diff --git a/libopie2/opiecore/libopiecore2.control b/libopie2/opiecore/libopiecore2.control
index 7dec1b9..956d24f 100644
--- a/libopie2/opiecore/libopiecore2.control
+++ b/libopie2/opiecore/libopiecore2.control
@@ -5,5 +5,5 @@ Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Version: 1.8.1-$SUB_VERSION.2
+Version: 1.8.2-$SUB_VERSION.2
 Depends: libqpe1
 Provides: libopiecore2
diff --git a/libopie2/opiecore/oconfig.cpp b/libopie2/opiecore/oconfig.cpp
index dc4d0b3..fb5eabb 100644
--- a/libopie2/opiecore/oconfig.cpp
+++ b/libopie2/opiecore/oconfig.cpp
@@ -40,10 +40,12 @@
 
 OConfig::OConfig( const QString &name, Domain domain )
-    :OpieConfig( name, domain )
+        :Config( name, domain )
 {
+    qDebug( "OConfig::OConfig()" );
 }
 
 OConfig::~OConfig()
 {
+    qDebug( "OConfig::~OConfig()" );
 }
 
diff --git a/libopie2/opiecore/oconfig.h b/libopie2/opiecore/oconfig.h
index 75aa170..444d280 100644
--- a/libopie2/opiecore/oconfig.h
+++ b/libopie2/opiecore/oconfig.h
@@ -36,5 +36,5 @@
 //FIXME: Or rather use QSettings also for libqpe?
 
-#include "opieconfig.h"
+#include <qpe/config.h>
 
 class QColor;
@@ -46,5 +46,5 @@ class QFont;
   */
 
-class OConfig : public OpieConfig
+class OConfig : public Config
 {
   public:
@@ -64,5 +64,5 @@ class OConfig : public OpieConfig
      * The current group is used for searching keys and accessing entries.
      */
-    const QString& group() { return OpieConfig::group(); };
+    const QString& group() { return git.key(); };
     /**
      * @returns a @ref QColor entry or a @a default value if the key is not found.
diff --git a/libopie2/opiecore/odebug.cpp b/libopie2/opiecore/odebug.cpp
index b2a37bc..4505ce7 100644
--- a/libopie2/opiecore/odebug.cpp
+++ b/libopie2/opiecore/odebug.cpp
@@ -2,7 +2,6 @@
                              This file is part of the Opie Project
                              (C) 2003 Michael 'Mickey' Lauer (mickey@tm.informatik.uni-frankfurt.de)
-                             Inspired by the KDE debug classes, which are
-                             (C) 1997 Matthias Kalle Dalheimer (kalle@kde.org)
                              (C) 2002 Holger Freyther (freyther@kde.org)
+                             (C) 1997 Matthias Kalle Dalheimer (kalle@kde.org)
               =.
             .=l.
diff --git a/libopie2/opiecore/oglobal.cpp b/libopie2/opiecore/oglobal.cpp
index f6071be..ae2fcb6 100644
--- a/libopie2/opiecore/oglobal.cpp
+++ b/libopie2/opiecore/oglobal.cpp
@@ -31,6 +31,13 @@
 #include <opie2/oglobal.h>
 
+OConfig* OGlobal::_config = 0;
+
 OConfig* OGlobal::config()
 {
-    return globalconfig;
+    if ( !OGlobal::_config )
+    {
+        qDebug( "OGlobal::creating global configuration instance." );
+        OGlobal::_config = new OConfig( "global" );
+    }
+    return OGlobal::_config;
 }
diff --git a/libopie2/opiecore/oglobal.h b/libopie2/opiecore/oglobal.h
index 23cedde..2dc4f9e 100644
--- a/libopie2/opiecore/oglobal.h
+++ b/libopie2/opiecore/oglobal.h
@@ -1,6 +1,5 @@
 /*
                              This file is part of the Opie Project
-
-                             Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
+                             Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de>
               =.
             .=l.
@@ -32,17 +31,18 @@
 #define OGLOBAL_H
 
-#include <qpe/global.h>
 #include <opie2/oconfig.h>
 
-static OConfig *globalconfig = new OConfig( "global" );
-
-//FIXME: Is it wise or even necessary to inherit OGlobal from Global?
-// once we totally skip libqpe it should ideally swallow Global -zecke
+//FIXME Is it wise or even necessary to inherit OGlobal from Global?
+//      once we totally skip libqpe it should ideally swallow Global -zecke
+//      You're right. I deleted global as the base class. -mickeyl
 
-class OGlobal : public Global
+class OGlobal
 {
   public:
-    // do we want to put that into OApplication as in KApplication -zecke
+    //FIXME Do we want to put that into OApplication as in KApplication? -zecke
+    //      We already have a per-application config in OApplication
+    //      ( accessed through oApp->config() ), but this one is the global one! -mickeyl
     static OConfig* config();
+    static OConfig* _config;
 };
 
diff --git a/libopie2/opiecore/oglobalsettings.cpp b/libopie2/opiecore/oglobalsettings.cpp
index 1799529..66adbd0 100644
--- a/libopie2/opiecore/oglobalsettings.cpp
+++ b/libopie2/opiecore/oglobalsettings.cpp
@@ -39,4 +39,5 @@
 /* QT */
 
+#include <qobject.h>
 #include <qdir.h>
 #include <qpixmap.h>
diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro
index fe5800e..5d630ea 100644
--- a/libopie2/opiecore/opiecore.pro
+++ b/libopie2/opiecore/opiecore.pro
@@ -26,5 +26,5 @@ SOURCES     = oapplication.cpp          \
 INTERFACES  =
 TARGET      = opiecore2
-VERSION     = 1.8.1
+VERSION     = 1.8.2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
diff --git a/libopie2/opiedb/libopiedb2.control b/libopie2/opiedb/libopiedb2.control
index 3fe3820..5500dc8 100644
--- a/libopie2/opiedb/libopiedb2.control
+++ b/libopie2/opiedb/libopiedb2.control
@@ -5,6 +5,6 @@ Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Version: 1.8.1-$SUB_VERSION.2
-Depends: libqpe1, libopiecore2 (1.8.1)
+Version: 1.8.2-$SUB_VERSION.2
+Depends: libqpe1, libopiecore2 (1.8.2)
 Provides: libopiedb2
 Description: Opie library 2.0 DB
diff --git a/libopie2/opiedb/opiedb.pro b/libopie2/opiedb/opiedb.pro
index 6a4e8f1..d869e6f 100644
--- a/libopie2/opiedb/opiedb.pro
+++ b/libopie2/opiedb/opiedb.pro
@@ -23,5 +23,5 @@ SOURCES     = osqlbackend.cpp    \
 INTERFACES  =
 TARGET      = opiedb2
-VERSION     = 1.8.1
+VERSION     = 1.8.2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
diff --git a/libopie2/opiemm/libopiemm2.control b/libopie2/opiemm/libopiemm2.control
index 7fbadef..f528969 100644
--- a/libopie2/opiemm/libopiemm2.control
+++ b/libopie2/opiemm/libopiemm2.control
@@ -5,6 +5,6 @@ Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Version: 1.8.1-$SUB_VERSION.2
-Depends: libqpe1, libopiecore2 (1.8.1)
+Version: 1.8.2-$SUB_VERSION.2
+Depends: libqpe1, libopiecore2 (1.8.2)
 Provides: libopiemm2
 Description: Opie library 2.0 MM
diff --git a/libopie2/opiemm/opiemm.pro b/libopie2/opiemm/opiemm.pro
index d3ce8f7..d5c8238 100644
--- a/libopie2/opiemm/opiemm.pro
+++ b/libopie2/opiemm/opiemm.pro
@@ -6,5 +6,5 @@ SOURCES     = osoundsystem.cpp
 INTERFACES  =
 TARGET      = opiemm2
-VERSION     = 1.8.1
+VERSION     = 1.8.2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
diff --git a/libopie2/opienet/dhcp.h b/libopie2/opienet/dhcp.h
index 3f2f775..368e375 100644
--- a/libopie2/opienet/dhcp.h
+++ b/libopie2/opienet/dhcp.h
@@ -198,3 +198,4 @@ struct dhcp_packet {
         #define FQDN_SUBOPTION_COUNT    8
 
-#endif
\ No newline at end of file
+#endif
+
diff --git a/libopie2/opienet/libopienet2.control b/libopie2/opienet/libopienet2.control
index 65d8464..8eb0704 100644
--- a/libopie2/opienet/libopienet2.control
+++ b/libopie2/opienet/libopienet2.control
@@ -5,6 +5,6 @@ Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Version: 1.8.1-$SUB_VERSION.2
-Depends: libqpe1, libopiecore2 (1.8.1)
+Version: 1.8.2-$SUB_VERSION.2
+Depends: libopiecore2 (1.8.2)
 Provides: libopienet2
 Description: Opie library 2.0 NET
diff --git a/libopie2/opienet/odebugmapper.cpp b/libopie2/opienet/odebugmapper.cpp
index d62b3ba..7e4ab2b 100644
--- a/libopie2/opienet/odebugmapper.cpp
+++ b/libopie2/opienet/odebugmapper.cpp
@@ -4,9 +4,11 @@
  */
 
+#include <opie2/odebug.h>
+
 #include "odebugmapper.h"
 
 DebugMapper::DebugMapper()
 {
-    qDebug( "DebugMapper::DebugMapper()" );
+    odebug << "DebugMapper::DebugMapper()" << oendl;
 
 
@@ -192,5 +194,5 @@ DebugMapper::DebugMapper()
 DebugMapper::~DebugMapper()
 {
-    qDebug( "DebugMapper::~DebugMapper()" );
+    odebug << "DebugMapper::~DebugMapper()" << oendl;
 }
 
@@ -202,5 +204,5 @@ const QString& DebugMapper::map( int value ) const
     if ( !result )
     {
-        qDebug( "DebugMapper::map() - value not found." );
+        owarn << "DebugMapper::map() - value " << value << " is not found." << oendl;
         return QString::null;
     }
diff --git a/libopie2/opienet/omanufacturerdb.cpp b/libopie2/opienet/omanufacturerdb.cpp
index c3c213c..bcce11f 100644
--- a/libopie2/opienet/omanufacturerdb.cpp
+++ b/libopie2/opienet/omanufacturerdb.cpp
@@ -1,19 +1,37 @@
-/**********************************************************************
-** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
-**
-** This file is part of Opie Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-**********************************************************************/
+/*
+                             This file is part of the Opie Project
+                             (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 #include "omanufacturerdb.h"
 
+/* OPIE CORE */
+#include <opie2/odebug.h>
+
 /* QT */
 #include <qstring.h>
@@ -27,5 +45,5 @@ OManufacturerDB* OManufacturerDB::instance()
     if ( !OManufacturerDB::_instance )
     {
-        qDebug( "OManufacturerDB::instance(): creating OManufacturerDB..." );
+        odebug << "OManufacturerDB::instance(): creating OManufacturerDB..." << oendl;
        _instance = new OManufacturerDB();
     }
@@ -37,13 +55,13 @@ OManufacturerDB::OManufacturerDB()
 {
     QString filename( "/etc/manufacturers" );
-    qDebug( "OManufacturerDB: trying to read '%s'...", (const char*) filename );
+    odebug << "OManufacturerDB: trying to read " << filename << oendl;
     if ( !QFile::exists( filename ) )
     {
         filename = "/opt/QtPalmtop/etc/manufacturers";
-        qDebug( "OManufacturerDB: trying to read '%s'...", (const char*) filename );
+        odebug << "OManufacturerDB: trying to read " << filename << oendl;
         if ( !QFile::exists( filename ) )
         {
             filename = "/usr/share/wellenreiter/manufacturers";
-            qDebug( "OManufacturerDB: trying to read '%s'...", (const char*) filename );
+            odebug << "OManufacturerDB: trying to read " << filename << oendl;
         }
     }
@@ -53,9 +71,9 @@ OManufacturerDB::OManufacturerDB()
     if (!hasFile)
     {
-        qWarning( "OManufacturerDB: no valid manufacturer list found.", (const char*) filename );
+        owarn << "OManufacturerDB: no valid manufacturer list found." << oendl;
     }
     else
     {
-        qDebug( "OManufacturerDB: found manufacturer list in '%s'...", (const char*) filename );
+        odebug << "OManufacturerDB: found manufacturer list in " << filename << oendl;
         QTextStream s( &file );
         QString addr;
@@ -82,16 +100,11 @@ OManufacturerDB::OManufacturerDB()
                 s.skipWhiteSpace();
                 extManu = s.readLine();
-                #ifdef DEBUG
-                qDebug( "OManufacturerDB: read '%s' as extended manufacturer string", (const char*) extManu );
-                #endif
+                odebug << "OManufacturerDB: read " << extManu << " as extended manufacturer string" << oendl;
                 manufacturersExt.insert( addr, extManu );
             }
             else
                 s.readLine();
-            #ifdef DEBUG
-            qDebug( "ManufacturerDB: read tuple %s, %s", (const char*) addr, (const char*) manu );
-            #endif
+            odebug << "OManufacturerDB: read tuple " << addr << ", " << manu << oendl;
             manufacturers.insert( addr, manu );
-
         }
     }
diff --git a/libopie2/opienet/omanufacturerdb.h b/libopie2/opienet/omanufacturerdb.h
index 651f624..c2712e5 100644
--- a/libopie2/opienet/omanufacturerdb.h
+++ b/libopie2/opienet/omanufacturerdb.h
@@ -1,16 +1,31 @@
-/**********************************************************************
-** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
-**
-** This file is part of Opie Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-**********************************************************************/
+/*
+                             This file is part of the Opie Project
+                             (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
+                             If not, write to the Free Software Foundation,
+                             Inc., 59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
 
 #ifndef OMANUFACTURERDB_H
diff --git a/libopie2/opienet/onetutils.cpp b/libopie2/opienet/onetutils.cpp
index e3eb327..48cfa43 100644
--- a/libopie2/opienet/onetutils.cpp
+++ b/libopie2/opienet/onetutils.cpp
@@ -2,5 +2,5 @@
                              This file is part of the Opie Project
 
-                             (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
+                             (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de>
               =.
             .=l.
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 95c813f..6a9280f 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -1,8 +1,5 @@
 /*
                              This file is part of the Opie Project
-                             Copyright (C) 2003 by the Wellenreiter team:
-                             Martin J. Muench <mjm@remote-exploit.org>
-                             Max Moser <mmo@remote-exploit.org
-                             Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
+                             Copyright (C) 2003 by Michael 'Mickey' Lauer <mickey@Vanille.de>
               =.
             .=l.
@@ -951,4 +948,5 @@ OStationList* OWirelessNetworkInterface::scanNetwork()
             we = (struct iw_event*) &buffer[offset];
         }
+        return stations;
 
         return stations;
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index eb6c86e..bc9e299 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -1,8 +1,5 @@
 /*
                              This file is part of the Opie Project
-                             Copyright (C) 2003 by the Wellenreiter team:
-                             Martin J. Muench <mjm@remote-exploit.org>
-                             Max Moser <mmo@remote-exploit.org
-                             Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
+                             Copyright (C) 2003 by Michael 'Mickey' Lauer <mickey@Vanille.de>
               =.
             .=l.
diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp
index 6331b2d..635224c 100644
--- a/libopie2/opienet/opcap.cpp
+++ b/libopie2/opienet/opcap.cpp
@@ -1,8 +1,5 @@
 /*
                              This file is part of the Opie Project
-                             Copyright (C) 2003 by the Wellenreiter team:
-                             Martin J. Muench <mjm@remote-exploit.org>
-                             Max Moser <mmo@remote-exploit.org
-                             Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
+                             Copyright (C) 2003 by Michael 'Mickey' Lauer <mickey@Vanille.de>
               =.
             .=l.
diff --git a/libopie2/opienet/opcap.h b/libopie2/opienet/opcap.h
index 54b256b..497fd6b 100644
--- a/libopie2/opienet/opcap.h
+++ b/libopie2/opienet/opcap.h
@@ -1,8 +1,5 @@
 /*
                              This file is part of the Opie Project
-                             Copyright (C) 2003 by the Wellenreiter team:
-                             Martin J. Muench <mjm@remote-exploit.org>
-                             Max Moser <mmo@remote-exploit.org
-                             Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
+                             Copyright (C) 2003 by Michael 'Mickey' Lauer <mickey@Vanille.de>
               =.
             .=l.
diff --git a/libopie2/opienet/opienet.pro b/libopie2/opienet/opienet.pro
index 386c2db..2027481 100644
--- a/libopie2/opienet/opienet.pro
+++ b/libopie2/opienet/opienet.pro
@@ -20,5 +20,5 @@ SOURCES     = odebugmapper.cpp       \
 INTERFACES  =
 TARGET      = opienet2
-VERSION     = 1.8.1
+VERSION     = 1.8.2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
diff --git a/libopie2/opienet/ostation.cpp b/libopie2/opienet/ostation.cpp
index ba1e4f6..c363f0c 100644
--- a/libopie2/opienet/ostation.cpp
+++ b/libopie2/opienet/ostation.cpp
@@ -1,6 +1,5 @@
 /*
                              This file is part of the Opie Project
-
-                             (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
+                             Copyright (C) 2003 by Michael 'Mickey' Lauer <mickey@Vanille.de>
               =.
             .=l.
diff --git a/libopie2/opienet/ostation.h b/libopie2/opienet/ostation.h
index a6956c9..1e7366d 100644
--- a/libopie2/opienet/ostation.h
+++ b/libopie2/opienet/ostation.h
@@ -1,6 +1,5 @@
 /*
                              This file is part of the Opie Project
-
-                             (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
+                             Copyright (C) 2003 by Michael 'Mickey' Lauer <mickey@Vanille.de>
               =.
             .=l.
diff --git a/libopie2/opienet/udp_ports.h b/libopie2/opienet/udp_ports.h
index 5e92497..3fb1c85 100644
--- a/libopie2/opienet/udp_ports.h
+++ b/libopie2/opienet/udp_ports.h
@@ -3,5 +3,5 @@
  * find . -name "*"|xargs grep -h '#define UDP_PORT' > udp_ports.h
  * in the root directory of Ethereal 0.9.15. Cudos to the Ethereal Team.
- * -- Michael 'Mickey' Lauer <mickeyl@handhelds.org>
+ * -- Michael 'Mickey' Lauer <mickey@Vanille.de>
  */
 
diff --git a/libopie2/opiepim/libopiepim2.control b/libopie2/opiepim/libopiepim2.control
index 5cfa453..ac8e13c 100644
--- a/libopie2/opiepim/libopiepim2.control
+++ b/libopie2/opiepim/libopiepim2.control
@@ -5,6 +5,6 @@ Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Version: 1.8.1-$SUB_VERSION.2
-Depends: libqpe1, libopiecore2 (1.8.1)
+Version: 1.8.2-$SUB_VERSION.2
+Depends: libqpe1, libopiecore2 (1.8.2)
 Provides: libopiepim2
 Description: Opie library 2.0 PIM
diff --git a/libopie2/opiepim/opiepim.pro b/libopie2/opiepim/opiepim.pro
index cc6ee90..3972c3f 100644
--- a/libopie2/opiepim/opiepim.pro
+++ b/libopie2/opiepim/opiepim.pro
@@ -7,5 +7,5 @@ SOURCES     =
 INTERFACES  =
 TARGET      = opiepim2
-VERSION     = 1.8.1
+VERSION     = 1.8.2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
diff --git a/libopie2/opieui/libopieui2.control b/libopie2/opieui/libopieui2.control
index 6900fd6..71e6358 100644
--- a/libopie2/opieui/libopieui2.control
+++ b/libopie2/opieui/libopieui2.control
@@ -5,6 +5,6 @@ Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Version: 1.8.1-$SUB_VERSION.2
-Depends: libqpe1, libopiecore2 (1.8.1)
+Version: 1.8.2-$SUB_VERSION.2
+Depends: libqpe1, libopiecore2 (1.8.2)
 Provides: libopieui2
 Description: Opie library 2.0 UI
diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro
index 68a5c5f..4c15181 100644
--- a/libopie2/opieui/opieui.pro
+++ b/libopie2/opieui/opieui.pro
@@ -47,5 +47,5 @@ SOURCES     = ocompletionbox.cpp     \
 INTERFACES  =
 TARGET      = opieui2
-VERSION     = 1.8.1
+VERSION     = 1.8.2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
diff --git a/libopie2/tools/regen.py b/libopie2/tools/regen.py
index 9ad5352..3779896 100755
--- a/libopie2/tools/regen.py
+++ b/libopie2/tools/regen.py
@@ -51,9 +51,11 @@ print >>tablecfile,"""
  */
 
+#include <opie2/odebug.h>
+
 #include "%s"
 
 DebugMapper::DebugMapper()
 {
-    qDebug( "DebugMapper::DebugMapper()" );
+    odebug << "DebugMapper::DebugMapper()" << oendl;
 
 """ % (tablehfile.name)
@@ -73,5 +75,5 @@ print >>tablecfile,"""
 DebugMapper::~DebugMapper()
 {
-    qDebug( "DebugMapper::~DebugMapper()" );
+    odebug << "DebugMapper::~DebugMapper()" << oendl;
 }
 
@@ -83,5 +85,5 @@ const QString& DebugMapper::map( int value ) const
     if ( !result )
     {
-        qDebug( "DebugMapper::map() - value not found." );
+        owarn << "DebugMapper::map() - value " << value << " is not found." << oendl;
         return QString::null;
     }