summaryrefslogtreecommitdiffstats
path: root/kate/filetemplates
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:54:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:54:06 -0600
commit71049a71c6648791e95cf421b19047415a2c4c84 (patch)
tree4f75fdaee1cce5a44f58f1f54980099f50a82b10 /kate/filetemplates
parent6fe537d6dff11f4c638c51ed1f652765b63f8591 (diff)
downloadtdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.tar.gz
tdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kate/filetemplates')
-rw-r--r--kate/filetemplates/plugin/filetemplates.cpp8
-rw-r--r--kate/filetemplates/plugin/filetemplates.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index 2153c4f..c8b9730 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -31,19 +31,19 @@
#include <kdialogbase.h>
#include <kdirwatch.h>
#include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kicondialog.h>
#include <kiconloader.h>
#include <tdeio/netaccess.h>
#include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <knewstuff/knewstuff.h>
#include <knewstuff/entry.h>
#include <kprocess.h>
#include <kstandarddirs.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kurlrequester.h>
#include <kuser.h>
#include <kxmlguifactory.h>
diff --git a/kate/filetemplates/plugin/filetemplates.h b/kate/filetemplates/plugin/filetemplates.h
index 29c0fff..a5c78ba 100644
--- a/kate/filetemplates/plugin/filetemplates.h
+++ b/kate/filetemplates/plugin/filetemplates.h
@@ -30,7 +30,7 @@
#include <kate/viewmanager.h>
#include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include <kwizard.h>