Update old references to knetworkmanager

This partially resolves Bug 1566

36 files changed, 109 insertions, 109 deletions

diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_cdma_widget.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_cdma_widget.h
index 110b079..0384d24 100644
--- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_cdma_widget.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_cdma_widget.h
@@ -22,8 +22,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_CONNECTION_SETTING_CDMA_WIDGET_H
-#define KNETWORKMANAGER_CONNECTION_SETTING_CDMA_WIDGET_H
+#ifndef TDENETWORKMANAGER_CONNECTION_SETTING_CDMA_WIDGET_H
+#define TDENETWORKMANAGER_CONNECTION_SETTING_CDMA_WIDGET_H
 
 
 // tqt headers
@@ -66,4 +66,4 @@ class CDMAWidgetImpl : public WidgetInterface
 };
 
 }
-#endif /* KNETWORKMANAGER_CONNECTION_SETTING_CDMA_WIDGET_H*/
+#endif /* TDENETWORKMANAGER_CONNECTION_SETTING_CDMA_WIDGET_H*/
diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_gsm_widget.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_gsm_widget.h
index 221336e..7d7d02e 100644
--- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_gsm_widget.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_gsm_widget.h
@@ -22,8 +22,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_CONNECTION_SETTING_GSM_WIDGET_H
-#define KNETWORKMANAGER_CONNECTION_SETTING_GSM_WIDGET_H
+#ifndef TDENETWORKMANAGER_CONNECTION_SETTING_GSM_WIDGET_H
+#define TDENETWORKMANAGER_CONNECTION_SETTING_GSM_WIDGET_H
 
 
 // tqt headers
@@ -71,4 +71,4 @@ class GSMWidgetImpl : public WidgetInterface
 };
 
 }
-#endif /* KNETWORKMANAGER_CONNECTION_SETTING_GSM_WIDGET_H*/
+#endif /* TDENETWORKMANAGER_CONNECTION_SETTING_GSM_WIDGET_H*/
diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_info_widget.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_info_widget.h
index 2ddb6e5..386dabe 100644
--- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_info_widget.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_info_widget.h
@@ -23,8 +23,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_CONNECTION_SETTING_INFO_WIDGET_H
-#define KNETWORKMANAGER_CONNECTION_SETTING_INFO_WIDGET_H
+#ifndef TDENETWORKMANAGER_CONNECTION_SETTING_INFO_WIDGET_H
+#define TDENETWORKMANAGER_CONNECTION_SETTING_INFO_WIDGET_H
 
 
 // tqt headers
@@ -67,4 +67,4 @@ class InfoWidgetImpl : public WidgetInterface
 };
 
 }
-#endif /* KNETWORKMANAGER_CONNECTION_SETTING_INFO_WIDGET_H*/
+#endif /* TDENETWORKMANAGER_CONNECTION_SETTING_INFO_WIDGET_H*/
diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ipv4_widget.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ipv4_widget.h
index 0b2e48f..b8f8006 100644
--- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ipv4_widget.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ipv4_widget.h
@@ -22,8 +22,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_CONNECTION_SETTING_IPV4_WIDGET_H
-#define KNETWORKMANAGER_CONNECTION_SETTING_IPV4_WIDGET_H
+#ifndef TDENETWORKMANAGER_CONNECTION_SETTING_IPV4_WIDGET_H
+#define TDENETWORKMANAGER_CONNECTION_SETTING_IPV4_WIDGET_H
 
 // tde headers
 #include <tdehardwaredevices.h>
@@ -66,4 +66,4 @@ namespace ConnectionSettings
 	};
 
 }
-#endif /* KNETWORKMANAGER_CONNECTION_SETTING_IPv4_WIDGET_H*/
+#endif /* TDENETWORKMANAGER_CONNECTION_SETTING_IPv4_WIDGET_H*/
diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ppp_widget.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ppp_widget.h
index 71ccc67..8730200 100644
--- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ppp_widget.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_ppp_widget.h
@@ -22,8 +22,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_CONNECTION_SETTING_PPP_WIDGET_H
-#define KNETWORKMANAGER_CONNECTION_SETTING_PPP_WIDGET_H
+#ifndef TDENETWORKMANAGER_CONNECTION_SETTING_PPP_WIDGET_H
+#define TDENETWORKMANAGER_CONNECTION_SETTING_PPP_WIDGET_H
 
 
 // tqt headers
@@ -67,4 +67,4 @@ class PPPWidgetImpl : public WidgetInterface
 };
 
 }
-#endif /* KNETWORKMANAGER_CONNECTION_SETTING_PPP_WIDGET_H*/
+#endif /* TDENETWORKMANAGER_CONNECTION_SETTING_PPP_WIDGET_H*/
diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_serial_widget.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_serial_widget.h
index 93e23fd..ff6164b 100644
--- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_serial_widget.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_serial_widget.h
@@ -22,8 +22,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_CONNECTION_SETTING_SERIAL_WIDGET_H
-#define KNETWORKMANAGER_CONNECTION_SETTING_SERIAL_WIDGET_H
+#ifndef TDENETWORKMANAGER_CONNECTION_SETTING_SERIAL_WIDGET_H
+#define TDENETWORKMANAGER_CONNECTION_SETTING_SERIAL_WIDGET_H
 
 
 // tqt headers
@@ -70,4 +70,4 @@ class SerialWidgetImpl : public WidgetInterface
 };
 
 }
-#endif /* KNETWORKMANAGER_CONNECTION_SETTING_SERIAL_WIDGET_H*/
+#endif /* TDENETWORKMANAGER_CONNECTION_SETTING_SERIAL_WIDGET_H*/
diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_vpn_widget.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_vpn_widget.h
index 09efd05..98fbd31 100644
--- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_vpn_widget.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_vpn_widget.h
@@ -22,8 +22,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_CONNECTION_SETTING_VPN_WIDGET_H
-#define KNETWORKMANAGER_CONNECTION_SETTING_VPN_WIDGET_H
+#ifndef TDENETWORKMANAGER_CONNECTION_SETTING_VPN_WIDGET_H
+#define TDENETWORKMANAGER_CONNECTION_SETTING_VPN_WIDGET_H
 
 
 // tqt headers
@@ -66,4 +66,4 @@ class VPNWidgetImpl : public WidgetInterface
 };
 
 }
-#endif /* KNETWORKMANAGER_CONNECTION_SETTING_VPN_WIDGET_H*/
+#endif /* TDENETWORKMANAGER_CONNECTION_SETTING_VPN_WIDGET_H*/
diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_widget_interface.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_widget_interface.h
index 298e67e..a0cb71d 100644
--- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_widget_interface.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_widget_interface.h
@@ -22,8 +22,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_CONNECTION_SETTING_WIDGET_INTERFACE_H
-#define KNETWORKMANAGER_CONNECTION_SETTING_WIDGET_INTERFACE_H
+#ifndef TDENETWORKMANAGER_CONNECTION_SETTING_WIDGET_INTERFACE_H
+#define TDENETWORKMANAGER_CONNECTION_SETTING_WIDGET_INTERFACE_H
 
 // qt headers
 #include <tqwidget.h>
@@ -44,4 +44,4 @@ namespace ConnectionSettings
 	};
 }
 
-#endif /* KNETWORKMANAGER_CONNECTION_SETTING_WIDGET_INTERFACE_H */
+#endif /* TDENETWORKMANAGER_CONNECTION_SETTING_WIDGET_INTERFACE_H */
diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.h
index 1c2e6ef..9f0644a 100644
--- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.h
@@ -22,8 +22,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_CONNECTION_SETTING_WIRELESS_SECURITY_WIDGET_H
-#define KNETWORKMANAGER_CONNECTION_SETTING_WIRELESS_SECURITY_WIDGET_H
+#ifndef TDENETWORKMANAGER_CONNECTION_SETTING_WIRELESS_SECURITY_WIDGET_H
+#define TDENETWORKMANAGER_CONNECTION_SETTING_WIRELESS_SECURITY_WIDGET_H
 
 // tqt headers
 #include <tqtimer.h>
@@ -259,4 +259,4 @@ namespace ConnectionSettings
 	};
 }
 
-#endif /* KNETWORKMANAGER_CONNECTION_SETTING_WIRELESS_SECURITY_WIDGET_H*/
+#endif /* TDENETWORKMANAGER_CONNECTION_SETTING_WIRELESS_SECURITY_WIDGET_H*/
diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.h
index 6063402..431b295 100644
--- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.h
@@ -23,8 +23,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_CONNECTION_SETTING_WIRELESS_WIDGET_H
-#define KNETWORKMANAGER_CONNECTION_SETTING_WIRELESS_WIDGET_H
+#ifndef TDENETWORKMANAGER_CONNECTION_SETTING_WIRELESS_WIDGET_H
+#define TDENETWORKMANAGER_CONNECTION_SETTING_WIRELESS_WIDGET_H
 
 // tde headers
 #include <tdehardwaredevices.h>
@@ -75,4 +75,4 @@ namespace ConnectionSettings
 			ConnectionSettingsDialogImpl* _parentdialog;
 	};
 }
-#endif /* KNETWORKMANAGER_CONNECTION_SETTING_WIRELESS_WIDGET_H*/
+#endif /* TDENETWORKMANAGER_CONNECTION_SETTING_WIRELESS_WIDGET_H*/
diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_settings_dialog.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_settings_dialog.h
index 51e4b6c..535d640 100644
--- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_settings_dialog.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_settings_dialog.h
@@ -22,8 +22,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_CONNECTION_SETTINGS_DIALOG_H
-#define KNETWORKMANAGER_CONNECTION_SETTINGS_DIALOG_H
+#ifndef TDENETWORKMANAGER_CONNECTION_SETTINGS_DIALOG_H
+#define TDENETWORKMANAGER_CONNECTION_SETTINGS_DIALOG_H
 
 // tqt headers
 #include <tqvaluelist.h>
@@ -88,4 +88,4 @@ class ConnectionSettingsDialogImpl : public ConnectionSettingsDialog
 		TQByteArray _networkextid;
 };
 
-#endif /* KNETWORKMANAGER_CONNECTION_SETTINGS_DIALOG_H*/
+#endif /* TDENETWORKMANAGER_CONNECTION_SETTINGS_DIALOG_H*/
diff --git a/tdenetworkmanager/src/main.cpp b/tdenetworkmanager/src/main.cpp
index 84b5490..31255ce 100644
--- a/tdenetworkmanager/src/main.cpp
+++ b/tdenetworkmanager/src/main.cpp
@@ -36,7 +36,7 @@
 #include "tdenetman.h"
 
 
-static const char* tdenm_version = I18N_NOOP(KNETWORKMANAGER_VERSION_STRING);
+static const char* tdenm_version = I18N_NOOP(TDENETWORKMANAGER_VERSION_STRING);
 static const char* tdenm_descr   = I18N_NOOP("A NetworkManager front-end for TDE");
 static const char* tdenm_copy    = I18N_NOOP("Copyright (C) 2012 Trinity Destop Project");
 static const char* tdenm_webpage = I18N_NOOP("http://www.trinitydesktop.org");
diff --git a/tdenetworkmanager/src/tdenetman-cellular_device_tray.h b/tdenetworkmanager/src/tdenetman-cellular_device_tray.h
index c718940..202c25c 100644
--- a/tdenetworkmanager/src/tdenetman-cellular_device_tray.h
+++ b/tdenetworkmanager/src/tdenetman-cellular_device_tray.h
@@ -24,8 +24,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_CELLULAR_DEVICE_TRAY_H
-#define KNETWORKMANAGER_CELLULAR_DEVICE_TRAY_H
+#ifndef TDENETWORKMANAGER_CELLULAR_DEVICE_TRAY_H
+#define TDENETWORKMANAGER_CELLULAR_DEVICE_TRAY_H
 
 // TDENM includes
 #include "tdenetman.h"
@@ -53,4 +53,4 @@ class CellularDeviceTray : public DeviceTrayComponent
 		TDEHardwareDevices* hwdevices;
 };
 
-#endif /* KNETWORKMANAGER_CELLULAR_DEVICE_TRAY_H */
+#endif /* TDENETWORKMANAGER_CELLULAR_DEVICE_TRAY_H */
diff --git a/tdenetworkmanager/src/tdenetman-connection_editor.h b/tdenetworkmanager/src/tdenetman-connection_editor.h
index 66283e2..05fd823 100644
--- a/tdenetworkmanager/src/tdenetman-connection_editor.h
+++ b/tdenetworkmanager/src/tdenetman-connection_editor.h
@@ -22,8 +22,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_CONNECTION_EDITOR_H
-#define KNETWORKMANAGER_CONNECTION_EDITOR_H
+#ifndef TDENETWORKMANAGER_CONNECTION_EDITOR_H
+#define TDENETWORKMANAGER_CONNECTION_EDITOR_H
 
 // tqt headers
 #include <tqvaluelist.h>
@@ -65,4 +65,4 @@ class ConnectionEditorImpl : public ConnectionEditor
 		void fillConnectionList();
 };
 
-#endif /* KNETWORKMANAGER_CONNECTION_EDITOR_H*/
+#endif /* TDENETWORKMANAGER_CONNECTION_EDITOR_H*/
diff --git a/tdenetworkmanager/src/tdenetman-menu_subhead.h b/tdenetworkmanager/src/tdenetman-menu_subhead.h
index d7917e2..1ef860d 100644
--- a/tdenetworkmanager/src/tdenetman-menu_subhead.h
+++ b/tdenetworkmanager/src/tdenetman-menu_subhead.h
@@ -24,8 +24,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_MENU_SUBHEAD_H
-#define KNETWORKMANAGER_MENU_SUBHEAD_H
+#ifndef TDENETWORKMANAGER_MENU_SUBHEAD_H
+#define TDENETWORKMANAGER_MENU_SUBHEAD_H
 
 #include <tqmap.h>
 #include <tqtimer.h>
@@ -53,4 +53,4 @@ class Subhead : public TQWidget
 	  ~Subhead ();
 };
 
-#endif /* KNETWORKMANAGER_MENU_SUBHEAD_H */
+#endif /* TDENETWORKMANAGER_MENU_SUBHEAD_H */
diff --git a/tdenetworkmanager/src/tdenetman-menuitem.h b/tdenetworkmanager/src/tdenetman-menuitem.h
index d7a3b48..705780f 100644
--- a/tdenetworkmanager/src/tdenetman-menuitem.h
+++ b/tdenetworkmanager/src/tdenetman-menuitem.h
@@ -23,8 +23,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_MENUITEM_H
-#define KNETWORKMANAGER_MENUITEM_H
+#ifndef TDENETWORKMANAGER_MENUITEM_H
+#define TDENETWORKMANAGER_MENUITEM_H
 
 #include <tqobject.h>
 
@@ -54,4 +54,4 @@ class NetworkMenuItem : public TQObject
 		NetworkMenuItemPrivate* d;
 };
 
-#endif /* KNETWORKMANAGER_MENUITEM_H */
+#endif /* TDENETWORKMANAGER_MENUITEM_H */
diff --git a/tdenetworkmanager/src/tdenetman-plugin.h b/tdenetworkmanager/src/tdenetman-plugin.h
index 9d8a3cc..9ddde0f 100644
--- a/tdenetworkmanager/src/tdenetman-plugin.h
+++ b/tdenetworkmanager/src/tdenetman-plugin.h
@@ -22,8 +22,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_PLUGIN_H
-#define KNETWORKMANAGER_PLUGIN_H
+#ifndef TDENETWORKMANAGER_PLUGIN_H
+#define TDENETWORKMANAGER_PLUGIN_H
 
 #include <tqobject.h>
 
@@ -36,4 +36,4 @@ class Plugin : public TQObject
 		~Plugin();
 };
 
-#endif /* KNETWORKMANAGER_PLUGIN_H */
+#endif /* TDENETWORKMANAGER_PLUGIN_H */
diff --git a/tdenetworkmanager/src/tdenetman-pluginmanager.h b/tdenetworkmanager/src/tdenetman-pluginmanager.h
index 262da0f..45679fb 100644
--- a/tdenetworkmanager/src/tdenetman-pluginmanager.h
+++ b/tdenetworkmanager/src/tdenetman-pluginmanager.h
@@ -22,8 +22,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_PLUGINMANAGER_H
-#define KNETWORKMANAGER_PLUGINMANAGER_H
+#ifndef TDENETWORKMANAGER_PLUGINMANAGER_H
+#define TDENETWORKMANAGER_PLUGINMANAGER_H
 
 #include <tqobject.h>
 #include <tqmap.h>
@@ -64,4 +64,4 @@ class PluginManager : public TQObject
 		static PluginManager* _instance;
 };
 
-#endif /* KNETWORKMANAGER_PLUGINMANAGER_H */
+#endif /* TDENETWORKMANAGER_PLUGINMANAGER_H */
diff --git a/tdenetworkmanager/src/tdenetman-tray.h b/tdenetworkmanager/src/tdenetman-tray.h
index fef9480..da8f1c4 100644
--- a/tdenetworkmanager/src/tdenetman-tray.h
+++ b/tdenetworkmanager/src/tdenetman-tray.h
@@ -27,8 +27,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_TRAY_H
-#define KNETWORKMANAGER_TRAY_H
+#ifndef TDENETWORKMANAGER_TRAY_H
+#define TDENETWORKMANAGER_TRAY_H
 
 #include <tqmap.h>
 #include <tqtimer.h>
@@ -164,4 +164,4 @@ class NewSecretsDialog : public TQDialog
 		TDENetworkConnection* _connection;
 };
 
-#endif /* KNETWORKMANAGER_TRAY_H */
+#endif /* TDENETWORKMANAGER_TRAY_H */
diff --git a/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.h b/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.h
index 0d55e53..29501eb 100644
--- a/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.h
+++ b/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.h
@@ -22,8 +22,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_VPNAUTHENTICATIONDIALOG_H
-#define KNETWORKMANAGER_VPNAUTHENTICATIONDIALOG_H
+#ifndef TDENETWORKMANAGER_VPNAUTHENTICATIONDIALOG_H
+#define TDENETWORKMANAGER_VPNAUTHENTICATIONDIALOG_H
 
 #include <tqdir.h>
 #include <tqobject.h>
@@ -64,4 +64,4 @@ class VPNAuthenticationDialog : public AuthenticationDialog
 		void done(bool, TQStringList &, bool, bool);
 };
 
-#endif /* KNETWORKMANAGER_VPNAUTHENTICATIONDIALOG_H */
+#endif /* TDENETWORKMANAGER_VPNAUTHENTICATIONDIALOG_H */
diff --git a/tdenetworkmanager/src/tdenetman-vpnmanager.h b/tdenetworkmanager/src/tdenetman-vpnmanager.h
index d80e7c5..f4c62e6 100644
--- a/tdenetworkmanager/src/tdenetman-vpnmanager.h
+++ b/tdenetworkmanager/src/tdenetman-vpnmanager.h
@@ -23,8 +23,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_VPNMANAGER_H
-#define KNETWORKMANAGER_VPNMANAGER_H
+#ifndef TDENETWORKMANAGER_VPNMANAGER_H
+#define TDENETWORKMANAGER_VPNMANAGER_H
 
 #include <tqobject.h>
 #include <tqguardedptr.h>
@@ -47,4 +47,4 @@ class VPNManager : public TQObject
 	  static VPNServiceList getVPNServices ();
 };
 
-#endif /* KNETWORKMANAGER_VPNMANAGER_H */
+#endif /* TDENETWORKMANAGER_VPNMANAGER_H */
diff --git a/tdenetworkmanager/src/tdenetman-vpnplugin.h b/tdenetworkmanager/src/tdenetman-vpnplugin.h
index 0ec909c..b345136 100644
--- a/tdenetworkmanager/src/tdenetman-vpnplugin.h
+++ b/tdenetworkmanager/src/tdenetman-vpnplugin.h
@@ -22,8 +22,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_VPNPLUGIN_H
-#define KNETWORKMANAGER_VPNPLUGIN_H
+#ifndef TDENETWORKMANAGER_VPNPLUGIN_H
+#define TDENETWORKMANAGER_VPNPLUGIN_H
 
 #include <tqwidget.h>
 #include <tqmap.h>
@@ -33,7 +33,7 @@
 
 #include "tdenetman-plugin.h"
 
-#define KNETWORKMANAGER_VPNPLUGIN "TDENetworkManager/VPNPlugin"
+#define TDENETWORKMANAGER_VPNPLUGIN "TDENetworkManager/VPNPlugin"
 
 class VPNConfigWidget : public TQWidget
 {
@@ -78,5 +78,5 @@ class VPNPlugin : public Plugin
 };
 
 
-#endif /* KNETWORKMANAGER_VPNPLUGIN_H */
+#endif /* TDENETWORKMANAGER_VPNPLUGIN_H */
 
diff --git a/tdenetworkmanager/src/tdenetman-vpnservice.h b/tdenetworkmanager/src/tdenetman-vpnservice.h
index 29b7c56..d9981dd 100644
--- a/tdenetworkmanager/src/tdenetman-vpnservice.h
+++ b/tdenetworkmanager/src/tdenetman-vpnservice.h
@@ -23,8 +23,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_VPN_SERVICE_H
-#define KNETWORKMANAGER_VPN_SERVICE_H
+#ifndef TDENETWORKMANAGER_VPN_SERVICE_H
+#define TDENETWORKMANAGER_VPN_SERVICE_H
 
 #include <tqobject.h>
 #include <tqguardedptr.h>
@@ -57,4 +57,4 @@ class VPNService : public TQObject
 	  TQGuardedPtr<VPNPlugin> _vpnPlugin;
 };
 
-#endif /* KNETWORKMANAGER_VPN_SERVICE_H */
+#endif /* TDENETWORKMANAGER_VPN_SERVICE_H */
diff --git a/tdenetworkmanager/src/tdenetman-wired_device_tray.h b/tdenetworkmanager/src/tdenetman-wired_device_tray.h
index 2c1b0ba..e1c827a 100644
--- a/tdenetworkmanager/src/tdenetman-wired_device_tray.h
+++ b/tdenetworkmanager/src/tdenetman-wired_device_tray.h
@@ -24,8 +24,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_WIRED_DEVICE_TRAY_H
-#define KNETWORKMANAGER_WIRED_DEVICE_TRAY_H
+#ifndef TDENETWORKMANAGER_WIRED_DEVICE_TRAY_H
+#define TDENETWORKMANAGER_WIRED_DEVICE_TRAY_H
 
 // TDENM includes
 #include "devicetraycomponent.h"
@@ -55,4 +55,4 @@ class WiredDeviceTray : public DeviceTrayComponent
 		TDEHardwareDevices* hwdevices;
 };
 
-#endif /* KNETWORKMANAGER_WIRED_DEVICE_TRAY_H */
+#endif /* TDENETWORKMANAGER_WIRED_DEVICE_TRAY_H */
diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.h b/tdenetworkmanager/src/tdenetman-wireless_device_tray.h
index a34da1c..59a24a1 100644
--- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.h
+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.h
@@ -25,8 +25,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_WIRELESS_DEVICE_TRAY_H
-#define KNETWORKMANAGER_WIRELESS_DEVICE_TRAY_H
+#ifndef TDENETWORKMANAGER_WIRELESS_DEVICE_TRAY_H
+#define TDENETWORKMANAGER_WIRELESS_DEVICE_TRAY_H
 
 // TDENM includes
 #include "tdenetman.h"
@@ -84,4 +84,4 @@ class WirelessDeviceTray : public DeviceTrayComponent
 
 };
 
-#endif /* KNETWORKMANAGER_WIRELESS_DEVICE_TRAY_H */
+#endif /* TDENETWORKMANAGER_WIRELESS_DEVICE_TRAY_H */
diff --git a/tdenetworkmanager/src/tdenetman-wireless_manager.h b/tdenetworkmanager/src/tdenetman-wireless_manager.h
index 8baf68e..1d8765d 100644
--- a/tdenetworkmanager/src/tdenetman-wireless_manager.h
+++ b/tdenetworkmanager/src/tdenetman-wireless_manager.h
@@ -22,8 +22,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_WIRELESS_MANAGER_H
-#define KNETWORKMANAGER_WIRELESS_MANAGER_H
+#ifndef TDENETWORKMANAGER_WIRELESS_MANAGER_H
+#define TDENETWORKMANAGER_WIRELESS_MANAGER_H
 
 // TQt includes
 #include <tqguardedptr.h>
@@ -56,4 +56,4 @@ class WirelessManager
 
 };
 
-#endif /* KNETWORKMANAGER_WIRELESS_MANAGER_H */
+#endif /* TDENETWORKMANAGER_WIRELESS_MANAGER_H */
diff --git a/tdenetworkmanager/src/tdenetman-wireless_menuitem.h b/tdenetworkmanager/src/tdenetman-wireless_menuitem.h
index 717e1a0..35889e7 100644
--- a/tdenetworkmanager/src/tdenetman-wireless_menuitem.h
+++ b/tdenetworkmanager/src/tdenetman-wireless_menuitem.h
@@ -22,8 +22,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_WIRELESSMENUITEM_H
-#define KNETWORKMANAGER_WIRELESSMENUITEM_H
+#ifndef TDENETWORKMANAGER_WIRELESSMENUITEM_H
+#define TDENETWORKMANAGER_WIRELESSMENUITEM_H
 
 #include "tdenetman-menuitem.h"
 
@@ -86,4 +86,4 @@ class WirelessNetworkItem : public NetworkMenuItem, public TQCustomMenuItem
 		TDEHardwareDevices* hwdevices;
 };
 
-#endif /* KNETWORKMANAGER_WIRELESSMENUITEM_H */
+#endif /* TDENETWORKMANAGER_WIRELESSMENUITEM_H */
diff --git a/tdenetworkmanager/src/tdenetman-wireless_network.h b/tdenetworkmanager/src/tdenetman-wireless_network.h
index 7fb4d65..00fbd40 100644
--- a/tdenetworkmanager/src/tdenetman-wireless_network.h
+++ b/tdenetworkmanager/src/tdenetman-wireless_network.h
@@ -22,8 +22,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_WIRELESS_NETWORK_H
-#define KNETWORKMANAGER_WIRELESS_NETWORK_H
+#ifndef TDENETWORKMANAGER_WIRELESS_NETWORK_H
+#define TDENETWORKMANAGER_WIRELESS_NETWORK_H
 
 #include "tdenetman.h"
 
@@ -93,4 +93,4 @@ class WirelessNetwork
 		TDEHardwareDevices* hwdevices;
 };
 
-#endif /* KNETWORKMANAGER_WIRELESS_NETWORK_H */
+#endif /* TDENETWORKMANAGER_WIRELESS_NETWORK_H */
diff --git a/tdenetworkmanager/src/tdenetman.h b/tdenetworkmanager/src/tdenetman.h
index 6365b89..48e25fd 100644
--- a/tdenetworkmanager/src/tdenetman.h
+++ b/tdenetworkmanager/src/tdenetman.h
@@ -22,8 +22,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_H
-#define KNETWORKMANAGER_H
+#ifndef TDENETWORKMANAGER_H
+#define TDENETWORKMANAGER_H
 
 // TDE includes
 #include <kuniqueapplication.h>
@@ -54,4 +54,4 @@ class TDENetworkManager : public KUniqueApplication
 		void timerEvent( TQTimerEvent *e );
 };
 
-#endif /* KNETWORKMANAGER_H */
+#endif /* TDENETWORKMANAGER_H */
diff --git a/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp b/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp
index 74e245f..845d179 100644
--- a/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp
+++ b/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-openvpn.cpp - A NetworkManager frontend for TDE
+ * tdenetman-openvpn.cpp - A NetworkManager frontend for TDE
  *
  * Copyright (C) 2006 Novell, Inc.
  *
@@ -609,4 +609,4 @@ bool OpenVPNAuthentication::needsUserInteraction()
 	return false;
 }
 
-#include "tdenetman-openvpn.moc"
\ No newline at end of file
+#include "tdenetman-openvpn.moc"
diff --git a/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.h b/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.h
index a53f5d4..eef5be9 100644
--- a/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.h
+++ b/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-openvpn.h - A NetworkManager frontend for TDE
+ * tdenetman-openvpn.h - A NetworkManager frontend for TDE
  *
  * Copyright (C) 2006 Novell, Inc.
  *
@@ -22,8 +22,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_OPENVPN_H
-#define KNETWORKMANAGER_OPENVPN_H
+#ifndef TDENETWORKMANAGER_OPENVPN_H
+#define TDENETWORKMANAGER_OPENVPN_H
 
 #include <tqmap.h>
 #include <tqstring.h>
@@ -111,4 +111,4 @@ class OpenVPNAuthentication : public VPNAuthenticationWidget
 		OpenVPNConnectionType::CONNECTIONTYPE _connectionType;
 };
 
-#endif /* KNETWORKMANAGER_OPENVPN_H */
+#endif /* TDENETWORKMANAGER_OPENVPN_H */
diff --git a/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp b/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp
index e3d91d9..d3fca42 100644
--- a/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp
+++ b/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-pptp.cpp - A NetworkManager frontend for TDE
+ * tdenetman-pptp.cpp - A NetworkManager frontend for TDE
  *
  * Copyright (C) 2006 Novell, Inc.
  *
@@ -251,4 +251,4 @@ void PPTPAuthentication::setPasswords(TDENetworkSettingsMap secrets) {
 	}
 }
 
-#include "tdenetman-pptp.moc"
\ No newline at end of file
+#include "tdenetman-pptp.moc"
diff --git a/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.h b/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.h
index 6f80300..7fb7af6 100644
--- a/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.h
+++ b/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-vpnc.h - A NetworkManager frontend for TDE
+ * tdenetman-pptp.h - A NetworkManager frontend for TDE
  *
  * Copyright (C) 2006 Novell, Inc.
  *
@@ -22,8 +22,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_PPTP_H
-#define KNETWORKMANAGER_PPTP_H
+#ifndef TDENETWORKMANAGER_PPTP_H
+#define TDENETWORKMANAGER_PPTP_H
 
 #include <tqmap.h>
 #include <tqstring.h>
@@ -85,4 +85,4 @@ class PPTPAuthentication : public VPNAuthenticationWidget
 		PPTPAuthenticationWidget* _pptpAuth;
 };
 
-#endif /* KNETWORKMANAGER_PPTP_H */
+#endif /* TDENETWORKMANAGER_PPTP_H */
diff --git a/tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.cpp b/tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.cpp
index 5b52b1b..b818987 100644
--- a/tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.cpp
+++ b/tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-strongswan.cpp - A NetworkManager frontend for TDE
+ * tdenetman-strongswan.cpp - A NetworkManager frontend for TDE
  *
  * Author: Thomas Kallenberg <tkallenb@hsr.ch>, <thomas@no-more-secrets.ch>
  *
@@ -257,4 +257,4 @@ void StrongswanAuthentication::setPasswords(TDENetworkSettingsMap secrets) {
 	}
 }
 
-#include "tdenetman-strongswan.moc"
\ No newline at end of file
+#include "tdenetman-strongswan.moc"
diff --git a/tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.h b/tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.h
index c1229ab..884cf04 100644
--- a/tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.h
+++ b/tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-strongswan.h - A NetworkManager frontend for TDE
+ * tdenetman-strongswan.h - A NetworkManager frontend for TDE
  *
  * Author: Thomas Kallenberg <tkallenb@hsr.ch>, <thomas@no-more-secrets.ch>
  *
@@ -22,8 +22,8 @@
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_STRONGSWAN_H
-#define KNETWORKMANAGER_STRONGSWAN_H
+#ifndef TDENETWORKMANAGER_STRONGSWAN_H
+#define TDENETWORKMANAGER_STRONGSWAN_H
 
 #include <tqmap.h>
 #include <tqstring.h>
@@ -100,4 +100,4 @@ class StrongswanAuthentication : public VPNAuthenticationWidget
 		StrongswanAuthenticationWidget* _strongswanAuth;
 };
 
-#endif /* KNETWORKMANAGER_STRONGSWAN_H */
+#endif /* TDENETWORKMANAGER_STRONGSWAN_H */
diff --git a/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.h b/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.h
index 9999140..a23faa1 100644
--- a/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.h
+++ b/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.h
@@ -1,6 +1,6 @@
 /***************************************************************************
  *
- * knetworkmanager-vpnc.h - A NetworkManager frontend for TDE 
+ * tdenetman-vpnc.h - A NetworkManager frontend for TDE
  *
  * Copyright (C) 2006 Novell, Inc.
  *
@@ -16,15 +16,15 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  **************************************************************************/
 
-#ifndef KNETWORKMANAGER_VPNC_H
-#define KNETWORKMANAGER_VPNC_H
+#ifndef TDENETWORKMANAGER_VPNC_H
+#define TDENETWORKMANAGER_VPNC_H
 
 #include <tqmap.h>
 #include <tqstring.h>
@@ -90,4 +90,4 @@ class VPNCAuthentication : public VPNAuthenticationWidget
 		VPNCAuthenticationWidget* _vpncAuth;
 };
 
-#endif /* KNETWORKMANAGER_VPNC_H */
+#endif /* TDENETWORKMANAGER_VPNC_H */