Tagged v2.2.6 release

- BUGFIX: Improved reliability of torrent moving

AUTHORS

@@ -2,21 +2,13 @@ Author:
 * Christophe Dumez <chris@qbittorrent.org>
 
 Contributors:
-* Vladimir Golovnev <glassez@yandex.ru>
 * Stefanos Antaris <santaris@csd.auth.gr>
-* Mohammad Dib <mdib@qbittorrent.org>
-* Mirco Chinelli <infinity89@fastwebmail.it>
 * Ishan Arora <ishan@qbittorrent.org>
 * Arnaud Demaizière <arnaud@qbittorrent.org>
 * Grigis Gaëtan <cipher16@gmail.com>
 * Christian Kandeler <zambesi@users.sourceforge.net>
-* Silvan Scherrer <silvan.scherrer@aroa.ch>
 
 Code from other projects:
-* files src/qtsingleapp/* src/lineedit/*
-  copyright: Nokia Corporation
-  license: LGPL
-
 * files src/ico.cpp src/ico.h
   copyright: Malte Starostik <malte@kde.org>
   license: LGPL
@@ -37,9 +29,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
@@ -69,27 +61,24 @@ Translations authors:
 * files: src/lang/*.ts
   copyright:
   - Arabic: SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)
-  - Armenian: Hrant Ohanyan (hrantohanyan@mail.am)
   - Brazilian: Nick Marinho (nickmarinho@gmail.com)
   - Bulgarian: Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)
   - Catalan: Francisco Luque Contreras (frannoe@ya.com)
   - Chinese (Simplified): Guo Yue (yue.guo0418@gmail.com)
   - Chinese (Traditional): Yi-Shun Wang (dnextstep@gmail.com)
-  - 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)
-  - Galician: Marcos Lans (marcoslansgarza@gmail.com)
   - German: Niels Hoffmann (zentralmaschine@users.sourceforge.net)
   - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net) and Stephanos Antaris (santaris@csd.auth.gr)
   - Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
-  - Italian: Matteo Sechi (bu17714@gmail.com)
+  - Italian: Mirko Ferrari (mirkoferrari@gmail.com) and Ferraro Luciano (luciano.ferraro@gmail.com)
   - Japanese: Nardog (alphisation@gmail.com)
   - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net)
-  - Norwegian: Tomaso
+  - Norwegian: Lars-Erik Labori (hamil@users.sourceforge.net)
   - Polish: Mariusz Fik (fisiu@opensuse.org)
   - Portuguese: Nick Marinho (nickmarinho@gmail.com)
   - Romanian: Obada Denis (obadadenis@users.sourceforge.net)

Changelog

@@ -1,136 +1,60 @@
-* Thu Feb 3 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.5
+* Sun Apr 18 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.6
-   - BUGFIX: Make sure the progress is not 100% unless the file is complete
+    - BUGFIX: Announce to all trackers at once
-   - BUGFIX: Fix memory leak in HTTP torrent downloader
+    - BUGFIX: Added support for single-thread boost
-   - BUGFIX: Use native file dialogs (by Vladimir Golovnev)
+    - BUGFIX: Remove old folder when moving a torrent
-   - BUGFIX: Fix encoding problem in torrent moving code (by Vladimir Golovnev)
+    - BUGFIX: Improved reliability of torrent moving
-   - BUGFIX: Performance improvement on ARM
+    - BUGFIX: Stop rechecking torrents when they are moved
-   - BUGFIX: RSS code rewrite (more cpu/memory efficient)
+    - BUGFIX: Status filters height stays correct when the visual style changes
-   - I18N: Updated Norwegian translation (Tomaso)
+    - I18N: Added Arabic translation
 
-* Sun Jan 23 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.4
+* Wed Apr 07 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.5
-   - BUGFIX: Added unicode support to email notification
+    - BUGFIX: Fix crash when adding a new torrent label
-   - BUGFIX: Improved compatibility with various SMTP servers
+    - BUGFIX: Fix HTTPS protocol support in torrent/rss downloader
-   - BUGFIX: Fix Labeling in RSS downloader
+    - BUGFIX: Fix default width of file name column in torrent content
-   - BUGFIX: Avoid main window flashing on startup (closes #703984)
+    - BUGFIX: Fix torrent addition dialog buttons height
-   - BUGFIX: Improved hostname resolution code
+    - BUGFIX: Fix deprecation warnings with libtorrent v0.15
-   - BUGFIX: Dropped dependency on libboost-thread
+    - BUGFIX: Fix "Download from URL" title size in Web UI
-   - BUGFIX: Display legal notice on screen center
+    - BUGFIX: Fix transparency of speed limits icons
-   - BUGFIX: Fix renaming of single-file torrents (by Vladimir Golovnev)
+    - BUGFIX: Dropped dependency on Qt gif library
-   - I18N: More dialog buttons are now translated (by Vladimir Golovnev)
+    - BUGFIX: Improved libboost detection by configure file
-   - I18N: Fix translation of size units (by Vladimir Golovnev)
+    - BUGFIX: Bring back compatibility with boost v1.34
+    - COSMETIC: Added icons to menu actions in Web UI
 
-* Sat Jan 15 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.3
+* Tue Apr 06 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.4
-   - BUGFIX: Fix possible crashes in full allocation mode
+    - BUGFIX: Fix possible crash when adding a torrent
-   - BUGFIX: Fix icon size issues (Linux, icon theme)
+    - BUGFIX: Fix failure to remember some torrents on startup
-   - BUGFIX: Fixed file priority context menu
+    - BUGFIX: Fix torrent addition window layout (torrent content not expanding)
-   - BUGFIX: Remove dbus dependency in nox mode
+    - BUGFIX: Fix about dialog in Web UI
-   - BUGFIX: Fix compilation on FreeBSD
+    - BUGFIX: Correctly clear trackers error messages once they work
-   - I18N: Improve Web UI translation
+    - BUGFIX: Display correct share ratio for paused torrents
-   - I18N: Updated Polish translation
+    - COSMETIC: Improved alternative speed limits icons
 
-* Wed Jan 12 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.2
+* Sun Apr 04 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.3
-    - BUGFIX: Do not report PeX as being disabled when DHT is
+    - BUGFIX: Fix possible crash when deleting a torrent just after pausing it
-    - BUGFIX: Fix possible crash on adding magnet links
+    - BUGFIX: Enable Apply button when alternative rate limits are changed
-    - BUGFIX: Fix torrent import (was not working)
+    - BUGFIX: Source compatibility with Windows (Thanks Ishan Arora)
-    - I18N: Updated Greek, Croatian, Russian, Unkrainian and Bulgarian translations
+    - BUGFIX: Source compatibility with eCS (OS/2) (Thanks Silvan Scherrer)
-    - I18N: Added Armenian translation (New)
+    - BUGFIX: Cleaner binutils gold linker support
-    - I18N: Remove country flags from program preferences (language selection)
+    - BUGFIX: Clean fix for progress display with cleanlooks style
-    - I18N: Translate locale names (language selection)
 
-* Mon Jan 10 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.1
+* Mon Mar 22 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.2
-    - BUGFIX: Really disable torrent addition dialog by default
+    - FEATURE: DHT port can be set from Web UI
-    - BUGFIX: Fix some missing icons in the Web UI
+    - BUGFIX: Fix possible crash with folder scanning
-    - BUGFIX: Fix magnet torrent name update problem
+    - BUGFIX: Fix Mac compilation
-    - COSMETIC: Use 24px size for toolbar icons and reduce spacing
+    - BUGFIX: Save fast resume data every 3 minutes (for robustness)
-    - COSMETIC: Move transfer list filter on the right side of the toolbar
+    - I18N: Updated Polish translation (thanks Szymon Świerkosz)
 
-* Sun Jan 9 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.0
+* Sat Mar 20 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.1
-    - FEATURE: Use system icons (Linux, Qt >= 4.6)
+    - FEATURE: Display pieces that are being downloaded
-    - FEATURE: Improved ETA calculation
+    - FEATURE: Added back folder watching in Web UI
-    - FEATURE: Simplify program preferences
+    - FEATURE: Added back file prioritizing in Web UI
-    - FEATURE: Software update check can now be disabled (Mac OS X / Windows)
+    - BUGFIX: Fix compilation with Qt 4.4
-    - FEATURE: Display pieces size in torrent properties
+    - BUGFIX: Fix Web UI compatibility with Safari
-    - FEATURE: Added "Time Active/Seeded" column to transfer list
+    - BUGFIX: Fix progress display with cleanlook style
-    - FEATURE: Give feedback regarding the IP filter parsing
+    - BUGFIX: Fix file filtering in complex torrents
-    - FEATURE: Added a button to reload the IP filter
+    - BUGFIX: Ask for user confirmation for recursive torrent download
-    - FEATURE: Search engine results can now be opened in a Web browser
+    - BUGFIX: Fix "add file" dialog in torrent creation tool
-    - FEATURE: Added a search engine plugin to extratorrent.com
+    - BUGFIX: Fix "Ctrl+A" in Web UI
-    - FEATURE: Added a search engine plugin for kickasstorrents.com
-    - FEATURE: Added auto-suspend upon downloads completion feature
-    - BUGFIX: Hide unwanted files that have to be partly downloaded
-    - BUGFIX: Do not allocate space for unwanted files (preallocation mode)
-    - I18N: Added Galician translation
-    - COSMETIC: Same deletion confirmation dialog in the GUI and Web UI
-    - COSMETIC: Simplified the top toolbar
-    - COSMETIC: Display execution log as a tab instead of a modal window
-
-* Sun Dec 5 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.5.0
-    - FEATURE: qBittorrent can now act as a tracker
-    - FEATURE: New and improved RSS feed automated downloader
-    - FEATURE: Added feature to shutdown qbittorrent on torrents completion
-    - FEATURE: Added a torrent import assistant to seed or keep downloading outside torrents
-    - FEATURE: qBittorrent can update itself from Sourceforge (Windows/Mac OS X only)
-    - FEATURE: Added a transfer list column to display the current tracker
-    - 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
-    - FEATURE: Bring up the connection settings when clicking on the connection status icon
-    - FEATURE: Major code refactoring and optimization
-    - FEATURE: Added "Amount downloaded/left" columns to transfer list
-    - FEATURE: Simplified proxy settings
-    - FEATURE: Optimized and improved the peer country resolution code
-    - FEATURE: Download first/last pieces first when sequential download is
-    enabled (Thanks Ahmad)
-    - FEATURE: Download first/last pieces first now applies to all media files
-    in the torrent (Thanks Ahmad)
-    - BUGFIX: Fix SOCKS5 proxy authentication in search engine(closes #680072)
-    - BUGFIX: Fix two advanced settings (ignore limits on LAN and protocol
-    overhead inclusion in rate limiter)
-    - BUGFIX: Fix strict super seeding (was not working)
-    - BUGFIX: Improve magnet save path handling (closes #683395)
-    - BUGFIX: Disable overwrite confirmation in torrent addition dialog (closes # 685269)
-    - COSMETIC: Replaced message box by on-screen notification for download errors
-    - COSMETIC: Improved the torrent creation tool appearance
-    - COSMETIC: Use country flags by Mark James (Thanks to Dmytro Pukha)
-    - COSMETIC: Use bigger alternative speed icon
-    - OTHERS: Dropped support for Qt <= 4.4
-
-* Tue Aug 24 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.0
-    - FEATURE: Added actions to "Move to top/bottom" of priority queue
-    - FEATURE: Auto-Shutdown on downloads completion
-    - FEATURE: Email notification on download completion
-    - FEATURE: Added button to password-lock the UI
-    - FEATURE: Added label-level Pause/Resume/Delete actions
-    - FEATURE: Torrents can now be filtered by name
-    - FEATURE: Run external program on torrent completion
-    - FEATURE: Detect executable updates in order to advise the user to restart
-
-* Tue Jul 27 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.3.0
-    - FEATURE: Simplified torrent root folder renaming/truncating (< v2.3.0 is no longer forward compatible)
-    - FEATURE: Remember previous save paths in torrent addition dialog
-    - FEATURE: Max number of half-open connections can now be edited
-    - FEATURE: Added support for strict super seeding
-    - FEATURE: The user can force listening on a particular network interface
-    - FEATURE: Added cookie support for RSS feeds
-    - FEATURE: User can force tracker reannounce
-    - FEATURE: Added "No action" setting for double-click action
-    - FEATURE: Several torrents can be moved at once
-    - FEATURE: Added error state for torrents (error is displayed in a tooltip)
-    - FEATURE: Added filter for paused/error torrents
-    - FEATURE: Add Check/Uncheck all feature in Web UI
-    - FEATURE: Search engine can now be disabled
-    - FEATURE: Torrents can be automatically paused once they reach a given ratio
-    - FEATURE: Several files can now be disabled at once
-    - FEATURE: Added "Select All/None" buttons to files list
-    - FEATURE: Added support for BitComet links (bc://bt/...)
-    - BUGFIX: Hide seeding torrents files priorities in Web UI
-    - BUGFIX: The user can disable permanently recursive torrent download
-    - BUGFIX: Peer Exchange status is now correctly reported
-    - BUGFIX: Use an INI file instead of the registry on Windows (More reliable)
-    - BUGFIX: Removed client spoofing feature to avoid tracker blacklisting
-    - COSMETIC: Display peers country name in tooltip
-    - COSMETIC: Display number of torrents in transfers tab label
-    - COSMETIC: Simplified program preferences
-    - COSMETIC: Fix naming of actions opening new dialogs (use Name...)
 
 * Sun Mar 14 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.0
     - FEATURE: User can set alternative speed limits for fast toggling

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
 
@@ -18,9 +18,9 @@ qBittorrent - A BitTorrent client in C++ / Qt4
         -> 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, libboost-thread, libboost-date-time) + libasio
       or
-    - libboost >= 1.35.x (libboost-system, libboost-filesystem, libboost-date-time)
+    - libboost >= 1.35.x (libboost-system, libboost-filesystem, libboost-thread, libboost-date-time)
 
     - python >= 2.3 (needed by search engine)
         * Run time only dependency

configure

@@ -18,24 +18,15 @@ Main options:
   --help              This help text.
 
 Dependency options:
-  --enable-debug                                  Enable debug mode
+  --disable-gui                      Disable qBittorrent Graphical user
-  --disable-gui                                   Disable qBittorrent
+                                    interface for headless running
-                                                 Graphical user interface for
+  --with-libboost-inc=[path]         Path to libboost include files
-                                                 headless running
+  --with-libboost-lib=[path]         Path to libboost library files
-  --with-libboost-inc=[path]                      Path to libboost include
+  --disable-libnotify               Disable use of libnotify
-                                                 files
+  --disable-geoip-database          Disable use of geoip-database
-  --with-libboost-lib=[path]                      Path to libboost library
+  --with-geoip-database-embedded     Geoip Database will be embedded in
-                                                 files
+                                    qBittorrent executable (please follow
-  --disable-libnotify                            Disable use of libnotify
+                                    instructions in src/geoip/README)
-  --disable-geoip-database                       Disable use of geoip-database
-  --with-geoip-database-embedded                  Geoip Database will be
-                                                 embedded in qBittorrent
-                                                 executable (please follow
-                                                 instructions in
-                                                 src/geoip/README)
-  --with-qtsingleapplication=[system|shipped]     Use the shipped
-                                                 qtsingleapplication library
-                                                 or the system one
 
 EOT
 }
@@ -152,11 +143,6 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
-		--enable-debug)
-			QC_ENABLE_DEBUG="Y"
-			shift
-			;;
-
 		--disable-gui)
 			QC_DISABLE_GUI="Y"
 			shift
@@ -187,11 +173,6 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
-		--with-qtsingleapplication=*)
-			QC_WITH_QTSINGLEAPPLICATION=$optarg
-			shift
-			;;
-
 		--verbose)
 			QC_VERBOSE="Y"
 			shift
@@ -213,14 +194,12 @@ 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_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_WITH_QTSINGLEAPPLICATION=$QC_WITH_QTSINGLEAPPLICATION
 echo
 fi
 
@@ -325,8 +304,7 @@ 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
 -----END QCMOD-----
 */
@@ -334,25 +312,14 @@ 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");
-                }
-                #ifdef Q_OS_FREEBSD
-                  conf->addLib("-lexecinfo");
-                  conf->addExtra("MANPREFIX = \$\$PREFIX");
-                #else
-                  conf->addExtra("MANPREFIX = \$\$PREFIX/share"); 
-                #endif
-		return(QT_VERSION >= 0x040500);
 	}
 };
 #line 1 "pkg-config.qcm"
@@ -388,12 +355,27 @@ public:
 	bool exec(){
 		QStringList incs;
 		QString req_ver = "0.14.4";
+		QString adv_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(!libs.isEmpty())
+		//	conf->addLib(libs);
+		if(conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other)) {
+                        //printf("\nWarning: libtorrent-rasterbar v%s was detected. Some feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
+		//else
+			conf->addDefine("LIBTORRENT_0_15");
+		}
+		// Get linking parameters
+		//QStringList params;
+		//QByteArray staticlibs;
+		//params << "--static" << "--libs" << "libtorrent-rasterbar";
+		//conf->doCommand("pkg-config", params, &staticlibs);
+		//conf->addLib(staticlibs.trimmed());
+		//libcrypto
 		if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
   		  conf->addLib("-lcrypto");
                 }
@@ -451,6 +433,9 @@ public:
 			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
 				return false;
       			}
+			if(!conf->checkHeader(s, "boost/thread.hpp")) {
+				return false;
+      			}
 		}else{
 			QStringList sl;
 			sl << "/usr/include";
@@ -471,6 +456,9 @@ public:
 			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
 				return false;
       			}
+			if(!conf->checkHeader(s, "boost/thread.hpp")) {
+				return false;
+      			}
 		}
 		conf->addIncludePath(s);
 		// Find library
@@ -481,7 +469,7 @@ public:
 #endif
     if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
       // Not required by nox
-      required_libs << "filesystem" ;
+      required_libs << "filesystem" << "thread";
     }
     QStringList libDirs;
     libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
@@ -540,7 +528,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())
@@ -556,21 +544,10 @@ public:
 			} else {
 				return false;
 			}
-			QStringList incs3;
-                        QString req_ver3 = "2.0";
-                        QString version3, libs3, other3;
-			if(conf->findPkgConfig("gtk+-2.0", mode, req_ver3, &version3, &incs3, &libs3, &other3)) {
-                                for(int n = 0; n < incs3.count(); ++n)
-                                conf->addIncludePath(incs3[n]);
-                                if(!libs3.isEmpty())
-                                        conf->addLib(libs3);
-                        } else {
-                                return false;
-                        }
 		} else {
 			return false;
 		}
-
+		
 		return true;
 	}
 };
@@ -612,33 +589,6 @@ public:
 #endif
 	}
 };
-#line 1 "qtsingleapplication.qcm"
-/*
------BEGIN QCMOD-----
-name: qtsingleapplication
-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) {}
-        QString name() const { return "qtsingleapplication library"; }
-        QString shortname() const { return "qtsingleapplication"; }
-
-        bool exec(){
-                QString s;
-                s = conf->getenv("QC_WITH_QTSINGLEAPPLICATION");
-                if(s.compare("system", Qt::CaseInsensitive) == 0) {
-                  // System
-                  conf->addExtra("CONFIG += usesystemqtsingleapplication");
-                  printf(" [system] ");
-                } else {
-                  printf(" [shipped] ");
-                }
-                return true;
-        }
-};
 
 EOT
 cat >$1/modules_new.cpp <<EOT
@@ -660,9 +610,6 @@ cat >$1/modules_new.cpp <<EOT
     o = new qc_geoip_database(conf);
     o->required = false;
     o->disabled = false;
-    o = new qc_qtsingleapplication(conf);
-    o->required = true;
-    o->disabled = false;
 
 EOT
 cat >$1/conf4.h <<EOT
@@ -1608,14 +1555,12 @@ export PREFIX
 export BINDIR
 export DATADIR
 export EX_QTDIR
-export QC_ENABLE_DEBUG
 export QC_DISABLE_GUI
 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_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,15 +0,0 @@
-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

@@ -19,7 +19,4 @@
   </dep>
   <dep type='geoip-database'>
   </dep>
-  <dep type='qtsingleapplication'>
-    <required/>
-  </dep>
 </qconf>

qcm/libboost.qcm

@@ -48,6 +48,9 @@ public:
 			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
 				return false;
       			}
+			if(!conf->checkHeader(s, "boost/thread.hpp")) {
+				return false;
+      			}
 		}else{
 			QStringList sl;
 			sl << "/usr/include";
@@ -68,6 +71,9 @@ public:
 			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
 				return false;
       			}
+			if(!conf->checkHeader(s, "boost/thread.hpp")) {
+				return false;
+      			}
 		}
 		conf->addIncludePath(s);
 		// Find library
@@ -78,7 +84,7 @@ public:
 #endif
     if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
       // Not required by nox
-      required_libs << "filesystem" ;
+      required_libs << "filesystem" << "thread";
     }
     QStringList libDirs;
     libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";

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())
@@ -40,21 +40,10 @@ public:
 			} else {
 				return false;
 			}
-			QStringList incs3;
-                        QString req_ver3 = "2.0";
-                        QString version3, libs3, other3;
-			if(conf->findPkgConfig("gtk+-2.0", mode, req_ver3, &version3, &incs3, &libs3, &other3)) {
-                                for(int n = 0; n < incs3.count(); ++n)
-                                conf->addIncludePath(incs3[n]);
-                                if(!libs3.isEmpty())
-                                        conf->addLib(libs3);
-                        } else {
-                                return false;
-                        }
 		} else {
 			return false;
 		}
-
+		
 		return true;
 	}
 };

qcm/libtorrent-rasterbar.qcm

@@ -13,12 +13,27 @@ public:
 	bool exec(){
 		QStringList incs;
 		QString req_ver = "0.14.4";
+		QString adv_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(!libs.isEmpty())
+		//	conf->addLib(libs);
+		if(conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other)) {
+                        //printf("\nWarning: libtorrent-rasterbar v%s was detected. Some feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
+		//else
+			conf->addDefine("LIBTORRENT_0_15");
+		}
+		// Get linking parameters
+		//QStringList params;
+		//QByteArray staticlibs;
+		//params << "--static" << "--libs" << "libtorrent-rasterbar";
+		//conf->doCommand("pkg-config", params, &staticlibs);
+		//conf->addLib(staticlibs.trimmed());
+		//libcrypto
 		if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
   		  conf->addLib("-lcrypto");
                 }

qcm/qt4.qcm

@@ -1,7 +1,6 @@
 /*
 -----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
 -----END QCMOD-----
 */
@@ -9,24 +8,13 @@ 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");
-                }
-                #ifdef Q_OS_FREEBSD
-                  conf->addLib("-lexecinfo");
-                  conf->addExtra("MANPREFIX = $$PREFIX");
-                #else
-                  conf->addExtra("MANPREFIX = $$PREFIX/share"); 
-                #endif
-		return(QT_VERSION >= 0x040500);
 	}
 };

qcm/qtsingleapplication.qcm

@@ -1,26 +0,0 @@
-/*
------BEGIN QCMOD-----
-name: qtsingleapplication
-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) {}
-        QString name() const { return "qtsingleapplication library"; }
-        QString shortname() const { return "qtsingleapplication"; }
-
-        bool exec(){
-                QString s;
-                s = conf->getenv("QC_WITH_QTSINGLEAPPLICATION");
-                if(s.compare("system", Qt::CaseInsensitive) == 0) {
-                  // System
-                  conf->addExtra("CONFIG += usesystemqtsingleapplication");
-                  printf(" [system] ");
-                } else {
-                  printf(" [shipped] ");
-                }
-                return true;
-        }
-};

src/GUI.h

@@ -37,10 +37,13 @@
 #include "ui_mainwindow.h"
 #include "qtorrenthandle.h"
 
-class QBtSession;
+enum TabIndex{TAB_TRANSFER, TAB_SEARCH, TAB_RSS};
+
+class Bittorrent;
 class QTimer;
 class downloadFromURL;
 class SearchEngine;
+class QLocalServer;
 class QCloseEvent;
 class RSSImp;
 class QShortcut;
@@ -54,34 +57,26 @@ class PropertiesWidget;
 class StatusBar;
 class consoleDlg;
 class about;
-class TorrentCreatorDlg;
+class createtorrent;
 class downloadFromURL;
-class HidableTabWidget;
-class LineEdit;
-class QFileSystemWatcher;
-class ExecutionLog;
 
-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;
+  int getCurrentTabIndex() const;
   TransferListWidget* getTransferList() const { return transferList; }
-  QMenu* getTrayIconMenu();
-  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 deleteBTSession();
 
 protected slots:
   // GUI related slots
@@ -92,20 +87,18 @@ protected slots:
   void on_actionCreate_torrent_triggered();
   void on_actionWebsite_triggered() const;
   void on_actionBugReport_triggered() const;
+  void on_actionShow_console_triggered();
+  void readParamsOnSocket();
+  void acceptConnection();
   void balloonClicked();
   void writeSettings();
   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);
-  void on_actionLock_qBittorrent_triggered();
-  void defineUILockPassword();
-  bool unlockUI();
-  void notifyOfUpdate(QString);
-  void showConnectionSettings();
   // Keyboard shortcuts
   void createKeyboardShortcuts();
   void displayTransferTab() const;
@@ -118,54 +111,45 @@ protected slots:
   void on_actionOpen_triggered();
   void updateGUI();
   void loadPreferences(bool configure_session=true);
-  void processParams(const QString& params);
   void processParams(const QStringList& params);
   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 *);
   void showEvent(QShowEvent *);
   bool event(QEvent * event);
   void displayRSSTab(bool enable);
-  void displaySearchTab(bool enable);
 
 private:
-  QFileSystemWatcher *executable_watcher;
   // Bittorrent
+  Bittorrent *BTSession;
   QList<QPair<QTorrentHandle,QString> > unauthenticated_trackers; // Still needed?
   // GUI related
-  bool m_posInitialized;
   QTimer *guiUpdater;
-  HidableTabWidget *tabs;
+  QTabWidget *tabs;
   StatusBar *status_bar;
   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;
-  QPointer<QMenu> myTrayIconMenu;
+  QMenu *myTrayIconMenu;
   TransferListWidget *transferList;
   TransferListFiltersWidget *transferListFilters;
   PropertiesWidget *properties;
   bool displaySpeedInTitle;
   bool force_exit;
-  bool ui_locked;
-  LineEdit *search_filter;
   // Keyboard shortcuts
   QShortcut *switchSearchShortcut;
   QShortcut *switchSearchShortcut2;
@@ -173,27 +157,15 @@ private:
   QShortcut *switchRSSShortcut;
   // Widgets
   QAction *prioSeparator;
-  QAction *prioSeparatorMenu;
+  QAction *prioSeparator2;
   QSplitter *hSplitter;
   QSplitter *vSplitter;
   // Search
-  QPointer<SearchEngine> searchEngine;
+  SearchEngine *searchEngine;
   // RSS
   QPointer<RSSImp> rssWidget;
-  // Execution Log
+  // Misc
-  QPointer<ExecutionLog> m_executionLog;
+  QLocalServer *localServer;
-
-private slots:
-    void on_actionSearch_engine_triggered();
-    void on_actionRSS_Reader_triggered();
-    void on_actionSpeed_in_title_bar_triggered();
-    void on_actionTop_tool_bar_triggered();
-    void on_action_Import_Torrent_triggered();
-    void on_actionDonate_money_triggered();
-    void on_actionExecution_Logs_triggered(bool checked);
-    void on_actionAutoExit_qBittorrent_toggled(bool );
-    void on_actionAutoSuspend_system_toggled(bool );
-    void on_actionAutoShutdown_system_toggled(bool );
 };
 
 #endif