From 2fb700f92bb787fab0845a63a541cd5640daa449 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Jan 2013 13:18:13 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 vcs/cvsservice/CMakeLists.txt        | 2 +-
 vcs/cvsservice/cvspart.cpp           | 2 +-
 vcs/cvsservice/diffwidget.cpp        | 4 ++--
 vcs/perforce/perforcepart.cpp        | 2 +-
 vcs/subversion/subversion_core.cpp   | 2 +-
 vcs/subversion/subversion_part.cpp   | 2 +-
 vcs/subversion/subversion_widget.cpp | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'vcs')

diff --git a/vcs/cvsservice/CMakeLists.txt b/vcs/cvsservice/CMakeLists.txt
index b02db663..dc50d646 100644
--- a/vcs/cvsservice/CMakeLists.txt
+++ b/vcs/cvsservice/CMakeLists.txt
@@ -53,6 +53,6 @@ tde_add_kpart( libkdevcvsservice AUTOMOC
     annotatepage.cpp annotateview.cpp
   LINK
     kdevextensions-static kdevwidgets-shared tdevelop-shared
-    cvsservice khtml-shared
+    cvsservice tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp
index 9df91a9b..89854b1b 100644
--- a/vcs/cvsservice/cvspart.cpp
+++ b/vcs/cvsservice/cvspart.cpp
@@ -36,7 +36,7 @@
 #include <cvsservice_stub.h>
 #include <cvsjob_stub.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kdevpartcontroller.h>
 #include <kdevgenericfactory.h>
 
diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp
index d4a2dc55..fae85d9d 100644
--- a/vcs/cvsservice/diffwidget.cpp
+++ b/vcs/cvsservice/diffwidget.cpp
@@ -25,8 +25,8 @@
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 
-#include <kparts/componentfactory.h>
-#include <kparts/part.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeparts/part.h>
 
 #include <kio/jobclasses.h>
 #include <kio/job.h>
diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
index 06d55ec9..45ea039b 100644
--- a/vcs/perforce/perforcepart.cpp
+++ b/vcs/perforce/perforcepart.cpp
@@ -23,7 +23,7 @@
 #include <kapplication.h>
 #include <kaction.h>
 #include <kurl.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 #include "kdevpartcontroller.h"
 #include "kdevcore.h"
diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp
index 4a647b34..9f517c07 100644
--- a/vcs/subversion/subversion_core.cpp
+++ b/vcs/subversion/subversion_core.cpp
@@ -17,7 +17,7 @@
 	 Boston, MA 02110-1301, USA.
 	 */
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kdevcore.h>
 #include <kdevproject.h>
 #include "subversion_part.h"
diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp
index af58f7c8..7c41c29b 100644
--- a/vcs/subversion/subversion_part.cpp
+++ b/vcs/subversion/subversion_part.cpp
@@ -42,7 +42,7 @@
 #include "urlutil.h"
 #include <tqvbox.h>
 #include <kdialogbase.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kdevpartcontroller.h>
 #include <kdevproject.h>
 #include <domutil.h>
diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp
index 0f66a844..e635d600 100644
--- a/vcs/subversion/subversion_widget.cpp
+++ b/vcs/subversion/subversion_widget.cpp
@@ -17,7 +17,7 @@
 	 Boston, MA 02110-1301, USA.
 	 */
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kdevcore.h>
 #include <kdebug.h>
 #include <klineedit.h>
-- 
cgit v1.2.1