From d6d75dc9ff326e0bd6fc673adae71d53277fb8e4 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 20 Jan 2013 00:23:08 -0600
Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4

---
 kontact/src/mainwindow.cpp     | 10 +++++-----
 kontact/src/profilemanager.cpp |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kontact/src')

diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 41e026a6..307f1c4b 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -787,12 +787,12 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
     return;
   }
 
-  KApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) );
+  TDEApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) );
 
   KParts::Part *part = plugin->part();
 
   if ( !part ) {
-    KApplication::restoreOverrideCursor();
+    TDEApplication::restoreOverrideCursor();
     KMessageBox::error( this, i18n( "Cannot load part for %1." )
                               .arg( plugin->title() )
                         + "\n" + lastErrorMessage() );
@@ -894,7 +894,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
     }
   }
 
-  KApplication::restoreOverrideCursor();
+  TDEApplication::restoreOverrideCursor();
 }
 
 void MainWindow::selectPlugin( const TQString &pluginName )
@@ -1027,14 +1027,14 @@ void MainWindow::updateConfig()
 
 void MainWindow::showAboutDialog()
 {
-  KApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) );
+  TDEApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) );
 
   if ( !mAboutDialog )
     mAboutDialog = new AboutDialog( this );
 
   mAboutDialog->show();
   mAboutDialog->raise();
-  KApplication::restoreOverrideCursor();
+  TDEApplication::restoreOverrideCursor();
 }
 
 void MainWindow::configureShortcuts()
diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp
index 67f1bd19..d929bcb3 100644
--- a/kontact/src/profilemanager.cpp
+++ b/kontact/src/profilemanager.cpp
@@ -331,7 +331,7 @@ TQString Kontact::ProfileManager::generateNewId() const
 {
     while ( true )
     {
-        const TQString newId = KApplication::randomString( 10 );
+        const TQString newId = TDEApplication::randomString( 10 );
         if ( !m_profiles.contains( newId ) )
             return newId;
     }
-- 
cgit v1.2.3