diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /kate/app/katemdi.cpp | |
| parent | eba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff) | |
| download | tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kate/app/katemdi.cpp')
| -rw-r--r-- | kate/app/katemdi.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp index 6138915ab..6480d5fd3 100644 --- a/kate/app/katemdi.cpp +++ b/kate/app/katemdi.cpp @@ -2,7 +2,7 @@ Copyright (C) 2005 Christoph Cullmann <cullmann@kde.org> Copyright (C) 2002, 2003 Joseph Wenninger <jowenn@kde.org> - GUIClient partly based on ktoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org> + GUIClient partly based on tdetoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -23,7 +23,7 @@ #include "katemdi.h" #include "katemdi.moc" -#include <kaction.h> +#include <tdeaction.h> #include <kdebug.h> #include <kglobal.h> #include <kglobalsettings.h> @@ -31,7 +31,7 @@ #include <klocale.h> #include <tdeconfig.h> #include <kiconloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> #include <tqvbox.h> @@ -134,7 +134,7 @@ GUIClient::GUIClient ( MainWindow *mw ) setXML( completeDescription, false /*merge*/ ); } - if (actionCollection()->kaccel()==0) + if (actionCollection()->tdeaccel()==0) actionCollection()->setWidget(m_mw); m_toolMenu = new TDEActionMenu(i18n("Tool &Views"),actionCollection(),"kate_mdi_toolview_menu"); |