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

6 files changed, 15 insertions, 15 deletions

diff --git a/lib/util/CMakeLists.txt b/lib/util/CMakeLists.txt
index 378c4dca..1eb17f35 100644
--- a/lib/util/CMakeLists.txt
+++ b/lib/util/CMakeLists.txt
@@ -22,7 +22,7 @@ include_directories(
 
 install( FILES
     domutil.h execcommand.h filetemplate.h urlutil.h
-    configwidgetproxy.h rurl.h kscriptactionmanager.h
+    configwidgetproxy.h rurl.h tdescriptactionmanager.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/util )
 
 
@@ -33,6 +33,6 @@ tde_add_library( kdevutil STATIC_PIC AUTOMOC
     blockingkprocess.cpp configwidgetproxy.cpp
     domutil.cpp execcommand.cpp filetemplate.cpp
     kdeveditorutil.cpp kdevjobtimer.cpp
-    kdevshellwidget.cpp kscriptactionmanager.cpp
+    kdevshellwidget.cpp tdescriptactionmanager.cpp
     rurl.cpp settings.cpp urlutil.cpp
 )
diff --git a/lib/util/Makefile.am b/lib/util/Makefile.am
index 3a31f258..4dbaa33b 100644
--- a/lib/util/Makefile.am
+++ b/lib/util/Makefile.am
@@ -4,15 +4,15 @@ noinst_LTLIBRARIES = libkdevutil.la
 
 libkdevutil_la_SOURCES = blockingkprocess.cpp configwidgetproxy.cpp domutil.cpp \
 	execcommand.cpp filetemplate.cpp kdeveditorutil.cpp kdevjobtimer.cpp \
-	kdevshellwidget.cpp kscriptactionmanager.cpp rurl.cpp settings.cpp urlutil.cpp
+	kdevshellwidget.cpp tdescriptactionmanager.cpp rurl.cpp settings.cpp urlutil.cpp
 
 METASOURCES = AUTO
 
 tdevelopincludedir = $(includedir)/tdevelop/util
 tdevelopinclude_HEADERS = domutil.h execcommand.h filetemplate.h urlutil.h \
-	configwidgetproxy.h rurl.h kscriptactionmanager.h
+	configwidgetproxy.h rurl.h tdescriptactionmanager.h
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevextensions kdevinterfaces
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevextensions kdevinterfaces
 DOXYGEN_PROJECTNAME = KDevelop Utility Library
 DOXYGEN_DOCDIRPREFIX = kdev
 include ../../Doxyfile.am
diff --git a/lib/util/kdeveditorutil.cpp b/lib/util/kdeveditorutil.cpp
index 3c01f780..198e9a42 100644
--- a/lib/util/kdeveditorutil.cpp
+++ b/lib/util/kdeveditorutil.cpp
@@ -11,11 +11,11 @@
 
 #include "kdeveditorutil.h"
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/selectioninterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/selectioninterface.h>
 
 bool KDevEditorUtil::currentPositionReal( unsigned int * line, unsigned int * col, KTextEditor::Document * doc, KTextEditor::View * view )
 {
diff --git a/lib/util/kdevshellwidget.cpp b/lib/util/kdevshellwidget.cpp
index b85bea80..b9220250 100644
--- a/lib/util/kdevshellwidget.cpp
+++ b/lib/util/kdevshellwidget.cpp
@@ -13,7 +13,7 @@
 #include <tqframe.h>
 
 #include <kdebug.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kde_terminal_interface.h>
 #include <kprocess.h>
diff --git a/lib/util/kscriptactionmanager.cpp b/lib/util/tdescriptactionmanager.cpp
index 28756841..3b0aa8ac 100644
--- a/lib/util/kscriptactionmanager.cpp
+++ b/lib/util/tdescriptactionmanager.cpp
@@ -17,9 +17,9 @@
 *   Free Software Foundation, Inc.,                                       *
 *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
 ***************************************************************************/
-#include "kscriptactionmanager.h"
-#include <kparts/part.h>
-#include <kparts/componentfactory.h>
+#include "tdescriptactionmanager.h"
+#include <tdeparts/part.h>
+#include <tdeparts/componentfactory.h>
 #include <kapplication.h>
 #include <kdesktopfile.h>
 #include <kstandarddirs.h>
@@ -174,4 +174,4 @@ bool KScriptAction::isValid( ) const
   return m_isValid;
 }
 
-#include "kscriptactionmanager.moc"
+#include "tdescriptactionmanager.moc"
diff --git a/lib/util/kscriptactionmanager.h b/lib/util/tdescriptactionmanager.h
index c2e43238..c2e43238 100644
--- a/lib/util/kscriptactionmanager.h
+++ b/lib/util/tdescriptactionmanager.h