author | kergoth <kergoth> | 2003-04-09 18:10:11 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-09 18:10:11 (UTC) |
commit | bacff63f1e4915c683a409e81b18ffcf5aeceda3 (patch) (side-by-side diff) | |
tree | a1b898223bd132a29964ec28a89c0756fa9828cf /noncore/settings/networksettings/mainwindowimp.cpp | |
parent | dc219288ae070e0fe91e2d7da768d620f8b91592 (diff) | |
download | opie-bacff63f1e4915c683a409e81b18ffcf5aeceda3.zip opie-bacff63f1e4915c683a409e81b18ffcf5aeceda3.tar.gz opie-bacff63f1e4915c683a409e81b18ffcf5aeceda3.tar.bz2 |
Make networksettings actually compile again. Fix the ifdef on non-kde to actually work, and killed off more references to qt3 widget flags.
Diffstat (limited to 'noncore/settings/networksettings/mainwindowimp.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
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)));
|