Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 18 insertions, 18 deletions

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"),
 			"[email protected]");
@@ -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()));
 	}
 }