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

9 files changed, 17 insertions, 17 deletions

diff --git a/kig/Makefile.am b/kig/Makefile.am
index 62d97410..e011bf79 100644
--- a/kig/Makefile.am
+++ b/kig/Makefile.am
@@ -25,7 +25,7 @@ SUBDIRS = \
 
 kde_module_LTLIBRARIES = libkigpart.la
 libkigpart_la_SOURCES = dummy.cpp
-libkigpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -lktexteditor
+libkigpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -ltdetexteditor
 libkigpart_la_LIBADD  = $(LIB_KPARTS) \
 	misc/libmisc.la objects/libobjects.la filters/libfilters.la \
 	modes/libmodes.la kig/libkigparttemp.la $(scriptinglib)
diff --git a/kig/README.Developers b/kig/README.Developers
index 7f9a92bf..ea571396 100644
--- a/kig/README.Developers
+++ b/kig/README.Developers
@@ -4,7 +4,7 @@ Hi, here are some things that might not be immediately clear :
   modes ) ( just in case this wasn't clear.. )
 
 - for testing code, i don't really know how you're supposed to do this with
-  kparts, so i just do a "make install" every time, and then simply run the
+  tdeparts, so i just do a "make install" every time, and then simply run the
   program, you prolly want to do "./configure --enable-debug=full
   --prefix=/usr/local/trinity" (meanwhile, i found out, the solution is in a
   developer faq on developer.kde.org
diff --git a/kig/kig/Makefile.am b/kig/kig/Makefile.am
index 8e04c0dd..4ffc5b85 100644
--- a/kig/kig/Makefile.am
+++ b/kig/kig/Makefile.am
@@ -23,7 +23,7 @@ bin_PROGRAMS = kig
 
 # the application source, library search path, and link libraries
 kig_SOURCES = main.cpp kig.cpp
-kig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kig_LDADD   = $(LIB_KPARTS)
 
 # this is where the desktop file will go 
diff --git a/kig/kig/kig.h b/kig/kig/kig.h
index ee65962c..0df1ad43 100644
--- a/kig/kig/kig.h
+++ b/kig/kig/kig.h
@@ -36,7 +36,7 @@
 #endif
 
 #include <kapplication.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 #include <dcopclient.h>
 
 class KToggleAction;
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index 128eaeed..a8117c6e 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -58,7 +58,7 @@
 #include <kstandarddirs.h>
 #include <kstdaction.h>
 #include <ktoolbar.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 #include <tdeprint/kprintdialogpage.h>
 
 #include <tqcheckbox.h>
diff --git a/kig/kig/kig_part.h b/kig/kig/kig_part.h
index 641d93aa..2a1c6506 100644
--- a/kig/kig/kig_part.h
+++ b/kig/kig/kig_part.h
@@ -24,7 +24,7 @@
 
 #include <tqptrlist.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 #include "../objects/common.h"
 
diff --git a/kig/kig/kig_view.h b/kig/kig/kig_view.h
index 96da513c..2e09014a 100644
--- a/kig/kig/kig_view.h
+++ b/kig/kig/kig_view.h
@@ -25,7 +25,7 @@
 #include <tqwidget.h>
 #include <tqpixmap.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 #include <vector>
 
diff --git a/kig/scripting/newscriptwizard.cc b/kig/scripting/newscriptwizard.cc
index c02226e8..67a0b9a4 100644
--- a/kig/scripting/newscriptwizard.cc
+++ b/kig/scripting/newscriptwizard.cc
@@ -32,13 +32,13 @@
 #include <kglobalsettings.h>
 #include <kpopupmenu.h>
 #include <ktextedit.h>
-#include <ktexteditor/clipboardinterface.h>
-#include <ktexteditor/dynwordwrapinterface.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/editorchooser.h>
-#include <ktexteditor/popupmenuinterface.h>
-#include <ktexteditor/undointerface.h>
-#include <ktexteditor/view.h>
+#include <tdetexteditor/clipboardinterface.h>
+#include <tdetexteditor/dynwordwrapinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/editorchooser.h>
+#include <tdetexteditor/popupmenuinterface.h>
+#include <tdetexteditor/undointerface.h>
+#include <tdetexteditor/view.h>
 
 #include <assert.h>
 
diff --git a/kig/scripting/newscriptwizard.h b/kig/scripting/newscriptwizard.h
index ac690156..6fa9d07f 100644
--- a/kig/scripting/newscriptwizard.h
+++ b/kig/scripting/newscriptwizard.h
@@ -23,9 +23,9 @@
 #include "script-common.h"
 
 #include <ktextedit.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/highlightinginterface.h>
-#include <ktexteditor/view.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/highlightinginterface.h>
+#include <tdetexteditor/view.h>
 
 #include <algorithm>