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

9 files changed, 15 insertions, 15 deletions

diff --git a/knode/CMakeLists.txt b/knode/CMakeLists.txt
index 86246a514..8b9269460 100644
--- a/knode/CMakeLists.txt
+++ b/knode/CMakeLists.txt
@@ -80,7 +80,7 @@ tde_add_library( knodecommon SHARED AUTOMOC
     kncollectionview.cpp articlewidget.cpp csshelper.cpp
     smtpaccountwidget_base.ui
   VERSION 3.0.0
-  LINK emailfunctions-static tdepim-shared kpgp-shared khtml-shared
+  LINK emailfunctions-static tdepim-shared kpgp-shared tdehtml-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/knode/Makefile.am b/knode/Makefile.am
index 61139f412..7d043e7bf 100644
--- a/knode/Makefile.am
+++ b/knode/Makefile.am
@@ -17,7 +17,7 @@ SUBDIRS = pics filters
 
 bin_PROGRAMS = knode
 
-knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 knode_LDADD   = libknodecommon.la
 
 kcm_knode_la_SOURCES = knconfigpages.cpp
diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp
index d5975dad1..b66b1a6f7 100644
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@@ -32,8 +32,8 @@
 #include <kapplication.h>
 #include <kbookmarkmanager.h>
 #include <kcharsets.h>
-#include <khtml_part.h>
-#include <khtmlview.h>
+#include <tdehtml_part.h>
+#include <tdehtmlview.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmdcodec.h>
diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp
index 29376f9c4..ddc66afd3 100644
--- a/knode/knaccountmanager.cpp
+++ b/knode/knaccountmanager.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 
 #include "kngroupmanager.h"
 #include "knnntpaccount.h"
diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp
index 38a18a342..fa92c045e 100644
--- a/knode/kncomposer.cpp
+++ b/knode/kncomposer.cpp
@@ -16,7 +16,7 @@
 #include <tqtextcodec.h>
 #include <tqclipboard.h>
 #include <tqapplication.h>
-#include <kspelldlg.h>
+#include <tdespelldlg.h>
 #include <tdeversion.h>
 #include "addressesdialog.h"
 using KPIM::AddressesDialog;
@@ -35,7 +35,7 @@ using KRecentAddress::RecentAddresses;
 #include <kdebug.h>
 #include <klineedit.h>
 #include <kcombobox.h>
-#include <kspell.h>
+#include <tdespell.h>
 #include <ktempfile.h>
 #include <kpgp.h>
 #include <kpgpblock.h>
diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp
index af92a8d76..9e80e1b83 100644
--- a/knode/knconfigwidgets.cpp
+++ b/knode/knconfigwidgets.cpp
@@ -27,7 +27,7 @@
 #include <kuserprofile.h>
 #include <kopenwith.h>
 #include <kscoringeditor.h>
-#include <kspell.h>
+#include <tdespell.h>
 #include <kcombobox.h>
 #include <kpgpui.h>
 #include <kurlcompletion.h>
diff --git a/knode/knode_part.cpp b/knode/knode_part.cpp
index 4ada858c1..1d09376fc 100644
--- a/knode/knode_part.cpp
+++ b/knode/knode_part.cpp
@@ -32,8 +32,8 @@
 #include "sidebarextension.h"
 
 #include <kapplication.h>
-#include <kparts/genericfactory.h>
-#include <kparts/statusbarextension.h>
+#include <tdeparts/genericfactory.h>
+#include <tdeparts/statusbarextension.h>
 #include <knotifyclient.h>
 #include <dcopclient.h>
 #include <kiconloader.h>
diff --git a/knode/knode_part.h b/knode/knode_part.h
index badfbee5b..b1136db44 100644
--- a/knode/knode_part.h
+++ b/knode/knode_part.h
@@ -26,10 +26,10 @@
 
 
 #include <tdeversion.h>
-#include <kparts/browserextension.h>
-#include <kparts/factory.h>
-#include <kparts/event.h>
-#include <kparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/event.h>
+#include <tdeparts/part.h>
 
 #include <tqwidget.h>
 
diff --git a/knode/knserverinfo.cpp b/knode/knserverinfo.cpp
index 30f0b863d..307c72fff 100644
--- a/knode/knserverinfo.cpp
+++ b/knode/knserverinfo.cpp
@@ -17,7 +17,7 @@
 #include <kconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 using namespace KWallet;
 
 #include "knglobals.h"