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 @@ -8,3 +8,3 @@ -#ifdef QTE_VERSION +#ifdef QWS #else 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 @@ -16,3 +16,3 @@ -#ifdef QTE_VERSION
+#ifdef QWS
#include <qpe/config.h>
@@ -21,3 +21,3 @@ #include <qpe/qpeapplication.h>
- #define QLibrary
+// #define QLibrary Library
#else
@@ -61,4 +61,4 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par // /usr/local/kde/lib/libinterfaces.la
-#ifdef QTE_VERSION
- loadModules(QPEApplication::kdeDir() + "/plugins/networksettings");
+#ifdef QWS
+ loadModules(QPEApplication::qpeDir() + "/plugins/networksettings");
#else
@@ -132,3 +132,3 @@ MainWindowImp::~MainWindowImp(){ -#ifdef QTE_VERSION
+#ifdef QWS
// Delete Modules and Libraries
@@ -248,3 +248,3 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString & #endif
-#ifdef QTE_VERSION
+#ifdef QWS
QLibrary *lib = new QLibrary(pluginFileName);
@@ -384,3 +384,3 @@ void MainWindowImp::configureClicked(){ - InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(this, "InterfaceSetupImp", i, true, Qt::WShowModal | Qt::WDestructiveClose | Qt::WType_Dialog);
+ InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(this, "InterfaceSetupImp", i, true, Qt::WType_Modal | Qt::WDestructiveClose | Qt::WStyle_Dialog);
QString currentProfileText = currentProfileLabel->text();
@@ -420,3 +420,3 @@ void MainWindowImp::informationClicked(){ }
- InterfaceInformationImp *information = new InterfaceInformationImp(this, "InterfaceSetupImp", i, Qt::WShowModal | Qt::WDestructiveClose | Qt::WType_Dialog);
+ InterfaceInformationImp *information = new InterfaceInformationImp(this, "InterfaceSetupImp", i, Qt::WType_Modal | Qt::WDestructiveClose | Qt::WStyle_Dialog);
information->showMaximized();
@@ -452,3 +452,3 @@ void MainWindowImp::updateInterface(Interface *i){ // Update the icons and information
-#ifdef QTE_VERSION
+#ifdef QWS
item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down")));
@@ -474,3 +474,3 @@ void MainWindowImp::updateInterface(Interface *i){ -#ifdef QTE_VERSION
+#ifdef QWS
item->setPixmap(1, (Resource::loadPixmap(QString("networksettings/") + typeName)));
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 @@ -11,3 +11,3 @@ class QLibrary; class KProcess;
-#ifdef QTE_VERSION
+#ifdef QWS
class QLibrary;
@@ -60,3 +60,3 @@ private: QString scheme;
-#ifndef QTE_VERSION
+#ifndef QWS
KLibLoader *loader;
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 @@ -15,3 +15,3 @@ -#ifdef QTE_VERSION +#ifdef QWS #include <opie/oprocess.h> |