Use tdeApprename/tdeapp

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

12 files changed, 23 insertions, 23 deletions

diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp
index defdecfac..a87249915 100644
--- a/libtdepim/addresseeview.cpp
+++ b/libtdepim/addresseeview.cpp
@@ -105,7 +105,7 @@ AddresseeView::AddresseeView( TQWidget *parent, const char *name,
   load();
 
   // set up IMProxy to display contacts' IM presence and make connections to keep the display live
-  mKIMProxy = ::KIMProxy::instance( kapp->dcopClient() );
+  mKIMProxy = ::KIMProxy::instance( tdeApp->dcopClient() );
   connect( mKIMProxy, TQ_SIGNAL( sigContactPresenceChanged( const TQString& ) ),
            this, TQ_SLOT( slotPresenceChanged( const TQString& ) ) );
   connect( mKIMProxy, TQ_SIGNAL( sigPresenceInfoExpired() ),
@@ -569,15 +569,15 @@ TDEABC::Addressee AddresseeView::addressee() const
 
 void AddresseeView::urlClicked( const TQString &url )
 {
-  kapp->invokeBrowser( url );
+  tdeApp->invokeBrowser( url );
 }
 
 void AddresseeView::emailClicked( const TQString &email )
 {
   if ( email.startsWith( "mailto:" ) )
-    kapp->invokeMailer( email.mid( 7 ), TQString() );
+    tdeApp->invokeMailer( email.mid( 7 ), TQString() );
   else
-    kapp->invokeMailer( email, TQString() );
+    tdeApp->invokeMailer( email, TQString() );
 }
 
 void AddresseeView::phoneNumberClicked( const TQString &number )
diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp
index 0695dfb19..e604bae93 100644
--- a/libtdepim/addressesdialog.cpp
+++ b/libtdepim/addressesdialog.cpp
@@ -972,7 +972,7 @@ AddressesDialog::ldapSearchResult()
 void
 AddressesDialog::launchAddressBook()
 {
-  kapp->startServiceByDesktopName( "kaddressbook", TQString() );
+  tdeApp->startServiceByDesktopName( "kaddressbook", TQString() );
 }
 
 void
diff --git a/libtdepim/alarmclient.cpp b/libtdepim/alarmclient.cpp
index 50e7b960c..14d0a58bb 100644
--- a/libtdepim/alarmclient.cpp
+++ b/libtdepim/alarmclient.cpp
@@ -40,7 +40,7 @@ AlarmClient::~AlarmClient()
 
 void AlarmClient::startDaemon()
 {
-  if ( kapp->dcopClient()->isApplicationRegistered( "korgac" ) ) {
+  if ( tdeApp->dcopClient()->isApplicationRegistered( "korgac" ) ) {
     // Alarm daemon already runs
     return;
   }
@@ -52,7 +52,7 @@ void AlarmClient::startDaemon()
   }
   else {
     TQString error;
-    if ( kapp->startServiceByDesktopPath( desktopFile, TQStringList(), &error ) != 0 )
+    if ( tdeApp->startServiceByDesktopPath( desktopFile, TQStringList(), &error ) != 0 )
       kdWarning() << "Failure starting korgac:" << error << endl;
   }
 }
diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp
index 8a3a25eb5..a38c8f1e1 100644
--- a/libtdepim/completionordereditor.cpp
+++ b/libtdepim/completionordereditor.cpp
@@ -297,7 +297,7 @@ void CompletionOrderEditor::slotOk()
     // Emit DCOP signal
     // The emitter is always set to KPIM::IMAPCompletionOrder, so that the connect works
     // This is why we can't use k_dcop_signals here, but need to use emitDCOPSignal
-    kapp->dcopClient()->emitDCOPSignal( "KPIM::IMAPCompletionOrder", "orderChanged()", TQByteArray() );
+    tdeApp->dcopClient()->emitDCOPSignal( "KPIM::IMAPCompletionOrder", "orderChanged()", TQByteArray() );
   }
   KDialogBase::slotOk();
 }
diff --git a/libtdepim/kaddrbook.cpp b/libtdepim/kaddrbook.cpp
index b32b017ed..cb831d419 100644
--- a/libtdepim/kaddrbook.cpp
+++ b/libtdepim/kaddrbook.cpp
@@ -58,13 +58,13 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) {
   TDEABC::Addressee::List addressees = ab->findByEmail( email );
 
   if ( addressees.count() > 0 ) {
-    if ( kapp->dcopClient()->isApplicationRegistered( "kaddressbook" ) ){
+    if ( tdeApp->dcopClient()->isApplicationRegistered( "kaddressbook" ) ){
       //make sure kaddressbook is loaded, otherwise showContactEditor
       //won't work as desired, see bug #87233
       DCOPRef call ( "kaddressbook", "kaddressbook" );
       call.send( "newInstance()" );
     }  else {
-      kapp->startServiceByDesktopName( "kaddressbook" );
+      tdeApp->startServiceByDesktopName( "kaddressbook" );
     }
 
     DCOPRef call( "kaddressbook", "KAddressBookIface" );
@@ -162,12 +162,12 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) {
 }
 
 void KAddrBookExternal::openAddressBook(TQWidget *) {
-  kapp->startServiceByDesktopName( "kaddressbook" );
+  tdeApp->startServiceByDesktopName( "kaddressbook" );
 }
 
 void KAddrBookExternal::addNewAddressee( TQWidget* )
 {
-  kapp->startServiceByDesktopName("kaddressbook");
+  tdeApp->startServiceByDesktopName("kaddressbook");
   DCOPRef call("kaddressbook", "KAddressBookIface");
   call.send("newContact()");
 }
diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp
index 44e7edddc..207fd845a 100644
--- a/libtdepim/kimportdialog.cpp
+++ b/libtdepim/kimportdialog.cpp
@@ -338,7 +338,7 @@ void KImportDialog::readFile( int rows )
     {
       progress->setValue(progressValue++);
       if (progressValue % 15 == 0) // try not to constantly repaint
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
     
     if (x == '\r') inputStream >> x; // eat '\r', to handle DOS/LOSEDOWS files correctly
@@ -572,7 +572,7 @@ void KImportDialog::assignTemplate()
   TQStringList templates;
 
   // load all template files
-  TQStringList list = TDEGlobal::dirs()->findAllResources( "data" , TQString( kapp->name() ) +
+  TQStringList list = TDEGlobal::dirs()->findAllResources( "data" , TQString( tdeApp->name() ) +
       "/csv-templates/*.desktop", true, true );
 
   for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it )
@@ -666,7 +666,7 @@ void KImportDialog::applyConverter()
     mCurrentRow = i;
     progress->setValue(i);
     if (i % 5 == 0)  // try to avoid constantly processing events
-      kapp->processEvents();
+      tdeApp->processEvents();
       
     convertRow();
   }
@@ -728,7 +728,7 @@ TQString KImportDialog::data( uint row, uint col )
 void KImportDialog::saveTemplate()
 {
   TQString fileName = KFileDialog::getSaveFileName(
-                      locateLocal( "data", TQString( kapp->name() ) + "/csv-templates/" ),
+                      locateLocal( "data", TQString( tdeApp->name() ) + "/csv-templates/" ),
                       "*.desktop", this );
 
   if ( fileName.isEmpty() )
diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp
index 3549a314d..82c6ef17f 100644
--- a/libtdepim/komposer/core/core.cpp
+++ b/libtdepim/komposer/core/core.cpp
@@ -238,7 +238,7 @@ Core::initCore()
 void
 Core::initConnections()
 {
-  connect( kapp, TQ_SIGNAL(shutDown()),
+  connect( tdeApp, TQ_SIGNAL(shutDown()),
            TQ_SLOT(slotQuit()) );
 }
 
diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp
index 8c4e025d8..15218eacf 100644
--- a/libtdepim/komposer/core/pluginmanager.cpp
+++ b/libtdepim/komposer/core/pluginmanager.cpp
@@ -74,7 +74,7 @@ PluginManager::PluginManager( TQObject *parent )
   // can remain in control when all windows are removed.
   // This way we can unload plugins asynchronously, which is more
   // robust if they are still doing processing.
-  kapp->ref();
+  tdeApp->ref();
   d->shutdownMode = Private::StartingUp;
 
   KSettings::Dispatcher::self()->registerInstance( TDEGlobal::instance(),
@@ -216,7 +216,7 @@ PluginManager::slotShutdownDone()
 {
   d->shutdownMode = Private::DoneShutdown;
 
-  kapp->deref();
+  tdeApp->deref();
 }
 
 void
diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp
index 26cc3d24e..920b5a35c 100644
--- a/libtdepim/ldapsearchdialog.cpp
+++ b/libtdepim/ldapsearchdialog.cpp
@@ -459,7 +459,7 @@ TQString LDAPSearchDialog::selectedEMails() const
 
 void LDAPSearchDialog::slotHelp()
 {
-  kapp->invokeHelp( "ldap-queries" );
+  tdeApp->invokeHelp( "ldap-queries" );
 }
 
 void LDAPSearchDialog::slotUser1()
diff --git a/libtdepim/maillistdrag.cpp b/libtdepim/maillistdrag.cpp
index b269efe08..adc7962a9 100644
--- a/libtdepim/maillistdrag.cpp
+++ b/libtdepim/maillistdrag.cpp
@@ -248,7 +248,7 @@ TQByteArray MailListDrag::encodedData(const char *mimeType) const
                 break;
             }
             dlg->progressBar()->setValue(++i);
-            kapp->eventLoop()->processEvents(TQEventLoop::ExcludeSocketNotifiers);
+            tdeApp->eventLoop()->processEvents(TQEventLoop::ExcludeSocketNotifiers);
         }
 
         delete dlg;
diff --git a/libtdepim/tdeconfigwizard.cpp b/libtdepim/tdeconfigwizard.cpp
index 7b982aea1..026a8dd00 100644
--- a/libtdepim/tdeconfigwizard.cpp
+++ b/libtdepim/tdeconfigwizard.cpp
@@ -167,7 +167,7 @@ void TDEConfigWizard::readConfig()
            "configured by the wizard do not run in parallel to the wizard; "
            "otherwise, changes done by the wizard could be lost."),
       i18n("Warning"), i18n("Run Wizard Now"), "warning_running_instances" );
-  if ( result != KMessageBox::Continue ) kapp->quit();
+  if ( result != KMessageBox::Continue ) tdeApp->quit();
 
   usrReadConfig();
 }
diff --git a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
index 4d37dc953..f1e4f941c 100644
--- a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
+++ b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
@@ -39,7 +39,7 @@ void KPartsGenericPart::load()
         return; // not enough info yet
     // Here it crashes in KSycoca::openDatabase when trying to load the stuff from designer itself
     // Not sure why - but it's not really needed anyway.
-    if ( !kapp )
+    if ( !tdeApp )
         return;
     TQString mimetype = m_mimetype;
     if ( mimetype == "auto" )