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

---
 tdeio/bookmarks/kbookmark.cc               | 4 ++--
 tdeio/bookmarks/kbookmarkexporter.cc       | 2 +-
 tdeio/bookmarks/kbookmarkimporter.cc       | 2 +-
 tdeio/bookmarks/kbookmarkimporter_crash.cc | 2 +-
 tdeio/bookmarks/kbookmarkimporter_ie.cc    | 2 +-
 tdeio/bookmarks/kbookmarkimporter_kde1.cc  | 2 +-
 tdeio/bookmarks/kbookmarkimporter_ns.cc    | 2 +-
 tdeio/bookmarks/kbookmarkimporter_opera.cc | 2 +-
 tdeio/bookmarks/kbookmarkmanager.cc        | 4 ++--
 tdeio/bookmarks/kbookmarkmenu.cc           | 4 ++--
 tdeio/bookmarks/kbookmarkmenu.h            | 2 +-
 tdeio/bookmarks/kbookmarkmenu_p.h          | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'tdeio/bookmarks')

diff --git a/tdeio/bookmarks/kbookmark.cc b/tdeio/bookmarks/kbookmark.cc
index e6bef2e02..8bbaa5e43 100644
--- a/tdeio/bookmarks/kbookmark.cc
+++ b/tdeio/bookmarks/kbookmark.cc
@@ -25,8 +25,8 @@
 #include <kmimetype.h>
 #include <kstringhandler.h>
 #include <kinputdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <assert.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
diff --git a/tdeio/bookmarks/kbookmarkexporter.cc b/tdeio/bookmarks/kbookmarkexporter.cc
index 30c52bdb8..ee33612a2 100644
--- a/tdeio/bookmarks/kbookmarkexporter.cc
+++ b/tdeio/bookmarks/kbookmarkexporter.cc
@@ -24,7 +24,7 @@
 #include <tqstylesheet.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kbookmarkmanager.h"
 #include "kbookmarkexporter.h"
diff --git a/tdeio/bookmarks/kbookmarkimporter.cc b/tdeio/bookmarks/kbookmarkimporter.cc
index 366802905..513f89b40 100644
--- a/tdeio/bookmarks/kbookmarkimporter.cc
+++ b/tdeio/bookmarks/kbookmarkimporter.cc
@@ -20,7 +20,7 @@
 
 #include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
diff --git a/tdeio/bookmarks/kbookmarkimporter_crash.cc b/tdeio/bookmarks/kbookmarkimporter_crash.cc
index 0443b3b1c..9b0cacf25 100644
--- a/tdeio/bookmarks/kbookmarkimporter_crash.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_crash.cc
@@ -22,7 +22,7 @@
 
 #include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
diff --git a/tdeio/bookmarks/kbookmarkimporter_ie.cc b/tdeio/bookmarks/kbookmarkimporter_ie.cc
index 092ebe596..d588517a3 100644
--- a/tdeio/bookmarks/kbookmarkimporter_ie.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_ie.cc
@@ -20,7 +20,7 @@
 
 #include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqtextcodec.h>
 
diff --git a/tdeio/bookmarks/kbookmarkimporter_kde1.cc b/tdeio/bookmarks/kbookmarkimporter_kde1.cc
index 6aca22b84..95937f890 100644
--- a/tdeio/bookmarks/kbookmarkimporter_kde1.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_kde1.cc
@@ -21,7 +21,7 @@
 #include "kbookmarkimporter_kde1.h"
 #include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
diff --git a/tdeio/bookmarks/kbookmarkimporter_ns.cc b/tdeio/bookmarks/kbookmarkimporter_ns.cc
index 8ce06a79b..29960ce51 100644
--- a/tdeio/bookmarks/kbookmarkimporter_ns.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_ns.cc
@@ -25,7 +25,7 @@
 #include "kbookmarkmanager.h"
 #include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
diff --git a/tdeio/bookmarks/kbookmarkimporter_opera.cc b/tdeio/bookmarks/kbookmarkimporter_opera.cc
index 57b5d6208..0609c7a3b 100644
--- a/tdeio/bookmarks/kbookmarkimporter_opera.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_opera.cc
@@ -20,7 +20,7 @@
 
 #include <tdefiledialog.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqtextcodec.h>
 
diff --git a/tdeio/bookmarks/kbookmarkmanager.cc b/tdeio/bookmarks/kbookmarkmanager.cc
index 205d879ab..60d4f2932 100644
--- a/tdeio/bookmarks/kbookmarkmanager.cc
+++ b/tdeio/bookmarks/kbookmarkmanager.cc
@@ -29,9 +29,9 @@
 #include <ksavefile.h>
 #include <dcopref.h>
 #include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tqfile.h>
diff --git a/tdeio/bookmarks/kbookmarkmenu.cc b/tdeio/bookmarks/kbookmarkmenu.cc
index 0468bcd5a..e1b00bc40 100644
--- a/tdeio/bookmarks/kbookmarkmenu.cc
+++ b/tdeio/bookmarks/kbookmarkmenu.cc
@@ -32,8 +32,8 @@
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdestdaccel.h>
 #include <kstdaction.h>
diff --git a/tdeio/bookmarks/kbookmarkmenu.h b/tdeio/bookmarks/kbookmarkmenu.h
index 0c1ebb27c..aeed441b0 100644
--- a/tdeio/bookmarks/kbookmarkmenu.h
+++ b/tdeio/bookmarks/kbookmarkmenu.h
@@ -30,7 +30,7 @@
 #include <tqlistview.h>
 
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 
 #include "kbookmark.h"
diff --git a/tdeio/bookmarks/kbookmarkmenu_p.h b/tdeio/bookmarks/kbookmarkmenu_p.h
index fc34e9029..b47af8ebf 100644
--- a/tdeio/bookmarks/kbookmarkmenu_p.h
+++ b/tdeio/bookmarks/kbookmarkmenu_p.h
@@ -30,7 +30,7 @@
 #include <tqlistview.h>
 
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 
 #include "kbookmark.h"
-- 
cgit v1.2.3