no longer link against libopie1 since libopie2 provides everything

8 files changed, 15 insertions, 18 deletions

diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index 9358866..ca53471 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -1,409 +1,409 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 
 /* LOCAL */
 #include "configwindow.h"
 #include "mainwindow.h"
 
 /* OPIE */
 #include <opie2/onetwork.h>
 #ifdef QWS
 #include <opie2/oapplication.h>
 #include <opie2/oconfig.h>
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 using namespace Opie;
 #endif
 
 /* QT */
 #include <qapplication.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qfile.h>
 #include <qlineedit.h>
 #include <qlayout.h>
 #include <qmap.h>
 #include <qpushbutton.h>
 #include <qtabwidget.h>
 #include <qtoolbutton.h>
 #include <qspinbox.h>
 #include <qtextstream.h>
 
 /* POSIX */
 #include <assert.h>
 
 WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0;
 
 WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f )
            :WellenreiterConfigBase( parent, name, true, f )
 {
     _devicetype[ "cisco" ] = DEVTYPE_CISCO;
     _devicetype[ "wlan-ng" ] = DEVTYPE_WLAN_NG;
     _devicetype[ "hostap" ] = DEVTYPE_HOSTAP;
     _devicetype[ "orinoco" ] = DEVTYPE_ORINOCO;
     _devicetype[ "<manual>" ] = DEVTYPE_MANUAL;
     _devicetype[ "<file>" ] = DEVTYPE_FILE;
 
     // gather possible interface names from ONetwork
     ONetwork* net = ONetwork::instance();
     ONetwork::InterfaceIterator it = net->iterator();
     while ( it.current() )
     {
         if ( it.current()->isWireless() )
             interfaceName->insertItem( it.current()->name() );
         ++it;
     }
 
     load();
 
     #ifdef Q_WS_X11 // We're on X11: adding an Ok-Button for the Dialog here
     QPushButton* okButton = new QPushButton( "ok", this );
     okButton->show();
     WellenreiterConfigBaseLayout->addWidget( okButton, 0, 3 ); //FIXME: rename this in configbase.ui
     connect( okButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
     #endif
 
     WellenreiterConfigWindow::_instance = this;
 
     connect( deviceType, SIGNAL( activated(int) ), this, SLOT( changedDeviceType(int) ) );
     connect( newNetworkAction, SIGNAL( activated(int) ), this, SLOT( changedNetworkAction(int) ) );
     connect( newClientAction, SIGNAL( activated(int) ), this, SLOT( changedClientAction(int) ) );
     connect( newStationAction, SIGNAL( activated(int) ), this, SLOT( changedStationAction(int) ) );
     connect( getCaptureFileName, SIGNAL( clicked() ), this, SLOT( getCaptureFileNameClicked() ) );
 
     // make the checkbox 'channelAll' control all other channels
     connect( channelAll, SIGNAL( stateChanged(int) ), this, SLOT( channelAllClicked(int) ) );
 
     connect( autodetect, SIGNAL( clicked() ), this, SLOT( performAutodetection() ) );
 
     // hide tab4 (parse) until Wellenreiter 1.2
     tab->removePage( tab_4 );
 };
 
 
 void WellenreiterConfigWindow::accept()
 {
     save();
     QDialog::accept();
 }
 
 
 WellenreiterConfigWindow::~WellenreiterConfigWindow()
 {
 }
 
 
 void WellenreiterConfigWindow::performAutodetection()
 {
     //TODO: insert modal splash screen here
     //      and sleep a second, so that it looks
     //      like we're actually doing something fancy... ;-)
 
     qDebug( "WellenreiterConfigWindow::performAutodetection()" );
 
     // try to guess device type
     QFile m( "/proc/modules" );
     if ( m.open( IO_ReadOnly ) )
     {
         int devicetype(0);
         QString line;
         QTextStream modules( &m );
         while( !modules.atEnd() && !devicetype )
         {
             modules >> line;
             if ( line.contains( "cisco" ) ) devicetype = DEVTYPE_CISCO;
             else if ( line.contains( "hostap" ) ) devicetype = DEVTYPE_HOSTAP;
             else if ( line.contains( "prism" ) ) devicetype = DEVTYPE_WLAN_NG;
             else if ( line.contains( "orinoco" ) ) devicetype = DEVTYPE_ORINOCO;
         }
         if ( devicetype )
         {
             deviceType->setCurrentItem( devicetype );
             _guess = devicetype;
             qDebug( "Wellenreiter: guessed device type to be #%d", devicetype );
         }
     }
 }
 
 
 int WellenreiterConfigWindow::driverType() const
 {
     QString name = deviceType->currentText();
     if ( _devicetype.contains( name ) )
     {
         return _devicetype[name];
     }
     else
     {
         return 0;
     }
 };
 
 
 int WellenreiterConfigWindow::hoppingInterval() const
 {
     return hopInterval->cleanText().toInt();
 }
 
 
 bool WellenreiterConfigWindow::usePrismHeader() const
 {
     return prismHeader->isChecked();
 }
 
 
 bool WellenreiterConfigWindow::isChannelChecked( int channel ) const
 {
     switch ( channel )
     {
         case 1: return channel1->isOn();
         case 2: return channel2->isOn();
         case 3: return channel3->isOn();
         case 4: return channel4->isOn();
         case 5: return channel5->isOn();
         case 6: return channel6->isOn();
         case 7: return channel7->isOn();
         case 8: return channel8->isOn();
         case 9: return channel9->isOn();
         case 10: return channel10->isOn();
         case 11: return channel11->isOn();
         case 12: return channel12->isOn();
         case 13: return channel13->isOn();
         case 14: return channel14->isOn();
     }
 }
 
 
 void WellenreiterConfigWindow::changedDeviceType(int t)
 {
     if ( t != DEVTYPE_FILE ) return;
     QString name = ( (WellenreiterMainWindow*) qApp->mainWidget() )->getFileName(false);
     if ( !name.isEmpty() && QFile::exists( name ) )
     {
         interfaceName->insertItem( name );
         interfaceName->setCurrentItem( interfaceName->count()-1 );
     }
     else
     {
         deviceType->setCurrentItem( _guess );
     }
 
 }
 
 
 void WellenreiterConfigWindow::synchronizeActionsAndScripts()
 {
     if ( newNetworkAction->currentItem() == 4 ) newNetworkScript->show(); else newNetworkScript->hide();
     if ( newClientAction->currentItem() == 4 ) newClientScript->show(); else newClientScript->hide();
     if ( newStationAction->currentItem() == 4 ) newStationScript->show(); else newStationScript->hide();
 
     //newNetworkScript->setEnabled( newNetworkAction->currentItem() == 4 );
     //newClientScript->setEnabled( newClientAction->currentItem() == 4 );
     //newStationScript->setEnabled( newStationAction->currentItem() == 4 );
 }
 
 
 void WellenreiterConfigWindow::changedNetworkAction(int t)
 {
     synchronizeActionsAndScripts();
 }
 
 
 void WellenreiterConfigWindow::changedClientAction(int t)
 {
     synchronizeActionsAndScripts();
 }
 
 
 void WellenreiterConfigWindow::changedStationAction(int t)
 {
     synchronizeActionsAndScripts();
 }
 
 
 void WellenreiterConfigWindow::getCaptureFileNameClicked()
 {
     QString name = ( (WellenreiterMainWindow*) qApp->mainWidget() )->getFileName(true);
     qDebug( "name = %s", (const char*) name );
     if ( !name.isEmpty() )
     {
         captureFileName->setText( name );
     }
 }
 
 
 void WellenreiterConfigWindow::channelAllClicked(int state)
 {
     bool b = state;
     channel1->setChecked( b );
     channel2->setChecked( b );
     channel3->setChecked( b );
     channel4->setChecked( b );
     channel5->setChecked( b );
     channel6->setChecked( b );
     channel7->setChecked( b );
     channel8->setChecked( b );
     channel9->setChecked( b );
     channel10->setChecked( b );
     channel11->setChecked( b );
     channel12->setChecked( b );
     channel13->setChecked( b );
     channel14->setChecked( b );
 }
 
 
 bool WellenreiterConfigWindow::useGPS() const
 {
     return enableGPS->isChecked();
 }
 
 
 const QString WellenreiterConfigWindow::gpsHost() const
 {
     return useGPS() ? gpsdHost->currentText() : QString::null;
 }
 
 
 int WellenreiterConfigWindow::gpsPort() const
 {
     bool ok;
     return useGPS() ? gpsdPort->value() : -1;
 }
 
 
 void WellenreiterConfigWindow::performAction( const QString& type,
                                               const QString& essid,
                                               const QString& mac,
                                               bool wep,
                                               int channel,
                                               int signal
                                               /* , const GpsLocation& loc */ )
 {
     int action;
     QString script;
 
     if ( type == "network" )
     {
         action = newNetworkAction->currentItem();
         script = newNetworkScript->text();
     }
     else if ( type == "managed" || type == "adhoc" )
     {
         action = newClientAction->currentItem();
         script = newClientScript->text();
     }
     else if ( type == "station" )
     {
         action = newStationAction->currentItem();
         script = newStationScript->text();
     }
     else
     {
         qWarning( "WellenreiterConfigWindow::performAction(): unknown type '%s'", (const char*) type );
         return;
     }
 
     qDebug( "for event '%s' I'm going to perform action %d (script='%s')", (const char*) type, action, (const char*) script );
 
     switch( action )
     {
         case 0: /* Ignore */ return;
         case 1: /* Play Alarm */ ODevice::inst()->alarmSound(); return;
         case 2: /* Play Click */ ODevice::inst()->touchSound(); return;
         case 3: /* Blink LED */ break; //FIXME: Implement this
         case 4: /* Run Script */
         {
             /**
                 *
                 * Script Substitution Information:
                 *
                 * $SSID = SSID
                 * $MAC = MAC
                 * $WEP = Wep
                 * $CHAN = Channel
                 *
                 **/
             script = script.replace( QRegExp( "$SSID" ), essid );
             script = script.replace( QRegExp( "$MAC" ), mac );
             script = script.replace( QRegExp( "$WEP" ), wep ? QString( "true" ) : QString( "false" ) );
             script = script.replace( QRegExp( "$CHAN" ), QString::number( channel ) );
 
             qDebug( "going to call script '%s'", (const char*) script );
             ::system( script );
             qDebug( "script returned." );
             return;
         }
         default: assert( false );
     }
 }
 
 
 void WellenreiterConfigWindow::load()
 {
 #ifdef Q_WS_X11
     #warning Persistent Configuration not yet implemented for standalone X11 build
     performAutodetection();
 #else
     qDebug( "loading configuration settings..." );
 
     /* This is dumb monkey typing stuff... We _need_ to do this automatically! */
 
     OConfig* c = oApp->config();
 
     c->setGroup( "Interface" );
 
     QString interface = c->readEntry( "name", "<none>" );
     if ( interface != "<none>" )
     {
 #if QT_VERSION < 300
         interfaceName->insertItem( interface, 0 );
         interfaceName->setCurrentItem( 0 );
 #else
         interfaceName->setCurrentText( interface );
 #endif
 
         QString device = c->readEntry( "type", "<select>" );
 #if QT_VERSION < 300
         for ( int i = 0; i < deviceType->count(); ++i )
         {
             if ( deviceType->text( i ) == device )
             {
                 deviceType->setCurrentItem( i );
                 break;
             }
         }
 #else
         deviceType->setCurrentText( device );
 #endif
     }
     else
     {
         performAutodetection();
     }
 
     prismHeader->setChecked( c->readBoolEntry( "prism", false ) );
     hopChannels->setChecked( c->readBoolEntry( "hop", true ) );
     hopInterval->setValue( c->readNumEntry( "interval", 250 ) );
     adaptiveHopping->setChecked( c->readBoolEntry( "adaptive", true ) );
 
     c->setGroup( "Capture" );
     captureFileName->setText( c->readEntry( "filename", "/tmp/capture" ) );
 
     c->setGroup( "UI" );
     lookupVendor->setChecked( c->readBoolEntry( "lookupVendor", true ) );
     openTree->setChecked( c->readBoolEntry( "openTree", true ) );
     disablePM->setChecked( c->readBoolEntry( "disablePM", true ) );
     newNetworkAction->setCurrentItem( c->readNumEntry( "newNetworkAction", 1 ) ); // Default: Play Alarm
     newNetworkScript->setText( c->readEntry( "newNetworkScript", "" ) );
     newClientAction->setCurrentItem( c->readNumEntry( "newClientAction", 2 ) ); // Default: Play Click
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index 188d96a..7957d4c 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -1,47 +1,47 @@
 DESTDIR         = $(OPIEDIR)/bin
 TEMPLATE        = app
 CONFIG          = qt warn_on debug
 
 HEADERS         = wellenreiterbase.h \
                   mainwindow.h \
                   wellenreiter.h \
                   scanlist.h \
                   logwindow.h \
                   hexwindow.h \
                   statwindow.h \
                   configwindow.h \
                   graphwindow.h \
                   protolistview.h \
                   gps.h
 
 SOURCES         = main.cpp \
                   mainwindow.cpp \
                   wellenreiterbase.cpp \
                   wellenreiter.cpp \
                   scanlist.cpp \
                   logwindow.cpp \
                   hexwindow.cpp \
                   statwindow.cpp \
                   configwindow.cpp \
                   graphwindow.cpp \
                   protolistview.cpp \
                   gps.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 INTERFACES      = configbase.ui
 TARGET          = wellenreiter
 
 !contains( platform, x11 ) {
   message( qws )
   include ( $(OPIEDIR)/include.pro )
-  LIBS += -lqpe -lopie -lopiecore2 -lopieui2 -lopienet2
+  LIBS += -lqpe -lopiecore2 -lopieui2 -lopienet2
 }
 
 contains( platform, x11 ) {
   LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter
   SOURCES += resource.cpp
   HEADERS += resource.h
   DESTDIR = $(OPIEDIR)/output/bin
 }
 
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index d4e3279..05a8913 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -1,426 +1,427 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 
 #include "configwindow.h"
 #include "gps.h"
 #include "logwindow.h"
 #include "hexwindow.h"
 #include "mainwindow.h"
 #include "wellenreiter.h"
 #include "scanlist.h"
 
 #include <qcombobox.h>
 #include <qdatastream.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qiconset.h>
 #include <qmenubar.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
 #include <qstatusbar.h>
 #include <qtextstream.h>
 #include <qtoolbutton.h>
 
 #ifdef QWS
 #include <qpe/resource.h>
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
+using namespace Opie;
 #else
 #include "resource.h"
 #include <qapplication.h>
 #include <qfiledialog.h>
 #endif
 
 WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f )
            :QMainWindow( parent, name, f )
 {
     cw = new WellenreiterConfigWindow( this );
     mw = new Wellenreiter( this );
     mw->setConfigWindow( cw );
     setCentralWidget( mw );
 
     // setup application icon
 
     #ifndef QWS
     setIcon( Resource::loadPixmap( "wellenreiter/appicon-trans" ) );
     setIconText( "Wellenreiter/X11" );
     #endif
 
     // setup tool buttons
 
     startButton = new QToolButton( 0 );
     #ifdef QWS
     startButton->setAutoRaise( true );
     #endif
     startButton->setIconSet( Resource::loadIconSet( "wellenreiter/SearchIcon" ) );
     startButton->setEnabled( false );
     connect( startButton, SIGNAL( clicked() ), mw, SLOT( startClicked() ) );
 
     stopButton = new QToolButton( 0 );
     #ifdef QWS
     stopButton->setAutoRaise( true );
     #endif
     stopButton->setIconSet( Resource::loadIconSet( "wellenreiter/CancelIcon" ) );
     stopButton->setEnabled( false );
     connect( stopButton, SIGNAL( clicked() ), mw, SLOT( stopClicked() ) );
 
     QToolButton* d = new QToolButton( 0 );
     #ifdef QWS
     d->setAutoRaise( true );
     #endif
     d->setIconSet( Resource::loadIconSet( "wellenreiter/SettingsIcon" ) );
     connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) );
 
     uploadButton = new QToolButton( 0 );
     #ifdef QWS
     uploadButton->setAutoRaise( true );
     #endif
     uploadButton->setIconSet( Resource::loadIconSet( "up" ) );
     uploadButton->setEnabled( false );
     //uploadButton->setEnabled( true ); // DEBUGGING
     connect( uploadButton, SIGNAL( clicked() ), this, SLOT( uploadSession() ) );
 
     // setup menu bar
 
     int id;
 
     QMenuBar* mb = menuBar();
 
     QPopupMenu* fileSave = new QPopupMenu( mb );
     fileSave->insertItem( tr( "&Session..." ), this, SLOT( fileSaveSession() ) );
     fileSave->insertItem( tr( "&Text Log..." ), this, SLOT( fileSaveLog() ) );
     fileSave->insertItem( tr( "&Hex Log..." ), this, SLOT( fileSaveHex() ) );
 
     QPopupMenu* fileLoad = new QPopupMenu( mb );
     fileLoad->insertItem( tr( "&Session..." ), this, SLOT( fileLoadSession() ) );
     //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) );
 
     QPopupMenu* file = new QPopupMenu( mb );
     file->insertItem( tr( "&New" ), this, SLOT( fileNew() ) );
     id = file->insertItem( tr( "&Load" ), fileLoad );
     file->insertItem( tr( "&Save" ), fileSave );
     file->insertSeparator();
     uploadID = file->insertItem( tr( "&Upload Session" ), this, SLOT( uploadSession() ) );
     file->insertSeparator();
     file->insertItem( tr( "&Exit" ), qApp, SLOT( quit() ) );
 
     QPopupMenu* view = new QPopupMenu( mb );
     view->insertItem( tr( "&Configure..." ) );
 
     QPopupMenu* sniffer = new QPopupMenu( mb );
     sniffer->insertItem( tr( "&Configure..." ), this, SLOT( showConfigure() ) );
     sniffer->insertSeparator();
     startID = sniffer->insertItem( tr( "&Start" ), mw, SLOT( startClicked() ) );
     sniffer->setItemEnabled( startID, false );
     stopID = sniffer->insertItem( tr( "Sto&p" ), mw, SLOT( stopClicked() ) );
     sniffer->setItemEnabled( stopID, false );
 
     QPopupMenu* demo = new QPopupMenu( mb );
     demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) );
 
     id = mb->insertItem( tr( "&File" ), file );
     //id = mb->insertItem( tr( "&View" ), view );
     //mb->setItemEnabled( id, false );
     id = mb->insertItem( tr( "&Sniffer" ), sniffer );
 
     id = mb->insertItem( tr( "&Demo" ), demo );
     mb->setItemEnabled( id, true );
     mb->setItemEnabled( uploadID, false );
 
     #ifdef QWS
     mb->insertItem( startButton );
     mb->insertItem( stopButton );
     mb->insertItem( uploadButton );
     mb->insertItem( d );
     #else // Qt3 changed the insertion order. It's now totally random :(
     mb->insertItem( d );
     mb->insertItem( uploadButton );
     mb->insertItem( stopButton );
     mb->insertItem( startButton );
     #endif
 
     updateToolButtonState();
 
     // setup status bar (for now only on X11)
 
     #ifndef QWS
     statusBar()->message( tr( "Ready." ) );
     #endif
 
     connect( mw, SIGNAL( startedSniffing() ), this, SLOT( changedSniffingState() ) );
     connect( mw, SIGNAL( stoppedSniffing() ), this, SLOT( changedSniffingState() ) );
 };
 
 
 
 void WellenreiterMainWindow::showConfigure()
 {
     qDebug( "show configure..." );
     cw->setCaption( tr( "Configure" ) );
     #ifdef QWS
     cw->showMaximized();
     #endif
     int result = cw->exec();
 
     if ( result ) updateToolButtonState();
 }
 
 
 void WellenreiterMainWindow::updateToolButtonState()
 {
     const QString& interface = cw->interfaceName->currentText();
     const int cardtype = cw->driverType();
 
     if ( ( interface != "<select>" ) && ( cardtype != 0 ) )
     {
         startButton->setEnabled( true );
         menuBar()->setItemEnabled( startID, true );
     }
     else
     {
         startButton->setEnabled( false );
         menuBar()->setItemEnabled( startID, false );
     }
 }
 
 
 void WellenreiterMainWindow::changedSniffingState()
 {
     startButton->setEnabled( !mw->sniffing );
     menuBar()->setItemEnabled( startID, !mw->sniffing );
     stopButton->setEnabled( mw->sniffing );
     menuBar()->setItemEnabled( stopID, mw->sniffing );
 
     if ( !mw->sniffing )
     {
         menuBar()->setItemEnabled( uploadID, true );
         uploadButton->setEnabled( true );
     }
 }
 
 
 WellenreiterMainWindow::~WellenreiterMainWindow()
 {
     qDebug( "Wellenreiter:: bye." );
 };
 
 
 void WellenreiterMainWindow::demoAddStations()
 {
     //mw = 0; // test SIGSGV handling
 
     mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:00:20:EF:A6:43"), true, 6, 80, GpsLocation( 39.8794, -94.0936) );
     mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:30:6D:EF:A6:23"), true, 11, 10, GpsLocation( 0.0, 0.0 ) );
     mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:03:F8:E7:16:22"), false, 3, 10, GpsLocation( 5.5, 2.3 ) );
     mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:04:01:E7:56:62"), false, 3, 15, GpsLocation( 2.3, 5.5 ) );
     mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:05:8E:E7:56:E2"), false, 3, 20, GpsLocation( -10.0, -20.5 ) );
 }
 
 
 QString WellenreiterMainWindow::getFileName( bool save )
 {
     QMap<QString, QStringList> map;
     map.insert( tr("All"), QStringList() );
     QStringList text;
     text << "text/*";
     map.insert( tr("Text"), text );
     text << "*";
     map.insert( tr("All"), text );
 
     QString str;
     if ( save )
     {
         #ifdef QWS
         str = OFileDialog::getSaveFileName( 2, "/", QString::null, map );
         #else
         str = QFileDialog::getSaveFileName();
         #endif
         if ( str.isEmpty() /*|| QFileInfo(str).isDir()*/ )
             return "";
     }
     else
     {
         #ifdef QWS
         str = OFileDialog::getOpenFileName( 2, "/", QString::null, map );
         #else
         str = QFileDialog::getOpenFileName();
         #endif
         if ( str.isEmpty() || !QFile(str).exists() || QFileInfo(str).isDir() )
             return "";
     }
     return str;
 }
 
 
 void WellenreiterMainWindow::fileSaveLog()
 {
     QString fname = getFileName( true );
     if ( !fname.isEmpty() )
     {
         QFile f( fname );
         if ( f.open(IO_WriteOnly) )
         {
             QTextStream t( &f );
             t << mw->logWindow()->getLog();
             f.close();
             qDebug( "Saved log to file '%s'", (const char*) fname );
         }
         else
         {
             qDebug( "Problem saving log to file '%s'", (const char*) fname );
         }
     }
 }
 
 void WellenreiterMainWindow::fileSaveSession()
 {
     QString fname = getFileName( true );
     if ( !fname.isEmpty() )
     {
 
         QFile f( fname );
         if ( f.open(IO_WriteOnly) )
         {
             QDataStream t( &f );
             t << *mw->netView();
             f.close();
             qDebug( "Saved session to file '%s'", (const char*) fname );
         }
         else
         {
             qDebug( "Problem saving session to file '%s'", (const char*) fname );
         }
     }
 }
 
 void WellenreiterMainWindow::fileSaveHex()
 {
     QString fname = getFileName( true );
     if ( !fname.isEmpty() )
     {
         QFile f( fname );
         if ( f.open(IO_WriteOnly) )
         {
             QTextStream t( &f );
             t << mw->hexWindow()->getLog();
             f.close();
             qDebug( "Saved hex log to file '%s'", (const char*) fname );
         }
         else
         {
             qDebug( "Problem saving hex log to file '%s'", (const char*) fname );
         }
     }
 }
 
 void WellenreiterMainWindow::fileLoadSession()
 {
     QString fname = getFileName( false );
     if ( !fname.isEmpty() )
     {
         QFile f( fname );
         if ( f.open(IO_ReadOnly) )
         {
             QDataStream t( &f );
             t >> *mw->netView();
             f.close();
             qDebug( "Loaded session from file '%s'", (const char*) fname );
         }
         else
         {
             qDebug( "Problem loading session from file '%s'", (const char*) fname );
         }
     }
 }
 
 
 void WellenreiterMainWindow::fileNew()
 {
     mw->netView()->clear();
     mw->logWindow()->clear();
     mw->hexWindow()->clear();
 }
 
 
 void WellenreiterMainWindow::closeEvent( QCloseEvent* e )
 {
     if ( mw->isDaemonRunning() )
     {
         QMessageBox::warning( this, "Wellenreiter/Opie",
                               tr( "Sniffing in progress!\nPlease stop sniffing before closing." ) );
         e->ignore();
     }
     else
     {
         QMainWindow::closeEvent( e );
     }
 }
 
 static const char* CAP_hostname = "www.vanille.de";
 
 #include <netdb.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 
 void WellenreiterMainWindow::uploadSession()
 {
     QLineEdit* from;
     QLineEdit* location;
     QLineEdit* comments;
     QPushButton* accept;
     QPushButton* reject;
 
     QDialog* d = new QDialog( 0, "session upload", true );
     d->setCaption( tr( "Upload Session" ) );
     QGridLayout* g = new QGridLayout( d, 4, 2, 3 );
     g->addWidget( new QLabel( tr( "From: " ), d ), 0, 0 );
     g->addWidget( from = new QLineEdit( d ), 0, 1 );
     g->addWidget( new QLabel( tr( "Location: " ), d ), 1, 0 );
     g->addWidget( location = new QLineEdit( d ), 1, 1 );
     g->addWidget( new QLabel( tr( "Comments: " ), d ), 2, 0 );
     g->addWidget( comments = new QLineEdit( d ), 2, 1 );
     g->addWidget( accept = new QPushButton( tr( "&Ok" ), d ), 3, 0 );
     g->addWidget( reject = new QPushButton( tr( "&Cancel" ), d ), 3, 1 );
     accept->setDefault( true );
     accept->setAutoDefault( true );
     from->setText( "WL II User" );
     location->setText( "WL II Location" );
     comments->setText( "No Comments." );
     connect( accept, SIGNAL( clicked() ), d, SLOT( accept() ) );
     connect( reject, SIGNAL( clicked() ), d, SLOT( reject() ) );
     int result = d->exec();
 
     if ( !result )
     {
         qDebug( "Session upload cancelled :(" );
         return;
     }
 
     qDebug( "Starting upload..." );
 
     struct sockaddr_in raddr;
     struct hostent *rhost_info;
     int sock = -1;
     bool ok = false;
 
     rhost_info = (struct hostent *) ::gethostbyname( CAP_hostname );
     if ( rhost_info )
     {
 
 
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index 10ead53..b42f1df 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -1,563 +1,564 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 
 #include "scanlist.h"
 #include "configwindow.h"
 #include "logwindow.h"
 
 #include <assert.h>
 #include <qcursor.h>
 #include <qdatetime.h>
 #include <qtextstream.h>
 #include <qpopupmenu.h>
 #include <qcheckbox.h>
 
 #ifdef QWS
 #include <qpe/qpeapplication.h>
 #endif
 
 #ifdef QWS
 #include <qpe/resource.h>
 #else
 #include "resource.h"
 #endif
 
 const int col_type = 0;
 const int col_essid = 0;
 const int col_sig = 1;
 const int col_ap = 2;
 const int col_channel = 3;
 const int col_wep = 4;
 const int col_traffic = 5;
 const int col_ip = 6;
 const int col_manuf = 7;
 const int col_firstseen = 8;
 const int col_lastseen = 9;
 const int col_location = 10;
 
 MScanListView::MScanListView( QWidget* parent, const char* name )
               :OListView( parent, name )
 {
 
     setFrameShape( QListView::StyledPanel );
     setFrameShadow( QListView::Sunken );
 
     addColumn( tr( "Net/Station" ) );
     setColumnAlignment( col_essid, AlignLeft || AlignVCenter );
     addColumn( tr( "#" ) );
     setColumnAlignment( col_sig, AlignCenter );
     addColumn( tr( "MAC" ) );
     setColumnAlignment( col_ap, AlignCenter );
     addColumn( tr( "Chn" ) );
     setColumnAlignment( col_channel, AlignCenter );
     addColumn( tr( "W" ) );
     setColumnAlignment( col_wep, AlignCenter );
     addColumn( tr( "T" ) );
     setColumnAlignment( col_traffic, AlignCenter );
     addColumn( tr( "IP" ) );
     setColumnAlignment( col_ip, AlignCenter );
     addColumn( tr( "Manufacturer" ) );
     setColumnAlignment( col_manuf, AlignCenter );
     addColumn( tr( "First Seen" ) );
     setColumnAlignment( col_firstseen, AlignCenter );
     addColumn( tr( "Last Seen" ) );
     setColumnAlignment( col_lastseen, AlignCenter );
     addColumn( tr( "Location" ) );
     setColumnAlignment( col_location, AlignCenter );
     setRootIsDecorated( true );
     setAllColumnsShowFocus( true );
 
     connect( this, SIGNAL( rightButtonClicked(QListViewItem*,const QPoint&,int) ),
              this, SLOT( contextMenuRequested(QListViewItem*,const QPoint&,int) ) );
 
     #ifdef QWS
     QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
     #endif
 
 };
 
 
 MScanListView::~MScanListView()
 {
 };
 
 
 OListViewItem* MScanListView::childFactory()
 {
     return new MScanListItem( this );
 }
 
 
 void MScanListView::serializeTo( QDataStream& s) const
 {
     qDebug( "serializing MScanListView" );
     OListView::serializeTo( s );
 }
 
 
 void MScanListView::serializeFrom( QDataStream& s)
 {
     qDebug( "serializing MScanListView" );
     OListView::serializeFrom( s );
 }
 
 
 void MScanListView::addNewItem( const QString& type,
                                 const QString& essid,
                                 const OMacAddress& mac,
                                 bool wep,
                                 int channel,
                                 int signal,
                                 const GpsLocation& loc,
                                 bool probe )
 {
     QString macaddr = mac.toString(true);
 
     #ifdef DEBUG
     qDebug( "MScanList::addNewItem( %s / %s / %s [%d]", (const char*) type,
             (const char*) essid, (const char*) macaddr, channel );
     #endif
 
     // search, if we already have seen this net
 
     QString s;
     MScanListItem* network;
     MScanListItem* item = static_cast<MScanListItem*> ( firstChild() );
 
     while ( item && ( item->text( col_essid ) != essid ) )
     {
         #ifdef DEBUG
         qDebug( "itemtext: %s", (const char*) item->text( col_essid ) );
         #endif
         item = static_cast<MScanListItem*> ( item->nextSibling() );
     }
     if ( item )
     {
         // we have already seen this net, check all childs if MAC exists
 
         network = item;
 
         item = static_cast<MScanListItem*> ( item->firstChild() );
         assert( item ); // this shouldn't fail
 
         while ( item && ( item->text( col_ap ) != macaddr ) )
         {
             #ifdef DEBUG
             qDebug( "subitemtext: %s", (const char*) item->text( col_ap ) );
             #endif
             item = static_cast<MScanListItem*> ( item->nextSibling() );
         }
 
         if ( item )
         {
             // we have already seen this item, it's a dupe
             #ifdef DEBUG
             qDebug( "%s is a dupe - ignoring...", (const char*) macaddr );
             #endif
             item->receivedBeacon();
             return;
         }
     }
     else
     {
         s.sprintf( "(i) New network: ESSID '%s'", (const char*) essid );
         MLogWindow::logwindow()->log( s );
         network = new MScanListItem( this, "network", essid, QString::null, 0, 0, 0, probe );
     }
 
 
     // insert new station as child from network
     // no essid to reduce clutter, maybe later we have a nick or stationname to display!?
 
     #ifdef DEBUG
     qDebug( "inserting new station %s", (const char*) macaddr );
     #endif
 
     MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal );
     station->setManufacturer( mac.manufacturer() );
     station->setLocation( loc.dmsPosition() );
 
     if ( type == "managed" )
     {
         s.sprintf( "(i) New Access Point in '%s' [%d]", (const char*) essid, channel );
     }
     else
     {
         s.sprintf( "(i) New AdHoc station in '%s' [%d]", (const char*) essid, channel );
     }
     MLogWindow::logwindow()->log( s );
 }
 
 
 void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress& addr, const QString& type )
 {
     MScanListItem* subitem = static_cast<MScanListItem*>( network->firstChild() );
 
     while ( subitem && ( subitem->text( col_ap ) != addr.toString(true) ) )
     {
         #ifdef DEBUG
         qDebug( "subitemtext: %s", (const char*) subitem->text( col_ap ) );
         #endif
         subitem = static_cast<MScanListItem*> ( subitem->nextSibling() );
     }
 
     if ( subitem )
     {
         // we have already seen this item, it's a dupe
         #ifdef DEBUG
         qDebug( "%s is a dupe - ignoring...", (const char*) addr.toString(true) );
         #endif
         subitem->receivedBeacon(); //FIXME: sent data bit
         return;
     }
 
     // Hey, it seems to be a new item :-D
     MScanListItem* station = new MScanListItem( network, type, /* network->text( col_essid ) */ "", addr.toString(true), false, -1, -1 );
     station->setManufacturer( addr.manufacturer() );
 
     QString s;
     if ( type == "station" )
     {
         s.sprintf( "(i) New Station in '%s' [xx]", (const char*) network->text( col_essid ) );
     }
     else
     {
         s.sprintf( "(i) New Wireless Station in '%s' [xx]", (const char*) network->text( col_essid ) );
     }
     MLogWindow::logwindow()->log( s );
 }
 
 
 void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo )
 {
+    qDebug( "WDSTraffic: %s and %s seem to form a WDS", (const char*) viaFrom.toString(), (const char*) viaTo.toString() );
     QString s;
     MScanListItem* network;
 
     QListViewItemIterator it( this );
     while ( it.current() &&
             it.current()->text( col_ap ) != viaFrom.toString(true) &&
             it.current()->text( col_ap ) != viaTo.toString(true) ) ++it;
 
     MScanListItem* item = static_cast<MScanListItem*>( it.current() );
 
     if ( item ) // Either viaFrom or viaTo AP has shown up yet, so just add our two new stations
     {
         addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from );
         addIfNotExisting( static_cast<MScanListItem*>(item->parent()), to );
     }
     else
     {
         qDebug( "D'Oh! Stations without AP... ignoring for now... will handle this in 1.1 version :-D" );
         MLogWindow::logwindow()->log( "WARNING: Unhandled WSD traffic!" );
     }
 }
 
 
 void MScanListView::toDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via )
 {
     QString s;
     MScanListItem* network;
 
     QListViewItemIterator it( this );
     while ( it.current() && it.current()->text( col_ap ) != via.toString(true) ) ++it;
 
     MScanListItem* item = static_cast<MScanListItem*>( it.current() );
 
     if ( item ) // AP has shown up yet, so just add our new "from" - station
     {
         addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from, "adhoc" );
     }
     else
     {
         qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" );
         MLogWindow::logwindow()->log( "WARNING: Unhandled toDS traffic!" );
 
     }
 }
 
 
 void MScanListView::fromDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via )
 {
     QString s;
     MScanListItem* network;
 
     QListViewItemIterator it( this );
     while ( it.current() && it.current()->text( col_ap ) != via.toString(true) ) ++it;
 
     MScanListItem* item = static_cast<MScanListItem*>( it.current() );
 
     if ( item ) // AP has shown up yet, so just add our new "from" - station
     {
         addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from, "station" );
     }
     else
     {
         qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" );
         MLogWindow::logwindow()->log( "WARNING: Unhandled fromDS traffic!" );
     }
 }
 
 
 void MScanListView::IBSStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via )
 {
     qWarning( "D'oh! Not yet implemented..." );
     MLogWindow::logwindow()->log( "WARNING: Unhandled IBSS traffic!" );
 }
 
 
 void MScanListView::identify( const OMacAddress& macaddr, const QString& ip )
 {
     qDebug( "identify %s = %s", (const char*) macaddr.toString(), (const char*) ip );
 
     QListViewItemIterator it( this );
     for ( ; it.current(); ++it )
     {
         if ( it.current()->text( col_ap ) == macaddr.toString(true) )
         {
             it.current()->setText( col_ip, ip );
             return;
         }
     }
     qDebug( "D'oh! Received identification, but item not yet in list... ==> Handle this!" );
     MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled identification %s = %s!",
                                                      (const char*) macaddr.toString(), (const char*) ip ) );
 }
 
 
 void MScanListView::addService( const QString& name, const OMacAddress& macaddr, const QString& ip )
 {
     qDebug( "addService '%s', Server = %s = %s", (const char*) name, (const char*) macaddr.toString(), (const char*) ip );
 
     //TODO: Refactor that out, we need it all over the place.
     //      Best to do it in a more comfortable abstraction in OListView
     //      (Hmm, didn't I already start something in this direction?)
 
     QListViewItemIterator it( this );
     for ( ; it.current(); ++it )
     {
         if ( it.current()->text( col_ap ) == macaddr.toString(true) )
         {
 
             MScanListItem* subitem = static_cast<MScanListItem*>( it.current()->firstChild() );
 
             while ( subitem && ( subitem->text( col_essid ) != name ) )
             {
                 #ifdef DEBUG
                 qDebug( "subitemtext: %s", (const char*) subitem->text( col_essid ) );
                 #endif
                 subitem = static_cast<MScanListItem*> ( subitem->nextSibling() );
             }
 
             if ( subitem )
             {
                 // we have already seen this item, it's a dupe
                 #ifdef DEBUG
                 qDebug( "%s is a dupe - ignoring...", (const char*) name );
                 #endif
                 subitem->receivedBeacon(); //FIXME: sent data bit
                 return;
             }
 
             // never seen that - add new item
 
             MScanListItem* item = new MScanListItem( it.current(), "service", "N/A", " ", false, -1, -1 );
             item->setText( col_essid, name );
 
             return;
         }
     }
     qDebug( "D'oh! Received identification, but item not yet in list... ==> Handle this!" );
     MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled service addition %s = %s!",
                                                      (const char*) macaddr.toString(), (const char*) ip ) );
 }
 
 
 void MScanListView::contextMenuRequested( QListViewItem* item, const QPoint&, int col )
 {
     if ( !item ) return;
 
     MScanListItem* itm = static_cast<MScanListItem*>( item );
 
     qDebug( "contextMenuRequested on item '%s' (%s) in column: '%d'",
             (const char*) itm->text(0), (const char*) itm->type, col );
 
     if ( itm->type == "adhoc" || itm->type == "managed" )
     {
         QString entry = QString().sprintf( "&Join %s Net '%s'...", (const char*) itm->type, (const char*) itm->essid() );
 
         QPopupMenu m( this );
         m.insertItem( entry, 37773, 0 );
         int result = m.exec( QCursor::pos() );
         if ( result == 37773 )
             emit joinNetwork( itm->type, itm->essid(), itm->channel(), itm->macaddr() );
     }
 }
 
 //============================================================
 // MScanListItem
 //============================================================
 
 MScanListItem::MScanListItem( QListView* parent, const QString& type, const QString& essid, const QString& macaddr,
                               bool wep, int channel, int signal, bool probed )
                :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ),
                 _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ),
                 _channel( channel ), _signal( signal ), _beacons( 1 )
 {
     #ifdef DEBUG
     qDebug( "creating scanlist item" );
     #endif
 
     if ( WellenreiterConfigWindow::instance() )
         WellenreiterConfigWindow::instance()->performAction( type, essid, macaddr, wep, channel, signal ); // better use signal/slot combination here
 
     decorateItem( type, essid, macaddr, wep, channel, signal, probed );
 }
 
 MScanListItem::MScanListItem( QListViewItem* parent, const QString& type, const QString& essid, const QString& macaddr,
                               bool wep, int channel, int signal )
                :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null )
 {
     #ifdef DEBUG
     qDebug( "creating scanlist item" );
     #endif
     if ( WellenreiterConfigWindow::instance() )
         WellenreiterConfigWindow::instance()->performAction( type, essid, macaddr, wep, channel, signal ); // better use signal/slot combination here
 
     decorateItem( type, essid, macaddr, wep, channel, signal, false );
 }
 
 const QString& MScanListItem::essid() const
 {
     if ( type == "network" )
         return _essid;
     else
         return ( (MScanListItem*) parent() )->essid();
 }
 
 OListViewItem* MScanListItem::childFactory()
 {
     return new MScanListItem( this );
 }
 
 void MScanListItem::serializeTo( QDataStream& s ) const
 {
     #ifdef DEBUG
     qDebug( "serializing MScanListItem" );
     #endif
     OListViewItem::serializeTo( s );
 
     s << _type;
     s << (Q_UINT8) ( _wep ? 'y' : 'n' );
 }
 
 void MScanListItem::serializeFrom( QDataStream& s )
 {
     #ifdef DEBUG
     qDebug( "serializing MScanListItem" );
     #endif
     OListViewItem::serializeFrom( s );
 
     char wep;
     s >> _type;
     s >> (Q_UINT8) wep;
     _wep = (wep == 'y');
 
     QString name;
     name.sprintf( "wellenreiter/%s", (const char*) _type );
     setPixmap( col_type, Resource::loadPixmap( name ) );
     if ( _wep )
         setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap!
     listView()->triggerUpdate();
 }
 
 void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal, bool probed )
 {
     #ifdef DEBUG
     qDebug( "decorating scanlist item %s / %s / %s [%d]",
         (const char*) type,
         (const char*) essid,
         (const char*) macaddr,
         channel );
     #endif
 
     // set icon for managed or adhoc mode
     QString name;
     name.sprintf( "wellenreiter/%s", (const char*) type );
     setPixmap( col_type, Resource::loadPixmap( name ) );
 
     // special case for probed networks FIXME: This is ugly at present
     if ( type == "network" && probed )
     {
         setPixmap( col_type, Resource::loadPixmap( "wellenreiter/network-probed.png" ) );
     }
 
     // set icon for wep (wireless encryption protocol)
     if ( wep )
         setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap!
 
     // set channel and signal text
 
     if ( signal != -1 )
         setText( col_sig, QString::number( signal ) );
     if ( channel != -1 )
         setText( col_channel, QString::number( channel ) );
 
     setText( col_firstseen, QTime::currentTime().toString() );
     //setText( col_lastseen, QTime::currentTime().toString() );
 
     listView()->triggerUpdate();
 
     this->type = type;
     _type = type;
     _essid = essid;
     _macaddr = macaddr;
     _channel = channel;
     _beacons = 1;
     _signal = 0;
 
     if ( WellenreiterConfigWindow::instance()->openTree->isChecked() )
     {
         listView()->ensureItemVisible( this );
     }
 
 }
 
 
 void MScanListItem::setManufacturer( const QString& manufacturer )
 {
     setText( col_manuf, manufacturer );
 }
 
 
 void MScanListItem::setLocation( const QString& location )
 {
     setText( col_location, location );
 }
 
 
 void MScanListItem::receivedBeacon()
 {
     _beacons++;
     #ifdef DEBUG
     qDebug( "MScanListItem %s: received beacon #%d", (const char*) _macaddr, _beacons );
     #endif
     setText( col_sig, QString::number( _beacons ) );
     setText( col_lastseen, QTime::currentTime().toString() );
 
     MScanListItem* p = (MScanListItem*) parent();
     if ( p ) p->receivedBeacon();
 
 }
 
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index cd74bed..43a04e3 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -1,427 +1,422 @@
 /**********************************************************************
-** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
-**
-** This file is part of Opie Environment.
+** Copyright (C) 2002-2004 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** 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.
 **
 ***********************************************************************/
 
 // Local
 
 #include "gps.h"
 #include "wellenreiter.h"
 #include "scanlist.h"
 #include "logwindow.h"
 #include "hexwindow.h"
 #include "configwindow.h"
 #include "statwindow.h"
 #include "graphwindow.h"
 #include "protolistview.h"
 
 // Opie
 
 #ifdef QWS
-#include <opie/odevice.h>
-#include <qpe/qcopenvelope_qws.h>
-using namespace Opie;
-#endif
-
-#ifdef QWS
 #include <opie2/oapplication.h>
+#include <opie2/odevice.h>
 #else
 #include <qapplication.h>
 #endif
 #include <opie2/omanufacturerdb.h>
 #include <opie2/onetwork.h>
 #include <opie2/opcap.h>
+#include <qpe/qcopenvelope_qws.h>
+using namespace Opie;
 
 // Qt
 
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qdatetime.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qmessagebox.h>
 #include <qobjectlist.h>
 #include <qregexp.h>
 #include <qspinbox.h>
 #include <qtimer.h>
 #include <qtoolbutton.h>
 #include <qmainwindow.h>
 
 // Standard
 
 #include <assert.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
 #include <stdlib.h>
 
 Wellenreiter::Wellenreiter( QWidget* parent )
     : WellenreiterBase( parent, 0, 0 ),
       sniffing( false ), iface( 0 ), configwindow( 0 )
 {
 
     logwindow->log( "(i) Wellenreiter has been started." );
 
     //
     // detect operating system
     //
 
     #ifdef QWS
     QString sys;
     sys.sprintf( "(i) Running on '%s'.", (const char*) ODevice::inst()->systemString() );
     _system = ODevice::inst()->system();
     logwindow->log( sys );
     #endif
 
     netview->setColumnWidthMode( 1, QListView::Manual );
     connect( netview, SIGNAL( joinNetwork(const QString&,const QString&,int,const QString&) ),
              this, SLOT( joinNetwork(const QString&,const QString&,int,const QString&) ) );
     pcap = new OPacketCapturer();
 
     gps = new GPS( this );
 
     QTimer::singleShot( 1000, this, SLOT( initialTimer() ) );
 
 }
 
 
 Wellenreiter::~Wellenreiter()
 {
     delete pcap;
 }
 
 
 void Wellenreiter::initialTimer()
 {
     qDebug( "Wellenreiter::preloading manufacturer database..." );
     OManufacturerDB::instance();
 }
 
 
 void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* cw )
 {
     configwindow = cw;
 }
 
 
 void Wellenreiter::channelHopped(int c)
 {
     QString title = "Wellenreiter II -scan- [";
     QString left;
     if ( c > 1 ) left.fill( '.', c-1 );
     title.append( left );
     title.append( '|' );
     if ( c < iface->channels() )
     {
         QString right;
         right.fill( '.', iface->channels()-c );
         title.append( right );
     }
     title.append( "]" );
     //title.append( QString().sprintf( " %02d", c ) );
     assert( parent() );
     ( (QMainWindow*) parent() )->setCaption( title );
 }
 
 
 void Wellenreiter::handleNotification( OPacket* p )
 {
     QObjectList* l = p->queryList();
     QObjectListIt it( *l );
     QObject* o;
 
     while ( (o = it.current()) != 0 )
     {
         QString name = it.current()->name();
         if ( configwindow->parsePackets->isProtocolChecked( name ) )
         {
             QString action = configwindow->parsePackets->protocolAction( name );
             qDebug( "parsePacket-action for '%s' seems to be '%s'", (const char*) name, (const char*) action );
             doAction( action, name, p );
         }
         else
         {
             qDebug( "protocol '%s' not checked in parsePackets.", (const char*) name );
         }
     ++it;
     }
 }
 
 
 void Wellenreiter::handleManagementFrame( OPacket* p, OWaveLanManagementPacket* manage )
 {
     if ( manage->managementType() == "Beacon" ) handleManagementFrameBeacon( p, manage );
     else if ( manage->managementType() == "ProbeRequest" ) handleManagementFrameProbeRequest( p, manage );
     else if ( manage->managementType() == "ProbeResponse" ) handleManagementFrameProbeResponse( p, manage );
     else qWarning( "Wellenreiter::handleManagementFrame(): '%s' - please handle me!", (const char*) manage->managementType() );
 }
 
 
 void Wellenreiter::handleManagementFrameProbeRequest( OPacket* p, OWaveLanManagementPacket* request )
 {
     OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) );
     QString essid = ssid ? ssid->ID( true /* decloak */ ) : QString("<unknown>");
     OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) );
     int channel = ds ? ds->channel() : -1;
     OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) );
 
     GpsLocation loc( -111, -111 );
     if ( configwindow->enableGPS->isChecked() )
     {
         // TODO: add check if GPS is working!?
         qDebug( "Wellenreiter::gathering GPS data..." );
         loc = gps->position();
         qDebug( "Wellenreiter::GPS data received is ( %f , %f ) - dms string = '%s'", loc.latitude(), loc.longitude(), loc.dmsPosition().latin1() );
     }
 
     if ( essid.length() )
         netView()->addNewItem( "adhoc", essid, header->macAddress2(), false /* should check FrameControl field */, -1, 0, loc, true /* only probed */ );
     qDebug( "Wellenreiter::invalid frame [possibly noise] detected!" );
 }
 
 
 void Wellenreiter::handleManagementFrameProbeResponse( OPacket* p, OWaveLanManagementPacket* response )
 {
 }
 
 
 void Wellenreiter::handleManagementFrameBeacon( OPacket* p, OWaveLanManagementPacket* beacon )
 {
     QString type;
     if ( beacon->canIBSS() )
     {
         type = "adhoc";
     }
     else if ( beacon->canESS() )
     {
         type = "managed";
     }
     else
     {
         qWarning( "Wellenreiter::invalid frame [possibly noise] detected!" );
         return;
     }
 
     OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) );
     QString essid = ssid ? ssid->ID( true /* decloak */ ) : QString("<unknown>");
     OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) );
     int channel = ds ? ds->channel() : -1;
 
     OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) );
 
     GpsLocation loc( -111, -111 );
     if ( configwindow->enableGPS->isChecked() )
     {
         // TODO: add check if GPS is working!?
         qDebug( "Wellenreiter::gathering GPS data..." );
         loc = gps->position();
         qDebug( "Wellenreiter::GPS data received is ( %f , %f ) - dms string = '%s'", loc.latitude(), loc.longitude(), loc.dmsPosition().latin1() );
     }
 
     netView()->addNewItem( type, essid, header->macAddress2(), beacon->canPrivacy(), channel, 0, loc );
 
     // update graph window
     if ( ds )
     {
         OPrismHeaderPacket* prism = static_cast<OPrismHeaderPacket*>( p->child( "Prism" ) );
         if ( prism )
             graphwindow->traffic( ds->channel(), prism->signalStrength() );
         else
             graphwindow->traffic( ds->channel(), 95 );
     }
 }
 
 
 void Wellenreiter::handleControlFrame( OPacket* p, OWaveLanControlPacket* control )
 {
     OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) );
 
     if ( control->controlType() == "Acknowledge" )
     {
         netView()->addNewItem( "adhoc", "<unknown>", header->macAddress1(), false, -1, 0, GpsLocation( -111, -111 ) );
     }
     else
     {
         qDebug( "Wellenreiter::handleControlFrame - please handle %s in a future version! :D", (const char*) control->controlType()  );
     }
 }
 
 
 void Wellenreiter::handleWlanData( OPacket* p, OWaveLanDataPacket* data, OMacAddress& from, OMacAddress& to )
 {
     OWaveLanPacket* wlan = (OWaveLanPacket*) p->child( "802.11" );
     if ( wlan->fromDS() && !wlan->toDS() )
     {
         netView()->fromDStraffic( wlan->macAddress3(), wlan->macAddress1(), wlan->macAddress2() );
         from = wlan->macAddress3();
         to = wlan->macAddress2();
     }
     else if ( !wlan->fromDS() && wlan->toDS() )
     {
         netView()->toDStraffic( wlan->macAddress2(), wlan->macAddress3(), wlan->macAddress1() );
         from = wlan->macAddress2();
         to = wlan->macAddress3();
     }
     else if ( wlan->fromDS() && wlan->toDS() )
     {
         netView()->WDStraffic( wlan->macAddress4(), wlan->macAddress3(), wlan->macAddress1(), wlan->macAddress2() );
         from = wlan->macAddress4();
         to = wlan->macAddress3();
     }
     else
     {
         netView()->IBSStraffic( wlan->macAddress2(), wlan->macAddress1(), wlan->macAddress3() );
         from = wlan->macAddress2();
         to = wlan->macAddress1();
     }
 }
 
 
 void Wellenreiter::handleEthernetData( OPacket* p, OEthernetPacket* data, OMacAddress& from, OMacAddress& to )
 {
     from = data->sourceAddress();
     to = data->destinationAddress();
 
     netView()->addNewItem( "station", "<wired>", from, false, -1, 0, GpsLocation( -111, -111 ) );
 }
 
 
 void Wellenreiter::handleARPData( OPacket* p, OARPPacket*, OMacAddress& source, OMacAddress& dest )
 {
     OARPPacket* arp = (OARPPacket*) p->child( "ARP" );
     if ( arp )
     {
         qDebug( "Received ARP traffic (type '%s'): ", (const char*) arp->type() );
         if ( arp->type() == "REQUEST" )
         {
             netView()->identify( arp->senderMacAddress(), arp->senderIPV4Address().toString() );
         }
         else if ( arp->type() == "REPLY" )
         {
             netView()->identify( arp->senderMacAddress(), arp->senderIPV4Address().toString() );
             netView()->identify( arp->targetMacAddress(), arp->targetIPV4Address().toString() );
         }
     }
 }
 
 
 void Wellenreiter::handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& source, OMacAddress& dest )
 {
     //TODO: Implement more IP based protocols
 
     ODHCPPacket* dhcp = (ODHCPPacket*) p->child( "DHCP" );
     if ( dhcp )
     {
         qDebug( "Received DHCP '%s' packet", (const char*) dhcp->type() );
         if ( dhcp->type() == "OFFER" )
         {
             qDebug( "DHCP: '%s' ('%s') seems to be a DHCP server.", (const char*) source.toString(), (const char*) dhcp->serverAddress().toString() );
             netView()->identify( source, dhcp->serverAddress().toString() );
             netView()->addService( "DHCP", source, dhcp->serverAddress().toString() );
         }
         else if ( dhcp->type() == "ACK" )
         {
             qDebug( "DHCP: '%s' ('%s') accepted the offered DHCP address.", (const char*) dhcp->clientMacAddress().toString(), (const char*) dhcp->yourAddress().toString() );
             netView()->identify( dhcp->clientMacAddress(), dhcp->yourAddress().toString() );
         }
     }
 }
 
 
 QObject* Wellenreiter::childIfToParse( OPacket* p, const QString& protocol )
 {
     if ( configwindow->parsePackets->isProtocolChecked( protocol ) )
         if ( configwindow->parsePackets->protocolAction( protocol ) == "Discard!" )
             return 0;
 
     return p->child( protocol );
 }
 
 
 bool Wellenreiter::checkDumpPacket( OPacket* p )
 {
     // go through all child packets and see if one is inside the child hierarchy for p
     // if so, do what the user requested (protocolAction), e.g. pass or discard
     if ( !configwindow->writeCaptureFile->isChecked() )
         return true; // semantic change - we're logging anyway now to /tmp/wellenreiter
 
     QObjectList* l = p->queryList();
     QObjectListIt it( *l );
     QObject* o;
 
     while ( (o = it.current()) != 0 )
     {
         QString name = it.current()->name();
         if ( configwindow->capturePackets->isProtocolChecked( name ) )
         {
             QString action = configwindow->capturePackets->protocolAction( name );
             qDebug( "capturePackets-action for '%s' seems to be '%s'", (const char*) name, (const char*) action );
             if ( action == "Discard" )
             {
                 logwindow->log( QString().sprintf( "(i) dump-discarding of '%s' packet requested.", (const char*) name ) );
                 return false;
             }
         }
         else
         {
             qDebug( "protocol '%s' not checked in capturePackets.", (const char*) name );
         }
     ++it;
     }
     return true;
 }
 
 
 void Wellenreiter::receivePacket( OPacket* p )
 {
     hexWindow()->log( p->dump( 8 ) );
 
     if ( checkDumpPacket( p ) )
     {
         pcap->dump( p );
     }
 
     // check for a management frame
     OWaveLanManagementPacket* manage = static_cast<OWaveLanManagementPacket*>( childIfToParse( p, "802.11 Management" ) );
     if ( manage )
     {
         handleManagementFrame( p, manage );
         return;
     }
 
     // check for a control frame
     OWaveLanControlPacket* control = static_cast<OWaveLanControlPacket*>( childIfToParse( p, "802.11 Control" ) );
     if ( control )
     {
         handleControlFrame( p, control );
         return;
     }
 
     OMacAddress source;
     OMacAddress dest;
 
     //TODO: WEP check here
 
     // check for a wireless data frame
     OWaveLanDataPacket* wlan = static_cast<OWaveLanDataPacket*>( childIfToParse( p, "802.11 Data" ) );
     if ( wlan )
     {
         handleWlanData( p, wlan, source, dest );
     }
 
     // check for a wired data frame
     OEthernetPacket* eth = static_cast<OEthernetPacket*>( childIfToParse( p, "Ethernet" ) );
     if ( eth )
     {
         handleEthernetData( p, eth, source, dest );
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h
index a28740b..745486f 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.h
+++ b/noncore/net/wellenreiter/gui/wellenreiter.h
@@ -1,109 +1,107 @@
 /**********************************************************************
-** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
-**
-** This file is part of Opie Environment.
+** Copyright (C) 2002-2004 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** 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 WELLENREITER_H
 #define WELLENREITER_H
 
 #include "wellenreiterbase.h"
 
 #ifdef QWS
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 using namespace Opie;
 #endif
 
 class QTimerEvent;
 class QPixmap;
 class OPacket;
 class OWaveLanManagementPacket;
 class OWaveLanControlPacket;
 class OWaveLanDataPacket;
 class OEthernetPacket;
 class OARPPacket;
 class OMacAddress;
 class OIPPacket;
 class OPacketCapturer;
 class OWirelessNetworkInterface;
 class WellenreiterConfigWindow;
 class MLogWindow;
 class MHexWindow;
 class GPS;
 
 class Wellenreiter : public WellenreiterBase {
     Q_OBJECT
 
   public:
     Wellenreiter( QWidget* parent = 0 );
     ~Wellenreiter();
 
     void setConfigWindow( WellenreiterConfigWindow* cw );
     MScanListView* netView() const { return netview; };
     MLogWindow* logWindow() const { return logwindow; };
     MHexWindow* hexWindow() const { return hexwindow; };
     bool isDaemonRunning() const { return sniffing; };
     QString captureFileName() const { return dumpname; };
 
   public:
     bool sniffing;
 
   protected:
     virtual void timerEvent( QTimerEvent* );
 
   public slots:
     void initialTimer();
 
     void channelHopped(int);
     void receivePacket(OPacket*);
     void startClicked();
     void stopClicked();
 
     void joinNetwork(const QString&,const QString&,int,const QString&);
 
   signals:
     void startedSniffing();
     void stoppedSniffing();
 
   private:
     void handleManagementFrame( OPacket* p, OWaveLanManagementPacket* );
     void handleManagementFrameBeacon( OPacket* p, OWaveLanManagementPacket* );
     void handleManagementFrameProbeRequest( OPacket* p, OWaveLanManagementPacket* );
     void handleManagementFrameProbeResponse( OPacket* p, OWaveLanManagementPacket* );
     void handleControlFrame( OPacket* p, OWaveLanControlPacket* control );
     void handleWlanData( OPacket* p, OWaveLanDataPacket* data, OMacAddress& from, OMacAddress& to );
     void handleEthernetData( OPacket* p, OEthernetPacket* data, OMacAddress& from, OMacAddress& to );
     void handleARPData( OPacket* p, OARPPacket* arp, OMacAddress& from, OMacAddress& to );
     void handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& from, OMacAddress& to );
     void handleNotification( OPacket* p );
     void doAction( const QString& action, const QString& protocol, OPacket* p );
     QObject* childIfToParse( OPacket* p, const QString& protocol );
     bool checkDumpPacket( OPacket* p );
 
   private:
     #ifdef QWS
     OSystem _system;                // Opie Operating System identifier
     #endif
 
     QString dumpname;
     OWirelessNetworkInterface* iface;
     OPacketCapturer* pcap;
     WellenreiterConfigWindow* configwindow;
     GPS* gps;
 
     //void readConfig();
     //void writeConfig();
 };
 
 
 
 #endif
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
index eac5d89..c2413dc 100644
--- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
@@ -1,185 +1,186 @@
 /**********************************************************************
 ** 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.
 **
 ***********************************************************************/
 
 #include "wellenreiterbase.h"
 
 #include <qheader.h>
 #include <qlabel.h>
 #include <qlistview.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qvariant.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
 #include <qimage.h>
 #include <qpixmap.h>
 
 #include "logwindow.h"
 #include "hexwindow.h"
 #include "scanlist.h"
 #include "statwindow.h"
 #include "graphwindow.h"
 
 #ifdef QWS
 #include <qpe/resource.h>
-#include <opie/otabwidget.h>
+#include <opie2/otabwidget.h>
+using namespace Opie;
 #else
 #include "resource.h"
 #include <qtabwidget.h>
 #endif
 
 
 /*
  *  Constructs a WellenreiterBase which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f' 
  */
 WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags fl )
     : QWidget( parent, name, fl )
 {
     //ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) );
     //ani2 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot90" ) );
     //ani3 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot180" ) );
     //ani4 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot270" ) );
     
     if ( !name )
         setName( "WellenreiterBase" );
     resize( 191, 294 );
 #ifdef QWS
     setCaption( tr( "Wellenreiter/Opie" ) );
 #else
     setCaption( tr( "Wellenreiter/X11" ) );
 #endif
     WellenreiterBaseLayout = new QVBoxLayout( this );
     WellenreiterBaseLayout->setSpacing( 2 );
     WellenreiterBaseLayout->setMargin( 0 );
 #ifdef QWS
     TabWidget = new OTabWidget( this, "TabWidget", OTabWidget::Global );
 #else
     TabWidget = new QTabWidget( this, "TabWidget" );
 #endif
     ap = new QWidget( TabWidget, "ap" );
     apLayout = new QVBoxLayout( ap );
     apLayout->setSpacing( 2 );
     apLayout->setMargin( 2 );
 
     //--------- NETVIEW TAB --------------
 
     netview = new MScanListView( ap );
     apLayout->addWidget( netview );
 
     //--------- GRAPH TAB --------------
 
     graphwindow = new MGraphWindow( TabWidget, "Graph" );
 
     //--------- LOG TAB --------------
 
     logwindow = new MLogWindow( TabWidget, "Log" );
 
     //--------- HEX TAB --------------
 
     hexwindow = new MHexWindow( TabWidget, "Hex" );
 
     //--------- STAT TAB --------------
 
     statwindow = new MStatWindow( TabWidget, "Stat" );
 
     //--------- ABOUT TAB --------------
 
     about = new QWidget( TabWidget, "about" );
     aboutLayout = new QGridLayout( about );
     aboutLayout->setSpacing( 6 );
     aboutLayout->setMargin( 11 );
 
     PixmapLabel1_3_2 = new QLabel( about, "PixmapLabel1_3_2" );
     PixmapLabel1_3_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, PixmapLabel1_3_2->sizePolicy().hasHeightForWidth() ) );
     PixmapLabel1_3_2->setFrameShape( QLabel::Panel );
     PixmapLabel1_3_2->setFrameShadow( QLabel::Sunken );
     PixmapLabel1_3_2->setLineWidth( 2 );
     PixmapLabel1_3_2->setMargin( 0 );
     PixmapLabel1_3_2->setMidLineWidth( 0 );
     PixmapLabel1_3_2->setPixmap(  Resource::loadPixmap( "wellenreiter/logo" ) );
     PixmapLabel1_3_2->setScaledContents( TRUE );
     PixmapLabel1_3_2->setAlignment( int( QLabel::AlignCenter ) );
 
     aboutLayout->addWidget( PixmapLabel1_3_2, 0, 0 );
 
     TextLabel1_4_2 = new QLabel( about, "TextLabel1_4_2" );
     QFont TextLabel1_4_2_font(  TextLabel1_4_2->font() );
     TextLabel1_4_2_font.setFamily( "adobe-helvetica" );
     TextLabel1_4_2_font.setPointSize( 10 );
     TextLabel1_4_2->setFont( TextLabel1_4_2_font );
     TextLabel1_4_2->setText( tr( "<p align=center>\n"
 "<hr>\n"
 "Michael 'Mickey' Lauer<br><hr>\n"
 "Max Moser<br>\n"
 "Martin J. Muench<br>\n"
 "<b>www.wellenreiter.net</b>\n"
 "</p>" ) );
     TextLabel1_4_2->setAlignment( int( QLabel::AlignCenter ) );
 
     aboutLayout->addWidget( TextLabel1_4_2, 1, 0 );
 
 #ifdef QWS
     TabWidget->addTab( ap, "wellenreiter/networks", tr( "Nets" ) );
     TabWidget->addTab( graphwindow, "wellenreiter/graph", tr( "Graph" ) );
     TabWidget->addTab( logwindow, "wellenreiter/log", tr( "Log" ) );
     TabWidget->addTab( hexwindow, "wellenreiter/hex", tr( "Hex" ) );
     TabWidget->addTab( statwindow, "wellenreiter/stat", tr( "Stat" ) );
     TabWidget->addTab( about, "wellenreiter/about", tr( "About" ) );
 #else
     TabWidget->addTab( ap, /* "wellenreiter/networks", */ tr( "Networks" ) );
     TabWidget->addTab( graphwindow, /* "wellenreiter/graph", */ tr( "Graph" ) );
     TabWidget->addTab( logwindow, /* "wellenreiter/log", */ tr( "Log" ) );
     TabWidget->addTab( hexwindow, /* "wellenreiter/hex", */ tr( "Hex" ) );
     TabWidget->addTab( statwindow, /* "wellenreiter/hex", */ tr( "Stat" ) );
     TabWidget->addTab( about, /* "wellenreiter/about", */ tr( "About" ) );
 #endif
     WellenreiterBaseLayout->addWidget( TabWidget );
 
 #ifdef QWS
     TabWidget->setCurrentTab( tr( "Nets" ) );
 #endif
 
 }
 
 /*
  *  Destroys the object and frees any allocated resources
  */
 WellenreiterBase::~WellenreiterBase()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 
 /*  
  *  Main event handler. Reimplemented to handle application
  *  font changes
  */
 bool WellenreiterBase::event( QEvent* ev )
 {
     bool ret = QWidget::event( ev ); 
     if ( ev->type() == QEvent::ApplicationFontChange ) {
 	//QFont Log_2_font(  Log_2->font() );
 	//Log_2_font.setFamily( "adobe-courier" );
 	//Log_2_font.setPointSize( 8 );
 	//Log_2->setFont( Log_2_font ); 
 	QFont TextLabel1_4_2_font(  TextLabel1_4_2->font() );
 	TextLabel1_4_2_font.setFamily( "adobe-helvetica" );
 	TextLabel1_4_2_font.setPointSize( 10 );
 	TextLabel1_4_2->setFont( TextLabel1_4_2_font );
     }
     return ret;
 }
 
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.h b/noncore/net/wellenreiter/gui/wellenreiterbase.h
index e8dc924..2cc273e 100644
--- a/noncore/net/wellenreiter/gui/wellenreiterbase.h
+++ b/noncore/net/wellenreiter/gui/wellenreiterbase.h
@@ -1,76 +1,77 @@
 /**********************************************************************
 ** 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 WELLENREITERBASE_H
 #define WELLENREITERBASE_H
 
 #include <qvariant.h>
 #include <qwidget.h>
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
 class QLabel;
 class MScanListView;
 class MScanListItem;
 class QPushButton;
 class MLogWindow;
 class MHexWindow;
 class MStatWindow;
 class MGraphWindow;
 
 #ifdef QWS
-class OTabWidget;
+#include <opie2/otabwidget.h>
+using namespace Opie;
 #else
 class QTabWidget;
 #endif
 
 class WellenreiterBase : public QWidget
 {
     Q_OBJECT
 
 public:
     WellenreiterBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~WellenreiterBase();
 
 #ifdef QWS
     OTabWidget* TabWidget;
 #else
     QTabWidget* TabWidget;
 #endif
     QWidget* ap;
     MScanListView* netview;
     MLogWindow* logwindow;
     MHexWindow* hexwindow;
     MStatWindow* statwindow;
     MGraphWindow* graphwindow;
     QWidget* about;
     QLabel* PixmapLabel1_3_2;
     QLabel* TextLabel1_4_2;
 
 protected:
     QVBoxLayout* WellenreiterBaseLayout;
     QVBoxLayout* apLayout;
     QGridLayout* aboutLayout;
     bool event( QEvent* );
 
     QPixmap* ani1;
     QPixmap* ani2;
     QPixmap* ani3;
     QPixmap* ani4;
 
 
 };
 
 #endif // WELLENREITERBASE_H