3 files changed, 15 insertions, 19 deletions
diff --git a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
index a7b0bdc..650e634 100644
--- a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
@@ -11,2 +11,4 @@
 #include <opie2/oprocess.h>
+#include <opie2/oresource.h>
+
 #include <qpe/applnk.h>
@@ -16,3 +18,2 @@
 #include <qpe/qlibrary.h>
-#include <qpe/resource.h>
 
@@ -534,9 +535,3 @@ void MainWindowImp::updateInterface(Interface *i)
     // Update the icons and information
-#ifdef QWS
-    QPixmap pic;
-    pic.convertFromImage( Resource::loadImage( i->getStatus() ? "up": "down" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
-    item->setPixmap(0, ( pic ));
-#else
-    item->setPixmap(0, (SmallIcon(i->getStatus() ? "up": "down")));
-#endif
+    item->setPixmap( 0, Opie::Core::OResource::loadPixmap( i->getStatus() ? "up" : "down", Opie::Core::OResource::SmallIcon ) );
 
@@ -558,7 +553,4 @@ void MainWindowImp::updateInterface(Interface *i)
 
-#ifdef QWS
-    item->setPixmap(1, (Resource::loadPixmap(QString("networksettings/") + typeName)));
-#else
-    item->setPixmap(1, (SmallIcon(typeName)));
-#endif
+    item->setPixmap( 1, ( Opie::Core::OResource::loadPixmap( "networksettings/" + typeName, Opie::Core::OResource::SmallIcon ) ) );
+    
     item->setText(2, i->getHardwareName());
@@ -784,3 +776,3 @@ void MainWindowImp::initHostname()
 
-void MainWindowImp::slotHostname(Opie::Core::OProcess *proc, char *buffer, int buflen)
+void MainWindowImp::slotHostname(Opie::Core::OProcess */*proc*/, char *buffer, int buflen)
 {
diff --git a/noncore/settings/networksettings/ppp/edit.cpp b/noncore/settings/networksettings/ppp/edit.cpp
index 6c9735c..0abf161 100644
--- a/noncore/settings/networksettings/ppp/edit.cpp
+++ b/noncore/settings/networksettings/ppp/edit.cpp
@@ -31,3 +31,5 @@
 /* OPIE */
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
+
+#include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
@@ -85,5 +87,7 @@ DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount
     up = new QPushButton(this);
-    up->setPixmap( Resource::loadPixmap("up") );
+    up->setPixmap( Opie::Core::OResource::loadPixmap("up", Opie::Core::OResource::SmallIcon) );
+    up->setMinimumHeight( AppLnk::smallIconSize()+4 );
     down = new QPushButton(this);
-    down->setPixmap( Resource::loadPixmap("down") );
+    down->setPixmap( Opie::Core::OResource::loadPixmap("down", Opie::Core::OResource::SmallIcon) );
+    down->setMinimumHeight( AppLnk::smallIconSize()+4 );
     lpn1->addWidget(add);
diff --git a/noncore/settings/networksettings/wlan/wlanimp2.cpp b/noncore/settings/networksettings/wlan/wlanimp2.cpp
index 2fd97c3..0c18bcc 100644
--- a/noncore/settings/networksettings/wlan/wlanimp2.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp2.cpp
@@ -14,3 +14,3 @@
 #include <opie2/opcap.h>
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
 using namespace Opie::Core;
@@ -604,3 +604,3 @@ void WLANImp::displayFoundNetwork( const QString& mode, int channel, const QStri
         name.sprintf( "networksettings/%s", (const char*) mode );
-        item->setPixmap( col_mode, Resource::loadPixmap( name ) );
+        item->setPixmap( col_mode, Opie::Core::OResource::loadPixmap( name, Opie::Core::OResource::SmallIcon ) );
         qApp->processEvents();