TQt4 port ktorrent

This enables compilation under both Qt3 and Qt4


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

1 files changed, 16 insertions, 16 deletions

diff --git a/estimation-scripts/enable-logging.diff b/estimation-scripts/enable-logging.diff
index 57dc703..b199bca 100644
--- a/estimation-scripts/enable-logging.diff
+++ b/estimation-scripts/enable-logging.diff
@@ -16,8 +16,8 @@ Index: estimation-scripts/enable-logging.diff
 - using namespace bt;
 - 
 -@@ -77,6 +78,9 @@
-- KTorrentViewItem::KTorrentViewItem(QListView* parent,bt::TorrentControl* tc)
-- 	: KListViewItem(parent),tc(tc)
+- KTorrentViewItem::KTorrentViewItem(QListView* tqparent,bt::TorrentControl* tc)
+- 	: KListViewItem(tqparent),tc(tc)
 - {
 -+	toLog = true;
 -+	counter = 1;
@@ -32,7 +32,7 @@ Index: estimation-scripts/enable-logging.diff
 -+	bool tmpLog = true;
 - 	/*
 - 	addColumn(i18n("File"));
-- 	addColumn(i18n("Status"));
+- 	addColumn(i18n("tqStatus"));
 -@@ -114,8 +119,43 @@
 - 	setText(6,KBytesPerSecToString(tc->getUploadRate() / 1024.0));
 -   
@@ -45,7 +45,7 @@ Index: estimation-scripts/enable-logging.diff
 -+ 		{
 -+ 			if(!started)
 -+ 			{
--+ 				Out() << "{" << tc->getTorrentName() << "}," << QDateTime::currentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",ACTIVATED" << endl;
+-+ 				Out() << "{" << tc->getTorrentName() << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",ACTIVATED" << endl;
 -+ 				tmpLog = false;
 -+ 				started = true;
 -+ 				toLog = true;
@@ -56,7 +56,7 @@ Index: estimation-scripts/enable-logging.diff
 -+ 		{
 -+ 			if(started)
 -+ 			{
--+ 				Out() << "{" << tc->getTorrentName() << "}," << QDateTime::currentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",DEACTIVATED" <<endl;
+-+ 				Out() << "{" << tc->getTorrentName() << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",DEACTIVATED" <<endl;
 -+ 				tmpLog = false;
 -+ 				started = false;
 -+ 			}
@@ -71,7 +71,7 @@ Index: estimation-scripts/enable-logging.diff
 - 	if (tc->getBytesLeft() == 0)
 - 	{
 -+ 		if(toLog && tmpLog) 
--+ 			Out() << "{" << tc->getTorrentName() << "}," << QDateTime::currentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << 0 << "," << tc->getNumPeers() << ",FINISHED" << endl;
+-+ 			Out() << "{" << tc->getTorrentName() << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << 0 << "," << tc->getNumPeers() << ",FINISHED" << endl;
 -+ 		toLog = false;
 -+
 - 		setText(7,i18n("finished"));
@@ -83,13 +83,13 @@ Index: estimation-scripts/enable-logging.diff
 - 			if (tc->getDownloadRate() == 0)
 -+			{
 -+ 				if(toLog && tmpLog) 
--+ 					Out() << "{" << tc->getTorrentName() << "}," << QDateTime::currentDateTime().toTime_t() << "," << 0 << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",RUNNING" << endl;
+-+ 					Out() << "{" << tc->getTorrentName() << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << 0 << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",RUNNING" << endl;
 - 				setText(7,i18n("infinity"));
 -+			}
 - 			else
 - 			{
 -+				if(toLog && tmpLog) 
--+ 					Out() << "{" << tc->getTorrentName() << "}," << QDateTime::currentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",RUNNING" << endl;
+-+ 					Out() << "{" << tc->getTorrentName() << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << tc->getDownloadRate() << "," << tc->getBytesDownloaded() << "," << tc->getBytesLeft() << "," << tc->getNumPeers() << ",RUNNING" << endl;
 -+
 - 				Uint32 secs = (int)floor( (float)tc->getBytesLeft() / (float)tc->getDownloadRate() );
 - 				QTime t;
@@ -125,8 +125,8 @@ Index: apps/ktorrent/ktorrentviewitem.cpp
  using namespace kt;
  
 @@ -78,6 +81,9 @@
- KTorrentViewItem::KTorrentViewItem(QListView* parent,TorrentInterface* tc)
- 	: KListViewItem(parent),tc(tc)
+ KTorrentViewItem::KTorrentViewItem(QListView* tqparent,TorrentInterface* tc)
+ 	: KListViewItem(tqparent),tc(tc)
  {
 +	toLog = true;
 +	counter = 1;
@@ -141,7 +141,7 @@ Index: apps/ktorrent/ktorrentviewitem.cpp
 +	bool tmpLog = true;
  	/*
  	addColumn(i18n("File"));
- 	addColumn(i18n("Status"));
+ 	addColumn(i18n("tqStatus"));
 @@ -114,8 +121,46 @@
  	setText(6,KBytesPerSecToString(s.upload_rate / 1024.0));
    
@@ -155,7 +155,7 @@ Index: apps/ktorrent/ktorrentviewitem.cpp
 +  		{
 +  			if(!started)
 +  			{
-+  				Out() << "{" << s.torrent_name << "}," << QDateTime::currentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",ACTIVATED" << endl;
++  				Out() << "{" << s.torrent_name << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",ACTIVATED" << endl;
 +  				tmpLog = false;
 +  				started = true;
 +  				toLog = true;
@@ -166,7 +166,7 @@ Index: apps/ktorrent/ktorrentviewitem.cpp
 +  		{
 +  			if(started)
 +  			{
-+  				Out() << "{" << s.torrent_name << "}," << QDateTime::currentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",DEACTIVATED" <<endl;
++  				Out() << "{" << s.torrent_name << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",DEACTIVATED" <<endl;
 +  				tmpLog = false;
 +  				started = false;
 +  			}
@@ -182,7 +182,7 @@ Index: apps/ktorrent/ktorrentviewitem.cpp
  	if (s.bytes_left == 0)
  	{
 +  		if(toLog && tmpLog) 
-+  			Out() << "{" << s.torrent_name << "}," << QDateTime::currentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << 0 << "," << s.num_peers << ",FINISHED" << endl;
++  			Out() << "{" << s.torrent_name << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << 0 << "," << s.num_peers << ",FINISHED" << endl;
 +  		toLog = false;
 + 
 +
@@ -195,14 +195,14 @@ Index: apps/ktorrent/ktorrentviewitem.cpp
  			if (s.download_rate == 0)
 +			{
 +  				if(toLog && tmpLog) 
-+  					Out() << "{" << s.torrent_name << "}," << QDateTime::currentDateTime().toTime_t() << "," << 0 << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",RUNNING" << endl;
++  					Out() << "{" << s.torrent_name << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << 0 << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",RUNNING" << endl;
 +
  				setText(7,i18n("infinity"));
 +			}
  			else
  			{
 + 				if(toLog && tmpLog) 
-+  					Out() << "{" << s.torrent_name << "}," << QDateTime::currentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",RUNNING" << endl;
++  					Out() << "{" << s.torrent_name << "}," << QDateTime::tqcurrentDateTime().toTime_t() << "," << s.download_rate << "," << s.bytes_downloaded << "," << s.bytes_left << "," << s.num_peers << ",RUNNING" << endl;
 +
  				Uint32 secs = (int)floor( (float)s.bytes_left / (float)s.download_rate);
  				setText(7,DurationToString(secs));