summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp2
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp20
-rw-r--r--noncore/settings/networksettings/mainwindowimp.h4
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp2
4 files changed, 14 insertions, 14 deletions
diff --git a/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp b/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp
index 15293fd..e00dcce 100644
--- a/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp
+++ b/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp
@@ -7,5 +7,5 @@
7#include <qmessagebox.h> 7#include <qmessagebox.h>
8 8
9#ifdef QTE_VERSION 9#ifdef QWS
10#else 10#else
11 #define showMaximized show 11 #define showMaximized show
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index d6b708b..581b7e3 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -15,10 +15,10 @@
15#include <qmessagebox.h> 15#include <qmessagebox.h>
16 16
17#ifdef QTE_VERSION 17#ifdef QWS
18 #include <qpe/config.h> 18 #include <qpe/config.h>
19 #include <qpe/qlibrary.h> 19 #include <qpe/qlibrary.h>
20 #include <qpe/resource.h> 20 #include <qpe/resource.h>
21 #include <qpe/qpeapplication.h> 21 #include <qpe/qpeapplication.h>
22 #define QLibrary 22// #define QLibrary Library
23#else 23#else
24 #include <klibloader.h> 24 #include <klibloader.h>
@@ -60,6 +60,6 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par
60 // Load connections. 60 // Load connections.
61 // /usr/local/kde/lib/libinterfaces.la 61 // /usr/local/kde/lib/libinterfaces.la
62#ifdef QTE_VERSION 62#ifdef QWS
63 loadModules(QPEApplication::kdeDir() + "/plugins/networksettings"); 63 loadModules(QPEApplication::qpeDir() + "/plugins/networksettings");
64#else 64#else
65 loader = KLibLoader::self(); 65 loader = KLibLoader::self();
@@ -131,5 +131,5 @@ MainWindowImp::~MainWindowImp(){
131 } 131 }
132 132
133#ifdef QTE_VERSION 133#ifdef QWS
134 // Delete Modules and Libraries 134 // Delete Modules and Libraries
135 QMap<Module*, QLibrary*>::Iterator it; 135 QMap<Module*, QLibrary*>::Iterator it;
@@ -247,5 +247,5 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &
247 qDebug("MainWindowImp::loadPlugin: %s", pluginFileName.latin1()); 247 qDebug("MainWindowImp::loadPlugin: %s", pluginFileName.latin1());
248#endif 248#endif
249#ifdef QTE_VERSION 249#ifdef QWS
250 QLibrary *lib = new QLibrary(pluginFileName); 250 QLibrary *lib = new QLibrary(pluginFileName);
251 void *functionPointer = lib->resolve(resolveString); 251 void *functionPointer = lib->resolve(resolveString);
@@ -383,5 +383,5 @@ void MainWindowImp::configureClicked(){
383 } 383 }
384 384
385 InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(this, "InterfaceSetupImp", i, true, Qt::WShowModal | Qt::WDestructiveClose | Qt::WType_Dialog); 385 InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(this, "InterfaceSetupImp", i, true, Qt::WType_Modal | Qt::WDestructiveClose | Qt::WStyle_Dialog);
386 QString currentProfileText = currentProfileLabel->text(); 386 QString currentProfileText = currentProfileLabel->text();
387 if(currentProfileText.upper() == "ALL"); 387 if(currentProfileText.upper() == "ALL");
@@ -419,5 +419,5 @@ void MainWindowImp::informationClicked(){
419 } 419 }
420 } 420 }
421 InterfaceInformationImp *information = new InterfaceInformationImp(this, "InterfaceSetupImp", i, Qt::WShowModal | Qt::WDestructiveClose | Qt::WType_Dialog); 421 InterfaceInformationImp *information = new InterfaceInformationImp(this, "InterfaceSetupImp", i, Qt::WType_Modal | Qt::WDestructiveClose | Qt::WStyle_Dialog);
422 information->showMaximized(); 422 information->showMaximized();
423} 423}
@@ -451,5 +451,5 @@ void MainWindowImp::updateInterface(Interface *i){
451 451
452 // Update the icons and information 452 // Update the icons and information
453#ifdef QTE_VERSION 453#ifdef QWS
454 item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down"))); 454 item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down")));
455#else 455#else
@@ -473,5 +473,5 @@ void MainWindowImp::updateInterface(Interface *i){
473 typeName = i->getModuleOwner()->getPixmapName(i); 473 typeName = i->getModuleOwner()->getPixmapName(i);
474 474
475#ifdef QTE_VERSION 475#ifdef QWS
476 item->setPixmap(1, (Resource::loadPixmap(QString("networksettings/") + typeName))); 476 item->setPixmap(1, (Resource::loadPixmap(QString("networksettings/") + typeName)));
477#else 477#else
diff --git a/noncore/settings/networksettings/mainwindowimp.h b/noncore/settings/networksettings/mainwindowimp.h
index 2ebf304..49f3eea 100644
--- a/noncore/settings/networksettings/mainwindowimp.h
+++ b/noncore/settings/networksettings/mainwindowimp.h
@@ -10,5 +10,5 @@ class Interface;
10class QLibrary; 10class QLibrary;
11class KProcess; 11class KProcess;
12#ifdef QTE_VERSION 12#ifdef QWS
13class QLibrary; 13class QLibrary;
14#else 14#else
@@ -59,5 +59,5 @@ private:
59 bool advancedUserMode; 59 bool advancedUserMode;
60 QString scheme; 60 QString scheme;
61#ifndef QTE_VERSION 61#ifndef QWS
62 KLibLoader *loader; 62 KLibLoader *loader;
63#endif 63#endif
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 57266bb..8bf004f 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -14,5 +14,5 @@
14#include <qcombobox.h> 14#include <qcombobox.h>
15 15
16#ifdef QTE_VERSION 16#ifdef QWS
17 #include <opie/oprocess.h> 17 #include <opie/oprocess.h>
18#else 18#else