From 6f6ab1c43958edf1e413004fc27fbe6f0b26f722 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Mon, 15 Mar 2010 18:12:55 +0000 Subject: [PATCH] Qt 4.4 compilation fix --- Changelog | 3 +++ src/bittorrent.cpp | 3 --- src/main.cpp | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index e66e61d27..77c73a104 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,6 @@ +* Unreleased - Christophe Dumez - v2.2.1 + - FEATURE: Fix compilation with Qt 4.4 + * Sun Mar 14 2010 - Christophe Dumez - v2.2.0 - FEATURE: User can set alternative speed limits for fast toggling - FEATURE: Bandwidth scheduler (automatically use alternative speed limits for a given period) diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp index 8086b02c7..46d689607 100644 --- a/src/bittorrent.cpp +++ b/src/bittorrent.cpp @@ -2274,10 +2274,7 @@ void Bittorrent::addConsoleMessage(QString msg, QString) { torrent_queue.push(qMakePair(prio, hash)); } // Resume downloads - int prio = -1; while(!torrent_queue.empty()) { - int new_prio = torrent_queue.top().first; - Q_ASSERT(new_prio >= prio); const QString &hash = torrent_queue.top().second; torrent_queue.pop(); qDebug("Starting up torrent %s", qPrintable(hash)); diff --git a/src/main.cpp b/src/main.cpp index d32e4256c..238aa5256 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include "GUI.h"