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

6 files changed, 12 insertions, 12 deletions

diff --git a/konqueror/keditbookmarks/DESIGN b/konqueror/keditbookmarks/DESIGN
index 9ef300f81..723a279d7 100644
--- a/konqueror/keditbookmarks/DESIGN
+++ b/konqueror/keditbookmarks/DESIGN
@@ -11,7 +11,7 @@ various other thingies:
    exporters        : forwarders to kio/bookmarks code, and html export code
    dcop             : dcop handling, internal interface
    bookmarkiterator : is a baseclass for iterating actions, of sorts...
-   updater          : favicon updating base stuff - kio/khtml crap
+   updater          : favicon updating base stuff - kio/tdehtml crap
    testlink         : link testing stuff
 
 3 different selection styles:
diff --git a/konqueror/keditbookmarks/Makefile.am b/konqueror/keditbookmarks/Makefile.am
index 4da0053a6..681e1ab14 100644
--- a/konqueror/keditbookmarks/Makefile.am
+++ b/konqueror/keditbookmarks/Makefile.am
@@ -7,7 +7,7 @@ lib_LTLIBRARIES =
 tdeinit_LTLIBRARIES = keditbookmarks.la
 
 kbookmarkmerger_SOURCES = kbookmarkmerger.cpp
-kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kbookmarkmerger_LDADD = $(LIB_KIO)
 
 dcop_DCOPIDLNG = true
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index 75f96ed18..4bcd50735 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -55,8 +55,8 @@
 #include <ktempfile.h>
 #include <kstandarddirs.h>
 
-#include <kparts/part.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/componentfactory.h>
 
 #include <kicondialog.h>
 #include <kiconloader.h>
diff --git a/konqueror/keditbookmarks/favicons.h b/konqueror/keditbookmarks/favicons.h
index 97894d741..3be46d35f 100644
--- a/konqueror/keditbookmarks/favicons.h
+++ b/konqueror/keditbookmarks/favicons.h
@@ -24,8 +24,8 @@
 #include <kbookmark.h>
 #include <konq_faviconmgr.h>
 
-#include <kparts/part.h>
-#include <kparts/browserinterface.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserinterface.h>
 
 #include "bookmarkiterator.h"
 
diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp
index ee2b6d3b6..4060b08a8 100644
--- a/konqueror/keditbookmarks/updater.cpp
+++ b/konqueror/keditbookmarks/updater.cpp
@@ -32,9 +32,9 @@
 
 #include <kio/job.h>
 
-#include <kparts/part.h>
-#include <kparts/componentfactory.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeparts/browserextension.h>
 
 FavIconUpdater::FavIconUpdater(TQObject *parent, const char *name)
     : KonqFavIconMgr(parent, name) {
@@ -123,7 +123,7 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) {
     m_webGrabber = new FavIconWebGrabber(m_part, bk.url());
 }
 
-// khtml callback
+// tdehtml callback
 void FavIconUpdater::setIconURL(const KURL &iconURL) {
     setIconForURL(m_bk.url(), iconURL);
 }
diff --git a/konqueror/keditbookmarks/updater.h b/konqueror/keditbookmarks/updater.h
index 454b51672..44a19af40 100644
--- a/konqueror/keditbookmarks/updater.h
+++ b/konqueror/keditbookmarks/updater.h
@@ -24,8 +24,8 @@
 #include <kbookmark.h>
 #include <konq_faviconmgr.h>
 
-#include <kparts/part.h>
-#include <kparts/browserinterface.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserinterface.h>
 
 class FavIconWebGrabber : public QObject
 {