summaryrefslogtreecommitdiffstats
path: root/cervisia/cvsservice
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:05:39 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:05:39 -0600
commitff94d46e423398804d2ae63faeb114c2cf604fc4 (patch)
tree4481ffd491d15ac15081cea46d7cc298ef6351a4 /cervisia/cvsservice
parentb9553cef2a3cd9f5b89c8aca6f4b7781a079dbb7 (diff)
downloadtdesdk-ff94d46e423398804d2ae63faeb114c2cf604fc4.tar.gz
tdesdk-ff94d46e423398804d2ae63faeb114c2cf604fc4.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'cervisia/cvsservice')
-rw-r--r--cervisia/cvsservice/CMakeLists.txt2
-rw-r--r--cervisia/cvsservice/cvsservice.cpp2
-rw-r--r--cervisia/cvsservice/repository.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/cervisia/cvsservice/CMakeLists.txt b/cervisia/cvsservice/CMakeLists.txt
index cfb739cf..f3181c04 100644
--- a/cervisia/cvsservice/CMakeLists.txt
+++ b/cervisia/cvsservice/CMakeLists.txt
@@ -55,7 +55,7 @@ tde_add_tdeinit_executable( cvsservice AUTOMOC
cvsjob.skel cvsjob.stub repository.cpp repository.skel
repository.stub sshagent.cpp cvsserviceutils.cpp cvsloginjob.cpp
cvsloginjob.skel cvsloginjob.stub
- LINK kio-shared
+ LINK tdeio-shared
)
diff --git a/cervisia/cvsservice/cvsservice.cpp b/cervisia/cvsservice/cvsservice.cpp
index 70cb283d..8aa5c2a6 100644
--- a/cervisia/cvsservice/cvsservice.cpp
+++ b/cervisia/cvsservice/cvsservice.cpp
@@ -26,7 +26,7 @@
#include <dcopref.h>
#include <dcopclient.h>
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kprocess.h>
diff --git a/cervisia/cvsservice/repository.cpp b/cervisia/cvsservice/repository.cpp
index 92a56baa..7f5d54ee 100644
--- a/cervisia/cvsservice/repository.cpp
+++ b/cervisia/cvsservice/repository.cpp
@@ -25,7 +25,7 @@
#include <tqstring.h>
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdirwatch.h>
#include <kstandarddirs.h>