Bump to v3.0.11

Conflicts:
	src/qtlibtorrent/qbtsession.cpp

.travis.yml

@@ -0,0 +1,53 @@
+language:
+  - cpp
+
+env:
+  # use libtorrent 0.15.10
+  - lt_source=from_dist gui=true
+  - lt_source=from_dist gui=false
+  # use libtorrent 0.16.X from RC_0_16 svn branch
+  - lt_source=from_svn gui=true
+  - lt_source=from_svn gui=false
+
+branches:
+  except:
+    - search_encoding_windows
+    - v2_9_x
+
+notifications:
+  email:
+    on_success: change
+    on_failure: change 
+
+before_install:
+  - shopt -s expand_aliases
+  - alias sudo="sudo "
+  # Using nprocs/2 sometimes may fail (gcc is killed by system), just use two threads
+  - alias make="colormake -j2 "
+
+  # Also setup a virtual display for after_success target when gui == true
+  - if ! $gui; then qbtconf="$qbtconf --disable-gui"; else export "DISPLAY=:99.0" && /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 ; fi
+  - ltconf=" --with-libgeoip=system"
+
+  - echo settings
+  - echo $lt_source
+  - echo $ltconf
+  - echo $gui
+  - echo $qbtconf
+
+  - sudo apt-get -qq update
+  # Travis can stall during heavy load if these packages are installed in one step - split the command
+  - sudo apt-get -qq install debhelper qconf colormake libssl-dev libgeoip-dev
+  - sudo apt-get -qq install libboost-dev libboost-filesystem-dev libboost-system-dev
+  - sudo apt-get -qq install libqt4-dev 
+
+install:
+  - if [[ "$lt_source" == "from_dist" ]]; then sudo apt-get -qq install libtorrent-rasterbar-dev; fi
+  - if [[ "$lt_source" == "from_svn" ]]; then cd .. && svn co svn://svn.code.sf.net/p/libtorrent/code/branches/RC_0_16 ./libtorrent && (cd libtorrent && ./autotool.sh && ./configure $ltconf && sudo make install) && sudo ldconfig /usr/local/lib && cd $TRAVIS_BUILD_DIR ; fi
+
+script:
+  - qt-qconf
+  - ./configure $qbtconf && sudo make install
+  
+after_success:
+  - if $gui ; then qbittorrent --version ; else qbittorrent-nox --version ; fi

AUTHORS

@@ -1,4 +1,7 @@
-Author:
+Current maintainer:
+* Sledgehammer999 <sledgehammer999@qbittorrent.org>
+
+Original author:
 * Christophe Dumez <chris@qbittorrent.org>
 
 Contributors:
@@ -11,6 +14,7 @@ Contributors:
 * Grigis Gaëtan <cipher16@gmail.com>
 * Christian Kandeler <zambesi@users.sourceforge.net>
 * Silvan Scherrer <silvan.scherrer@aroa.ch>
+* Nick Tiskov <daymansmail@gmail.com>
 
 Code from other projects:
 * files src/qtsingleapp/* src/lineedit/*
@@ -25,6 +29,10 @@ Code from other projects:
   copyright: Dan Haim <negativeiq@users.sourceforge.net>
   license: BSD
 
+* file src/stacktrace_win.h
+  copyright: Quassel Project
+  license: GPLv2/3
+
 Images Authors:
 * files: src/Icons/*.png
   copyright: Gnome Icon Theme
@@ -74,6 +82,8 @@ Translations authors:
   copyright:
   - Arabic: SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)
   - Armenian: Hrant Ohanyan (hrantohanyan@mail.am)
+  - Basque: Xabier Aramendi (azpidatziak@gmail.com)
+  - Belarusian: Mihas Varantsou (meequz@gmail.com)
   - Brazilian: Nick Marinho (nickmarinho@gmail.com)
   - Bulgarian: Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)
   - Catalan: Francisco Luque Contreras (frannoe@ya.com)
@@ -87,10 +97,12 @@ Translations authors:
   - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net)
   - French: Christophe Dumez (chris@qbittorrent.org)
   - Galician: Marcos Lans (marcoslansgarza@gmail.com)
+  - Georgian: Beqa Arabuli (arabulibeqa@yahoo.com)
   - German: Niels Hoffmann (zentralmaschine@users.sourceforge.net)
   - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net) and Stephanos Antaris (santaris@csd.auth.gr)
+  - Hebrew: David Deutsch (d.deffo@gmail.com)
   - Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
-  - Italian: Matteo Sechi (bu17714@gmail.com)
+  - Italian: bovirus (bovirus@live.it) and Matteo Sechi (bu17714@gmail.com)
   - Japanese: Masato Hashimoto (cabezon.hashimoto@gmail.com)
   - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net)
   - Lithuanian: Naglis Jonaitis (njonaitis@gmail.com)
@@ -104,5 +116,5 @@ Translations authors:
   - Spanish: Francisco Luque Contreras (frannoe@ya.com)
   - Swedish: Daniel Nylander (po@danielnylander.se)
   - Turkish: Hasan Yilmaz (iletisim@hedefturkce.com)
-  - Ukrainian: Andrey Shpachenko (masterfix@users.sourceforge.net) and Oleh Prypin (blaxpirit@gmail.com)
+  - Ukrainian: Oleh Prypin (blaxpirit@gmail.com)
   license: GPLv2

Changelog

@@ -1,3 +1,126 @@
+* Mon Jul 29 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.0.11
+    - FEATURE: Allow more fine tuning of upload slots. It should improve speed (sledgehammer999)
+    - FEATURE: Enable edit/rename via F2 or double click in various places (Gelmir)
+    - BUGFIX: Fix Spanish and Basque translations being messed up on Windows (sledgehammer999)
+    - BUGFIX: Don't allow newlines in rename dialog (Gelmir)
+    - BUGFIX: Treat unfinished dates as the newest ones when sorting (sledgehammer999)
+    - BUGFIX: Fix text size problem on Windows with custom DPI (sledgehammer999)
+    - BUGFIX: Respect UI lock when clicking on tray notification (sledgehammer999)
+    - BUGFIX: Fix kickass torrents search plugin (Gelmir)
+    - BUGFIX: Use system language as default language. Closes #780 (sledgehammer999)
+    - BUGFIX: Move completed files to .unwanted folder when they are unselected by the user (constantined)
+    - BUGFIX: Show delete action when multiple feeds are selected (Gelmir)
+    - BUGFIX: Use Unicode for libtorrent alert messages (Gelmir)    
+    - OTHER: Update translations
+    - WINDOWS: Shave off ~4MB from the binary size (sledgehammer999)
+    - WINDOWS: Remove wrong dependency on msvc2008 runtime (sledgehammer999)
+    - WINDOWS: Disable stacktrace when building with mingw (Gelmir)
+    - WINDOWS: Updated NSIS script to include/delete .pdb file. (sledgehammer999)
+
+* Tue Jul 9 2013 - Christophe Dumez <chris@qbittorrent.org> and sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.0.10
+    - BUGFIX: Fix LegitTorrents search plugin
+    - BUGFIX: Improve peer host name resolution (closes #360)
+    - BUGFIX: Context menu fix in the Web UI
+    - BUGFIX: Respect 'don't show' torrent dialog in Search (sledgehammer999)
+    - BUGFIX: Torrent creator can now use files/folders from disk root (Gelmir)
+    - BUGFIX: Update free disk space when changing drives in the add new torrent dialog (sledgehammer999)
+    - BUGFIX: Various fixes relating to RSS drag and drop (Gelmir)
+    - BUGFIX: Properly rename torrent which changes position in filter model (Gelmir)
+    - BUGFIX: Actually show tray notifications when a torrent finishes downloading (sledgehammer999)
+    - BUGFIX: Don't download RSS items based on rules still being edited (Gelmir)
+    - COSMETIC: Native look for the search boxes (Hyperz)
+    - IMPROVEMENT: Use natural sorting where possible (Gelmir and sledgehammer999)
+    - LINUX: Drop Boost.Thread dependency from configure script
+    - OTHER: Update translations.
+    - OTHER: Drop obsolete Boost.Thread dependency from configure script on linux (Dumez)
+    - LIBTORRENT: SOCKS5 fixes (0.16.10)
+    - LIBTORRENT: Fix hanging issue on Windows when closing files (0.16.10)
+    - LIBTORRENT: Cache can now be returned to the OS (0.16.10)
+    - PERFORMANCE: Impove drawing speed of tranferlist when there are many torrents(>100) (sledgehammer999)
+    - PERFORMANCE: Impove drawing speed of peers list when there are many peers (sledgehammer999)
+    
+* Sat Mar 16 2013 - Christophe Dumez <chris@qbittorrent.org> - v3.0.9
+    - BUGFIX: Raise qBittorrent windows when another instance is launched
+    - BUGFIX: Show human readable names for network interfaces in preferences (Windows)
+    - BUGFIX: Fix torrent creator bug when saving non-latin path (Windows)
+    - BUGFIX: Enable 'copy magnet uri' for torrents without metadata too
+    - BUGFIX: Fix a few JSON parser issues (Gelmir)
+    - BUGFIX: Add support for gzipped encoded HTTP responses (daimor)
+    - BUGFIX: Fix possibly missing "Add torrent" icon (Driim)
+    - OTHER: Add search plugin for Legit Torrents
+
+* Sun Jan 20 2013 - Christophe Dumez <chris@qbittorrent.org> - v3.0.8
+    - BUGFIX: Fix support for --no-splash command line argument
+    - BUGFIX: Fix compilation error with libtorrent v0.15
+    - BUGFIX: Fix search issues with Python3
+    - BUGFIX: Fix dead link about certificates in program preferences
+
+* Sat Jan 19 2013 - Christophe Dumez <chris@qbittorrent.org> - v3.0.7
+    - BUGFIX: Update max write cache size to 2048MB and set it to automatic by default (closes #148)
+    - BUGFIX: Add m4v to the list of previewable file extensions (closes #216)
+    - BUGFIX: Fix "Couldn't set environment variable..." message on start up (closes #245)
+    - BUGFIX: Use right path separator in torrent addition dialog on Windows
+    - BUGFIX: Fix "Set as default save path" setting (closes #254)
+    - BUGFIX: Reenable disk cache on Windows since the memory issue seems to be gone
+    - BUGFIX: Fixed several search engine plugins and removed the dead ones
+    - BUGFIX: Use https links in search plugins when possible
+    - BUGFIX: Bump Mootools to v1.4.5 (Web UI)
+    - BUGFIX: Require password to exit qBittorrent from tray icon when locked (closes #311)
+    - BUGFIX: Fix possible crash in loadPeers() (closes #222)
+
+* Sun Oct 7 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.6
+    - BUGFIX: Fix unicode support for command-line arguments on Windows (closes #139)
+    - BUGFIX: Do not store created torrent in memory before writing it to a file (closes #133)
+    - BUGFIX: No longer fallback to ANY interface if the user-selected interface cannot be found (closes #143)
+    - BUGFIX: Fix timezone parsing in RSS (closes #136)
+    - BUGFIX: Fix cookie support for RSS feeds (closes #119)
+
+* Sun Sep 30 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.5
+    - BUGFIX: Disabling systray icon no longer disables file association settings (closes #114)
+    - BUGFIX: Import new trackers from magnet link in case of duplicate torrent (closes #111)
+    - BUGFIX: Fix "Skip hash check" feature in torrent import dialog (closes #128)
+    - BUGFIX: Several Web UI connection fixes
+    - BUGFIX: Add Basque locale to Web UI
+
+* Tue Sep 18 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.4
+    - BUGFIX: Fix issue with downloads starting from scratch on startup if temporary
+      directory setting is enabled.
+
+* Sun Sep 16 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.3
+    - BUGFIX: Fix issue with temporary directory not being taken into consideration (closes #94)
+    - BUGFIX: Address encoding issues when using search engine on Windows (closes #29)
+    - BUGFIX: Bypass cache when uploading a torrent file in Web UI (closes #68)
+    - BUGFIX: "Completed On" column is not updated until restart (closes #84)
+    - BUGFIX: Fix possible build error on some systems
+    - I18N: Add hebrew translation
+
+* Sat Sep 1 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.2
+    - FEATURE: Add "clear" functionality to search field (closes #59)
+    - BUGFIX: Attempt to use qBittorrent icon from theme if available (closes #49)
+    - BUGFIX: Fix crash when a fastresume file is empty (closes #52)
+    - BUGFIX: Fix encoding problem for detected XDG Download folder (closes #53)
+    - BUGFIX: Improve performance when showing torrent content panel (Improves #24)
+    - BUGFIX: Fix label-based filtering of torrents whose label contains special characters
+    - BUGFIX: Fix possible crash due to labels (closes #64)
+
+* Tue Aug 21 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.1
+    - BUGFIX: Fix possible crash when adding a tracker to a magnet torrent without metadata (Closes #1034254)
+    - BUGFIX: Remember queue position for torrents without metadata (closes #17)
+    - BUGFIX: Fix crash when using unauthorized characters in label names (closes #19)
+    - BUGFIX: Fix search plugins updating (closes #25)
+    - BUGFIX: Make uTP connections rate limited by default
+
+* Thu Aug 09 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.0
+    - FEATURE: Brand new torrent addition dialog
+    - FEATURE: Add the ability to choose the save path when using magnet links (mutoso)
+    - FEATURE: Add support for adding multiple local torrents at once (Web UI)
+    - COSMETIC: Improve style of left panel
+    - BUGFIX: Lower panels no longer gets disabled
+    - BUGFIX: Major code refactoring and various optimizations.
+    - BUGFIX: No longer strip root folder from torrent files
+    - OTHER: Drop support for libtorrent v0.14.x
+    - OTHER: Drop support for Qt 4.5
+
 * Sat Oct 08 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.9.0
     - FEATURE: Add file association settings to program preferences (Windows)
     - FEATURE: Add setting to ignore slow torrents in queueing system

INSTALL

@@ -10,19 +10,21 @@ qBittorrent - A BitTorrent client in C++ / Qt4
   will install and execute qBittorrent hopefully without any problems.
 
   Dependencies:
-    - Qt >= 4.5.0 (libqtgui, libqtcore, libqtnetwork, libqtxml, libqtdbus/optional)
+    - Qt >= 4.6.0 (libqtgui, libqtcore, libqtnetwork, libqtxml, libqtdbus/optional)
 
     - pkg-config executable
 
-    - libtorrent-rasterbar by Arvid Norberg (>= 0.14.4 REQUIRED, compatible with v0.15.x)
+    - libtorrent-rasterbar by Arvid Norberg (>= 0.15.0)
         -> http://www.libtorrent.net
         Be careful: another library (the one used by rTorrent) uses a similar name.
 
-    - libboost 1.34.x (libboost-filesystem, libboost-date-time) + libasio
+    - libboost 1.34.x (libboost-filesystem°) + libasio
       or
-    - libboost >= 1.35.x (libboost-system, libboost-filesystem, libboost-date-time)
+    - libboost >= 1.35.x (libboost-system, libboost-filesystem°)
+      
+    °libboost-filesystem is not needed if libtorrent-rasterbar >= v0.16.x is used
 
-    - python >= 2.3 && < 3.0 (needed by search engine)
+    - python >= 2.3 (needed by search engine)
         * Run time only dependency
 
     - geoip-database (optional)
@@ -42,7 +44,7 @@ qBittorrent - A BitTorrent client in C++ / Qt4
 
     - pkg-config executable
 
-    - libtorrent-rasterbar by Arvid Norberg (>= 0.14.4 REQUIRED, >= v0.15.0 ADVISED)
+    - libtorrent-rasterbar by Arvid Norberg (>= v0.15.0)
         -> http://www.libtorrent.net
         Be careful: another library (the one used by rTorrent) uses a similar name.
 

README.os2

@@ -27,7 +27,6 @@ First you need to create the conf.pri file in the same dir as this readme.os2 is
 the conf.pri file has the following content:
 
 ##### conf.pri content beginn #####
-PREFIX = .
 BINDIR = ./bin
 INCDIR = ./include
 LIBDIR = ./lib
@@ -43,7 +42,10 @@ LIBS += -Lx:/trees/libtorrent/trunk/src/.libs \
 
 Of course all the above path references have to be adjusted to your build env.
 
-It should now be easy to build qBittorrent:
+Now you can either do a normal build or a shadow build. A shadow build has the
+advantage that no created files are in the same dir as the sources are.
+
+For a normal build do the following:
 
 Simply type:
 $ qmake
@@ -51,6 +53,16 @@ $ qmake
 Followed by:
 $ make
 
+For a shadow build do the following:
+given your sources are in x:\trees\qbittorrent\trunk create a 
+x:\trees\qbittorrent\build directory
+
+Now switch to the created directory and type:
+$ qmake ..\trunk
+
+Followed by:
+$ make
+
 If all works fine you should get a working qbittorrent executable.
 
 If you have any question regarding the eCS (OS/2) port of qBittorrent you can meet me (_diver) on IRC:

configure

@@ -325,7 +325,7 @@ cat >$1/modules.cpp <<EOT
 #line 1 "qt4.qcm"
 /*
 -----BEGIN QCMOD-----
-name: Qt >= 4.5
+name: Qt >= 4.6
 arg: enable-debug, Enable debug mode
 arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 -----END QCMOD-----
@@ -334,8 +334,8 @@ class qc_qt4 : public ConfObj
 {
 public:
 	qc_qt4(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.5"; }
+	QString name() const { return "Qt >= 4.6"; }
-	QString shortname() const { return "Qt 4.5"; }
+	QString shortname() const { return "Qt 4.6"; }
 	bool exec()
 	{
                 // NOX mode
@@ -356,7 +356,7 @@ public:
                 #else
                   conf->addExtra("MANPREFIX = \$\$PREFIX/share"); 
                 #endif
-		return(QT_VERSION >= 0x040500);
+		return(QT_VERSION >= 0x040600);
 	}
 };
 #line 1 "qt-dbus.qcm"
@@ -419,11 +419,11 @@ class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.14.4"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.15.0"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
 		QStringList incs;
-		QString req_ver = "0.14.4";
+		QString req_ver = "0.15.0";
 		QString version, libs, other;
 		VersionMode mode = VersionMin;
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))
@@ -442,12 +442,15 @@ arg: with-libboost-lib=[path], Path to libboost library files
 -----END QCMOD-----
 */
 #include <boost/version.hpp>
+#include <libtorrent/version.hpp>
+
 class qc_libboost : public ConfObj
 {
 public:
-	qc_libboost(Conf *c) : ConfObj(c) {}
+  qc_libboost(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libboost"; }
+  QString name() const { return "libboost"; }
-	QString shortname() const { return "libboost"; }
+  QString shortname() const { return "libboost"; }
+
   QString findBoostLib(QString path, QString lib) const {
     QString name;
     QDir libDir(path);
@@ -471,77 +474,62 @@ public:
     }
     return name;
   }
-	bool exec(){
+
-        	QString s;
+  bool exec(){
-		s = conf->getenv("QC_WITH_LIBBOOST_INC");
+    QStringList sl;
-		if(!s.isEmpty()) {
+    QString s = conf->getenv("QC_WITH_LIBBOOST_INC");
-			if(!conf->checkHeader(s, "boost/format.hpp")) {
+    if (!s.isEmpty())
-				return false;
+      sl << s;
-      			}
+    sl << "/usr/include";
-			if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
+    sl << "/usr/local/include";
-				return false;
+    bool found = false;
-      			}
+    foreach (s, sl) {
-			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
+      if (conf->checkHeader(s, "boost/format.hpp")
-				return false;
+#if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
-      			}
+          && conf->checkHeader(s, "boost/filesystem/path.hpp")
-		}else{
+#endif
-			QStringList sl;
+         ) {
-			sl << "/usr/include";
+        found = true;
-			sl << "/usr/local/include";
+        break;
-			bool found = false;
+      }
-			foreach(s, sl){
+    }
-				if(conf->checkHeader(s, "boost/format.hpp")){
+    if (!found)
-					found = true;
+      return false;
-					break;
+
-				}
+    conf->addIncludePath(s);
-			}
+
-			if(!found) {
+    // Find library
-				return false;
+    s = conf->getenv("QC_WITH_LIBBOOST_LIB");
-          		}
-			if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
-				return false;
-      			}
-			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
-				return false;
-      			}
-		}
-		conf->addIncludePath(s);
-		// Find library
-		s = conf->getenv("QC_WITH_LIBBOOST_LIB");
     QStringList required_libs;
 #if BOOST_VERSION >= 103500
       required_libs << "system"; 
 #endif
+#if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
     required_libs << "filesystem" ;
+#endif
+    //required_libs << "thread";
     QStringList libDirs;
+    if (!s.isEmpty())
+      libDirs << s;
     libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
+
     foreach(const QString& lib, required_libs) {
-      if(!s.isEmpty()) {
+      bool found = false;
-        QString detected_name = findBoostLib(s, lib);
+      foreach(const QString& libDir, libDirs) {
-        if(detected_name.isEmpty()) {
+        QString detected_name = findBoostLib(libDir, lib);
-          printf("Could not find boost %s library!\n", qPrintable(lib));
+        if(!detected_name.isEmpty()) {
-          return false;
-        } else {
           conf->addLib("-l"+detected_name);
-        }
+          found = true;
-      } else {
+          break;
-        bool found = false;
-        foreach(const QString& libDir, libDirs) {
-          QString detected_name = findBoostLib(libDir, lib);
-          if(!detected_name.isEmpty()) {
-            conf->addLib("-l"+detected_name);
-            found = true;
-            break;
-          }
-        }
-        if(!found) {
-          printf("Could not find boost %s library!\n", qPrintable(lib));
-          return false;
         }
       }
+      if(!found) {
+        printf("Could not find boost %s library!\n", qPrintable(lib));
+        return false;
+      }
     }
-		return true;
+    return true;
-	}
+  }
 };
 #line 1 "geoip-database.qcm"
 /*

install.os2

@@ -11,7 +11,7 @@ QBittorrent installation
 
 3. INSTALLATION
 
-4. CONTACT
+4. BUGREPORTS
 
 5. CREDITS
 
@@ -29,17 +29,70 @@ Welcome to QBittorrent port for OS/2 and eComStation.
 2. REQUIREMENTS
 ===============
 
-* klibc 0.6.3 or later
+The following requirements can be installed either by rpm or by zip files.
 
-    ftp://ftp.netlabs.org/pub/gcc/libc-0_6_3-csd3.wpi
+RPM Installation:
 
-* openssl 1.0
+klibc
- 
+-----
-    ftp://ftp.netlabs.org/pub/unixos2/ssl10.zip
 
-* Qt4 dll
+  1. yum install libc
 
-    see http://svn.netlabs.org/qt4 for more information whats needed and where to get the latest
+openssl 1.0
+-----------
+
+  1. yum install openssl
+
+pthread
+-------
+
+  1. yum install pthread
+
+GCC4Core
+--------
+
+  1. yum install libgcc
+  2. yum install gcc-stack-protector
+  3. yum install gcc-stdc++-shared-library
+  4. yum install gcc-supc++-shared-library
+
+Qt4 dll
+-------
+
+  1. yum install libqt4
+
+
+ZIP Installation:
+
+klibc
+-----
+
+  1. Download klibc 0.6.5 or better (see http://svn.netlabs.org/libc for more information)
+  2. Install the files to your libpath eg x:\ecs\dll
+
+openssl 1.0
+-----------
+
+  1. Download the zip file from http://rpm.netlabs.org/release/00/zip
+  2. Install the files to your libpath eg. x:\ecs\dll
+
+pthread
+-------
+
+  1. Download pthread 2012-03-13 or better from http://rpm.netlabs.org/release/00/zip
+  2. Install the files to your libpath eg. x:\ecs\dll
+
+GCC4Core
+--------
+
+  1. Download GCC4Core 1.2.1 or better from http://ftp.netlabs.org/pub/gcc
+  2. Install the files to your libpath eg. x:\ecs\dll
+
+Qt4 dll
+-------
+
+  1. Download Qt4 4.7.3 or better (see http://svn.netlabs.org/qt4 for more information)
+  2. Install the files according to the readme
 
 
 3. INSTALLATION
@@ -47,30 +100,6 @@ Welcome to QBittorrent port for OS/2 and eComStation.
           
 To install QBittorrent, do the following:
 
-klibc
------
-
-  1. Download klibc 0.6.3 csd3 or later.
-  2. Install the package by double-clicking on the WPI file.
-
-
-openssl 1.0
------------
-
-  1. Download the zip file
-  2. Install the files to your libpath eg. x:\ecs\dll
-
-Qt4 dll
--------
-
-  1. Download the package
-  2. Install the package by double-clicking on the wpi file.
-
-
-
-QBittorrent
------------
-
   1. Create a directory for QBittorrent.
   2. Extract the QBittorrent package to the new directory.
   3. Create a WPS object for QBittorrent.exe.
@@ -78,18 +107,13 @@ QBittorrent
   5. Happy torrenting
   
 
+4. BUGREPORTS
+=============
 
-4. CONTACT
+Please create bugreports at http://svn.netlabs.org/qtapps
-==========
-
-Please send bugreports to:
-
-  ecs@aroa.ch
-
 Only bug reports with a reproducable bug are accepted. :-)
 
 
-
 5. CREDITS
 ==========
 
@@ -122,6 +146,33 @@ development, you can do so in one of the following ways:
 7. HISTORY
 ==========
 
+2012-09-19
+
+  * updated to 3.0.4 code level of QBittorrent
+  * updated libtorrent to 0.16.3 level
+
+2012-09-06
+
+  * updated to 3.0.2 code level of QBittorrent
+
+2012-05-14
+
+  * updated to 2.9.8 code level of QBittorrent
+
+2012-03-15
+
+  * updated to 2.9.5 code level of QBittorrent
+
+2011-09-26
+
+  * updated to 2.8.5 code level of QBittorrent
+  * updated to Qt 4.7.3
+
+2011-06-20
+
+  * updated to 2.7.3 code level of QBittorrent
+  * updated libtorrent to 0.15.6 level
+
 2010-12-23
 
   * updated to 2.5.2 code level of QBittorrent

macxconf.pri

@@ -2,15 +2,66 @@ PREFIX = /usr/local
 BINDIR = /usr/local/bin
 DATADIR = /usr/local/share
 
-INCLUDEPATH += /usr/local/include/libtorrent /usr/include/openssl /usr/include /opt/local/include/boost /opt/local/include
+# Use pkg-config to get all necessary libtorrent DEFINES
-LIBS += -ltorrent-rasterbar -lcrypto -L/opt/local/lib -lboost_system-mt -lboost_filesystem-mt -lboost_thread-mt -framework Cocoa -framework Carbon -framework IOKit
+CONFIG += link_pkgconfig
+PKGCONFIG += libtorrent-rasterbar
+DEFINES += BOOST_ASIO_DYN_LINK
+
+# Special include/libs paths (macports)
+INCLUDEPATH += /usr/include/openssl /usr/include /opt/local/include/boost /opt/local/include
+LIBS += -L/opt/local/lib
+
+# OpenSSL lib
+LIBS += -lssl -lcrypto
+# Boost system lib
+LIBS += -lboost_system-mt
+# Boost filesystem lib (Not needed for libtorrent >= 0.16.0)
+#LIBS += -lboost_filesystem-mt
+# Carbon
+LIBS += -framework Carbon -framework IOKit
+# Zlib
+LIBS += -lz
 
 document_icon.path = Contents/Resources
-document_icon.files = Icons/qBitTorrentDocument.icns
+document_icon.files = mac/qBitTorrentDocument.icns
-
 QMAKE_BUNDLE_DATA += document_icon
-ICON = Icons/qbittorrent_mac.icns
+
-QMAKE_INFO_PLIST = Info.plist
+qt_conf.path = Contents/Resources
+qt_conf.files = mac/qt.conf
+QMAKE_BUNDLE_DATA += qt_conf
+
+qt_translations.path = Contents/MacOS/translations
+qt_translations.files = qt-translations/qt_ar.qm \
+                        qt-translations/qt_bg.qm \
+                        qt-translations/qt_ca.qm \
+                        qt-translations/qt_cs.qm \
+                        qt-translations/qt_da.qm \
+                        qt-translations/qt_de.qm \
+                        qt-translations/qt_es.qm \
+                        qt-translations/qt_fi.qm \
+                        qt-translations/qt_fr.qm \
+                        qt-translations/qt_gl.qm \
+                        qt-translations/qt_he.qm \
+                        qt-translations/qt_hu.qm \
+                        qt-translations/qt_it.qm \
+                        qt-translations/qt_ja.qm \
+                        qt-translations/qt_ko.qm \
+                        qt-translations/qt_lt.qm \
+                        qt-translations/qt_nl.qm \
+                        qt-translations/qt_pl.qm \
+                        qt-translations/qt_pt.qm \
+                        qt-translations/qt_pt_BR.qm \
+                        qt-translations/qt_ru.qm \
+                        qt-translations/qt_sk.qm \
+                        qt-translations/qt_sv.qm \
+                        qt-translations/qt_tr.qm \
+                        qt-translations/qt_uk.qm \
+                        qt-translations/qt_zh_CN.qm \
+                        qt-translations/qt_zh_TW.qm
+QMAKE_BUNDLE_DATA += qt_translations
+
+ICON = mac/qbittorrent_mac.icns
+QMAKE_INFO_PLIST = mac/Info.plist
 
 DEFINES += WITH_GEOIP_EMBEDDED
 message("On Mac OS X, GeoIP database must be embedded.")

os2conf.pri

@@ -7,12 +7,13 @@ LIBS += -ltorrent-rasterbar \
         -lboost_thread \
         -lboost_system \
         -lboost_filesystem \
-        -lssl -lcrypto -lidn -lpthread
+        -lssl -lcrypto -lidn -lpthread -lz
 
 RC_FILE = qbittorrent_os2.rc
 
 # LIBTORRENT DEFINES
 DEFINES += WITH_SHIPPED_GEOIP_H
+DEFINES += BOOST_ASIO_DYN_LINK
 
 DEFINES += WITH_GEOIP_EMBEDDED
 message("On eCS(OS/2), GeoIP database must be embedded.")

qbittorrent.pro

@@ -9,7 +9,10 @@ dist.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/ &&
 dist.commands += git clone . ../$${PROJECT_NAME}-$${PROJECT_VERSION} &&
 dist.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/.git &&
 dist.commands += rm -f ../$${PROJECT_NAME}-$${PROJECT_VERSION}/.gitignore &&
-dist.commands += tar zcpvf ../$${PROJECT_NAME}-$${PROJECT_VERSION}.tar.gz ../$${PROJECT_NAME}-$${PROJECT_VERSION} &&
+dist.commands += cd .. &&
-dist.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}
+dist.commands += tar czf $${PROJECT_NAME}-$${PROJECT_VERSION}.tar.gz $${PROJECT_NAME}-$${PROJECT_VERSION} &&
+dist.commands += tar cf $${PROJECT_NAME}-$${PROJECT_VERSION}.tar $${PROJECT_NAME}-$${PROJECT_VERSION} &&
+dist.commands += xz -f $${PROJECT_NAME}-$${PROJECT_VERSION}.tar &&
+dist.commands += rm -fR $${PROJECT_NAME}-$${PROJECT_VERSION}
 
 QMAKE_EXTRA_TARGETS += dist

qcm/libboost.qcm

@@ -6,12 +6,15 @@ arg: with-libboost-lib=[path], Path to libboost library files
 -----END QCMOD-----
 */
 #include <boost/version.hpp>
+#include <libtorrent/version.hpp>
+
 class qc_libboost : public ConfObj
 {
 public:
-	qc_libboost(Conf *c) : ConfObj(c) {}
+  qc_libboost(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libboost"; }
+  QString name() const { return "libboost"; }
-	QString shortname() const { return "libboost"; }
+  QString shortname() const { return "libboost"; }
+
   QString findBoostLib(QString path, QString lib) const {
     QString name;
     QDir libDir(path);
@@ -35,75 +38,60 @@ public:
     }
     return name;
   }
-	bool exec(){
+
-        	QString s;
+  bool exec(){
-		s = conf->getenv("QC_WITH_LIBBOOST_INC");
+    QStringList sl;
-		if(!s.isEmpty()) {
+    QString s = conf->getenv("QC_WITH_LIBBOOST_INC");
-			if(!conf->checkHeader(s, "boost/format.hpp")) {
+    if (!s.isEmpty())
-				return false;
+      sl << s;
-      			}
+    sl << "/usr/include";
-			if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
+    sl << "/usr/local/include";
-				return false;
+    bool found = false;
-      			}
+    foreach (s, sl) {
-			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
+      if (conf->checkHeader(s, "boost/format.hpp")
-				return false;
+#if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
-      			}
+          && conf->checkHeader(s, "boost/filesystem/path.hpp")
-		}else{
+#endif
-			QStringList sl;
+         ) {
-			sl << "/usr/include";
+        found = true;
-			sl << "/usr/local/include";
+        break;
-			bool found = false;
+      }
-			foreach(s, sl){
+    }
-				if(conf->checkHeader(s, "boost/format.hpp")){
+    if (!found)
-					found = true;
+      return false;
-					break;
+
-				}
+    conf->addIncludePath(s);
-			}
+
-			if(!found) {
+    // Find library
-				return false;
+    s = conf->getenv("QC_WITH_LIBBOOST_LIB");
-          		}
-			if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
-				return false;
-      			}
-			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
-				return false;
-      			}
-		}
-		conf->addIncludePath(s);
-		// Find library
-		s = conf->getenv("QC_WITH_LIBBOOST_LIB");
     QStringList required_libs;
 #if BOOST_VERSION >= 103500
       required_libs << "system"; 
 #endif
+#if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
     required_libs << "filesystem" ;
+#endif
+    //required_libs << "thread";
     QStringList libDirs;
+    if (!s.isEmpty())
+      libDirs << s;
     libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
+
     foreach(const QString& lib, required_libs) {
-      if(!s.isEmpty()) {
+      bool found = false;
-        QString detected_name = findBoostLib(s, lib);
+      foreach(const QString& libDir, libDirs) {
-        if(detected_name.isEmpty()) {
+        QString detected_name = findBoostLib(libDir, lib);
-          printf("Could not find boost %s library!\n", qPrintable(lib));
+        if(!detected_name.isEmpty()) {
-          return false;
-        } else {
           conf->addLib("-l"+detected_name);
-        }
+          found = true;
-      } else {
+          break;
-        bool found = false;
-        foreach(const QString& libDir, libDirs) {
-          QString detected_name = findBoostLib(libDir, lib);
-          if(!detected_name.isEmpty()) {
-            conf->addLib("-l"+detected_name);
-            found = true;
-            break;
-          }
-        }
-        if(!found) {
-          printf("Could not find boost %s library!\n", qPrintable(lib));
-          return false;
         }
       }
+      if(!found) {
+        printf("Could not find boost %s library!\n", qPrintable(lib));
+        return false;
+      }
     }
-		return true;
+    return true;
-	}
+  }
 };

qcm/libtorrent-rasterbar.qcm

@@ -8,11 +8,11 @@ class qc_libtorrent_rasterbar : public ConfObj
 {
 public:
 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
-	QString name() const { return "libtorrent-rasterbar >= 0.14.4"; }
+	QString name() const { return "libtorrent-rasterbar >= 0.15.0"; }
 	QString shortname() const { return "libtorrent-rasterbar"; }
 	bool exec(){
 		QStringList incs;
-		QString req_ver = "0.14.4";
+		QString req_ver = "0.15.0";
 		QString version, libs, other;
 		VersionMode mode = VersionMin;
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))

qcm/qt4.qcm

@@ -1,6 +1,6 @@
 /*
 -----BEGIN QCMOD-----
-name: Qt >= 4.5
+name: Qt >= 4.6
 arg: enable-debug, Enable debug mode
 arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
 -----END QCMOD-----
@@ -9,8 +9,8 @@ class qc_qt4 : public ConfObj
 {
 public:
 	qc_qt4(Conf *c) : ConfObj(c) {}
-	QString name() const { return "Qt >= 4.5"; }
+	QString name() const { return "Qt >= 4.6"; }
-	QString shortname() const { return "Qt 4.5"; }
+	QString shortname() const { return "Qt 4.6"; }
 	bool exec()
 	{
                 // NOX mode
@@ -31,6 +31,6 @@ public:
                 #else
                   conf->addExtra("MANPREFIX = $$PREFIX/share"); 
                 #endif
-		return(QT_VERSION >= 0x040500);
+		return(QT_VERSION >= 0x040600);
 	}
 };

src/about_imp.h

@@ -45,13 +45,13 @@ class about : public QDialog, private Ui::AboutDlg{
       qDebug("Deleting about dlg");
     }
 
-    about(QWidget *parent): QDialog(parent){
+    about(QWidget *parent): QDialog(parent) {
       setupUi(this);
       setAttribute(Qt::WA_DeleteOnClose);
       // Set icons
       logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png")));
       //Title
-      lb_name->setText(QString::fromUtf8("<b><h1>")+tr("qBittorrent")+QString::fromUtf8(" "VERSION"</h1></b>"));
+      lb_name->setText(QString::fromUtf8("<b><h1>qBittorrent")+QString::fromUtf8(" "VERSION"</h1></b>"));
       // Thanks
       QString thanks_txt;
       thanks_txt += QString::fromUtf8("<p>I would first like to thank sourceforge.net for hosting qBittorrent project and for their support.</p>");
@@ -64,6 +64,8 @@ class about : public QDialog, private Ui::AboutDlg{
       QString trans_txt = "<p>"+tr("I would like to thank the following people who volunteered to translate qBittorrent:")+"</p>";
       trans_txt += QString::fromUtf8("<ul><li><u>Arabic:</u> SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)</li>\
           <li><u>Armenian:</u> Hrant Ohanyan (hrantohanyan@mail.am)</li>\
+          <li><u>Basque:</u> Xabier Aramendi (azpidatziak@gmail.com)</li>\
+          <li><u>Belarusian:</u> Mihas Varantsou (meequz@gmail.com)</li>\
           <li><u>Brazilian:</u> Nick Marinho (nickmarinho@gmail.com)</li>\
           <li><u>Bulgarian:</u> Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)</li>\
           <li><u>Catalan:</u> Francisco Luque Contreras (frannoe@ya.com)</li>\
@@ -75,10 +77,12 @@ class about : public QDialog, private Ui::AboutDlg{
           <li><u>Dutch:</u> Pieter Heyvaert (pieter_heyvaert@hotmail.com)</li>\
           <li><u>Finnish:</u> Niklas Laxström (nikerabbit@users.sourceforge.net) and Pekka Niemi (pekka.niemi@iki.fi)</li>\
           <li><u>Galician:</u> Marcos Lans (marcoslansgarza@gmail.com)</li>\
+          <li><u>Georgian:</u> Beqa Arabuli (arabulibeqa@yahoo.com)</li>\
           <li><u>German:</u> Niels Hoffmann (zentralmaschine@users.sourceforge.net)</li>\
           <li><u>Greek:</u> Tsvetan Bankov (emerge_life@users.sourceforge.net)</li>\
+          <li><u>Hebrew:</u> David Deutsch (d.deffo@gmail.com)</li>\
           <li><u>Hungarian:</u> Majoros Péter (majoros.peterj@gmail.com)</li>\
-          <li><u>Italian:</u> Matteo Sechi (bu17714@gmail.com)</li>\
+          <li><u>Italian:</u> bovirus (bovirus@live.it) and Matteo Sechi (bu17714@gmail.com)</li>\
           <li><u>Japanese:</u> Masato Hashimoto (cabezon.hashimoto@gmail.com)</li>\
           <li><u>Korean:</u> Jin Woo Sin (jin828sin@users.sourceforge.net)</li>\
           <li><u>Lithuanian:</u> Naglis Jonaitis (njonaitis@gmail.com)</li>\
@@ -89,16 +93,16 @@ class about : public QDialog, private Ui::AboutDlg{
           <li><u>Russian:</u> Nick Khazov (m2k3d0n@users.sourceforge.net) and Alexey Morsov (samurai@ricom.ru)</li>\
           <li><u>Serbian:</u> Anaximandar Milet (anaximandar@operamail.com)</li>\
           <li><u>Slovak:</u>  helix84</li>\
-          <li><u>Spanish:</u> Francisco Luque Contreras (frannoe@ya.com)</li>\
+          <li><u>Spanish:</u> Alfredo Monclús (alfrix), Francisco Luque Contreras (frannoe@ya.com)</li>\
           <li><u>Swedish:</u> Daniel Nylander (po@danielnylander.se)</li>\
           <li><u>Turkish:</u> Hasan YILMAZ (iletisim@hedefturkce.com) and Erdem Bingöl (erdem84@gmail.com)</li>\
-          <li><u>Ukrainian:</u> Andrey Shpachenko (masterfix@users.sourceforge.net) and Oleh Prypin (blaxpirit@gmail.com)</li></ul>");
+          <li><u>Ukrainian:</u> Oleh Prypin (blaxpirit@gmail.com)</li></ul>");
       trans_txt += "<p>"+tr("Please contact me if you would like to translate qBittorrent into your own language.")+"</p>";
       te_translation->setHtml(trans_txt);
       // License
       te_license->append(QString::fromUtf8("<a name='top'></a>"));
       QFile licensefile(":/gpl.html");
-      if(licensefile.open(QIODevice::ReadOnly|QIODevice::Text)) {
+      if (licensefile.open(QIODevice::ReadOnly|QIODevice::Text)) {
         te_license->setHtml(licensefile.readAll());
         licensefile.close();
       }

src/addnewtorrentdialog.h

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006  Christophe Dumez
+ * Copyright (C) 2012  Christophe Dumez
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -28,70 +28,66 @@
  * Contact : chris@qbittorrent.org
  */
 
-#ifndef TORRENTADDITION_H
+#ifndef ADDNEWTORRENTDIALOG_H
-#define TORRENTADDITION_H
+#define ADDNEWTORRENTDIALOG_H
-
-#include <QStringList>
-
-#include "ui_torrentadditiondlg.h"
 
+#include <QShortcut>
+#include <QDialog>
+#include <QUrl>
 #include <libtorrent/torrent_info.hpp>
 
-class TorrentFilesFilterModel;
+QT_BEGIN_NAMESPACE
+namespace Ui {
+class AddNewTorrentDialog;
+}
+QT_END_NAMESPACE
+
+class TorrentContentFilterModel;
 class PropListDelegate;
 
-class torrentAdditionDialog : public QDialog, private Ui_addTorrentDialog{
+class AddNewTorrentDialog : public QDialog
+{
   Q_OBJECT
-
+  
 public:
-  torrentAdditionDialog(QWidget *parent);
+  ~AddNewTorrentDialog();
-  ~torrentAdditionDialog();
-  void showLoadMagnetURI(QString magnet_uri);
-  void showLoad(QString filePath, QString from_url=QString::null);
-  QString getCurrentTruncatedSavePath(QString* root_folder_or_file_name = 0) const;
-  QString getTruncatedSavePath(QString save_path, QString* root_folder_or_file_name = 0) const;
-  bool allFiltered() const;
 
-public slots:
+  static void showTorrent(const QString& torrent_path, const QString& from_url = QString());
-  void displayContentListMenu(const QPoint&);
+  static void showMagnet(const QString& torrent_link);
+
+private slots:
+  void showAdvancedSettings(bool show);
+  void displayContentTreeMenu(const QPoint&);
+  void on_buttonBox_accepted();
+  void updateDiskSpaceLabel();
+  void onSavePathChanged(int);
+  void relayout();
   void renameSelectedFile();
-  void updateDiskSpaceLabels();
+  void setdialogPosition();
-  void on_browseButton_clicked();
+
-  void on_CancelButton_clicked();
+private:
-  void savePiecesPriorities();
+  explicit AddNewTorrentDialog(QWidget *parent = 0);
-  void on_OkButton_clicked();
+  bool loadTorrent(const QString& torrent_path, const QString& from_url);
-  void hideTorrentContent();
+  bool loadMagnet(const QString& magnet_uri);
-  void limitDialogWidth();
-  void saveTruncatedPathHistory();
   void loadSavePathHistory();
-  void updateLabelInSavePath(QString label);
+  void saveSavePathHistory() const;
-  void updateSavePathCurrentText();
+  int indexOfSavePath(const QString& save_path);
-  void resetComboLabelIndex(QString text);
+  void updateFileNameInSavePaths(const QString& new_filename);
-
+  void loadState();
-protected:
+  void saveState();
-  void closeEvent(QCloseEvent *event);
 
 private:
-  void readSettings();
+  Ui::AddNewTorrentDialog *ui;
-  void saveSettings();
+  TorrentContentFilterModel *m_contentModel;
-
+  PropListDelegate *m_contentDelegate;
-private:
+  bool m_isMagnet;
-  QString fileName;
+  QString m_filePath;
-  QString hash;
+  QString m_url;
-  QString filePath;
+  QString m_hash;
-  QString from_url;
+  boost::intrusive_ptr<libtorrent::torrent_info> m_torrentInfo;
-  QString defaultSavePath;
+  QStringList m_filesPath;
-  QString old_label;
+  bool m_hasRenamedFile;
-  bool appendLabelToSavePath;
+  QShortcut *editHotkey;
-  TorrentFilesFilterModel *PropListModel;
-  PropListDelegate *PropDelegate;
-  unsigned int nbFiles;
-  boost::intrusive_ptr<libtorrent::torrent_info> t;
-  QStringList files_path;
-  bool is_magnet;
-  int hidden_height;
-  QStringList path_history;
-  bool m_showContentList;
 };
 
-#endif
+#endif // ADDNEWTORRENTDIALOG_H

src/deletionconfirmationdlg.h

@@ -59,7 +59,7 @@ class DeletionConfirmationDlg : public QDialog, private Ui::confirmDeletionDlg {
 
   static bool askForDeletionConfirmation(bool *delete_local_files) {
     DeletionConfirmationDlg dlg;
-    if(dlg.exec() == QDialog::Accepted) {
+    if (dlg.exec() == QDialog::Accepted) {
       *delete_local_files = dlg.shouldDeleteLocalFiles();
       return true;
     }

src/dnsupdater.cpp

@@ -50,7 +50,7 @@ DNSUpdater::DNSUpdater(QObject *parent) :
   m_ipCheckTimer.start();
 
   // Check lastUpdate to avoid flooding
-  if(!m_lastIPCheckTime.isValid() ||
+  if (!m_lastIPCheckTime.isValid() ||
       m_lastIPCheckTime.secsTo(QDateTime::currentDateTime())*1000 > IP_CHECK_INTERVAL_MS) {
     checkPublicIP();
   }
@@ -79,19 +79,19 @@ void DNSUpdater::checkPublicIP()
 void DNSUpdater::ipRequestFinished(QNetworkReply *reply)
 {
   qDebug() << Q_FUNC_INFO;
-  if(reply->error()) {
+  if (reply->error()) {
     // Error
     qWarning() << Q_FUNC_INFO << "Error:" << reply->errorString();
   } else {
     // Parse response
     QRegExp ipregex("Current IP Address:\\s+([^<]+)</body>");
     QString ret = reply->readAll();
-    if(ipregex.indexIn(ret) >= 0) {
+    if (ipregex.indexIn(ret) >= 0) {
       QString ip_str = ipregex.cap(1);
       qDebug() << Q_FUNC_INFO << "Regular expression captured the following IP:" << ip_str;
       QHostAddress new_ip(ip_str);
-      if(!new_ip.isNull()) {
+      if (!new_ip.isNull()) {
-        if(m_lastIP != new_ip) {
+        if (m_lastIP != new_ip) {
           qDebug() << Q_FUNC_INFO << "The IP address changed, report the change to DynDNS...";
           qDebug() << m_lastIP.toString() << "->" << new_ip.toString();
           m_lastIP = new_ip;
@@ -157,7 +157,7 @@ QUrl DNSUpdater::getUpdateUrl() const
 
 void DNSUpdater::ipUpdateFinished(QNetworkReply *reply)
 {
-  if(reply->error()) {
+  if (reply->error()) {
     // Error
     qWarning() << Q_FUNC_INFO << "Error:" << reply->errorString();
   } else {
@@ -174,11 +174,11 @@ void DNSUpdater::processIPUpdateReply(const QString &reply)
   qDebug() << Q_FUNC_INFO << reply;
   QString code = reply.split(" ").first();
   qDebug() << Q_FUNC_INFO << "Code:" << code;
-  if(code == "good" || code == "nochg") {
+  if (code == "good" || code == "nochg") {
-    QBtSession::instance()->addConsoleMessage(tr("Your dynamic DNS was successfuly updated."), "green");
+    QBtSession::instance()->addConsoleMessage(tr("Your dynamic DNS was successfully updated."), "green");
     return;
   }
-  if(code == "911" || code == "dnserr") {
+  if (code == "911" || code == "dnserr") {
     QBtSession::instance()->addConsoleMessage(tr("Dynamic DNS error: The service is temporarily unavailable, it will be retried in 30 minutes."),
                                               "red");
     m_lastIP.clear();
@@ -188,30 +188,30 @@ void DNSUpdater::processIPUpdateReply(const QString &reply)
   // Everything bellow is an error, stop updating until the user updates something
   m_ipCheckTimer.stop();
   m_lastIP.clear();
-  if(code == "nohost") {
+  if (code == "nohost") {
     QBtSession::instance()->addConsoleMessage(tr("Dynamic DNS error: hostname supplied does not exist under specified account."),
                                               "red");
     m_state = INVALID_CREDS;
     return;
   }
-  if(code == "badauth") {
+  if (code == "badauth") {
     QBtSession::instance()->addConsoleMessage(tr("Dynamic DNS error: Invalid username/password."), "red");
     m_state = INVALID_CREDS;
     return;
   }
-  if(code == "badagent") {
+  if (code == "badagent") {
     QBtSession::instance()->addConsoleMessage(tr("Dynamic DNS error: qBittorrent was blacklisted by the service, please report a bug at http://bugs.qbittorrent.org."),
                                               "red");
     m_state = FATAL;
     return;
   }
-  if(code == "!donator") {
+  if (code == "!donator") {
     QBtSession::instance()->addConsoleMessage(tr("Dynamic DNS error: %1 was returned by the service, please report a bug at http://bugs.qbittorrent.org.").arg("!donator"),
                                               "red");
     m_state = FATAL;
     return;
   }
-  if(code == "abuse") {
+  if (code == "abuse") {
     QBtSession::instance()->addConsoleMessage(tr("Dynamic DNS error: Your username was blocked due to abuse."),
                                               "red");
     m_state = FATAL;
@@ -221,18 +221,18 @@ void DNSUpdater::processIPUpdateReply(const QString &reply)
 
 void DNSUpdater::updateCredentials()
 {
-  if(m_state == FATAL) return;
+  if (m_state == FATAL) return;
   Preferences pref;
   bool change = false;
   // Get DNS service information
-  if(m_service != pref.getDynDNSService()) {
+  if (m_service != pref.getDynDNSService()) {
     m_service = pref.getDynDNSService();
     change = true;
   }
-  if(m_domain != pref.getDynDomainName()) {
+  if (m_domain != pref.getDynDomainName()) {
     m_domain = pref.getDynDomainName();
     QRegExp domain_regex("^(?:(?!\\d|-)[a-zA-Z0-9\\-]{1,63}\\.)+[a-zA-Z]{2,}$");
-    if(domain_regex.indexIn(m_domain) < 0) {
+    if (domain_regex.indexIn(m_domain) < 0) {
       QBtSession::instance()->addConsoleMessage(tr("Dynamic DNS error: supplied domain name is invalid."),
                                                 "red");
       m_lastIP.clear();
@@ -242,9 +242,9 @@ void DNSUpdater::updateCredentials()
     }
     change = true;
   }
-  if(m_username != pref.getDynDNSUsername()) {
+  if (m_username != pref.getDynDNSUsername()) {
     m_username = pref.getDynDNSUsername();
-    if(m_username.length() < 4) {
+    if (m_username.length() < 4) {
       QBtSession::instance()->addConsoleMessage(tr("Dynamic DNS error: supplied username is too short."),
                                                 "red");
       m_lastIP.clear();
@@ -254,9 +254,9 @@ void DNSUpdater::updateCredentials()
     }
     change = true;
   }
-  if(m_password != pref.getDynDNSPassword()) {
+  if (m_password != pref.getDynDNSPassword()) {
     m_password = pref.getDynDNSPassword();
-    if(m_password.length() < 4) {
+    if (m_password.length() < 4) {
       QBtSession::instance()->addConsoleMessage(tr("Dynamic DNS error: supplied password is too short."),
                                                 "red");
       m_lastIP.clear();
@@ -267,7 +267,7 @@ void DNSUpdater::updateCredentials()
     change = true;
   }
 
-  if(m_state == INVALID_CREDS && change) {
+  if (m_state == INVALID_CREDS && change) {
     m_state = OK; // Try again
     m_ipCheckTimer.start();
     checkPublicIP();

src/downloadfromurldlg.h

@@ -43,38 +43,38 @@ class downloadFromURL : public QDialog, private Ui::downloadFromURL{
   Q_OBJECT
 
   public:
-    downloadFromURL(QWidget *parent): QDialog(parent){
+    downloadFromURL(QWidget *parent): QDialog(parent) {
       setupUi(this);
       setAttribute(Qt::WA_DeleteOnClose);
       setModal(true);
       show();
       // Paste clipboard if there is an URL in it
       QString clip_txt = qApp->clipboard()->text();
-      if(clip_txt.startsWith("http://", Qt::CaseInsensitive) || clip_txt.startsWith("https://", Qt::CaseInsensitive) || clip_txt.startsWith("ftp://", Qt::CaseInsensitive) || clip_txt.startsWith("magnet:", Qt::CaseInsensitive) || clip_txt.startsWith("bc://bt/", Qt::CaseInsensitive)) {
+      if (clip_txt.startsWith("http://", Qt::CaseInsensitive) || clip_txt.startsWith("https://", Qt::CaseInsensitive) || clip_txt.startsWith("ftp://", Qt::CaseInsensitive) || clip_txt.startsWith("magnet:", Qt::CaseInsensitive) || clip_txt.startsWith("bc://bt/", Qt::CaseInsensitive)) {
         textUrls->setText(clip_txt);
       }
     }
 
-    ~downloadFromURL(){}
+    ~downloadFromURL() {}
 
   signals:
     void urlsReadyToBeDownloaded(const QStringList& torrent_urls);
 
   public slots:
-    void on_downloadButton_clicked(){
+    void on_downloadButton_clicked() {
       QString urls = textUrls->toPlainText();
       QStringList url_list = urls.split(QString::fromUtf8("\n"));
       QString url;
       QStringList url_list_cleaned;
-      foreach(url, url_list){
+      foreach (url, url_list) {
         url = url.trimmed();
-        if(!url.isEmpty()){
+        if (!url.isEmpty()) {
-          if(url_list_cleaned.indexOf(QRegExp(url, Qt::CaseInsensitive, QRegExp::FixedString)) < 0){
+          if (url_list_cleaned.indexOf(QRegExp(url, Qt::CaseInsensitive, QRegExp::FixedString)) < 0) {
             url_list_cleaned << url;
           }
         }
       }
-      if(!url_list_cleaned.size()){
+      if (!url_list_cleaned.size()) {
         QMessageBox::critical(0, tr("No URL entered"), tr("Please type at least one URL."));
         return;
       }
@@ -83,7 +83,7 @@ class downloadFromURL : public QDialog, private Ui::downloadFromURL{
       close();
     }
 
-    void on_cancelButton_clicked(){
+    void on_cancelButton_clicked() {
       close();
     }
 };

src/downloadfromurldlg.ui

@@ -14,31 +14,14 @@
    <string>Download from urls</string>
   </property>
   <layout class="QVBoxLayout">
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <property name="margin">
-    <number>9</number>
-   </property>
    <item>
     <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
      <item>
       <widget class="QLabel" name="downloadURL_lbl">
        <property name="font">
         <font>
-         <family>Sans Serif</family>
-         <pointsize>12</pointsize>
          <weight>75</weight>
-         <italic>false</italic>
          <bold>true</bold>
-         <underline>false</underline>
-         <strikeout>false</strikeout>
         </font>
        </property>
        <property name="text">
@@ -65,13 +48,7 @@
      </property>
      <property name="font">
       <font>
-       <family>Sans Serif</family>
-       <pointsize>9</pointsize>
-       <weight>50</weight>
        <italic>true</italic>
-       <bold>false</bold>
-       <underline>false</underline>
-       <strikeout>false</strikeout>
       </font>
      </property>
      <property name="text">
@@ -81,12 +58,6 @@
    </item>
    <item>
     <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
      <item>
       <spacer>
        <property name="orientation">

src/downloadthread.cpp

@@ -32,7 +32,6 @@
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkProxy>
-#include <QNetworkCookie>
 #include <QNetworkCookieJar>
 
 #include "downloadthread.h"
@@ -51,11 +50,61 @@ DownloadThread::DownloadThread(QObject* parent) : QObject(parent) {
 #endif
 }
 
+QByteArray DownloadThread::gUncompress(Bytef *inData, size_t len) {
+  if (len <= 4) {
+    qWarning("gUncompress: Input data is truncated");
+    return QByteArray();
+  }
+
+  QByteArray result;
+  z_stream strm;
+  static const int CHUNK_SIZE = 1024;
+  char out[CHUNK_SIZE];
+
+  /* allocate inflate state */
+  strm.zalloc = Z_NULL;
+  strm.zfree = Z_NULL;
+  strm.opaque = Z_NULL;
+  strm.avail_in = len;
+  strm.next_in = inData;
+
+  const int windowBits = 15;
+  const int ENABLE_ZLIB_GZIP = 32;
+
+  int ret = inflateInit2(&strm, windowBits|ENABLE_ZLIB_GZIP); // gzip decoding
+  if (ret != Z_OK)
+    return QByteArray();
+
+  // run inflate()
+  do {
+    strm.avail_out = CHUNK_SIZE;
+    strm.next_out = reinterpret_cast<unsigned char*>(out);
+
+    ret = inflate(&strm, Z_NO_FLUSH);
+    Q_ASSERT(ret != Z_STREAM_ERROR); // state not clobbered
+
+    switch (ret) {
+    case Z_NEED_DICT:
+    case Z_DATA_ERROR:
+    case Z_MEM_ERROR:
+      (void) inflateEnd(&strm);
+
+      return QByteArray();
+    }
+
+    result.append(out, CHUNK_SIZE - strm.avail_out);
+  } while (!strm.avail_out);
+
+  // clean up and return
+  inflateEnd(&strm);
+  return result;
+}
+
 void DownloadThread::processDlFinished(QNetworkReply* reply) {
   QString url = reply->url().toString();
   qDebug("Download finished: %s", qPrintable(url));
   // Check if the request was successful
-  if(reply->error() != QNetworkReply::NoError) {
+  if (reply->error() != QNetworkReply::NoError) {
     // Failure
     qDebug("Download failure (%s), reason: %s", qPrintable(url), qPrintable(errorCodeToString(reply->error())));
     emit downloadFailure(url, errorCodeToString(reply->error()));
@@ -64,16 +113,22 @@ void DownloadThread::processDlFinished(QNetworkReply* reply) {
   }
   // Check if the server ask us to redirect somewhere lese
   const QVariant redirection = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
-  if(redirection.isValid()) {
+  if (redirection.isValid()) {
     // We should redirect
-    qDebug("Redirecting from %s to %s", qPrintable(url), qPrintable(redirection.toUrl().toString()));
+    QUrl newUrl = redirection.toUrl();
-    m_redirectMapping.insert(redirection.toUrl().toString(), url);
+    // Resolve relative urls
-    downloadUrl(redirection.toUrl().toString());
+    if (newUrl.isRelative())
+        newUrl = reply->url().resolved(newUrl);
+    const QString newUrlString = newUrl.toString();
+    qDebug("Redirecting from %s to %s", qPrintable(url), qPrintable(newUrlString));
+    m_redirectMapping.insert(newUrlString, url);
+    // redirecting with first cookies
+    downloadUrl(newUrlString, m_networkManager.cookieJar()->cookiesForUrl(url));
     reply->deleteLater();
     return;
   }
   // Checking if it was redirected, restoring initial URL
-  if(m_redirectMapping.contains(url)) {
+  if (m_redirectMapping.contains(url)) {
     url = m_redirectMapping.take(url);
   }
   // Success
@@ -82,9 +137,13 @@ void DownloadThread::processDlFinished(QNetworkReply* reply) {
   if (tmpfile->open()) {
     QString filePath = tmpfile->fileName();
     qDebug("Temporary filename is: %s", qPrintable(filePath));
-    if(reply->isOpen() || reply->open(QIODevice::ReadOnly)) {
+    if (reply->isOpen() || reply->open(QIODevice::ReadOnly)) {
-      // TODO: Support GZIP compression
+      QByteArray replyData = reply->readAll();
-      tmpfile->write(reply->readAll());
+      if (reply->rawHeader("Content-Encoding") == "gzip") {
+        // uncompress gzip reply
+        replyData = gUncompress(reinterpret_cast<unsigned char*>(replyData.data()), replyData.length());
+      }
+      tmpfile->write(replyData);
       tmpfile->close();
       // XXX: tmpfile needs to be deleted on Windows before using the file
       // or it will complain that the file is used by another process.
@@ -104,39 +163,21 @@ void DownloadThread::processDlFinished(QNetworkReply* reply) {
   reply->deleteLater();
 }
 
-#ifndef DISABLE_GUI
+void DownloadThread::downloadTorrentUrl(const QString &url, const QList<QNetworkCookie>& cookies)
-void DownloadThread::loadCookies(const QString &host_name, QString url) {
+{
-  const QList<QByteArray> raw_cookies = RssSettings().getHostNameCookies(host_name);
-  QNetworkCookieJar *cookie_jar = m_networkManager.cookieJar();
-  QList<QNetworkCookie> cookies;
-  qDebug("Loading cookies for host name: %s", qPrintable(host_name));
-  foreach(const QByteArray& raw_cookie, raw_cookies) {
-    QList<QByteArray> cookie_parts = raw_cookie.split('=');
-    if(cookie_parts.size() == 2) {
-      qDebug("Loading cookie: %s", raw_cookie.constData());
-      cookies << QNetworkCookie(cookie_parts.first(), cookie_parts.last());
-    }
-  }
-  cookie_jar->setCookiesFromUrl(cookies, url);
-  m_networkManager.setCookieJar(cookie_jar);
-}
-#endif
-
-void DownloadThread::downloadTorrentUrl(const QString &url) {
   // Process request
-  QNetworkReply *reply = downloadUrl(url);
+  QNetworkReply *reply = downloadUrl(url, cookies);
   connect(reply, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(checkDownloadSize(qint64,qint64)));
 }
 
-QNetworkReply* DownloadThread::downloadUrl(const QString &url){
+QNetworkReply* DownloadThread::downloadUrl(const QString &url, const QList<QNetworkCookie>& cookies) {
   // Update proxy settings
   applyProxySettings();
-#ifndef DISABLE_GUI
+  // Set cookies
-  // Load cookies
+  if (!cookies.empty()) {
-  QString host_name = QUrl::fromEncoded(url.toUtf8()).host();
+    qDebug("Setting %d cookies for url: %s", cookies.size(), qPrintable(url));
-  if(!host_name.isEmpty())
+    m_networkManager.cookieJar()->setCookiesFromUrl(cookies, url);
-    loadCookies(host_name, url);
+  }
-#endif
   // Process download request
   qDebug("url is %s", qPrintable(url));
   const QUrl qurl = QUrl::fromEncoded(url.toUtf8());
@@ -146,19 +187,21 @@ QNetworkReply* DownloadThread::downloadUrl(const QString &url){
   request.setRawHeader("User-Agent", "Mozilla/5.0 (X11; U; Linux i686 (x86_64); en-US; rv:1.9.1.5) Gecko/20091102 Firefox/3.5.5");
   qDebug("Downloading %s...", request.url().toEncoded().data());
   qDebug("%d cookies for this URL", m_networkManager.cookieJar()->cookiesForUrl(url).size());
-  for(int i=0; i<m_networkManager.cookieJar()->cookiesForUrl(url).size(); ++i) {
+  for (int i=0; i<m_networkManager.cookieJar()->cookiesForUrl(url).size(); ++i) {
     qDebug("%s=%s", m_networkManager.cookieJar()->cookiesForUrl(url).at(i).name().data(), m_networkManager.cookieJar()->cookiesForUrl(url).at(i).value().data());
     qDebug("Domain: %s, Path: %s", qPrintable(m_networkManager.cookieJar()->cookiesForUrl(url).at(i).domain()), qPrintable(m_networkManager.cookieJar()->cookiesForUrl(url).at(i).path()));
   }
+  // accept gzip
+  request.setRawHeader("Accept-Encoding", "gzip");
   return m_networkManager.get(request);
 }
 
 void DownloadThread::checkDownloadSize(qint64 bytesReceived, qint64 bytesTotal) {
   QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
-  if(!reply) return;
+  if (!reply) return;
-  if(bytesTotal > 0) {
+  if (bytesTotal > 0) {
     // Total number of bytes is available
-    if(bytesTotal > 1048576) {
+    if (bytesTotal > 1048576) {
       // More than 1MB, this is probably not a torrent file, aborting...
       reply->abort();
       reply->deleteLater();
@@ -166,7 +209,7 @@ void DownloadThread::checkDownloadSize(qint64 bytesReceived, qint64 bytesTotal)
       disconnect(reply, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(checkDownloadSize(qint64,qint64)));
     }
   } else {
-    if(bytesReceived  > 1048576) {
+    if (bytesReceived  > 1048576) {
       // More than 1MB, this is probably not a torrent file, aborting...
       reply->abort();
       reply->deleteLater();
@@ -177,13 +220,13 @@ void DownloadThread::checkDownloadSize(qint64 bytesReceived, qint64 bytesTotal)
 void DownloadThread::applyProxySettings() {
   QNetworkProxy proxy;
   const Preferences pref;
-  if(pref.isProxyEnabled()) {
+  if (pref.isProxyEnabled()) {
     // Proxy enabled
     proxy.setHostName(pref.getProxyIp());
     proxy.setPort(pref.getProxyPort());
     // Default proxy type is HTTP, we must change if it is SOCKS5
     const int proxy_type = pref.getProxyType();
-    if(proxy_type == Proxy::SOCKS5 || proxy_type == Proxy::SOCKS5_PW) {
+    if (proxy_type == Proxy::SOCKS5 || proxy_type == Proxy::SOCKS5_PW) {
       qDebug() << Q_FUNC_INFO << "using SOCKS proxy";
       proxy.setType(QNetworkProxy::Socks5Proxy);
     } else {
@@ -191,7 +234,7 @@ void DownloadThread::applyProxySettings() {
       proxy.setType(QNetworkProxy::HttpProxy);
     }
     // Authentication?
-    if(pref.isProxyAuthEnabled()) {
+    if (pref.isProxyAuthEnabled()) {
       qDebug("Proxy requires authentication, authenticating");
       proxy.setUser(pref.getProxyUsername());
       proxy.setPassword(pref.getProxyPassword());
@@ -203,7 +246,7 @@ void DownloadThread::applyProxySettings() {
 }
 
 QString DownloadThread::errorCodeToString(QNetworkReply::NetworkError status) {
-  switch(status){
+  switch(status) {
   case QNetworkReply::HostNotFoundError:
     return tr("The remote host name was not found (invalid hostname)");
   case QNetworkReply::OperationCanceledError:

src/downloadthread.h

@@ -32,9 +32,11 @@
 #define DOWNLOADTHREAD_H
 
 #include <QNetworkReply>
+#include <QNetworkCookie>
 #include <QObject>
 #include <QHash>
 #include <QSslError>
+#include <zlib.h>
 
 QT_BEGIN_NAMESPACE
 class QNetworkAccessManager;
@@ -45,8 +47,8 @@ class DownloadThread : public QObject {
 
 public:
   DownloadThread(QObject* parent = 0);
-  QNetworkReply* downloadUrl(const QString &url);
+  QNetworkReply* downloadUrl(const QString &url, const QList<QNetworkCookie>& cookies = QList<QNetworkCookie>());
-  void downloadTorrentUrl(const QString &url);
+  void downloadTorrentUrl(const QString &url, const QList<QNetworkCookie>& cookies = QList<QNetworkCookie>());
   //void setProxy(QString IP, int port, QString username, QString password);
 
 signals:
@@ -61,11 +63,9 @@ private slots:
 #endif
 
 private:
+  static QByteArray gUncompress(Bytef *inData, size_t len);
   QString errorCodeToString(QNetworkReply::NetworkError status);
   void applyProxySettings();
-#ifndef DISABLE_GUI
-  void loadCookies(const QString &host_name, QString url);
-#endif
 
 private:
   QNetworkAccessManager m_networkManager;

src/executionlog.cpp

@@ -50,10 +50,10 @@ ExecutionLog::ExecutionLog(QWidget *parent) :
     ui->tabBan->layout()->addWidget(m_banList);
 
     const QStringList log_msgs = QBtSession::instance()->getConsoleMessages();
-    foreach(const QString& msg, log_msgs)
+    foreach (const QString& msg, log_msgs)
       addLogMessage(msg);
     const QStringList ban_msgs = QBtSession::instance()->getPeerBanMessages();
-    foreach(const QString& msg, ban_msgs)
+    foreach (const QString& msg, ban_msgs)
       addBanMessage(msg);
     connect(QBtSession::instance(), SIGNAL(newConsoleMessage(QString)), SLOT(addLogMessage(QString)));
     connect(QBtSession::instance(), SIGNAL(newBanMessage(QString)), SLOT(addBanMessage(QString)));

src/executionlog.h

@@ -37,8 +37,8 @@ QT_BEGIN_NAMESPACE
 namespace Ui {
     class ExecutionLog;
 }
-class LogListWidget;
 QT_END_NAMESPACE
+class LogListWidget;
 
 class ExecutionLog : public QWidget
 {

src/filesystemwatcher.h

@@ -21,6 +21,7 @@
 #endif
 #endif
 
+#include "fs_utils.h"
 #include "misc.h"
 
 #ifndef CIFS_MAGIC_NUMBER
@@ -59,11 +60,11 @@ private:
 private:
   static bool isNetworkFileSystem(QString path) {
     QString file = path;
-    if(!file.endsWith(QDir::separator()))
+    if (!file.endsWith(QDir::separator()))
       file += QDir::separator();
     file += ".";
     struct statfs buf;
-    if(!statfs(file.toLocal8Bit().constData(), &buf)) {
+    if (!statfs(file.toLocal8Bit().constData(), &buf)) {
 #ifdef Q_WS_MAC
       // XXX: should we make sure HAVE_STRUCT_FSSTAT_F_FSTYPENAME is defined?
       return (strcmp(buf.f_fstypename, "nfs") == 0 || strcmp(buf.f_fstypename, "cifs") == 0 || strcmp(buf.f_fstypename, "smbfs") == 0);
@@ -118,23 +119,23 @@ private:
 
 public:
   FileSystemWatcher(QObject *parent): QFileSystemWatcher(parent) {
-    m_filters << "*.torrent";
+    m_filters << "*.torrent" << "*.magnet";
     connect(this, SIGNAL(directoryChanged(QString)), this, SLOT(scanLocalFolder(QString)));
   }
 
   ~FileSystemWatcher() {
 #ifndef Q_WS_WIN
-    if(watch_timer)
+    if (watch_timer)
       delete watch_timer;
 #endif
-    if(m_partialTorrentTimer)
+    if (m_partialTorrentTimer)
       delete m_partialTorrentTimer;
   }
 
   QStringList directories() const {
     QStringList dirs;
 #ifndef Q_WS_WIN
-    if(watch_timer) {
+    if (watch_timer) {
       foreach (const QDir &dir, watched_folders)
         dirs << dir.canonicalPath();
     }
@@ -149,7 +150,7 @@ public:
     if (!dir.exists())
       return;
     // Check if the path points to a network file system or not
-    if(isNetworkFileSystem(path)) {
+    if (isNetworkFileSystem(path)) {
       // Network mode
       qDebug("Network folder detected: %s", qPrintable(path));
       qDebug("Using file polling mode instead of inotify...");
@@ -194,7 +195,7 @@ protected slots:
     // Local folders scan
     addTorrentsFromDir(QDir(path), torrents);
     // Report detected torrent files
-    if(!torrents.empty()) {
+    if (!torrents.empty()) {
       qDebug("The following files are being reported: %s", qPrintable(torrents.join("\n")));
       emit torrentsAdded(torrents);
     }
@@ -210,7 +211,7 @@ protected slots:
       addTorrentsFromDir(dir, torrents);
     }
     // Report detected torrent files
-    if(!torrents.empty()) {
+    if (!torrents.empty()) {
       qDebug("The following files are being reported: %s", qPrintable(torrents.join("\n")));
       emit torrentsAdded(torrents);
     }
@@ -221,16 +222,16 @@ protected slots:
     QStringList no_longer_partial;
 
     // Check which torrents are still partial
-    foreach(const QString& torrent_path, m_partialTorrents.keys()) {
+    foreach (const QString& torrent_path, m_partialTorrents.keys()) {
-      if(!QFile::exists(torrent_path)) {
+      if (!QFile::exists(torrent_path)) {
         m_partialTorrents.remove(torrent_path);
         continue;
       }
-      if(misc::isValidTorrentFile(torrent_path)) {
+      if (fsutils::isValidTorrentFile(torrent_path)) {
         no_longer_partial << torrent_path;
          m_partialTorrents.remove(torrent_path);
       } else {
-        if(m_partialTorrents[torrent_path] >= MAX_PARTIAL_RETRIES) {
+        if (m_partialTorrents[torrent_path] >= MAX_PARTIAL_RETRIES) {
           m_partialTorrents.remove(torrent_path);
           QFile::rename(torrent_path, torrent_path+".invalid");
         } else {
@@ -240,7 +241,7 @@ protected slots:
     }
 
     // Stop the partial timer if necessary
-    if(m_partialTorrents.empty()) {
+    if (m_partialTorrents.empty()) {
       m_partialTorrentTimer->stop();
       m_partialTorrentTimer->deleteLater();
       qDebug("No longer any partial torrent.");
@@ -249,7 +250,7 @@ protected slots:
       m_partialTorrentTimer->start(WATCH_INTERVAL);
     }
     // Notify of new torrents
-    if(!no_longer_partial.isEmpty())
+    if (!no_longer_partial.isEmpty())
       emit torrentsAdded(no_longer_partial);
   }
 
@@ -259,7 +260,7 @@ signals:
 private:
   void startPartialTorrentTimer() {
     Q_ASSERT(!m_partialTorrents.isEmpty());
-    if(!m_partialTorrentTimer) {
+    if (!m_partialTorrentTimer) {
       m_partialTorrentTimer = new QTimer();
       connect(m_partialTorrentTimer, SIGNAL(timeout()), SLOT(processPartialTorrents()));
       m_partialTorrentTimer->setSingleShot(true);
@@ -269,19 +270,25 @@ private:
 
   void addTorrentsFromDir(const QDir &dir, QStringList &torrents) {
     const QStringList files = dir.entryList(m_filters, QDir::Files, QDir::Unsorted);
-    foreach(const QString &file, files) {
+    foreach (const QString &file, files) {
       const QString file_abspath = dir.absoluteFilePath(file);
-      if(misc::isValidTorrentFile(file_abspath)) {
+      if (file_abspath.endsWith(".magnet")) {
+        QFile f(file_abspath);
+        if (f.open(QIODevice::ReadOnly)
+            && !misc::magnetUriToHash(QString::fromLocal8Bit(f.readAll())).isEmpty()) {
+          torrents << file_abspath;
+        }
+      } else if (fsutils::isValidTorrentFile(file_abspath)) {
         torrents << file_abspath;
       } else {
-        if(!m_partialTorrents.contains(file_abspath)) {
+        if (!m_partialTorrents.contains(file_abspath)) {
           qDebug("Partial torrent detected at: %s", qPrintable(file_abspath));
           qDebug("Delay the file's processing...");
           m_partialTorrents.insert(file_abspath, 0);
         }
       }
     }
-    if(!m_partialTorrents.empty())
+    if (!m_partialTorrents.empty())
       startPartialTorrentTimer();
   }
 

src/fs_utils.h

@@ -0,0 +1,73 @@
+/*
+ * Bittorrent Client using Qt4 and libtorrent.
+ * Copyright (C) 2012  Christophe Dumez
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
+ * Contact : chris@qbittorrent.org
+ */
+
+#ifndef FS_UTILS_H
+#define FS_UTILS_H
+
+#include <QString>
+#include <QCoreApplication>
+
+/**
+ * Utility functions related to file system.
+ */
+class fsutils
+{
+  Q_DECLARE_TR_FUNCTIONS(fsutils)
+
+public:
+static QString toDisplayPath(const QString& path);
+static QString fileExtension(const QString& filename);
+static QString fileName(const QString& file_path);
+static qint64 computePathSize(const QString& path);
+static bool sameFiles(const QString& path1, const QString& path2);
+static QString updateLabelInSavePath(QString defaultSavePath, QString save_path, const QString& old_label, const QString& new_label);
+static QString toValidFileSystemName(QString filename);
+static bool isValidFileSystemName(const QString& filename);
+static long long freeDiskSpaceOnPath(QString path);
+static QString branchPath(const QString& file_path, QString* removed = 0);
+static bool sameFileNames(const QString& first, const QString& second);
+static QString expandPath(const QString& path);
+static bool isValidTorrentFile(const QString& path);
+static bool smartRemoveEmptyFolderTree(const QString& dir_path);
+static bool forceRemove(const QString& file_path);
+
+/* Ported from Qt4 to drop dependency on QtGui */
+static QString QDesktopServicesDataLocation();
+static QString QDesktopServicesCacheLocation();
+static QString QDesktopServicesDownloadLocation();
+/* End of Qt4 code */
+static QString searchEngineLocation();
+static QString BTBackupLocation();
+static QString cacheLocation();
+
+};
+
+#endif // FS_UTILS_H
+

src/geoip/geoipmanager.cpp

@@ -64,20 +64,20 @@
 #include <QFile>
 #include <QChar>
 
-#include "misc.h"
+#include "fs_utils.h"
 
 using namespace libtorrent;
 
 QString GeoIPManager::geoipFolder(bool embedded) {
 #ifdef WITH_GEOIP_EMBEDDED
-  if(embedded)
+  if (embedded)
     return ":/geoip/";
-  return misc::QDesktopServicesDataLocation()+"geoip"+QDir::separator();
+  return fsutils::QDesktopServicesDataLocation()+"geoip"+QDir::separator();
 #else
   Q_UNUSED(embedded);
-  if(QFile::exists("/usr/local/share/GeoIP/GeoIP.dat"))
+  if (QFile::exists("/usr/local/share/GeoIP/GeoIP.dat"))
     return "/usr/local/share/GeoIP/";
-  if(QFile::exists("/var/lib/GeoIP/GeoIP.dat"))
+  if (QFile::exists("/var/lib/GeoIP/GeoIP.dat"))
     return "/var/lib/GeoIP/";
   return "/usr/share/GeoIP/";
 #endif
@@ -89,22 +89,22 @@ QString GeoIPManager::geoipDBpath(bool embedded) {
 
 #ifdef WITH_GEOIP_EMBEDDED
 void GeoIPManager::exportEmbeddedDb() {
-  if(!QFile::exists(geoipDBpath(false)) || QFile(geoipDBpath(false)).size() != QFile(geoipDBpath(true)).size()) { // Export is required
+  if (!QFile::exists(geoipDBpath(false)) || QFile(geoipDBpath(false)).size() != QFile(geoipDBpath(true)).size()) { // Export is required
     qDebug("A local Geoip database update is required, proceeding...");
     // Create geoip folder is necessary
     QDir gfolder(geoipFolder(false));
-    if(!gfolder.exists()) {
+    if (!gfolder.exists()) {
-      if(!gfolder.mkpath(geoipFolder(false))) {
+      if (!gfolder.mkpath(geoipFolder(false))) {
         std::cerr << "Failed to create geoip folder at " << qPrintable(geoipFolder(false)) << std::endl;
         return;
       }
     }
     // Remove destination files
-    if(QFile::exists(geoipDBpath(false)))
+    if (QFile::exists(geoipDBpath(false)))
-      misc::safeRemove(geoipDBpath(false));
+      fsutils::forceRemove(geoipDBpath(false));
     // Copy from executable to hard disk
     qDebug("%s -> %s", qPrintable(geoipDBpath(true)), qPrintable(geoipDBpath(false)));
-    if(!QFile::copy(geoipDBpath(true), geoipDBpath(false))) {
+    if (!QFile::copy(geoipDBpath(true), geoipDBpath(false))) {
       std::cerr << "ERROR: Failed to copy geoip.dat from executable to hard disk" << std::endl;
     }
     qDebug("Local Geoip database was updated");
@@ -116,7 +116,7 @@ void GeoIPManager::loadDatabase(session *s) {
 #ifdef WITH_GEOIP_EMBEDDED
   exportEmbeddedDb();
 #endif
-  if(QFile::exists(geoipDBpath(false))) {
+  if (QFile::exists(geoipDBpath(false))) {
     qDebug("Loading GeoIP database from %s...", qPrintable(geoipDBpath(false)));
     s->load_country_db(geoipDBpath(false).toLocal8Bit().constData());
   } else {
@@ -183,9 +183,9 @@ const char * country_name[253] =
  "Saint Barthelemy","Saint Martin"};
 
 QString GeoIPManager::CountryISOCodeToName(const char* iso) {
-  if(iso[0] == 0) return "N/A";
+  if (iso[0] == 0) return "N/A";
-  for(uint i = 0; i < num_countries; ++i) {
+  for (uint i = 0; i < num_countries; ++i) {
-    if(iso[0] == country_code[i][0] &&  iso[1] == country_code[i][1]) {
+    if (iso[0] == country_code[i][0] &&  iso[1] == country_code[i][1]) {
       return QLatin1String(country_name[i]);
     }
   }
@@ -195,7 +195,7 @@ QString GeoIPManager::CountryISOCodeToName(const char* iso) {
 
 // http://www.iso.org/iso/country_codes/iso_3166_code_lists/english_country_names_and_code_elements.htm
 QIcon GeoIPManager::CountryISOCodeToIcon(const char* iso) {
-  if(iso[0] == 0 || iso[0] == '!') return QIcon();
+  if (iso[0] == 0 || iso[0] == '!') return QIcon();
   const QString isoStr = QString(QByteArray(iso, 2)).toLower();
   return QIcon(":/Icons/flags/"+isoStr+".png");
 }

src/headlessloader.h

@@ -55,7 +55,7 @@ public:
     std::cout << qPrintable(tr("To control qBittorrent, access the Web UI at http://localhost:%1").arg(QString::number(pref.getWebUiPort()))) << std::endl;
     std::cout << qPrintable(tr("The Web UI administrator user name is: %1").arg(pref.getWebUiUsername())) << std::endl;
     qDebug() << "Password:" << pref.getWebUiPassword();
-    if(pref.getWebUiPassword() == "32fe0bd2bb001911bb8bcfe23fc92b63") {
+    if (pref.getWebUiPassword() == "32fe0bd2bb001911bb8bcfe23fc92b63") {
       std::cout << qPrintable(tr("The Web UI administrator password is still the default one: %1").arg("adminadmin")) << std::endl;
       std::cout << qPrintable(tr("This is a security risk, please consider changing your password from program preferences.")) << std::endl;
     }
@@ -85,16 +85,16 @@ public slots:
   // the right addTorrent function, considering
   // the parameter type.
   void processParams(const QStringList& params) {
-    foreach(QString param, params) {
+    foreach (QString param, params) {
       param = param.trimmed();
-      if(param.startsWith(QString::fromUtf8("http://"), Qt::CaseInsensitive) || param.startsWith(QString::fromUtf8("ftp://"), Qt::CaseInsensitive) || param.startsWith(QString::fromUtf8("https://"), Qt::CaseInsensitive)) {
+      if (param.startsWith(QString::fromUtf8("http://"), Qt::CaseInsensitive) || param.startsWith(QString::fromUtf8("ftp://"), Qt::CaseInsensitive) || param.startsWith(QString::fromUtf8("https://"), Qt::CaseInsensitive)) {
         QBtSession::instance()->downloadFromUrl(param);
       }else{
-        if(param.startsWith("bc://bt/", Qt::CaseInsensitive)) {
+        if (param.startsWith("bc://bt/", Qt::CaseInsensitive)) {
           qDebug("Converting bc link to magnet link");
           param = misc::bcLinkToMagnet(param);
         }
-        if(param.startsWith("magnet:", Qt::CaseInsensitive)) {
+        if (param.startsWith("magnet:", Qt::CaseInsensitive)) {
           QBtSession::instance()->addMagnetUri(param);
         } else {
           QBtSession::instance()->addTorrent(param);

src/hidabletabwidget.h

@@ -44,7 +44,7 @@ public:
 protected:
   void tabInserted(int index) {
     QTabWidget::tabInserted(index);
-    if(count() == 1) {
+    if (count() == 1) {
       showTabBar(false);
     } else {
       showTabBar(true);
@@ -53,7 +53,7 @@ protected:
 
   void tabRemoved(int index) {
     QTabWidget::tabInserted(index);
-    if(count() == 1) {
+    if (count() == 1) {
       showTabBar(false);
     } else {
       showTabBar(true);