Tagged v2.4.11 release

torrent is really complete (closes #674349)

AUTHORS

@@ -36,9 +36,9 @@ Images Authors:
   url: http://www.oxygen-icons.org
 
 * files: src/Icons/flags/*.png
-  copyright: Mark James <mjames@gmail.com>
+  copyright: Open Clip Art Library
-  license: Public Domain
+  license: Creative Commons Public Domain Dedication
-  url: http://www.famfamfam.com
+  url: http://www.openclipart.org
 
 * files: src/Icons/skin/*.png
   files: src/menuicons/YYxYY/*.png
@@ -76,7 +76,7 @@ Translations authors:
   - Croatian: Oliver Mucafir (oliver.untwist@gmail.com)
   - Czech: Jirka Vilim (web@tets.cz)
   - Danish: Mathias Nielsen (comoneo@gmail.com)
-  - Dutch: Pieter Heyvaert (pieter_heyvaert@hotmail.com)
+  - Dutch: Joost Schipper (heavyjoost@users.sourceforge.net)
   - English: Christophe Dumez (chris@qbittorrent.org)
   - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net)
   - French: Christophe Dumez (chris@qbittorrent.org)

Changelog

@@ -1,62 +1,99 @@
-* Thu Jan 6 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.5.4
+* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.4.11
-    - BUGFIX: Added --enable-debug parameter to the configure script
+    - BUGFIX: Do not report a progress of 100% in the Web UI unless the
-    - BUGFIX: Prioritize first and last pieces when sequential download is enabled
+    torrent is really complete (closes #674349)
-    - BUGFIX: Some encoding fixes (Windows)
+    - BUGFIX: Fix possible incorrect behavior with queueing
-    - BUGFIX: Display default password on stdout when using nox
+    - BUGFIX: Fix RSS refresh interval saving
-    - BUGFIX: Fix issues when search engines results contain a '|'
+    - BUGFIX: Fix possible crash when setting RSS proxy (closes #676288)
-    - BUGFIX: Avoid possible crash on exit when the IP filter is enabled (closes #695945)
+    - BUGFIX: Fix HTTP redirect issue that would cause the torrent addition to
+    show up for automated RSS downloads (Closes #677565)
 
-* Sat Jan 1 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.5.3
+* Wed Nov 10 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.10
-    - BUGFIX: Fix priority up/down for multiple torrents at the same time (closes #692184)
+    - BUGFIX: Fix possible crash when selecting a RSS item (really closes #575624)
-    - BUGFIX: Make sure the number of torrents is properly set on startup (closes #694135)
+    - BUGFIX: Improved IPv6 support (IP filter and Peer list)
-    - BUGFIX: Fix scan directories saving (closes #694768)
+    - BUGFIX: Make IP filter more tolerant towards strangely formatted IPs
-    - BUGFIX: Remove empty folders on torrent soft deletion (closes #695174)
+    - BUGFIX: More reliable folder scanning
-    - BUGFIX: Make sure the main window has focus on startup
+    - BUGFIX: Do not create the torrent root folder at final destination if
-    - BUGFIX: Fix ampersand display in search tabs (closes #695715)
+    torrent is in the temp dir (closes #673271)
+    - BUGFIX: Fix compilation with libnotify v0.7.0 (closes #671769)
+    - BUGFIX: Use a pointing cursor over status bar buttons
 
-* Sun Dec 19 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.5.2
+* Sun Oct 31 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.9
-    - BUGFIX: Fix alternative speed icon staying pressed when disabled
+    - BUGFIX: Fix crash when pressing enter in save path field in torrent addition dialog
-    - BUGFIX: Fix slot warning on startup
+    - BUGFIX: Fix crash when deleting a torrent with no metadata (closes #667528)
-    - BUGFIX: Fix alignment issues in program preferences
+    - BUGFIX: Fix possible crash on clicking a RSS article (closes #575624)
-    - BUGFIX: Make sure we don't move completed torrent to the temp directory
+    - BUGFIX: Correctly update total number of torrents when a torrent is automatically removed (closes #668726)
-    for checking (closes #602938)
+    - BUGFIX: Correctly display the hash of torrents with no metadata
-    - BUGFIX: Fix some 'File Not found' warning in the Web UI
+    - BUGFIX: Elide status bar text if it is too wide
-    - BUGFIX: Fix dangerous usage of vector iterator
+    - BUGFIX: Make sure the splash screen is displayed for 2 seconds
-    - BUGFIX: No longer expand the first folder in the torrent content list
+    - BUGFIX: Make listening on a particular interface more reliable
-    - BUGFIX: Fixes possible crash in the RSS Downloader dialog (closes #691426)
+    - BUGFIX: Fix torrent size update in torrent addition dialog
+    - BUGFIX: Fix possible crash on qBittorrent shutdown
+    - BUGFIX: Fix and improve file priorities editing (closes #669084)
+    - I18N: Updated Arabic, Italian and Croatian translations
 
-* Sun Dec 5 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.5.1
+* Sun Oct 24 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.8
-    - BUGFIX: Fix possible crash when right-clicking on a torrent
+    - BUGFIX: Fix possible crash on manual peer ban
+    - BUGFIX: Improved hostname resolution code
+    - BUGFIX: Several search plugins fixed
+    - BUGFIX: Auto-disable the shutdown feature
+    - BUGFIX: Remember the current property tab on startup
+    - BUGFIX: Fix status list widget height issue on style change
+    - BUGFIX: Fix rounding issue in torrent progress display
+    - BUGFIX: Fix issue when altering files priorities of a seeding torrent
+    - BUGFIX: Better fix for save path editing issues in torrent addition dialog
+    - BUGFIX: Peers can now be sorted by country
 
-* Sun Dec 5 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.5.0
+* Tue Oct 19 2010  - Christophe Dumez <chris@qbittorrent.org> - v2.4.7
-    - FEATURE: qBittorrent can now act as a tracker
+    - BUGFIX: Display the priority column when the queueing system gets enabled
-    - FEATURE: New and improved RSS feed automated downloader
+    - BUGFIX: Fix encoding problem in file renaming
-    - FEATURE: Added feature to shutdown qbittorrent on torrents completion
+    - BUGFIX: Delete uneeded files on torrent "soft" deletion
-    - FEATURE: Added a torrent import assistant to seed or keep downloading outside torrents
+    - BUGFIX: Fix issues when marking a file as 'not downloaded' causes the torrent to complete
-    - FEATURE: qBittorrent can update itself from Sourceforge (Windows/Mac OS X only)
+    - BUGFIX: Improved "Set Location" and "Change save path" dialogs
-    - FEATURE: Added a transfer list column to display the current tracker
+    - BUGFIX: Fix display of queued seeding torrents
-    - FEATURE: Remember the last trackers used in the torrent creation tool
+
-    - FEATURE: The optimal piece size is now automatically computed in the torrent creation tool
+* Sun Oct 17 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.6
-    - FEATURE: Bring up the connection settings when clicking on the connection status icon
+    - BUGFIX: Fix "torrent seeding after creation" feature
-    - FEATURE: Major code refactoring and optimization
+    - BUGFIX: The properties panel data would sometimes not match the selected torrent
-    - FEATURE: Added "Amount downloaded/left" columns to transfer list
+    - BUGFIX: Fix detection of files at final destination when temp dir is used
-    - FEATURE: Simplified proxy settings
+    - BUGFIX: Fix moving of a torrent to an unexisting directory
-    - FEATURE: Optimized and improved the peer country resolution code
+
-    - FEATURE: Download first/last pieces first when sequential download is
+* Tue Oct 12 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.5
-    enabled (Thanks Ahmad)
+    - BUGFIX: Remember torrent completion date correctly
-    - FEATURE: Download first/last pieces first now applies to all media files
+    - BUGFIX: Fix feature to keep incomplete torrents in a separate folder
-    in the torrent (Thanks Ahmad)
+    - BUGFIX: Fix display of URL seeds in the UI
-    - BUGFIX: Fix SOCKS5 proxy authentication in search engine(closes #680072)
+    - BUGFIX: Improved peer hostname resolution with caching
-    - BUGFIX: Fix two advanced settings (ignore limits on LAN and protocol
+    - BUGFIX: Piece availability/downloaded widgets performance improvement
-    overhead inclusion in rate limiter)
+
-    - BUGFIX: Fix strict super seeding (was not working)
+* Fri Oct 1 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.4
-    - BUGFIX: Improve magnet save path handling (closes #683395)
+    - BUGFIX: Clean program exit on system shutdown/logout
-    - BUGFIX: Disable overwrite confirmation in torrent addition dialog (closes # 685269)
+    - BUGFIX: Fix possible search engine plugin update
-    - COSMETIC: Replaced message box by on-screen notification for download errors
+
-    - COSMETIC: Improved the torrent creation tool appearance
+* Tue Sep 28 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.3
-    - COSMETIC: Use country flags by Mark James (Thanks to Dmytro Pukha)
+    - BUGFIX: Fix encoding issue in command line parameters processing
-    - COSMETIC: Use bigger alternative speed icon
+    - BUGFIX: Fix possible crash when changing the save path in addition dialog
-    - OTHERS: Dropped support for Qt <= 4.4
+    - BUGFIX: Fix wrong mapping to source model
+
+* Sun Sep 26 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.2
+    - BUGFIX: Fix display of torrent content in addition dialog
+    - BUGFIX: Really fix manual editing of save path in torrent addition dialog
+
+* Sun Sep 26 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.1
+    - I18N: Updated Arabic translation
+    - I18N: Fixes to German translation
+    - BUGFIX: Save path can now be edited in torrent addition dialog
+    - BUGFIX: Fix save path encoding on non-utf8 systems
+    - BUGFIX: Fix saving to drive root on Windows
+    - BUGFIX: OGV can now be previewed
+    - BUGFIX: Maximum download limit is now 10MB/s
+    - BUGFIX: Fix 'download in scan dir' persistence
+    - BUGFIX: Add .torrent extension only when missing (torrent creator)
+    - BUGFIX: Fix possible issue with temporary download path persistence
+    - BUGFIX: Added support for | (OR) operator in RSS feed downloader
+    - BUGFIX: Fix Web UI for spanish users
+    - BUGFIX: Fix locale switching from Web UI
+    - BUGFIX: Use AND operator for torrentdownloads.net searches
+    - BUGFIX: Limit torrent addition dialog width to fit the screen
+    - COSMETIC: Fix progress bars style on Windows
 
 * Tue Aug 24 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.0
     - FEATURE: Added actions to "Move to top/bottom" of priority queue

INSTALL

@@ -10,7 +10,7 @@ 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.4.0 (libqt-devel, libqtgui, libqtcore, libqtnetwork, libqtxml)
 
     - pkg-config executable
 

configure

@@ -18,11 +18,9 @@ Main options:
   --help              This help text.
 
 Dependency options:
-  --enable-debug                                  Enable debug mode
   --disable-gui                                   Disable qBittorrent
                                                  Graphical user interface for
                                                  headless running
-  --enable-debug                                  Enable debug mode
   --with-libboost-inc=[path]                      Path to libboost include
                                                  files
   --with-libboost-lib=[path]                      Path to libboost library
@@ -34,6 +32,7 @@ Dependency options:
                                                  executable (please follow
                                                  instructions in
                                                  src/geoip/README)
+  --disable-qtsingleapplication                  Disable use of libboost
   --with-qtsingleapplication=[system|shipped]     Use the shipped
                                                  qtsingleapplication library
                                                  or the system one
@@ -153,21 +152,11 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
-		--enable-debug)
-			QC_ENABLE_DEBUG="Y"
-			shift
-			;;
-
 		--disable-gui)
 			QC_DISABLE_GUI="Y"
 			shift
 			;;
 
-		--enable-debug)
-			QC_ENABLE_DEBUG="Y"
-			shift
-			;;
-
 		--with-libboost-inc=*)
 			QC_WITH_LIBBOOST_INC=$optarg
 			shift
@@ -193,6 +182,11 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
+		--disable-qtsingleapplication)
+			QC_DISABLE_qtsingleapplication="Y"
+			shift
+			;;
+
 		--with-qtsingleapplication=*)
 			QC_WITH_QTSINGLEAPPLICATION=$optarg
 			shift
@@ -219,14 +213,13 @@ echo PREFIX=$PREFIX
 echo BINDIR=$BINDIR
 echo DATADIR=$DATADIR
 echo EX_QTDIR=$EX_QTDIR
-echo QC_ENABLE_DEBUG=$QC_ENABLE_DEBUG
 echo QC_DISABLE_GUI=$QC_DISABLE_GUI
-echo QC_ENABLE_DEBUG=$QC_ENABLE_DEBUG
 echo QC_WITH_LIBBOOST_INC=$QC_WITH_LIBBOOST_INC
 echo QC_WITH_LIBBOOST_LIB=$QC_WITH_LIBBOOST_LIB
 echo QC_DISABLE_libnotify=$QC_DISABLE_libnotify
 echo QC_DISABLE_geoip_database=$QC_DISABLE_geoip_database
 echo QC_WITH_GEOIP_DATABASE_EMBEDDED=$QC_WITH_GEOIP_DATABASE_EMBEDDED
+echo QC_DISABLE_qtsingleapplication=$QC_DISABLE_qtsingleapplication
 echo QC_WITH_QTSINGLEAPPLICATION=$QC_WITH_QTSINGLEAPPLICATION
 echo
 fi
@@ -332,29 +325,22 @@ cat >$1/modules.cpp <<EOT
 #line 1 "qt4.qcm"
 /*
 -----BEGIN QCMOD-----
-name: Qt >= 4.5
+name: Qt >= 4.4
-arg: enable-debug, Enable debug mode
 arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
-arg: enable-debug, Enable debug mode
 -----END QCMOD-----
 */
 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.4"; }
-	QString shortname() const { return "Qt 4.5"; }
+	QString shortname() const { return "Qt 4.4"; }
 	bool exec()
 	{
-                // NOX mode
 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			conf->addExtra("CONFIG += nox");
+			conf->addDefine("DISABLE_GUI");
 		}	
-                // Debug mode
+		return(QT_VERSION >= 0x040400);
-                if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) {
-                  conf->addExtra("CONFIG += debug");
-                }
-		return(QT_VERSION >= 0x040500);
 	}
 };
 #line 1 "pkg-config.qcm"
@@ -548,7 +534,7 @@ public:
 		QString version, libs, other;
 		VersionMode mode = VersionMin;
 		if(conf->findPkgConfig("libnotify", mode, req_ver, &version, &incs, &libs, &other)) {
-			conf->addExtra("CONFIG += libnotify");
+			conf->addDefine("WITH_LIBNOTIFY");
 			for(int n = 0; n < incs.count(); ++n)
 				conf->addIncludePath(incs[n]);
 			if(!libs.isEmpty())
@@ -623,29 +609,29 @@ public:
 #line 1 "qtsingleapplication.qcm"
 /*
 -----BEGIN QCMOD-----
-name: qtsingleapplication
+name: libboost
 arg: with-qtsingleapplication=[system|shipped], Use the shipped qtsingleapplication library or the system one
 -----END QCMOD-----
 */
 class qc_qtsingleapplication : public ConfObj
 {
 public:
-        qc_qtsingleapplication(Conf *c) : ConfObj(c) {}
+	qc_qtsingleapplication(Conf *c) : ConfObj(c) {}
-        QString name() const { return "qtsingleapplication library"; }
+	QString name() const { return "qtsingleapplication library"; }
-        QString shortname() const { return "qtsingleapplication"; }
+	QString shortname() const { return "qtsingleapplication"; }
 
-        bool exec(){
+	bool exec(){
-                QString s;
+        	QString s;
-                s = conf->getenv("QC_WITH_QTSINGLEAPPLICATION");
+		s = conf->getenv("QC_WITH_QTSINGLEAPPLICATION");
                 if(s.compare("system", Qt::CaseInsensitive) == 0) {
                   // System
-                  conf->addExtra("CONFIG += usesystemqtsingleapplication");
+                  conf->addDefine("USE_SYSTEM_QTSINGLEAPPLICATION");
                   printf(" [system] ");
                 } else {
                   printf(" [shipped] ");
-                }
+		}
-                return true;
+		return true;
-        }
+	}
 };
 
 EOT
@@ -669,7 +655,7 @@ cat >$1/modules_new.cpp <<EOT
     o->required = false;
     o->disabled = false;
     o = new qc_qtsingleapplication(conf);
-    o->required = true;
+    o->required = false;
     o->disabled = false;
 
 EOT
@@ -1616,14 +1602,13 @@ export PREFIX
 export BINDIR
 export DATADIR
 export EX_QTDIR
-export QC_ENABLE_DEBUG
 export QC_DISABLE_GUI
-export QC_ENABLE_DEBUG
 export QC_WITH_LIBBOOST_INC
 export QC_WITH_LIBBOOST_LIB
 export QC_DISABLE_libnotify
 export QC_DISABLE_geoip_database
 export QC_WITH_GEOIP_DATABASE_EMBEDDED
+export QC_DISABLE_qtsingleapplication
 export QC_WITH_QTSINGLEAPPLICATION
 export QC_VERBOSE
 rm -rf .qconftemp

install.os2

@@ -1,136 +0,0 @@
-QBittorrent installation
-
-
-
-0. CONTENTS OF THIS FILE
-========================
-
-1. INTRODUCTION
-
-2. REQUIREMENTS
-
-3. INSTALLATION
-
-4. CONTACT
-
-5. CREDITS
-
-6. SUPPORT AND DONATIONS
-
-7. HISTORY
-
-
-1. INTRODUCTION
-===============
-
-Welcome to QBittorrent port for OS/2 and eComStation.
-
-
-2. REQUIREMENTS
-===============
-
-* klibc 0.6.3 or later
-
-    ftp://ftp.netlabs.org/pub/gcc/libc-0_6_3-csd3.wpi
-
-* openssl 1.0
- 
-    ftp://ftp.netlabs.org/pub/unixos2/ssl10.zip
-
-* Qt4 dll
-
-    see http://svn.netlabs.org/qt4 for more information whats needed and where to get the latest
-
-
-3. INSTALLATION
-===============
-          
-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.
-  4. Start QBittorrent
-  5. Happy torrenting
-  
-
-
-4. CONTACT
-==========
-
-Please send bugreports to:
-
-  ecs@aroa.ch
-
-Only bug reports with a reproducable bug are accepted. :-)
-
-
-
-5. CREDITS
-==========
-
-The port was done by:
-
-Silvan Scherrer aka _diver
-
-Thanks go to:
-
-  * Dmitry A. Kuminov
-
-They either helped me when I had some nasty questions or did some testing for
-me.
-
-
-6. SUPPORT AND DONATIONS
-========================
-
-QBittorrent port is based on volunteer work. If you would like to support further
-development, you can do so in one of the following ways:
-
-
-  * Donate to the Qt4 project: see qt.netlabs.org for more information
-
-  * Contribute to the project: Besides actual development, this also includes
-    maintaining the documentation and the project web site as well as help
-    for users.
-
-
-7. HISTORY
-==========
-
-2010-12-23
-
-  * updated to 2.5.2 code level of QBittorrent
-
-2010-11-22
-
-  * updated to 2.4.11 code level of QBittorrent
-
-2010-xx-xx
-
-  * initial port
-

macxconf.pri

@@ -1,16 +0,0 @@
-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
-
-document_icon.path = Contents/Resources
-document_icon.files = Icons/qBitTorrentDocument.icns
-
-QMAKE_BUNDLE_DATA += document_icon
-ICON = Icons/qbittorrent_mac.icns
-QMAKE_INFO_PLIST = Info.plist
-
-DEFINES += WITH_GEOIP_EMBEDDED
-message("On Mac OS X, GeoIP database must be embedded.")

os2conf.pri

@@ -1,17 +0,0 @@
-INCLUDEPATH += $$PWD
-
-exists(conf.pri) {
-    # to the conf.pri goes all system dependent stuff
-    include(conf.pri)
-}
-
-LIBS += -ltorrent-rasterbar \
-        -lboost_thread \
-        -lboost_system \
-        -lboost_filesystem \
-        -lssl -lcrypto -lidn -lpthread
-
-RC_FILE = qbittorrent_os2.rc
-
-DEFINES += WITH_GEOIP_EMBEDDED
-message("On eCS(OS/2), GeoIP database must be embedded.")

qBittorrent.kdevelop

@@ -0,0 +1,199 @@
+<?xml version = '1.0'?>
+<kdevelop>
+  <general>
+    <author>Christophe Dumez</author>
+    <email>chris@qbittorrent.org</email>
+    <version>1.0.0</version>
+    <projectmanagement>KDevTrollProject</projectmanagement>
+    <primarylanguage>C++</primarylanguage>
+    <keywords>
+      <keyword>Qt</keyword>
+    </keywords>
+    <projectname>qBittorrent</projectname>
+    <ignoreparts/>
+    <projectdirectory>.</projectdirectory>
+    <absoluteprojectpath>false</absoluteprojectpath>
+    <description/>
+    <defaultencoding/>
+    <versioncontrol>kdevsubversion</versioncontrol>
+  </general>
+  <kdevfileview>
+    <groups>
+      <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
+      <group pattern="*.ui" name="User Interface" />
+      <group pattern="*.png" name="Icons" />
+      <group pattern="*" name="Others" />
+      <hidenonprojectfiles>false</hidenonprojectfiles>
+      <hidenonlocation>false</hidenonlocation>
+    </groups>
+    <tree>
+      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
+      <hidenonprojectfiles>false</hidenonprojectfiles>
+      <showvcsfields>false</showvcsfields>
+    </tree>
+  </kdevfileview>
+  <kdevdoctreeview>
+    <ignoretocs>
+      <toc>bash</toc>
+      <toc>bash_bugs</toc>
+      <toc>clanlib</toc>
+      <toc>w3c-dom-level2-html</toc>
+      <toc>fortran_bugs_gcc</toc>
+      <toc>gnome1</toc>
+      <toc>gnustep</toc>
+      <toc>gtk</toc>
+      <toc>gtk_bugs</toc>
+      <toc>haskell</toc>
+      <toc>haskell_bugs_ghc</toc>
+      <toc>java_bugs_gcc</toc>
+      <toc>java_bugs_sun</toc>
+      <toc>kde2book</toc>
+      <toc>opengl</toc>
+      <toc>pascal_bugs_fp</toc>
+      <toc>php</toc>
+      <toc>php_bugs</toc>
+      <toc>perl</toc>
+      <toc>perl_bugs</toc>
+      <toc>python</toc>
+      <toc>python_bugs</toc>
+      <toc>qt-kdev3</toc>
+      <toc>ruby</toc>
+      <toc>ruby_bugs</toc>
+      <toc>sdl</toc>
+      <toc>stl</toc>
+      <toc>w3c-svg</toc>
+      <toc>sw</toc>
+      <toc>w3c-uaag10</toc>
+      <toc>wxwidgets_bugs</toc>
+    </ignoretocs>
+    <ignoredoxygen>
+      <toc>KDE Libraries (Doxygen)</toc>
+    </ignoredoxygen>
+  </kdevdoctreeview>
+  <kdevdebugger>
+    <general>
+      <dbgshell/>
+      <gdbpath/>
+      <configGdbScript/>
+      <runShellScript/>
+      <runGdbScript/>
+      <breakonloadinglibs>true</breakonloadinglibs>
+      <separatetty>false</separatetty>
+      <floatingtoolbar>false</floatingtoolbar>
+    </general>
+    <display>
+      <staticmembers>false</staticmembers>
+      <demanglenames>true</demanglenames>
+      <outputradix>10</outputradix>
+    </display>
+  </kdevdebugger>
+  <kdevcppsupport>
+    <qt>
+      <version>4</version>
+      <used>true</used>
+      <includestyle>4</includestyle>
+      <designerintegration>ExternalDesigner</designerintegration>
+      <root>/usr/lib/qt4</root>
+      <qmake>/usr/bin/qmake</qmake>
+      <designer>/usr/bin/designer</designer>
+      <designerpluginpaths/>
+    </qt>
+    <references>
+      <pcs>automatic_%2Fhome%2Fishanarora%2Fprojects%2Fqbittorrent</pcs>
+    </references>
+    <codecompletion>
+      <automaticCodeCompletion>true</automaticCodeCompletion>
+      <automaticArgumentsHint>true</automaticArgumentsHint>
+      <automaticHeaderCompletion>true</automaticHeaderCompletion>
+      <codeCompletionDelay>250</codeCompletionDelay>
+      <argumentsHintDelay>400</argumentsHintDelay>
+      <headerCompletionDelay>250</headerCompletionDelay>
+      <showOnlyAccessibleItems>false</showOnlyAccessibleItems>
+      <completionBoxItemOrder>0</completionBoxItemOrder>
+      <howEvaluationContextMenu>true</howEvaluationContextMenu>
+      <showCommentWithArgumentHint>true</showCommentWithArgumentHint>
+      <statusBarTypeEvaluation>false</statusBarTypeEvaluation>
+      <namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases>
+      <processPrimaryTypes>true</processPrimaryTypes>
+      <processFunctionArguments>true</processFunctionArguments>
+      <preProcessAllHeaders>true</preProcessAllHeaders>
+      <parseMissingHeadersExperimental>true</parseMissingHeadersExperimental>
+      <resolveIncludePathsUsingMakeExperimental>true</resolveIncludePathsUsingMakeExperimental>
+      <alwaysParseInBackground>true</alwaysParseInBackground>
+      <usePermanentCaching>true</usePermanentCaching>
+      <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
+      <includePaths>.;</includePaths>
+    </codecompletion>
+    <creategettersetter>
+      <prefixGet>get</prefixGet>
+      <prefixSet>set</prefixSet>
+      <prefixVariable>m_,_</prefixVariable>
+      <parameterName>theValue</parameterName>
+      <inlineGet>true</inlineGet>
+      <inlineSet>true</inlineSet>
+    </creategettersetter>
+    <splitheadersource>
+      <enabled>false</enabled>
+      <synchronize>true</synchronize>
+      <orientation>Vertical</orientation>
+    </splitheadersource>
+  </kdevcppsupport>
+  <kdevfilecreate>
+    <filetypes/>
+    <useglobaltypes>
+      <type ext="ui" />
+      <type ext="cpp" />
+      <type ext="h" />
+    </useglobaltypes>
+  </kdevfilecreate>
+  <kdevtrollproject>
+    <general>
+      <activedir>src</activedir>
+    </general>
+    <run>
+      <directoryradio>executable</directoryradio>
+      <mainprogram>/home/ishanarora/projects/qbittorrent/src/qbittorrent</mainprogram>
+      <programargs/>
+      <globaldebugarguments/>
+      <globalcwd>/home/ishanarora/projects/qbittorrent</globalcwd>
+      <useglobalprogram>true</useglobalprogram>
+      <terminal>false</terminal>
+      <autocompile>true</autocompile>
+      <autoinstall>false</autoinstall>
+      <autokdesu>false</autokdesu>
+      <envvars/>
+    </run>
+    <make>
+      <abortonerror>true</abortonerror>
+      <runmultiplejobs>false</runmultiplejobs>
+      <numberofjobs>1</numberofjobs>
+      <dontact>false</dontact>
+      <makebin/>
+      <prio>0</prio>
+      <envvars/>
+    </make>
+    <qmake>
+      <savebehaviour>2</savebehaviour>
+      <replacePaths>false</replacePaths>
+      <disableDefaultOpts>true</disableDefaultOpts>
+    </qmake>
+  </kdevtrollproject>
+  <cppsupportpart>
+    <filetemplates>
+      <interfacesuffix>.h</interfacesuffix>
+      <implementationsuffix>.cpp</implementationsuffix>
+    </filetemplates>
+  </cppsupportpart>
+  <ctagspart>
+    <customArguments/>
+    <customTagfilePath>/home/ishanarora/projects/qbittorrent/tags</customTagfilePath>
+    <activeTagsFiles/>
+  </ctagspart>
+  <kdevdocumentation>
+    <projectdoc>
+      <docsystem/>
+      <docurl/>
+      <usermanualurl/>
+    </projectdoc>
+  </kdevdocumentation>
+</kdevelop>

qbittorrent.qc

@@ -20,6 +20,5 @@
   <dep type='geoip-database'>
   </dep>
   <dep type='qtsingleapplication'>
-    <required/>
   </dep>
 </qconf>

qcm/libnotify.qcm

@@ -24,7 +24,7 @@ public:
 		QString version, libs, other;
 		VersionMode mode = VersionMin;
 		if(conf->findPkgConfig("libnotify", mode, req_ver, &version, &incs, &libs, &other)) {
-			conf->addExtra("CONFIG += libnotify");
+			conf->addDefine("WITH_LIBNOTIFY");
 			for(int n = 0; n < incs.count(); ++n)
 				conf->addIncludePath(incs[n]);
 			if(!libs.isEmpty())

qcm/qt4.qcm

@@ -1,27 +1,20 @@
 /*
 -----BEGIN QCMOD-----
-name: Qt >= 4.5
+name: Qt >= 4.4
-arg: enable-debug, Enable debug mode
 arg: disable-gui, Disable qBittorrent Graphical user interface for headless running
-arg: enable-debug, Enable debug mode
 -----END QCMOD-----
 */
 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.4"; }
-	QString shortname() const { return "Qt 4.5"; }
+	QString shortname() const { return "Qt 4.4"; }
 	bool exec()
 	{
-                // NOX mode
 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
-			conf->addExtra("CONFIG += nox");
+			conf->addDefine("DISABLE_GUI");
 		}	
-                // Debug mode
+		return(QT_VERSION >= 0x040400);
-                if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) {
-                  conf->addExtra("CONFIG += debug");
-                }
-		return(QT_VERSION >= 0x040500);
 	}
 };

qcm/qtsingleapplication.qcm

@@ -1,6 +1,6 @@
 /*
 -----BEGIN QCMOD-----
-name: qtsingleapplication
+name: libboost
 arg: with-qtsingleapplication=[system|shipped], Use the shipped qtsingleapplication library or the system one
 -----END QCMOD-----
 */
@@ -16,7 +16,7 @@ public:
                 s = conf->getenv("QC_WITH_QTSINGLEAPPLICATION");
                 if(s.compare("system", Qt::CaseInsensitive) == 0) {
                   // System
-                  conf->addExtra("CONFIG += usesystemqtsingleapplication");
+                  conf->addDefine("USE_SYSTEM_QTSINGLEAPPLICATION");
                   printf(" [system] ");
                 } else {
                   printf(" [shipped] ");

src/GUI.h

@@ -37,7 +37,7 @@
 #include "ui_mainwindow.h"
 #include "qtorrenthandle.h"
 
-class QBtSession;
+class Bittorrent;
 class QTimer;
 class downloadFromURL;
 class SearchEngine;
@@ -54,19 +54,19 @@ class PropertiesWidget;
 class StatusBar;
 class consoleDlg;
 class about;
-class TorrentCreatorDlg;
+class createtorrent;
 class downloadFromURL;
 class HidableTabWidget;
 class LineEdit;
 class QFileSystemWatcher;
 
-class MainWindow : public QMainWindow, private Ui::MainWindow{
+class GUI : public QMainWindow, private Ui::MainWindow{
   Q_OBJECT
 
 public:
   // Construct / Destruct
-  MainWindow(QWidget *parent=0, QStringList torrentCmdLine=QStringList());
+  GUI(QWidget *parent=0, QStringList torrentCmdLine=QStringList());
-  ~MainWindow();
+  ~GUI();
   // Methods
   QWidget* getCurrentTabWidget() const;
   TransferListWidget* getTransferList() const { return transferList; }
@@ -74,12 +74,12 @@ public:
   PropertiesWidget *getProperties() const { return properties; }
 
 public slots:
-  void trackerAuthenticationRequired(const QTorrentHandle& h);
+  void trackerAuthenticationRequired(QTorrentHandle& h);
   void setTabText(int index, QString text) const;
   void showNotificationBaloon(QString title, QString msg) const;
   void downloadFromURLList(const QStringList& urls);
   void updateAltSpeedsBtn(bool alternative);
-  void updateNbTorrents();
+  void updateNbTorrents(unsigned int nb_downloading, unsigned int nb_seeding, unsigned int nb_active, unsigned int nb_inactive, unsigned int nb_paused);
   void deleteBTSession();
 
 protected slots:
@@ -97,7 +97,7 @@ protected slots:
   void readSettings();
   void on_actionExit_triggered();
   void createTrayIcon();
-  void fullDiskError(const QTorrentHandle& h, QString msg) const;
+  void fullDiskError(QTorrentHandle& h, QString msg) const;
   void handleDownloadFromUrlFailure(QString, QString) const;
   void createSystrayDelayed();
   void tab_changed(int);
@@ -105,7 +105,6 @@ protected slots:
   void defineUILockPassword();
   bool unlockUI();
   void notifyOfUpdate(QString);
-  void showConnectionSettings();
   // Keyboard shortcuts
   void createKeyboardShortcuts();
   void displayTransferTab() const;
@@ -123,17 +122,13 @@ protected slots:
   void addTorrent(QString path);
   void addUnauthenticatedTracker(const QPair<QTorrentHandle,QString> &tracker);
   void processDownloadedFiles(QString path, QString url);
-  void finishedTorrent(const QTorrentHandle& h) const;
+  void finishedTorrent(QTorrentHandle& h) const;
-  void askRecursiveTorrentDownloadConfirmation(const QTorrentHandle &h);
+  void askRecursiveTorrentDownloadConfirmation(QTorrentHandle &h);
   // Options slots
   void on_actionOptions_triggered();
   void optionsSaved();
   // HTTP slots
   void on_actionDownload_from_URL_triggered();
-#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
-  void handleUpdateCheckFinished(bool update_available, QString new_version);
-  void handleUpdateInstalled(QString error_msg);
-#endif
 
 protected:
   void closeEvent(QCloseEvent *);
@@ -145,6 +140,7 @@ protected:
 private:
   QFileSystemWatcher *executable_watcher;
   // Bittorrent
+  Bittorrent *BTSession;
   QList<QPair<QTorrentHandle,QString> > unauthenticated_trackers; // Still needed?
   // GUI related
   QTimer *guiUpdater;
@@ -153,7 +149,7 @@ private:
   QPointer<options_imp> options;
   QPointer<consoleDlg> console;
   QPointer<about> aboutDlg;
-  QPointer<TorrentCreatorDlg> createTorrentDlg;
+  QPointer<createtorrent> createTorrentDlg;
   QPointer<downloadFromURL> downloadFromURLDialog;
   QPointer<QSystemTrayIcon> systrayIcon;
   QPointer<QTimer> systrayCreator;
@@ -187,8 +183,6 @@ private slots:
     void on_actionSpeed_in_title_bar_triggered();
     void on_actionTop_tool_bar_triggered();
     void on_actionShutdown_when_downloads_complete_triggered();
-    void on_actionShutdown_qBittorrent_when_downloads_complete_triggered();
-    void on_action_Import_Torrent_triggered();
     void on_actionDonate_money_triggered();
 };