summaryrefslogtreecommitdiff
path: root/noncore/net/wellenreiter/gui/scanlist.cpp
Side-by-side diff
Diffstat (limited to 'noncore/net/wellenreiter/gui/scanlist.cpp') (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.cpp59
1 files changed, 29 insertions, 30 deletions
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index d5665b4..809d0bd 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -19,5 +19,4 @@
#include <assert.h>
-#include "manufacturers.h"
#include <qdatetime.h>
#include <qtextstream.h>
@@ -48,5 +47,5 @@ const int col_lastseen = 9;
MScanListView::MScanListView( QWidget* parent, const char* name )
- :OListView( parent, name ), _manufacturerdb( 0 )
+ :OListView( parent, name )
{
@@ -78,8 +77,10 @@ MScanListView::MScanListView( QWidget* parent, const char* name )
};
+
MScanListView::~MScanListView()
{
};
+
OListViewItem* MScanListView::childFactory()
{
@@ -87,4 +88,5 @@ OListViewItem* MScanListView::childFactory()
}
+
void MScanListView::serializeTo( QDataStream& s) const
{
@@ -93,4 +95,5 @@ void MScanListView::serializeTo( QDataStream& s) const
}
+
void MScanListView::serializeFrom( QDataStream& s)
{
@@ -99,12 +102,8 @@ void MScanListView::serializeFrom( QDataStream& s)
}
-void MScanListView::setManufacturerDB( ManufacturerDB* manufacturerdb )
-{
- _manufacturerdb = manufacturerdb;
-}
-void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal )
+void MScanListView::addNewItem( const QString& type, const QString& essid, const OMacAddress& mac, bool wep, int channel, int signal )
{
- // FIXME: scanlistitem needs a proper encapsulation and not such a damn dealing with text(...)
+ QString macaddr = mac.toString(true);
#ifdef DEBUG
@@ -169,6 +168,5 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo
MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal );
- if ( _manufacturerdb )
- station->setManufacturer( _manufacturerdb->lookup( macaddr ) );
+ station->setManufacturer( mac.manufacturer() );
if ( type == "managed" )
@@ -185,9 +183,9 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo
-void MScanListView::addIfNotExisting( MScanListItem* network, QString addr, const QString& type )
+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 ) )
+ while ( subitem && ( subitem->text( col_ap ) != addr.toString(true) ) )
{
#ifdef DEBUG
@@ -201,5 +199,5 @@ void MScanListView::addIfNotExisting( MScanListItem* network, QString addr, cons
// we have already seen this item, it's a dupe
#ifdef DEBUG
- qDebug( "%s is a dupe - ignoring...", (const char*) addr );
+ qDebug( "%s is a dupe - ignoring...", (const char*) addr.toString(true) );
#endif
subitem->receivedBeacon(); //FIXME: sent data bit
@@ -208,7 +206,6 @@ void MScanListView::addIfNotExisting( MScanListItem* network, QString addr, cons
// Hey, it seems to be a new item :-D
- MScanListItem* station = new MScanListItem( network, type, /* network->text( col_essid ) */ "", addr, false, -1, -1 );
- if ( _manufacturerdb )
- station->setManufacturer( _manufacturerdb->lookup( addr ) );
+ MScanListItem* station = new MScanListItem( network, type, /* network->text( col_essid ) */ "", addr.toString(true), false, -1, -1 );
+ station->setManufacturer( addr.manufacturer() );
QString s;
@@ -225,5 +222,5 @@ void MScanListView::addIfNotExisting( MScanListItem* network, QString addr, cons
-void MScanListView::WDStraffic( QString from, QString to, QString viaFrom, QString viaTo )
+void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo )
{
QString s;
@@ -232,6 +229,6 @@ void MScanListView::WDStraffic( QString from, QString to, QString viaFrom, QStri
QListViewItemIterator it( this );
while ( it.current() &&
- it.current()->text( col_ap ) != viaFrom &&
- it.current()->text( col_ap ) != viaTo ) ++it;
+ it.current()->text( col_ap ) != viaFrom.toString(true) &&
+ it.current()->text( col_ap ) != viaTo.toString(true) ) ++it;
MScanListItem* item = static_cast<MScanListItem*>( it.current() );
@@ -250,5 +247,5 @@ void MScanListView::WDStraffic( QString from, QString to, QString viaFrom, QStri
-void MScanListView::toDStraffic( QString from, QString to, QString via )
+void MScanListView::toDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via )
{
QString s;
@@ -256,5 +253,5 @@ void MScanListView::toDStraffic( QString from, QString to, QString via )
QListViewItemIterator it( this );
- while ( it.current() && it.current()->text( col_ap ) != via ) ++it;
+ while ( it.current() && it.current()->text( col_ap ) != via.toString(true) ) ++it;
MScanListItem* item = static_cast<MScanListItem*>( it.current() );
@@ -273,5 +270,5 @@ void MScanListView::toDStraffic( QString from, QString to, QString via )
-void MScanListView::fromDStraffic( QString from, QString to, QString via )
+void MScanListView::fromDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via )
{
QString s;
@@ -279,5 +276,5 @@ void MScanListView::fromDStraffic( QString from, QString to, QString via )
QListViewItemIterator it( this );
- while ( it.current() && it.current()->text( col_ap ) != via ) ++it;
+ while ( it.current() && it.current()->text( col_ap ) != via.toString(true) ) ++it;
MScanListItem* item = static_cast<MScanListItem*>( it.current() );
@@ -295,5 +292,5 @@ void MScanListView::fromDStraffic( QString from, QString to, QString via )
-void MScanListView::IBSStraffic( QString from, QString to, QString via )
+void MScanListView::IBSStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via )
{
qWarning( "D'oh! Not yet implemented..." );
@@ -302,12 +299,12 @@ void MScanListView::IBSStraffic( QString from, QString to, QString via )
-void MScanListView::identify( const QString& macaddr, const QString& ip )
+void MScanListView::identify( const OMacAddress& macaddr, const QString& ip )
{
- qDebug( "identify %s = %s", (const char*) macaddr, (const char*) 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 )
+ if ( it.current()->text( col_ap ) == macaddr.toString(true) )
{
it.current()->setText( col_ip, ip );
@@ -317,5 +314,5 @@ void MScanListView::identify( const QString& macaddr, const QString& ip )
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, (const char*) ip ) );
+ (const char*) macaddr.toString(), (const char*) ip ) );
}
@@ -451,6 +448,8 @@ void MScanListItem::receivedBeacon()
setText( col_sig, QString::number( _beacons ) );
setText( col_lastseen, QTime::currentTime().toString() );
- if ( WellenreiterConfigWindow::instance() )
- playSound( WellenreiterConfigWindow::instance()->soundOnBeacon() );
+
+ MScanListItem* p = (MScanListItem*) parent();
+ if ( p ) p->receivedBeacon();
+
}