1 files changed, 10 insertions, 14 deletions

diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h
index 4cb9216..253c166 100644
--- a/noncore/net/wellenreiter/gui/scanlist.h
+++ b/noncore/net/wellenreiter/gui/scanlist.h
@@ -7,61 +7,57 @@
 ** 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 SCANLIST_H
 #define SCANLIST_H
 
+/* OPIE */
 #include <opie2/olistview.h>
+#include <opie2/onetutils.h>
 
+/* QT */
 #include <qtextstream.h>
 
 class QString;
-class ManufacturerDB;
-
 class MScanListItem;
 
 class MScanListView: public OListView
 {
   Q_OBJECT
 
   public:
     MScanListView( QWidget* parent = 0, const char* name = 0 );
     virtual ~MScanListView();
 
-    void setManufacturerDB( ManufacturerDB* manufacturerdb );
-
     virtual OListViewItem* childFactory();
     virtual void serializeTo( QDataStream& s ) const;
     virtual void serializeFrom( QDataStream& s );
 
   public slots:
-    void addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal );
-    void fromDStraffic( QString from, QString to, QString via ); // NYI
-    void toDStraffic( QString from, QString to, QString via );
-    void WDStraffic( QString from, QString to, QString viaFrom, QString viaTo );
-    void IBSStraffic( QString from, QString to, QString via ); // NYI
+    void addNewItem( const QString& type, const QString& essid, const OMacAddress& macaddr, bool wep, int channel, int signal );
+    void fromDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via );
+    void toDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via );
+    void WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo );
+    void IBSStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via );
 
-    void identify( const QString& macaddr, const QString& ipaddr );
+    void identify( const OMacAddress&, const QString& ipaddr );
 
   protected:
-    void addIfNotExisting( MScanListItem* parent, QString addr, const QString& type = "station" );
-
-  private:
-    ManufacturerDB* _manufacturerdb;
+    void addIfNotExisting( MScanListItem* parent, const OMacAddress& addr, const QString& type = "station" );
 
 };
 
 //****************************** MScanListItem ****************************************************************
 
 class MScanListItem: public OListViewItem
 {
   public:
     MScanListItem::MScanListItem( QListView* parent,
                                   QString type = "unknown",
                                   QString essid = "unknown",
                                   QString macaddr = "unknown",