From cd2822e137e9a73aa2bf13f7f0dc67fda50a1879 Mon Sep 17 00:00:00 2001
From: benmeyer <benmeyer>
Date: Wed, 09 Apr 2003 00:18:15 +0000
Subject: KDEafied and bugs fixes

---
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
@@ -21,3 +21,9 @@ moc_*.cpp
 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,6 +1,10 @@
 #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
@@ -3,7 +3,6 @@
 
 #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
@@ -411,28 +411,6 @@
         </widget>
     </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>
     <tabstop>connectionList</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
@@ -12,25 +12,41 @@
 #include <qheader.h>
 #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>
 #include <sys/ioctl.h>
 
 #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()));
   connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked()));
@@ -42,7 +58,13 @@ 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();
   
   Interfaces i;
@@ -108,6 +130,7 @@ MainWindowImp::~MainWindowImp(){
       delete iIt.key();
   }
   
+#ifdef QTE_VERSION
   // Delete Modules and Libraries
   QMap<Module*, QLibrary*>::Iterator it;
   for( it = libraries.begin(); it != libraries.end(); ++it ){
@@ -116,6 +139,9 @@ MainWindowImp::~MainWindowImp(){
     // What fucking shit this is.
     //delete it.data();
   }
+#else
+  // klibloader automaticly deletes the libraries for us...
+#endif
 }
 
 /**
@@ -190,7 +216,9 @@ void MainWindowImp::getAllInterfaces(){
  *  and attempts to load them
  */ 
 void MainWindowImp::loadModules(const QString &path){
-  //qDebug(path.latin1());
+#ifdef DEBUG
+  qDebug("MainWindowImp::loadModules: %s", path.latin1());
+#endif
   QDir d(path);
   if(!d.exists())
     return;
@@ -201,7 +229,7 @@ void MainWindowImp::loadModules(const QString &path){
   QFileInfoListIterator it( *list );
   QFileInfo *fi;
   while ( (fi=it.current()) ) {
-    if(fi->fileName().contains(".so")){
+    if(fi->fileName().contains(".so") && fi->fileName().contains("networksettings_")){
       loadPlugin(path + "/" + fi->fileName());
     }
     ++it;
@@ -215,19 +243,25 @@ void MainWindowImp::loadModules(const QString &path){
  * @return pointer to the function with name resolveString or NULL
  */ 
 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;
   }
@@ -235,6 +269,30 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &
   // Store for deletion later
   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
 }
 
 /**
@@ -324,7 +382,7 @@ 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");
     currentProfileText = "";
@@ -354,11 +412,14 @@ void MainWindowImp::informationClicked(){
     QWidget *moduleInformation = i->getModuleOwner()->information(i);
     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();
 }
 
 /**
@@ -389,8 +450,12 @@ void MainWindowImp::updateInterface(Interface *i){
     item = items[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"))
     typeName = "lo";
@@ -407,7 +472,11 @@ void MainWindowImp::updateInterface(Interface *i){
   if(i->getModuleOwner() != NULL)
     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()));
   item->setText(4, (i->getStatus()) ? i->getIp() : QString(""));
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
@@ -9,6 +9,14 @@ class Module;
 class Interface;
 class QLibrary;
 class KProcess;
+#ifdef QTE_VERSION 
+class QLibrary;
+#else
+class KLibrary;
+class KLibLoader;
+#define QLibrary KLibrary
+#endif
+
 
 class MainWindowImp : public MainWindow {
   Q_OBJECT
@@ -50,6 +58,9 @@ private:
 
   bool advancedUserMode;
   QString scheme;
+#ifndef QTE_VERSION
+  KLibLoader *loader;
+#endif
 };
 
 #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
@@ -2,7 +2,11 @@
 #define NETCONF_MODULE_H
 
 #include <qobject.h>
+#if QT_VERSION < 300
 #include <qlist.h>
+#else
+#include <qptrlist.h>
+#endif
 #include <qmap.h>
 #include "interface.h"
 
--
cgit v0.9.0.2