Rename KApplication to TDEApplication to avoid conflicts with KDE4

8 files changed, 12 insertions, 12 deletions

diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp
index 38ae51b3b..04e5a9e23 100644
--- a/kontact/interfaces/uniqueapphandler.cpp
+++ b/kontact/interfaces/uniqueapphandler.cpp
@@ -197,7 +197,7 @@ void Kontact::UniqueAppHandler::loadKontactCommandLineOptions()
 {
   TDECmdLineArgs::addCmdLineOptions( options );
   KUniqueApplication::addCmdLineOptions();
-  KApplication::addCmdLineOptions();
+  TDEApplication::addCmdLineOptions();
 }
 
 #include "uniqueapphandler.moc"
diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index a66aa4c1b..0e5d806ba 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -201,7 +201,7 @@ TQString KNotesPart::newNote( const TQString& name, const TQString& text )
 
 TQString KNotesPart::newNoteFromClipboard( const TQString& name )
 {
-  const TQString& text = KApplication::clipboard()->text();
+  const TQString& text = TDEApplication::clipboard()->text();
   return newNote( name, text );
 }
 
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index d2180a634..b31849431 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -222,7 +222,7 @@ void SummaryWidget::startKPilot()
 {
   TQString error;
   TQCString appID;
-  if ( !KApplication::tdeinitExec( "kpilotDaemon", TQString( "--fail-silently" ) ) ) {
+  if ( !TDEApplication::tdeinitExec( "kpilotDaemon", TQString( "--fail-silently" ) ) ) {
     kdDebug(5602) << "No service available..." << endl;
     mStartedDaemon = true;
   }
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 50aa975fe..cfcbc43d2 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -394,7 +394,7 @@ bool KCMKontactKNT::dcopActive() const
   bool isGood = true;
   DCOPClient *client = kapp->dcopClient();
   if ( !client->isApplicationRegistered( "rssservice" ) ) {
-    if ( KApplication::startServiceByDesktopName( "rssservice", TQStringList(), &error, &appID ) )
+    if ( TDEApplication::startServiceByDesktopName( "rssservice", TQStringList(), &error, &appID ) )
       isGood = false;
   }
 
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index ecd70a1e1..92207c1ed 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -58,7 +58,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
 
   bool dcopAvailable = true;
   if ( !kapp->dcopClient()->isApplicationRegistered( "rssservice" ) ) {
-    if ( KApplication::startServiceByDesktopName( "rssservice", TQStringList(), &error, &appID ) ) {
+    if ( TDEApplication::startServiceByDesktopName( "rssservice", TQStringList(), &error, &appID ) ) {
       TQLabel *label = new TQLabel( i18n( "No rss dcop service available.\nYou need rssservice to use this plugin." ), this );
       vlay->addWidget( label, TQt::AlignHCenter );
       dcopAvailable = false;
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index fb8bd9510..63c7c8977 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -53,7 +53,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   TQCString appID;
   bool serviceAvailable = true;
   if ( !kapp->dcopClient()->isApplicationRegistered( "KWeatherService" ) ) {
-    if ( KApplication::startServiceByDesktopName( "kweatherservice", TQStringList(), &error, &appID ) ) {
+    if ( TDEApplication::startServiceByDesktopName( "kweatherservice", TQStringList(), &error, &appID ) ) {
       TQLabel *label = new TQLabel( i18n( "No weather dcop service available;\nyou need KWeather to use this plugin." ), this );
       mLayout->addWidget( label, TQt::AlignHCenter | AlignVCenter );
       serviceAvailable = false;
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 41e026a69..307f1c4b8 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 67f1bd198..d929bcb3a 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;
     }