summaryrefslogtreecommitdiffstats
path: root/ktouch/src/ktouch.cpp
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/ktouch.cpp
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/ktouch.cpp')
-rw-r--r--ktouch/src/ktouch.cpp8
1 files changed, 4 insertions, 4 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