summaryrefslogtreecommitdiffstats
path: root/khelpcenter
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:02 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:02 -0600
commitde7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch)
treedbb3152c372f8620f9290137d461f3d9f9eba1cb /khelpcenter
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')
-rw-r--r--khelpcenter/README.metadata4
-rw-r--r--khelpcenter/fontdialog.cpp2
-rw-r--r--khelpcenter/formatter.cpp2
-rw-r--r--khelpcenter/glossary.cpp2
-rw-r--r--khelpcenter/htmlsearch.cpp2
-rw-r--r--khelpcenter/htmlsearch/htmlsearch.cpp2
-rw-r--r--khelpcenter/htmlsearch/htmlsearch.desktop2
-rw-r--r--khelpcenter/htmlsearch/kcmhtmlsearch.cpp2
-rw-r--r--khelpcenter/htmlsearchconfig.cpp2
-rw-r--r--khelpcenter/infotree.cpp4
-rw-r--r--khelpcenter/kcmhelpcenter.cpp2
-rw-r--r--khelpcenter/kcmhelpcenter.desktop2
-rw-r--r--khelpcenter/khc_indexbuilder.cpp2
-rw-r--r--khelpcenter/mainwindow.cpp2
-rw-r--r--khelpcenter/mainwindow.h2
-rw-r--r--khelpcenter/plugins/CMakeLists.txt2
-rw-r--r--khelpcenter/plugins/Makefile.am2
-rw-r--r--khelpcenter/plugins/tdeioslaves.desktop (renamed from khelpcenter/plugins/kioslaves.desktop)2
-rw-r--r--khelpcenter/plugintraverser.cpp4
-rw-r--r--khelpcenter/prefs.kcfgc2
-rw-r--r--khelpcenter/scrollkeepertreebuilder.cpp2
-rw-r--r--khelpcenter/searchengine.cpp2
-rw-r--r--khelpcenter/searchengine.h2
23 files changed, 26 insertions, 26 deletions
diff --git a/khelpcenter/README.metadata b/khelpcenter/README.metadata
index 5b02e313d..c0149c8e5 100644
--- a/khelpcenter/README.metadata
+++ b/khelpcenter/README.metadata
@@ -30,7 +30,7 @@ Icon string Name of icon for document
DocPath URI Location of document. In addition to the
standard URI schemes like http: and file:
all schemes which are supported through
- kioslaves can be used. In particular the
+ tdeioslaves can be used. In particular the
following non-standard URI schemes are
supported:
help: KDE manual identified by app name
@@ -91,7 +91,7 @@ X-TDE-KHelpcenter string If this entry is set to one of the
'kinfocenter' kinfocenter docs
'kcontrol' kcontrol module docs
'konqueror' konqueror plugin docs
- 'kioslave' kioslave docs
+ 'tdeioslave' tdeioslave docs
'info' info pages
X-DOC-DocumentType string Type of document. The type is used to look
up corresponding search handlers.
diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp
index e20ec598e..ebaead73f 100644
--- a/khelpcenter/fontdialog.cpp
+++ b/khelpcenter/fontdialog.cpp
@@ -22,7 +22,7 @@
#include <kapplication.h>
#include <kcharsets.h>
#include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kfontcombo.h>
#include <tdehtmldefaults.h>
#include <klocale.h>
diff --git a/khelpcenter/formatter.cpp b/khelpcenter/formatter.cpp
index 9b35c4b09..a59fc5345 100644
--- a/khelpcenter/formatter.cpp
+++ b/khelpcenter/formatter.cpp
@@ -23,7 +23,7 @@
#include <klocale.h>
#include <kglobal.h>
#include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <tqfile.h>
diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp
index 8a406230a..a2c0b0990 100644
--- a/khelpcenter/glossary.cpp
+++ b/khelpcenter/glossary.cpp
@@ -21,7 +21,7 @@
#include "view.h"
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <klocale.h>
diff --git a/khelpcenter/htmlsearch.cpp b/khelpcenter/htmlsearch.cpp
index f82516479..72eaa432d 100644
--- a/khelpcenter/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch.cpp
@@ -1,5 +1,5 @@
#include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include "docentry.h"
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>
diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp
index a02538543..da0de3ae4 100644
--- a/khelpcenter/htmlsearchconfig.cpp
+++ b/khelpcenter/htmlsearchconfig.cpp
@@ -26,7 +26,7 @@
#include <klocale.h>
#include <kurllabel.h>
#include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kurlrequester.h>
#include <klineedit.h>
diff --git a/khelpcenter/infotree.cpp b/khelpcenter/infotree.cpp
index 91dcb535a..0e8e5875b 100644
--- a/khelpcenter/infotree.cpp
+++ b/khelpcenter/infotree.cpp
@@ -24,7 +24,7 @@
#include "docentry.h"
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <klistview.h>
@@ -98,7 +98,7 @@ void InfoTree::build( NavigatorItem *parent )
TDEConfig *cfg = kapp->config();
cfg->setGroup( "Info pages" );
TQStringList infoDirFiles = cfg->readListEntry( "Search paths" );
- // Default paths taken fron tdebase/kioslave/info/kde-info2html.conf
+ // Default paths taken fron tdebase/tdeioslave/info/kde-info2html.conf
if ( infoDirFiles.isEmpty() ) {
infoDirFiles << "/usr/share/info";
infoDirFiles << "/usr/info";
diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp
index c01d8f3c3..74f29c434 100644
--- a/khelpcenter/kcmhelpcenter.cpp
+++ b/khelpcenter/kcmhelpcenter.cpp
@@ -26,7 +26,7 @@
#include "searchhandler.h"
#include "searchengine.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <klocale.h>
#include <kglobal.h>
diff --git a/khelpcenter/kcmhelpcenter.desktop b/khelpcenter/kcmhelpcenter.desktop
index 2767ae615..1b8baac49 100644
--- a/khelpcenter/kcmhelpcenter.desktop
+++ b/khelpcenter/kcmhelpcenter.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Application
-Exec=kcmshell kcmhelpcenter
+Exec=tdecmshell kcmhelpcenter
Icon=help
X-TDE-SubstituteUID=true
diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp
index 0efd5ac2b..9d084f0d4 100644
--- a/khelpcenter/khc_indexbuilder.cpp
+++ b/khelpcenter/khc_indexbuilder.cpp
@@ -31,7 +31,7 @@
#include <dcopclient.h>
#include <kprocess.h>
#include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tqfile.h>
#include <tqfileinfo.h>
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index 7dc1fbcf3..2cf00ced7 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -28,7 +28,7 @@
#include "prefs.h"
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <dcopclient.h>
#include <kiconloader.h>
#include <kmimemagic.h>
diff --git a/khelpcenter/mainwindow.h b/khelpcenter/mainwindow.h
index 92b6b10cd..27085dd49 100644
--- a/khelpcenter/mainwindow.h
+++ b/khelpcenter/mainwindow.h
@@ -4,7 +4,7 @@
#include <tqptrlist.h>
#include <kmainwindow.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
#include <kurl.h>
#include <tdeparts/browserextension.h>
#include <dcopclient.h>
diff --git a/khelpcenter/plugins/CMakeLists.txt b/khelpcenter/plugins/CMakeLists.txt
index cbda88d75..fea32db40 100644
--- a/khelpcenter/plugins/CMakeLists.txt
+++ b/khelpcenter/plugins/CMakeLists.txt
@@ -18,5 +18,5 @@ install( FILES
applets.desktop contact.desktop faq.desktop info.desktop
links.desktop support.desktop userguide.desktop welcome.desktop
hardwaremodules.desktop kcontrolmodules.desktop konqplugins.desktop
- kioslaves.desktop quickstart.desktop visualdict.desktop
+ tdeioslaves.desktop quickstart.desktop visualdict.desktop
DESTINATION ${DATA_INSTALL_DIR}/khelpcenter/plugins )
diff --git a/khelpcenter/plugins/Makefile.am b/khelpcenter/plugins/Makefile.am
index c5dca33bb..c5601db13 100644
--- a/khelpcenter/plugins/Makefile.am
+++ b/khelpcenter/plugins/Makefile.am
@@ -5,6 +5,6 @@ SUBDIRS = Applications Manpages Scrollkeeper
plugin_DATA = applets.desktop contact.desktop faq.desktop info.desktop \
links.desktop support.desktop userguide.desktop welcome.desktop \
kicmodules.desktop kcontrolmodules.desktop konqplugins.desktop \
- kioslaves.desktop quickstart.desktop visualdict.desktop
+ tdeioslaves.desktop quickstart.desktop visualdict.desktop
plugindir = $(kde_datadir)/khelpcenter/plugins
diff --git a/khelpcenter/plugins/kioslaves.desktop b/khelpcenter/plugins/tdeioslaves.desktop
index 3535ebfd1..619b0488c 100644
--- a/khelpcenter/plugins/kioslaves.desktop
+++ b/khelpcenter/plugins/tdeioslaves.desktop
@@ -32,4 +32,4 @@ Icon=contents2
X-DOC-Weight=-400
-X-TDE-KHelpcenter-Special=kioslave
+X-TDE-KHelpcenter-Special=tdeioslave
diff --git a/khelpcenter/plugintraverser.cpp b/khelpcenter/plugintraverser.cpp
index e48ec8359..8386ba606 100644
--- a/khelpcenter/plugintraverser.cpp
+++ b/khelpcenter/plugintraverser.cpp
@@ -24,7 +24,7 @@
#include "navigatoritem.h"
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kiconloader.h>
@@ -94,7 +94,7 @@ void PluginTraverser::process( DocEntry *entry )
entry->khelpcenterSpecial() == "kcontrol" ||
entry->khelpcenterSpecial() == "konqueror" ) {
mNavigator->insertParentAppDocs( entry->khelpcenterSpecial(), mCurrentItem );
- } else if ( entry->khelpcenterSpecial() == "kioslave" ) {
+ } else if ( entry->khelpcenterSpecial() == "tdeioslave" ) {
mNavigator->insertIOSlaveDocs( entry->khelpcenterSpecial(), mCurrentItem );
} else if ( entry->khelpcenterSpecial() == "info" ) {
mNavigator->insertInfoDocs( mCurrentItem );
diff --git a/khelpcenter/prefs.kcfgc b/khelpcenter/prefs.kcfgc
index ae03d9c4b..4742430de 100644
--- a/khelpcenter/prefs.kcfgc
+++ b/khelpcenter/prefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=khelpcenter.kcfg
ClassName=Prefs
Singleton=true
diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp
index b62777272..6695114c7 100644
--- a/khelpcenter/scrollkeepertreebuilder.cpp
+++ b/khelpcenter/scrollkeepertreebuilder.cpp
@@ -24,7 +24,7 @@
#include "docentry.h"
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kglobal.h>
#include <klocale.h>
diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp
index ca4f56c01..7c06828dd 100644
--- a/khelpcenter/searchengine.cpp
+++ b/khelpcenter/searchengine.cpp
@@ -2,7 +2,7 @@
#include <tqstylesheet.h>
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kstandarddirs.h>
#include <kprocess.h>
diff --git a/khelpcenter/searchengine.h b/khelpcenter/searchengine.h
index 9821c0da0..2863b904f 100644
--- a/khelpcenter/searchengine.h
+++ b/khelpcenter/searchengine.h
@@ -6,7 +6,7 @@
#include <tqstring.h>
#include <kpixmap.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
#include "docentrytraverser.h"