summaryrefslogtreecommitdiffstats
path: root/tdecore/tdeconfig.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:51:32 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:51:32 -0600
commit0c9d97065a3d6ceb12d687555a1a33d90db96238 (patch)
tree4305105967fc03b06139b57871d5ab6d2360e75b /tdecore/tdeconfig.cpp
parent59d153016be1e09cb31cdb18bef0a649acfc6292 (diff)
downloadtdelibs-0c9d97065a3d6ceb12d687555a1a33d90db96238.tar.gz
tdelibs-0c9d97065a3d6ceb12d687555a1a33d90db96238.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/tdeconfig.cpp')
-rw-r--r--tdecore/tdeconfig.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tdecore/tdeconfig.cpp b/tdecore/tdeconfig.cpp
index 28f25e61a..1e75be6f1 100644
--- a/tdecore/tdeconfig.cpp
+++ b/tdecore/tdeconfig.cpp
@@ -277,7 +277,7 @@ void TDEConfig::setFileWriteMode(int mode)
backEnd->setFileWriteMode(mode);
}
-KLockFile::Ptr TDEConfig::lockFile(bool bGlobal)
+TDELockFile::Ptr TDEConfig::lockFile(bool bGlobal)
{
TDEConfigINIBackEnd *aBackEnd = dynamic_cast<TDEConfigINIBackEnd*>(backEnd);
if (!aBackEnd) return 0;