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

---
 ktouch/src/ktouch.cpp               | 4 ++--
 ktouch/src/ktouchchartwidget.cpp    | 2 +-
 ktouch/src/ktouchcoloreditor.cpp    | 4 ++--
 ktouch/src/ktouchcolorscheme.cpp    | 4 ++--
 ktouch/src/ktouchkeyboard.cpp       | 4 ++--
 ktouch/src/ktouchkeyboardeditor.cpp | 4 ++--
 ktouch/src/ktouchkeyboardwidget.cpp | 6 +++---
 ktouch/src/ktouchlecture.cpp        | 4 ++--
 ktouch/src/ktouchlectureeditor.cpp  | 4 ++--
 ktouch/src/ktouchleveldata.cpp      | 2 +-
 ktouch/src/ktouchopenrequest.cpp    | 6 +++---
 ktouch/src/ktouchstatistics.cpp     | 4 ++--
 ktouch/src/ktouchstatisticsdata.cpp | 4 ++--
 ktouch/src/ktouchtrainer.cpp        | 2 +-
 ktouch/src/prefs.kcfgc              | 2 +-
 15 files changed, 28 insertions(+), 28 deletions(-)

(limited to 'ktouch')

diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp
index c25bd26c..a92c0b4e 100644
--- a/ktouch/src/ktouch.cpp
+++ b/ktouch/src/ktouch.cpp
@@ -25,12 +25,12 @@
 //#include <tqimevent.h>
 
 // KDE Header
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <tdefiledialog.h>
 #include <tdeaction.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdepopupmenu.h>
 #include <tdeconfigdialog.h>
diff --git a/ktouch/src/ktouchchartwidget.cpp b/ktouch/src/ktouchchartwidget.cpp
index 43e3642a..f519616b 100644
--- a/ktouch/src/ktouchchartwidget.cpp
+++ b/ktouch/src/ktouchchartwidget.cpp
@@ -15,7 +15,7 @@
 
 #include <tqpainter.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <numeric>  // for mathematical functions
 #include <cmath>
diff --git a/ktouch/src/ktouchcoloreditor.cpp b/ktouch/src/ktouchcoloreditor.cpp
index 26784fa2..8fee8e91 100644
--- a/ktouch/src/ktouchcoloreditor.cpp
+++ b/ktouch/src/ktouchcoloreditor.cpp
@@ -20,8 +20,8 @@
 #include <kdebug.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 KTouchColorEditor::KTouchColorEditor(TQWidget* parent, const char* name, bool modal, WFlags fl)
 : KTouchColorEditorDlg(parent,name, modal,fl)
diff --git a/ktouch/src/ktouchcolorscheme.cpp b/ktouch/src/ktouchcolorscheme.cpp
index 4a8d38f6..faf47602 100644
--- a/ktouch/src/ktouchcolorscheme.cpp
+++ b/ktouch/src/ktouchcolorscheme.cpp
@@ -16,8 +16,8 @@
 #include <tqdom.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 
 #define WRITE_COLOR(z,x,y) 	e = doc.createElement(x); \
diff --git a/ktouch/src/ktouchkeyboard.cpp b/ktouch/src/ktouchkeyboard.cpp
index 300b3482..9d8a6c9a 100644
--- a/ktouch/src/ktouchkeyboard.cpp
+++ b/ktouch/src/ktouchkeyboard.cpp
@@ -15,9 +15,9 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "prefs.h"
 
diff --git a/ktouch/src/ktouchkeyboardeditor.cpp b/ktouch/src/ktouchkeyboardeditor.cpp
index c0d71736..579f8a69 100644
--- a/ktouch/src/ktouchkeyboardeditor.cpp
+++ b/ktouch/src/ktouchkeyboardeditor.cpp
@@ -16,9 +16,9 @@
 #include <tqlabel.h>
 #include <tqfont.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksqueezedtextlabel.h>
 #include <klineedit.h>
 #include <ktextedit.h>
diff --git a/ktouch/src/ktouchkeyboardwidget.cpp b/ktouch/src/ktouchkeyboardwidget.cpp
index 75edfb9e..9b29233e 100644
--- a/ktouch/src/ktouchkeyboardwidget.cpp
+++ b/ktouch/src/ktouchkeyboardwidget.cpp
@@ -19,11 +19,11 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "prefs.h"
 #include "ktouchkeyconnector.h"
diff --git a/ktouch/src/ktouchlecture.cpp b/ktouch/src/ktouchlecture.cpp
index 6285a843..ce834df5 100644
--- a/ktouch/src/ktouchlecture.cpp
+++ b/ktouch/src/ktouchlecture.cpp
@@ -18,8 +18,8 @@
 #include <tqdom.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 
 bool KTouchLecture::load(TQWidget * window, const KURL& url) {
diff --git a/ktouch/src/ktouchlectureeditor.cpp b/ktouch/src/ktouchlectureeditor.cpp
index c9eff2eb..513a740a 100644
--- a/ktouch/src/ktouchlectureeditor.cpp
+++ b/ktouch/src/ktouchlectureeditor.cpp
@@ -19,10 +19,10 @@
 #include <tdelistview.h>
 #include <klineedit.h>
 #include <ktextedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <ksqueezedtextlabel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcombobox.h>
 #include <tdefontdialog.h>
 #include <tdefiledialog.h>
diff --git a/ktouch/src/ktouchleveldata.cpp b/ktouch/src/ktouchleveldata.cpp
index de9b1257..913618a4 100644
--- a/ktouch/src/ktouchleveldata.cpp
+++ b/ktouch/src/ktouchleveldata.cpp
@@ -13,7 +13,7 @@
 #include "ktouchleveldata.h"
 #include <tqiodevice.h>
 #include <tqdom.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqstringlist.h>
 
diff --git a/ktouch/src/ktouchopenrequest.cpp b/ktouch/src/ktouchopenrequest.cpp
index 59f7e605..a9100945 100644
--- a/ktouch/src/ktouchopenrequest.cpp
+++ b/ktouch/src/ktouchopenrequest.cpp
@@ -18,10 +18,10 @@
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksqueezedtextlabel.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include "ktouchopenrequest.h"
 #include "ktouchopenrequest.moc"
diff --git a/ktouch/src/ktouchstatistics.cpp b/ktouch/src/ktouchstatistics.cpp
index 563485c3..0cfdeb2e 100644
--- a/ktouch/src/ktouchstatistics.cpp
+++ b/ktouch/src/ktouchstatistics.cpp
@@ -26,8 +26,8 @@
 #include <kpushbutton.h>
 #include <kcombobox.h>
 #include <kurl.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <ktabwidget.h>
 
diff --git a/ktouch/src/ktouchstatisticsdata.cpp b/ktouch/src/ktouchstatisticsdata.cpp
index 67e1dac5..4e9d0ef9 100644
--- a/ktouch/src/ktouchstatisticsdata.cpp
+++ b/ktouch/src/ktouchstatisticsdata.cpp
@@ -18,8 +18,8 @@
 #include <tqdom.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 
 #ifdef HAVE_SSTREAM
diff --git a/ktouch/src/ktouchtrainer.cpp b/ktouch/src/ktouchtrainer.cpp
index b13b3a30..568e25c5 100644
--- a/ktouch/src/ktouchtrainer.cpp
+++ b/ktouch/src/ktouchtrainer.cpp
@@ -18,7 +18,7 @@
 
 #include <kdebug.h>
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kaudioplayer.h>
 #include <tqmessagebox.h>
diff --git a/ktouch/src/prefs.kcfgc b/ktouch/src/prefs.kcfgc
index 8589875f..46104570 100644
--- a/ktouch/src/prefs.kcfgc
+++ b/ktouch/src/prefs.kcfgc
@@ -1,6 +1,6 @@
 # Code generation options for tdeconfig_compiler
 File=ktouch.kcfg
-IncludeFiles=kglobalsettings.h
+IncludeFiles=tdeglobalsettings.h
 ClassName=Prefs
 Singleton=true
 Mutators=true
-- 
cgit v1.2.1