From af4135d80dc6a4591d1890d5d6387f8b4a98d575 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:50:55 -0600
Subject: [PATCH] Rename additional header files to avoid conflicts with KDE4

---
 src/addnetworkroutedialog.cpp                |  2 +-
 src/advancedsettingsdialog.cpp               |  2 +-
 src/ciscocertificateenrollment.cpp           |  4 ++--
 src/ciscocertificateenrollmentdatadialog.cpp |  4 ++--
 src/ciscopasswddecoder.cpp                   |  4 ++--
 src/configdaemonoptions.cpp                  |  2 +-
 src/debugoutputtextedit.cpp                  |  2 +-
 src/displaycertdialog.cpp                    |  2 +-
 src/enterpassworddialog.cpp                  |  4 ++--
 src/enterxauthinteractivepasscodedialog.cpp  |  4 ++--
 src/generateopenvpnkeydialog.cpp             |  6 +++---
 src/importcertificatedialog.cpp              |  4 ++--
 src/importipsecprofiledialog.cpp             |  6 +++---
 src/importopenvpnprofiledialog.cpp           |  6 +++---
 src/importprofiledialog.cpp                  |  6 +++---
 src/kfeedback.cpp                            |  4 ++--
 src/kvpnc.cpp                                | 12 ++++++------
 src/kvpncconfig.cpp                          |  4 ++--
 src/kvpnckicker.cpp                          |  4 ++--
 src/listviewtooltip.h                        |  2 +-
 src/logviewerdialog.cpp                      |  6 +++---
 src/main.cpp                                 |  4 ++--
 src/mainview.cpp                             |  4 ++--
 src/manageciscocert.cpp                      |  4 ++--
 src/networkinterface.cpp                     |  8 ++++----
 src/networkinterface.h                       |  2 +-
 src/newprofiledialog.cpp                     |  4 ++--
 src/newprofilewizard.cpp                     |  4 ++--
 src/openvpnmanagementhandler.cpp             |  4 ++--
 src/preferencesdialog.cpp                    |  4 ++--
 src/profilecertoptions.cpp                   |  2 +-
 src/profilegeneraloptions.cpp                |  2 +-
 src/profileipsecoptions.cpp                  |  2 +-
 src/profilemanagerbase.cpp                   |  2 +-
 src/profilenetworkrouteoptions.cpp           |  4 ++--
 src/profilepskoptions.cpp                    |  2 +-
 src/profileracoonoptions.cpp                 |  2 +-
 src/profilesmartcardoptions.cpp              |  2 +-
 src/profilesshoptions.cpp                    |  2 +-
 src/toolinfo.cpp                             |  4 ++--
 src/toolsinfodialog.cpp                      |  4 ++--
 src/utils.cpp                                |  4 ++--
 src/utils.h                                  |  2 +-
 src/vpntypesinfodialog.cpp                   |  4 ++--
 44 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/src/addnetworkroutedialog.cpp b/src/addnetworkroutedialog.cpp
index 787ee62..4f2716f 100644
--- a/src/addnetworkroutedialog.cpp
+++ b/src/addnetworkroutedialog.cpp
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "addnetworkroutedialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <klineedit.h>
 #include <kcombobox.h>
diff --git a/src/advancedsettingsdialog.cpp b/src/advancedsettingsdialog.cpp
index 8459ed0..58b11b2 100644
--- a/src/advancedsettingsdialog.cpp
+++ b/src/advancedsettingsdialog.cpp
@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 #include <tqpushbutton.h>
 #include <tqgroupbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "advancedsettingsdialog.h"
 #include "toolinfo.h"
 #include <iostream>
diff --git a/src/ciscocertificateenrollment.cpp b/src/ciscocertificateenrollment.cpp
index f1e1ae5..5b308da 100644
--- a/src/ciscocertificateenrollment.cpp
+++ b/src/ciscocertificateenrollment.cpp
@@ -21,8 +21,8 @@
 //BEGIN INCLUDES
 #include "ciscocertificateenrollment.h"
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <kpassdlg.h>
 #include <kcombobox.h>
diff --git a/src/ciscocertificateenrollmentdatadialog.cpp b/src/ciscocertificateenrollmentdatadialog.cpp
index 2ecabe4..e7d139a 100644
--- a/src/ciscocertificateenrollmentdatadialog.cpp
+++ b/src/ciscocertificateenrollmentdatadialog.cpp
@@ -18,8 +18,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "ciscocertificateenrollmentdatadialog.h"
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <kpassdlg.h>
 #include <kcombobox.h>
diff --git a/src/ciscopasswddecoder.cpp b/src/ciscopasswddecoder.cpp
index 1925bc3..34c8990 100644
--- a/src/ciscopasswddecoder.cpp
+++ b/src/ciscopasswddecoder.cpp
@@ -22,8 +22,8 @@
 
 #include <tqfile.h>
 #include <tqtextstream.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 CiscoPasswdDecoder::CiscoPasswdDecoder(TQString& profileFile)
 {
diff --git a/src/configdaemonoptions.cpp b/src/configdaemonoptions.cpp
index 8f76f63..3593cf2 100644
--- a/src/configdaemonoptions.cpp
+++ b/src/configdaemonoptions.cpp
@@ -19,7 +19,7 @@
 ***************************************************************************/
 
 //BEGIN INCLUDES
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "configdaemonoptions.h"
 
diff --git a/src/debugoutputtextedit.cpp b/src/debugoutputtextedit.cpp
index d6857bb..cdc8c09 100644
--- a/src/debugoutputtextedit.cpp
+++ b/src/debugoutputtextedit.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "debugoutputtextedit.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktextbrowser.h>
 #include <iostream>
 #include <tqwidget.h>
diff --git a/src/displaycertdialog.cpp b/src/displaycertdialog.cpp
index 4bf4be6..57e06c5 100644
--- a/src/displaycertdialog.cpp
+++ b/src/displaycertdialog.cpp
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "displaycertdialog.h"
-#include "klocale.h"
+#include "tdelocale.h"
 #include <klineedit.h>
 #include <tqstringlist.h>
 #include <iostream>
diff --git a/src/enterpassworddialog.cpp b/src/enterpassworddialog.cpp
index be96482..c9e76e0 100644
--- a/src/enterpassworddialog.cpp
+++ b/src/enterpassworddialog.cpp
@@ -20,8 +20,8 @@
 
 #include "enterpassworddialog.h"
 #include <tqdialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
 #include <tqdialog.h>
diff --git a/src/enterxauthinteractivepasscodedialog.cpp b/src/enterxauthinteractivepasscodedialog.cpp
index 94771ad..ac9d732 100644
--- a/src/enterxauthinteractivepasscodedialog.cpp
+++ b/src/enterxauthinteractivepasscodedialog.cpp
@@ -20,8 +20,8 @@
 
 #include "enterxauthinteractivepasscodedialog.h"
 #include <tqdialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
 #include <tqdialog.h>
diff --git a/src/generateopenvpnkeydialog.cpp b/src/generateopenvpnkeydialog.cpp
index 2763563..88890fd 100644
--- a/src/generateopenvpnkeydialog.cpp
+++ b/src/generateopenvpnkeydialog.cpp
@@ -18,9 +18,9 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "generateopenvpnkeydialog.h"
-#include <kmessagebox.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <tqfile.h>
diff --git a/src/importcertificatedialog.cpp b/src/importcertificatedialog.cpp
index 0321242..5cc77ab 100644
--- a/src/importcertificatedialog.cpp
+++ b/src/importcertificatedialog.cpp
@@ -23,8 +23,8 @@
 ***************************************************************************/
 //BEGIN includes
 #include "importcertificatedialog.h"
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <kpassdlg.h>
 #include <kcombobox.h>
diff --git a/src/importipsecprofiledialog.cpp b/src/importipsecprofiledialog.cpp
index d87546c..ea9830c 100644
--- a/src/importipsecprofiledialog.cpp
+++ b/src/importipsecprofiledialog.cpp
@@ -22,10 +22,10 @@
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
 //BEGIN INCLUDES
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kcombobox.h>
diff --git a/src/importopenvpnprofiledialog.cpp b/src/importopenvpnprofiledialog.cpp
index d4264ba..29a759d 100644
--- a/src/importopenvpnprofiledialog.cpp
+++ b/src/importopenvpnprofiledialog.cpp
@@ -22,10 +22,10 @@
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
 //BEGIN INCLUDES
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kcombobox.h>
diff --git a/src/importprofiledialog.cpp b/src/importprofiledialog.cpp
index 82a5f89..49d343c 100644
--- a/src/importprofiledialog.cpp
+++ b/src/importprofiledialog.cpp
@@ -18,10 +18,10 @@
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
 //BEGIN INCLUDES
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
diff --git a/src/kfeedback.cpp b/src/kfeedback.cpp
index 63550a9..09a4697 100644
--- a/src/kfeedback.cpp
+++ b/src/kfeedback.cpp
@@ -16,9 +16,9 @@
 #include <tqmultilineedit.h>
 #include <tqhbox.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kapp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp
index dd0d6a9..6d89b27 100644
--- a/src/kvpnc.cpp
+++ b/src/kvpnc.cpp
@@ -56,9 +56,9 @@
 
 #include <tdeaboutdata.h>
 #include <kstdaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpassdlg.h>
 // #include <knotifyclient.h>
 #include <kstatusbar.h>
@@ -74,11 +74,11 @@
 #include <kcombobox.h>
 #include <kstddirs.h>
 #include <klineeditdlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdelistview.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <knuminput.h>
 #include <tdewallet.h>
@@ -98,7 +98,7 @@
 #include "vpnaccountdata.h"
 #include "enterpassworddialog.h"
 #include "enterxauthinteractivepasscodedialog.h"
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <iostream>
 #include "utils.h"
 #include "toolsinfodialog.h"
diff --git a/src/kvpncconfig.cpp b/src/kvpncconfig.cpp
index 9bcb2c7..25e8b41 100644
--- a/src/kvpncconfig.cpp
+++ b/src/kvpncconfig.cpp
@@ -23,9 +23,9 @@
 #include "utils.h"
 #include "kvpncimportprofileselectiondialog.h"
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <iostream>
 #include <kstandarddirs.h>
 #include <tqdom.h>
diff --git a/src/kvpnckicker.cpp b/src/kvpnckicker.cpp
index 029463c..afc9cd2 100644
--- a/src/kvpnckicker.cpp
+++ b/src/kvpnckicker.cpp
@@ -20,10 +20,10 @@
 
 #include <tqtooltip.h>
 #include <tqimage.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include "kvpnckicker.h"
 #include "kvpnc.h"
 
diff --git a/src/listviewtooltip.h b/src/listviewtooltip.h
index 62ecb36..25487ab 100644
--- a/src/listviewtooltip.h
+++ b/src/listviewtooltip.h
@@ -23,7 +23,7 @@
 #include <tqlistview.h>
 #include <tqheader.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 /**
 	@author Christoph Thielecke <crissi99@gmx.de>
diff --git a/src/logviewerdialog.cpp b/src/logviewerdialog.cpp
index abed51a..556738a 100644
--- a/src/logviewerdialog.cpp
+++ b/src/logviewerdialog.cpp
@@ -18,10 +18,10 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "logviewerdialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <tqpixmap.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqstring.h>
 #include <tqcursor.h>
 #include <kiconloader.h>
@@ -35,7 +35,7 @@
 #include <kvpnc.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 LogViewerDialog::LogViewerDialog(TQWidget *parent, TQApplication *app, KVpncConfig *GlobalConfig,const TQString& caption, int count) : KDialogBase( parent, "Show_log", false, caption,
 KDialogBase::Ok|KDialogBase::Cancel,KDialogBase::Ok, true )
diff --git a/src/main.cpp b/src/main.cpp
index 74b34d0..bc8e222 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,11 +21,11 @@
 // KDE includes
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdemainwindow.h>
 #include <kapp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <tqstring.h>
 
diff --git a/src/mainview.cpp b/src/mainview.cpp
index f25d038..e3a2166 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -18,13 +18,13 @@
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tqpushbutton.h>
 #include <tqlineedit.h>
 #include <klineedit.h>
 #include <kpassdlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqprocess.h>
 #include <tqtextedit.h>
 #include <tqwidget.h>
diff --git a/src/manageciscocert.cpp b/src/manageciscocert.cpp
index af3b0dc..dc336f1 100644
--- a/src/manageciscocert.cpp
+++ b/src/manageciscocert.cpp
@@ -29,8 +29,8 @@
 
 #include <kpushbutton.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kcombobox.h>
 #include <kurlrequester.h>
 #include <kpassdlg.h>
diff --git a/src/networkinterface.cpp b/src/networkinterface.cpp
index 3d9a186..4c9d291 100644
--- a/src/networkinterface.cpp
+++ b/src/networkinterface.cpp
@@ -22,13 +22,13 @@
 #include <iostream>
 #include <tqfile.h>
 #include <tqtextstream.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstddirs.h>
 #include <tqnetwork.h>
 #include <tqurloperator.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <arpa/inet.h>
 #include <linux/sockios.h>
 #include <linux/if.h>
diff --git a/src/networkinterface.h b/src/networkinterface.h
index 1543af2..651e05e 100644
--- a/src/networkinterface.h
+++ b/src/networkinterface.h
@@ -25,7 +25,7 @@
 #include <tqstringlist.h>
 #include <tqobject.h>
 #include <tqapplication.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqhttp.h>
 #include <tqstringlist.h>
 #include "kvpncconfig.h"
diff --git a/src/newprofiledialog.cpp b/src/newprofiledialog.cpp
index 479b75b..2ff41e9 100644
--- a/src/newprofiledialog.cpp
+++ b/src/newprofiledialog.cpp
@@ -23,11 +23,11 @@
 #include <klineedit.h>
 #include <tqcheckbox.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqlistbox.h>
 #include <klineedit.h>
 #include <klineeditdlg.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <tqobject.h>
 #include <ktextedit.h>
diff --git a/src/newprofilewizard.cpp b/src/newprofilewizard.cpp
index 3086137..f00b514 100644
--- a/src/newprofilewizard.cpp
+++ b/src/newprofilewizard.cpp
@@ -19,7 +19,7 @@
 ***************************************************************************/
 //BEGIN INCLUDES
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqhbox.h>
 #include <tqvbox.h>
@@ -28,7 +28,7 @@
 #include <tqcheckbox.h>
 #include <klineedit.h>
 #include <tqlineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcombobox.h>
 #include <kurlrequester.h>
 #include <knuminput.h>
diff --git a/src/openvpnmanagementhandler.cpp b/src/openvpnmanagementhandler.cpp
index 4007bcb..1559816 100644
--- a/src/openvpnmanagementhandler.cpp
+++ b/src/openvpnmanagementhandler.cpp
@@ -24,10 +24,10 @@
 #include <tqregexp.h>
 #include <tqtextstream.h>
 #include <kpassdlg.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 #include "kvpncconfig.h"
 #include "utils.h"
diff --git a/src/preferencesdialog.cpp b/src/preferencesdialog.cpp
index dca3a7b..1b6e191 100644
--- a/src/preferencesdialog.cpp
+++ b/src/preferencesdialog.cpp
@@ -24,10 +24,10 @@
 #include "preferencesdialog.h"
 #include <tqtabwidget.h>
 #include <tqpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqspinbox.h>
 #include <tqpixmap.h>
 #include <kurlrequester.h>
diff --git a/src/profilecertoptions.cpp b/src/profilecertoptions.cpp
index f0db6de..9e5e4ce 100644
--- a/src/profilecertoptions.cpp
+++ b/src/profilecertoptions.cpp
@@ -24,7 +24,7 @@
 #include <klineedit.h>
 #include <kurlrequester.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include "widgetnotifyhelper.h"
 #include <iostream>
diff --git a/src/profilegeneraloptions.cpp b/src/profilegeneraloptions.cpp
index f535af3..cbc2d6c 100644
--- a/src/profilegeneraloptions.cpp
+++ b/src/profilegeneraloptions.cpp
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "profilegeneraloptions.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
 #include <klineedit.h>
diff --git a/src/profileipsecoptions.cpp b/src/profileipsecoptions.cpp
index 847cc0a..b0ec594 100644
--- a/src/profileipsecoptions.cpp
+++ b/src/profileipsecoptions.cpp
@@ -21,7 +21,7 @@
 #include "profileipsecoptions.h"
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
diff --git a/src/profilemanagerbase.cpp b/src/profilemanagerbase.cpp
index 0cdca92..7d9b0b7 100644
--- a/src/profilemanagerbase.cpp
+++ b/src/profilemanagerbase.cpp
@@ -1,5 +1,5 @@
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './profilemanagerbase.ui'
 **
diff --git a/src/profilenetworkrouteoptions.cpp b/src/profilenetworkrouteoptions.cpp
index 519831c..31ff501 100644
--- a/src/profilenetworkrouteoptions.cpp
+++ b/src/profilenetworkrouteoptions.cpp
@@ -24,10 +24,10 @@
 #include <tdelistview.h>
 #include <tqpushbutton.h>
 #include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcombobox.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <iostream>
 
diff --git a/src/profilepskoptions.cpp b/src/profilepskoptions.cpp
index e7c9065..236a10c 100644
--- a/src/profilepskoptions.cpp
+++ b/src/profilepskoptions.cpp
@@ -24,7 +24,7 @@
 #include <klineedit.h>
 #include <kurlrequester.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include "widgetnotifyhelper.h"
 #include <iostream>
diff --git a/src/profileracoonoptions.cpp b/src/profileracoonoptions.cpp
index cc060a4..b9e310d 100644
--- a/src/profileracoonoptions.cpp
+++ b/src/profileracoonoptions.cpp
@@ -20,7 +20,7 @@
 #include "profileracoonoptions.h"
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <tqcheckbox.h>
 #include <tqtooltip.h>
diff --git a/src/profilesmartcardoptions.cpp b/src/profilesmartcardoptions.cpp
index 3714145..667bee7 100644
--- a/src/profilesmartcardoptions.cpp
+++ b/src/profilesmartcardoptions.cpp
@@ -24,7 +24,7 @@
 #include <klineedit.h>
 #include <kurlrequester.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include "widgetnotifyhelper.h"
 #include <iostream>
diff --git a/src/profilesshoptions.cpp b/src/profilesshoptions.cpp
index b627f24..f923651 100644
--- a/src/profilesshoptions.cpp
+++ b/src/profilesshoptions.cpp
@@ -21,7 +21,7 @@
 
 #include <klineedit.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 #include <tqspinbox.h>
 #include <tqcheckbox.h>
diff --git a/src/toolinfo.cpp b/src/toolinfo.cpp
index a84ae2c..ddd6f31 100644
--- a/src/toolinfo.cpp
+++ b/src/toolinfo.cpp
@@ -23,9 +23,9 @@
 #include <iostream>
 #include <cstdlib>
 #include <unistd.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqtimer.h>
 #include <tqstringlist.h>
 #include <tqfileinfo.h>
diff --git a/src/toolsinfodialog.cpp b/src/toolsinfodialog.cpp
index 105cb87..a3795c7 100644
--- a/src/toolsinfodialog.cpp
+++ b/src/toolsinfodialog.cpp
@@ -23,11 +23,11 @@
 #include <tdelistview.h>
 //#include <tqlistviewitem.h>
 #include <tqpixmap.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqstring.h>
 #include <kiconloader.h>
 #include <iostream>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcursor.h>
 
 #include "utils.h"
diff --git a/src/utils.cpp b/src/utils.cpp
index a5d1c46..e029ede 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -25,7 +25,7 @@
 #include <tqfile.h>
 #include <tqprocess.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <tqdir.h>
 #include <kstddirs.h>
@@ -34,7 +34,7 @@
 #include <netdb.h> // name resolving
 #include <arpa/inet.h>
 #include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 //END INCLUDES
 
diff --git a/src/utils.h b/src/utils.h
index 66eb7e5..137b23f 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -27,7 +27,7 @@
 #include "kvpnc.h"
 #include "toolinfo.h"
 #include <tqstringlist.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 /**
 Provides various help functions.
diff --git a/src/vpntypesinfodialog.cpp b/src/vpntypesinfodialog.cpp
index 9d36cac..189ea76 100644
--- a/src/vpntypesinfodialog.cpp
+++ b/src/vpntypesinfodialog.cpp
@@ -21,11 +21,11 @@
 #include <tdelistview.h>
 //#include <tqlistviewitem.h>
 #include <tqpixmap.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqstring.h>
 #include <kiconloader.h>
 #include <iostream>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcursor.h>
 #include <tqtooltip.h>
 #include <tqlistview.h>