From 2ea6792dc3fe761d06e793a6a82811519d69c6ea Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:47:13 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 .../tdenetman-connection_setting_wireless_security_widget.cpp         | 2 +-
 .../configwidgets/tdenetman-connection_setting_wireless_widget.cpp    | 4 ++--
 .../src/configwidgets/tdenetman-connection_settings_dialog.cpp        | 4 ++--
 tdenetworkmanager/src/devicetraycomponent.cpp                         | 2 +-
 tdenetworkmanager/src/main.cpp                                        | 2 +-
 tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp              | 2 +-
 tdenetworkmanager/src/tdenetman-connection_editor.cpp                 | 4 ++--
 tdenetworkmanager/src/tdenetman-menu_subhead.cpp                      | 4 ++--
 tdenetworkmanager/src/tdenetman-menuitem.cpp                          | 4 ++--
 tdenetworkmanager/src/tdenetman-pluginmanager.cpp                     | 2 +-
 tdenetworkmanager/src/tdenetman-tray.cpp                              | 4 ++--
 tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.cpp           | 2 +-
 tdenetworkmanager/src/tdenetman-vpnmanager.cpp                        | 2 +-
 tdenetworkmanager/src/tdenetman-vpnservice.cpp                        | 2 +-
 tdenetworkmanager/src/tdenetman-wired_device_tray.cpp                 | 2 +-
 tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp              | 2 +-
 tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp                 | 4 ++--
 tdenetworkmanager/src/tdenetman.cpp                                   | 4 ++--
 tdenetworkmanager/src/traycomponent.cpp                               | 2 +-
 tdenetworkmanager/src/vpn_tray_component.cpp                          | 2 +-
 tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp       | 2 +-
 tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp             | 2 +-
 tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.cpp | 2 +-
 tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp             | 4 ++--
 24 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp
index 3d641dc..ec71417 100644
--- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp
@@ -36,7 +36,7 @@
 
 /* kde headers */
 #include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kpassdlg.h>
 #include <kmdcodec.h>
diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp
index 9c5de2e..d5f5055 100644
--- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp
@@ -34,9 +34,9 @@
 #include <klineedit.h>
 #include <tdelistviewsearchline.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "tdenetman-connection_setting_widget_interface.h"
 #include "tdenetman-connection_setting_wireless_widget.h"
diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_settings_dialog.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_settings_dialog.cpp
index f1da84b..d60fe9b 100644
--- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_settings_dialog.cpp
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_settings_dialog.cpp
@@ -36,8 +36,8 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 // tdenm headers
 #include "tdenetman-connection_setting_widget_interface.h"
diff --git a/tdenetworkmanager/src/devicetraycomponent.cpp b/tdenetworkmanager/src/devicetraycomponent.cpp
index 6d96027..f897b85 100644
--- a/tdenetworkmanager/src/devicetraycomponent.cpp
+++ b/tdenetworkmanager/src/devicetraycomponent.cpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "devicetraycomponent.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <ksystemtray.h>
 #include <knotifyclient.h>
diff --git a/tdenetworkmanager/src/main.cpp b/tdenetworkmanager/src/main.cpp
index 972a60b..52a2ff7 100644
--- a/tdenetworkmanager/src/main.cpp
+++ b/tdenetworkmanager/src/main.cpp
@@ -23,7 +23,7 @@
  **************************************************************************/
 
 // TDE includes
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <dcopclient.h>
diff --git a/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp b/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp
index 29cf61f..2998228 100644
--- a/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp
@@ -27,7 +27,7 @@
 
 // TDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 // TDENM includes
diff --git a/tdenetworkmanager/src/tdenetman-connection_editor.cpp b/tdenetworkmanager/src/tdenetman-connection_editor.cpp
index 078f3d3..c9e144e 100644
--- a/tdenetworkmanager/src/tdenetman-connection_editor.cpp
+++ b/tdenetworkmanager/src/tdenetman-connection_editor.cpp
@@ -38,9 +38,9 @@
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // tdenm headers
 #include "tdenetman-connection_editor.h"
diff --git a/tdenetworkmanager/src/tdenetman-menu_subhead.cpp b/tdenetworkmanager/src/tdenetman-menu_subhead.cpp
index cfaace0..c40bb4d 100644
--- a/tdenetworkmanager/src/tdenetman-menu_subhead.cpp
+++ b/tdenetworkmanager/src/tdenetman-menu_subhead.cpp
@@ -40,13 +40,13 @@ class WirelessDialog;
 #include <kdialogbase.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <khelpmenu.h>
 #include <kprocess.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "tdenetman-menu_subhead.h"
 
diff --git a/tdenetworkmanager/src/tdenetman-menuitem.cpp b/tdenetworkmanager/src/tdenetman-menuitem.cpp
index 751616a..d5aa285 100644
--- a/tdenetworkmanager/src/tdenetman-menuitem.cpp
+++ b/tdenetworkmanager/src/tdenetman-menuitem.cpp
@@ -41,13 +41,13 @@
 #include <kdialogbase.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <khelpmenu.h>
 #include <kprocess.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 using namespace ConnectionSettings;
 
diff --git a/tdenetworkmanager/src/tdenetman-pluginmanager.cpp b/tdenetworkmanager/src/tdenetman-pluginmanager.cpp
index e388628..d388440 100644
--- a/tdenetworkmanager/src/tdenetman-pluginmanager.cpp
+++ b/tdenetworkmanager/src/tdenetman-pluginmanager.cpp
@@ -25,7 +25,7 @@
 #include <kplugininfo.h>
 #include <tdeparts/componentfactory.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "tdenetman-pluginmanager.h"
 
diff --git a/tdenetworkmanager/src/tdenetman-tray.cpp b/tdenetworkmanager/src/tdenetman-tray.cpp
index 358853c..32524f6 100644
--- a/tdenetworkmanager/src/tdenetman-tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-tray.cpp
@@ -43,13 +43,13 @@
 #include <kdialogbase.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <khelpmenu.h>
 #include <kprocess.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqpushbutton.h>
 #include <tqlayout.h>
diff --git a/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.cpp b/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.cpp
index 36f4306..ec708d0 100644
--- a/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.cpp
+++ b/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.cpp
@@ -30,7 +30,7 @@
 #include <tqwidgetstack.h>
 #include <klineedit.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqobjectlist.h>
 #include <tqcheckbox.h>
diff --git a/tdenetworkmanager/src/tdenetman-vpnmanager.cpp b/tdenetworkmanager/src/tdenetman-vpnmanager.cpp
index 5b38ba0..f106455 100644
--- a/tdenetworkmanager/src/tdenetman-vpnmanager.cpp
+++ b/tdenetworkmanager/src/tdenetman-vpnmanager.cpp
@@ -23,7 +23,7 @@
  *
  **************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdir.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
diff --git a/tdenetworkmanager/src/tdenetman-vpnservice.cpp b/tdenetworkmanager/src/tdenetman-vpnservice.cpp
index fdc1700..05f5cdf 100644
--- a/tdenetworkmanager/src/tdenetman-vpnservice.cpp
+++ b/tdenetworkmanager/src/tdenetman-vpnservice.cpp
@@ -29,7 +29,7 @@
 #include <tdeconfig.h>
 #include <tqdom.h> 
 #include <tqdir.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstddirs.h>
 #include <kprocess.h>
diff --git a/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp
index 095f19e..fcfdc4f 100644
--- a/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp
@@ -37,7 +37,7 @@
 
 // TDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 // TDENM includes
diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
index c60ffd2..448b867 100644
--- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
@@ -40,7 +40,7 @@
 // TDE includes
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 
 // TDENM includes
diff --git a/tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp b/tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp
index b1f16e8..8ff8f97 100644
--- a/tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp
+++ b/tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp
@@ -40,13 +40,13 @@
 #include <kdialogbase.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <khelpmenu.h>
 #include <kprocess.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "tdenetman-wireless_menuitem.h"
 #include "tdenetman-wireless_network.h"
diff --git a/tdenetworkmanager/src/tdenetman.cpp b/tdenetworkmanager/src/tdenetman.cpp
index d9f2ad1..4da1bfc 100644
--- a/tdenetworkmanager/src/tdenetman.cpp
+++ b/tdenetworkmanager/src/tdenetman.cpp
@@ -24,7 +24,7 @@
 
 // TDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdehardwaredevices.h>
 #include <tdenetworkconnections.h>
 
@@ -39,7 +39,7 @@
 #include <tqobject.h>
 
 // TDE includes
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 extern TDENetworkConnectionStatus::TDENetworkConnectionStatus nm_device_state_global;
diff --git a/tdenetworkmanager/src/traycomponent.cpp b/tdenetworkmanager/src/traycomponent.cpp
index 5bfff55..67001d0 100644
--- a/tdenetworkmanager/src/traycomponent.cpp
+++ b/tdenetworkmanager/src/traycomponent.cpp
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "traycomponent.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksystemtray.h>
 
 TrayComponent::TrayComponent(KSystemTray * parent, const char * name )
diff --git a/tdenetworkmanager/src/vpn_tray_component.cpp b/tdenetworkmanager/src/vpn_tray_component.cpp
index 7edaba6..147e711 100644
--- a/tdenetworkmanager/src/vpn_tray_component.cpp
+++ b/tdenetworkmanager/src/vpn_tray_component.cpp
@@ -24,7 +24,7 @@
 
 // TDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
diff --git a/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp b/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp
index 3c4a1a7..f4e7520 100644
--- a/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp
+++ b/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp
@@ -22,7 +22,7 @@
  *
  **************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqmessagebox.h>
 #include <tqbutton.h>
 #include <kcombobox.h>
diff --git a/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp b/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp
index 0addf32..e3d91d9 100644
--- a/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp
+++ b/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp
@@ -22,7 +22,7 @@
  *
  **************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqmessagebox.h>
 #include <tqbutton.h>
 #include <kcombobox.h>
diff --git a/tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.cpp b/tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.cpp
index ec041e4..5b52b1b 100644
--- a/tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.cpp
+++ b/tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.cpp
@@ -22,7 +22,7 @@
  *
  **************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqmessagebox.h>
 #include <tqbutton.h>
 #include <kcombobox.h>
diff --git a/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp b/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp
index 7de3553..cc95378 100644
--- a/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp
+++ b/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp
@@ -24,8 +24,8 @@
  *
  **************************************************************************/
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqmessagebox.h>
 #include <tqbutton.h>
 #include <kcombobox.h>
-- 
cgit v1.2.3