summaryrefslogtreecommitdiffstats
path: root/kate/app/katemainwindow.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-15 21:55:37 -0600
committerTimothy Pearson <[email protected]>2013-02-15 21:55:37 -0600
commit77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch)
treea1cce95474892add7cb970b8e9fbdb16e12bc2d7 /kate/app/katemainwindow.cpp
parent9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff)
downloadtdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz
tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kate/app/katemainwindow.cpp')
-rw-r--r--kate/app/katemainwindow.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 7584e09da..cf62e77f1 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -50,17 +50,17 @@
#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <kdialogbase.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
#include <kdockwidget.h>
#include <kedittoolbar.h>
#include <tdefiledialog.h>
#include <kglobalaccel.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
#include <kkeydialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kmimetype.h>
#include <kopenwith.h>
#include <tdepopupmenu.h>
@@ -75,7 +75,7 @@
#include <khelpmenu.h>
#include <tdemultitabbar.h>
#include <ktip.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kstringhandler.h>
#include <tqlayout.h>
#include <tqptrvector.h>