Bump to v3.0.9

Commenting Mingw release flags section for now. Strace is not reliable with mingw (only calls to other libraries are resolved, internal calls show up as addresses).

.gitignore

@@ -0,0 +1,14 @@
+src/geoip/GeoIP.dat
+src/qbittorrent
+qbittorrent.pro.user
+conf.pri
+Makefile
+*.pyc
+*.log
+# Compiled object files
+*.o
+# Generated MOC, resource and UI files
+moc_*.cpp
+qrc_*.cpp
+ui_*.h
+*.moc

AUTHORS

@@ -50,6 +50,10 @@ Images Authors:
   copyright: Greg Houston <gregory.houston@gmail.com>
   license: MIT
 
+* file: src/Icons/skin/qbittorrent_mono*
+  copyright: Daniel Eguren <deguren@gmail.com>
+  license: LGPL
+
 * file: src/search_engine/engines/btjunkie.png
   copyright: Downloaded from btjunkie.org
 
@@ -70,6 +74,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)
@@ -83,11 +89,13 @@ 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)
-  - Japanese: Nardog (alphisation@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)
   - Norwegian: Tomaso
@@ -100,5 +108,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,80 +1,140 @@
-* Sn Mar 13 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.8
-  - BUFIX: Fix compilation with libtorrent v0.14.x
-  - BUGFIX: Fix issues when writing on NTFS (Linux, Mac)
-  - BUGFIX: Fix root folder being cut off if the torrent comes from a scanned folder (Christian Kandeler)
-  - BUGFIX: Improve folder removal behavior
-  - BUGFIX: Make sure the .unwanted folder is deleted on soft torrent removal
-  - BUGFIX: Indicate support for Magnet links in desktop file (Fisiu)
-  - BUGFIX: Do not report torrent being checked as queued
-  - BUGFIX: Improve lists columns state saving
+* 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
 
-* Sat Feb 26 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.7
-  - BUGFIX: Encoding fixes (Windows)
-  - BUGFIX: Fix "append label to save path" (Windows)
-  - BUGFIX: Disable OS cache for aligned files to reduce memory consumption
-  - BUGFIX: Fix torrent upload from Web UI (Windows)
-  - BUGFIX: Fix cursor problem in torrent addition dialog
-  - BUGFIX: Fix crash when additing an empty tracker URL
-  - BUGFIX: Share ratio can now go over 100
-  - BUGFIX: Fix compilation with boost >= v1.46
+* 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
 
-* Tue Feb 8 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.6 
-  - FEATURE: IP address reported to trackers is now customizable
-  - BUGFIX: Use slashes instead of antislashes in URLs (Windows)
-  - BUGFIX: Fix articles read state reset problem in RSS
-  - BUGFIX: Fix possible path encoding issues on Windows
-  - BUGFIX: Fix downloads from URLs on Windows
-  - I18N: Added Lithuanian translation
-  - COSMETIC: Improve main window layout
-  - COSMETIC: Improve properties buttons style
-  - COSMETIC: Display pieces being downloaded in green instead of yellow
-  - COSMETIC: Improve piece availability bar appearance
+* 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)
 
-* Thu Feb 3 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.5
-   - BUGFIX: Make sure the progress is not 100% unless the file is complete
-   - BUGFIX: Fix memory leak in HTTP torrent downloader
-   - BUGFIX: Use native file dialogs (by Vladimir Golovnev)
-   - BUGFIX: Fix encoding problem in torrent moving code (by Vladimir Golovnev)
-   - BUGFIX: Performance improvement on ARM
-   - BUGFIX: RSS code rewrite (more cpu/memory efficient)
-   - I18N: Updated Norwegian translation (Tomaso)
+* 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 Jan 23 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.4
-   - BUGFIX: Added unicode support to email notification
-   - BUGFIX: Improved compatibility with various SMTP servers
-   - BUGFIX: Fix Labeling in RSS downloader
-   - BUGFIX: Avoid main window flashing on startup (closes #703984)
-   - BUGFIX: Improved hostname resolution code
-   - BUGFIX: Dropped dependency on libboost-thread
-   - BUGFIX: Display legal notice on screen center
-   - BUGFIX: Fix renaming of single-file torrents (by Vladimir Golovnev)
-   - I18N: More dialog buttons are now translated (by Vladimir Golovnev)
-   - I18N: Fix translation of size units (by Vladimir Golovnev)
+* 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
 
-* Sat Jan 15 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.3
-   - BUGFIX: Fix possible crashes in full allocation mode
-   - BUGFIX: Fix icon size issues (Linux, icon theme)
-   - BUGFIX: Fixed file priority context menu
-   - BUGFIX: Remove dbus dependency in nox mode
-   - BUGFIX: Fix compilation on FreeBSD
-   - I18N: Improve Web UI translation
-   - I18N: Updated Polish translation
+* 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.
 
-* Wed Jan 12 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.2
-    - BUGFIX: Do not report PeX as being disabled when DHT is
-    - BUGFIX: Fix possible crash on adding magnet links
-    - BUGFIX: Fix torrent import (was not working)
-    - I18N: Updated Greek, Croatian, Russian, Unkrainian and Bulgarian translations
-    - I18N: Added Armenian translation (New)
-    - I18N: Remove country flags from program preferences (language selection)
-    - I18N: Translate locale names (language selection)
+* 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
 
-* Mon Jan 10 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.1
-    - BUGFIX: Really disable torrent addition dialog by default
-    - BUGFIX: Fix some missing icons in the Web UI
-    - BUGFIX: Fix magnet torrent name update problem
-    - COSMETIC: Use 24px size for toolbar icons and reduce spacing
-    - COSMETIC: Move transfer list filter on the right side of the toolbar
+* 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
+    - FEATURE: Add advanced setting to announce to all trackers
+    - FEATURE: Add support for anonymous mode (libtorrent >= v0.16)
+    - FEATURE: Add quick "set as default save path" checkbox to torrent addition dialog (sledgehammer999)
+    - BUGFIX: Add tray menu entry for toggling window visibility
+    - BUGFIX: Fix execution log lines selection and copying
+    - BUGFIX: Reduce CPU usage when running Web UI
+    - BUGFIX: Save RSS items to disk regularly for safety
+    - BUGFIX: Fix ratio calculation (use all_time_download)
+    - BUGFIX: Fix torrent upload issues (Web UI)
+    - BUGFIX: Fix some IE incompatibilities (Web UI)
+    - COSMETIC: Display speed at the beginning of the Window title
+    - COSMETIC: Several cosmetic fixes to the Web UI
+    - COSMETIC: Make top toolbar follow system style
+    - OTHER: Display libraries versions in about dialog (sledgehammer999)
+    - OTHER: Display qBittorrent version in Web UI about dialog
+
+* Thu Jun 02 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.8.0
+    - FEATURE: Added full libtorrent v0.16 support (uTP, ...)
+    - FEATURE: Proxy can be disabled for peer connections
+    - FEATURE: Added support for secure SMTP connection (SSL)
+    - FEATURE: Added support for SMTP authentication
+    - FEATURE: Added UPnP/NAT-PMP port forward for the Web UI port
+    - FEATURE: qBittorrent can update dynamic DNS services (DynDNS, no-ip)
+    - FEATURE: Display peer connection type in peer list (BT, uTP, Web)
+    - FEATURE: Added full regex support to RSS downloader
+    - FEATURE: Added regex help and validation in RSS downloader
+    - FEATURE: Added HTTPS support to Web UI (Ishan Arora)
+    - BUGFIX: Change systray icon on the fly (no restart needed)
+    - BUGFIX: Remember peer-level rate limits (requires libtorrent v0.16)
+    - BUGFIX: Stop annoncing to trackers an all tiers (more respectful)
+    - BUGFIX: Stop sharing private trackers with other peers
+    - BUGFIX: Tracker exchange extension can be disabled
+    - BUGFIX: Cleaner program exit on system log out
+    - BUGFIX: Fix possible magnet link parsing problems
+    - BUGFIX: Fix possible RSS URL parsing problems
+    - COSMETIC: Added monochrome icon for light themes 
+
+* Sun Mar 20 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.7.0
+    - FEATURE: Added search field for torrent content
+    - FEATURE: Added auto-shutdown confirmation dialog
+    - FEATURE: Added option to skip torrent deletion confirmation (Ville Kiiskinen)
+    - FEATURE: IP address reported to trackers is now customizable
+    - FEATURE: Inhibit system sleep when torrents are active (Vladimir Golovnev)
+    - FEATURE: Added option to bypass Web UI authentication for localhost
+    - FEATURE: Added option to disable program exit confirmation
+    - FEATURE: Added per-torrent ratio limiting (Christian Kandeler)
+    - FEATURE: Torrent content list is now sortable
+    - BUGFIX: Fix compilation with namespaced Qt (Christian Kandeler)
+    - BUGFIX: Added length restriction on UI lock password
+    - COSMETIC: Added monochrome tray icon
+    - COSMETIC: Improved status bar's style
+    - OTHER: Make QtDBus dependency optional (X11)
 
 * Sun Jan 9 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.0
     - FEATURE: Use system icons (Linux, Qt >= 4.6)

INSTALL

@@ -10,25 +10,23 @@ qBittorrent - A BitTorrent client in C++ / Qt4
   will install and execute qBittorrent hopefully without any problems.
 
   Dependencies:
-    - Qt >= 4.5.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
+    - 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 (needed by search engine)
         * Run time only dependency
 
-    - libnotify >= 0.4.2, glib-2.0 (optional)
-        * Can be used for system notifications to replace standard Qt notifications
-          so that it integrates better into the Desktop
-
     - geoip-database (optional)
         * If qBittorrent cannot find this database, it will try to resolve countries using the Internet but it will be a lot slower.
         * Run time only dependency
@@ -46,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:

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
- 
-    ftp://ftp.netlabs.org/pub/unixos2/ssl10.zip
+klibc
+-----
 
-* 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 send bugreports to:
-
-  ecs@aroa.ch
-
+Please create bugreports at http://svn.netlabs.org/qtapps
 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
-LIBS += -ltorrent-rasterbar -lcrypto -L/opt/local/lib -lboost_system-mt -lboost_filesystem-mt -lboost_thread-mt -framework Cocoa -framework Carbon
+# Use pkg-config to get all necessary libtorrent DEFINES
+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,9 +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

@@ -2,3 +2,17 @@ TEMPLATE = subdirs
 
 SUBDIRS += src
 
+include(version.pri)
+
+# Dist
+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 += cd .. &&
+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

qbittorrent.qc

@@ -6,6 +6,8 @@
   <dep type='qt4'>
     <required/>
   </dep>
+  <dep type='qt-dbus'>
+  </dep>
   <dep type='pkg-config'>
     <required/>
   </dep>
@@ -15,8 +17,6 @@
   <dep type='libboost'>
     <required/>
   </dep>
-  <dep type='libnotify'>
-  </dep>
   <dep type='geoip-database'>
   </dep>
   <dep type='qtsingleapplication'>

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) {}
-	QString name() const { return "libboost"; }
-	QString shortname() const { return "libboost"; }
+  qc_libboost(Conf *c) : ConfObj(c) {}
+  QString name() const { return "libboost"; }
+  QString shortname() const { return "libboost"; }
+
   QString findBoostLib(QString path, QString lib) const {
     QString name;
     QDir libDir(path);
@@ -35,78 +38,60 @@ public:
     }
     return name;
   }
-	bool exec(){
-        	QString s;
-		s = conf->getenv("QC_WITH_LIBBOOST_INC");
-		if(!s.isEmpty()) {
-			if(!conf->checkHeader(s, "boost/format.hpp")) {
-				return false;
-      			}
-			if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
-				return false;
-      			}
-			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
-				return false;
-      			}
-		}else{
-			QStringList sl;
-			sl << "/usr/include";
-			sl << "/usr/local/include";
-			bool found = false;
-			foreach(s, sl){
-				if(conf->checkHeader(s, "boost/format.hpp")){
-					found = true;
-					break;
-				}
-			}
-			if(!found) {
-				return false;
-          		}
-			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");
+
+  bool exec(){
+    QStringList sl;
+    QString s = conf->getenv("QC_WITH_LIBBOOST_INC");
+    if (!s.isEmpty())
+      sl << s;
+    sl << "/usr/include";
+    sl << "/usr/local/include";
+    bool found = false;
+    foreach (s, sl) {
+      if (conf->checkHeader(s, "boost/format.hpp")
+#if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16
+          && conf->checkHeader(s, "boost/filesystem/path.hpp")
+#endif
+         ) {
+        found = true;
+        break;
+      }
+    }
+    if (!found)
+      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(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-      // Not required by nox
-      required_libs << "filesystem" ;
-    }
+#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()) {
-        QString detected_name = findBoostLib(s, lib);
-        if(detected_name.isEmpty()) {
-          printf("Could not find boost %s library!\n", qPrintable(lib));
-          return false;
-        } else {
+      bool found = false;
+      foreach(const QString& libDir, libDirs) {
+        QString detected_name = findBoostLib(libDir, lib);
+        if(!detected_name.isEmpty()) {
           conf->addLib("-l"+detected_name);
-        }
-      } else {
-        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;
+          found = true;
+          break;
         }
       }
+      if(!found) {
+        printf("Could not find boost %s library!\n", qPrintable(lib));
+        return false;
+      }
     }
-		return true;
-	}
+    return true;
+  }
 };

qcm/libtorrent-rasterbar.qcm

@@ -8,20 +8,17 @@ 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))
 			return false;
 		for(int n = 0; n < incs.count(); ++n)
 			conf->addIncludePath(incs[n]);
-		if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-  		  conf->addLib("-lcrypto");
-                }
 		return true;
 	}
 };

qcm/qt-dbus.qcm

@@ -0,0 +1,31 @@
+/*
+-----BEGIN QCMOD-----
+name: qt-dbus
+-----END QCMOD-----
+*/
+// see  Conf::findPkgConfig
+class qc_qt_dbus : public ConfObj
+{
+public:
+	qc_qt_dbus(Conf *c) : ConfObj(c) {}
+	QString name() const { return "QtDBus >= 4.5"; }
+	QString shortname() const { return "qt-dbus"; }
+        QString checkString() const {
+                if(!conf->getenv("QC_DISABLE_qt_dbus").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
+                        return "";
+                return ConfObj::checkString();
+        }
+	bool exec(){
+                if(!conf->getenv("QC_DISABLE_qt_dbus").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
+                  return false;
+		QStringList incs;
+		QString req_ver = "4.5.0";
+		QString version, libs, other;
+		VersionMode mode = VersionMin;
+		if(conf->findPkgConfig("QtDBus", mode, req_ver, &version, &incs, &libs, &other)) {
+                        conf->addExtra("CONFIG += dbus");
+			return true;
+                }
+		return false;
+	}
+};

qcm/qt-svg.qcm

@@ -0,0 +1,31 @@
+/*
+-----BEGIN QCMOD-----
+name: qt-svg
+-----END QCMOD-----
+*/
+// see  Conf::findPkgConfig
+class qc_qt_svg : public ConfObj
+{
+public:
+	qc_qt_svg(Conf *c) : ConfObj(c) {}
+	QString name() const { return "QtSvg >= 4.5"; }
+	QString shortname() const { return "qt-svg"; }
+        QString checkString() const {
+                if(!conf->getenv("QC_DISABLE_qt_svg").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
+                        return "";
+                return ConfObj::checkString();
+        }
+	bool exec(){
+                if(!conf->getenv("QC_DISABLE_qt_svg").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
+                  return false;
+		QStringList incs;
+		QString req_ver = "4.5.0";
+		QString version, libs, other;
+		VersionMode mode = VersionMin;
+		if(conf->findPkgConfig("QtSvg", mode, req_ver, &version, &incs, &libs, &other)) {
+                        conf->addExtra("CONFIG += svg");
+			return true;
+                }
+		return false;
+	}
+};

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 shortname() const { return "Qt 4.5"; }
+	QString name() const { return "Qt >= 4.6"; }
+	QString shortname() const { return "Qt 4.6"; }
 	bool exec()
 	{
                 // NOX mode
@@ -19,7 +19,11 @@ public:
 		}
                 // Debug mode
                 if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) {
+                  conf->addExtra("CONFIG -= release");
                   conf->addExtra("CONFIG += debug");
+                } else {
+                  conf->addExtra("CONFIG -= debug");
+                  conf->addExtra("CONFIG += release");
                 }
                 #ifdef Q_OS_FREEBSD
                   conf->addLib("-lexecinfo");
@@ -27,6 +31,6 @@ public:
                 #else
                   conf->addExtra("MANPREFIX = $$PREFIX/share"); 
                 #endif
-		return(QT_VERSION >= 0x040500);
+		return(QT_VERSION >= 0x040600);
 	}
 };

src/Icons/qBittorrent.desktop

@@ -1,6 +1,5 @@
 [Desktop Entry]
-Categories=Qt;Network;P2P;
-Comment=V2.6.8
+Categories=Network;FileTransfer;P2P;Qt;
 Exec=qbittorrent %U
 GenericName=BitTorrent client
 GenericName[ar]=العميل BitTorrent
@@ -30,6 +29,9 @@ GenericName[tr]=BitTorrent istemcisi
 GenericName[uk]=BitTorrent-клієнт
 GenericName[zh]=BitTorrent之用户
 GenericName[zh_TW]=BitTorrent客戶端
+Comment=Download and share files over BitTorrent
+Comment[fr]=Télécharger et partager des fichiers avec BitTorrent
+Comment[pl]=Dzielenie się plikami przez BitTorrent
 Icon=qbittorrent
 MimeType=application/x-bittorrent;x-scheme-handler/magnet;
 Name=qBittorrent

src/about_imp.h

@@ -33,6 +33,9 @@
 
 #include "ui_about.h"
 #include <QFile>
+#include <QtGlobal>
+#include <libtorrent/version.hpp>
+#include <boost/version.hpp>
 
 class about : public QDialog, private Ui::AboutDlg{
   Q_OBJECT
@@ -42,7 +45,7 @@ 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
@@ -61,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>\
@@ -72,11 +77,13 @@ 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>Japanese:</u> Nardog (alphisation@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>\
           <li><u>Norwegian:</u> Tomaso</li>\
@@ -89,16 +96,20 @@ class about : public QDialog, private Ui::AboutDlg{
           <li><u>Spanish:</u> 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();
       }
+      // Libraries
+      label_11->setText(QT_VERSION_STR);
+      label_12->setText(LIBTORRENT_VERSION);
+      label_13->setText(QString::number(BOOST_VERSION / 100000) + "." + QString::number((BOOST_VERSION / 100) % 1000) + "." + QString::number(BOOST_VERSION % 100));
       show();
     }
 };

src/addnewtorrentdialog.h

@@ -0,0 +1,91 @@
+/*
+ * 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 ADDNEWTORRENTDIALOG_H
+#define ADDNEWTORRENTDIALOG_H
+
+#include <QDialog>
+#include <QUrl>
+#include <libtorrent/torrent_info.hpp>
+
+QT_BEGIN_NAMESPACE
+namespace Ui {
+class AddNewTorrentDialog;
+}
+QT_END_NAMESPACE
+
+class TorrentContentFilterModel;
+class PropListDelegate;
+
+class AddNewTorrentDialog : public QDialog
+{
+  Q_OBJECT
+  
+public:
+  ~AddNewTorrentDialog();
+
+  static void showTorrent(const QString& torrent_path, const QString& from_url = QString());
+  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 setdialogPosition();
+
+private:
+  explicit AddNewTorrentDialog(QWidget *parent = 0);
+  bool loadTorrent(const QString& torrent_path, const QString& from_url);
+  bool loadMagnet(const QString& magnet_uri);
+  void loadSavePathHistory();
+  void saveSavePathHistory() const;
+  int indexOfSavePath(const QString& save_path);
+  void updateFileNameInSavePaths(const QString& new_filename);
+  void loadState();
+  void saveState();
+
+private:
+  Ui::AddNewTorrentDialog *ui;
+  TorrentContentFilterModel *m_contentModel;
+  PropListDelegate *m_contentDelegate;
+  bool m_isMagnet;
+  QString m_filePath;
+  QString m_url;
+  QString m_hash;
+  boost::intrusive_ptr<libtorrent::torrent_info> m_torrentInfo;
+  QStringList m_filesPath;
+  bool m_hasRenamedFile;
+};
+
+#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;
     }