summaryrefslogtreecommitdiffstats
path: root/kontact/plugins/newsticker
diff options
context:
space:
mode:
Diffstat (limited to 'kontact/plugins/newsticker')
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.cpp36
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.h4
-rw-r--r--kontact/plugins/newsticker/newsticker_plugin.cpp2
-rw-r--r--kontact/plugins/newsticker/summarywidget.cpp24
-rw-r--r--kontact/plugins/newsticker/summarywidget.h2
5 files changed, 34 insertions, 34 deletions
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 179baed3..84aaca95 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -45,11 +45,11 @@
#include "newsfeeds.h"
-#include <kdemacros.h>
+#include <tdemacros.h>
extern "C"
{
- KDE_EXPORT TDECModule *create_kontactknt( TQWidget *parent, const char * )
+ TDE_EXPORT TDECModule *create_kontactknt( TQWidget *parent, const char * )
{
return new KCMKontactKNT( parent, "kcmkontactknt" );
}
@@ -80,10 +80,10 @@ NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWi
mTitle->setText( title );
mURL->setText( url );
mTitle->setFocus();
- connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( modified() ) );
- connect( mURL, TQT_SIGNAL( textChanged( const TQString& ) ),
- this, TQT_SLOT( modified() ) );
+ connect( mTitle, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( modified() ) );
+ connect( mURL, TQ_SIGNAL( textChanged( const TQString& ) ),
+ this, TQ_SLOT( modified() ) );
modified();
}
@@ -133,18 +133,18 @@ KCMKontactKNT::KCMKontactKNT( TQWidget *parent, const char *name )
{
initGUI();
- connect( mAllNews, TQT_SIGNAL( currentChanged( TQListViewItem* ) ),
- this, TQT_SLOT( allCurrentChanged( TQListViewItem* ) ) );
- connect( mSelectedNews, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
- this, TQT_SLOT( selectedChanged( TQListViewItem* ) ) );
+ connect( mAllNews, TQ_SIGNAL( currentChanged( TQListViewItem* ) ),
+ this, TQ_SLOT( allCurrentChanged( TQListViewItem* ) ) );
+ connect( mSelectedNews, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ),
+ this, TQ_SLOT( selectedChanged( TQListViewItem* ) ) );
- connect( mUpdateInterval, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) );
- connect( mArticleCount, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) );
+ connect( mUpdateInterval, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) );
+ connect( mArticleCount, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) );
- connect( mAddButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addNews() ) );
- connect( mRemoveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeNews() ) );
- connect( mNewButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( newFeed() ) );
- connect( mDeleteButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteFeed() ) );
+ connect( mAddButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addNews() ) );
+ connect( mRemoveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeNews() ) );
+ connect( mNewButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( newFeed() ) );
+ connect( mDeleteButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deleteFeed() ) );
TDEAcceleratorManager::manage( this );
@@ -356,7 +356,7 @@ void KCMKontactKNT::initGUI()
mSelectedNews->setFullWidth( true );
layout->addWidget( mSelectedNews, 0, 2 );
- TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical,
+ TQGroupBox *box = new TQGroupBox( 0, TQt::Vertical,
i18n( "News Feed Settings" ), this );
TQGridLayout *boxLayout = new TQGridLayout( box->layout(), 2, 3,
@@ -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/kcmkontactknt.h b/kontact/plugins/newsticker/kcmkontactknt.h
index a44cae7f..9227cb54 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.h
+++ b/kontact/plugins/newsticker/kcmkontactknt.h
@@ -37,7 +37,7 @@ class NewsItem;
class KCMKontactKNT : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -85,7 +85,7 @@ class KCMKontactKNT : public TDECModule
class NewsEditDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/newsticker/newsticker_plugin.cpp b/kontact/plugins/newsticker/newsticker_plugin.cpp
index 04d46883..62d27fc8 100644
--- a/kontact/plugins/newsticker/newsticker_plugin.cpp
+++ b/kontact/plugins/newsticker/newsticker_plugin.cpp
@@ -32,7 +32,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_newstickerplugin,
NewsTickerPluginFactory( "kontact_newstickerplugin" ) )
NewsTickerPlugin::NewsTickerPlugin( Kontact::Core *core, const char *name, const TQStringList& )
- : Kontact::Plugin( core, TQT_TQOBJECT(core), name )
+ : Kontact::Plugin( core, core, name )
{
setInstance( NewsTickerPluginFactory::instance() );
}
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index f385b269..e209d031 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 );
@@ -68,7 +68,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
mBaseWidget = new TQWidget( this, "baseWidget" );
vlay->addWidget( mBaseWidget );
- connect( &mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateDocuments() ) );
+ connect( &mTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( updateDocuments() ) );
readConfig();
@@ -223,10 +223,10 @@ void SummaryWidget::updateView()
urlLabel->setMaximumSize( urlLabel->minimumSizeHint() );
mLabels.append( urlLabel );
- connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- kapp, TQT_SLOT( invokeBrowser( const TQString& ) ) );
- connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
- this, TQT_SLOT( rmbMenu( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ tdeApp, TQ_SLOT( invokeBrowser( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ),
+ this, TQ_SLOT( rmbMenu( const TQString& ) ) );
// header
TQLabel *label = new TQLabel( hbox );
@@ -252,10 +252,10 @@ void SummaryWidget::updateView()
mLabels.append( urlLabel );
mLayout->addWidget( urlLabel );
- connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
- kapp, TQT_SLOT( invokeBrowser( const TQString& ) ) );
- connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
- this, TQT_SLOT( rmbMenu( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+ tdeApp, TQ_SLOT( invokeBrowser( const TQString& ) ) );
+ connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ),
+ this, TQ_SLOT( rmbMenu( const TQString& ) ) );
numArticles++;
@@ -300,13 +300,13 @@ 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 )
{
if ( obj->inherits( "KURLLabel" ) ) {
- KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
+ KURLLabel* label = static_cast<KURLLabel*>( obj );
if ( e->type() == TQEvent::Enter )
emit message( label->url() );
if ( e->type() == TQEvent::Leave )
diff --git a/kontact/plugins/newsticker/summarywidget.h b/kontact/plugins/newsticker/summarywidget.h
index c5122fb8..2363dcc4 100644
--- a/kontact/plugins/newsticker/summarywidget.h
+++ b/kontact/plugins/newsticker/summarywidget.h
@@ -55,7 +55,7 @@ typedef TQValueList<Feed> FeedList;
class SummaryWidget : public Kontact::Summary, public DCOPObject
{
- Q_OBJECT
+ TQ_OBJECT
//
K_DCOP