summaryrefslogtreecommitdiffstats
path: root/quanta/src/quanta_init.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:18:40 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:18:40 -0600
commit82072ef281de2d5948a42fb69ae800d47e0800be (patch)
treebe82dd63affaf693c5e0857c997fa9589d344cc2 /quanta/src/quanta_init.cpp
parent93ec82602aa008218cc1ee075ff13d65b3a317ea (diff)
downloadtdewebdev-82072ef281de2d5948a42fb69ae800d47e0800be.tar.gz
tdewebdev-82072ef281de2d5948a42fb69ae800d47e0800be.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'quanta/src/quanta_init.cpp')
-rw-r--r--quanta/src/quanta_init.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 974dbc92..77883967 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -45,7 +45,7 @@
#include <kmenubar.h>
#include <klocale.h>
#include <kconfig.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
#include <kstandarddirs.h>
#include <kstatusbar.h>
#include <kaction.h>
@@ -56,8 +56,8 @@
#include <ktip.h>
#include <kio/netaccess.h>
#include <ktabwidget.h>
-#include <kmultitabbar.h>
-#include <ktexteditor/view.h>
+#include <tdemultitabbar.h>
+#include <tdetexteditor/view.h>
#include "wkafkapart.h"
#include "kafkacommon.h"
@@ -248,7 +248,7 @@ void QuantaInit::initQuanta()
break;
}
}
- KActionMenu *toolviewMenu = (KActionMenu*)(m_quanta->actionCollection()->action("kmdi_toolview_menu"));
+ KActionMenu *toolviewMenu = (KActionMenu*)(m_quanta->actionCollection()->action("tdemdi_toolview_menu"));
if (toolviewMenu)
toolviewMenu->plug(m_quanta->windowMenu());