summaryrefslogtreecommitdiff
path: root/noncore/net/wellenreiter/gui/scanlist.cpp
Unidiff
Diffstat (limited to 'noncore/net/wellenreiter/gui/scanlist.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index c605111..9e8aa72 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -126,14 +126,15 @@ void MScanListView::addNewItem( const QString& type,
126 const GpsLocation& loc, 126 const GpsLocation& loc,
127 bool probe ) 127 bool probe )
128{ 128{
129 QString macaddr = mac.toString(true); 129 QString macaddr = mac.toString(true);
130 130
131 #ifdef DEBUG 131 #ifdef DEBUG
132 qDebug( "MScanList::addNewItem( %s / %s / %s [%d]", (const char*) type, 132 odebug << "MScanList::addNewItem( " << (const char*) type << " / "
133 (const char*) essid, (const char*) macaddr, channel ); 133 << (const char*) essid << " / " << (const char*) macaddr
134 << " [" << channel << "]" << oendl;
134 #endif 135 #endif
135 136
136 // search, if we already have seen this net 137 // search, if we already have seen this net
137 138
138 QString s; 139 QString s;
139 MScanListItem* network; 140 MScanListItem* network;
@@ -391,14 +392,14 @@ void MScanListView::addService( const QString& name, const OMacAddress& macaddr,
391void MScanListView::contextMenuRequested( QListViewItem* item, const QPoint&, int col ) 392void MScanListView::contextMenuRequested( QListViewItem* item, const QPoint&, int col )
392{ 393{
393 if ( !item ) return; 394 if ( !item ) return;
394 395
395 MScanListItem* itm = static_cast<MScanListItem*>( item ); 396 MScanListItem* itm = static_cast<MScanListItem*>( item );
396 397
397 qDebug( "contextMenuRequested on item '%s' (%s) in column: '%d'", 398 odebug << "contextMenuRequested on item '" << (const char*) itm->text(0) << "' ("
398 (const char*) itm->text(0), (const char*) itm->type, col ); 399 << (const char*) itm->type << ") in column: '" << col << "'" << oendl;
399 400
400 if ( itm->type == "adhoc" || itm->type == "managed" ) 401 if ( itm->type == "adhoc" || itm->type == "managed" )
401 { 402 {
402 QString entry = QString().sprintf( "&Join %s Net '%s'...", (const char*) itm->type, (const char*) itm->essid() ); 403 QString entry = QString().sprintf( "&Join %s Net '%s'...", (const char*) itm->type, (const char*) itm->essid() );
403 404
404 QPopupMenu m( this ); 405 QPopupMenu m( this );
@@ -486,17 +487,15 @@ void MScanListItem::serializeFrom( QDataStream& s )
486 listView()->triggerUpdate(); 487 listView()->triggerUpdate();
487} 488}
488 489
489void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal, bool probed ) 490void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal, bool probed )
490{ 491{
491 #ifdef DEBUG 492 #ifdef DEBUG
492 qDebug( "decorating scanlist item %s / %s / %s [%d]", 493 odebug << "decorating scanlist item " << (const char*) type << " / "
493 (const char*) type, 494 << (const char*) essid << " / " << (const char*) macaddr
494 (const char*) essid, 495 << "[" << channel << "]" << oendl;
495 (const char*) macaddr,
496 channel );
497 #endif 496 #endif
498 497
499 // set icon for managed or adhoc mode 498 // set icon for managed or adhoc mode
500 QString name; 499 QString name;
501 name.sprintf( "wellenreiter/%s", (const char*) type ); 500 name.sprintf( "wellenreiter/%s", (const char*) type );
502 setPixmap( col_type, Resource::loadPixmap( name ) ); 501 setPixmap( col_type, Resource::loadPixmap( name ) );