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

---
 klinkstatus/src/ui/documentrootdialog.cpp                  | 2 +-
 klinkstatus/src/ui/klshistorycombo.cpp                     | 2 +-
 klinkstatus/src/ui/resultssearchbar.cpp                    | 2 +-
 klinkstatus/src/ui/resultview.cpp                          | 2 +-
 klinkstatus/src/ui/sessionwidget.cpp                       | 6 +++---
 klinkstatus/src/ui/settings/configidentificationdialog.cpp | 2 +-
 klinkstatus/src/ui/tablelinkstatus.cpp                     | 4 ++--
 klinkstatus/src/ui/tabwidgetsession.cpp                    | 2 +-
 klinkstatus/src/ui/treeview.cpp                            | 4 ++--
 9 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'klinkstatus/src/ui')

diff --git a/klinkstatus/src/ui/documentrootdialog.cpp b/klinkstatus/src/ui/documentrootdialog.cpp
index b1563285..6afb9618 100644
--- a/klinkstatus/src/ui/documentrootdialog.cpp
+++ b/klinkstatus/src/ui/documentrootdialog.cpp
@@ -20,7 +20,7 @@
 #include "documentrootdialog.h"
 
 #include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 #include <tqstring.h>
diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp
index 2733d199..3bfddd0d 100644
--- a/klinkstatus/src/ui/klshistorycombo.cpp
+++ b/klinkstatus/src/ui/klshistorycombo.cpp
@@ -18,7 +18,7 @@
 #include <kdebug.h>
 #include <tdestdaccel.h>
 #include <kurldrag.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 
 bool KLSHistoryCombo::items_saved_ = false;
diff --git a/klinkstatus/src/ui/resultssearchbar.cpp b/klinkstatus/src/ui/resultssearchbar.cpp
index d99626b4..d5e4293d 100644
--- a/klinkstatus/src/ui/resultssearchbar.cpp
+++ b/klinkstatus/src/ui/resultssearchbar.cpp
@@ -23,7 +23,7 @@
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
diff --git a/klinkstatus/src/ui/resultview.cpp b/klinkstatus/src/ui/resultview.cpp
index fdf65099..d79bffdb 100644
--- a/klinkstatus/src/ui/resultview.cpp
+++ b/klinkstatus/src/ui/resultview.cpp
@@ -15,7 +15,7 @@
 #include <tqpainter.h>
 #include <tqcolor.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kiconloader.h>
 
diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp
index a82c5527..53ee3bd5 100644
--- a/klinkstatus/src/ui/sessionwidget.cpp
+++ b/klinkstatus/src/ui/sessionwidget.cpp
@@ -23,14 +23,14 @@
 #include <kcombobox.h>
 #include <ksqueezedtextlabel.h>
 #include <kprogress.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kpushbutton.h>
 #include <tdefiledialog.h>
 #include <tdeactionclasses.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>
diff --git a/klinkstatus/src/ui/settings/configidentificationdialog.cpp b/klinkstatus/src/ui/settings/configidentificationdialog.cpp
index 3abc7e2f..d9e20145 100644
--- a/klinkstatus/src/ui/settings/configidentificationdialog.cpp
+++ b/klinkstatus/src/ui/settings/configidentificationdialog.cpp
@@ -20,7 +20,7 @@
 
 #include "configidentificationdialog.h"
 
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
 
diff --git a/klinkstatus/src/ui/tablelinkstatus.cpp b/klinkstatus/src/ui/tablelinkstatus.cpp
index 2d2ad497..af78ca0b 100644
--- a/klinkstatus/src/ui/tablelinkstatus.cpp
+++ b/klinkstatus/src/ui/tablelinkstatus.cpp
@@ -34,8 +34,8 @@
 #include <kstandarddirs.h>
 #include <krun.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 
diff --git a/klinkstatus/src/ui/tabwidgetsession.cpp b/klinkstatus/src/ui/tabwidgetsession.cpp
index 26a5e131..dead2278 100644
--- a/klinkstatus/src/ui/tabwidgetsession.cpp
+++ b/klinkstatus/src/ui/tabwidgetsession.cpp
@@ -34,7 +34,7 @@
 
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstringhandler.h> 
 #include <kcharsets.h>
 #include <kmimetype.h>
diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp
index eb56abe1..7dd4df3c 100644
--- a/klinkstatus/src/ui/treeview.cpp
+++ b/klinkstatus/src/ui/treeview.cpp
@@ -18,13 +18,13 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <kurl.h>
 #include <krun.h>
 #include <dcopref.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <dcopclient.h>
 #include <kcharsets.h>
 
-- 
cgit v1.2.1