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

11 files changed, 40 insertions, 40 deletions

diff --git a/kcontrol/konqhtml/CMakeLists.txt b/kcontrol/konqhtml/CMakeLists.txt
index 77f295aae..097ba8221 100644
--- a/kcontrol/konqhtml/CMakeLists.txt
+++ b/kcontrol/konqhtml/CMakeLists.txt
@@ -24,8 +24,8 @@ link_directories(
 ##### other data ################################
 
 install( FILES
-    khtml_behavior.desktop khtml_java_js.desktop
-    khtml_fonts.desktop khtml_filter.desktop
+    tdehtml_behavior.desktop tdehtml_java_js.desktop
+    tdehtml_fonts.desktop tdehtml_filter.desktop
   DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 install(
@@ -36,7 +36,7 @@ install(
 install(
   FILES uninstall.desktop
   DESTINATION ${APPS_INSTALL_DIR}/Settings/WebBrowsing
-  RENAME khtml_appearance.desktop )
+  RENAME tdehtml_appearance.desktop )
 
 ##### kcm_konqhtml (module) #####################
 
@@ -48,6 +48,6 @@ tde_add_kpart( kcm_konqhtml AUTOMOC
     jspolicies.cpp nsconfigwidget.ui policies.cpp
     domainlistview.cpp advancedTabOptions.ui
     filteropts.cpp
-  LINK khtml-shared
+  LINK tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/konqhtml/Makefile.am b/kcontrol/konqhtml/Makefile.am
index a16c324e4..151e22aff 100644
--- a/kcontrol/konqhtml/Makefile.am
+++ b/kcontrol/konqhtml/Makefile.am
@@ -13,9 +13,9 @@ kcm_konqhtml_la_SOURCES = advancedTabDialog.cpp htmlopts.cpp jsopts.cpp \
 			     filteropts.cpp
 
 kcm_konqhtml_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
-kcm_konqhtml_la_LIBADD = -lkhtml -ltdeui
+kcm_konqhtml_la_LIBADD = -ltdehtml -ltdeui
 
-xdg_apps_DATA = khtml_behavior.desktop khtml_java_js.desktop khtml_fonts.desktop khtml_filter.desktop
+xdg_apps_DATA = tdehtml_behavior.desktop tdehtml_java_js.desktop tdehtml_fonts.desktop tdehtml_filter.desktop
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kcmkonqhtml.pot
@@ -23,4 +23,4 @@ messages: rc.cpp
 install-data-local: uninstall.desktop
 	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing
 	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing/nsplugin.desktop
-	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing/khtml_appearance.desktop
+	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing/tdehtml_appearance.desktop
diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp
index 78619d818..163bdd4f4 100644
--- a/kcontrol/konqhtml/appearance.cpp
+++ b/kcontrol/konqhtml/appearance.cpp
@@ -14,7 +14,7 @@
 #include <kdialog.h>
 #include <kfontcombo.h>
 #include <kglobal.h>
-#include <khtmldefaults.h>
+#include <tdehtmldefaults.h>
 #include <klocale.h>
 #include <knuminput.h>
 
@@ -320,15 +320,15 @@ void KAppearanceOptions::load()
 
 void KAppearanceOptions::load( bool useDefaults )
 {
-    TDEConfig khtmlrc("khtmlrc", true, false);
+    TDEConfig tdehtmlrc("tdehtmlrc", true, false);
 	 m_pConfig->setReadDefaults( useDefaults );
 
-	 khtmlrc.setReadDefaults( useDefaults );
+	 tdehtmlrc.setReadDefaults( useDefaults );
 
-#define SET_GROUP(x) m_pConfig->setGroup(x); khtmlrc.setGroup(x)
-#define READ_NUM(x,y) m_pConfig->readNumEntry(x, khtmlrc.readNumEntry(x, y))
-#define READ_ENTRY(x,y) m_pConfig->readEntry(x, khtmlrc.readEntry(x, y))
-#define READ_LIST(x) m_pConfig->readListEntry(x, khtmlrc.readListEntry(x))
+#define SET_GROUP(x) m_pConfig->setGroup(x); tdehtmlrc.setGroup(x)
+#define READ_NUM(x,y) m_pConfig->readNumEntry(x, tdehtmlrc.readNumEntry(x, y))
+#define READ_ENTRY(x,y) m_pConfig->readEntry(x, tdehtmlrc.readEntry(x, y))
+#define READ_LIST(x) m_pConfig->readListEntry(x, tdehtmlrc.readListEntry(x))
 
     SET_GROUP(m_groupname);
     fSize = READ_NUM( "MediumFontSize", 12 );
@@ -348,7 +348,7 @@ void KAppearanceOptions::load( bool useDefaults )
     if (m_pConfig->hasKey("Fonts"))
        fonts = m_pConfig->readListEntry( "Fonts" );
     else
-       fonts = khtmlrc.readListEntry( "Fonts" );
+       fonts = tdehtmlrc.readListEntry( "Fonts" );
     while (fonts.count() < 7)
        fonts.append(TQString::null);
 
diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp
index 153692082..ada8f31a6 100644
--- a/kcontrol/konqhtml/htmlopts.cpp
+++ b/kcontrol/konqhtml/htmlopts.cpp
@@ -230,13 +230,13 @@ void KMiscHTMLOptions::load()
 
 void KMiscHTMLOptions::load( bool useDefaults )
 {
-    TDEConfig khtmlrc("khtmlrc", true, false);
-    khtmlrc.setReadDefaults( useDefaults );
+    TDEConfig tdehtmlrc("tdehtmlrc", true, false);
+    tdehtmlrc.setReadDefaults( useDefaults );
 	 m_pConfig->setReadDefaults( useDefaults );
 
-#define SET_GROUP(x) m_pConfig->setGroup(x); khtmlrc.setGroup(x)
-#define READ_BOOL(x,y) m_pConfig->readBoolEntry(x, khtmlrc.readBoolEntry(x, y))
-#define READ_ENTRY(x) m_pConfig->readEntry(x, khtmlrc.readEntry(x))
+#define SET_GROUP(x) m_pConfig->setGroup(x); tdehtmlrc.setGroup(x)
+#define READ_BOOL(x,y) m_pConfig->readBoolEntry(x, tdehtmlrc.readBoolEntry(x, y))
+#define READ_ENTRY(x) m_pConfig->readEntry(x, tdehtmlrc.readEntry(x))
 
 
     // *** load ***
diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp
index 68b20fd2f..617f79f6f 100644
--- a/kcontrol/konqhtml/javaopts.cpp
+++ b/kcontrol/konqhtml/javaopts.cpp
@@ -17,7 +17,7 @@
 #include <kdebug.h>
 #include <klineedit.h>
 #include <klocale.h>
-#include <khtml_settings.h>
+#include <tdehtml_settings.h>
 #include <knuminput.h>
 
 #include <tqlayout.h>
diff --git a/kcontrol/konqhtml/jspolicies.h b/kcontrol/konqhtml/jspolicies.h
index 7f3e400fa..3f434e682 100644
--- a/kcontrol/konqhtml/jspolicies.h
+++ b/kcontrol/konqhtml/jspolicies.h
@@ -25,7 +25,7 @@
 #include <tqgroupbox.h>
 #include <tqstring.h>
 
-#include <khtml_settings.h>
+#include <tdehtml_settings.h>
 
 #include "policies.h"
 
diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp
index 35a958b46..45559809b 100644
--- a/kcontrol/konqhtml/main.cpp
+++ b/kcontrol/konqhtml/main.cpp
@@ -43,33 +43,33 @@
 
 extern "C"
 {
-	KDE_EXPORT TDECModule *create_khtml_behavior(TQWidget *parent, const char *name)
+	KDE_EXPORT TDECModule *create_tdehtml_behavior(TQWidget *parent, const char *name)
 	{
 		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KMiscHTMLOptions(c, "HTML Settings", parent, name);
 	}
 
-	KDE_EXPORT TDECModule *create_khtml_fonts(TQWidget *parent, const char *name)
+	KDE_EXPORT TDECModule *create_tdehtml_fonts(TQWidget *parent, const char *name)
 	{
 		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KAppearanceOptions(c, "HTML Settings", parent, name);
 	}
 
-	KDE_EXPORT TDECModule *create_khtml_java_js(TQWidget *parent, const char* /*name*/)
+	KDE_EXPORT TDECModule *create_tdehtml_java_js(TQWidget *parent, const char* /*name*/)
 	{
 		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KJSParts(c, parent, "kcmkonqhtml");
 	}
 
-	KDE_EXPORT TDECModule *create_khtml_plugins(TQWidget *parent, const char *name)
+	KDE_EXPORT TDECModule *create_tdehtml_plugins(TQWidget *parent, const char *name)
 	{
 		TDEConfig *c = new TDEConfig( "konquerorrc", false, false );
 		return new KPluginOptions(c, "Java/JavaScript Settings", parent, name);
 	}
 
-        KDE_EXPORT TDECModule *create_khtml_filter(TQWidget *parent, const char *name )
+        KDE_EXPORT TDECModule *create_tdehtml_filter(TQWidget *parent, const char *name )
         {
-	    TDEConfig *c = new TDEConfig( "khtmlrc", false, false );
+	    TDEConfig *c = new TDEConfig( "tdehtmlrc", false, false );
             return new KCMFilter(c, "Filter Settings", parent, name);
         }
 }
diff --git a/kcontrol/konqhtml/khtml_behavior.desktop b/kcontrol/konqhtml/tdehtml_behavior.desktop
index a4cb670ba..01488fad4 100644
--- a/kcontrol/konqhtml/khtml_behavior.desktop
+++ b/kcontrol/konqhtml/tdehtml_behavior.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/khtml/index.html#kbrowse-html
+DocPath=kcontrol/tdehtml/index.html#kbrowse-html
 Icon=konqueror
-Exec=kcmshell khtml_behavior
+Exec=kcmshell tdehtml_behavior
 
 
 X-TDE-Library=konqhtml
-X-TDE-FactoryName=khtml_behavior
+X-TDE-FactoryName=tdehtml_behavior
 
 Name=Web Behavior
 Name[af]=Web Gedrag
diff --git a/kcontrol/konqhtml/khtml_filter.desktop b/kcontrol/konqhtml/tdehtml_filter.desktop
index ac56dcc15..e23404714 100644
--- a/kcontrol/konqhtml/khtml_filter.desktop
+++ b/kcontrol/konqhtml/tdehtml_filter.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/khtml/index.html#khtml-adblock
+DocPath=kcontrol/tdehtml/index.html#tdehtml-adblock
 Icon=filter
-Exec=kcmshell khtml_filter
+Exec=kcmshell tdehtml_filter
 
 X-TDE-Library=konqhtml
-X-TDE-FactoryName=khtml_filter
+X-TDE-FactoryName=tdehtml_filter
 
 Name=AdBlocK Filters
 Name[af]=Advertensie blok filters
diff --git a/kcontrol/konqhtml/khtml_fonts.desktop b/kcontrol/konqhtml/tdehtml_fonts.desktop
index 468899be9..341508848 100644
--- a/kcontrol/konqhtml/khtml_fonts.desktop
+++ b/kcontrol/konqhtml/tdehtml_fonts.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/khtml/index.html#kbrowse-appearance
+DocPath=kcontrol/tdehtml/index.html#kbrowse-appearance
 Icon=fonts
-Exec=kcmshell khtml_fonts
+Exec=kcmshell tdehtml_fonts
 
 
 X-TDE-Library=konqhtml
-X-TDE-FactoryName=khtml_fonts
+X-TDE-FactoryName=tdehtml_fonts
 
 Name=Fonts
 Name[af]=Skriftipes
diff --git a/kcontrol/konqhtml/khtml_java_js.desktop b/kcontrol/konqhtml/tdehtml_java_js.desktop
index 3a29299d6..e0477c0e6 100644
--- a/kcontrol/konqhtml/khtml_java_js.desktop
+++ b/kcontrol/konqhtml/tdehtml_java_js.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/khtml/index.html#kbrowse-java
+DocPath=kcontrol/tdehtml/index.html#kbrowse-java
 Icon=konqueror
-Exec=kcmshell khtml_java_js
+Exec=kcmshell tdehtml_java_js
 
 
 X-TDE-Library=konqhtml
-X-TDE-FactoryName=khtml_java_js
+X-TDE-FactoryName=tdehtml_java_js
 
 Name=Java & JavaScript
 Name[af]=Java & Javaskrip