| -rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 52 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 2 |
2 files changed, 27 insertions, 27 deletions
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index ed9ec14..c605111 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp @@ -106,5 +106,5 @@ OListViewItem* MScanListView::childFactory() void MScanListView::serializeTo( QDataStream& s) const { - odebug << "serializing MScanListView" << oendl; + odebug << "serializing MScanListView" << oendl; OListView::serializeTo( s ); } @@ -113,5 +113,5 @@ void MScanListView::serializeTo( QDataStream& s) const void MScanListView::serializeFrom( QDataStream& s) { - odebug << "serializing MScanListView" << oendl; + odebug << "serializing MScanListView" << oendl; OListView::serializeFrom( s ); } @@ -143,5 +143,5 @@ void MScanListView::addNewItem( const QString& type, { #ifdef DEBUG - odebug << "itemtext: " << item->text( col_essid ) << "" << oendl; + odebug << "itemtext: " << item->text( col_essid ) << "" << oendl; #endif item = static_cast<MScanListItem*> ( item->nextSibling() ); @@ -159,5 +159,5 @@ void MScanListView::addNewItem( const QString& type, { #ifdef DEBUG - odebug << "subitemtext: " << item->text( col_ap ) << "" << oendl; + odebug << "subitemtext: " << item->text( col_ap ) << "" << oendl; #endif item = static_cast<MScanListItem*> ( item->nextSibling() ); @@ -168,5 +168,5 @@ void MScanListView::addNewItem( const QString& type, // we have already seen this item, it's a dupe #ifdef DEBUG - odebug << "" << macaddr << " is a dupe - ignoring..." << oendl; + odebug << "" << macaddr << " is a dupe - ignoring..." << oendl; #endif item->receivedBeacon(); @@ -186,5 +186,5 @@ void MScanListView::addNewItem( const QString& type, #ifdef DEBUG - odebug << "inserting new station " << macaddr << "" << oendl; + odebug << "inserting new station " << macaddr << "" << oendl; #endif @@ -212,5 +212,5 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress& { #ifdef DEBUG - odebug << "subitemtext: " << subitem->text( col_ap ) << "" << oendl; + odebug << "subitemtext: " << subitem->text( col_ap ) << "" << oendl; #endif subitem = static_cast<MScanListItem*> ( subitem->nextSibling() ); @@ -221,5 +221,5 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress& // we have already seen this item, it's a dupe #ifdef DEBUG - odebug << "" << addr.toString(true) << " is a dupe - ignoring..." << oendl; + odebug << "" << addr.toString(true) << " is a dupe - ignoring..." << oendl; #endif subitem->receivedBeacon(); //FIXME: sent data bit @@ -246,5 +246,5 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress& void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo ) { - odebug << "WDSTraffic: " << (const char*) viaFrom.toString() << " and " << viaTo.toString() << " seem to form a WDS" << oendl; + odebug << "WDSTraffic: " << (const char*) viaFrom.toString() << " and " << viaTo.toString() << " seem to form a WDS" << oendl; QString s; MScanListItem* network; @@ -264,5 +264,5 @@ void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to, else { - odebug << "D'Oh! Stations without AP... ignoring for now... will handle this in 1.1 version :-D" << oendl; + odebug << "D'Oh! Stations without AP... ignoring for now... will handle this in 1.1 version :-D" << oendl; MLogWindow::logwindow()->log( "WARNING: Unhandled WSD traffic!" ); } @@ -286,5 +286,5 @@ void MScanListView::toDStraffic( const OMacAddress& from, const OMacAddress& to, else { - odebug << "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" << oendl; + odebug << "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" << oendl; MLogWindow::logwindow()->log( "WARNING: Unhandled toDS traffic!" ); @@ -309,5 +309,5 @@ void MScanListView::fromDStraffic( const OMacAddress& from, const OMacAddress& t else { - odebug << "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" << oendl; + odebug << "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" << oendl; MLogWindow::logwindow()->log( "WARNING: Unhandled fromDS traffic!" ); } @@ -317,5 +317,5 @@ void MScanListView::fromDStraffic( const OMacAddress& from, const OMacAddress& t void MScanListView::IBSStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via ) { - owarn << "D'oh! Not yet implemented..." << oendl; + owarn << "D'oh! Not yet implemented..." << oendl; MLogWindow::logwindow()->log( "WARNING: Unhandled IBSS traffic!" ); } @@ -324,5 +324,5 @@ void MScanListView::IBSStraffic( const OMacAddress& from, const OMacAddress& to, void MScanListView::identify( const OMacAddress& macaddr, const QString& ip ) { - odebug << "identify " << (const char*) macaddr.toString() << " = " << ip << "" << oendl; + odebug << "identify " << (const char*) macaddr.toString() << " = " << ip << "" << oendl; QListViewItemIterator it( this ); @@ -335,5 +335,5 @@ void MScanListView::identify( const OMacAddress& macaddr, const QString& ip ) } } - odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl; + odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl; MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled identification %s = %s!", (const char*) macaddr.toString(), (const char*) ip ) ); @@ -343,5 +343,5 @@ void MScanListView::identify( const OMacAddress& macaddr, const QString& ip ) void MScanListView::addService( const QString& name, const OMacAddress& macaddr, const QString& ip ) { - odebug << "addService '" << (const char*) name << "', Server = " << (const char*) macaddr.toString() << " = " << ip << "" << oendl; + odebug << "addService '" << (const char*) name << "', Server = " << (const char*) macaddr.toString() << " = " << ip << "" << oendl; //TODO: Refactor that out, we need it all over the place. @@ -360,5 +360,5 @@ void MScanListView::addService( const QString& name, const OMacAddress& macaddr, { #ifdef DEBUG - odebug << "subitemtext: " << subitem->text( col_essid ) << "" << oendl; + odebug << "subitemtext: " << subitem->text( col_essid ) << "" << oendl; #endif subitem = static_cast<MScanListItem*> ( subitem->nextSibling() ); @@ -369,5 +369,5 @@ void MScanListView::addService( const QString& name, const OMacAddress& macaddr, // we have already seen this item, it's a dupe #ifdef DEBUG - odebug << "" << name << " is a dupe - ignoring..." << oendl; + odebug << "" << name << " is a dupe - ignoring..." << oendl; #endif subitem->receivedBeacon(); //FIXME: sent data bit @@ -383,5 +383,5 @@ void MScanListView::addService( const QString& name, const OMacAddress& macaddr, } } - odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl; + odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl; MLogWindow::logwindow()->log( QString().sprintf( "WARNING: Unhandled service addition %s = %s!", (const char*) macaddr.toString(), (const char*) ip ) ); @@ -421,5 +421,5 @@ MScanListItem::MScanListItem( QListView* parent, const QString& type, const QStr { #ifdef DEBUG - odebug << "creating scanlist item" << oendl; + odebug << "creating scanlist item" << oendl; #endif @@ -435,5 +435,5 @@ MScanListItem::MScanListItem( QListViewItem* parent, const QString& type, const { #ifdef DEBUG - odebug << "creating scanlist item" << oendl; + odebug << "creating scanlist item" << oendl; #endif if ( WellenreiterConfigWindow::instance() ) @@ -459,5 +459,5 @@ void MScanListItem::serializeTo( QDataStream& s ) const { #ifdef DEBUG - odebug << "serializing MScanListItem" << oendl; + odebug << "serializing MScanListItem" << oendl; #endif OListViewItem::serializeTo( s ); @@ -470,11 +470,11 @@ void MScanListItem::serializeFrom( QDataStream& s ) { #ifdef DEBUG - odebug << "serializing MScanListItem" << oendl; + odebug << "serializing MScanListItem" << oendl; #endif OListViewItem::serializeFrom( s ); - char wep; + Q_UINT8 wep; s >> _type; - s >> (Q_UINT8) wep; + s >> wep; _wep = (wep == 'y'); @@ -556,5 +556,5 @@ void MScanListItem::receivedBeacon() _beacons++; #ifdef DEBUG - odebug << "MScanListItem " << _macaddr << ": received beacon #" << _beacons << "" << oendl; + odebug << "MScanListItem " << _macaddr << ": received beacon #" << _beacons << "" << oendl; #endif setText( col_sig, QString::number( _beacons ) ); diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 822bde8..40cd105 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp @@ -587,5 +587,5 @@ void Wellenreiter::startClicked() pcap->open( interface ); else - pcap->open( QFile( interface ) ); + pcap->openCaptureFile( interface ); odebug << "Wellenreiter:: dumping to " << dumpname << "" << oendl; |