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

---
 kwordquiz/src/dlglanguage.cpp        | 2 +-
 kwordquiz/src/dlgrc.cpp              | 2 +-
 kwordquiz/src/dlgsort.cpp            | 2 +-
 kwordquiz/src/dlgspecchar.cpp        | 2 +-
 kwordquiz/src/flashview.cpp          | 2 +-
 kwordquiz/src/kwordquiz.cpp          | 4 ++--
 kwordquiz/src/kwordquizdoc.cpp       | 4 ++--
 kwordquiz/src/kwordquizprefs.cpp     | 4 ++--
 kwordquiz/src/kwordquizview.cpp      | 6 +++---
 kwordquiz/src/kwqnewstuff.cpp        | 4 ++--
 kwordquiz/src/multipleview.cpp       | 2 +-
 kwordquiz/src/prefcardappearance.cpp | 2 +-
 kwordquiz/src/qaview.cpp             | 2 +-
 kwordquiz/src/wqlreader.cpp          | 4 ++--
 kwordquiz/src/wqprintdialogpage.cpp  | 2 +-
 15 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'kwordquiz/src')

diff --git a/kwordquiz/src/dlglanguage.cpp b/kwordquiz/src/dlglanguage.cpp
index bfc033ad..b840760a 100644
--- a/kwordquiz/src/dlglanguage.cpp
+++ b/kwordquiz/src/dlglanguage.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
  
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kiconloader.h>
 
diff --git a/kwordquiz/src/dlgrc.cpp b/kwordquiz/src/dlgrc.cpp
index 9fa996e3..540b910b 100644
--- a/kwordquiz/src/dlgrc.cpp
+++ b/kwordquiz/src/dlgrc.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krestrictedline.h>
 
 #include "dlgrc.h"
diff --git a/kwordquiz/src/dlgsort.cpp b/kwordquiz/src/dlgsort.cpp
index 20221468..b06891ec 100644
--- a/kwordquiz/src/dlgsort.cpp
+++ b/kwordquiz/src/dlgsort.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqradiobutton.h>
 
diff --git a/kwordquiz/src/dlgspecchar.cpp b/kwordquiz/src/dlgspecchar.cpp
index 79dd2da0..da993afc 100644
--- a/kwordquiz/src/dlgspecchar.cpp
+++ b/kwordquiz/src/dlgspecchar.cpp
@@ -18,7 +18,7 @@
 
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcharselect.h>
 #include <kdebug.h>
 
diff --git a/kwordquiz/src/flashview.cpp b/kwordquiz/src/flashview.cpp
index 36640b89..3e150a34 100644
--- a/kwordquiz/src/flashview.cpp
+++ b/kwordquiz/src/flashview.cpp
@@ -17,7 +17,7 @@
 #include <tqlabel.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 
 #include "kwordquiz.h"
diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp
index 6abf0e02..d876ff38 100644
--- a/kwordquiz/src/kwordquiz.cpp
+++ b/kwordquiz/src/kwordquiz.cpp
@@ -21,10 +21,10 @@
 #include <tqcheckbox.h>
 
 // include files for KDE
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kedittoolbar.h>
 #include <kstandarddirs.h> //locate
 #include <tdefontdialog.h>
diff --git a/kwordquiz/src/kwordquizdoc.cpp b/kwordquiz/src/kwordquizdoc.cpp
index c024969c..0ac33d27 100644
--- a/kwordquiz/src/kwordquizdoc.cpp
+++ b/kwordquiz/src/kwordquizdoc.cpp
@@ -18,8 +18,8 @@
 // include files for TQt
 
 // include files for KDE
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 #include "keduvocdata.h"
 
diff --git a/kwordquiz/src/kwordquizprefs.cpp b/kwordquiz/src/kwordquizprefs.cpp
index 1047a280..0f8a13c7 100644
--- a/kwordquiz/src/kwordquizprefs.cpp
+++ b/kwordquiz/src/kwordquizprefs.cpp
@@ -22,11 +22,11 @@
 #include <tqlistview.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <krestrictedline.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kdebug.h>
 #include <tdeconfigskeleton.h>
diff --git a/kwordquiz/src/kwordquizview.cpp b/kwordquiz/src/kwordquizview.cpp
index 4b1f1cfc..5fbf5be6 100644
--- a/kwordquiz/src/kwordquizview.cpp
+++ b/kwordquiz/src/kwordquizview.cpp
@@ -22,10 +22,10 @@
 #include <tqlineedit.h>
 
 // include files for KDE
-#include <klocale.h> //i18n
-#include <kmessagebox.h> // always useful
+#include <tdelocale.h> //i18n
+#include <tdemessagebox.h> // always useful
 #include <krandomsequence.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <knotifyclient.h>
 
 // application specific includes
diff --git a/kwordquiz/src/kwqnewstuff.cpp b/kwordquiz/src/kwqnewstuff.cpp
index c2af5aae..c8bd08e1 100644
--- a/kwordquiz/src/kwqnewstuff.cpp
+++ b/kwordquiz/src/kwqnewstuff.cpp
@@ -18,9 +18,9 @@
 #include <tqdir.h>
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knewstuff/entry.h>
 
 #include "kwordquiz.h"
diff --git a/kwordquiz/src/multipleview.cpp b/kwordquiz/src/multipleview.cpp
index 4a8e11b8..d1de930a 100644
--- a/kwordquiz/src/multipleview.cpp
+++ b/kwordquiz/src/multipleview.cpp
@@ -20,7 +20,7 @@
 #include <tqradiobutton.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 
 #include "kwordquiz.h"
diff --git a/kwordquiz/src/prefcardappearance.cpp b/kwordquiz/src/prefcardappearance.cpp
index ae968059..2347d313 100644
--- a/kwordquiz/src/prefcardappearance.cpp
+++ b/kwordquiz/src/prefcardappearance.cpp
@@ -14,7 +14,7 @@
 
 #include <tdefontrequester.h>
 #include <kcolorbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "prefcardappearance.h"
 
diff --git a/kwordquiz/src/qaview.cpp b/kwordquiz/src/qaview.cpp
index 6a5af0aa..8b8d7842 100644
--- a/kwordquiz/src/qaview.cpp
+++ b/kwordquiz/src/qaview.cpp
@@ -19,7 +19,7 @@
 #include <tqlabel.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <knotifyclient.h>
 
diff --git a/kwordquiz/src/wqlreader.cpp b/kwordquiz/src/wqlreader.cpp
index 7eef97c7..b917913f 100644
--- a/kwordquiz/src/wqlreader.cpp
+++ b/kwordquiz/src/wqlreader.cpp
@@ -17,8 +17,8 @@
 #include <tqtextstream.h>
 #include <tqfile.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include "wqlreader.h"
 
diff --git a/kwordquiz/src/wqprintdialogpage.cpp b/kwordquiz/src/wqprintdialogpage.cpp
index 997da802..148d298b 100644
--- a/kwordquiz/src/wqprintdialogpage.cpp
+++ b/kwordquiz/src/wqprintdialogpage.cpp
@@ -21,7 +21,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "wqprintdialogpage.h"
 
-- 
cgit v1.2.1