From 5b8c58522102256d4516036708f275c6cea3eba9 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 00:53:51 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
KDE4
---
.../src/knetworkmanager-device_tray.cpp | 2 +-
.../src/knetworkmanager-menu_subhead.cpp | 2 +-
knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp | 2 +-
knetworkmanager-0.8/src/knetworkmanager-storage.cpp | 8 ++++----
knetworkmanager-0.8/src/knetworkmanager-tray.cpp | 4 ++--
.../src/knetworkmanager-vpnauthenticationdialog.h | 2 +-
.../src/knetworkmanager-vpnmanager.cpp | 20 ++++++++++----------
.../src/knetworkmanager-vpnservice.cpp | 4 ++--
.../src/knetworkmanager-wireless_menuitem.cpp | 2 +-
knetworkmanager-0.8/src/settings.kcfgc | 2 +-
10 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp
index e1b3666..8b55905 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp
@@ -49,7 +49,7 @@ class WirelessDialog;
#include <khelpmenu.h>
#include <kprocess.h>
#include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kmessagebox.h>
#include <kglobalsettings.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-menu_subhead.cpp b/knetworkmanager-0.8/src/knetworkmanager-menu_subhead.cpp
index 5a69cd5..cef0eb9 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-menu_subhead.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-menu_subhead.cpp
@@ -45,7 +45,7 @@ class WirelessDialog;
#include <khelpmenu.h>
#include <kprocess.h>
#include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kmessagebox.h>
#include "knetworkmanager-menu_subhead.h"
diff --git a/knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp b/knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp
index b13563e..fc67f7f 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp
@@ -46,7 +46,7 @@
#include <khelpmenu.h>
#include <kprocess.h>
#include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kmessagebox.h>
#include <tqdbusobjectpath.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-storage.cpp b/knetworkmanager-0.8/src/knetworkmanager-storage.cpp
index de12f7f..87f1694 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-storage.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-storage.cpp
@@ -26,7 +26,7 @@
#include <tqtimer.h>
#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kstaticdeleter.h>
#include <kdebug.h>
@@ -229,7 +229,7 @@ Storage::restoreSetting(Connection* conn, const TQString& setting_grp_name)
return false;
}
- // read the SettingsMap from kconfig
+ // read the SettingsMap from tdeconfig
SettingsMap map;
for(TQMap<TQString, TQString>::ConstIterator it = config_map.begin(); it != config_map.end(); ++it)
{
@@ -269,7 +269,7 @@ Storage::restoreSecrets(Connection* conn, const TQString& secrets_grp_name)
return false;
}
- // read the SettingsMap from kconfig
+ // read the SettingsMap from tdeconfig
SettingsMap map;
for(TQMap<TQString, TQString>::ConstIterator it = config_map.begin(); it != config_map.end(); ++it)
{
@@ -309,7 +309,7 @@ Storage::restoreVPNSecrets(Connection* conn, const TQString& secrets_grp_name)
return false;
}
- // read the SettingsMap from kconfig
+ // read the SettingsMap from tdeconfig
SettingsMap map;
for(TQMap<TQString, TQString>::ConstIterator it = config_map.begin(); it != config_map.end(); ++it)
{
diff --git a/knetworkmanager-0.8/src/knetworkmanager-tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-tray.cpp
index 43735c8..736fe84 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-tray.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-tray.cpp
@@ -50,7 +50,7 @@ class WirelessDialog;
#include <khelpmenu.h>
#include <kprocess.h>
#include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kmessagebox.h>
#include <tqpushbutton.h>
@@ -486,7 +486,7 @@ Tray::slotVPNSecretsNeeded(ConnectionSettings::Connection* connection, Connectio
// printf("Secrets cannot be restored!\n\r");
// }
- // Read the SettingsMap from kconfig
+ // Read the SettingsMap from tdeconfig
// This loop reads the secrets information map only
TQMap<TQString, TQString> map;
for(TQMap<TQString, TQString>::ConstIterator it = config_map.begin(); it != config_map.end(); ++it)
diff --git a/knetworkmanager-0.8/src/knetworkmanager-vpnauthenticationdialog.h b/knetworkmanager-0.8/src/knetworkmanager-vpnauthenticationdialog.h
index 8c43e7d..de7127f 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-vpnauthenticationdialog.h
+++ b/knetworkmanager-0.8/src/knetworkmanager-vpnauthenticationdialog.h
@@ -28,7 +28,7 @@
#include <tqdir.h>
#include <tqobject.h>
#include <kprocess.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include "knetworkmanager.h"
#include "vpnauthentication.h"
diff --git a/knetworkmanager-0.8/src/knetworkmanager-vpnmanager.cpp b/knetworkmanager-0.8/src/knetworkmanager-vpnmanager.cpp
index b7f86f7..28ab689 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-vpnmanager.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-vpnmanager.cpp
@@ -28,7 +28,7 @@
#include <klocale.h>
#include <tqdir.h>
#include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include "knetworkmanager-vpnmanager.h"
#include "knetworkmanager-vpnservice.h"
@@ -53,18 +53,18 @@ VPNManager::getVPNServices ()
// read in all available Services
for (TQStringList::Iterator i = services.begin (); i != services.end (); ++i) {
TQString service = SERVICE_DIR + TQString ("/") + *i;
- TDEConfig* kconfig = new TDEConfig (service, true, true, "config");
- kconfig->setGroup ("VPN Connection");
+ TDEConfig* tdeconfig = new TDEConfig (service, true, true, "config");
+ tdeconfig->setGroup ("VPN Connection");
-kdDebug() << "VPN Service " << kconfig->readEntry ("name", TQString()).ascii() << endl;
+kdDebug() << "VPN Service " << tdeconfig->readEntry ("name", TQString()).ascii() << endl;
// create new VPNService Object
- VPNService* vpnservice = new VPNService(kconfig->readEntry ("name", TQString()), kconfig->readEntry ("service", TQString()), TQT_TQOBJECT(KNetworkManager::getInstance()));
+ VPNService* vpnservice = new VPNService(tdeconfig->readEntry ("name", TQString()), tdeconfig->readEntry ("service", TQString()), TQT_TQOBJECT(KNetworkManager::getInstance()));
if (!vpnservice->getVPNPlugin())
delete vpnservice;
else
list.push_back(vpnservice);
- delete kconfig;
+ delete tdeconfig;
}
}
@@ -86,13 +86,13 @@ VPNManager::getVPNService(TQString service_type)
// read in all available Services
for (TQStringList::Iterator i = services.begin (); i != services.end (); ++i) {
TQString service = SERVICE_DIR + TQString ("/") + *i;
- TDEConfig* kconfig = new TDEConfig (service, true, true, "config");
- kconfig->setGroup ("VPN Connection");
+ TDEConfig* tdeconfig = new TDEConfig (service, true, true, "config");
+ tdeconfig->setGroup ("VPN Connection");
- if (kconfig->readEntry ("service", TQString()) == service_type)
+ if (tdeconfig->readEntry ("service", TQString()) == service_type)
{
// create new VPNService Object
- VPNService* vpnservice = new VPNService(kconfig->readEntry ("name", TQString()), kconfig->readEntry ("service", TQString()), TQT_TQOBJECT(KNetworkManager::getInstance()));
+ VPNService* vpnservice = new VPNService(tdeconfig->readEntry ("name", TQString()), tdeconfig->readEntry ("service", TQString()), TQT_TQOBJECT(KNetworkManager::getInstance()));
if (!vpnservice->getVPNPlugin())
delete vpnservice;
else
diff --git a/knetworkmanager-0.8/src/knetworkmanager-vpnservice.cpp b/knetworkmanager-0.8/src/knetworkmanager-vpnservice.cpp
index 84daa0c..77336c6 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-vpnservice.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-vpnservice.cpp
@@ -26,14 +26,14 @@
#define SERVICE_DIR "/etc/NetworkManager/VPN"
#include <stdlib.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tqdom.h>
#include <tqdir.h>
#include <klocale.h>
#include <kdebug.h>
#include <kstddirs.h>
#include <kprocess.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kplugininfo.h>
#include "knetworkmanager-pluginmanager.h"
diff --git a/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp b/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp
index f8bedae..ddf08b3 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp
@@ -43,7 +43,7 @@
#include <khelpmenu.h>
#include <kprocess.h>
#include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kmessagebox.h>
#include <NetworkManager.h>
diff --git a/knetworkmanager-0.8/src/settings.kcfgc b/knetworkmanager-0.8/src/settings.kcfgc
index 35e7882..de4baee 100644
--- a/knetworkmanager-0.8/src/settings.kcfgc
+++ b/knetworkmanager-0.8/src/settings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=knetworkmanager.kcfg
ClassName=Settings
Singleton=true
--
cgit v1.2.1