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
@@ -87,22 +87,24 @@ public slots:
   void chooseMethod(int method)
   {
     m = method;
     qDebug( "choosing method: %d", method );
     OConfig* g = OGlobal::config();
     g->setGroup( "General" );
     g->writeEntry( "debugMode", m );
     e->setText( OGlobalSettings::debugOutput() );
+    g->write();
   }
   void updateDebugOutput()
   {
     OConfig* g = OGlobal::config();
     g->setGroup( "General" );
     g->writeEntry( "debugOutput"+QString::number(OGlobalSettings::debugMode()), e->text() );
+    g->write();
   }
   void emitInfoOutput()
   {
     odebug << "This is a debug message" << oendl;
   }
   void emitWarningOutput()
   {
     owarn << "This is a warning message" << oendl;
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
@@ -26,17 +26,17 @@ class Station
 QDict<Station> stations;
 
 //======================== Application class ===============================
 
 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 )
   {
 
     ONetwork* net = ONetwork::instance();
 
     if ( argc < 3 )
     {
         printf( "Usage: ./%s <interface> <driver> <interval>\n", argv[0] );
         printf( "\n" );
@@ -51,19 +51,19 @@ public:
                                                     (const char*) it.current()->macAddress().toString(),
                                                     (const char*) it.current()->ipV4Address() );
             }
             ++it;
         }
     exit( -1 );
     }
 
-    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" );
 
     QString interface( argv[1] );
     QString driver( argv[2] );
 
     printf( "Trying to use '%s' as %s-controlled device...\n", (const char*) interface, (const char*) driver );
 
     // sanity checks before downcasting
@@ -100,24 +100,30 @@ public:
     }
     else
         printf( "Interface status is already promisc - good.\n" );
 
     // connect a monitoring strategy to the interface
     if ( driver == "orinoco" )
         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" );
         exit( -1 );
     }
 
     // enable monitoring mode
     printf( "Enabling monitor mode...\n" );
-    //wiface->setMonitorMode( true );
+    wiface->setMode( "monitor" );
 
     // open a packet capturer
     cap = new OPacketCapturer();
     cap->open( interface );
     if ( !cap->isOpen() )
     {
         printf( "Unable to open libpcap (%s). Exiting.\n", strerror( errno ) );
         exit( -1 );
@@ -126,22 +132,30 @@ public:
     // set capturer to non-blocking mode
     cap->setBlocking( false );
 
     // start channel hopper
     //wiface->setChannelHopping( 1000 );
 
     // connect
     connect( cap, SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) );
+    // timer
+    startTimer( 1000 );
 
   }
 
   ~Wellenreiter() {};
 
 public slots:
+  virtual void timerEvent(QTimerEvent* e)
+  {
+    wiface->setChannel( channel++ );
+    if ( channel == 14 ) channel = 1;
+  }
+
   void receivePacket(OPacket* p)
   {
     if (!p)
     {
         printf( "(empty packet received)\n" );
         return;
     }
 
@@ -198,16 +212,17 @@ public slots:
                 (const char*) wlan->macAddress3().toString(true) );
         }
         return;
     }
   }
 private:
   OPacketCapturer* cap;
   OWirelessNetworkInterface* wiface;
+  int channel;
 };
 
 
 int main( int argc, char** argv )
 {
     Wellenreiter w( argc, argv );
     w.exec();
     return 0;
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
@@ -1,13 +1,13 @@
 TEMPLATE        = app
 CONFIG          = qt warn_on debug
 HEADERS         =
 SOURCES         = miniwellenreiter.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 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
@@ -105,25 +105,26 @@ int main( int argc, char** argv )
             iface->setMacAddress( addr );
             iface->setUp( true );
             qDebug( "DEMO: MAC Address now is '%s'", (const char*) iface->macAddress().toString() );
 
             */
 
             // monitor test
 
-            /*
+            
 
             qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() );
             iface->setMode( "monitor" );
             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 );
             qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() );
 
             /*iface->setMode( "adhoc" );
             sleep( 1 );
             qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() );
             iface->setMode( "managed" );
diff --git a/libopie2/libopie2.control b/libopie2/libopie2.control
index 6e11cbf..f54efd8 100644
--- a/libopie2/libopie2.control
+++ b/libopie2/libopie2.control
@@ -1,11 +1,11 @@
 Package: libopie2
 Files:
 Priority: optional
 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
@@ -1,11 +1,11 @@
 Package: libopiecore2
 Files: $OPIEDIR/lib/libopiecore2.so.*
 Priority: optional
 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
 Description: Opie library 2.0 CORE
 
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
@@ -34,22 +34,24 @@
 #include <qfont.h>
 #include <qcolor.h>
 
 /* OPIE */
 
 #include <opie2/oconfig.h>
 
 OConfig::OConfig( const QString &name, Domain domain )
-    :OpieConfig( name, domain )
+        :Config( name, domain )
 {
+    qDebug( "OConfig::OConfig()" );
 }
 
 OConfig::~OConfig()
 {
+    qDebug( "OConfig::~OConfig()" );
 }
 
 QColor OConfig::readColorEntry( const QString& key, const QColor* pDefault ) const
 {
   QColor aRetColor;
   int nRed = 0, nGreen = 0, nBlue = 0;
 
   QString aValue = readEntry( key );
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
@@ -30,27 +30,27 @@
 */
 
 #ifndef OCONFIG_H
 #define OCONFIG_H
 
 //FIXME: Implement for X11 or reuse libqpe/Config there also?
 //FIXME: Or rather use QSettings also for libqpe?
 
-#include "opieconfig.h"
+#include <qpe/config.h>
 
 class QColor;
 class QFont;
 
 /**
   * A Configuration class based on the Qtopia @ref Config class
   * featuring additional handling of color and font entries
   */
 
-class OConfig : public OpieConfig
+class OConfig : public Config
 {
   public:
     /**
      * Constructs a OConfig object with a @a name.
      */
     OConfig( const QString &name, Domain domain = User );
     /**
      * Destructs the OConfig object.
@@ -58,17 +58,17 @@ class OConfig : public OpieConfig
      * Writes back any dirty configuration entries, and destroys
      * dynamically created objects.
      */
     virtual ~OConfig();
     /**
      * @returns the name of the current group.
      * 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.
      */
     QColor readColorEntry( const QString& key, const QColor* pDefault ) const;
     /**
      * @returns a @ref QFont value or a @a default value if the key is not found.
      */
     QFont readFontEntry( const QString& key, const QFont* pDefault ) const;
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
@@ -1,14 +1,13 @@
 /*
                              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.
            .>+-=
  _;:,     .>    :=|.         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,
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
@@ -25,12 +25,19 @@
     --        :-=`           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 <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,12 +1,11 @@
 /*
                              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.
            .>+-=
  _;:,     .>    :=|.         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,
@@ -26,24 +25,25 @@
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #ifndef OGLOBAL_H
 #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;
 };
 
 #endif // OGLOBAL_H
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
@@ -33,16 +33,17 @@
 /* OPIE */
 
 #include <opie2/oglobalsettings.h>
 #include <opie2/oconfig.h>
 #include <opie2/oglobal.h>
 
 /* QT */
 
+#include <qobject.h>
 #include <qdir.h>
 #include <qpixmap.h>
 #include <qfontinfo.h>
 
 /* UNIX */
 
 #include <stdlib.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
@@ -20,17 +20,17 @@ SOURCES     = oapplication.cpp          \
               ocompletionbase.cpp       \
               ocompletion.cpp           \
               odebug.cpp                \
               oglobal.cpp               \
               oglobalsettings.cpp      
               
 INTERFACES  =
 TARGET      = opiecore2
-VERSION     = 1.8.1
+VERSION     = 1.8.2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 MOC_DIR     = moc
 OBJECTS_DIR = obj
 
 
 !contains( platform, x11 ) {
   LIBS        = -lqpe
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
@@ -1,11 +1,11 @@
 Package: libopiedb2
 Files: $OPIEDIR/lib/libopiedb2.so*
 Priority: optional
 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
@@ -17,17 +17,17 @@ SOURCES     = osqlbackend.cpp    \
                 osqlmanager.cpp  \
                 osqlquery.cpp    \
                 osqlresult.cpp   \
                 osqltable.cpp    \
                 osqlbackendmanager.cpp \
                 osqlitedriver.cpp
 INTERFACES  =
 TARGET      = opiedb2
-VERSION     = 1.8.1
+VERSION     = 1.8.2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 
 MOC_DIR     = moc
 OBJECTS_DIR = obj
 
 LIBS += -lsqlite -lqpe
 
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
@@ -1,11 +1,11 @@
 Package: libopiemm2
 Files: $OPIEDIR/lib/libopiemm2.so.*
 Priority: optional
 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
@@ -1,16 +1,16 @@
 TEMPLATE    = lib
 CONFIG      += qt warn_on debug
 DESTDIR     = $(OPIEDIR)/lib
 HEADERS     = osoundsystem.h
 SOURCES     = osoundsystem.cpp
 INTERFACES  =
 TARGET      = opiemm2
-VERSION     = 1.8.1
+VERSION     = 1.8.2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        +=
 MOC_DIR     = moc
 OBJECTS_DIR = obj
 
 
 !contains( platform, x11 ) {
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
@@ -192,9 +192,10 @@ struct dhcp_packet {
         #define FQDN_ENCODED            3
         #define FQDN_RCODE1             4
         #define FQDN_RCODE2             5
         #define FQDN_HOSTNAME           6
         #define FQDN_DOMAINNAME                 7
         #define FQDN_FQDN               8
         #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
@@ -1,11 +1,11 @@
 Package: libopienet2
 Files: $OPIEDIR/lib/libopienet2.so.* $OPIEDIR/etc/manufacturers
 Priority: optional
 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
@@ -1,18 +1,20 @@
 
 /*
  * debug value mapper - generated by regen.py - (C) Michael 'Mickey' Lauer <mickey@vanille.de>
  */
 
+#include <opie2/odebug.h>
+
 #include "odebugmapper.h"
 
 DebugMapper::DebugMapper()
 {
-    qDebug( "DebugMapper::DebugMapper()" );
+    odebug << "DebugMapper::DebugMapper()" << oendl;
 
 
     _map.insert( 0x8902, new QString("SIOCSPGRP") );
     _map.insert( 0x8904, new QString("SIOCGPGRP") );
     _map.insert( 0x8905, new QString("SIOCATMARK") );
     _map.insert( 0x8906, new QString("SIOCGSTAMP") );
     _map.insert( 0x890B, new QString("SIOCADDRT") );
     _map.insert( 0x890C, new QString("SIOCDELRT") );
@@ -186,27 +188,27 @@ DebugMapper::DebugMapper()
     _map.insert( 0x89F0, new QString("SIOCDEVPRIVATE") );
     _map.insert( 0x89E0, new QString("SIOCPROTOPRIVATE") );
 
 };
 
 
 DebugMapper::~DebugMapper()
 {
-    qDebug( "DebugMapper::~DebugMapper()" );
+    odebug << "DebugMapper::~DebugMapper()" << oendl;
 }
 
 
 const QString& DebugMapper::map( int value ) const
 {
     QString* result = _map[ value ];
 
     if ( !result )
     {
-        qDebug( "DebugMapper::map() - value not found." );
+        owarn << "DebugMapper::map() - value " << value << " is not found." << oendl;
         return QString::null;
     }
     else
     {
         return *result;
     }
 }
 
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,67 +1,85 @@
-/**********************************************************************
-** 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>
 #include <qfile.h>
 #include <qtextstream.h>
 
 OManufacturerDB* OManufacturerDB::_instance = 0;
 
 OManufacturerDB* OManufacturerDB::instance()
 {
     if ( !OManufacturerDB::_instance )
     {
-        qDebug( "OManufacturerDB::instance(): creating OManufacturerDB..." );
+        odebug << "OManufacturerDB::instance(): creating OManufacturerDB..." << oendl;
        _instance = new OManufacturerDB();
     }
     return _instance;
 }
 
 
 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;
         }
     }
 
     QFile file( filename );
     bool hasFile = file.open( IO_ReadOnly );
     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;
         QString manu;
         QString extManu;
         while (!s.atEnd())
         {
             s >> addr;
             if ( !addr ) // read nothing!?
@@ -76,28 +94,23 @@ OManufacturerDB::OManufacturerDB()
             s.skipWhiteSpace();
             s >> manu;
             s.skipWhiteSpace();
             s >> extManu;
             if ( extManu[0] == '#' ) // we have an extended manufacturer
             {
                 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 );
-
         }
     }
 
 }
 
 
 OManufacturerDB::~OManufacturerDB()
 {
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,22 +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.
+
+*/
 
 #ifndef OMANUFACTURERDB_H
 #define OMANUFACTURERDB_H
 
 #include <qmap.h>
 
 /**
  * @brief A Ethernet card vendor database.
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
@@ -1,12 +1,12 @@
 /*
                              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.
            .>+-=
  _;:,     .>    :=|.         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,
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,14 +1,11 @@
 /*
                              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.
            .>+-=
  _;:,     .>    :=|.         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,
@@ -945,16 +942,17 @@ OStationList* OWirelessNetworkInterface::scanNetwork()
                 case IWEVREGISTERED: qDebug( "IWEVREGISTERED" ); break; /* Discovered a new node (AP mode) */
                 case IWEVEXPIRED: qDebug( "IWEVEXPIRED" ); break;       /* Expired a node (AP mode) */
                 default: qDebug( "unhandled event" );
             }
 
             offset += we->len;
             we = (struct iw_event*) &buffer[offset];
         }
+        return stations;
 
         return stations;
 
     }
     else
     {
         qDebug( " - no results (timeout) :(" );
         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,14 +1,11 @@
 /*
                              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.
            .>+-=
  _;:,     .>    :=|.         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,
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,14 +1,11 @@
 /*
                              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.
            .>+-=
  _;:,     .>    :=|.         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,
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,14 +1,11 @@
 /*
                              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.
            .>+-=
  _;:,     .>    :=|.         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,
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
@@ -14,17 +14,17 @@ HEADERS     = 802_11_user.h       \
 SOURCES     = odebugmapper.cpp       \
               omanufacturerdb.cpp \
               onetutils.cpp       \
               onetwork.cpp        \
               opcap.cpp           \
               ostation.cpp
 INTERFACES  =
 TARGET      = opienet2
-VERSION     = 1.8.1
+VERSION     = 1.8.2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lpcap
 
 
 !contains( platform, x11 ) {
   include ( $(OPIEDIR)/include.pro )
 }
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,12 +1,11 @@
 /*
                              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.
            .>+-=
  _;:,     .>    :=|.         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,
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,12 +1,11 @@
 /*
                              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.
            .>+-=
  _;:,     .>    :=|.         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,
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
@@ -1,13 +1,13 @@
 /*
  * This file has been generated by doing
  * 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>
  */
 
         #define UDP_PORT_AODV654
 #define UDP_PORT_LENGTH     2
 #define UDP_PORT_OFFSET     PARAMETER_VALUE_OFFSET
 #define UDP_PORT_RAS1 1718
 #define UDP_PORT_RAS2 1719
         #define UDP_PORT_CPHA8116
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
@@ -1,11 +1,11 @@
 Package: libopiepim2
 Files: $OPIEDIR/lib/libopiepim2.so.*
 Priority: optional
 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
@@ -1,17 +1,17 @@
 TEMPLATE    = lib
 CONFIG      += qt warn_on debug
 DESTDIR     = $(OPIEDIR)/lib
 HEADERS     = 
               
 SOURCES     =
 INTERFACES  =
 TARGET      = opiepim2
-VERSION     = 1.8.1
+VERSION     = 1.8.2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 
 MOC_DIR     = moc
 OBJECTS_DIR = obj
 
 
 !contains( platform, x11 ) {
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
@@ -1,11 +1,11 @@
 Package: libopieui2
 Files: $OPIEDIR/lib/libopieui2.so.*
 Priority: optional
 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
@@ -41,17 +41,17 @@ SOURCES     = ocompletionbox.cpp     \
               opiemenubar.cpp        \
               oresource.cpp          \
               otoolbar.cpp           \
               oseparator.cpp         #\
 #              otaskbarapplet.cpp
 
 INTERFACES  =
 TARGET      = opieui2
-VERSION     = 1.8.1
+VERSION     = 1.8.2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lopiecore2
 MOC_DIR     = moc
 OBJECTS_DIR = obj
 
 
 !contains( platform, x11 ) {
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
@@ -45,21 +45,23 @@ class DebugMapper
 #endif
 """
 
 print >>tablecfile,"""
 /*
  * debug value mapper - generated by regen.py - (C) Michael 'Mickey' Lauer <mickey@vanille.de>
  */
 
+#include <opie2/odebug.h>
+
 #include "%s"
 
 DebugMapper::DebugMapper()
 {
-    qDebug( "DebugMapper::DebugMapper()" );
+    odebug << "DebugMapper::DebugMapper()" << oendl;
 
 """ % (tablehfile.name)
 
 for line in result:
     l = line.split()
     if not l[0].startswith( "#define" ) or not l[2].startswith( "0x" ):
         print >>sys.stderr, "can't parse line: %s" % l
         continue
@@ -67,27 +69,27 @@ for line in result:
 
 
 print >>tablecfile,"""
 };
 
 
 DebugMapper::~DebugMapper()
 {
-    qDebug( "DebugMapper::~DebugMapper()" );
+    odebug << "DebugMapper::~DebugMapper()" << oendl;
 }
 
 
 const QString& DebugMapper::map( int value ) const
 {
     QString* result = _map[ value ];
 
     if ( !result )
     {
-        qDebug( "DebugMapper::map() - value not found." );
+        owarn << "DebugMapper::map() - value " << value << " is not found." << oendl;
         return QString::null;
     }
     else
     {
         return *result;
     }
 }