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

6 files changed, 9 insertions, 9 deletions

diff --git a/languages/lib/debugger/CMakeLists.txt b/languages/lib/debugger/CMakeLists.txt
index 0f980a45..c159528b 100644
--- a/languages/lib/debugger/CMakeLists.txt
+++ b/languages/lib/debugger/CMakeLists.txt
@@ -33,6 +33,6 @@ install( FILES
 tde_add_library( lang_debugger SHARED AUTOMOC
   SOURCES kdevdebugger.cpp debugger.cpp
   VERSION 0.0.0
-  LINK ktexteditor-shared
+  LINK tdetexteditor-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/languages/lib/debugger/Makefile.am b/languages/lib/debugger/Makefile.am
index 70484a34..1a6b7d2e 100644
--- a/languages/lib/debugger/Makefile.am
+++ b/languages/lib/debugger/Makefile.am
@@ -2,12 +2,12 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes)
 METASOURCES = AUTO
 lib_LTLIBRARIES = liblang_debugger.la
 liblang_debugger_la_LDFLAGS = $(all_libraries)
-liblang_debugger_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_KPARTS) -lktexteditor
+liblang_debugger_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_KPARTS) -ltdetexteditor
 liblang_debugger_la_SOURCES = kdevdebugger.cpp debugger.cpp
 langincludedirdir = $(includedir)/tdevelop/languages/debugger
 langincludedir_HEADERS = debugger.h kdevdebugger.h
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevinterfaces kdevutil
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces kdevutil
 DOXYGEN_PROJECTNAME = KDevelop Debugger Support Library
 DOXYGEN_DOCDIRPREFIX = kdevlang
 include ../../../Doxyfile.am
diff --git a/languages/lib/debugger/debugger.cpp b/languages/lib/debugger/debugger.cpp
index 5d33ee8c..69b7a128 100644
--- a/languages/lib/debugger/debugger.cpp
+++ b/languages/lib/debugger/debugger.cpp
@@ -3,7 +3,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/document.h>
 
 // #include "editorproxy.h"
 #include <kdevpartcontroller.h>
diff --git a/languages/lib/debugger/debugger.h b/languages/lib/debugger/debugger.h
index b7c48964..d4112490 100644
--- a/languages/lib/debugger/debugger.h
+++ b/languages/lib/debugger/debugger.h
@@ -5,11 +5,11 @@
 
 #include "kdevdebugger.h"
 
-#include <kparts/part.h>
-#include <ktexteditor/markinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/markinterface.h>
 
 #include <tdeversion.h>
-#include <ktexteditor/markinterfaceextension.h>
+#include <tdetexteditor/markinterfaceextension.h>
 
 class KDevPartController;
 
diff --git a/languages/lib/designer_integration/Makefile.am b/languages/lib/designer_integration/Makefile.am
index 3ba9afb5..250b8be6 100644
--- a/languages/lib/designer_integration/Makefile.am
+++ b/languages/lib/designer_integration/Makefile.am
@@ -11,6 +11,6 @@ libdesignerintegration_la_SOURCES = implementationwidgetbase.ui \
 langincludedirdir = $(includedir)/tdevelop/languages/designer_integration
 langincludedir_HEADERS = qtdesignerintegration.h implementationwidget.h implementationwidgetbase.h
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevinterfaces kdevutil
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces kdevutil
 DOXYGEN_PROJECTNAME = KDevelop Designer Integration Support Library
 include ../../../Doxyfile.am
diff --git a/languages/lib/interfaces/Makefile.am b/languages/lib/interfaces/Makefile.am
index d469eaa6..3edd1097 100644
--- a/languages/lib/interfaces/Makefile.am
+++ b/languages/lib/interfaces/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES = $(all_includes)
 servicetypedir = $(kde_servicetypesdir)
 servicetype_DATA = tdeveloppcsimporter.desktop
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevinterfaces kdevutil
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces kdevutil
 DOXYGEN_PROJECTNAME = KDevelop Language Support Interfaces Library
 DOXYGEN_DOCDIRPREFIX = kdevlang
 include ../../../Doxyfile.am