14 files changed, 51 insertions, 19 deletions

diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp
index d3e04ba..ce26420 100644
--- a/libopie2/opiecore/oapplication.cpp
+++ b/libopie2/opiecore/oapplication.cpp
@@ -90,35 +90,35 @@ void OApplication::init()
     {
         qFatal( "OApplication: Can't create more than one OApplication object. Aborting." );
     }
 }
 
 
 void OApplication::setMainWidget( QWidget* widget )
 {
     showMainWidget( widget );
 }
 
 
 void OApplication::showMainWidget( QWidget* widget, bool nomax )
 {
     #ifdef Q_WS_QWS
     QPEApplication::showMainWidget( widget, nomax );
     #else
     QApplication::setMainWidget( widget );
     widget->show();
     #endif
     widget->setCaption( _appname );
 }
 
 
-void OApplication::setTitle( QString title ) const
+void OApplication::setTitle( const QString& title ) const
 {
     if ( mainWidget() )
     {
         if ( !title.isNull() )
             mainWidget()->setCaption( QString(_appname) + QString( " - " ) + title );
         else
             mainWidget()->setCaption( _appname );
     }
 }
 
diff --git a/libopie2/opiecore/oapplication.h b/libopie2/opiecore/oapplication.h
index 4d25202..8326847 100644
--- a/libopie2/opiecore/oapplication.h
+++ b/libopie2/opiecore/oapplication.h
@@ -12,61 +12,65 @@
  - .   .-<_>     .<>         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 OAPPLICATION_H
 #define OAPPLICATION_H
 
 #define oApp OApplication::oApplication()
 
+// the below stuff will fail with moc because moc does not pre process headers
+// This will make usage of signal and slots hard inside QPEApplication -zecke
+
 #ifdef QWS
  #include <qpe/qpeapplication.h>
  #define OApplicationBaseClass QPEApplication
 #else
  #include <qapplication.h>
  #define OApplicationBaseClass QApplication
 #endif
 
 class OApplicationPrivate;
 class OConfig;
 
 class OApplication: public OApplicationBaseClass
 {
+// Q_OBJECT would fail -zecke 
   public:
 
    /**
     * Constructor. Parses command-line arguments and sets the window caption.
     *
     * @param rAppName application name. Will be used for finding the
     * associated message, icon and configuration files
     *
     */
     OApplication( int& argc, char** argv, const QCString& rAppName );
    /**
     * Destructor. Destroys the application object and its children.
     */
     virtual ~OApplication();
 
    /**
     * Returns the current application object.
     *
     * This is similar to the global @ref QApplication pointer qApp. It
     * allows access to the single global OApplication object, since
     * more than one cannot be created in the same application. It
     * saves you the trouble of having to pass the pointer explicitly
     * to every function that may require it.
     *
@@ -93,38 +97,38 @@ class OApplication: public OApplicationBaseClass
    /**
     * Sets the main widget - reimplemented to call showMainWidget()
     * on Qt/Embedded.
     *
     * @param mainWidget the widget to become the main widget
     * @see QWidget object
     */
     virtual void setMainWidget( QWidget *mainWidget );
 
    /**
     * Shows the main widget - reimplemented to call setMainWidget()
     * on platforms other than Qt/Embedded.
     *
     * @param mainWidget the widget to become the main widget
     * @see QWidget object
     */
     virtual void showMainWidget( QWidget* widget, bool nomax = false );
 
    /**
     * Set the application title. The application title will be concatenated
     * to the application name given in the constructor.
     *
     * @param title the title. If not given, resets caption to appname
     */
-    virtual void setTitle( QString title = QString::null ) const;
+    virtual void setTitle( const QString& title = QString::null ) const;
     //virtual void setTitle() const;
 
   protected:
     void init();
 
   private:
     const QCString _appname;
     static OApplication* _instance;
     OConfig* _config;
     OApplicationPrivate* d;
 };
 
 #endif // OAPPLICATION_H
diff --git a/libopie2/opiecore/oglobal.h b/libopie2/opiecore/oglobal.h
index 8345c6a..34f211e 100644
--- a/libopie2/opiecore/oglobal.h
+++ b/libopie2/opiecore/oglobal.h
@@ -16,33 +16,34 @@
      +  .  -:.       =       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 OGLOBAL_H
 #define OGLOBAL_H
 
 #include <qpe/global.h>
 #include <opie2/oconfig.h>
 
 static OConfig globalconfig = 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
 
 class OGlobal : public Global
 {
   public:
-  
+    // do we want to put that into OApplication as in KApplication -zecke
     static OConfig* config();
 };
 
 #endif // OGLOBAL_H
diff --git a/libopie2/opiecore/oglobalsettings.h b/libopie2/opiecore/oglobalsettings.h
index 6481251..d3f357e 100644
--- a/libopie2/opiecore/oglobalsettings.h
+++ b/libopie2/opiecore/oglobalsettings.h
@@ -26,48 +26,49 @@
     --        :-=`           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 OGLOBALSETTINGS_H
 #define OGLOBALSETTINGS_H
 
 #include <qstring.h>
 #include <qcolor.h>
 #include <qfont.h>
 
 #define OPIE_DEFAULT_SINGLECLICK true
 #define OPIE_DEFAULT_INSERTTEAROFFHANDLES true
 #define OPIE_DEFAULT_AUTOSELECTDELAY -1
 #define OPIE_DEFAULT_CHANGECURSOR true
 #define OPIE_DEFAULT_LARGE_CURSOR false
 #define OPIE_DEFAULT_VISUAL_ACTIVATE true
 #define OPIE_DEFAULT_VISUAL_ACTIVATE_SPEED 50
 
 //FIXME: There's still a whole lot of stuff in here which has to be revised
 //FIXME: before public usage... lack of time to do it at once - so it will
 //FIXME: happen step-by-step. ML.
+// we should not habe too much configure options!!!!!! -zecke
 
 /**
  * Access the OPIE global configuration settings.
  *
  */
 class OGlobalSettings
 {
   public:
 
     /**
      * Returns a threshold in pixels for drag & drop operations.
      * As long as the mouse movement has not exceeded this number
      * of pixels in either X or Y direction no drag operation may
      * be started. This prevents spurious drags when the user intended
      * to click on something but moved the mouse a bit while doing so.
      *
      * For this to work you must save the position of the mouse (oldPos)
      * in the @ref QWidget::mousePressEvent().
      * When the position of the mouse (newPos)
      * in a  @ref QWidget::mouseMoveEvent() exceeds this threshold
      * you may start a drag
      * which should originate from oldPos.
      *
      * Example code:
@@ -78,63 +79,65 @@ class OGlobalSettings
      * }
      *
      * void OColorCells::mouseMoveEvent( QMouseEvent *e )
      * {
      *    if( !(e->state() && LeftButton)) return;
      *
      *    int delay = OGlobalSettings::dndEventDelay();
      *    QPoint newPos = e->pos();
      *    if(newPos.x() > mOldPos.x()+delay || newPos.x() < mOldPos.x()-delay ||
      *       newPos.y() > mOldPos.y()+delay || newPos.y() < mOldPos.y()-delay)
      *    {
      *       // Drag color object
      *       int cell = posToCell(mOldPos); // Find color at mOldPos
      *       if ((cell != -1) && colors[cell].isValid())
      *       {
      *          OColorDrag *d = OColorDrag::makeDrag( colors[cell], this);
      *          d->dragCopy();
      *       }
      *    }
      * }
      * </pre>
      *
      */
 
+    // we do not support DND at the momemt -zecke
     static int dndEventDelay();
 
     /**
      * Returns whether OPIE runs in single (default) or double click
      * mode.
      *
      * @return @p true if single click mode, or @p false if double click mode.
      *
      * see @ref http://opie.handhelds.org/documentation/standards/opie/style/mouse/index.html
      **/
     static bool singleClick();
 
     /**
      * Returns whether tear-off handles are inserted in OPopupMenus.
      **/
+    // would clutter the small screen -zecke
     static bool insertTearOffHandle();
 
     /**
      * @return the OPIE setting for "change cursor over icon"
      */
     static bool changeCursorOverIcon();
 
     /**
      * @return whether to show some feedback when an item (specifically an
      * icon) is activated.
      */
     static bool visualActivate();
     static unsigned int visualActivateSpeed();
 
     /**
      * Returns the OPIE setting for the auto-select option
      *
      * @return the auto-select delay or -1 if auto-select is disabled.
      */
     static int autoSelectDelay();
 
     /**
      * Returns the OPIE setting for the shortcut key to open
      * context menus.
@@ -230,58 +233,60 @@ class OGlobalSettings
 
     /**
      * Returns additional information for debug output (dependent on the debug mode).
      *
      * @return Additional debug output information.
      */
     static QString debugOutput();
     /**
      * This is a structure containing the possible mouse settings.
      */
     struct OMouseSettings
     {
         enum { RightHanded = 0, LeftHanded = 1 };
         int handed; // left or right
     };
 
     /**
      * This returns the current mouse settings.
      */
     static OMouseSettings & mouseSettings();
 
     /**
      * The path to the desktop directory of the current user.
      */
+     // below handled by Global stuff and QPEApplication
     static QString desktopPath() { initStatic(); return *s_desktopPath; }
 
     /**
      * The path to the autostart directory of the current user.
      */
     static QString autostartPath() { initStatic(); return *s_autostartPath; }
 
     /**
-     * The path to the trash directory of the current user.
+     * The path to the trash directory of the current user.    
      */
+     // we do not have that concept -zecke
     static QString trashPath() { initStatic(); return *s_trashPath; }
 
     /**
      * The path where documents are stored of the current user.
      */
     static QString documentPath() { initStatic(); return *s_documentPath; }
 
 
     /**
      * The default color to use when highlighting toolbar buttons
      */
     static QColor toolBarHighlightColor();
     static QColor inactiveTitleColor();
     static QColor inactiveTextColor();
     static QColor activeTitleColor();
     static QColor activeTextColor();
     static int contrast();
 
     /**
      * The default colors to use for text and links.
      */
     static QColor baseColor(); // Similair to QColorGroup::base()
     static QColor textColor(); // Similair to QColorGroup::text()
     static QColor linkColor();
diff --git a/libopie2/opienet/omanufacturerdb.h b/libopie2/opienet/omanufacturerdb.h
index 5e66c37..cb0b6c8 100644
--- a/libopie2/opienet/omanufacturerdb.h
+++ b/libopie2/opienet/omanufacturerdb.h
@@ -1,37 +1,38 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 
 #ifndef OMANUFACTURERDB_H
 #define OMANUFACTURERDB_H
 
 #include <qmap.h>
 
 class OManufacturerDB
 {
   public:
+    //FIXME make us consistent -zecke I use self(), sandman inst() you use instance() so we need to chose one!
     static OManufacturerDB* instance();
     const QString& lookup( const QString& macaddr ) const;
 
   protected:
     OManufacturerDB();
     virtual ~OManufacturerDB();
 
   private:
     QMap<QString, QString> manufacturers;
     static OManufacturerDB* _instance;
 };
 
 #endif
 
diff --git a/libopie2/opienet/onetutils.h b/libopie2/opienet/onetutils.h
index bedea63..9611518 100644
--- a/libopie2/opienet/onetutils.h
+++ b/libopie2/opienet/onetutils.h
@@ -29,100 +29,103 @@
 
 */
 
 #ifndef ONETUTILS_H
 #define ONETUTILS_H
 
 #include <qdict.h>
 #include <qmap.h>
 #include <qstring.h>
 #include <qhostaddress.h>
 #include <qobject.h>
 
 #include <sys/types.h>
 
 struct ifreq;
 class OWirelessNetworkInterface;
 
 /*======================================================================================
  * OMacAddress
  *======================================================================================*/
 
 class OMacAddress
 {
   public:
+    // QString c'tor? -zecke
     OMacAddress( unsigned char* );
     OMacAddress( const unsigned char* );
     OMacAddress( struct ifreq& );
     ~OMacAddress();
 
     QString manufacturer() const;
     QString toString( bool substitute = false ) const;
     const unsigned char* native() const;
 
+    // no c'tor but this one why not make it a c'tor. it could also replace the others or is this the problem?
     static OMacAddress fromString( const QString& );
 
   public:
     static const OMacAddress& broadcast; // ff:ff:ff:ff:ff:ff
     static const OMacAddress& unknown;   // 44:44:44:44:44:44
 
   private:
     unsigned char _bytes[6];
 
   friend bool operator==( const OMacAddress &m1, const OMacAddress &m2 );
 
 };
 
 bool operator==( const OMacAddress &m1, const OMacAddress &m2 );
 
 
 /*======================================================================================
  * OHostAddress
  *======================================================================================*/
 
 class OHostAddress : public QHostAddress
 {
   public:
     OHostAddress();
     ~OHostAddress();
 };
 
 
 /*======================================================================================
  * OPrivateIOCTL
  *======================================================================================*/
 
 class OPrivateIOCTL : public QObject
 {
   public:
     OPrivateIOCTL( QObject* parent, const char* name, int cmd, int getargs, int setargs );
     ~OPrivateIOCTL();
 
     int numberGetArgs() const;
     int typeGetArgs() const;
     int numberSetArgs() const;
     int typeSetArgs() const;
 
+    // FIXME return int? as ::ioctl does? -zecke
     void invoke() const;
     void setParameter( int, u_int32_t );
 
   private:
     u_int32_t _ioctl;
     u_int16_t _getargs;
     u_int16_t _setargs;
 
 };
 
  /*======================================================================================
  * Miscellaneous
  *======================================================================================*/
 
 /* dump bytes */
 
 void dumpBytes( const unsigned char* data, int num );
 
 /* Network to host order macros */
 
 #ifdef LBL_ALIGN
 #define EXTRACT_16BITS(p) \
         ((u_int16_t)((u_int16_t)*((const u_int8_t *)(p) + 0) << 8 | \
                      (u_int16_t)*((const u_int8_t *)(p) + 1)))
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 73b543b..f0094c7 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -87,49 +87,49 @@ void ONetwork::synchronize()
     QTextStream s( &f );
     s.readLine();
     s.readLine();
     while ( !s.atEnd() )
     {
         s >> str;
         str.truncate( str.find( ':' ) );
         qDebug( "ONetwork: found interface '%s'", (const char*) str );
         ONetworkInterface* iface;
         if ( isWirelessInterface( str ) )
         {
             iface = new OWirelessNetworkInterface( this, (const char*) str );
             qDebug( "ONetwork: interface '%s' has Wireless Extensions", (const char*) str );
         }
         else
         {
             iface = new ONetworkInterface( this, (const char*) str );
         }
         _interfaces.insert( str, iface );
         s.readLine();
     }
 }
 
 
-ONetworkInterface* ONetwork::interface( QString iface ) const
+ONetworkInterface* ONetwork::interface( const QString& iface ) const
 {
     return _interfaces[iface];
 }
 
 
 ONetwork* ONetwork::instance()
 {
     if ( !_instance ) _instance = new ONetwork();
     return _instance;
 }
 
 
 ONetwork::InterfaceIterator ONetwork::iterator() const
 {
     return ONetwork::InterfaceIterator( _interfaces );
 }
 
 
 bool ONetwork::isWirelessInterface( const char* name ) const
 {
     int sfd = socket( AF_INET, SOCK_STREAM, 0 );
     struct iwreq iwr;
     memset( &iwr, 0, sizeof( struct iwreq ) );
     strcpy( (char*) &iwr.ifr_name, name );
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index d2cc25d..db8e702 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -77,54 +77,56 @@ class OMonitoringInterface;
  *
  * This class provides access to all available network devices of your computer.
  * @author Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
  */
 class ONetwork : public QObject
 {
   Q_OBJECT
 
  public:
     typedef QDict<ONetworkInterface> InterfaceMap;
     typedef QDictIterator<ONetworkInterface> InterfaceIterator;
 
   public:
     /**
      * @returns a pointer to the (one and only) @ref ONetwork instance.
      */
     static ONetwork* instance();
     /**
      * @returns an iterator usable for iterating through all network interfaces.
      */
     InterfaceIterator iterator() const;
     /**
      * @returns true, if the @p interface supports the wireless extension protocol.
      */
+     // FIXME QString? -zecke
     bool isWirelessInterface( const char* interface ) const;
     /**
      * @returns a pointer to the @ref ONetworkInterface object for the specified @p interface or 0, if not found
      * @see ONetworkInterface
      */
-    ONetworkInterface* interface( QString interface ) const;
+     // FIXME: const QString& is prefered over QString!!! -zecke
+    ONetworkInterface* interface( const QString& interface ) const;
 
   protected:
     ONetwork();
     void synchronize();
 
   private:
     static ONetwork* _instance;
     InterfaceMap _interfaces;
 };
 
 
 /*======================================================================================
  * ONetworkInterface
  *======================================================================================*/
 
 /**
  * @brief A network interface wrapper.
  *
  * This class provides a wrapper for a network interface. All the cumbersume details of
  * Linux ioctls are hidden under a convenient high-level interface.
  * @warning Most of the setting methods contained in this class require the appropriate
  * process permissions to work.
  * @author Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
  */
diff --git a/libopie2/opienet/opcap.h b/libopie2/opienet/opcap.h
index 99631ba..6bf7416 100644
--- a/libopie2/opienet/opcap.h
+++ b/libopie2/opienet/opcap.h
@@ -47,381 +47,391 @@ extern "C"  // work around a bpf/pcap conflict in recent headers
 
 /* QT */
 #include <qevent.h>
 #include <qfile.h>
 #include <qhostaddress.h>
 #include <qobject.h>
 #include <qstring.h>
 #include <qmap.h>
 
 /* OPIE */
 #include <opie2/onetutils.h>
 #include "802_11_user.h"
 
 /* TYPEDEFS */
 typedef struct timeval timevalstruct;
 typedef struct pcap_pkthdr packetheaderstruct;
 
 /* FORWARDS */
 class OPacketCapturer;
 class QSocketNotifier;
 
 /*======================================================================================
  * OPacket - A frame on the wire
  *======================================================================================*/
-
+// FIXME how many OPackets do we've at a time? QObject seams to be a big for that usage
 class OPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OPacket( int datalink, packetheaderstruct, const unsigned char*, QObject* parent );
     virtual ~OPacket();
 
     timevalstruct timeval() const;
 
     int caplen() const;
     int len() const;
     QString dump( int = 32 ) const;
 
     void updateStats( QMap<QString,int>&, QObjectList* );
 
   private:
     const packetheaderstruct _hdr;  // pcap packet header
     const unsigned char* _data;     // pcap packet data
     const unsigned char* _end;      // end of pcap packet data
 };
 
 /*======================================================================================
  * OEthernetPacket - DLT_EN10MB frame
  *======================================================================================*/
 
+//FIXME same critic as above -zecke
 class OEthernetPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OEthernetPacket( const unsigned char*, const struct ether_header*, QObject* parent = 0 );
     virtual ~OEthernetPacket();
 
     OMacAddress sourceAddress() const;
     OMacAddress destinationAddress() const;
     int type() const;
 
   private:
     const struct ether_header* _ether;
 };
 
 
 /*======================================================================================
  * OWaveLanPacket - DLT_IEEE802_11 frame
  *======================================================================================*/
-
+//FIXME same
 class OWaveLanPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OWaveLanPacket( const unsigned char*, const struct ieee_802_11_header*, QObject* parent = 0 );
     virtual ~OWaveLanPacket();
 
     int duration() const;
     bool fromDS() const;
     bool toDS() const;
     virtual OMacAddress macAddress1() const;
     virtual OMacAddress macAddress2() const;
     virtual OMacAddress macAddress3() const;
     virtual OMacAddress macAddress4() const;
     bool usesPowerManagement() const;
     int type() const;
     int subType() const;
     int version() const;
     bool usesWep() const;
 
   private:
     const struct ieee_802_11_header* _wlanhdr;
 };
 
 
 /*======================================================================================
  * OWaveLanManagementPacket - type: management (T_MGMT)
  *======================================================================================*/
-
+//FIXME same as above -zecke
 class OWaveLanManagementPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OWaveLanManagementPacket( const unsigned char*, const struct ieee_802_11_mgmt_header*, OWaveLanPacket* parent = 0 );
     virtual ~OWaveLanManagementPacket();
 
     QString managementType() const;
 
     int beaconInterval() const;
     int capabilities() const; // generic
 
     bool canESS() const;
     bool canIBSS() const;
     bool canCFP() const;
     bool canCFP_REQ() const;
     bool canPrivacy() const;
 
   private:
     const struct ieee_802_11_mgmt_header* _header;
     const struct ieee_802_11_mgmt_body* _body;
 };
 
 
 /*======================================================================================
  * OWaveLanManagementSSID
  *======================================================================================*/
-
+//FIXME is QObject necessary? -zecke
 class OWaveLanManagementSSID : public QObject
 {
   Q_OBJECT
 
   public:
     OWaveLanManagementSSID( const unsigned char*, const struct ssid_t*, QObject* parent = 0 );
     virtual ~OWaveLanManagementSSID();
 
     QString ID() const;
 
   private:
     const struct ssid_t* _data;
 };
 
 /*======================================================================================
  * OWaveLanManagementRates
  *======================================================================================*/
-
+// FIXME same as above -zecke
 class OWaveLanManagementRates : public QObject
 {
   Q_OBJECT
 
   public:
     OWaveLanManagementRates( const unsigned char*, const struct rates_t*, QObject* parent = 0 );
     virtual ~OWaveLanManagementRates();
 
   private:
     const struct rates_t* _data;
 };
 
 /*======================================================================================
  * OWaveLanManagementCF
  *======================================================================================*/
 
+//FIXME same....
 class OWaveLanManagementCF : public QObject
 {
   Q_OBJECT
 
   public:
     OWaveLanManagementCF( const unsigned char*, const struct cf_t*, QObject* parent = 0 );
     virtual ~OWaveLanManagementCF();
 
   private:
     const struct cf_t* _data;
 };
 
 /*======================================================================================
  * OWaveLanManagementFH
  *======================================================================================*/
 
+//FIXME same
 class OWaveLanManagementFH : public QObject
 {
   Q_OBJECT
 
   public:
     OWaveLanManagementFH( const unsigned char*, const struct fh_t*, QObject* parent = 0 );
     virtual ~OWaveLanManagementFH();
 
   private:
     const struct fh_t* _data;
 };
 
 /*======================================================================================
  * OWaveLanManagementDS
  *======================================================================================*/
-
+//FIXME same
 class OWaveLanManagementDS : public QObject
 {
   Q_OBJECT
 
   public:
     OWaveLanManagementDS( const unsigned char*, const struct ds_t*, QObject* parent = 0 );
     virtual ~OWaveLanManagementDS();
 
     int channel() const;
 
   private:
     const struct ds_t* _data;
 };
 
 /*======================================================================================
  * OWaveLanManagementTim
  *======================================================================================*/
 
+//FIXME guess what?
 class OWaveLanManagementTim : public QObject
 {
   Q_OBJECT
 
   public:
     OWaveLanManagementTim( const unsigned char*, const struct tim_t*, QObject* parent = 0 );
     virtual ~OWaveLanManagementTim();
 
   private:
     const struct tim_t* _data;
 };
 
 /*======================================================================================
  * OWaveLanManagementIBSS
  *======================================================================================*/
 
+//FIXME same as above ( Qobject )
 class OWaveLanManagementIBSS : public QObject
 {
   Q_OBJECT
 
   public:
     OWaveLanManagementIBSS( const unsigned char*, const struct ibss_t*, QObject* parent = 0 );
     virtual ~OWaveLanManagementIBSS();
 
   private:
     const struct ibss_t* _data;
 };
 
 /*======================================================================================
  * OWaveLanManagementChallenge
  *======================================================================================*/
 
+// Qobject do we need that??
 class OWaveLanManagementChallenge : public QObject
 {
   Q_OBJECT
 
   public:
     OWaveLanManagementChallenge( const unsigned char*, const struct challenge_t*, QObject* parent = 0 );
     virtual ~OWaveLanManagementChallenge();
 
   private:
     const struct challenge_t* _data;
 };
 
 /*======================================================================================
  * OWaveLanDataPacket - type: data (T_DATA)
  *======================================================================================*/
-
+// Qobject?
 class OWaveLanDataPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OWaveLanDataPacket( const unsigned char*, const struct ieee_802_11_data_header*, OWaveLanPacket* parent = 0 );
     virtual ~OWaveLanDataPacket();
 
   private:
     const struct ieee_802_11_data_header* _header;
 };
 
 /*======================================================================================
  * OWaveLanControlPacket - type: control (T_CTRL)
  *======================================================================================*/
-
+// Qobject needed?
 class OWaveLanControlPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OWaveLanControlPacket( const unsigned char*, const struct ieee_802_11_control_header*, OWaveLanPacket* parent = 0 );
     virtual ~OWaveLanControlPacket();
 
   private:
     const struct ieee_802_11_control_header* _header;
 };
 
 /*======================================================================================
  * OLLCPacket - IEEE 802.2 Link Level Control
  *======================================================================================*/
 
+// QObject needed?
 class OLLCPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OLLCPacket( const unsigned char*, const struct ieee_802_11_802_2_header* data, QObject* parent = 0 );
     virtual ~OLLCPacket();
 
   private:
+  //FIXME how to get that header?
     const struct ieee_802_11_802_2_header* _header;
 };
 
 /*======================================================================================
  * OIPPacket
  *======================================================================================*/
 
+// Qobject as baseclass?
 class OIPPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OIPPacket( const unsigned char*, const struct iphdr*, QObject* parent = 0 );
     virtual ~OIPPacket();
 
     QHostAddress fromIPAddress() const;
     QHostAddress toIPAddress() const;
 
     int tos() const;
     int len() const;
     int id() const;
     int offset() const;
     int ttl() const;
     int protocol() const;
     int checksum() const;
 
   private:
     const struct iphdr* _iphdr;
 };
 
 /*======================================================================================
  * OUDPPacket
  *======================================================================================*/
-
+// QObject?
 class OUDPPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OUDPPacket( const unsigned char*, const struct udphdr*, QObject* parent = 0 );
     virtual ~OUDPPacket();
 
     int fromPort() const;
     int toPort() const;
 
   private:
     const struct udphdr* _udphdr;
 };
 
 /*======================================================================================
  * OTCPPacket
  *======================================================================================*/
 
+// Qobect needed?
 class OTCPPacket : public QObject
 {
   Q_OBJECT
 
   public:
     OTCPPacket( const unsigned char*, const struct tcphdr*, QObject* parent = 0 );
     virtual ~OTCPPacket();
 
     int fromPort() const;
     int toPort() const;
 
   private:
     const struct tcphdr* _tcphdr;
 };
 
 
 /*======================================================================================
  * OPacketCapturer
  *======================================================================================*/
 
 /**
  * @brief A class based wrapper for network packet capturing.
  *
  * This class is the base of a high-level interface to the well known packet capturing
diff --git a/libopie2/opieui/odialog.h b/libopie2/opieui/odialog.h
index 7947dfb..4116ed7 100644
--- a/libopie2/opieui/odialog.h
+++ b/libopie2/opieui/odialog.h
@@ -30,59 +30,60 @@
 */
 
 #ifndef ODIALOG_H
 #define ODIALOG_H
 
 class QLayoutItem;
 
 #include <qdialog.h>
 
 /**
  * Dialog with extended nonmodal support and methods for OPIE standard
  * compliance.
  *
  * The @ref marginHint() and @ref spacingHint() sizes shall be used
  * whenever you layout the interior of a dialog. One special note. If
  * you make your own action buttons (OK, Cancel etc), the space
  * beteween the buttons shall be @ref spacingHint(), whereas the space
  * above, below, to the right and to the left shall be @ref marginHint().
  * If you add a separator line above the buttons, there shall be a
  * @ref marginHint() between the buttons and the separator and a
  * @ref marginHint() above the separator as well.
  *
  * @author Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
  */
+ // lets fix up Qt instead! Size does matter. -zecke
 
 class ODialog : public QDialog
 {
   Q_OBJECT
 
   public:
 
     /**
      * Constructor.
      *
      * Takes the same arguments as @ref QDialog.
      */
     ODialog(QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags f = 0);
 
     /**
      * Return the number of pixels you shall use between a
      * dialog edge and the outermost widget(s) according to the KDE standard.
      **/
     static int marginHint();
 
     /**
      * Return the number of pixels you shall use between
      * widgets inside a dialog according to the KDE standard.
      */
     static int spacingHint();
 
   private:
     static int mMarginSize;
     static int mSpacingSize;
 
-    //class ODialogPrivate;
-    //ODialogPrivate *d;
+    class ODialogPrivate;
+    ODialogPrivate *d; // d pointer always needed! -zecke
 
 };
 #endif // ODIALOG_H
diff --git a/libopie2/opieui/oimageeffect.h b/libopie2/opieui/oimageeffect.h
index 313ea50..fb4d22d 100644
--- a/libopie2/opieui/oimageeffect.h
+++ b/libopie2/opieui/oimageeffect.h
@@ -1,26 +1,27 @@
 //FIXME: Revise for Opie - do we really need such fancy stuff on PDA's?
 //FIXME: Maybe not on SL5xxx, but surely on C700 :))
+//FIXME: I think we don#t need that -zecke
 
 /* This file is part of the KDE libraries
  Copyright (C) 1998, 1999, 2001, 2002 Daniel M. Duley <mosfet@interaccess.com>
  (C) 1998, 1999 Christian Tibirna <ctibirna@total.net>
  (C) 1998, 1999 Dirk A. Mueller <mueller@kde.org>
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 
 1. Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
diff --git a/libopie2/opieui/olistview.h b/libopie2/opieui/olistview.h
index bafc67c..b62e278 100644
--- a/libopie2/opieui/olistview.h
+++ b/libopie2/opieui/olistview.h
@@ -98,61 +98,61 @@ class OListViewItem;
 
    /**
     * sets the column separator pen.
     *
     * @param p the pen used to draw the column separator.
     */
     void setColumnSeparator( const QPen &p );
 
    /**
     * @return the alternate background color
     */
     const QColor& alternateBackground() const;
 
    /**
     * @return the column separator pen
     */
     const QPen& columnSeparator() const;
 
    /**
     * create a list view item as child of this object
     * @return the new object
     */
     virtual OListViewItem* childFactory();
 
-    #ifndef QT_NO_DATASTREAM
+#ifndef QT_NO_DATASTREAM
    /**
     * serialize this object to a @ref QDataStream
     * @param s the stream used to serialize this object.
     */
     virtual void serializeTo( QDataStream& s ) const;
 
    /**
     * serialize this object from a @ref QDataStream
     * @param s the stream used to serialize this object.
     */
     virtual void serializeFrom( QDataStream& s );
-    #endif
+#endif
 
   private:
     QColor m_alternateBackground;
     bool m_fullWidth;
     QPen m_columnSeparator;
 };
 
 #ifndef QT_NO_DATASTREAM
 /**
   * \relates QListView
   * Writes a listview to the stream and returns a reference to the stream.
   */
 QDataStream& operator<<( QDataStream& s, const OListView& lv );
 /**
   * \relates QListView
   * Reads a listview from the stream and returns a reference to the stream.
   */
 QDataStream& operator>>( QDataStream& s, OListView& lv );
 #endif // QT_NO_DATASTREAM
 
 //****************************** OListViewItem ******************************************************************
 
 class OListViewItem: public QListViewItem
 {
diff --git a/libopie2/opieui/opopupmenu.h b/libopie2/opieui/opopupmenu.h
index 94f05f4..54e4301 100644
--- a/libopie2/opieui/opopupmenu.h
+++ b/libopie2/opieui/opopupmenu.h
@@ -1,24 +1,27 @@
+//FIXME what is ODE? ODE Desktop Environemt? -zecke
+//FIXME do we need titles? space is limited that is only eyecandy? -zecke
+//FIXME keyboard navigation is also not that popular on a PDA might be with a keyboard (tuxphone) -zecke
 /* This file is part of the ODE libraries
    Copyright (C) 2000 Daniel M. Duley <mosfet@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License version 2 as published by the Free Software Foundation.
 
    This library 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 _OPOPUP_H
 #define _OPOPUP_H
 
 #define INCLUDE_MENUITEM_DEF
 
 /* QT */
 
diff --git a/libopie2/qt3/opiecore/opair.h b/libopie2/qt3/opiecore/opair.h
index 26f617d..a151127 100644
--- a/libopie2/qt3/opiecore/opair.h
+++ b/libopie2/qt3/opiecore/opair.h
@@ -1,26 +1,27 @@
 // QPair minus QT_INLINE_TEMPLATE (instead directly using 'inline' directive)
 //FIXME: remove and use qpair.h as soon as we're on Qt3
+// name file qpair -zecke
 
 /****************************************************************************
 **
 ** Definition of QPair class
 **
 **
 ** Copyright (C) 1992-2001 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the tools module of the Qt GUI Toolkit.
 **
 ** This file may be distributed under the terms of the Q Public License
 ** as defined by Trolltech AS of Norway and appearing in the file
 ** LICENSE.QPL included in the packaging of this file.
 **
 ** 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.
 **
 ** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
 ** licenses may use this file in accordance with the Qt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE