diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:51:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:51:32 -0600 |
| commit | 0c9d97065a3d6ceb12d687555a1a33d90db96238 (patch) | |
| tree | 4305105967fc03b06139b57871d5ab6d2360e75b /tdecore/kapplication.cpp | |
| parent | 59d153016be1e09cb31cdb18bef0a649acfc6292 (diff) | |
| download | tdelibs-0c9d97065a3d6ceb12d687555a1a33d90db96238.tar.gz tdelibs-0c9d97065a3d6ceb12d687555a1a33d90db96238.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kapplication.cpp')
| -rw-r--r-- | tdecore/kapplication.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp index eb56b0f87..b55f0743b 100644 --- a/tdecore/kapplication.cpp +++ b/tdecore/kapplication.cpp @@ -1443,8 +1443,8 @@ void TDEApplication::startKdeinit() { #ifndef Q_WS_WIN //TODO TDEInstance inst( "starttdeinitlock" ); - KLockFile lock( locateLocal( "tmp", "starttdeinitlock", &inst )); - if( lock.lock( KLockFile::LockNoBlock ) != KLockFile::LockOK ) { + TDELockFile lock( locateLocal( "tmp", "starttdeinitlock", &inst )); + if( lock.lock( TDELockFile::LockNoBlock ) != TDELockFile::LockOK ) { lock.lock(); DCOPClient cl; if( cl.attach()) |