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

19 files changed, 22 insertions, 22 deletions

diff --git a/kjsembed/Makefile.am b/kjsembed/Makefile.am
index 3399ffb6..ad4b48f4 100644
--- a/kjsembed/Makefile.am
+++ b/kjsembed/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = -I$(QTDIR)/tools/designer/uilib -I$(srcdir)/.. $(all_includes)
 
 INCLUDES += -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST
 
-SUBDIRS = bindings builtins qtbindings . plugin plugins kscript stdlib cpptests docs
+SUBDIRS = bindings builtins qtbindings . plugin plugins tdescript stdlib cpptests docs
 
 lib_LTLIBRARIES = libkjsembed.la
 bin_PROGRAMS	= kjscmd
diff --git a/kjsembed/builtins/Makefile.am b/kjsembed/builtins/Makefile.am
index bf12fcf8..5be761af 100644
--- a/kjsembed/builtins/Makefile.am
+++ b/kjsembed/builtins/Makefile.am
@@ -11,7 +11,7 @@ libkjsembedbuiltins_la_SOURCES =	stdaction_imp.cpp \
 					qdir_imp.cpp \
 					qfile_imp.cpp
 
-libkjsembedbuiltins_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libkjsembedbuiltins_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 libkjsembedbuiltins_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) \
 				$(LIB_KFILE) -lkjs $(LIBSOCKET)
 
diff --git a/kjsembed/customobject_imp.cpp b/kjsembed/customobject_imp.cpp
index 04b20c68..ab006c77 100644
--- a/kjsembed/customobject_imp.cpp
+++ b/kjsembed/customobject_imp.cpp
@@ -45,7 +45,7 @@
 
 #ifndef QT_ONLY
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kaction.h>
 
 #include <klistview.h>
@@ -435,14 +435,14 @@ KJS::Value CustomObjectImp::call( KJS::ExecState *exec, KJS::Object &self, const
 	    return KJS::Value();
 	    break;
 	case KHTMLPartSelectAll:
-	    khtmlPartSelectAll( exec, self, args );
+	    tdehtmlPartSelectAll( exec, self, args );
 	    return KJS::Value();
 	    break;
 	case KHTMLPartHasSelection:
-	    return khtmlPartHasSelection( exec, self, args );
+	    return tdehtmlPartHasSelection( exec, self, args );
 	    break;
 	case KHTMLPartSelectedText:
-	    return khtmlPartSelectedText( exec, self, args );
+	    return tdehtmlPartSelectedText( exec, self, args );
 	    break;
 	case KSystemTrayContextMenu:
 	    return ksystemtrayContextMenu( exec, self, args );
@@ -1094,7 +1094,7 @@ void CustomObjectImp::hboxSpacing( KJS::ExecState *exec, KJS::Object &, const KJ
 		box->setSpacing( extractInt( exec, args, 0 ) );
 }
 
-void CustomObjectImp::khtmlPartSelectAll( KJS::ExecState *, KJS::Object &, const KJS::List & )
+void CustomObjectImp::tdehtmlPartSelectAll( KJS::ExecState *, KJS::Object &, const KJS::List & )
 {
 #ifndef QT_ONLY
 
@@ -1105,7 +1105,7 @@ void CustomObjectImp::khtmlPartSelectAll( KJS::ExecState *, KJS::Object &, const
 #endif // QT_ONLY
 }
 
-KJS::Value CustomObjectImp::khtmlPartHasSelection( KJS::ExecState *, KJS::Object &, const KJS::List & )
+KJS::Value CustomObjectImp::tdehtmlPartHasSelection( KJS::ExecState *, KJS::Object &, const KJS::List & )
 {
 #ifndef QT_ONLY
 
@@ -1118,7 +1118,7 @@ KJS::Value CustomObjectImp::khtmlPartHasSelection( KJS::ExecState *, KJS::Object
 	return KJS::Null();
 }
 
-KJS::Value CustomObjectImp::khtmlPartSelectedText( KJS::ExecState *, KJS::Object &, const KJS::List & )
+KJS::Value CustomObjectImp::tdehtmlPartSelectedText( KJS::ExecState *, KJS::Object &, const KJS::List & )
 {
 #ifndef QT_ONLY
 
diff --git a/kjsembed/customobject_imp.h b/kjsembed/customobject_imp.h
index 600d7a15..2b11686c 100644
--- a/kjsembed/customobject_imp.h
+++ b/kjsembed/customobject_imp.h
@@ -172,9 +172,9 @@ public:
 
     void hboxSpacing( KJS::ExecState *exec, KJS::Object &, const KJS::List &args );
 
-    void khtmlPartSelectAll( KJS::ExecState *, KJS::Object &, const KJS::List & );
-    KJS::Value khtmlPartHasSelection( KJS::ExecState *, KJS::Object &, const KJS::List & );
-    KJS::Value khtmlPartSelectedText( KJS::ExecState *, KJS::Object &, const KJS::List &args );
+    void tdehtmlPartSelectAll( KJS::ExecState *, KJS::Object &, const KJS::List & );
+    KJS::Value tdehtmlPartHasSelection( KJS::ExecState *, KJS::Object &, const KJS::List & );
+    KJS::Value tdehtmlPartSelectedText( KJS::ExecState *, KJS::Object &, const KJS::List &args );
 
     KJS::Value ksystemtrayContextMenu( KJS::ExecState *exec, KJS::Object&, const KJS::List &args );
     KJS::Value ksystemtrayActionCollection( KJS::ExecState *exec, KJS::Object&, const KJS::List &args );
diff --git a/kjsembed/docs/ChangeLog b/kjsembed/docs/ChangeLog
index 0c19114f..4b14af71 100644
--- a/kjsembed/docs/ChangeLog
+++ b/kjsembed/docs/ChangeLog
@@ -1351,7 +1351,7 @@
 2004-04-09 Friday 21:26  rich
 
 	Added support for streaming data to a KPart, and an example of doing so. This
-	means you no longer need to have a temporary file to display stuff in khtml.
+	means you no longer need to have a temporary file to display stuff in tdehtml.
 
 2004-04-09 Friday 20:22  rich
 
diff --git a/kjsembed/docs/embedding/simple-embed/Makefile.am b/kjsembed/docs/embedding/simple-embed/Makefile.am
index 2c9243a3..93d68f76 100644
--- a/kjsembed/docs/embedding/simple-embed/Makefile.am
+++ b/kjsembed/docs/embedding/simple-embed/Makefile.am
@@ -8,7 +8,7 @@ bin_PROGRAMS = embedjs
 INCLUDES         = -I$(top_srcdir) $(all_includes)
 
 # the library search path. 
-embedjs_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+embedjs_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 # the libraries to link against.
 embedjs_LDADD   = $(LIB_KFILE) $(LIB_TDEPRINT) -lkjs $(top_builddir)/kjsembed/libkjsembed.la
diff --git a/kjsembed/docs/embedding/simple-embed/README b/kjsembed/docs/embedding/simple-embed/README
index 9c048f35..12f9642b 100644
--- a/kjsembed/docs/embedding/simple-embed/README
+++ b/kjsembed/docs/embedding/simple-embed/README
@@ -53,7 +53,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play
 in your app.
 
 For more details, consult :
-http://www-106.ibm.com/developerworks/library/l-kparts/
+http://www-106.ibm.com/developerworks/library/l-tdeparts/
 http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html
 http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html
 
diff --git a/kjsembed/jsfactory.cpp b/kjsembed/jsfactory.cpp
index 5e6a22a7..d5be63a9 100644
--- a/kjsembed/jsfactory.cpp
+++ b/kjsembed/jsfactory.cpp
@@ -54,9 +54,9 @@
 #include <ksystemtray.h>
 #include <ktrader.h>
 
-#include <kparts/part.h>
-#include <kparts/mainwindow.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/mainwindow.h>
+#include <tdeparts/componentfactory.h>
 
 #endif // QT_ONLY
 
diff --git a/kjsembed/kjsembedpart.h b/kjsembed/kjsembedpart.h
index 84080138..3e4b3afb 100644
--- a/kjsembed/kjsembedpart.h
+++ b/kjsembed/kjsembedpart.h
@@ -25,7 +25,7 @@
 #include <tqstringlist.h>
 
 #ifndef QT_ONLY
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #endif
 
 #include <kjs/interpreter.h>
diff --git a/kjsembed/plugin/jsconsoleplugin.cpp b/kjsembed/plugin/jsconsoleplugin.cpp
index 15e67506..c1e4026c 100644
--- a/kjsembed/plugin/jsconsoleplugin.cpp
+++ b/kjsembed/plugin/jsconsoleplugin.cpp
@@ -23,7 +23,7 @@
 #include <kgenericfactory.h>
 #include <kinstance.h>
 #include <klocale.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 #include <jsfactory.h>
 #include <jsconsolewidget.h>
diff --git a/kjsembed/plugin/jsconsoleplugin.h b/kjsembed/plugin/jsconsoleplugin.h
index 18a17ed9..c8ea7aef 100644
--- a/kjsembed/plugin/jsconsoleplugin.h
+++ b/kjsembed/plugin/jsconsoleplugin.h
@@ -22,7 +22,7 @@
 #ifndef KJSEMBEDJSCONSOLEPLUGIN_H
 #define KJSEMBEDJSCONSOLEPLUGIN_H
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 class KJSEmbedPart;
 
diff --git a/kjsembed/kscript/Makefile.am b/kjsembed/tdescript/Makefile.am
index 2efe1a79..adcf52d4 100644
--- a/kjsembed/kscript/Makefile.am
+++ b/kjsembed/tdescript/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libjavascript.la
 
 libjavascript_la_SOURCES = javascript.cpp
 libjavascript_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -no-undefined -avoid-version
-libjavascript_la_LIBADD = -lkscript ../libkjsembed.la
+libjavascript_la_LIBADD = -ltdescript ../libkjsembed.la
 
 
 METASOURCES = AUTO
diff --git a/kjsembed/kscript/javascript.cpp b/kjsembed/tdescript/javascript.cpp
index 22de1aef..22de1aef 100644
--- a/kjsembed/kscript/javascript.cpp
+++ b/kjsembed/tdescript/javascript.cpp
diff --git a/kjsembed/kscript/javascript.desktop b/kjsembed/tdescript/javascript.desktop
index 1d612975..1d612975 100644
--- a/kjsembed/kscript/javascript.desktop
+++ b/kjsembed/tdescript/javascript.desktop
diff --git a/kjsembed/kscript/javascript.h b/kjsembed/tdescript/javascript.h
index 9ca87f24..9ca87f24 100644
--- a/kjsembed/kscript/javascript.h
+++ b/kjsembed/tdescript/javascript.h
diff --git a/kjsembed/kscript/swaptabs.desktop b/kjsembed/tdescript/swaptabs.desktop
index ebe80ab9..ebe80ab9 100644
--- a/kjsembed/kscript/swaptabs.desktop
+++ b/kjsembed/tdescript/swaptabs.desktop
diff --git a/kjsembed/kscript/swaptabs.js b/kjsembed/tdescript/swaptabs.js
index 20d19248..20d19248 100644
--- a/kjsembed/kscript/swaptabs.js
+++ b/kjsembed/tdescript/swaptabs.js
diff --git a/kjsembed/kscript/swaptabs.ui b/kjsembed/tdescript/swaptabs.ui
index f7f5e973..f7f5e973 100644
--- a/kjsembed/kscript/swaptabs.ui
+++ b/kjsembed/tdescript/swaptabs.ui
diff --git a/kjsembed/tests/test_kparts_args.js b/kjsembed/tests/test_tdeparts_args.js
index a719590a..a719590a 100644
--- a/kjsembed/tests/test_kparts_args.js
+++ b/kjsembed/tests/test_tdeparts_args.js