TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 26 insertions, 26 deletions

diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp
index bef49af8..09015d7a 100644
--- a/kopete/plugins/statistics/statisticsplugin.cpp
+++ b/kopete/plugins/statistics/statisticsplugin.cpp
@@ -46,14 +46,14 @@ typedef KGenericFactory<StatisticsPlugin> StatisticsPluginFactory;
 static const KAboutData aboutdata("kopete_statistics", I18N_NOOP("Statistics") , "0.1" );
 K_EXPORT_COMPONENT_FACTORY( kopete_statistics, StatisticsPluginFactory( &aboutdata )  )
 
-StatisticsPlugin::StatisticsPlugin( TQObject *parent, const char *name, const TQStringList &)
+StatisticsPlugin::StatisticsPlugin( TQObject *tqparent, const char *name, const TQStringList &)
       : DCOPObject("StatisticsDCOPIface"), 
-        Kopete::Plugin( StatisticsPluginFactory::instance(), parent, name )
+        Kopete::Plugin( StatisticsPluginFactory::instance(), tqparent, name )
       
 
 {
 	KAction *viewMetaContactStatistics = new KAction( i18n("View &Statistics" ),
-		TQString::fromLatin1( "log" ), 0, this, TQT_SLOT(slotViewStatistics()),
+		TQString::tqfromLatin1( "log" ), 0, this, TQT_SLOT(slotViewStatistics()),
 		actionCollection(), "viewMetaContactStatistics" );
 	viewMetaContactStatistics->setEnabled(Kopete::ContactList::self()->selectedMetaContacts().count() == 1);
 
@@ -101,7 +101,7 @@ StatisticsPlugin::~StatisticsPlugin()
 
 void StatisticsPlugin::slotAboutToReceive(Kopete::Message& m)
 {
-	if ( statisticsMetaContactMap.contains(m.from()->metaContact()) )
+	if ( statisticsMetaContactMap.tqcontains(m.from()->metaContact()) )
 		statisticsMetaContactMap[m.from()->metaContact()]->newMessageReceived(m);
 }
 
@@ -118,7 +118,7 @@ void StatisticsPlugin::slotViewClosed(Kopete::ChatSession* session)
 	for (; it.current(); ++it)
 	{
 		// If this contact is not in other chat sessions
-		if (!it.current()->manager() && statisticsMetaContactMap.contains(it.current()->metaContact()))
+		if (!it.current()->manager() && statisticsMetaContactMap.tqcontains(it.current()->metaContact()))
 			statisticsMetaContactMap[it.current()->metaContact()]->setIsChatWindowOpen(false);
 	}
 }
@@ -129,7 +129,7 @@ void StatisticsPlugin::slotViewStatistics()
 	
 	kdDebug() << k_funcinfo << "statistics - dialog :"+ mc->displayName() << endl;
 	
-	if ( mc && statisticsMetaContactMap.contains(mc) )
+	if ( mc && statisticsMetaContactMap.tqcontains(mc) )
 	{
 		(new StatisticsDialog(statisticsMetaContactMap[mc], db()))->show();
 	}
@@ -137,7 +137,7 @@ void StatisticsPlugin::slotViewStatistics()
 
 void StatisticsPlugin::slotOnlineStatusChanged(Kopete::MetaContact *mc, Kopete::OnlineStatus::StatusType status)
 {
-	if ( statisticsMetaContactMap.contains(mc) )
+	if ( statisticsMetaContactMap.tqcontains(mc) )
 		statisticsMetaContactMap[mc]->onlineStatusChanged(status);
 }
 
@@ -164,7 +164,7 @@ void StatisticsPlugin::slotMetaContactAdded(Kopete::MetaContact *mc)
 
 void StatisticsPlugin::slotMetaContactRemoved(Kopete::MetaContact *mc)
 {
-	if (statisticsMetaContactMap.contains(mc))
+	if (statisticsMetaContactMap.tqcontains(mc))
 	{
 		StatisticsContact *sc = statisticsMetaContactMap[mc];
 		statisticsMetaContactMap.remove(mc);
@@ -175,7 +175,7 @@ void StatisticsPlugin::slotMetaContactRemoved(Kopete::MetaContact *mc)
 
 void StatisticsPlugin::slotContactAdded( Kopete::Contact *c)
 {
-	if (statisticsMetaContactMap.contains(c->metaContact()))
+	if (statisticsMetaContactMap.tqcontains(c->metaContact()))
 	{
 		StatisticsContact *sc = statisticsMetaContactMap[c->metaContact()];
 		sc->contactAdded(c);
@@ -185,7 +185,7 @@ void StatisticsPlugin::slotContactAdded( Kopete::Contact *c)
 
 void StatisticsPlugin::slotContactRemoved( Kopete::Contact *c)
 {
-	if (statisticsMetaContactMap.contains(c->metaContact()))
+	if (statisticsMetaContactMap.tqcontains(c->metaContact()))
 		statisticsMetaContactMap[c->metaContact()]->contactRemoved(c);
 	
 	statisticsContactMap.remove(c->contactId());
@@ -195,7 +195,7 @@ void StatisticsPlugin::dcopStatisticsDialog(TQString id)
 {
 	kdDebug() << k_funcinfo << "statistics - DCOP dialog :" << id << endl;
 	
-	if (statisticsContactMap.contains(id))
+	if (statisticsContactMap.tqcontains(id))
 	{
 		(new StatisticsDialog(statisticsContactMap[id], db()))->show();
 	}	
@@ -205,63 +205,63 @@ bool StatisticsPlugin::dcopWasOnline(TQString id, int timeStamp)
 {
 	TQDateTime dt;
 	dt.setTime_t(timeStamp);	
-	return dcopWasStatus(id, dt, Kopete::OnlineStatus::Online); 
+	return dcopWastqStatus(id, dt, Kopete::OnlineStatus::Online); 
 }
 
 bool StatisticsPlugin::dcopWasOnline(TQString id, TQString dateTime)
 {
-	return dcopWasStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Online);
+	return dcopWastqStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Online);
 }
 
 bool StatisticsPlugin::dcopWasAway(TQString id, int timeStamp)
 {
 	TQDateTime dt;
 	dt.setTime_t(timeStamp);	
-	return dcopWasStatus(id, dt, Kopete::OnlineStatus::Away); 
+	return dcopWastqStatus(id, dt, Kopete::OnlineStatus::Away); 
 }
 
 bool StatisticsPlugin::dcopWasAway(TQString id, TQString dateTime)
 {
-	return dcopWasStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Away);
+	return dcopWastqStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Away);
 }
 
 bool StatisticsPlugin::dcopWasOffline(TQString id, int timeStamp)
 {
 	TQDateTime dt;
 	dt.setTime_t(timeStamp);	
-	return dcopWasStatus(id, dt, Kopete::OnlineStatus::Offline); 
+	return dcopWastqStatus(id, dt, Kopete::OnlineStatus::Offline); 
 }
 
 bool StatisticsPlugin::dcopWasOffline(TQString id, TQString dateTime)
 {
-	return dcopWasStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Offline);
+	return dcopWastqStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Offline);
 }
 
-bool StatisticsPlugin::dcopWasStatus(TQString id, TQDateTime dateTime, Kopete::OnlineStatus::StatusType status)
+bool StatisticsPlugin::dcopWastqStatus(TQString id, TQDateTime dateTime, Kopete::OnlineStatus::StatusType status)
 {
 	kdDebug() << k_funcinfo << "statistics - DCOP wasOnline :" << id << endl;
 	
-	if (dateTime.isValid() && statisticsContactMap.contains(id))
+	if (dateTime.isValid() && statisticsContactMap.tqcontains(id))
 	{
-		return statisticsContactMap[id]->wasStatus(dateTime, status);
+		return statisticsContactMap[id]->wastqStatus(dateTime, status);
 	}
 	
 	return false;	
 }
 
-TQString StatisticsPlugin::dcopStatus(TQString id, int timeStamp)
+TQString StatisticsPlugin::dcoptqStatus(TQString id, int timeStamp)
 {
 	TQDateTime dt;
 	dt.setTime_t(timeStamp);
-	return dcopStatus(id, dt.toString());
+	return dcoptqStatus(id, dt.toString());
 
 }
 
-TQString StatisticsPlugin::dcopStatus(TQString id, TQString dateTime)
+TQString StatisticsPlugin::dcoptqStatus(TQString id, TQString dateTime)
 {
 	TQDateTime dt = TQDateTime::fromString(dateTime);
 	
-	if (dt.isValid() && statisticsContactMap.contains(id))
+	if (dt.isValid() && statisticsContactMap.tqcontains(id))
 	{
 		return statisticsContactMap[id]->statusAt(dt);
 	}
@@ -269,11 +269,11 @@ TQString StatisticsPlugin::dcopStatus(TQString id, TQString dateTime)
 	return "";
 }
 
-TQString StatisticsPlugin::dcopMainStatus(TQString id, int timeStamp)
+TQString StatisticsPlugin::dcopMaintqStatus(TQString id, int timeStamp)
 {
 	TQDateTime dt;
 	dt.setTime_t(timeStamp);
-	if (dt.isValid() && statisticsContactMap.contains(id))
+	if (dt.isValid() && statisticsContactMap.tqcontains(id))
 	{
 		return statisticsContactMap[id]->mainStatusDate(dt.date());
 	}