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

---
 kdict/actions.h              | 2 +-
 kdict/applet/kdictapplet.cpp | 2 +-
 kdict/dict.cpp               | 4 ++--
 kdict/main.cpp               | 2 +-
 kdict/matchview.cpp          | 4 ++--
 kdict/options.cpp            | 2 +-
 kdict/options.h              | 2 +-
 kdict/queryview.cpp          | 6 +++---
 kdict/sets.cpp               | 2 +-
 kdict/toplevel.cpp           | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'kdict')

diff --git a/kdict/actions.h b/kdict/actions.h
index a5dd9201..5c618827 100644
--- a/kdict/actions.h
+++ b/kdict/actions.h
@@ -21,7 +21,7 @@
 #include <tqguardedptr.h>
 #include <tqptrlist.h>
 #include <tdeaction.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 class KComboBox;
 class TQLabel;
diff --git a/kdict/applet/kdictapplet.cpp b/kdict/applet/kdictapplet.cpp
index 7ef1f847..e4bb9b14 100644
--- a/kdict/applet/kdictapplet.cpp
+++ b/kdict/applet/kdictapplet.cpp
@@ -26,7 +26,7 @@
 #include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <tdeapplication.h>
 #include <kprocess.h>
diff --git a/kdict/dict.cpp b/kdict/dict.cpp
index 04c0643c..8094758d 100644
--- a/kdict/dict.cpp
+++ b/kdict/dict.cpp
@@ -25,9 +25,9 @@
 #include <tqregexp.h>
 #include <tqtextcodec.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmdcodec.h>
 #include <kextsock.h>
 #include <ksocks.h>
diff --git a/kdict/main.cpp b/kdict/main.cpp
index 7325e8f8..ce51a24d 100644
--- a/kdict/main.cpp
+++ b/kdict/main.cpp
@@ -14,7 +14,7 @@
 
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelibs_export.h>
 
 #include "application.h"
diff --git a/kdict/matchview.cpp b/kdict/matchview.cpp
index ccc9cf1f..be2e018b 100644
--- a/kdict/matchview.cpp
+++ b/kdict/matchview.cpp
@@ -22,10 +22,10 @@
 #include <tqregexp.h>
 
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "dict.h"
 #include "options.h"
diff --git a/kdict/options.cpp b/kdict/options.cpp
index 6885ae8d..4048badd 100644
--- a/kdict/options.cpp
+++ b/kdict/options.cpp
@@ -28,7 +28,7 @@
 
 #include <kcolordialog.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knumvalidator.h>
 #include <knuminput.h>
 #include <klineedit.h>
diff --git a/kdict/options.h b/kdict/options.h
index cea767c1..5a3a58c4 100644
--- a/kdict/options.h
+++ b/kdict/options.h
@@ -20,7 +20,7 @@
 
 #include <tqlistbox.h>
 #include <kdialogbase.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 class TQLineEdit;
 class TQCheckBox;
diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp
index 1c71ab05..2f5f4a49 100644
--- a/kdict/queryview.cpp
+++ b/kdict/queryview.cpp
@@ -19,12 +19,12 @@
 #include <tqtimer.h>
 
 #include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 #include <kcursor.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdehtml_events.h>
 #include <tdehtmlview.h>
 
diff --git a/kdict/sets.cpp b/kdict/sets.cpp
index 51dd7eb6..d49828b6 100644
--- a/kdict/sets.cpp
+++ b/kdict/sets.cpp
@@ -20,7 +20,7 @@
 
 #include <kiconloader.h>
 #include <kseparator.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "options.h"
 #include "sets.h"
diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp
index aee8c156..72b22980 100644
--- a/kdict/toplevel.cpp
+++ b/kdict/toplevel.cpp
@@ -20,7 +20,7 @@
 #include <kstdaction.h>
 #include <tdeapplication.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <twin.h>
 #include <kedittoolbar.h>
 #include <kdebug.h>
-- 
cgit v1.2.1