summaryrefslogtreecommitdiffstats
path: root/cervisia/cvsservice
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:49 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:49 -0600
commitf8069e2ea048f2657cc417d83820576ec55c181b (patch)
treecbc5bf540866934a91e0f33b260fc7a25e191fad /cervisia/cvsservice
parente6aaa3624cc6179b82a9bfff1760e742a669064c (diff)
downloadtdesdk-f8069e2ea048f2657cc417d83820576ec55c181b.tar.gz
tdesdk-f8069e2ea048f2657cc417d83820576ec55c181b.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'cervisia/cvsservice')
-rw-r--r--cervisia/cvsservice/cvsservice.cpp4
-rw-r--r--cervisia/cvsservice/repository.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/cervisia/cvsservice/cvsservice.cpp b/cervisia/cvsservice/cvsservice.cpp
index ce69caf5..70cb283d 100644
--- a/cervisia/cvsservice/cvsservice.cpp
+++ b/cervisia/cvsservice/cvsservice.cpp
@@ -86,8 +86,8 @@ CvsService::CvsService()
d->cvsJobs.setAutoDelete(true);
d->loginJobs.setAutoDelete(true);
- KConfig* config = kapp->config();
- KConfigGroupSaver cs(config, "General");
+ TDEConfig* config = kapp->config();
+ TDEConfigGroupSaver cs(config, "General");
if( config->readBoolEntry("UseSshAgent", false) )
{
// use the existing or start a new ssh-agent
diff --git a/cervisia/cvsservice/repository.cpp b/cervisia/cvsservice/repository.cpp
index 398c1c47..92a56baa 100644
--- a/cervisia/cvsservice/repository.cpp
+++ b/cervisia/cvsservice/repository.cpp
@@ -201,7 +201,7 @@ void Repository::slotConfigDirty(const TQString& fileName)
void Repository::Private::readGeneralConfig()
{
- KConfig* config = kapp->config();
+ TDEConfig* config = kapp->config();
// get path to cvs client programm
config->setGroup("General");
@@ -211,7 +211,7 @@ void Repository::Private::readGeneralConfig()
void Repository::Private::readConfig()
{
- KConfig* config = kapp->config();
+ TDEConfig* config = kapp->config();
// Sometimes the location can be unequal to the entry in the CVS/Root.
//
@@ -251,7 +251,7 @@ void Repository::Private::readConfig()
// use default global compression level instead?
if( compressionLevel < 0 )
{
- KConfigGroupSaver cs(config, "General");
+ TDEConfigGroupSaver cs(config, "General");
compressionLevel = config->readNumEntry("Compression", 0);
}