Rename additional header files to avoid conflicts with KDE4

knetworkmanager-0.8/src/devicetraycomponent.cpp

@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "devicetraycomponent.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksystemtray.h>
 
 #include "knetworkmanager-device.h"

knetworkmanager-0.8/src/knetworkmanager-cellular_device_tray.cpp

@@ -27,7 +27,7 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 // TQt DBus

knetworkmanager-0.8/src/knetworkmanager-connection.cpp

@@ -27,7 +27,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQDbus headers */
 #include <tqdbusconnection.h>

knetworkmanager-0.8/src/knetworkmanager-connection_dbus.cpp

@@ -27,7 +27,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQDbus headers */
 #include <tqdbusconnection.h>

knetworkmanager-0.8/src/knetworkmanager-connection_editor.cpp

@@ -38,7 +38,7 @@
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 
 // knm headers

knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.cpp

@@ -29,7 +29,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQDbus headers */
 #include <tqdbusconnection.h>

knetworkmanager-0.8/src/knetworkmanager-connection_setting.cpp

@@ -28,7 +28,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>

knetworkmanager-0.8/src/knetworkmanager-connection_setting_8021x.cpp

@@ -28,7 +28,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>

knetworkmanager-0.8/src/knetworkmanager-connection_setting_cdma.cpp

@@ -28,7 +28,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>

knetworkmanager-0.8/src/knetworkmanager-connection_setting_gsm.cpp

@@ -28,7 +28,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>

knetworkmanager-0.8/src/knetworkmanager-connection_setting_info.cpp

@@ -28,7 +28,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>

knetworkmanager-0.8/src/knetworkmanager-connection_setting_ipv4.cpp

@@ -28,7 +28,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>

knetworkmanager-0.8/src/knetworkmanager-connection_setting_ppp.cpp

@@ -31,7 +31,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>

knetworkmanager-0.8/src/knetworkmanager-connection_setting_serial.cpp

@@ -28,7 +28,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>

knetworkmanager-0.8/src/knetworkmanager-connection_setting_vpn.cpp

@@ -28,7 +28,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>

knetworkmanager-0.8/src/knetworkmanager-connection_setting_wired.cpp

@@ -28,7 +28,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>

knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless.cpp

@@ -29,7 +29,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>

knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_security.cpp

@@ -28,7 +28,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>

knetworkmanager-0.8/src/knetworkmanager-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>
 

knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp

@@ -32,7 +32,7 @@
 #include <klineedit.h>
 #include <tdelistviewsearchline.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kpushbutton.h>
 
 #include "knetworkmanager-connection.h"

knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp

@@ -44,14 +44,14 @@ class WirelessDialog;
 #include <knotifyclient.h>
 #include <knotifydialog.h>
 #include <kiconeffect.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 <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
 
 // KNM includes
 #include "knetworkmanager-device_tray.h"

knetworkmanager-0.8/src/knetworkmanager-generic_connection.cpp

@@ -29,7 +29,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQDbus headers */
 #include <tqdbusconnection.h>

knetworkmanager-0.8/src/knetworkmanager-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 "knetworkmanager-menu_subhead.h"
 

knetworkmanager-0.8/src/knetworkmanager-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>
 
 #include <tqdbusobjectpath.h>
 #include <tqdbuserror.h>

knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp

@@ -25,7 +25,7 @@
 #include <kplugininfo.h>
 #include <tdeparts/componentfactory.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "knetworkmanager-pluginmanager.h"
 

knetworkmanager-0.8/src/knetworkmanager-storage.cpp

@@ -25,7 +25,7 @@
 
 #include <tqtimer.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kstaticdeleter.h>
 #include <kdebug.h>

knetworkmanager-0.8/src/knetworkmanager-tray.cpp

@@ -45,13 +45,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 <tqpushbutton.h>
 #include <tqlayout.h>

knetworkmanager-0.8/src/knetworkmanager-vpn_connection.cpp

@@ -29,7 +29,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQDbus headers */
 #include <tqdbusconnection.h>

knetworkmanager-0.8/src/knetworkmanager-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>

knetworkmanager-0.8/src/knetworkmanager-vpnmanager.cpp

@@ -25,7 +25,7 @@
 
 #define SERVICE_DIR "/etc/NetworkManager/VPN"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdir.h>
 #include <kdebug.h>
 #include <tdeconfig.h>

knetworkmanager-0.8/src/knetworkmanager-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>

knetworkmanager-0.8/src/knetworkmanager-wired_connection.cpp

@@ -29,7 +29,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQDbus headers */
 #include <tqdbusconnection.h>

knetworkmanager-0.8/src/knetworkmanager-wired_device_tray.cpp

@@ -37,7 +37,7 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 // TQt DBus

knetworkmanager-0.8/src/knetworkmanager-wireless_connection.cpp

@@ -29,7 +29,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQDbus headers */
 #include <tqdbusconnection.h>

knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp

@@ -39,7 +39,7 @@
 // KDE includes
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 
 // QT DBus

knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp

@@ -38,13 +38,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 <NetworkManager.h>
 
 #include <tqdbusobjectpath.h>

knetworkmanager-0.8/src/knetworkmanager.cpp

@@ -24,7 +24,7 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // NM includes
 #include <NetworkManager.h>
@@ -67,7 +67,7 @@
 #include <tqobject.h>
 
 // KDE includes
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 char active_vpn_prev = 0;

knetworkmanager-0.8/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 )

knetworkmanager-0.8/src/vpn_tray_component.cpp

@@ -24,7 +24,7 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 // TQt DBus

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>

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 $@ $<

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>

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>

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>