From 0c9d97065a3d6ceb12d687555a1a33d90db96238 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 10:51:32 -0600
Subject: Rename KLock and KTrader to avoid conflicts with KDE4

---
 tdecore/kapplication.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tdecore/kapplication.cpp')

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())
-- 
cgit v1.2.1