diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:21:04 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:21:04 -0600 |
| commit | d1e0cc99a202cef3306b90b8839a6726e89f201e (patch) | |
| tree | a0d01a91644fd94aa6da5d8944e052b67461faad /tdemdi/tdemdiguiclient.cpp | |
| parent | 3e3559f2d4f4c4ffa3caa0374928c8a12be29bf3 (diff) | |
| download | tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.tar.gz tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'tdemdi/tdemdiguiclient.cpp')
| -rw-r--r-- | tdemdi/tdemdiguiclient.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tdemdi/tdemdiguiclient.cpp b/tdemdi/tdemdiguiclient.cpp index 449157b7a..c9b2f70f3 100644 --- a/tdemdi/tdemdiguiclient.cpp +++ b/tdemdi/tdemdiguiclient.cpp @@ -1,6 +1,6 @@ /* This file is part of the KDE libraries Copyright (C) 2003 Joseph Wenninger <[email protected]> - based on ktoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <[email protected]> + based on tdetoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -23,10 +23,10 @@ #include <tqpopupmenu.h> #include <kapplication.h> #include <tdeconfig.h> -#include <ktoolbar.h> -#include <kmainwindow.h> +#include <tdetoolbar.h> +#include <tdemainwindow.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqstring.h> #include <assert.h> #include <kdebug.h> @@ -134,7 +134,7 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c setXML( completeDescription, false /*merge*/ ); } - if ( actionCollection() ->kaccel() == 0 ) + if ( actionCollection() ->tdeaccel() == 0 ) actionCollection() ->setWidget( mdiMainFrm ); m_toolMenu = new TDEActionMenu( i18n( "Tool &Views" ), actionCollection(), "tdemdi_toolview_menu" ); if ( showMDIModeAction ) |