From 42a9872891eba166e81cf4f8c062261cc77398f8 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:57:16 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit f96f74ffa7040e64ae3352e08c810c383c8a0ba2.
---
 estimation-scripts/enable-logging.diff | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'estimation-scripts/enable-logging.diff')

diff --git a/estimation-scripts/enable-logging.diff b/estimation-scripts/enable-logging.diff
index 57dc703..e030443 100644
--- a/estimation-scripts/enable-logging.diff
+++ b/estimation-scripts/enable-logging.diff
@@ -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;
@@ -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));
-- 
cgit v1.2.1