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

---
 kget/dlgAdvanced.cpp                | 4 ++--
 kget/dlgAutomation.cpp              | 2 +-
 kget/dlgConnection.cpp              | 4 ++--
 kget/dlgDirectories.cpp             | 6 +++---
 kget/dlgIndividual.cpp              | 2 +-
 kget/dlgLimits.cpp                  | 2 +-
 kget/dlgPreferences.cpp             | 2 +-
 kget/docking.cpp                    | 2 +-
 kget/droptarget.cpp                 | 4 ++--
 kget/kget_plug_in/kget_linkview.cpp | 4 ++--
 kget/kget_plug_in/kget_plug_in.cpp  | 6 +++---
 kget/logwindow.cpp                  | 2 +-
 kget/main.cpp                       | 4 ++--
 kget/safedelete.cpp                 | 4 ++--
 kget/settings.cpp                   | 8 ++++----
 kget/tdefileio.cpp                  | 4 ++--
 kget/tdemainwidget.cpp              | 8 ++++----
 kget/transfer.cpp                   | 6 +++---
 kget/transferlist.cpp               | 6 +++---
 19 files changed, 40 insertions(+), 40 deletions(-)

(limited to 'kget')

diff --git a/kget/dlgAdvanced.cpp b/kget/dlgAdvanced.cpp
index dc479fc2..4695cc5a 100644
--- a/kget/dlgAdvanced.cpp
+++ b/kget/dlgAdvanced.cpp
@@ -27,9 +27,9 @@
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 #include "settings.h"
diff --git a/kget/dlgAutomation.cpp b/kget/dlgAutomation.cpp
index 97a299eb..9e425de9 100644
--- a/kget/dlgAutomation.cpp
+++ b/kget/dlgAutomation.cpp
@@ -29,7 +29,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdatetimewidget.h>
 #include <knuminput.h>
 #include "common.h"
diff --git a/kget/dlgConnection.cpp b/kget/dlgConnection.cpp
index 2908eda5..82655422 100644
--- a/kget/dlgConnection.cpp
+++ b/kget/dlgConnection.cpp
@@ -30,8 +30,8 @@
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
-#include <kprotocolmanager.h>
+#include <tdelocale.h>
+#include <tdeprotocolmanager.h>
 #include <kdialog.h>
 #include <knuminput.h>
 #include <kcombobox.h>
diff --git a/kget/dlgDirectories.cpp b/kget/dlgDirectories.cpp
index bf12aa32..7faec0e5 100644
--- a/kget/dlgDirectories.cpp
+++ b/kget/dlgDirectories.cpp
@@ -33,9 +33,9 @@
 
 #include <tdefiledialog.h>
 #include <klineedit.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 
 #include "settings.h"
diff --git a/kget/dlgIndividual.cpp b/kget/dlgIndividual.cpp
index 7add48c0..eeaa018d 100644
--- a/kget/dlgIndividual.cpp
+++ b/kget/dlgIndividual.cpp
@@ -40,7 +40,7 @@
 
 #include <tdeapplication.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdetoolbar.h>
 #include <krun.h>
 #include <tdeio/global.h>
diff --git a/kget/dlgLimits.cpp b/kget/dlgLimits.cpp
index 6f1f08f0..8ae36b8e 100644
--- a/kget/dlgLimits.cpp
+++ b/kget/dlgLimits.cpp
@@ -29,7 +29,7 @@
 #include <tqlayout.h>
 
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 #include "settings.h"
diff --git a/kget/dlgPreferences.cpp b/kget/dlgPreferences.cpp
index 736ce7d3..777f5419 100644
--- a/kget/dlgPreferences.cpp
+++ b/kget/dlgPreferences.cpp
@@ -28,7 +28,7 @@
 #include <tqlayout.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kcombobox.h>
 
diff --git a/kget/docking.cpp b/kget/docking.cpp
index a8a11393..fa1adb97 100644
--- a/kget/docking.cpp
+++ b/kget/docking.cpp
@@ -29,7 +29,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kurldrag.h>
 
diff --git a/kget/droptarget.cpp b/kget/droptarget.cpp
index 28f246b2..ed600f88 100644
--- a/kget/droptarget.cpp
+++ b/kget/droptarget.cpp
@@ -30,10 +30,10 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdemainwindow.h>
 #include <twin.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kurldrag.h>
 
diff --git a/kget/kget_plug_in/kget_linkview.cpp b/kget/kget_plug_in/kget_linkview.cpp
index d16882dc..0cf512f9 100644
--- a/kget/kget_plug_in/kget_linkview.cpp
+++ b/kget/kget_plug_in/kget_linkview.cpp
@@ -7,8 +7,8 @@
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdelistviewsearchline.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstdaction.h>
 #include <tdetoolbar.h>
diff --git a/kget/kget_plug_in/kget_plug_in.cpp b/kget/kget_plug_in/kget_plug_in.cpp
index 58a52d81..b7f1ed69 100644
--- a/kget/kget_plug_in/kget_plug_in.cpp
+++ b/kget/kget_plug_in/kget_plug_in.cpp
@@ -25,11 +25,11 @@
 #include <kdebug.h>
 #include <tdehtml_part.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeaction.h>
 #include <kinstance.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
 
diff --git a/kget/logwindow.cpp b/kget/logwindow.cpp
index ecf35986..601beb31 100644
--- a/kget/logwindow.cpp
+++ b/kget/logwindow.cpp
@@ -28,7 +28,7 @@
 #include <tqlayout.h>
 #include <tqlistview.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <tdeaction.h>
 
diff --git a/kget/main.cpp b/kget/main.cpp
index 48bdf170..1c1b9eb5 100644
--- a/kget/main.cpp
+++ b/kget/main.cpp
@@ -26,12 +26,12 @@
 
 
 #include <twin.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kurl.h>
 #include <kuniqueapplication.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 
 #include <signal.h>
 #include <unistd.h>
diff --git a/kget/safedelete.cpp b/kget/safedelete.cpp
index 53fbbbc3..6ee9ec15 100644
--- a/kget/safedelete.cpp
+++ b/kget/safedelete.cpp
@@ -1,5 +1,5 @@
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
 
diff --git a/kget/settings.cpp b/kget/settings.cpp
index c98bbd7e..8c905e18 100644
--- a/kget/settings.cpp
+++ b/kget/settings.cpp
@@ -25,12 +25,12 @@
 
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <twin.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
 #include <netwm_def.h>
 
 #include <tqdir.h>
diff --git a/kget/tdefileio.cpp b/kget/tdefileio.cpp
index ee4b4096..ed9ef955 100644
--- a/kget/tdefileio.cpp
+++ b/kget/tdefileio.cpp
@@ -21,8 +21,8 @@
 #include <tqfileinfo.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "tdefileio.h"
 
diff --git a/kget/tdemainwidget.cpp b/kget/tdemainwidget.cpp
index 57171e2f..a7d51617 100644
--- a/kget/tdemainwidget.cpp
+++ b/kget/tdemainwidget.cpp
@@ -56,10 +56,10 @@
 #include <kiconloader.h>
 #include <kurl.h>
 #include <kurldrag.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <twin.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdaction.h>
 #include <khelpmenu.h>
 #include <kedittoolbar.h>
@@ -68,7 +68,7 @@
 #include <tdeio/netaccess.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdeio/renamedlg.h>
 
 #include "safedelete.h"
diff --git a/kget/transfer.cpp b/kget/transfer.cpp
index b1da4d5a..d1ff6f0b 100644
--- a/kget/transfer.cpp
+++ b/kget/transfer.cpp
@@ -26,14 +26,14 @@
 #include <tqheader.h>
 
 #include <kurl.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <twin.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <assert.h>
 #include "safedelete.h"
diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp
index 12ce3b8e..d6acafc1 100644
--- a/kget/transferlist.cpp
+++ b/kget/transferlist.cpp
@@ -26,11 +26,11 @@
 
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksimpleconfig.h>
 #include <tdeio/netaccess.h>
 
-- 
cgit v1.2.1