diff options
author | Automated System <[email protected]> | 2013-02-15 22:07:52 -0600 |
---|---|---|
committer | Automated System <[email protected]> | 2013-02-15 22:07:52 -0600 |
commit | 0e1016601a881a8e4bbe62c0beee3bd23d19ab5f (patch) | |
tree | 8bf0f0cfd87710f857e4ed060c5c33af10b8d3c2 /kate/app/katemainwindow.cpp | |
parent | b2502b94cf23298f676853d91188b2cacc6ab0bd (diff) | |
parent | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (diff) | |
download | tdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.tar.gz tdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kate/app/katemainwindow.cpp')
-rw-r--r-- | kate/app/katemainwindow.cpp | 12 |
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> |