Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

4 files changed, 31 insertions, 31 deletions

diff --git a/dcoprss/document.cpp b/dcoprss/document.cpp
index fb5cd904..46f63e5d 100644
--- a/dcoprss/document.cpp
+++ b/dcoprss/document.cpp
@@ -79,8 +79,8 @@ void RSSDocument::loadingComplete(Loader *ldr, Document doc, Status stat)
 		Image *img = m_Doc->image();
 		if ( img )
 		{
-			connect(img, TQT_SIGNAL(gotPixmap(const TQPixmap &)),
-				TQT_SLOT(pixmapLoaded(const TQPixmap &)));
+			connect(img, TQ_SIGNAL(gotPixmap(const TQPixmap &)),
+				TQ_SLOT(pixmapLoaded(const TQPixmap &)));
 			img->getPixmap();
 			pixmapUpdating(DCOPRef(this));
 		}
@@ -250,7 +250,7 @@ void RSSDocument::refresh()
 		kdDebug() << "Document going to refresh" << endl;
 		m_isLoading = true;
 		Loader *loader = Loader::create(this,
-			TQT_SLOT(loadingComplete(Loader *, Document, Status)));
+			TQ_SLOT(loadingComplete(Loader *, Document, Status)));
 		loader->loadFrom(KURL( m_Url ),  new FileRetriever());
 		documentUpdating(DCOPRef(this));
 	}
@@ -266,8 +266,8 @@ void RSSDocument::refresh()
 			Image *img = m_Doc->image();
 			if ( img )
 			{
-				connect(img, TQT_SIGNAL(gotPixmap(const TQPixmap &)),
-					TQT_SLOT(pixmapLoaded(const TQPixmap &)));
+				connect(img, TQ_SIGNAL(gotPixmap(const TQPixmap &)),
+					TQ_SLOT(pixmapLoaded(const TQPixmap &)));
 				img->getPixmap();
 				pixmapUpdating(DCOPRef(this));
 			}
diff --git a/dcoprss/feedbrowser.cpp b/dcoprss/feedbrowser.cpp
index 7ba86c51..6bee25e6 100644
--- a/dcoprss/feedbrowser.cpp
+++ b/dcoprss/feedbrowser.cpp
@@ -47,8 +47,8 @@ void CategoryItem::setOpen( bool open )
 void CategoryItem::populate()
 {
 	m_dcopIface = new DCOPRSSIface( this, "m_dcopIface" );
-	connect( m_dcopIface, TQT_SIGNAL( gotCategories( const TQStringList & ) ),
-	         this, TQT_SLOT( gotCategories( const TQStringList & ) ) );
+	connect( m_dcopIface, TQ_SIGNAL( gotCategories( const TQStringList & ) ),
+	         this, TQ_SLOT( gotCategories( const TQStringList & ) ) );
 	m_dcopIface->getCategories( m_category );
 }
 
@@ -92,8 +92,8 @@ FeedBrowserDlg::FeedBrowserDlg( TQWidget *parent, const char *name )
 	               Close, Close, true )
 {
 	m_dcopIface = new DCOPRSSIface( this, "m_dcopIface" );
-	connect( m_dcopIface, TQT_SIGNAL( gotCategories( const TQStringList & ) ),
-	         this, TQT_SLOT( gotTopCategories( const TQStringList & ) ) );
+	connect( m_dcopIface, TQ_SIGNAL( gotCategories( const TQStringList & ) ),
+	         this, TQ_SLOT( gotTopCategories( const TQStringList & ) ) );
 
 	TQVBox *mainWidget = makeVBoxMainWidget();
 
@@ -101,10 +101,10 @@ FeedBrowserDlg::FeedBrowserDlg( TQWidget *parent, const char *name )
 	m_feedList->setAllColumnsShowFocus( true );
 	m_feedList->setRootIsDecorated( true );
 	m_feedList->addColumn( i18n( "Name" ) );
-	connect( m_feedList, TQT_SIGNAL( executed( TQListViewItem * ) ),
-	         this, TQT_SLOT( itemSelected( TQListViewItem * ) ) );
-	connect( m_feedList, TQT_SIGNAL( returnPressed( TQListViewItem * ) ),
-	         this, TQT_SLOT( itemSelected( TQListViewItem * ) ) );
+	connect( m_feedList, TQ_SIGNAL( executed( TQListViewItem * ) ),
+	         this, TQ_SLOT( itemSelected( TQListViewItem * ) ) );
+	connect( m_feedList, TQ_SIGNAL( returnPressed( TQListViewItem * ) ),
+	         this, TQ_SLOT( itemSelected( TQListViewItem * ) ) );
 
 	resize( 500, 400 );
 
diff --git a/dcoprss/query.cpp b/dcoprss/query.cpp
index dcaa556e..dcd6e515 100644
--- a/dcoprss/query.cpp
+++ b/dcoprss/query.cpp
@@ -31,7 +31,7 @@ void SlotCaller::call( TQObject *object, const char *slot,
                        const KXMLRPC::Query::Result &result )
 {
 	SlotCaller caller;
-	connect( &caller, TQT_SIGNAL( signal( const KXMLRPC::Query::Result &) ),
+	connect( &caller, TQ_SIGNAL( signal( const KXMLRPC::Query::Result &) ),
 	         object, slot );
 	emit caller.signal( result );
 }
@@ -89,7 +89,7 @@ void QueryService::findFeeds( const TQString &query )
 	args << query << "headlines_rank";
 
 	cachedCall( "syndic8.FindFeeds", Server::toVariantList( args ),
-	            TQT_SLOT( slotFoundFeeds( const KXMLRPC::Query::Result & ) ) );
+	            TQ_SLOT( slotFoundFeeds( const KXMLRPC::Query::Result & ) ) );
 }
 
 void QueryService::findSites( const TQString& query )
@@ -97,7 +97,7 @@ void QueryService::findSites( const TQString& query )
 	kdDebug() << "QueryService::findSites()" << endl;
 
 	cachedCall( "syndic8.FindSites", Server::toVariantList( query ),
-	            TQT_SLOT( slotFoundFeeds( const KXMLRPC::Query::Result & ) ) );
+	            TQ_SLOT( slotFoundFeeds( const KXMLRPC::Query::Result & ) ) );
 }
 
 void QueryService::getFeedInfo( const TQVariant& ids )
@@ -105,7 +105,7 @@ void QueryService::getFeedInfo( const TQVariant& ids )
 	kdDebug() << "QueryService::getFeedInfo()" << endl;
 
 	cachedCall( "syndic8.GetFeedInfo", Server::toVariantList( ids ),
-	            TQT_SLOT( slotGotFeedInfo( const KXMLRPC::Query::Result & ) ) );
+	            TQ_SLOT( slotGotFeedInfo( const KXMLRPC::Query::Result & ) ) );
 }
 
 void QueryService::getCategories( const TQString &category )
@@ -114,12 +114,12 @@ void QueryService::getCategories( const TQString &category )
 
 	if ( category == "Top" ) {
 		cachedCall( "syndic8.GetCategoryRoots", Server::toVariantList( TQString::fromLatin1( "DMOZ" ) ),
-		            TQT_SLOT( slotGotCategories( const KXMLRPC::Query::Result & ) ) );
+		            TQ_SLOT( slotGotCategories( const KXMLRPC::Query::Result & ) ) );
 	} else {
 		TQStringList args;
 		args << "DMOZ" << category;
 		cachedCall( "syndic8.GetCategoryChildren", Server::toVariantList( args ),
-		            TQT_SLOT( slotGotCategories( const KXMLRPC::Query::Result & ) ) );
+		            TQ_SLOT( slotGotCategories( const KXMLRPC::Query::Result & ) ) );
 	}
 }
 
@@ -131,7 +131,7 @@ void QueryService::getFeedsInCategory( const TQString &category )
 	args << "DMOZ" << category;
 
 	cachedCall( "syndic8.GetFeedsInCategory", Server::toVariantList( args ),
-	            TQT_SLOT( slotGotFeedsInCategory( const KXMLRPC::Query::Result & ) ) );
+	            TQ_SLOT( slotGotFeedsInCategory( const KXMLRPC::Query::Result & ) ) );
 }
 
 void QueryService::slotFoundFeeds( const KXMLRPC::Query::Result &result )
diff --git a/dcoprss/xmlrpciface.cpp b/dcoprss/xmlrpciface.cpp
index e34907e2..7c868d50 100644
--- a/dcoprss/xmlrpciface.cpp
+++ b/dcoprss/xmlrpciface.cpp
@@ -55,12 +55,12 @@ void Query::call( const TQString &server, const TQString &method,
 	TDEIO::TransferJob *job = TDEIO::http_post( KURL( server ), postData, false );
 	job->addMetaData( "UserAgent", userAgent );
 	job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" );
-	connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ),
-	         this, TQT_SLOT( slotInfoMessage( TDEIO::Job *, const TQString & ) ) );
-	connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
-	         this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
-	connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-	         this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+	connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ),
+	         this, TQ_SLOT( slotInfoMessage( TDEIO::Job *, const TQString & ) ) );
+	connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+	         this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
+	connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+	         this, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
 }
 
 void Query::slotInfoMessage( TDEIO::Job *, const TQString &msg )
@@ -373,9 +373,9 @@ void Server::call( const TQString &method, const TQValueList<TQVariant> &args,
 	}
 
 	Query *query = Query::create( this );
-	connect( query, TQT_SIGNAL( infoMessage( const TQString & ) ),
-	         this, TQT_SIGNAL( infoMessage( const TQString & ) ) );
-	connect( query, TQT_SIGNAL( finished( const KXMLRPC::Query::Result & ) ),
+	connect( query, TQ_SIGNAL( infoMessage( const TQString & ) ),
+	         this, TQ_SIGNAL( infoMessage( const TQString & ) ) );
+	connect( query, TQ_SIGNAL( finished( const KXMLRPC::Query::Result & ) ),
 	         receiver, slot );
 	query->call( m_url.url(), method, args, m_userAgent );
 }
@@ -390,9 +390,9 @@ void Server::call( const TQString &method, const TQValueList<TQVariant> &args,
 	}
 
 	Query *query = Query::create( this );
-	connect( query, TQT_SIGNAL( infoMessage( const TQString &msg ) ),
+	connect( query, TQ_SIGNAL( infoMessage( const TQString &msg ) ),
 	         infoObject, infoSlot );
-	connect( query, TQT_SIGNAL( finished( const KXMLRPC::Query::Result & ) ),
+	connect( query, TQ_SIGNAL( finished( const KXMLRPC::Query::Result & ) ),
 	         receiver, slot );
 	query->call( m_url.url(), method, args, m_userAgent );
 }