Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

8 files changed, 81 insertions, 81 deletions

diff --git a/knewsticker/common/newsengine.cpp b/knewsticker/common/newsengine.cpp
index 6f341c46..c5c44f04 100644
--- a/knewsticker/common/newsengine.cpp
+++ b/knewsticker/common/newsengine.cpp
@@ -49,14 +49,14 @@ NewsSourceBase::NewsSourceBase(const Data &nsd, ConfigIface *config)
 	m_cfg(dynamic_cast<ConfigAccess *>(config)),
 	m_newsIconMgr(NewsIconMgr::self())
 {
-	connect(this, TQT_SIGNAL(loadComplete(XMLNewsSource *, bool)),
-			TQT_SLOT(slotProcessArticles(XMLNewsSource *, bool)));
+	connect(this, TQ_SIGNAL(loadComplete(XMLNewsSource *, bool)),
+			TQ_SLOT(slotProcessArticles(XMLNewsSource *, bool)));
 }
 
 void NewsSourceBase::getIcon()
 {
-	connect(m_newsIconMgr, TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)),
-			this, TQT_SLOT(slotGotIcon(const KURL &, const TQPixmap &)));
+	connect(m_newsIconMgr, TQ_SIGNAL(gotIcon(const KURL &, const TQPixmap &)),
+			this, TQ_SLOT(slotGotIcon(const KURL &, const TQPixmap &)));
 	m_newsIconMgr->getIcon( KURL( m_data.icon ) );
 }
 
@@ -160,8 +160,8 @@ void NewsSourceBase::slotGotIcon(const KURL &url, const TQPixmap &pixmap)
 	if (url.url() == m_data.icon) {
 		m_icon = pixmap;
 
-		disconnect(m_newsIconMgr, TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)),
-			this, TQT_SLOT(slotGotIcon(const KURL &, const TQPixmap &)));
+		disconnect(m_newsIconMgr, TQ_SIGNAL(gotIcon(const KURL &, const TQPixmap &)),
+			this, TQ_SLOT(slotGotIcon(const KURL &, const TQPixmap &)));
 	}
 }
 
@@ -181,10 +181,10 @@ ProgramNewsSource::ProgramNewsSource(const NewsSourceBase::Data &nsd,
 	m_program(new TDEProcess()),
 	m_programOutput(0)
 {
-	connect(m_program, TQT_SIGNAL(processExited(TDEProcess *)),
-			TQT_SLOT(slotProgramExited(TDEProcess *)));
-	connect(m_program, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-			TQT_SLOT(slotGotProgramOutput(TDEProcess *, char *, int)));
+	connect(m_program, TQ_SIGNAL(processExited(TDEProcess *)),
+			TQ_SLOT(slotProgramExited(TDEProcess *)));
+	connect(m_program, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+			TQ_SLOT(slotGotProgramOutput(TDEProcess *, char *, int)));
 
 	m_data.sourceFile = KURL(m_data.sourceFile).encodedPathAndQuery();
 }
diff --git a/knewsticker/common/newsiconmgr.cpp b/knewsticker/common/newsiconmgr.cpp
index 4a2cb8d6..22525bc3 100644
--- a/knewsticker/common/newsiconmgr.cpp
+++ b/knewsticker/common/newsiconmgr.cpp
@@ -89,9 +89,9 @@ void NewsIconMgr::getIcon(const KURL &url)
 		}
 	} else {
 		TDEIO::Job *job = TDEIO::get(url, true, false);
-		connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-				TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
-		connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
+		connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+				TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+		connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *)));
 		
 		KIODownload download;
 		download.url = url;
diff --git a/knewsticker/common/xmlnewsaccess.cpp b/knewsticker/common/xmlnewsaccess.cpp
index b9d2ef3a..a49b96fc 100644
--- a/knewsticker/common/xmlnewsaccess.cpp
+++ b/knewsticker/common/xmlnewsaccess.cpp
@@ -62,9 +62,9 @@ void XMLNewsSource::loadFrom(const KURL &url)
 	TDEIO::Job *job = TDEIO::get(url, false, false);
 	job->addMetaData(TQString::fromLatin1("UserAgent"),
 	                 TQString::fromLatin1("KNewsTicker v0.2"));
-	connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-			TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
-	connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
+	connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+			TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+	connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *)));
 }
 
 void XMLNewsSource::slotData(TDEIO::Job *, const TQByteArray &data)
diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp
index 0d41c26e..dc71105f 100644
--- a/knewsticker/knewsticker.cpp
+++ b/knewsticker/knewsticker.cpp
@@ -50,13 +50,13 @@ KNewsTicker::KNewsTicker(const TQString &cfgFile, Type t, int actions, TQWidget
 	TQHBoxLayout *layout = new TQHBoxLayout(this);
 
 	m_contextMenu = new KNewsTickerMenu(this);
-	connect(m_contextMenu, TQT_SIGNAL(aboutToHide()),
-			TQT_SLOT(slotContextMenuAboutToHide()));
+	connect(m_contextMenu, TQ_SIGNAL(aboutToHide()),
+			TQ_SLOT(slotContextMenuAboutToHide()));
 	setCustomMenu(m_contextMenu);
 
 	m_arrowButton = new KArrowButton(this);
 	TQToolTip::add(m_arrowButton, i18n("Show menu"));
-	connect(m_arrowButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotArrowButtonPressed()));
+	connect(m_arrowButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotArrowButtonPressed()));
 	m_arrowButton->setFocusPolicy(TQWidget::NoFocus);
 	setupArrowButton();
 	layout->addWidget(m_arrowButton);
@@ -67,11 +67,11 @@ KNewsTicker::KNewsTicker(const TQString &cfgFile, Type t, int actions, TQWidget
 	m_dcopClient->registerAs("knewsticker", false);
 
 	TQToolTip::add(m_scroller, TQString());
-	connect(m_scroller, TQT_SIGNAL(contextMenu()), TQT_SLOT(slotOpenContextMenu()));
+	connect(m_scroller, TQ_SIGNAL(contextMenu()), TQ_SLOT(slotOpenContextMenu()));
 
-	connect(m_newsTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdateNews()));
+	connect(m_newsTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotUpdateNews()));
 
-	connect(m_updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotNotifyOfFailures()));
+	connect(m_updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotNotifyOfFailures()));
 
 	m_aboutData->addAuthor("Frerich Raabe", I18N_NOOP("Original author"),
 			"raabe@kde.org");
@@ -141,10 +141,10 @@ void KNewsTicker::reparseConfig()
 		if (!ns->data().enabled)
 			continue;
 
-		connect(ns, TQT_SIGNAL(newNewsAvailable(const NewsSourceBase::Ptr &, bool)),
-				TQT_SLOT(slotNewsSourceUpdated(const NewsSourceBase::Ptr &, bool)));
-		connect(ns, TQT_SIGNAL(invalidInput(const NewsSourceBase::Ptr &)),
-				TQT_SLOT(slotNewsSourceFailed(const NewsSourceBase::Ptr &)));
+		connect(ns, TQ_SIGNAL(newNewsAvailable(const NewsSourceBase::Ptr &, bool)),
+				TQ_SLOT(slotNewsSourceUpdated(const NewsSourceBase::Ptr &, bool)));
+		connect(ns, TQ_SIGNAL(invalidInput(const NewsSourceBase::Ptr &)),
+				TQ_SLOT(slotNewsSourceFailed(const NewsSourceBase::Ptr &)));
 		m_newsSources.append(ns);
 	}
 
@@ -429,7 +429,7 @@ void KNewsTickerMenu::populateMenu()
 		NewsSourceBase::Ptr ns = *nIt;
 
 		TDEPopupMenu *submenu = new TDEPopupMenu;
-		int checkNewsId = submenu->insertItem(lookIcon, i18n("Check News"), this, TQT_SLOT(slotCheckNews(int)), 0, sources.findIndex(ns) + 1000);
+		int checkNewsId = submenu->insertItem(lookIcon, i18n("Check News"), this, TQ_SLOT(slotCheckNews(int)), 0, sources.findIndex(ns) + 1000);
 		setItemParameter(checkNewsId, sources.findIndex(ns));
 
 		submenu->insertSeparator();
@@ -444,9 +444,9 @@ void KNewsTickerMenu::populateMenu()
 				TQString headline = a->headline().replace('&', "&&");
 				int id;
 				if ( a->read() )
-					id = submenu->insertItem(oldArticleIcon, headline, this, TQT_SLOT(slotOpenArticle(int)), 0, articleIdx+2000);
+					id = submenu->insertItem(oldArticleIcon, headline, this, TQ_SLOT(slotOpenArticle(int)), 0, articleIdx+2000);
 				else
-					id = submenu->insertItem(newArticleIcon, headline, this, TQT_SLOT(slotOpenArticle(int)), 0, articleIdx+2000);
+					id = submenu->insertItem(newArticleIcon, headline, this, TQ_SLOT(slotOpenArticle(int)), 0, articleIdx+2000);
 				kdDebug( 5005 ) << "Setting articles index for " << a->headline() << " to " << articleIdx << endl;
 				setItemParameter( id, articleIdx++ );
 			}
@@ -460,8 +460,8 @@ void KNewsTickerMenu::populateMenu()
 	if (!m_parent->m_cfg->newsSources().isEmpty())
 		insertSeparator();
 
-	insertItem(lookIcon, i18n("Check News"), m_parent, TQT_SLOT(slotUpdateNews()));
-	int i = insertItem(i18n("Offline Mode"), this, TQT_SLOT(slotToggleOfflineMode()), 0, 4711 );
+	insertItem(lookIcon, i18n("Check News"), m_parent, TQ_SLOT(slotUpdateNews()));
+	int i = insertItem(i18n("Offline Mode"), this, TQ_SLOT(slotToggleOfflineMode()), 0, 4711 );
 	setItemChecked(i, m_parent->m_cfg->offlineMode());
 
 	if (m_fullMenu) {
@@ -473,10 +473,10 @@ void KNewsTickerMenu::populateMenu()
 
 		insertTitle(logoIcon, i18n("KNewsTicker"), 0, 0);
 
-		insertItem(helpIcon, i18n("Help"), this, TQT_SLOT(slotShowHelp()));
-		insertItem(logoIcon, i18n("About KNewsTicker"), this, TQT_SLOT(slotShowAbout()));
+		insertItem(helpIcon, i18n("Help"), this, TQ_SLOT(slotShowHelp()));
+		insertItem(logoIcon, i18n("About KNewsTicker"), this, TQ_SLOT(slotShowAbout()));
 		insertSeparator();
-		insertItem(confIcon, i18n("Configure KNewsTicker..."), this, TQT_SLOT(slotConfigure()));
+		insertItem(confIcon, i18n("Configure KNewsTicker..."), this, TQ_SLOT(slotConfigure()));
 	}
 }
 
diff --git a/knewsticker/knewstickerconfig.cpp b/knewsticker/knewstickerconfig.cpp
index 0e558a1c..96457c36 100644
--- a/knewsticker/knewstickerconfig.cpp
+++ b/knewsticker/knewstickerconfig.cpp
@@ -109,31 +109,31 @@ KNewsTickerConfig::KNewsTickerConfig(ConfigAccess *cfg, TQWidget *parent,  const
 	m_child->lvNewsSources->viewport()->installEventFilter(this);
 	m_child->lvNewsSources->installEventFilter(this);
 
-	connect(m_newsIconMgr, TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), TQT_SLOT(slotGotNewsIcon(const KURL &, const TQPixmap &)));
-	connect(m_child->bChooseFont, TQT_SIGNAL(clicked()), TQT_SLOT(slotChooseFont()));
-
-	connect(m_child->lvNewsSources, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)),
-			TQT_SLOT(slotNewsSourceContextMenu(TDEListView *, TQListViewItem *, const TQPoint &)));
-	connect(m_child->lvNewsSources, TQT_SIGNAL(selectionChanged()),
-			TQT_SLOT(slotNewsSourceSelectionChanged()));
-	connect(m_child->lvNewsSources, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
-			TQT_SLOT(slotModifyNewsSource(TQListViewItem *, const TQPoint &, int)));
-	connect(m_child->bAddNewsSource, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddNewsSource()));
-	connect(m_child->bRemoveNewsSource, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveNewsSource()));
-	connect(m_child->bModifyNewsSource, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyNewsSource()));
-
-	connect(m_child->lvFilters, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
-			TQT_SLOT(slotFilterSelectionChanged(TQListViewItem *)));
-	connect(m_child->comboFilterAction, TQT_SIGNAL(activated(const TQString &)),
-			TQT_SLOT(slotFilterActionChanged(const TQString &)));
-	connect(m_child->comboFilterNewsSource, TQT_SIGNAL(activated(const TQString &)),
-			TQT_SLOT(slotFilterNewsSourceChanged(const TQString &)));
-	connect(m_child->comboFilterCondition, TQT_SIGNAL(activated(const TQString &)),
-			TQT_SLOT(slotFilterConditionChanged(const TQString &)));
-	connect(m_child->leFilterExpression, TQT_SIGNAL(textChanged(const TQString &)),
-			TQT_SLOT(slotFilterExpressionChanged(const TQString &)));
-	connect(m_child->bAddFilter, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddFilter()));
-	connect(m_child->bRemoveFilter, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveFilter()));
+	connect(m_newsIconMgr, TQ_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), TQ_SLOT(slotGotNewsIcon(const KURL &, const TQPixmap &)));
+	connect(m_child->bChooseFont, TQ_SIGNAL(clicked()), TQ_SLOT(slotChooseFont()));
+
+	connect(m_child->lvNewsSources, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)),
+			TQ_SLOT(slotNewsSourceContextMenu(TDEListView *, TQListViewItem *, const TQPoint &)));
+	connect(m_child->lvNewsSources, TQ_SIGNAL(selectionChanged()),
+			TQ_SLOT(slotNewsSourceSelectionChanged()));
+	connect(m_child->lvNewsSources, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
+			TQ_SLOT(slotModifyNewsSource(TQListViewItem *, const TQPoint &, int)));
+	connect(m_child->bAddNewsSource, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddNewsSource()));
+	connect(m_child->bRemoveNewsSource, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveNewsSource()));
+	connect(m_child->bModifyNewsSource, TQ_SIGNAL(clicked()), TQ_SLOT(slotModifyNewsSource()));
+
+	connect(m_child->lvFilters, TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+			TQ_SLOT(slotFilterSelectionChanged(TQListViewItem *)));
+	connect(m_child->comboFilterAction, TQ_SIGNAL(activated(const TQString &)),
+			TQ_SLOT(slotFilterActionChanged(const TQString &)));
+	connect(m_child->comboFilterNewsSource, TQ_SIGNAL(activated(const TQString &)),
+			TQ_SLOT(slotFilterNewsSourceChanged(const TQString &)));
+	connect(m_child->comboFilterCondition, TQ_SIGNAL(activated(const TQString &)),
+			TQ_SLOT(slotFilterConditionChanged(const TQString &)));
+	connect(m_child->leFilterExpression, TQ_SIGNAL(textChanged(const TQString &)),
+			TQ_SLOT(slotFilterExpressionChanged(const TQString &)));
+	connect(m_child->bAddFilter, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddFilter()));
+	connect(m_child->bRemoveFilter, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveFilter()));
 
 	load();
 
@@ -265,8 +265,8 @@ bool KNewsTickerConfig::eventFilter(TQObject *o, TQEvent *e)
 
 			NewsSourceBase::Data nsd(name, newSourceUrl, "" , NewsSourceBase::Computers , 10, true, false);
 			NewsSourceDlgImpl nsDlg(this, 0L, true);
-			connect(&nsDlg, TQT_SIGNAL(newsSource(const NewsSourceBase::Data &)),
-			TQT_SLOT(slotAddNewsSource(const NewsSourceBase::Data &)));
+			connect(&nsDlg, TQ_SIGNAL(newsSource(const NewsSourceBase::Data &)),
+			TQ_SLOT(slotAddNewsSource(const NewsSourceBase::Data &)));
 			nsDlg.setup(nsd, false);
 			nsDlg.exec();
 		}
@@ -402,8 +402,8 @@ void KNewsTickerConfig::slotChooseFont()
 void KNewsTickerConfig::slotAddNewsSource()
 {
 	NewsSourceDlgImpl nsDlg(this, 0L, true);
-	connect(&nsDlg, TQT_SIGNAL(newsSource(const NewsSourceBase::Data &)),
-			TQT_SLOT(slotAddNewsSource(const NewsSourceBase::Data &)));
+	connect(&nsDlg, TQ_SIGNAL(newsSource(const NewsSourceBase::Data &)),
+			TQ_SLOT(slotAddNewsSource(const NewsSourceBase::Data &)));
 	nsDlg.exec();
 }
 
@@ -460,8 +460,8 @@ void KNewsTickerConfig::modifyNewsSource(TQListViewItem *item)
 void KNewsTickerConfig::openModifyDialog()
 {
 	NewsSourceDlgImpl nsDlg(this, 0L, true);
-	connect(&nsDlg, TQT_SIGNAL(newsSource(const NewsSourceBase::Data &)),
-			TQT_SLOT(slotModifyNewsSource(const NewsSourceBase::Data &)));
+	connect(&nsDlg, TQ_SIGNAL(newsSource(const NewsSourceBase::Data &)),
+			TQ_SLOT(slotModifyNewsSource(const NewsSourceBase::Data &)));
 	nsDlg.setup(m_modifyItem->data(), true);
 	nsDlg.exec();
 }
diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
index 7f085134..f63a283f 100644
--- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
+++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
@@ -52,18 +52,18 @@ KntSrcFilePropsDlg::KntSrcFilePropsDlg(KPropertiesDialog *props)
 	: KPropsDlgPlugin(props)
 {
 	m_child = new KntSrcFilePropsDlgWidget(properties->addVBoxPage(i18n("News Resource")));
-	connect(m_child->urlName, TQT_SIGNAL(leftClickedURL(const TQString &)),
-	        TQT_SLOT(slotOpenURL(const TQString &)));
-	connect(m_child->lbArticles, TQT_SIGNAL(executed(TQListBoxItem *)),
-	        TQT_SLOT(slotClickedArticle(TQListBoxItem *)));
+	connect(m_child->urlName, TQ_SIGNAL(leftClickedURL(const TQString &)),
+	        TQ_SLOT(slotOpenURL(const TQString &)));
+	connect(m_child->lbArticles, TQ_SIGNAL(executed(TQListBoxItem *)),
+	        TQ_SLOT(slotClickedArticle(TQListBoxItem *)));
 
 	Loader *loader = Loader::create();
-	connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)),
-	        TQT_SLOT(slotConstructUI(Loader *, Document, Status)));
+	connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)),
+	        TQ_SLOT(slotConstructUI(Loader *, Document, Status)));
 	loader->loadFrom(props->item()->url(), new FileRetriever);
 
-	connect(NewsIconMgr::self(), TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)),
-	        TQT_SLOT(slotGotIcon(const KURL &, const TQPixmap &)));
+	connect(NewsIconMgr::self(), TQ_SIGNAL(gotIcon(const KURL &, const TQPixmap &)),
+	        TQ_SLOT(slotGotIcon(const KURL &, const TQPixmap &)));
 
 	m_child->show();
 }
diff --git a/knewsticker/newsscroller.cpp b/knewsticker/newsscroller.cpp
index c9df6429..5da27a1c 100644
--- a/knewsticker/newsscroller.cpp
+++ b/knewsticker/newsscroller.cpp
@@ -143,7 +143,7 @@ NewsScroller::NewsScroller(TQWidget *parent, ConfigAccess *cfg, const char *name
 	
 	m_headlines.setAutoDelete(true);
 
-	connect(m_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
+	connect(m_scrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()));
 
 	setAcceptDrops(true);
 	
diff --git a/knewsticker/newssourcedlgimpl.cpp b/knewsticker/newssourcedlgimpl.cpp
index 83fd6e04..df463422 100644
--- a/knewsticker/newssourcedlgimpl.cpp
+++ b/knewsticker/newssourcedlgimpl.cpp
@@ -42,16 +42,16 @@ SuggestProgressDlg::SuggestProgressDlg(const KURL &url, TQWidget *parent, const
 	m_progressBar->setPercentageVisible(false);
 
 	m_timeoutTimer = new TQTimer(this);
-	connect(m_timeoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeoutTick()));
+	connect(m_timeoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeoutTick()));
 	m_timeoutTimer->start(1000);
 
 	m_xmlSrc = new XMLNewsSource;
-	connect(m_xmlSrc, TQT_SIGNAL(loadComplete(XMLNewsSource *, bool)),
-	        this, TQT_SLOT(slotLoadComplete(XMLNewsSource *, bool)));
+	connect(m_xmlSrc, TQ_SIGNAL(loadComplete(XMLNewsSource *, bool)),
+	        this, TQ_SLOT(slotLoadComplete(XMLNewsSource *, bool)));
 	m_xmlSrc->loadFrom(url);
 
-	connect(NewsIconMgr::self(), TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)),
-	        this, TQT_SLOT(slotGotIcon(const KURL &, const TQPixmap &)));
+	connect(NewsIconMgr::self(), TQ_SIGNAL(gotIcon(const KURL &, const TQPixmap &)),
+	        this, TQ_SLOT(slotGotIcon(const KURL &, const TQPixmap &)));
 	KURL u = url;
 	if (url.isLocalFile())
 		u = TQString();
@@ -99,8 +99,8 @@ NewsSourceDlgImpl::NewsSourceDlgImpl(TQWidget *parent,  const char *name, bool m
 	: NewsSourceDlg(parent, name, modal, fl),
 	m_modified(false)
 {
-	connect(NewsIconMgr::self(), TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)),
-	        this, TQT_SLOT(slotGotIcon(const KURL &, const TQPixmap &)));
+	connect(NewsIconMgr::self(), TQ_SIGNAL(gotIcon(const KURL &, const TQPixmap &)),
+	        this, TQ_SLOT(slotGotIcon(const KURL &, const TQPixmap &)));
 
 	for (unsigned int i = 0; i < DEFAULT_SUBJECTS; i++)
 		comboCategory->insertItem(