From 0dbcf5653d7902ff5ef2c2d2ad7b2b268da80ff9 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Thu, 2 Dec 2010 17:02:13 +0000
Subject: [PATCH] Code clean up

---
 src/qtlibtorrent/qbtsession.cpp | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/qtlibtorrent/qbtsession.cpp b/src/qtlibtorrent/qbtsession.cpp
index c3e0bf11e..026cb18d0 100644
--- a/src/qtlibtorrent/qbtsession.cpp
+++ b/src/qtlibtorrent/qbtsession.cpp
@@ -589,25 +589,22 @@ void QBtSession::useAlternativeSpeedsLimit(bool alternative) {
   Preferences pref;
   pref.setAltBandwidthEnabled(alternative);
   // Apply settings to the bittorrent session
-  if(alternative) {
-    s->set_download_rate_limit(pref.getAltGlobalDownloadLimit()*1024);
-    s->set_upload_rate_limit(pref.getAltGlobalUploadLimit()*1024);
+  int down_limit = alternative ? pref.getAltGlobalDownloadLimit() : pref.getGlobalDownloadLimit();
+  if(down_limit <= 0) {
+    down_limit = -1;
   } else {
-    int down_limit = pref.getGlobalDownloadLimit();
-    if(down_limit <= 0) {
-      down_limit = -1;
-    } else {
-      down_limit *= 1024;
-    }
-    s->set_download_rate_limit(down_limit);
-    int up_limit = pref.getGlobalUploadLimit();
-    if(up_limit <= 0) {
-      up_limit = -1;
-    } else {
-      up_limit *= 1024;
-    }
-    s->set_upload_rate_limit(up_limit);
+    down_limit *= 1024;
   }
+  setDownloadRateLimit(down_limit);
+  // Upload rate
+  int up_limit = alternative ? pref.getAltGlobalUploadLimit() : pref.getGlobalUploadLimit();
+  if(up_limit <= 0) {
+    up_limit = -1;
+  } else {
+    up_limit *= 1024;
+  }
+  setUploadRateLimit(up_limit);
+  // Notify
   emit alternativeSpeedsModeChanged(alternative);
 }
 
@@ -1771,8 +1768,8 @@ void QBtSession::setListeningPort(int port) {
 // Set download rate limit
 // -1 to disable
 void QBtSession::setDownloadRateLimit(long rate) {
+  qDebug() << Q_FUNC_INFO << rate;
   Q_ASSERT(rate == -1 || rate >= 0);
-  qDebug("Setting a global download rate limit at %ld", rate);
   s->set_download_rate_limit(rate);
 }