diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:04 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:04 -0600 |
| commit | d1e0cc99a202cef3306b90b8839a6726e89f201e (patch) | |
| tree | a0d01a91644fd94aa6da5d8944e052b67461faad /tdemdi/tdemdi/guiclient.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/tdemdi/guiclient.cpp')
| -rw-r--r-- | tdemdi/tdemdi/guiclient.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tdemdi/tdemdi/guiclient.cpp b/tdemdi/tdemdi/guiclient.cpp index 536508992..d3e162e14 100644 --- a/tdemdi/tdemdi/guiclient.cpp +++ b/tdemdi/tdemdi/guiclient.cpp @@ -1,7 +1,7 @@ /* This file is part of the KDE libraries Copyright (C) 2003 Joseph Wenninger <jowenn@kde.org> Copyright (C) 2004 Christoph Cullmann <cullmann@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 @@ -24,9 +24,9 @@ #include <tqpopupmenu.h> #include <kapplication.h> #include <tdeconfig.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqstring.h> #include <kdebug.h> #include <kdockwidget.h> @@ -73,7 +73,7 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name) 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"); |