1 files changed, 80 insertions, 11 deletions

diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 0ddc489..d6b708b 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -14,5 +14,5 @@
 

-#include <qmainwindow.h>

 #include <qmessagebox.h>

 

+#ifdef QTE_VERSION 

 #include <qpe/config.h>

@@ -21,4 +21,19 @@
 #include <qpe/qpeapplication.h>

+ #define QLibrary

+#else

+ #include <klibloader.h>

+ #define QLibrary KLibrary

+ #include <kconfig.h>

+ #define Config KConfig

+ #include <kapplication.h>

+ #include <kstandarddirs.h>

+ #include <kiconloader.h>

+ #define showMaximized show

+#endif

 

+#if QT_VERSION < 300

 #include <qlist.h>

+#else

+#include <qptrlist.h>

+#endif

 #include <qdir.h>

@@ -26,2 +41,3 @@
 #include <qtextstream.h>

+#include <qregexp.h>

 

@@ -32,3 +48,3 @@
 

-MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true), advancedUserMode(false), scheme(DEFAULT_SCHEME){

+MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name), advancedUserMode(true), scheme(DEFAULT_SCHEME){

   connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked()));

@@ -44,3 +60,9 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par
   // Load connections.

-  loadModules(QPEApplication::qpeDir() + "/plugins/networksettings");

+  // /usr/local/kde/lib/libinterfaces.la

+#ifdef QTE_VERSION 

+  loadModules(QPEApplication::kdeDir() + "/plugins/networksettings");

+#else

+  loader = KLibLoader::self();

+  loadModules(QString("/usr/")+KStandardDirs::kde_default("lib"));

+#endif

   getAllInterfaces();

@@ -110,2 +132,3 @@ MainWindowImp::~MainWindowImp(){
   

+#ifdef QTE_VERSION

   // Delete Modules and Libraries

@@ -118,2 +141,5 @@ MainWindowImp::~MainWindowImp(){
   }

+#else

+  // klibloader automaticly deletes the libraries for us...

+#endif

 }

@@ -192,3 +218,5 @@ void MainWindowImp::getAllInterfaces(){
 void MainWindowImp::loadModules(const QString &path){

-  //qDebug(path.latin1());

+#ifdef DEBUG

+  qDebug("MainWindowImp::loadModules: %s", path.latin1());

+#endif

   QDir d(path);

@@ -203,3 +231,3 @@ void MainWindowImp::loadModules(const QString &path){
   while ( (fi=it.current()) ) {

-    if(fi->fileName().contains(".so")){

+    if(fi->fileName().contains(".so") && fi->fileName().contains("networksettings_")){

       loadPlugin(path + "/" + fi->fileName());

@@ -217,3 +245,6 @@ void MainWindowImp::loadModules(const QString &path){
 Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &resolveString){

-  //qDebug(QString("MainWindowImp::loadPlugin: %1").arg(pluginFileName).latin1());

+#ifdef DEBUG

+  qDebug("MainWindowImp::loadPlugin: %s", pluginFileName.latin1());

+#endif

+#ifdef QTE_VERSION 

   QLibrary *lib = new QLibrary(pluginFileName);

@@ -221,3 +252,5 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &
   if( !functionPointer ){

-    qDebug(QString("MainWindowImp: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1());

+#ifdef DEBUG

+  qDebug("MainWindowImp::loadPlugin: File: %s is not a plugin, but though was.", pluginFileName.latin1());

+#endif

     delete lib;

@@ -225,3 +258,2 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &
   }

-  

   // Try to get an object.

@@ -229,3 +261,5 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &
   if(object == NULL){

+#ifdef DEBUG

     qDebug("MainWindowImp: Couldn't create object, but did load library!");

+#endif

     delete lib;

@@ -237,2 +271,26 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &
   return object;

+

+#else

+  QLibrary *lib = loader->library(pluginFileName);

+  if( !lib || !lib->hasSymbol(resolveString) ){

+#ifdef DEBUG

+    qDebug(QString("MainWindowImp::loadPlugin: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1());

+#endif

+    return NULL;

+  }

+  // Try to get an object.

+  Module *object = ((Module* (*)()) lib->symbol(resolveString))();

+  if(object == NULL){

+#ifdef DEBUG

+    qDebug("MainWindowImp: Couldn't create object, but did load library!");

+#endif

+    return NULL;

+  }

+#ifdef DEBUG

+  qDebug("MainWindowImp::loadPlugin:: Found object, storing.");

+#endif

+  // Store for deletion later

+  libraries.insert(object, lib);

+  return object;

+#endif

 }

@@ -326,3 +384,3 @@ void MainWindowImp::configureClicked(){
   

-  InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(0, "InterfaceSetupImp", i, true, Qt::WDestructiveClose);

+  InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(this, "InterfaceSetupImp", i, true, Qt::WShowModal | Qt::WDestructiveClose | Qt::WType_Dialog);

   QString currentProfileText = currentProfileLabel->text();

@@ -356,2 +414,5 @@ void MainWindowImp::informationClicked(){
       moduleInformation->showMaximized();

+#ifdef DEBUG

+      qDebug("MainWindowImp::informationClicked:: Module owner has created, we showed.");

+#endif

       return;

@@ -359,4 +420,4 @@ void MainWindowImp::informationClicked(){
   }  

-  InterfaceInformationImp information(0, "InterfaceSetupImp", i);

-  information.showMaximized();

+  InterfaceInformationImp *information = new InterfaceInformationImp(this, "InterfaceSetupImp", i, Qt::WShowModal | Qt::WDestructiveClose | Qt::WType_Dialog);

+  information->showMaximized();

 }

@@ -391,3 +452,7 @@ void MainWindowImp::updateInterface(Interface *i){
   // Update the icons and information 

+#ifdef QTE_VERSION

   item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down")));

+#else

+  item->setPixmap(0, (SmallIcon(i->getStatus() ? "up": "down")));

+#endif

  

@@ -409,3 +474,7 @@ void MainWindowImp::updateInterface(Interface *i){
   

+#ifdef QTE_VERSION

   item->setPixmap(1, (Resource::loadPixmap(QString("networksettings/") + typeName)));

+#else

+  item->setPixmap(1, (SmallIcon(typeName)));

+#endif

   item->setText(2, i->getHardwareName());