Diffstat (limited to 'noncore/settings/networksettings') (more/less context) (ignore whitespace changes)
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 | |||
@@ -6,7 +6,7 @@ | |||
6 | #include <qgroupbox.h> | 6 | #include <qgroupbox.h> |
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 |
12 | #endif | 12 | #endif |
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 | |||
@@ -14,12 +14,12 @@ | |||
14 | 14 | ||
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> |
25 | #define QLibrary KLibrary | 25 | #define QLibrary KLibrary |
@@ -59,8 +59,8 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par | |||
59 | connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&))); | 59 | connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&))); |
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(); |
66 | loadModules(QString("/usr/")+KStandardDirs::kde_default("lib")); | 66 | loadModules(QString("/usr/")+KStandardDirs::kde_default("lib")); |
@@ -130,7 +130,7 @@ MainWindowImp::~MainWindowImp(){ | |||
130 | delete iIt.key(); | 130 | delete iIt.key(); |
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; |
136 | for( it = libraries.begin(); it != libraries.end(); ++it ){ | 136 | for( it = libraries.begin(); it != libraries.end(); ++it ){ |
@@ -246,7 +246,7 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString & | |||
246 | #ifdef DEBUG | 246 | #ifdef DEBUG |
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); |
252 | if( !functionPointer ){ | 252 | if( !functionPointer ){ |
@@ -382,7 +382,7 @@ void MainWindowImp::configureClicked(){ | |||
382 | } | 382 | } |
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"); |
388 | currentProfileText = ""; | 388 | currentProfileText = ""; |
@@ -418,7 +418,7 @@ void MainWindowImp::informationClicked(){ | |||
418 | return; | 418 | return; |
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 | } |
424 | 424 | ||
@@ -450,7 +450,7 @@ void MainWindowImp::updateInterface(Interface *i){ | |||
450 | item = items[i]; | 450 | item = items[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 |
456 | item->setPixmap(0, (SmallIcon(i->getStatus() ? "up": "down"))); | 456 | item->setPixmap(0, (SmallIcon(i->getStatus() ? "up": "down"))); |
@@ -472,7 +472,7 @@ void MainWindowImp::updateInterface(Interface *i){ | |||
472 | if(i->getModuleOwner() != NULL) | 472 | if(i->getModuleOwner() != NULL) |
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 |
478 | item->setPixmap(1, (SmallIcon(typeName))); | 478 | item->setPixmap(1, (SmallIcon(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 | |||
@@ -9,7 +9,7 @@ class Module; | |||
9 | class Interface; | 9 | class Interface; |
10 | class QLibrary; | 10 | class QLibrary; |
11 | class KProcess; | 11 | class KProcess; |
12 | #ifdef QTE_VERSION | 12 | #ifdef QWS |
13 | class QLibrary; | 13 | class QLibrary; |
14 | #else | 14 | #else |
15 | class KLibrary; | 15 | class KLibrary; |
@@ -58,7 +58,7 @@ private: | |||
58 | 58 | ||
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 |
64 | }; | 64 | }; |
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 | |||
@@ -13,7 +13,7 @@ | |||
13 | #include <qtabwidget.h> | 13 | #include <qtabwidget.h> |
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 |
19 | #define OProcess KProcess | 19 | #define OProcess KProcess |