diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:23:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:23:27 -0600 |
| commit | c46f36d00839916c8b6cde8ed2ca54aeb40dba19 (patch) | |
| tree | 990b3fd4f5a01a1a86b43d158686456eae2bdc44 /lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp | |
| parent | 1e8f4c1ed6da13b851a7100e395d9243871c464d (diff) | |
| download | tdewebdev-c46f36d00839916c8b6cde8ed2ca54aeb40dba19.tar.gz tdewebdev-c46f36d00839916c8b6cde8ed2ca54aeb40dba19.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp')
| -rw-r--r-- | lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp index 4c9930be..142213ad 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp @@ -1,6 +1,6 @@ /* This file is part of the KDE libraries Copyright (C) 2003 Joseph Wenninger <jowenn@kde.org> - based on ktoolbarhandler.cpp: Copyright (C) 2002 Simon Hausmann <hausmann@kde.org> + 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,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 ) |