From 057029787af1fbc8a0b17d47305e178528934caf Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Wed, 29 Aug 2007 06:33:27 +0000
Subject: [PATCH] - Added some asserts to check for overflows - Removed a
 useless functions (was used for debug) - Fixed 2 warnings in createTorrent.ui
 - Improved CXX_FLAGS in src.pro

---
 TODO                 |  3 +--
 src/bittorrent.cpp   | 11 ++---------
 src/bittorrent.h     |  1 -
 src/createtorrent.ui |  4 ++--
 src/src.pro          |  7 +++----
 5 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/TODO b/TODO
index 9c9fd8f57..8d8a3be96 100644
--- a/TODO
+++ b/TODO
@@ -45,10 +45,9 @@
 - update sorting when a new torrent is added?
 - Keep documention up to date
 - Windows port (Chris - Peerkoel)
-- write a patch for file_priority(int index);
+- write a patch for file_priority(int index), actual_size();
 - valgrind --tool=memcheck --leak-check=full src/qbittorrent (Looks ok)
 * beta 6
-  - Use gprof to check if we can optimize some stuff (compile with -pg)
   - Translations update (IN PROGRESS)
   - Wait for some bug fixes in libtorrent :
     - Number of seeds non null for finished torrent (Ticket #122)
diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index 99e71d692..c766b3c0f 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -555,15 +555,6 @@ void bittorrent::setMaxConnections(int maxConnec) {
   s->set_max_connections(maxConnec);
 }
 
-// For debug only
-void bittorrent::printPausedTorrents() {
-  QString hash;
-  qDebug("Paused Torrents:");
-  foreach(hash, pausedTorrents) {
-    qDebug("%s ", hash.toUtf8().data());
-  }
-}
-
 // Return DHT state
 bool bittorrent::isDHTEnabled() const{
   return DHTEnabled;
@@ -696,7 +687,9 @@ float bittorrent::getRealRatio(QString hash) const{
   size_type upload =  downUpInfo.second;
   QTorrentHandle h = getTorrentHandle(hash);
   download += h.total_payload_download();
+  Q_ASSERT(download >= 0);
   upload += h.total_payload_upload();
+  Q_ASSERT(upload >= 0);
   if(download == 0){
     if(upload == 0)
       return 1.;
diff --git a/src/bittorrent.h b/src/bittorrent.h
index fea40c790..c96e43399 100644
--- a/src/bittorrent.h
+++ b/src/bittorrent.h
@@ -82,7 +82,6 @@ class bittorrent : public QObject{
     session* getSession() const;
     QList<QPair<QString, QString> > getTrackersErrors(QString hash) const;
     bool receivedPausedAlert(QString hash) const;
-    void printPausedTorrents();
     QStringList getFinishedTorrents() const;
     QStringList getUnfinishedTorrents() const;
     bool isFinished(QString hash) const;
diff --git a/src/createtorrent.ui b/src/createtorrent.ui
index 46e1923ad..42b4b648b 100644
--- a/src/createtorrent.ui
+++ b/src/createtorrent.ui
@@ -489,7 +489,7 @@
     <string>Private (won't be distributed on trackerless network / DHT if enabled)</string>
    </property>
   </widget>
-  <widget class="QWidget" name="layoutWidget" >
+  <widget class="QWidget" name="layoutWidget2" >
    <property name="geometry" >
     <rect>
      <x>9</x>
@@ -543,7 +543,7 @@
     </item>
    </layout>
   </widget>
-  <widget class="QWidget" name="layoutWidget" >
+  <widget class="QWidget" name="layoutWidget3" >
    <property name="geometry" >
     <rect>
      <x>9</x>
diff --git a/src/src.pro b/src/src.pro
index f5f877f48..586ae48fb 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -19,18 +19,17 @@ DEFINES += VERSION_BUGFIX=0
 contains(DEBUG_MODE, 1){
   CONFIG += debug
   CONFIG -= release
-  QMAKE_CXXFLAGS_RELEASE += -fwrapv -O1
-  QMAKE_CXXFLAGS_DEBUG += -fwrapv -O1
   message(Debug build!)
 }
 contains(DEBUG_MODE, 0){
   CONFIG -= debug
   CONFIG += release
-  QMAKE_CXXFLAGS_RELEASE += -fwrapv -O2
-  QMAKE_CXXFLAGS_DEBUG += -fwrapv -O2
   message(Release build!)
 }
 
+QMAKE_CXXFLAGS_RELEASE += -fwrapv -O2
+QMAKE_CXXFLAGS_DEBUG += -fwrapv -O1
+
 CONFIG += link_pkgconfig
 PKGCONFIG += libtorrent libccext2 libccgnu2
 QT += network xml