Diffstat (limited to 'noncore/net/wellenreiter/gui/scanlist.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index 587faad..a61e808 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp | |||
@@ -17,14 +17,14 @@ | |||
17 | #include "configwindow.h" | 17 | #include "configwindow.h" |
18 | #include "logwindow.h" | 18 | #include "logwindow.h" |
19 | 19 | ||
20 | /* OPIE */ | 20 | /* OPIE */ |
21 | #ifdef QWS | 21 | #ifdef QWS |
22 | #include <opie2/odebug.h> | 22 | #include <opie2/odebug.h> |
23 | #include <opie2/oresource.h> | ||
23 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
24 | #include <qpe/resource.h> | ||
25 | #else | 25 | #else |
26 | #include "resource.h" | 26 | #include "resource.h" |
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | 29 | ||
30 | /* QT */ | 30 | /* QT */ |
@@ -474,15 +474,15 @@ void MScanListItem::serializeFrom( QDataStream& s ) | |||
474 | Q_UINT8 wep; | 474 | Q_UINT8 wep; |
475 | s >> _type; | 475 | s >> _type; |
476 | s >> wep; | 476 | s >> wep; |
477 | _wep = (wep == 'y'); | 477 | _wep = (wep == 'y'); |
478 | 478 | ||
479 | QString name = QString( "wellenreiter/"+ _type ); | 479 | QString name = QString( "wellenreiter/"+ _type ); |
480 | setPixmap( col_type, Resource::loadPixmap( name ) ); | 480 | setPixmap( col_type, Opie::Core::OResource::loadPixmap( name, Opie::Core::OResource::SmallIcon ) ); |
481 | if ( _wep ) | 481 | if ( _wep ) |
482 | setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap! | 482 | setPixmap( col_wep, Opie::Core::OResource::loadPixmap( "wellenreiter/cracked", Opie::Core::OResource::SmallIcon ) ); //FIXME: rename the pixmap! |
483 | listView()->triggerUpdate(); | 483 | listView()->triggerUpdate(); |
484 | } | 484 | } |
485 | 485 | ||
486 | void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal, bool probed ) | 486 | void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal, bool probed ) |
487 | { | 487 | { |
488 | #ifdef DEBUG | 488 | #ifdef DEBUG |
@@ -491,23 +491,23 @@ void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, | |||
491 | << "[" << channel << "]" << oendl; | 491 | << "[" << channel << "]" << oendl; |
492 | #endif | 492 | #endif |
493 | 493 | ||
494 | // set icon for managed or adhoc mode | 494 | // set icon for managed or adhoc mode |
495 | QString name; | 495 | QString name; |
496 | name.sprintf( "wellenreiter/"+ type ); | 496 | name.sprintf( "wellenreiter/"+ type ); |
497 | setPixmap( col_type, Resource::loadPixmap( name ) ); | 497 | setPixmap( col_type, Opie::Core::OResource::loadPixmap( name, Opie::Core::OResource::SmallIcon ) ); |
498 | 498 | ||
499 | // special case for probed networks FIXME: This is ugly at present | 499 | // special case for probed networks FIXME: This is ugly at present |
500 | if ( type == "network" && probed ) | 500 | if ( type == "network" && probed ) |
501 | { | 501 | { |
502 | setPixmap( col_type, Resource::loadPixmap( "wellenreiter/network-probed.png" ) ); | 502 | setPixmap( col_type, Opie::Core::OResource::loadPixmap( "wellenreiter/network-probed", Opie::Core::OResource::SmallIcon ) ); |
503 | } | 503 | } |
504 | 504 | ||
505 | // set icon for wep (wireless encryption protocol) | 505 | // set icon for wep (wireless encryption protocol) |
506 | if ( wep ) | 506 | if ( wep ) |
507 | setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap! | 507 | setPixmap( col_wep, Opie::Core::OResource::loadPixmap( "wellenreiter/cracked", Opie::Core::OResource::SmallIcon ) ); //FIXME: rename the pixmap! |
508 | 508 | ||
509 | // set channel and signal text | 509 | // set channel and signal text |
510 | 510 | ||
511 | if ( signal != -1 ) | 511 | if ( signal != -1 ) |
512 | setText( col_sig, QString::number( signal ) ); | 512 | setText( col_sig, QString::number( signal ) ); |
513 | if ( channel != -1 ) | 513 | if ( channel != -1 ) |