From dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Jan 2013 13:16:20 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 konqueror/konq_mainwindow.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'konqueror/konq_mainwindow.cc')

diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index f6451155b..09ea92c87 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -88,7 +88,7 @@
 #include <kstdaccel.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
-#include <ksycoca.h>
+#include <tdesycoca.h>
 #include <ktempfile.h>
 #include <kurlrequesterdlg.h>
 #include <kurlrequester.h>
@@ -3875,13 +3875,13 @@ void KonqMainWindow::initActions()
 
   m_configureModules << "kde-filebehavior.desktop" << "kde-fileappearance.desktop" <<
       "kde-filepreviews.desktop" << "tde-filetypes.desktop" <<
-      "tde-khtml_behavior.desktop" << "tde-khtml_java_js.desktop" <<
-      "tde-khtml_filter.desktop" <<
-      "tde-khtml_fonts.desktop" << "tde-ebrowsing.desktop" <<
+      "tde-tdehtml_behavior.desktop" << "tde-tdehtml_java_js.desktop" <<
+      "tde-tdehtml_filter.desktop" <<
+      "tde-tdehtml_fonts.desktop" << "tde-ebrowsing.desktop" <<
       "tde-kcmhistory.desktop" << "tde-cookies.desktop" <<
       "tde-cache.desktop" << "tde-proxy.desktop" << "tde-kcmcss.desktop" <<
       "tde-crypto.desktop" << "tde-useragent.desktop" <<
-      "tde-khtml_plugins.desktop" << "kde-kcmkonqyperformance.desktop";
+      "tde-tdehtml_plugins.desktop" << "kde-kcmkonqyperformance.desktop";
 
 
   if (!kapp->authorizeControlModules(configModules()).isEmpty())
-- 
cgit v1.2.1