diff options
Diffstat (limited to 'kontact/plugins')
-rw-r--r-- | kontact/plugins/kmail/kmail_plugin.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/knotes/knotetip.cpp | 4 | ||||
-rw-r--r-- | kontact/plugins/korganizer/korg_uniqueapp.cpp | 6 | ||||
-rw-r--r-- | kontact/plugins/korganizer/korganizerplugin.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/kpilot/summarywidget.cpp | 4 | ||||
-rw-r--r-- | kontact/plugins/newsticker/kcmkontactknt.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/newsticker/summarywidget.cpp | 8 | ||||
-rw-r--r-- | kontact/plugins/specialdates/sdsummarywidget.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/summary/summaryview_part.cpp | 4 | ||||
-rw-r--r-- | kontact/plugins/test/test_part.cpp | 8 | ||||
-rw-r--r-- | kontact/plugins/weather/summarywidget.cpp | 2 |
11 files changed, 22 insertions, 22 deletions
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 ); |