summaryrefslogtreecommitdiffstats
path: root/tdeui/kxmlguibuilder.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 23:21:04 -0600
committerTimothy Pearson <[email protected]>2013-02-01 23:21:04 -0600
commitd1e0cc99a202cef3306b90b8839a6726e89f201e (patch)
treea0d01a91644fd94aa6da5d8944e052b67461faad /tdeui/kxmlguibuilder.cpp
parent3e3559f2d4f4c4ffa3caa0374928c8a12be29bf3 (diff)
downloadtdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.tar.gz
tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/kxmlguibuilder.cpp')
-rw-r--r--tdeui/kxmlguibuilder.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tdeui/kxmlguibuilder.cpp b/tdeui/kxmlguibuilder.cpp
index 817a54514..3eb756678 100644
--- a/tdeui/kxmlguibuilder.cpp
+++ b/tdeui/kxmlguibuilder.cpp
@@ -21,11 +21,11 @@
#include "kapplication.h"
#include "kxmlguibuilder.h"
#include "kmenubar.h"
-#include "kpopupmenu.h"
-#include "ktoolbar.h"
+#include "tdepopupmenu.h"
+#include "tdetoolbar.h"
#include "kstatusbar.h"
-#include "kmainwindow.h"
-#include "kaction.h"
+#include "tdemainwindow.h"
+#include "tdeaction.h"
#include "kglobalsettings.h"
#include <klocale.h>
#include <kiconloader.h>
@@ -139,7 +139,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
if ( element.tagName().lower() == d->tagMenu )
{
// Look up to see if we are inside a mainwindow. If yes, then
- // use it as parent widget (to get kaction to plug itself into the
+ // use it as parent widget (to get tdeaction to plug itself into the
// mainwindow). Don't use a popupmenu as parent widget, otherwise
// the popup won't be hidden if it is used as a standalone menu as well.
// And we don't want to set the parent for a standalone popupmenu,