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
@@ -13,14 +13,14 @@
 #include <qlabel.h>
 
 #include <qmessagebox.h>
 
-#ifdef QTE_VERSION 
+#ifdef QWS 
  #include <qpe/config.h>
  #include <qpe/qlibrary.h>
  #include <qpe/resource.h>
  #include <qpe/qpeapplication.h>
- #define QLibrary
+// #define QLibrary Library
 #else
  #include <klibloader.h>
  #define QLibrary KLibrary
  #include <kconfig.h>
@@ -58,10 +58,10 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par
 
   connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&)));  
   // Load connections.
   // /usr/local/kde/lib/libinterfaces.la
-#ifdef QTE_VERSION 
-  loadModules(QPEApplication::kdeDir() + "/plugins/networksettings");
+#ifdef QWS 
+  loadModules(QPEApplication::qpeDir() + "/plugins/networksettings");
 #else
   loader = KLibLoader::self();
   loadModules(QString("/usr/")+KStandardDirs::kde_default("lib"));
 #endif
@@ -129,9 +129,9 @@ MainWindowImp::~MainWindowImp(){
     if(iIt.key()->getModuleOwner() == NULL)
       delete iIt.key();
   }
   
-#ifdef QTE_VERSION
+#ifdef QWS
   // Delete Modules and Libraries
   QMap<Module*, QLibrary*>::Iterator it;
   for( it = libraries.begin(); it != libraries.end(); ++it ){
     delete it.key();
@@ -245,9 +245,9 @@ void MainWindowImp::loadModules(const QString &path){
 Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &resolveString){
 #ifdef DEBUG
   qDebug("MainWindowImp::loadPlugin: %s", pluginFileName.latin1());
 #endif
-#ifdef QTE_VERSION 
+#ifdef QWS 
   QLibrary *lib = new QLibrary(pluginFileName);
   void *functionPointer = lib->resolve(resolveString);
   if( !functionPointer ){
 #ifdef DEBUG
@@ -381,9 +381,9 @@ void MainWindowImp::configureClicked(){
       return;
     }
   }
   
-  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();
   if(currentProfileText.upper() == "ALL");
     currentProfileText = "";
   configure->setProfile(currentProfileText);
@@ -417,9 +417,9 @@ void MainWindowImp::informationClicked(){
 #endif
       return;
     }
   } 
-  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();
 }
 
 /**
@@ -449,9 +449,9 @@ void MainWindowImp::updateInterface(Interface *i){
   else
     item = items[i];
  
   // Update the icons and information 
-#ifdef QTE_VERSION
+#ifdef QWS
   item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down")));
 #else
   item->setPixmap(0, (SmallIcon(i->getStatus() ? "up": "down")));
 #endif
@@ -471,9 +471,9 @@ void MainWindowImp::updateInterface(Interface *i){
   // Actually try to use the Module
   if(i->getModuleOwner() != NULL)
     typeName = i->getModuleOwner()->getPixmapName(i);
   
-#ifdef QTE_VERSION
+#ifdef QWS
   item->setPixmap(1, (Resource::loadPixmap(QString("networksettings/") + typeName)));
 #else
   item->setPixmap(1, (SmallIcon(typeName)));
 #endif