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

10 files changed, 14 insertions, 14 deletions

diff --git a/ksvg/CMakeLists.txt b/ksvg/CMakeLists.txt
index c9cf25a9..3f1c88bc 100644
--- a/ksvg/CMakeLists.txt
+++ b/ksvg/CMakeLists.txt
@@ -38,6 +38,6 @@ tde_add_library( ksvg SHARED
     ksvgdom-static ksvgdomimpl-static ksvgcore-static ksvgecma-static
     ksvgxrgbrender-static text2path-static ksvgart-static
   LINK
-    khtml-shared ${LCMS_LIBRARY} ${ART_LIBRARIES} ${FRIBIDI_LIBRARIES}
+    tdehtml-shared ${LCMS_LIBRARY} ${ART_LIBRARIES} ${FRIBIDI_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/ksvg/core/CanvasFactory.cpp b/ksvg/core/CanvasFactory.cpp
index d1278334..3c331060 100644
--- a/ksvg/core/CanvasFactory.cpp
+++ b/ksvg/core/CanvasFactory.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <ksimpleconfig.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include "KSVGCanvas.h"
 #include "CanvasFactory.h"
diff --git a/ksvg/ecma/ksvg_window.cpp b/ksvg/ecma/ksvg_window.cpp
index a8504b80..979e7fed 100644
--- a/ksvg/ecma/ksvg_window.cpp
+++ b/ksvg/ecma/ksvg_window.cpp
@@ -39,7 +39,7 @@
 #include <SVGPaintImpl.h>
 #include <SVGZoomAndPanImpl.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <assert.h>
 #include <kdebug.h>
 #include <tqstylesheet.h>
@@ -70,7 +70,7 @@ using namespace KSVG;
   navigator	KSVG::Window::_Navigator	DontDelete|ReadOnly
   printNode		KSVG::Window::_PrintNode		DontDelete|Function 1
 
-# todo navigator, status/defaultstatus, like in KJS::Window (khtml)
+# todo navigator, status/defaultstatus, like in KJS::Window (tdehtml)
 # todo close
 # todo instancename
 # todo setsrc, getsrc, reload, focus, blur, browsereval, findinstancebyname
@@ -381,7 +381,7 @@ Value WindowFunc::call(ExecState *exec, Object &thisObj, const List &args)
 		}
 		case KSVG::Window::_Prompt:
 		{
-		    // mop: from khtml. do we need that?
+		    // mop: from tdehtml. do we need that?
 		    // part->xmlDocImpl()->updateRendering();
 		    bool ok;
 		    TQString str2;
diff --git a/ksvg/ecma/ksvg_window.h b/ksvg/ecma/ksvg_window.h
index 5340dc9a..11655d7e 100644
--- a/ksvg/ecma/ksvg_window.h
+++ b/ksvg/ecma/ksvg_window.h
@@ -27,7 +27,7 @@ namespace KSVG {
 class SVGDocumentImpl;
 class WindowQObject;
 
-// This is currently a fork of khtml's Window object, simplified.
+// This is currently a fork of tdehtml's Window object, simplified.
 // However in the long run it could become a base class for it.
 // Author: David Faure <[email protected]>
 class Window : public KJS::ObjectImp {
diff --git a/ksvg/impl/SVGElementImpl.cc b/ksvg/impl/SVGElementImpl.cc
index 940790f2..fe013f0a 100644
--- a/ksvg/impl/SVGElementImpl.cc
+++ b/ksvg/impl/SVGElementImpl.cc
@@ -325,7 +325,7 @@ TQDict<DOM::DOMString> &SVGElementImpl::attributes()
 	return m_attributes;
 }
 
-// khtml overrides
+// tdehtml overrides
 void SVGElementImpl::setAttribute(const DOM::DOMString &name, const DOM::DOMString &value)
 {
 	m_attributes.replace(name.string(), new DOM::DOMString(value));
diff --git a/ksvg/impl/SVGElementImpl.h b/ksvg/impl/SVGElementImpl.h
index a12098ab..011b8b4b 100644
--- a/ksvg/impl/SVGElementImpl.h
+++ b/ksvg/impl/SVGElementImpl.h
@@ -62,7 +62,7 @@ public:
 	virtual ~SVGElementImpl();
 
 	// Attribute setting
-	// "Override" khtml's functions with ours
+	// "Override" tdehtml's functions with ours
 	void setAttribute(const DOM::DOMString &name, const DOM::DOMString &value);
 	void setAttributeInternal(const DOM::DOMString &name, const DOM::DOMString &value);
 	DOM::DOMString getAttribute(const DOM::DOMString &name) const;
diff --git a/ksvg/impl/SVGEventImpl.cc b/ksvg/impl/SVGEventImpl.cc
index e1252af8..b5b79fc9 100644
--- a/ksvg/impl/SVGEventImpl.cc
+++ b/ksvg/impl/SVGEventImpl.cc
@@ -346,7 +346,7 @@ SVGKeyEventImpl::SVGKeyEventImpl(TQKeyEvent *key, DOM::AbstractView &view, SVGEv
 	qKeyEvent = new TQKeyEvent(key->type(), key->key(), key->ascii(), key->state(), key->text(), key->isAutoRepeat(), key->count());
 
 	// Events are supposed to be accepted by default in TQt!
-	// This line made TQLineEdit's keyevents be ignored, so they were sent to the khtmlview
+	// This line made TQLineEdit's keyevents be ignored, so they were sent to the tdehtmlview
 	// (and e.g. space would make it scroll down)
 	//qKeyEvent->ignore();
 
diff --git a/ksvg/plugin/ksvg_factory.h b/ksvg/plugin/ksvg_factory.h
index 677bab38..c756bd66 100644
--- a/ksvg/plugin/ksvg_factory.h
+++ b/ksvg/plugin/ksvg_factory.h
@@ -21,8 +21,8 @@
 #ifndef KSVGFactory_H
 #define KSVGFactory_H
 
-#include <kparts/factory.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/browserextension.h>
 
 class TDEAboutData;
 class TDEInstance;
diff --git a/ksvg/plugin/ksvg_plugin.h b/ksvg/plugin/ksvg_plugin.h
index 5b9f4713..405bedaf 100644
--- a/ksvg/plugin/ksvg_plugin.h
+++ b/ksvg/plugin/ksvg_plugin.h
@@ -22,7 +22,7 @@
 #define KSVGPlugin_H
 
 #include <tqobject.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 namespace KSVG
 {
diff --git a/ksvg/test/external/Makefile.am b/ksvg/test/external/Makefile.am
index bd6712ab..49648281 100644
--- a/ksvg/test/external/Makefile.am
+++ b/ksvg/test/external/Makefile.am
@@ -6,8 +6,8 @@ bin_PROGRAMS = svgdisplay printnodetest
 
 svgdisplay_SOURCES = SVGTestWidget.cc svgdisplay.cc
 svgdisplay_LDADD =  $(LIB_TDECORE) ../../libksvg.la
-svgdisplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+svgdisplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 printnodetest_SOURCES = printnodetest.cpp
 printnodetest_LDADD =  $(LIB_TDECORE) ../../libksvg.la
-printnodetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+printnodetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor