Use tdeApprename/tdeapp

Signed-off-by: Michele Calgaro <[email protected]>

7 files changed, 27 insertions, 27 deletions

diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index 48d3fae96..27359e5b8 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -473,7 +473,7 @@ TQString karmPart::taskIdFromName( const TQString &taskname ) const
 
 void karmPart::quit()
 {
-  // TODO: write something for kapp->quit();
+  // TODO: write something for tdeApp->quit();
 }
 
 bool karmPart::save()
diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp
index 92f69ff6d..84ac89302 100644
--- a/karm/karmstorage.cpp
+++ b/karm/karmstorage.cpp
@@ -35,7 +35,7 @@
 #include <tqstringlist.h>
 
 #include "incidence.h"
-#include "tdeapplication.h"       // kapp
+#include "tdeapplication.h"       // tdeApp
 #include <kdebug.h>
 #include <tdeemailsettings.h>
 #include <tdelocale.h>            // i18n
@@ -608,7 +608,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
   while ( tasknr < taskview->count() && !dialog.wasCancelled() )
   {
     dialog.progressBar()->advance( 1 );
-    if ( tasknr % 15 == 0 ) kapp->processEvents(); // repainting is slow
+    if ( tasknr % 15 == 0 ) tdeApp->processEvents(); // repainting is slow
     if ( taskview->item_at_index(tasknr)->depth() > maxdepth )
       maxdepth = taskview->item_at_index(tasknr)->depth();
     tasknr++;
@@ -620,7 +620,7 @@ TQString KarmStorage::exportcsvFile( TaskView *taskview,
   {
     task = taskview->item_at_index( tasknr );
     dialog.progressBar()->advance( 1 );
-    if ( tasknr % 15 == 0 ) kapp->processEvents();
+    if ( tasknr % 15 == 0 ) tdeApp->processEvents();
 
     // indent the task in the csv-file:
     for ( int i=0; i < task->depth(); ++i ) retval += delim;
@@ -1069,7 +1069,7 @@ bool KarmStorage::bookTime(const Task* task,
   e->setDtEnd( startDateTime.addSecs( durationInSeconds ) );
 
   // Use a custom property to keep a record of negative durations
-  e->setCustomProperty( kapp->instanceName(),
+  e->setCustomProperty( tdeApp->instanceName(),
       TQCString("duration"),
       TQString::number(durationInSeconds));
 
@@ -1095,7 +1095,7 @@ void KarmStorage::changeTime(const Task* task, const long deltaSeconds)
   e->setDtEnd(end);
 
   // Use a custom property to keep a record of negative durations
-  e->setCustomProperty( kapp->instanceName(),
+  e->setCustomProperty( tdeApp->instanceName(),
       TQCString("duration"),
       TQString::number(deltaSeconds));
 
@@ -1175,7 +1175,7 @@ TQValueList<HistoryEvent> KarmStorage::getHistory(const TQDate& from,
         // an easy fix for a (hopefully) rare situation.
         processed.append( (*event)->uid());
 
-        duration = (*event)->customProperty(kapp->instanceName(),
+        duration = (*event)->customProperty(tdeApp->instanceName(),
             TQCString("duration"));
         if ( ! duration.isNull() )
         {
diff --git a/karm/main.cpp b/karm/main.cpp
index ef4326dc0..cdc43e9d5 100644
--- a/karm/main.cpp
+++ b/karm/main.cpp
@@ -15,7 +15,7 @@ namespace
   void cleanup( int )
   {
     kdDebug(5970) << i18n("Just caught a software interrupt.") << endl;
-    kapp->exit();
+    tdeApp->exit();
   }
 }
 
@@ -79,7 +79,7 @@ int main( int argc, char *argv[] )
 
   myApp.setMainWidget( mainWindow );
 
-  if (kapp->isRestored() && TDEMainWindow::canBeRestored( 1 ))
+  if (tdeApp->isRestored() && TDEMainWindow::canBeRestored( 1 ))
     mainWindow->restore( 1, false );
   else
     mainWindow->show();
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index 6edc6b2df..26cab9b57 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -9,7 +9,7 @@
 #include <dcopclient.h>
 #include <tdeaccel.h>
 #include <tdeaction.h>
-#include <tdeapplication.h>       // kapp
+#include <tdeapplication.h>       // tdeApp
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeglobal.h>
@@ -93,10 +93,10 @@ MainWindow::MainWindow( const TQString &icsfile )
   slotSelectionChanged();
 
   // Register with DCOP
-  if ( !kapp->dcopClient()->isRegistered() ) 
+  if ( !tdeApp->dcopClient()->isRegistered() ) 
   {
-    kapp->dcopClient()->registerAs( "karm" );
-    kapp->dcopClient()->setDefaultObject( objId() );
+    tdeApp->dcopClient()->registerAs( "karm" );
+    tdeApp->dcopClient()->setDefaultObject( objId() );
   }
 
   // Set up DCOP error messages
@@ -161,7 +161,7 @@ void MainWindow::exportcsvHistory()
 
 void MainWindow::quit()
 {
-  kapp->quit();
+  tdeApp->quit();
 }
 
 
@@ -440,7 +440,7 @@ void MainWindow::loadGeometry()
   if (initialGeometrySet()) setAutoSaveSettings();
   else
   {
-    TDEConfig &config = *kapp->config();
+    TDEConfig &config = *tdeApp->config();
 
     config.setGroup( TQString::fromLatin1("Main Window Geometry") );
     int w = config.readNumEntry( TQString::fromLatin1("Width"), 100 );
@@ -463,7 +463,7 @@ void MainWindow::saveGeometry()
 
 bool MainWindow::queryClose()
 {
-  if ( !kapp->sessionSaving() ) {
+  if ( !tdeApp->sessionSaving() ) {
     hide();
     return false;
   }
diff --git a/karm/preferences.cpp b/karm/preferences.cpp
index e8a437ef5..1663af377 100644
--- a/karm/preferences.cpp
+++ b/karm/preferences.cpp
@@ -5,7 +5,7 @@
 #include <tqspinbox.h>
 #include <tqlayout.h>
 
-#include <tdeapplication.h>       // kapp
+#include <tdeapplication.h>       // tdeApp
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeemailsettings.h>
@@ -252,7 +252,7 @@ TQString Preferences::userRealName()                  const { return _userRealNa
 //---------------------------------------------------------------------------
 void Preferences::load()
 {
-  TDEConfig &config = *kapp->config();
+  TDEConfig &config = *tdeApp->config();
 
   config.setGroup( TQString::fromLatin1("Idle detection") );
   _doIdleDetectionV = config.readBoolEntry( TQString::fromLatin1("enabled"),
diff --git a/karm/task.cpp b/karm/task.cpp
index 88c0e099b..6b4d32839 100644
--- a/karm/task.cpp
+++ b/karm/task.cpp
@@ -5,7 +5,7 @@
 
 #include <kiconloader.h>
 
-#include "tdeapplication.h"       // kapp
+#include "tdeapplication.h"       // tdeApp
 #include "kdebug.h"
 
 #include "event.h"
@@ -306,15 +306,15 @@ KCal::Todo* Task::asTodo(KCal::Todo* todo) const
   // time the file is opened.
   // todo->setDtStart( current );
 
-  todo->setCustomProperty( kapp->instanceName(),
+  todo->setCustomProperty( tdeApp->instanceName(),
       TQCString( "totalTaskTime" ), TQString::number( _time ) );
-  todo->setCustomProperty( kapp->instanceName(),
+  todo->setCustomProperty( tdeApp->instanceName(),
       TQCString( "totalSessionTime" ), TQString::number( _sessionTime) );
 
   if (getDesktopStr().isEmpty())
-    todo->removeCustomProperty(kapp->instanceName(), TQCString("desktopList"));
+    todo->removeCustomProperty(tdeApp->instanceName(), TQCString("desktopList"));
   else
-    todo->setCustomProperty( kapp->instanceName(),
+    todo->setCustomProperty( tdeApp->instanceName(),
         TQCString( "desktopList" ), getDesktopStr() );
 
   todo->setOrganizer( Preferences::instance()->userRealName() );
@@ -336,18 +336,18 @@ bool Task::parseIncidence( KCal::Incidence* incident, long& minutes,
   _comment = incident->description();
 
   ok = false;
-  minutes = incident->customProperty( kapp->instanceName(),
+  minutes = incident->customProperty( tdeApp->instanceName(),
       TQCString( "totalTaskTime" )).toInt( &ok );
   if ( !ok )
     minutes = 0;
 
   ok = false;
-  sessionMinutes = incident->customProperty( kapp->instanceName(),
+  sessionMinutes = incident->customProperty( tdeApp->instanceName(),
       TQCString( "totalSessionTime" )).toInt( &ok );
   if ( !ok )
     sessionMinutes = 0;
 
-  TQString desktopList = incident->customProperty( kapp->instanceName(),
+  TQString desktopList = incident->customProperty( tdeApp->instanceName(),
       TQCString( "desktopList" ) );
   TQStringList desktopStrList = TQStringList::split( TQString::fromLatin1(","),
       desktopList );
diff --git a/karm/taskview.cpp b/karm/taskview.cpp
index ad0877f13..6fb09c38f 100644
--- a/karm/taskview.cpp
+++ b/karm/taskview.cpp
@@ -10,7 +10,7 @@
 #include <tqtimer.h>
 #include <tqxml.h>
 
-#include "tdeapplication.h"       // kapp
+#include "tdeapplication.h"       // tdeApp
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>