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

---
 .../vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp               | 2 +-
 knetworkmanager-0.8/vpn-plugins/pptp/src/Makefile.am.automake         | 2 +-
 knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp     | 2 +-
 .../vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp         | 2 +-
 knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp     | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'knetworkmanager-0.8/vpn-plugins')

diff --git a/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp b/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp
index f043aad..0f265fe 100644
--- a/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp
+++ b/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp
@@ -22,7 +22,7 @@
  *
  **************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqmessagebox.h>
 #include <tqbutton.h>
 #include <kcombobox.h>
diff --git a/knetworkmanager-0.8/vpn-plugins/pptp/src/Makefile.am.automake b/knetworkmanager-0.8/vpn-plugins/pptp/src/Makefile.am.automake
index 60eb42d..8969488 100644
--- a/knetworkmanager-0.8/vpn-plugins/pptp/src/Makefile.am.automake
+++ b/knetworkmanager-0.8/vpn-plugins/pptp/src/Makefile.am.automake
@@ -6,7 +6,7 @@ INCLUDES = $(PACKAGE_CFLAGS) $(all_includes)
 
 # rules for creating .h and .cpp from .ui
 %.cpp: %.ui %.h
-	$(UIC) -tr tr2i18n -pch klocale.h -o $@ -impl $*.h $<
+	$(UIC) -tr tr2i18n -pch tdelocale.h -o $@ -impl $*.h $<
 
 %.h: %.ui
 	$(UIC) -o $@ $<
diff --git a/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp b/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp
index 0be9f04..a8124da 100644
--- a/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp
+++ b/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp
@@ -22,7 +22,7 @@
  *
  **************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqmessagebox.h>
 #include <tqbutton.h>
 #include <kcombobox.h>
diff --git a/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp b/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp
index 17ba6c8..914f324 100644
--- a/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp
+++ b/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp
@@ -22,7 +22,7 @@
  *
  **************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqmessagebox.h>
 #include <tqbutton.h>
 #include <kcombobox.h>
diff --git a/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp b/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp
index adac93c..5f1e47f 100644
--- a/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp
+++ b/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp
@@ -23,8 +23,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.1