Rename a number of libraries and executables to avoid conflicts with KDE4

10 files changed, 16 insertions, 16 deletions

diff --git a/khelpcenter/CMakeLists.txt b/khelpcenter/CMakeLists.txt
index 795eb39dd..279ecd389 100644
--- a/khelpcenter/CMakeLists.txt
+++ b/khelpcenter/CMakeLists.txt
@@ -50,7 +50,7 @@ tde_add_tdeinit_executable( khelpcenter AUTOMOC
     kcmhelpcenter.cpp htmlsearchconfig.cpp kcmhelpcenter.skel
     fontdialog.cpp plugintraverser.cpp scrollkeepertreebuilder.cpp
     prefs.kcfgc searchhandler.cpp
-  LINK khtml-shared
+  LINK tdehtml-shared
 )
 
 
diff --git a/khelpcenter/Makefile.am b/khelpcenter/Makefile.am
index 272a4d4e8..dcf2c973d 100644
--- a/khelpcenter/Makefile.am
+++ b/khelpcenter/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 bin_PROGRAMS = khc_indexbuilder
 lib_LTLIBRARIES = 
 
-khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 khc_indexbuilder_LDADD = $(LIB_TDECORE)
 khc_indexbuilder_SOURCES = khc_indexbuilder.cpp
 
@@ -34,7 +34,7 @@ khelpcenter_la_SOURCES = navigator.cpp \
 
 EXTRA_PROGRAMS = testmetainfo
 
-testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testmetainfo_LDADD = $(LIB_TDECORE) docentry.lo docmetainfo.lo \
                      docentrytraverser.lo htmlsearch.lo
 testmetainfo_SOURCES = testmetainfo.cpp
diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp
index 7699ddd49..e20ec598e 100644
--- a/khelpcenter/fontdialog.cpp
+++ b/khelpcenter/fontdialog.cpp
@@ -24,7 +24,7 @@
 #include <kcombobox.h>
 #include <kconfig.h>
 #include <kfontcombo.h>
-#include <khtmldefaults.h>
+#include <tdehtmldefaults.h>
 #include <klocale.h>
 #include <knuminput.h>
 
diff --git a/khelpcenter/htmlsearch/Makefile.am b/khelpcenter/htmlsearch/Makefile.am
index f0459d339..132be449b 100644
--- a/khelpcenter/htmlsearch/Makefile.am
+++ b/khelpcenter/htmlsearch/Makefile.am
@@ -21,14 +21,14 @@ noinst_HEADERS = kcmhtmlsearch.h htmlsearch.h
 
 xdg_apps_DATA = htmlsearch.desktop
 
-bin_PROGRAMS = khtmlindex
+bin_PROGRAMS = tdehtmlindex
 
 wrapperdir = $(kde_datadir)/khelpcenter/
 wrapper_SCRIPTS = meinproc_wrapper
 
-khtmlindex_SOURCES = index.cpp
-khtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-khtmlindex_LDADD = libhtmlsearch.la $(LIB_TDEUI)
+tdehtmlindex_SOURCES = index.cpp
+tdehtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdehtmlindex_LDADD = libhtmlsearch.la $(LIB_TDEUI)
 
 xpm_DATA = unchecked.xpm checked.xpm
 xpmdir = $(kde_datadir)/khelpcenter/pics
diff --git a/khelpcenter/htmlsearch/index.cpp b/khelpcenter/htmlsearch/index.cpp
index 82bf23689..3cc356d52 100644
--- a/khelpcenter/htmlsearch/index.cpp
+++ b/khelpcenter/htmlsearch/index.cpp
@@ -15,7 +15,7 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-  TDEAboutData aboutData( "khtmlindex", I18N_NOOP("KHtmlIndex"),
+  TDEAboutData aboutData( "tdehtmlindex", I18N_NOOP("KHtmlIndex"),
 	"",
 	I18N_NOOP("TDE Index generator for help files."));
 
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index 588be7142..0fdfde831 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -336,7 +336,7 @@ void KHTMLSearchConfig::generateIndex()
 {
   save();
 
-  TQString exe = kapp->dirs()->findExe("khtmlindex");
+  TQString exe = kapp->dirs()->findExe("tdehtmlindex");
   if (exe.isEmpty())
     return;
 
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index 56aec0179..7dc1fbcf3 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -35,8 +35,8 @@
 #include <krun.h>
 #include <kaboutdata.h>
 #include <kdebug.h>
-#include <khtmlview.h>
-#include <khtml_settings.h>
+#include <tdehtmlview.h>
+#include <tdehtml_settings.h>
 #include <kaction.h>
 #include <kstatusbar.h>
 #include <kstdaccel.h>
diff --git a/khelpcenter/mainwindow.h b/khelpcenter/mainwindow.h
index 7e2d8b0b7..92b6b10cd 100644
--- a/khelpcenter/mainwindow.h
+++ b/khelpcenter/mainwindow.h
@@ -6,7 +6,7 @@
 #include <kmainwindow.h>
 #include <kio/job.h>
 #include <kurl.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <dcopclient.h>
 #include <dcopobject.h>
 
diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp
index 5e29114bc..bfe430eaf 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -9,8 +9,8 @@
 #include <kactioncollection.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <khtml_settings.h>
-#include <khtmlview.h>
+#include <tdehtml_settings.h>
+#include <tdehtmlview.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
 #include <kstandarddirs.h>
diff --git a/khelpcenter/view.h b/khelpcenter/view.h
index 3af2a15b8..7d7c1001b 100644
--- a/khelpcenter/view.h
+++ b/khelpcenter/view.h
@@ -1,7 +1,7 @@
 #ifndef __view_h__
 #define __view_h__
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 #include "glossary.h"
 #include "navigator.h"