summaryrefslogtreecommitdiffstats
path: root/khelpcenter/htmlsearch
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 01:02:02 -0600
committerTimothy Pearson <[email protected]>2013-01-27 01:02:02 -0600
commitde7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch)
treedbb3152c372f8620f9290137d461f3d9f9eba1cb /khelpcenter/htmlsearch
parent936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff)
downloadtdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz
tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'khelpcenter/htmlsearch')
-rw-r--r--khelpcenter/htmlsearch/htmlsearch.cpp2
-rw-r--r--khelpcenter/htmlsearch/htmlsearch.desktop2
-rw-r--r--khelpcenter/htmlsearch/kcmhtmlsearch.cpp2
3 files changed, 3 insertions, 3 deletions
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>