summaryrefslogtreecommitdiff
path: root/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
Side-by-side diff
Diffstat (limited to 'noncore/settings/networksettings/mainwindow/mainwindowimp.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/mainwindow/mainwindowimp.cpp20
1 files changed, 6 insertions, 14 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)
{