Use tdeApprename/tdeapp

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

14 files changed, 44 insertions, 44 deletions

diff --git a/kontact/DESIGN.dcopinteraction b/kontact/DESIGN.dcopinteraction
index f0350627a..7eb4e4129 100644
--- a/kontact/DESIGN.dcopinteraction
+++ b/kontact/DESIGN.dcopinteraction
@@ -20,12 +20,12 @@ Here are some code snippets that must go into the part (A) that wants to use "Fo
 
 * Constructor:
  m_foo_stub = 0L;
- kapp->dcopClient()->setNotifications( true );
- connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const QCString&)),
+ tdeApp->dcopClient()->setNotifications( true );
+ connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const QCString&)),
           this, TQ_SLOT( unregisteredFromDCOP( const QCString& )) );
 
 * Destructor:
- kapp->dcopClient()->setNotifications( false );
+ tdeApp->dcopClient()->setNotifications( false );
  delete m_foo_stub;
 
 [Note that setNotifications() is implemented with a refcount, this is the
diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp
index 904089cad..7fe8633ea 100644
--- a/kontact/interfaces/uniqueapphandler.cpp
+++ b/kontact/interfaces/uniqueapphandler.cpp
@@ -79,9 +79,9 @@ using namespace Kontact;
 int UniqueAppHandler::newInstance()
 {
   // This bit is duplicated from TDEUniqueApplication::newInstance()
-  if ( kapp->mainWidget() ) {
-    kapp->mainWidget()->show();
-    KWin::forceActiveWindow( kapp->mainWidget()->winId() );
+  if ( tdeApp->mainWidget() ) {
+    tdeApp->mainWidget()->show();
+    KWin::forceActiveWindow( tdeApp->mainWidget()->winId() );
     TDEStartupInfo::appStarted();
   }
 
@@ -105,7 +105,7 @@ bool UniqueAppHandler::process( const TQCString &fun, const TQByteArray &data,
     if ( !ds.atEnd() ) { // backwards compatibility
       TQCString asn_id;
       ds >> asn_id;
-      kapp->setStartupId( asn_id );
+      tdeApp->setStartupId( asn_id );
     }
 
     TQDataStream _replyStream( replyData, IO_WriteOnly );
@@ -148,15 +148,15 @@ UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, Plugin
     : TQObject( plugin ), mFactory( factory ), mPlugin( plugin )
 {
   // The app is running standalone if 1) that name is known to DCOP
-  mRunningStandalone = kapp->dcopClient()->isApplicationRegistered( plugin->name() );
+  mRunningStandalone = tdeApp->dcopClient()->isApplicationRegistered( plugin->name() );
 
   // and 2) it's not registered by kontact (e.g. in another plugin)
-  if ( mRunningStandalone && kapp->dcopClient()->findLocalClient( plugin->name() ) )
+  if ( mRunningStandalone && tdeApp->dcopClient()->findLocalClient( plugin->name() ) )
       mRunningStandalone = false;
 
   if ( mRunningStandalone ) {
-    kapp->dcopClient()->setNotifications( true );
-    connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+    tdeApp->dcopClient()->setNotifications( true );
+    connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
              this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
   } else {
     mFactory->createHandler( mPlugin );
@@ -166,7 +166,7 @@ UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, Plugin
 UniqueAppWatcher::~UniqueAppWatcher()
 {
   if ( mRunningStandalone )
-    kapp->dcopClient()->setNotifications( false );
+    tdeApp->dcopClient()->setNotifications( false );
 
   delete mFactory;
 }
@@ -174,11 +174,11 @@ UniqueAppWatcher::~UniqueAppWatcher()
 void UniqueAppWatcher::unregisteredFromDCOP( const TQCString& appId )
 {
   if ( appId == mPlugin->name() && mRunningStandalone ) {
-    disconnect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+    disconnect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
                 this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
     kdDebug(5601) << k_funcinfo << appId << endl;
     mFactory->createHandler( mPlugin );
-    kapp->dcopClient()->setNotifications( false );
+    tdeApp->dcopClient()->setNotifications( false );
     mRunningStandalone = false;
   }
 }
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index 1a8186940..f56bfabdb 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -203,7 +203,7 @@ int KMailUniqueAppHandler::newInstance()
 }
 
 bool KMailPlugin::queryClose() const {
-  KMailIface_stub stub( kapp->dcopClient(), "kmail", "KMailIface" );
+  KMailIface_stub stub( tdeApp->dcopClient(), "kmail", "KMailIface" );
   bool canClose=stub.canQueryClose();
   return canClose;
 }
diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp
index dfa469bc0..fe39868a3 100644
--- a/kontact/plugins/knotes/knotetip.cpp
+++ b/kontact/plugins/knotes/knotetip.cpp
@@ -184,11 +184,11 @@ void KNoteTip::setFilter( bool enable )
     return;
 
   if ( enable ) {
-    kapp->installEventFilter( this );
+    tdeApp->installEventFilter( this );
     TQApplication::setGlobalMouseTracking( true );
   } else {
     TQApplication::setGlobalMouseTracking( false );
-    kapp->removeEventFilter( this );
+    tdeApp->removeEventFilter( this );
   }
 
   mFilter = enable;
diff --git a/kontact/plugins/korganizer/korg_uniqueapp.cpp b/kontact/plugins/korganizer/korg_uniqueapp.cpp
index a3229cd8a..69ab8dc20 100644
--- a/kontact/plugins/korganizer/korg_uniqueapp.cpp
+++ b/kontact/plugins/korganizer/korg_uniqueapp.cpp
@@ -42,9 +42,9 @@ int KOrganizerUniqueAppHandler::newInstance()
 
   // Bring korganizer's plugin to front
   // This bit is duplicated from TDEUniqueApplication::newInstance()
-  if ( kapp->mainWidget() ) {
-    kapp->mainWidget()->show();
-    KWin::forceActiveWindow( kapp->mainWidget()->winId() );
+  if ( tdeApp->mainWidget() ) {
+    tdeApp->mainWidget()->show();
+    KWin::forceActiveWindow( tdeApp->mainWidget()->winId() );
     TDEStartupInfo::appStarted();
   }
 
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index 475c64a9f..72d78b688 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -238,7 +238,7 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event )
 }
 
 bool KOrganizerPlugin::queryClose() const {
-  KOrganizerIface_stub stub( kapp->dcopClient(), "korganizer", "KOrganizerIface" );
+  KOrganizerIface_stub stub( tdeApp->dcopClient(), "korganizer", "KOrganizerIface" );
   bool canClose=stub.canQueryClose();
   return (!canClose);
 }
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index cc91632f5..6a15dc096 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -113,13 +113,13 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   connect( mNoConnectionStartLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
            this, TQ_SLOT( startKPilot() ) );
 
-  if ( !kapp->dcopClient()->isApplicationRegistered( "kpilotDaemon" ) ) {
+  if ( !tdeApp->dcopClient()->isApplicationRegistered( "kpilotDaemon" ) ) {
     startKPilot();
   }
 
   connectDCOPSignal( 0, 0, "kpilotDaemonStatusDetails(TQDateTime,TQString,TQStringList,TQString,TQString,TQString,bool)",
                      "receiveDaemonStatusDetails(TQDateTime,TQString,TQStringList,TQString,TQString,TQString,bool)", false );
-	connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString & ) ), TQ_SLOT( slotAppRemoved( const TQCString& ) ) );
+	connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString & ) ), TQ_SLOT( slotAppRemoved( const TQCString& ) ) );
 }
 
 SummaryWidget::~SummaryWidget()
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index e186f2a13..84aaca95d 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -392,7 +392,7 @@ bool KCMKontactKNT::dcopActive() const
   TQString error;
   TQCString appID;
   bool isGood = true;
-  DCOPClient *client = kapp->dcopClient();
+  DCOPClient *client = tdeApp->dcopClient();
   if ( !client->isApplicationRegistered( "rssservice" ) ) {
     if ( TDEApplication::startServiceByDesktopName( "rssservice", TQStringList(), &error, &appID ) )
       isGood = false;
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index b7b3f8660..e209d031e 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -57,7 +57,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   TQCString appID;
 
   bool dcopAvailable = true;
-  if ( !kapp->dcopClient()->isApplicationRegistered( "rssservice" ) ) {
+  if ( !tdeApp->dcopClient()->isApplicationRegistered( "rssservice" ) ) {
     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 );
@@ -224,7 +224,7 @@ void SummaryWidget::updateView()
     mLabels.append( urlLabel );
 
     connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
-             kapp, TQ_SLOT( invokeBrowser( const TQString& ) ) );
+             tdeApp, TQ_SLOT( invokeBrowser( const TQString& ) ) );
     connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ),
              this, TQ_SLOT( rmbMenu( const TQString& ) ) );
 
@@ -253,7 +253,7 @@ void SummaryWidget::updateView()
       mLayout->addWidget( urlLabel );
 
       connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
-               kapp, TQ_SLOT( invokeBrowser( const TQString& ) ) );
+               tdeApp, TQ_SLOT( invokeBrowser( const TQString& ) ) );
       connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ),
                this, TQ_SLOT( rmbMenu( const TQString& ) ) );
 
@@ -300,7 +300,7 @@ void SummaryWidget::rmbMenu( const TQString& url )
   menu.insertItem( i18n( "Copy URL to Clipboard" ) );
   int id = menu.exec( TQCursor::pos() );
   if ( id != -1 )
-    kapp->clipboard()->setText( url, TQClipboard::Clipboard );
+    tdeApp->clipboard()->setText( url, TQClipboard::Clipboard );
 }
 
 bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index fb9167c65..ea783de86 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -558,7 +558,7 @@ void SDSummaryWidget::mailContact( const TQString &uid )
   TDEABC::StdAddressBook *ab = TDEABC::StdAddressBook::self( true );
   TQString email = ab->findByUid( uid ).fullEmail();
 
-  kapp->invokeMailer( email, TQString() );
+  tdeApp->invokeMailer( email, TQString() );
 }
 
 void SDSummaryWidget::viewContact( const TQString &uid )
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index 5c64d9348..0fea7ac8b 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -77,7 +77,7 @@ SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*,
 
   initGUI( core );
 
-  connect( kapp, TQ_SIGNAL( tdedisplayPaletteChanged() ), TQ_SLOT( slotAdjustPalette() ) );
+  connect( tdeApp, TQ_SIGNAL( tdedisplayPaletteChanged() ), TQ_SLOT( slotAdjustPalette() ) );
   slotAdjustPalette();
 
   setDate( TQDate::currentDate() );
@@ -311,7 +311,7 @@ void SummaryViewPart::slotTextChanged()
 
 void SummaryViewPart::slotAdjustPalette()
 {
-  mMainWidget->setPaletteBackgroundColor( kapp->palette().active().base() );
+  mMainWidget->setPaletteBackgroundColor( tdeApp->palette().active().base() );
 }
 
 void SummaryViewPart::setDate( const TQDate& newDate )
diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp
index 12a7b4833..0752a8369 100644
--- a/kontact/plugins/test/test_part.cpp
+++ b/kontact/plugins/test/test_part.cpp
@@ -53,14 +53,14 @@ TestPart::TestPart(TQObject *parent, const char *name) // ## parentWidget
 
   new KParts::SideBarExtension(new TQComboBox(this), this, "sbe");
 
-  kapp->dcopClient()->setNotifications( true );
-  connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString&)),
+  tdeApp->dcopClient()->setNotifications( true );
+  connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString&)),
            this, TQ_SLOT( unregisteredFromDCOP( const TQCString& )) );
 }
 
 TestPart::~TestPart()
 {
-  kapp->dcopClient()->setNotifications( false );
+  tdeApp->dcopClient()->setNotifications( false );
   delete m_kab_stub;
 }
 
@@ -92,7 +92,7 @@ bool TestPart::connectToAddressBook()
     }
     // TODO document the required named for the dcop interfaces e.g. "CalendarIface".
     TQCString dcopObjectId = "KAddressBookIface";
-    m_kab_stub = new KAddressBookIface_stub(kapp->dcopClient(), dcopService, dcopObjectId);
+    m_kab_stub = new KAddressBookIface_stub(tdeApp->dcopClient(), dcopService, dcopObjectId);
   }
   return m_kab_stub != 0L;
 }
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index 660cf3700..fb28ab335 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -52,7 +52,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   TQString error;
   TQCString appID;
   bool serviceAvailable = true;
-  if ( !kapp->dcopClient()->isApplicationRegistered( "KWeatherService" ) ) {
+  if ( !tdeApp->dcopClient()->isApplicationRegistered( "KWeatherService" ) ) {
     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 );
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index a354fa417..3fb4714b7 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -193,12 +193,12 @@ void MainWindow::initObject()
   // launch commandline specified module if any
   activatePluginModule();
 
-  if ( Prefs::lastVersionSeen() == kapp->aboutData()->version() ) {
+  if ( Prefs::lastVersionSeen() == tdeApp->aboutData()->version() ) {
     selectPlugin( mCurrentPlugin );
   }
 
   paintAboutScreen( introductionString() );
-  Prefs::setLastVersionSeen( kapp->aboutData()->version() );
+  Prefs::setLastVersionSeen( tdeApp->aboutData()->version() );
 }
 
 MainWindow::~MainWindow()
@@ -291,7 +291,7 @@ void MainWindow::paintAboutScreen( const TQString& msg )
   TQString location = locate( "data", "kontact/about/main.html" );
   TQString content = KPIM::kFileToString( location );
   content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
-  if ( kapp->reverseLayout() )
+  if ( tdeApp->reverseLayout() )
     content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
   else
     content = content.arg( "" );
@@ -802,7 +802,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
   }
 
   // store old focus widget
-  TQWidget *focusWidget = kapp->focusWidget();
+  TQWidget *focusWidget = tdeApp->focusWidget();
   if ( mCurrentPlugin && focusWidget ) {
     // save the focus widget only when it belongs to the activated part
     TQWidget *parent = focusWidget->parentWidget();
@@ -1084,7 +1084,7 @@ void MainWindow::slotOpenUrl( const KURL &url )
       if ( !url.query().isEmpty() ) {
         app = url.query().mid( 1 );
       }
-      kapp->invokeHelp( TQString(), app );
+      tdeApp->invokeHelp( TQString(), app );
     }
   } else {
     new KRun( url, this );
@@ -1133,8 +1133,8 @@ void MainWindow::saveProperties( TDEConfig *config )
 
 bool MainWindow::queryClose()
 {
-  //if ( kapp->sessionSaving() || mReallyClose )
-  if ( kapp->sessionSaving() )
+  //if ( tdeApp->sessionSaving() || mReallyClose )
+  if ( tdeApp->sessionSaving() )
     return true;
 
   bool localClose = true;
@@ -1178,7 +1178,7 @@ TQString MainWindow::introductionString()
       "<td><a href=\"%1\">%1</a><br><span id=\"subtext\"><nobr>%1</td></tr>"
       "</table>"
       "<p style=\"margin-bottom: 0px\"> <a href=\"%1\">Skip this introduction</a></p>" )
-      .arg( kapp->aboutData()->version() )
+      .arg( tdeApp->aboutData()->version() )
       .arg( i18n( "Kontact handles your e-mail, addressbook, calendar, to-do list and more." ) )
       .arg( "exec:/help?kontact" )
       .arg( iconSize )