Resource -> OResource

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
@@ -1,48 +1,48 @@
 /**********************************************************************
 ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Wellenreiter II.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** 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.
 **
 **********************************************************************/
 
 #include "scanlist.h"
 #include "configwindow.h"
 #include "logwindow.h"
 
 /* OPIE */
 #ifdef QWS
 #include <opie2/odebug.h>
+#include <opie2/oresource.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
 #else
 #include "resource.h"
 #endif
 
 
 /* QT */
 #include <qcursor.h>
 #include <qdatetime.h>
 #include <qpopupmenu.h>
 #include <qcheckbox.h>
 
 /* STD */
 #include <assert.h>
 
 using namespace Opie::Core;
 using namespace Opie::Ui;
 using namespace Opie::Net;
 
 const int col_type = 0;
 const int col_essid = 0;
 const int col_sig = 1;
 const int col_ap = 2;
 const int col_channel = 3;
 const int col_wep = 4;
@@ -456,76 +456,76 @@ OListViewItem* MScanListItem::childFactory()
 void MScanListItem::serializeTo( QDataStream& s ) const
 {
     #ifdef DEBUG
     odebug << "serializing MScanListItem" << oendl;
     #endif
     OListViewItem::serializeTo( s );
 
     s << _type;
     s << (Q_UINT8) ( _wep ? 'y' : 'n' );
 }
 
 void MScanListItem::serializeFrom( QDataStream& s )
 {
     #ifdef DEBUG
     odebug << "serializing MScanListItem" << oendl;
     #endif
     OListViewItem::serializeFrom( s );
 
     Q_UINT8 wep;
     s >> _type;
     s >> wep;
     _wep = (wep == 'y');
 
     QString name = QString( "wellenreiter/"+ _type );
-    setPixmap( col_type, Resource::loadPixmap( name ) );
+    setPixmap( col_type, Opie::Core::OResource::loadPixmap( name, Opie::Core::OResource::SmallIcon ) );
     if ( _wep )
-        setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap!
+        setPixmap( col_wep, Opie::Core::OResource::loadPixmap( "wellenreiter/cracked", Opie::Core::OResource::SmallIcon ) ); //FIXME: rename the pixmap!
     listView()->triggerUpdate();
 }
 
 void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal, bool probed )
 {
     #ifdef DEBUG
     odebug << "decorating scanlist item " << type << " / "
            << essid << " / " << macaddr
            << "[" << channel << "]" << oendl;
     #endif
 
     // set icon for managed or adhoc mode
     QString name;
     name.sprintf( "wellenreiter/"+ type );
-    setPixmap( col_type, Resource::loadPixmap( name ) );
+    setPixmap( col_type, Opie::Core::OResource::loadPixmap( name, Opie::Core::OResource::SmallIcon ) );
 
     // special case for probed networks FIXME: This is ugly at present
     if ( type == "network" && probed )
     {
-        setPixmap( col_type, Resource::loadPixmap( "wellenreiter/network-probed.png" ) );
+        setPixmap( col_type, Opie::Core::OResource::loadPixmap( "wellenreiter/network-probed", Opie::Core::OResource::SmallIcon ) );
     }
 
     // set icon for wep (wireless encryption protocol)
     if ( wep )
-        setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap!
+        setPixmap( col_wep, Opie::Core::OResource::loadPixmap( "wellenreiter/cracked", Opie::Core::OResource::SmallIcon ) ); //FIXME: rename the pixmap!
 
     // set channel and signal text
 
     if ( signal != -1 )
         setText( col_sig, QString::number( signal ) );
     if ( channel != -1 )
         setText( col_channel, QString::number( channel ) );
 
     setText( col_firstseen, QTime::currentTime().toString() );
     //setText( col_lastseen, QTime::currentTime().toString() );
 
     listView()->triggerUpdate();
 
     this->type = type;
     _type = type;
     _essid = essid;
     _macaddr = macaddr;
     _channel = channel;
     _beacons = 1;
     _signal = 0;
 
     if ( WellenreiterConfigWindow::instance()->openTree->isChecked() )
     {
         listView()->ensureItemVisible( this );