From f56fd8812a3390d9a131e96a70809f31fd74b2ea Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 00:53:55 -0600
Subject: [PATCH] Rename a number of libraries and executables to avoid
 conflicts with KDE4

---
 tdenetworkmanager/src/settings.kcfgc                      | 2 +-
 tdenetworkmanager/src/tdenetman-menu_subhead.cpp          | 2 +-
 tdenetworkmanager/src/tdenetman-menuitem.cpp              | 2 +-
 tdenetworkmanager/src/tdenetman-tray.cpp                  | 2 +-
 tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.h | 2 +-
 tdenetworkmanager/src/tdenetman-vpnmanager.cpp            | 2 +-
 tdenetworkmanager/src/tdenetman-vpnservice.cpp            | 4 ++--
 tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp     | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tdenetworkmanager/src/settings.kcfgc b/tdenetworkmanager/src/settings.kcfgc
index a7ab93a..c6b9a8d 100644
--- a/tdenetworkmanager/src/settings.kcfgc
+++ b/tdenetworkmanager/src/settings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=tdenetworkmanager.kcfg
 ClassName=Settings
 Singleton=true
diff --git a/tdenetworkmanager/src/tdenetman-menu_subhead.cpp b/tdenetworkmanager/src/tdenetman-menu_subhead.cpp
index f370ba6..cfaace0 100644
--- a/tdenetworkmanager/src/tdenetman-menu_subhead.cpp
+++ b/tdenetworkmanager/src/tdenetman-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 "tdenetman-menu_subhead.h"
diff --git a/tdenetworkmanager/src/tdenetman-menuitem.cpp b/tdenetworkmanager/src/tdenetman-menuitem.cpp
index c57675a..751616a 100644
--- a/tdenetworkmanager/src/tdenetman-menuitem.cpp
+++ b/tdenetworkmanager/src/tdenetman-menuitem.cpp
@@ -46,7 +46,7 @@
 #include <khelpmenu.h>
 #include <kprocess.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 
 using namespace ConnectionSettings;
diff --git a/tdenetworkmanager/src/tdenetman-tray.cpp b/tdenetworkmanager/src/tdenetman-tray.cpp
index 02ee15e..d87fb19 100644
--- a/tdenetworkmanager/src/tdenetman-tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-tray.cpp
@@ -48,7 +48,7 @@
 #include <khelpmenu.h>
 #include <kprocess.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 
 #include <tqpushbutton.h>
diff --git a/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.h b/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.h
index 750526d..0d55e53 100644
--- a/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.h
+++ b/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.h
@@ -28,7 +28,7 @@
 #include <tqdir.h>
 #include <tqobject.h>
 #include <kprocess.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tdehardwaredevices.h>
 #include <tdenetworkconnections.h>
diff --git a/tdenetworkmanager/src/tdenetman-vpnmanager.cpp b/tdenetworkmanager/src/tdenetman-vpnmanager.cpp
index 26d4c3b..5b38ba0 100644
--- a/tdenetworkmanager/src/tdenetman-vpnmanager.cpp
+++ b/tdenetworkmanager/src/tdenetman-vpnmanager.cpp
@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <tqdir.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "tdenetman-vpnmanager.h"
 #include "tdenetman-vpnservice.h"
diff --git a/tdenetworkmanager/src/tdenetman-vpnservice.cpp b/tdenetworkmanager/src/tdenetman-vpnservice.cpp
index d97cf82..fdc1700 100644
--- a/tdenetworkmanager/src/tdenetman-vpnservice.cpp
+++ b/tdenetworkmanager/src/tdenetman-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 "tdenetman-pluginmanager.h"
diff --git a/tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp b/tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp
index aebead5..b1f16e8 100644
--- a/tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp
+++ b/tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp
@@ -45,7 +45,7 @@
 #include <khelpmenu.h>
 #include <kprocess.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 
 #include "tdenetman-wireless_menuitem.h"