summaryrefslogtreecommitdiffstats
path: root/ktouch/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:20:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:20:21 -0600
commitfccf6d244a4d60c3138afa81266e22ac65adddbc (patch)
treece62ccdaca3fffebeb33ad213dc5cea82ceff580 /ktouch/src
parent273ccce287bccee117bbfff8ca3386d613aec467 (diff)
downloadtdeedu-fccf6d244a4d60c3138afa81266e22ac65adddbc.tar.gz
tdeedu-fccf6d244a4d60c3138afa81266e22ac65adddbc.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'ktouch/src')
-rw-r--r--ktouch/src/ktouch.cpp8
-rw-r--r--ktouch/src/ktouch.h2
-rw-r--r--ktouch/src/ktouchkeyboardeditor.cpp2
-rw-r--r--ktouch/src/ktouchlectureeditor.cpp4
-rw-r--r--ktouch/src/ktouchlectureeditor_dlg.ui2
-rw-r--r--ktouch/src/ktouchprefgenerallayout.ui2
-rw-r--r--ktouch/src/ktouchprefkeyboardlayout.ui2
7 files changed, 11 insertions, 11 deletions
diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp
index 39a0b445..c25bd26c 100644
--- a/ktouch/src/ktouch.cpp
+++ b/ktouch/src/ktouch.cpp
@@ -28,15 +28,15 @@
#include <klocale.h>
#include <kstatusbar.h>
#include <tdefiledialog.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kstandarddirs.h>
#include <kmessagebox.h>
#include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <tdeconfigdialog.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kcombobox.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
#include <knuminput.h>
// Own header files
diff --git a/ktouch/src/ktouch.h b/ktouch/src/ktouch.h
index dd7f859d..e2648969 100644
--- a/ktouch/src/ktouch.h
+++ b/ktouch/src/ktouch.h
@@ -21,7 +21,7 @@
#include <tqstringlist.h>
#include <tqvaluevector.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <kapplication.h>
#include <kurl.h>
diff --git a/ktouch/src/ktouchkeyboardeditor.cpp b/ktouch/src/ktouchkeyboardeditor.cpp
index 9d3ce406..c0d71736 100644
--- a/ktouch/src/ktouchkeyboardeditor.cpp
+++ b/ktouch/src/ktouchkeyboardeditor.cpp
@@ -22,7 +22,7 @@
#include <ksqueezedtextlabel.h>
#include <klineedit.h>
#include <ktextedit.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
#include <kdebug.h>
#include <utility>
diff --git a/ktouch/src/ktouchlectureeditor.cpp b/ktouch/src/ktouchlectureeditor.cpp
index 27c74ec4..c9eff2eb 100644
--- a/ktouch/src/ktouchlectureeditor.cpp
+++ b/ktouch/src/ktouchlectureeditor.cpp
@@ -16,7 +16,7 @@
#include <tqstringlist.h>
#include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klineedit.h>
#include <ktextedit.h>
#include <klocale.h>
@@ -24,7 +24,7 @@
#include <ksqueezedtextlabel.h>
#include <kmessagebox.h>
#include <kcombobox.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
#include <tdefiledialog.h>
#include <algorithm> // for std::swap
diff --git a/ktouch/src/ktouchlectureeditor_dlg.ui b/ktouch/src/ktouchlectureeditor_dlg.ui
index 20ecbb94..83105f4c 100644
--- a/ktouch/src/ktouchlectureeditor_dlg.ui
+++ b/ktouch/src/ktouchlectureeditor_dlg.ui
@@ -667,7 +667,7 @@
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
- <includehint>klistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/ktouch/src/ktouchprefgenerallayout.ui b/ktouch/src/ktouchprefgenerallayout.ui
index 3a23de1b..96ed2bff 100644
--- a/ktouch/src/ktouchprefgenerallayout.ui
+++ b/ktouch/src/ktouchprefgenerallayout.ui
@@ -336,6 +336,6 @@
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>kfontrequester.h</includehint>
+ <includehint>tdefontrequester.h</includehint>
</includehints>
</UI>
diff --git a/ktouch/src/ktouchprefkeyboardlayout.ui b/ktouch/src/ktouchprefkeyboardlayout.ui
index 36bc7c23..949207cc 100644
--- a/ktouch/src/ktouchprefkeyboardlayout.ui
+++ b/ktouch/src/ktouchprefkeyboardlayout.ui
@@ -137,6 +137,6 @@
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>kfontrequester.h</includehint>
+ <includehint>tdefontrequester.h</includehint>
</includehints>
</UI>