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

7 files changed, 8 insertions, 8 deletions

diff --git a/lib/interfaces/Makefile.am b/lib/interfaces/Makefile.am
index 3e8cbc7c..21deec16 100644
--- a/lib/interfaces/Makefile.am
+++ b/lib/interfaces/Makefile.am
@@ -14,7 +14,7 @@ libkdevinterfaces_la_SOURCES = kdevcore.cpp kdevproject.cpp \
 libkdevinterfaces_la_LDFLAGS = -no-undefined $(all_libraries)
 libkdevinterfaces_la_LIBADD = $(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la \
 	$(top_builddir)/lib/util/libkdevutil.la \
-	$(LIB_TDEUI) $(LIB_KHTML) $(LIB_KPARTS) -lktexteditor -lkscript -lDCOP
+	$(LIB_TDEUI) $(LIB_KHTML) $(LIB_KPARTS) -ltdetexteditor -ltdescript -lDCOP
 
 tdevelopincludedir = $(includedir)/tdevelop/interfaces
 tdevelopinclude_HEADERS = kdevlanguagesupport.h kdevmainwindow.h \
@@ -33,7 +33,7 @@ METASOURCES = AUTO
 
 SUBDIRS = extensions external extras
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil designer_integration kdevcatalog kdevprofileslib kdevextensions
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil designer_integration kdevcatalog kdevprofileslib kdevextensions
 DOXYGEN_PROJECTNAME = TDevelop Interfaces Library
 DOXYGEN_DOCDIRPREFIX = kdev
 include ../../Doxyfile.am
diff --git a/lib/interfaces/extensions/Makefile.am b/lib/interfaces/extensions/Makefile.am
index 29ab44e4..211439b0 100644
--- a/lib/interfaces/extensions/Makefile.am
+++ b/lib/interfaces/extensions/Makefile.am
@@ -16,7 +16,7 @@ libkdevextensions_la_SOURCES = kdevappfrontend.cpp kdevmakefrontend.cpp
 INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes)
 METASOURCES = AUTO
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevinterfaces
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces
 DOXYGEN_PROJECTNAME = KDevelop Extension Interfaces Library
 DOXYGEN_DOCDIRPREFIX = kdev
 include ../../../Doxyfile.am
diff --git a/lib/interfaces/external/CMakeLists.txt b/lib/interfaces/external/CMakeLists.txt
index cee645d0..353721fd 100644
--- a/lib/interfaces/external/CMakeLists.txt
+++ b/lib/interfaces/external/CMakeLists.txt
@@ -27,7 +27,7 @@ install( FILES
 
 tde_add_library( kinterfacedesigner SHARED AUTOMOC
   SOURCES designer.cpp
-  LINK kparts-shared tdeui-shared
+  LINK tdeparts-shared tdeui-shared
   VERSION 0.0.0
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/lib/interfaces/external/Makefile.am b/lib/interfaces/external/Makefile.am
index 63e15465..8d022993 100644
--- a/lib/interfaces/external/Makefile.am
+++ b/lib/interfaces/external/Makefile.am
@@ -10,6 +10,6 @@ libkinterfacedesigner_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDEUI)
 libkinterfacedesigner_la_LDFLAGS = $(all_libraries)
 libkinterfacedesigner_la_SOURCES =  designer.cpp
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils
 DOXYGEN_PROJECTNAME = KInterfaceDesigner Library
 include ../../../Doxyfile.am
diff --git a/lib/interfaces/external/designer.h b/lib/interfaces/external/designer.h
index 4396c1ab..b84e2268 100644
--- a/lib/interfaces/external/designer.h
+++ b/lib/interfaces/external/designer.h
@@ -19,7 +19,7 @@
 #ifndef KINTERFACEDESIGNER_FORMEDITOR_H
 #define KINTERFACEDESIGNER_FORMEDITOR_H
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 /**Contains KInterfaceDesigner classes.*/
 namespace KInterfaceDesigner{
diff --git a/lib/interfaces/extras/Makefile.am b/lib/interfaces/extras/Makefile.am
index 49107f8f..a554ad30 100644
--- a/lib/interfaces/extras/Makefile.am
+++ b/lib/interfaces/extras/Makefile.am
@@ -12,7 +12,7 @@ libkdevextras_la_SOURCES = kdevcompileroptions.cpp kdevvcsintegrator.cpp
 servicetype_DATA = tdevelopcompileroptions.desktop \
 	tdevelopvcsintegrator.desktop
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevinterfaces
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces
 DOXYGEN_PROJECTNAME = TDevelop Extra Interfaces Library
 DOXYGEN_DOCDIRPREFIX = kdev
 include ../../../Doxyfile.am
diff --git a/lib/interfaces/kdevpartcontroller.h b/lib/interfaces/kdevpartcontroller.h
index 8c237bf3..0e24c8fc 100644
--- a/lib/interfaces/kdevpartcontroller.h
+++ b/lib/interfaces/kdevpartcontroller.h
@@ -26,7 +26,7 @@
 #define KDEV_PARTCONTROLLER_H
 
 #include <kurl.h>
-#include <kparts/partmanager.h>
+#include <tdeparts/partmanager.h>
 #include <ktrader.h>
 
 /**