7 files changed, 111 insertions, 40 deletions

diff --git a/noncore/settings/networksettings/.cvsignore b/noncore/settings/networksettings/.cvsignore
index 1ba7ac7..e000724 100644
--- a/noncore/settings/networksettings/.cvsignore
+++ b/noncore/settings/networksettings/.cvsignore
@@ -22,2 +22,8 @@ networksetup
 systemadvanced.cpp
 systemadvanced.h
+hosts.h
+hosts.cpp
+vpn.h
+vpn.cpp
+dns.h
+dns.cpp
diff --git a/noncore/settings/networksettings/addconnectionimp.cpp b/noncore/settings/networksettings/addconnectionimp.cpp
index 07545f7..f18d8d1 100644
--- a/noncore/settings/networksettings/addconnectionimp.cpp
+++ b/noncore/settings/networksettings/addconnectionimp.cpp
@@ -1,5 +1,9 @@
 #include "addconnectionimp.h"
 #include <qlistview.h>
+#if QT_VERSION < 300
 #include <qlist.h>
+#else
+#include <qptrlist.h>
+#endif
 #include <qlabel.h>
 #include <qheader.h>
diff --git a/noncore/settings/networksettings/addconnectionimp.h b/noncore/settings/networksettings/addconnectionimp.h
index 680a502..57e6b20 100644
--- a/noncore/settings/networksettings/addconnectionimp.h
+++ b/noncore/settings/networksettings/addconnectionimp.h
@@ -4,5 +4,4 @@
 #include "addconnection.h"
 #include <qmap.h>
-#include <qlist.h>
 
 class QListViewItem;
diff --git a/noncore/settings/networksettings/mainwindow.ui b/noncore/settings/networksettings/mainwindow.ui
index dcabc52..8e17cb3 100644
--- a/noncore/settings/networksettings/mainwindow.ui
+++ b/noncore/settings/networksettings/mainwindow.ui
@@ -412,26 +412,4 @@
     </vbox>
 </widget>
-<customwidgets>
-    <customwidget>
-        <class>QWidget</class>
-        <header location="local">qwidget.h</header>
-        <sizehint>
-            <width>100</width>
-            <height>100</height>
-        </sizehint>
-        <container>0</container>
-        <sizepolicy>
-            <hordata>7</hordata>
-            <verdata>7</verdata>
-        </sizepolicy>
-        <pixmap>image0</pixmap>
-    </customwidget>
-</customwidgets>
-<images>
-    <image>
-        <name>image0</name>
-        <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
-    </image>
-</images>
 <tabstops>
     <tabstop>tabWidget</tabstop>
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
@@ -13,16 +13,32 @@
 #include <qlabel.h>

 

-#include <qmainwindow.h>

 #include <qmessagebox.h>

 

-#include <qpe/config.h>

-#include <qpe/qlibrary.h>

-#include <qpe/resource.h>

-#include <qpe/qpeapplication.h>

+#ifdef QTE_VERSION 

+ #include <qpe/config.h>

+ #include <qpe/qlibrary.h>

+ #include <qpe/resource.h>

+ #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>

 #include <qfile.h>

 #include <qtextstream.h>

+#include <qregexp.h>

 

 #include <net/if.h>

@@ -31,5 +47,5 @@
 #define DEFAULT_SCHEME "/var/lib/pcmcia/scheme"

 

-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()));

   connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked()));

@@ -43,5 +59,11 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par
   connect(newProfile, SIGNAL(textChanged(const QString&)), this, SLOT(newProfileChanged(const QString&)));  

   // 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();

   

@@ -109,4 +131,5 @@ MainWindowImp::~MainWindowImp(){
   }

   

+#ifdef QTE_VERSION

   // Delete Modules and Libraries

   QMap<Module*, QLibrary*>::Iterator it;

@@ -117,4 +140,7 @@ MainWindowImp::~MainWindowImp(){
     //delete it.data();

   }

+#else

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

+#endif

 }

 

@@ -191,5 +217,7 @@ void MainWindowImp::getAllInterfaces(){
  */ 

 void MainWindowImp::loadModules(const QString &path){

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

+#ifdef DEBUG

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

+#endif

   QDir d(path);

   if(!d.exists())

@@ -202,5 +230,5 @@ void MainWindowImp::loadModules(const QString &path){
   QFileInfo *fi;

   while ( (fi=it.current()) ) {

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

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

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

     }

@@ -216,17 +244,23 @@ 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);

   void *functionPointer = lib->resolve(resolveString);

   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;

     return NULL;

   }

-  

   // Try to get an object.

   Module *object = ((Module* (*)()) functionPointer)();

   if(object == NULL){

+#ifdef DEBUG

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

+#endif

     delete lib;

     return NULL;

@@ -236,4 +270,28 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &
   libraries.insert(object, lib);

   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

 }

 

@@ -325,5 +383,5 @@ 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();

   if(currentProfileText.upper() == "ALL");

@@ -355,9 +413,12 @@ void MainWindowImp::informationClicked(){
     if(moduleInformation != NULL){

       moduleInformation->showMaximized();

+#ifdef DEBUG

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

+#endif

       return;

     }

-  }  

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

-  information.showMaximized();

+  } 

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

+  information->showMaximized();

 }

 

@@ -390,6 +451,10 @@ 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

+  

   QString typeName = "lan";

   if(i->getHardwareName().contains("Local Loopback"))

@@ -408,5 +473,9 @@ void MainWindowImp::updateInterface(Interface *i){
     typeName = i->getModuleOwner()->getPixmapName(i);

   

+#ifdef QTE_VERSION

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

+#else

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

+#endif

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

   item->setText(3, QString("(%1)").arg(i->getInterfaceName()));

diff --git a/noncore/settings/networksettings/mainwindowimp.h b/noncore/settings/networksettings/mainwindowimp.h
index 4f09d6c..2ebf304 100644
--- a/noncore/settings/networksettings/mainwindowimp.h
+++ b/noncore/settings/networksettings/mainwindowimp.h
@@ -10,4 +10,12 @@ class Interface;
 class QLibrary;

 class KProcess;

+#ifdef QTE_VERSION 

+class QLibrary;

+#else

+class KLibrary;

+class KLibLoader;

+#define QLibrary KLibrary

+#endif

+

 

 class MainWindowImp : public MainWindow {

@@ -51,4 +59,7 @@ private:
   bool advancedUserMode;

   QString scheme;

+#ifndef QTE_VERSION

+  KLibLoader *loader;

+#endif

 };

 

diff --git a/noncore/settings/networksettings/module.h b/noncore/settings/networksettings/module.h
index 2e6272b..46a3c77 100644
--- a/noncore/settings/networksettings/module.h
+++ b/noncore/settings/networksettings/module.h
@@ -3,5 +3,9 @@
 
 #include <qobject.h>
+#if QT_VERSION < 300
 #include <qlist.h>
+#else
+#include <qptrlist.h>
+#endif
 #include <qmap.h>
 #include "interface.h"