1 files changed, 11 insertions, 14 deletions

diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp
index 730a090f..be28b31b 100644
--- a/languages/cpp/backgroundparser.cpp
+++ b/languages/cpp/backgroundparser.cpp
@@ -77,9 +77,9 @@ public:
 		{
 			m_deadlock.unlock();
 			// GET LOCK
-			kapp->lock ();
+			tdeApp->lock ();
 			
-			//kdDebug(9007) << "-------> kapp locked" << endl;
+			//kdDebug(9007) << "-------> tdeApp locked" << endl;
 			
 			TQPtrList<KParts::Part> parts( *m_cppSupport->partController() ->parts() );
 			TQPtrListIterator<KParts::Part> it( parts );
@@ -94,15 +94,15 @@ public:
 				
 				contents = TQString( editIface->text().ascii() ); // deep copy
 				
-				//kdDebug(9007) << "-------> kapp unlocked" << endl;
+				//kdDebug(9007) << "-------> tdeApp unlocked" << endl;
 				
 				break;
 			}
 
 			// RELEASE LOCK
-			kapp->unlock();
+			tdeApp->unlock();
 			m_deadlock.lock();
-			//kdDebug(9007) << "-------> kapp unlocked" << endl;
+			//kdDebug(9007) << "-------> tdeApp unlocked" << endl;
 		}
 		
 		if( m_readFromDisk || contents == TQString() )
@@ -123,7 +123,7 @@ public:
 	{
 		bool ret = false;
 		m_deadlock.unlock();
-		kapp->lock ();
+		tdeApp->lock ();
 
 		KParts::ReadOnlyPart *part = m_cppSupport->partController()->partForURL( KURL(fileName) );
 		KTextEditor::Document * doc = dynamic_cast<KTextEditor::Document*>( part );
@@ -131,7 +131,7 @@ public:
 		if ( doc )
 			ret = doc->isModified();
 
-		kapp->unlock();
+		tdeApp->unlock();
 		m_deadlock.lock();
 		return ret;
 	}
@@ -182,14 +182,14 @@ public:
 	{
 		SafeString s( fileName.ascii() );
 		TQMutexLocker locker( &m_mutex );
-		m_fileList.push_front( tqMakePair( s, readFromDisk ) );
+		m_fileList.push_front( qMakePair( s, readFromDisk ) );
 	}
 
 	void push_back( const TQString& fileName, bool readFromDisk = false )
 	{
 	        SafeString s( fileName.ascii() );
 		TQMutexLocker locker( &m_mutex );
-		m_fileList.push_back( tqMakePair( s, readFromDisk ) );
+		m_fileList.push_back( qMakePair( s, readFromDisk ) );
 	}
 	
 	void pop_front()
@@ -475,11 +475,11 @@ void BackgroundParser::close()
 	m_close = true;
 	m_canParse.wakeAll();
   }
-	kapp->unlock();
+	tdeApp->unlock();
 	
 	while ( running() )
 		sleep( 1 );
-	kapp->lock();
+	tdeApp->lock();
 }
 
 bool BackgroundParser::filesInQueue()
@@ -547,6 +547,3 @@ void BackgroundParser::saveMemory() {
 	m_saveMemory = true; //Delay the operation
 	m_canParse.wakeAll();
 }
-
-
-//kate: indent-mode csands; tab-width 4; space-indent off;