From de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:02:02 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 khelpcenter/htmlsearch/htmlsearch.cpp     | 2 +-
 khelpcenter/htmlsearch/htmlsearch.desktop | 2 +-
 khelpcenter/htmlsearch/kcmhtmlsearch.cpp  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'khelpcenter/htmlsearch')

diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index a0f79c270..105914733 100644
--- a/khelpcenter/htmlsearch/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch/htmlsearch.cpp
@@ -7,7 +7,7 @@
 #include <kstandarddirs.h>
 #include <kprocess.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 #include "progressdialog.h"
diff --git a/khelpcenter/htmlsearch/htmlsearch.desktop b/khelpcenter/htmlsearch/htmlsearch.desktop
index 557ba0cf8..e70b40a96 100644
--- a/khelpcenter/htmlsearch/htmlsearch.desktop
+++ b/khelpcenter/htmlsearch/htmlsearch.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell htmlsearch
+Exec=tdecmshell htmlsearch
 Icon=help_index
 Type=Application
 DocPath=kcontrol/help-index.html
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index 0fdfde831..7846c3493 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -25,7 +25,7 @@
 #include <kapplication.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprocess.h>
 #include "klangcombo.h"
 #include <kurlrequester.h>
-- 
cgit v1.2.1