Tagged v2.3.0rc5 release

Changelog

@@ -1,4 +1,4 @@
-* Tue Jul 27 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.3.0
+* Unreleased - 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
@@ -15,12 +15,10 @@
     - 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

configure

@@ -18,24 +18,15 @@ Main options:
   --help              This help text.
 
 Dependency options:
-  --disable-gui                                   Disable qBittorrent
-                                                 Graphical user interface for
-                                                 headless running
-  --with-libboost-inc=[path]                      Path to libboost include
-                                                 files
-  --with-libboost-lib=[path]                      Path to libboost library
-                                                 files
-  --disable-libnotify                            Disable use of libnotify
-  --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)
-  --disable-qtsingleapplication                  Disable use of libboost
-  --with-qtsingleapplication=[system|shipped]     Use the shipped
-                                                 qtsingleapplication library
-                                                 or the system one
+  --disable-gui                      Disable qBittorrent Graphical user
+                                    interface for headless running
+  --with-libboost-inc=[path]         Path to libboost include files
+  --with-libboost-lib=[path]         Path to libboost library files
+  --disable-libnotify               Disable use of libnotify
+  --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)
 
 EOT
 }
@@ -182,16 +173,6 @@ while [ $# -gt 0 ]; do
 			shift
 			;;
 
-		--disable-qtsingleapplication)
-			QC_DISABLE_qtsingleapplication="Y"
-			shift
-			;;
-
-		--with-qtsingleapplication=*)
-			QC_WITH_QTSINGLEAPPLICATION=$optarg
-			shift
-			;;
-
 		--verbose)
 			QC_VERBOSE="Y"
 			shift
@@ -219,8 +200,6 @@ 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
 
@@ -550,21 +529,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;
 	}
 };
@@ -606,33 +574,6 @@ public:
 #endif
 	}
 };
-#line 1 "qtsingleapplication.qcm"
-/*
------BEGIN QCMOD-----
-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) {}
-	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->addDefine("USE_SYSTEM_QTSINGLEAPPLICATION");
-                  printf(" [system] ");
-                } else {
-                  printf(" [shipped] ");
-		}
-		return true;
-	}
-};
 
 EOT
 cat >$1/modules_new.cpp <<EOT
@@ -654,9 +595,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 = false;
-    o->disabled = false;
 
 EOT
 cat >$1/conf4.h <<EOT
@@ -1608,8 +1546,6 @@ 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
 (

qbittorrent.qc

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

qcm/libnotify.qcm

@@ -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;
 	}
 };

src/GUI.cpp

@@ -279,7 +279,10 @@ GUI::~GUI() {
   delete BTSession;
   // Deleting remaining top level widgets
   qDebug("Deleting remaining top level widgets");
-
+  foreach (QWidget *win, QApplication::topLevelWidgets()) {
+    if(win && win != this)
+      delete win;
+  }
   // May freeze for a few seconds after the next line
   // because the Bittorrent session proxy will
   // actually be deleted now and destruction
@@ -425,7 +428,7 @@ void GUI::readSettings() {
   QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
   settings.beginGroup(QString::fromUtf8("MainWindow"));
   restoreGeometry(settings.value("geometry").toByteArray());
-  const QStringList sizes_str = settings.value("vSplitterSizes", QStringList()).toStringList();
+  const QStringList &sizes_str = settings.value("vSplitterSizes", QStringList()).toStringList();
   // Splitter size
   QList<int> sizes;
   if(sizes_str.size() == 2) {
@@ -624,47 +627,21 @@ void GUI::on_actionCreate_torrent_triggered() {
 }
 
 bool GUI::event(QEvent * e) {
-  switch(e->type()) {
-  case QEvent::WindowStateChange: {
-      qDebug("Window change event");
-      //Now check to see if the window is minimised
-      if(isMinimized()) {
-        qDebug("minimisation");
-        QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-        if(systrayIcon && settings.value(QString::fromUtf8("Preferences/General/MinimizeToTray"), false).toBool()) {
-          qDebug("Has active window: %d", (int)(qApp->activeWindow() != 0));
-          // Check if there is a modal window
-          bool has_modal_window = false;
-          foreach (QWidget *widget, QApplication::allWidgets()) {
-            if(widget->isModal()) {
-              has_modal_window = true;
-              break;
-            }
-          }
-          // Iconify if there is no modal window
-          if(!has_modal_window) {
-            qDebug("Minimize to Tray enabled, hiding!");
-            e->accept();
-            QTimer::singleShot(0, this, SLOT(hide()));
-            return true;
-          }
+  if(e->type() == QEvent::WindowStateChange) {
+    qDebug("Window change event");
+    //Now check to see if the window is minimised
+    if(isMinimized()) {
+      qDebug("minimisation");
+      QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+      if(systrayIcon && settings.value(QString::fromUtf8("Preferences/General/MinimizeToTray"), false).toBool()) {
+        if(!qApp->activeWindow() || !qApp->activeWindow()->isModal()) {
+          qDebug("Minimize to Tray enabled, hiding!");
+          e->accept();
+          QTimer::singleShot(0, this, SLOT(hide()));
+          return true; 
         }
       }
-      break;
     }
-#ifdef Q_WS_MAC
-  case QEvent::ToolBarChange: {
-      qDebug("MAC: Received a toolbar change event!");
-      bool ret = QMainWindow::event(e);
-
-      qDebug("MAC: new toolbar visibility is %d", !actionTop_tool_bar->isChecked());
-      actionTop_tool_bar->toggle();
-      Preferences::setToolbarDisplayed(actionTop_tool_bar->isChecked());
-      return ret;
-    }
-#endif
-  default:
-    break;
   }
   return QMainWindow::event(e);
 }
@@ -674,7 +651,7 @@ void GUI::dropEvent(QDropEvent *event) {
   event->acceptProposedAction();
   QStringList files;
   if(event->mimeData()->hasUrls()) {
-    const QList<QUrl> urls = event->mimeData()->urls();
+    const QList<QUrl> &urls = event->mimeData()->urls();
     foreach(const QUrl &url, urls) {
       const QString tmp = url.toString().trimmed();
       if(!tmp.isEmpty())
@@ -687,20 +664,12 @@ void GUI::dropEvent(QDropEvent *event) {
   QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
   const bool useTorrentAdditionDialog = settings.value(QString::fromUtf8("Preferences/Downloads/AdditionDialog"), true).toBool();
   foreach(QString file, files) {
-#ifdef Q_WS_WIN
-    file = file.trimmed().replace(QString::fromUtf8("file:///"), QString::fromUtf8(""), Qt::CaseInsensitive);
-#else
     file = file.trimmed().replace(QString::fromUtf8("file://"), QString::fromUtf8(""), Qt::CaseInsensitive);
-#endif
     qDebug("Dropped file %s on download list", file.toLocal8Bit().data());
     if(file.startsWith(QString::fromUtf8("http://"), Qt::CaseInsensitive) || file.startsWith(QString::fromUtf8("ftp://"), Qt::CaseInsensitive) || file.startsWith(QString::fromUtf8("https://"), Qt::CaseInsensitive)) {
       BTSession->downloadFromUrl(file);
       continue;
     }
-    if(file.startsWith("bc://bt/", Qt::CaseInsensitive)) {
-      qDebug("Converting bc link to magnet link");
-      file = misc::bcLinkToMagnet(file);
-    }
     if(file.startsWith("magnet:", Qt::CaseInsensitive)) {
       // FIXME: Possibly skipped torrent addition dialog
       BTSession->addMagnetUri(file);
@@ -737,7 +706,7 @@ void GUI::on_actionOpen_triggered() {
   QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
   // Open File Open Dialog
   // Note: it is possible to select more than one file
-  const QStringList pathsList = QFileDialog::getOpenFileNames(0,
+  const QStringList &pathsList = QFileDialog::getOpenFileNames(0,
                                                                tr("Open Torrent Files"), settings.value(QString::fromUtf8("MainWindowLastDir"), QDir::homePath()).toString(),
                                                                tr("Torrent Files")+QString::fromUtf8(" (*.torrent)"));
   if(!pathsList.empty()) {
@@ -774,10 +743,6 @@ void GUI::processParams(const QStringList& params) {
     if(param.startsWith(QString::fromUtf8("http://"), Qt::CaseInsensitive) || param.startsWith(QString::fromUtf8("ftp://"), Qt::CaseInsensitive) || param.startsWith(QString::fromUtf8("https://"), Qt::CaseInsensitive)) {
       BTSession->downloadFromUrl(param);
     }else{
-      if(param.startsWith("bc://bt/", Qt::CaseInsensitive)) {
-        qDebug("Converting bc link to magnet link");
-        param = misc::bcLinkToMagnet(param);
-      }
       if(param.startsWith("magnet:", Qt::CaseInsensitive)) {
         if(useTorrentAdditionDialog) {
           torrentAdditionDialog *dialog = new torrentAdditionDialog(this, BTSession);
@@ -932,7 +897,6 @@ void GUI::updateGUI() {
 }
 
 void GUI::showNotificationBaloon(QString title, QString msg) const {
-  if(!Preferences::useProgramNotification()) return;
 #ifdef WITH_LIBNOTIFY
   if (notify_init ("summary-body")) {
     NotifyNotification* notification;
@@ -960,11 +924,7 @@ void GUI::showNotificationBaloon(QString title, QString msg) const {
 void GUI::downloadFromURLList(const QStringList& url_list) {
   QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
   const bool useTorrentAdditionDialog = settings.value(QString::fromUtf8("Preferences/Downloads/AdditionDialog"), true).toBool();
-  foreach(QString url, url_list) {
-    if(url.startsWith("bc://bt/", Qt::CaseInsensitive)) {
-      qDebug("Converting bc link to magnet link");
-      url = misc::bcLinkToMagnet(url);
-    }
+  foreach(const QString& url, url_list) {
     if(url.startsWith("magnet:", Qt::CaseInsensitive)) {
       if(useTorrentAdditionDialog) {
         torrentAdditionDialog *dialog = new torrentAdditionDialog(this, BTSession);

src/Info.plist

@@ -10,13 +10,13 @@
 				<string>torrent</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>qBitTorrentDocument</string>
+			<string>qbittorrentDocument</string>
 			<key>CFBundleTypeName</key>
 			<string>BitTorrent Document</string>
-			<key>CFBundleTypeMIMETypes</key>
-			<array>
-				<string>application/x-bittorrent</string>
-			</array>
+                        <key>CFBundleTypeMIMETypes</key>
+                	<array>
+        	            <string>application/x-bittorrent</string>
+	                </array>
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 			<key>LSHandlerRank</key>

src/advancedsettings.h

@@ -11,15 +11,15 @@
 #include "preferences.h"
 
 enum AdvSettingsCols {PROPERTY, VALUE};
-enum AdvSettingsRows {DISK_CACHE, OUTGOING_PORT_MIN, OUTGOING_PORT_MAX, IGNORE_LIMIT_LAN, COUNT_OVERHEAD, RECHECK_COMPLETED, LIST_REFRESH, RESOLVE_COUNTRIES, RESOLVE_HOSTS, MAX_HALF_OPEN, SUPER_SEEDING, NETWORK_IFACE, PROGRAM_NOTIFICATIONS };
-#define ROW_COUNT 13
+enum AdvSettingsRows {DISK_CACHE, OUTGOING_PORT_MIN, OUTGOING_PORT_MAX, IGNORE_LIMIT_LAN, COUNT_OVERHEAD, RECHECK_COMPLETED, LIST_REFRESH, RESOLVE_COUNTRIES, RESOLVE_HOSTS, MAX_HALF_OPEN, SUPER_SEEDING, NETWORK_IFACE };
+#define ROW_COUNT 12
 
 class AdvancedSettings: public QTableWidget {
   Q_OBJECT
 
 private:
   QSpinBox *spin_cache, *outgoing_ports_min, *outgoing_ports_max, *spin_list_refresh, *spin_maxhalfopen;
-  QCheckBox *cb_ignore_limits_lan, *cb_count_overhead, *cb_recheck_completed, *cb_resolve_countries, *cb_resolve_hosts, *cb_super_seeding, *cb_program_notifications;
+  QCheckBox *cb_ignore_limits_lan, *cb_count_overhead, *cb_recheck_completed, *cb_resolve_countries, *cb_resolve_hosts, *cb_super_seeding;
   QComboBox *combo_iface;
 
 public:
@@ -52,7 +52,6 @@ public:
     delete spin_maxhalfopen;
     delete cb_super_seeding;
     delete combo_iface;
-    delete cb_program_notifications;
   }
 
 public slots:
@@ -86,8 +85,6 @@ public slots:
     } else {
       Preferences::setNetworkInterface(combo_iface->currentText());
     }
-    // Program notification
-    Preferences::useProgramNotification(cb_program_notifications->isChecked());
   }
 
 protected slots:
@@ -178,7 +175,7 @@ protected slots:
     setItem(NETWORK_IFACE, PROPERTY, new QTableWidgetItem(tr("Network Interface (requires restart)")));
     combo_iface = new QComboBox;
     combo_iface->addItem(tr("Any interface", "i.e. Any network interface"));
-    const QString current_iface = Preferences::getNetworkInterface();
+    const QString &current_iface = Preferences::getNetworkInterface();
     int i = 1;
     foreach(const QNetworkInterface& iface, QNetworkInterface::allInterfaces()) {
       if(iface.name() == "lo") continue;
@@ -189,12 +186,6 @@ protected slots:
     }
     connect(combo_iface, SIGNAL(currentIndexChanged(int)), this, SLOT(emitSettingsChanged()));
     setCellWidget(NETWORK_IFACE, VALUE, combo_iface);
-    // Program notifications
-    setItem(PROGRAM_NOTIFICATIONS, PROPERTY, new QTableWidgetItem(tr("Display program notification baloons")));
-    cb_program_notifications = new QCheckBox();
-    connect(cb_program_notifications, SIGNAL(toggled(bool)), this, SLOT(emitSettingsChanged()));
-    cb_program_notifications->setChecked(Preferences::useProgramNotification());
-    setCellWidget(PROGRAM_NOTIFICATIONS, VALUE, cb_program_notifications);
   }
 
   void emitSettingsChanged() {

src/downloadfromurldlg.h

@@ -51,7 +51,7 @@ class downloadFromURL : public QDialog, private Ui::downloadFromURL{
       show();
       // Paste clipboard if there is an URL in it
       QString clip_txt = qApp->clipboard()->text();
-      if(clip_txt.startsWith("http://", Qt::CaseInsensitive) || clip_txt.startsWith("https://", Qt::CaseInsensitive) || clip_txt.startsWith("ftp://", Qt::CaseInsensitive) || clip_txt.startsWith("magnet:", Qt::CaseInsensitive) || clip_txt.startsWith("bc://bt/", Qt::CaseInsensitive)) {
+      if(clip_txt.startsWith("http://", Qt::CaseInsensitive) || clip_txt.startsWith("https://", Qt::CaseInsensitive) || clip_txt.startsWith("ftp://", Qt::CaseInsensitive) || clip_txt.startsWith("magnet:", Qt::CaseInsensitive)) {
         textUrls->setText(clip_txt);
       }
     }

src/downloadthread.cpp

@@ -101,7 +101,7 @@ void downloadThread::processDlFinished(QNetworkReply* reply) {
 }
 
 void downloadThread::loadCookies(const QString &host_name, QString url) {
-  const QList<QByteArray> raw_cookies = Preferences::getHostNameCookies(host_name);
+  const QList<QByteArray> &raw_cookies = Preferences::getHostNameCookies(host_name);
   QNetworkCookieJar *cookie_jar = networkManager.cookieJar();
   QList<QNetworkCookie> cookies;
   qDebug("Loading cookies for host name: %s", qPrintable(host_name));
@@ -135,7 +135,7 @@ QNetworkReply* downloadThread::downloadUrl(QString url){
     loadCookies(host_name, url);
   // Process download request
   qDebug("url is %s", qPrintable(url));
-  const QUrl qurl = QUrl::fromEncoded(url.toLocal8Bit());
+  const QUrl &qurl = QUrl::fromEncoded(url.toLocal8Bit());
   QNetworkRequest request(qurl);
   // Spoof Firefox 3.5 user agent to avoid
   // Web server banning

src/engineselectdlg.cpp

@@ -81,11 +81,7 @@ void engineSelectDlg::dropEvent(QDropEvent *event) {
   QString file;
   foreach(file, files) {
     qDebug("dropped %s", qPrintable(file));
-#ifdef Q_WS_WIN
-    file = file.replace("file:///", "");
-#else
     file = file.replace("file://", "");
-#endif
     if(file.startsWith("http://", Qt::CaseInsensitive) || file.startsWith("https://", Qt::CaseInsensitive) || file.startsWith("ftp://", Qt::CaseInsensitive)) {
       setCursor(QCursor(Qt::WaitCursor));
       downloader->downloadUrl(file);
@@ -269,7 +265,7 @@ void engineSelectDlg::installPlugin(QString path, QString plugin_name) {
   if(QFile::exists(dest_path)) {
     // Backup in case install fails
     QFile::copy(dest_path, dest_path+".bak");
-    misc::safeRemove(dest_path);
+    QFile::remove(dest_path);
     update = true;
   }
   // Copy the plugin
@@ -280,22 +276,22 @@ void engineSelectDlg::installPlugin(QString path, QString plugin_name) {
   if(!supported_engines->contains(plugin_name)) {
     if(update) {
       // Remove broken file
-      misc::safeRemove(dest_path);
+      QFile::remove(dest_path);
       // restore backup
       QFile::copy(dest_path+".bak", dest_path);
-      misc::safeRemove(dest_path+".bak");
+      QFile::remove(dest_path+".bak");
       QMessageBox::warning(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin could not be updated, keeping old version.", "%1 is the name of the search engine").arg(plugin_name));
       return;
     } else {
       // Remove broken file
-      misc::safeRemove(dest_path);
+      QFile::remove(dest_path);
       QMessageBox::warning(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin could not be installed.", "%1 is the name of the search engine").arg(plugin_name));
       return;
     }
   }
   // Install was successful, remove backup
   if(update) {
-    misc::safeRemove(dest_path+".bak");
+    QFile::remove(dest_path+".bak");
   }
   if(update) {
     QMessageBox::information(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("%1 search engine plugin was successfully updated.", "%1 is the name of the search engine").arg(plugin_name));
@@ -413,7 +409,7 @@ bool engineSelectDlg::parseVersionsFile(QString versions_file) {
   // Close file
   versions.close();
   // Clean up tmp file
-  misc::safeRemove(versions_file);
+  QFile::remove(versions_file);
   if(file_correct && !updated) {
     QMessageBox::information(this, tr("Search plugin update")+" -- "+tr("qBittorrent"), tr("All your plugins are already up to date."));
   }
@@ -443,21 +439,21 @@ void engineSelectDlg::processDownloadedFile(QString url, QString filePath) {
       }
     }
     // Delete tmp file
-    misc::safeRemove(filePath);
+    QFile::remove(filePath);
     return;
   }
   if(url.endsWith("versions.txt")) {
     if(!parseVersionsFile(filePath)) {
       QMessageBox::warning(this, tr("Search plugin update")+" -- "+tr("qBittorrent"), tr("Sorry, update server is temporarily unavailable."));
     }
-    misc::safeRemove(filePath);
+    QFile::remove(filePath);
     return;
   }
   if(url.endsWith(".py", Qt::CaseInsensitive)) {
     QString plugin_name = url.split('/').last();
     plugin_name.replace(".py", "");
     installPlugin(filePath, plugin_name);
-    misc::safeRemove(filePath);
+    QFile::remove(filePath);
     return;
   }
 }

src/eventmanager.cpp

@@ -208,6 +208,12 @@ void EventManager::setGlobalPreferences(QVariantMap m) const {
     Preferences::setLSDEnabled(m["lsd"].toBool());
   if(m.contains("encryption"))
     Preferences::setEncryptionSetting(m["encryption"].toInt());
+  if(m.contains("peer_id"))
+    Preferences::setPeerID(m["peer_id"].toString());
+  if(m.contains("peer_version"))
+    Preferences::setClientVersion(m["peer_version"].toString());
+  if(m.contains("peer_build"))
+    Preferences::setClientBuild(m["peer_build"].toString());
   // Proxy
   if(m.contains("proxy_type"))
     Preferences::setPeerProxyType(m["proxy_type"].toInt());
@@ -289,6 +295,9 @@ QVariantMap EventManager::getGlobalPreferences() const {
   data["pex"] = Preferences::isPeXEnabled();
   data["lsd"] = Preferences::isLSDEnabled();
   data["encryption"] = Preferences::getEncryptionSetting();
+  data["peer_id"] = Preferences::getPeerID();
+  data["peer_version"] = Preferences::getClientVersion();
+  data["peer_build"] = Preferences::getClientBuild();
   // Proxy
   data["proxy_type"] = Preferences::getPeerProxyType();
   data["proxy_ip"] = Preferences::getPeerProxyIp();

src/filesystemwatcher.h

@@ -201,7 +201,7 @@ signals:
 
 private:
   void addTorrentsFromDir(const QDir &dir, QStringList &torrents) {
-    const QStringList files = dir.entryList(filters, QDir::Files, QDir::Unsorted);
+    const QStringList &files = dir.entryList(filters, QDir::Files, QDir::Unsorted);
     foreach(const QString &file, files)
       torrents << dir.canonicalPath() + '/' + file;
   }

src/geoip.h

@@ -41,7 +41,6 @@
 using namespace libtorrent;
 
 class GeoIP : public QObject {
-  Q_OBJECT
 protected:
 #ifdef WITH_GEOIP_EMBEDDED
   static QString geoipFolder(bool embedded=false) {
@@ -76,7 +75,7 @@ protected:
       }
       // Remove destination files
       if(QFile::exists(geoipDBpath(false)))
-        misc::safeRemove(geoipDBpath(false));
+        QFile::remove(geoipDBpath(false));
       // Copy from executable to hard disk
       qDebug("%s -> %s", qPrintable(geoipDBpath(true)), qPrintable(geoipDBpath(false)));
       if(!QFile::copy(geoipDBpath(true), geoipDBpath(false))) {

src/headlessloader.h

@@ -89,10 +89,6 @@ public slots:
       if(param.startsWith(QString::fromUtf8("http://"), Qt::CaseInsensitive) || param.startsWith(QString::fromUtf8("ftp://"), Qt::CaseInsensitive) || param.startsWith(QString::fromUtf8("https://"), Qt::CaseInsensitive)) {
         BTSession->downloadFromUrl(param);
       }else{
-        if(param.startsWith("bc://bt/", Qt::CaseInsensitive)) {
-          qDebug("Converting bc link to magnet link");
-          param = misc::bcLinkToMagnet(param);
-        }
         if(param.startsWith("magnet:", Qt::CaseInsensitive)) {
           BTSession->addMagnetUri(param);
         } else {

src/httpconnection.cpp

@@ -133,7 +133,7 @@ QString HttpConnection::translateDocument(QString data) {
 
 void HttpConnection::respond() {
   //qDebug("Respond called");
-  const QString peer_ip = socket->peerAddress().toString();
+  const QString &peer_ip = socket->peerAddress().toString();
   const int nb_fail = parent->NbFailedAttemptsForIp(peer_ip);
   if(nb_fail >= MAX_AUTH_FAILED_ATTEMPTS) {
     generator.setStatusLine(403, "Forbidden");
@@ -333,10 +333,6 @@ void HttpConnection::respondCommand(QString command)
     foreach(QString url, list){
       url = url.trimmed();
       if(!url.isEmpty()){
-        if(url.startsWith("bc://bt/", Qt::CaseInsensitive)) {
-          qDebug("Converting bc link to magnet link");
-          url = misc::bcLinkToMagnet(url);
-        }
         if(url.startsWith("magnet:", Qt::CaseInsensitive)) {
           emit MagnetReadyToBeDownloaded(url);
         } else {

src/json.h

@@ -47,7 +47,7 @@ namespace json {
     case QVariant::LongLong:
     case QVariant::UInt:
     case QVariant::ULongLong:
-    //case QMetaType::Float:
+    case QMetaType::Float:
       return v.value<QString>();
     case QVariant::StringList:
     case QVariant::List: {