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

---
 cervisia/CMakeLists.txt  | 4 ++--
 cervisia/Makefile.am     | 2 +-
 cervisia/cervisiapart.h  | 8 ++++----
 cervisia/cervisiashell.h | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'cervisia')

diff --git a/cervisia/CMakeLists.txt b/cervisia/CMakeLists.txt
index b4f6f7c3..2a0b4523 100644
--- a/cervisia/CMakeLists.txt
+++ b/cervisia/CMakeLists.txt
@@ -102,7 +102,7 @@ tde_add_kpart( libcervisiapart AUTOMOC
     updateview_visitors.cpp entry.cpp entry_status.cpp stringmatcher.cpp
     cvsinitdlg.cpp ignorelistbase.cpp dirignorelist.cpp
     globalignorelist.cpp editwithmenu.cpp logmessageedit.cpp
-  LINK cervisia-static cvsservice-shared kutils-shared
+  LINK cervisia-static cvsservice-shared tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -112,7 +112,7 @@ tde_add_kpart( libcervisiapart AUTOMOC
 tde_add_tdeinit_executable( cervisia AUTOMOC
   SOURCES
     main.cpp cervisiashell.cpp
-  LINK cervisia-static cvsservice-shared kutils-shared
+  LINK cervisia-static cvsservice-shared tdeutils-shared
 )
 
 
diff --git a/cervisia/Makefile.am b/cervisia/Makefile.am
index 4b11e4ef..8d2b87a4 100644
--- a/cervisia/Makefile.am
+++ b/cervisia/Makefile.am
@@ -61,7 +61,7 @@ messages: rc.cpp
 	$(XGETTEXT) -C *.cpp *.h -o $(podir)/cervisia.pot
 
 srcdoc:
-	$(kde_bindir)/kdoc -a -p -d classdocs -n 'Cervisia' *.h -lqt -ltdecore -ltdeui -lkparts
+	$(kde_bindir)/kdoc -a -p -d classdocs -n 'Cervisia' *.h -lqt -ltdecore -ltdeui -ltdeparts
 
 cervisia.1: $(srcdir)/cervisia.1.in
 	sed -e 's%_KDEHTMLDIR_%'${kde_htmldir}'%g;' \
diff --git a/cervisia/cervisiapart.h b/cervisia/cervisiapart.h
index 6d1d097b..84f70585 100644
--- a/cervisia/cervisiapart.h
+++ b/cervisia/cervisiapart.h
@@ -22,10 +22,10 @@
 #ifndef CERVISIAPART_H
 #define CERVISIAPART_H
 
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
-#include <kparts/genericfactory.h>
-#include <kparts/statusbarextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/genericfactory.h>
+#include <tdeparts/statusbarextension.h>
 
 #include "addremovedlg.h"
 #include "commitdlg.h"
diff --git a/cervisia/cervisiashell.h b/cervisia/cervisiashell.h
index 2a676d76..a8591e24 100644
--- a/cervisia/cervisiashell.h
+++ b/cervisia/cervisiashell.h
@@ -22,7 +22,7 @@
 #ifndef CERVISIASHELL_H
 #define CERVISIASHELL_H
 
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 class KRecentFilesAction;
 
-- 
cgit v1.2.1