From b702bea80645dee6012ea5a8b4929ea6094ece0e Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Sat, 4 Aug 2007 06:23:44 +0000
Subject: [PATCH] - beta4 release

---
 TODO                |  3 ++-
 src/bittorrent.cpp  | 11 ++++++-----
 src/bittorrent.h    |  8 ++++----
 src/options_imp.cpp |  2 +-
 src/src.pro         |  2 +-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/TODO b/TODO
index 0992e98e5..47fcff1be 100644
--- a/TODO
+++ b/TODO
@@ -42,7 +42,7 @@
 - Complete documentation and english translation
 - Windows port (Chris - Peerkoel)
 - Add checking icon to documentation
-* beta4
+* beta5
   - Translations update (IN PROGRESS)
   - make use of finishedChecking alert if hydri implements it
   - Clean up delayed progress column sorting code
@@ -53,6 +53,7 @@
     - upload/download limit per torrent (Ticket #83)
     - double free or corruption on exit (Ticket #84)
     - Crash due to simple_segregated_storage (Ticket #94)
+
 LANGUAGES UPDATED:
 - French *BETA3*
 - English *BETA3*
diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index 1cb2b8889..877eef700 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -90,15 +90,15 @@ bittorrent::~bittorrent(){
   delete s;
 }
 
-void bittorrent::setDownloadLimit(QString hash, int val){
+void bittorrent::setDownloadLimit(QString hash, long val){
   torrent_handle h = getTorrentHandle(hash);
   if(h.is_valid())
     h.set_download_limit(val);
   saveTorrentSpeedLimits(hash);
 }
 
-void bittorrent::setUploadLimit(QString hash, int val){
-  qDebug("Set upload limit rate to %d", val);
+void bittorrent::setUploadLimit(QString hash, long val){
+  qDebug("Set upload limit rate to %ld", val);
   torrent_handle h = getTorrentHandle(hash);
   if(h.is_valid())
     h.set_upload_limit(val);
@@ -762,7 +762,8 @@ void bittorrent::setListeningPortsRange(std::pair<unsigned short, unsigned short
 
 // Set download rate limit
 // -1 to disable
-void bittorrent::setDownloadRateLimit(int rate){
+void bittorrent::setDownloadRateLimit(long rate){
+  qDebug("Setting a global download rate limit at %ld", rate);
   s->set_download_rate_limit(rate);
 }
 
@@ -772,7 +773,7 @@ session* bittorrent::getSession() const{
 
 // Set upload rate limit
 // -1 to disable
-void bittorrent::setUploadRateLimit(int rate){
+void bittorrent::setUploadRateLimit(long rate){
   s->set_upload_rate_limit(rate);
 }
 
diff --git a/src/bittorrent.h b/src/bittorrent.h
index 9a17a2f98..58a690d94 100644
--- a/src/bittorrent.h
+++ b/src/bittorrent.h
@@ -112,8 +112,8 @@ class bittorrent : public QObject{
     // Session configuration - Setters
     void setListeningPortsRange(std::pair<unsigned short, unsigned short> ports);
     void setMaxConnections(int maxConnec);
-    void setDownloadRateLimit(int rate);
-    void setUploadRateLimit(int rate);
+    void setDownloadRateLimit(long rate);
+    void setUploadRateLimit(long rate);
     void setGlobalRatio(float ratio);
     void setDHTPort(int dht_port);
     void setProxySettings(proxy_settings proxySettings, bool trackers=true, bool peers=true, bool web_seeds=true, bool dht=true);
@@ -121,8 +121,8 @@ class bittorrent : public QObject{
     void setDefaultSavePath(QString savepath);
     void applyEncryptionSettings(pe_settings se);
     void loadFilesPriorities(torrent_handle& h);
-    void setDownloadLimit(QString hash, int val);
-    void setUploadLimit(QString hash, int val);
+    void setDownloadLimit(QString hash, long val);
+    void setUploadLimit(QString hash, long val);
 
   protected slots:
     void scanDirectory();
diff --git a/src/options_imp.cpp b/src/options_imp.cpp
index 6f6b5048a..2b1648d1b 100644
--- a/src/options_imp.cpp
+++ b/src/options_imp.cpp
@@ -665,7 +665,7 @@ bool options_imp::isDHTEnabled() const{
 bool options_imp::isPeXDisabled() const{
   return disablePeX->isChecked();
 }
-// Return Download & Upload limits
+// Return Download & Upload limits in kbps
 // [download,upload]
 QPair<int,int> options_imp::getLimits() const{
   int DL = -1, UP = -1;
diff --git a/src/src.pro b/src/src.pro
index b92ec4511..0de443eb8 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -11,7 +11,7 @@ TARGET = qbittorrent
 CONFIG += qt thread x11 network
 
 # Update this VERSION for each release
-DEFINES += VERSION=\\\"v1.0.0beta3\\\"
+DEFINES += VERSION=\\\"v1.0.0beta4\\\"
 DEFINES += VERSION_MAJOR=1
 DEFINES += VERSION_MINOR=0
 DEFINES += VERSION_BUGFIX=0