diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:14:51 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:14:51 -0600 |
| commit | abef44c4d682c4a656465f91d019cc1af1b989d1 (patch) | |
| tree | 7cd5712ae2aec020675938183e0619b62376abcc /src/katemdi.cpp | |
| parent | 9aa2a73641f4d386c9667ac946cebfabca872940 (diff) | |
| download | ktechlab-abef44c4d682c4a656465f91d019cc1af1b989d1.tar.gz ktechlab-abef44c4d682c4a656465f91d019cc1af1b989d1.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/katemdi.cpp')
| -rw-r--r-- | src/katemdi.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/katemdi.cpp b/src/katemdi.cpp index ea18af7..22e0cbd 100644 --- a/src/katemdi.cpp +++ b/src/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 @@ -28,7 +28,7 @@ #include <klocale.h> #include <tdeconfig.h> #include <kiconloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> namespace KateMDI { @@ -108,7 +108,7 @@ GUIClient::GUIClient ( MainWindow *mw ) connect( m_mw->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ), this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) ); - if (actionCollection()->kaccel()==0) + if (actionCollection()->tdeaccel()==0) actionCollection()->setWidget(m_mw); |