summaryrefslogtreecommitdiffstats
path: root/tdecore/tdeconfig.h
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.h
parent59d153016be1e09cb31cdb18bef0a649acfc6292 (diff)
downloadtdelibs-0c9d97065a3d6ceb12d687555a1a33d90db96238.tar.gz
tdelibs-0c9d97065a3d6ceb12d687555a1a33d90db96238.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/tdeconfig.h')
-rw-r--r--tdecore/tdeconfig.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tdecore/tdeconfig.h b/tdecore/tdeconfig.h
index 19cd3bdf5..c2da06446 100644
--- a/tdecore/tdeconfig.h
+++ b/tdecore/tdeconfig.h
@@ -176,7 +176,7 @@ public:
* Otherwise there is a risk of deadlock.
* @since 3.3
*/
- KLockFile::Ptr lockFile( bool bGlobal=false );
+ TDELockFile::Ptr lockFile( bool bGlobal=false );
protected: