diff --git a/src/webui/requesthandler.cpp b/src/webui/requesthandler.cpp
index da049c625..a13720b69 100644
--- a/src/webui/requesthandler.cpp
+++ b/src/webui/requesthandler.cpp
@@ -63,534 +63,484 @@ const QString WEBUI_ACTION = "webui";
 
 QMap<QString, QMap<QString, RequestHandler::Action> > RequestHandler::initializeActions()
 {
-  QMap<QString,QMap<QString, RequestHandler::Action> > actions;
-
-  ADD_ACTION(public, webui);
-  ADD_ACTION(public, index);
-  ADD_ACTION(public, login);
-  ADD_ACTION(public, logout);
-  ADD_ACTION(public, theme);
-  ADD_ACTION(public, images);
-  ADD_ACTION(json, torrents);
-  ADD_ACTION(json, preferences);
-  ADD_ACTION(json, transferInfo);
-  ADD_ACTION(json, propertiesGeneral);
-  ADD_ACTION(json, propertiesTrackers);
-  ADD_ACTION(json, propertiesFiles);
-  ADD_ACTION(command, shutdown);
-  ADD_ACTION(command, download);
-  ADD_ACTION(command, upload);
-  ADD_ACTION(command, addTrackers);
-  ADD_ACTION(command, resumeAll);
-  ADD_ACTION(command, pauseAll);
-  ADD_ACTION(command, resume);
-  ADD_ACTION(command, pause);
-  ADD_ACTION(command, setPreferences);
-  ADD_ACTION(command, setFilePrio);
-  ADD_ACTION(command, getGlobalUpLimit);
-  ADD_ACTION(command, getGlobalDlLimit);
-  ADD_ACTION(command, setGlobalUpLimit);
-  ADD_ACTION(command, setGlobalDlLimit);
-  ADD_ACTION(command, getTorrentUpLimit);
-  ADD_ACTION(command, getTorrentDlLimit);
-  ADD_ACTION(command, setTorrentUpLimit);
-  ADD_ACTION(command, setTorrentDlLimit);
-  ADD_ACTION(command, delete);
-  ADD_ACTION(command, deletePerm);
-  ADD_ACTION(command, increasePrio);
-  ADD_ACTION(command, decreasePrio);
-  ADD_ACTION(command, topPrio);
-  ADD_ACTION(command, bottomPrio);
-  ADD_ACTION(command, recheck);
-
-  return actions;
+    QMap<QString,QMap<QString, RequestHandler::Action> > actions;
+
+    ADD_ACTION(public, webui);
+    ADD_ACTION(public, index);
+    ADD_ACTION(public, login);
+    ADD_ACTION(public, logout);
+    ADD_ACTION(public, theme);
+    ADD_ACTION(public, images);
+    ADD_ACTION(json, torrents);
+    ADD_ACTION(json, preferences);
+    ADD_ACTION(json, transferInfo);
+    ADD_ACTION(json, propertiesGeneral);
+    ADD_ACTION(json, propertiesTrackers);
+    ADD_ACTION(json, propertiesFiles);
+    ADD_ACTION(command, shutdown);
+    ADD_ACTION(command, download);
+    ADD_ACTION(command, upload);
+    ADD_ACTION(command, addTrackers);
+    ADD_ACTION(command, resumeAll);
+    ADD_ACTION(command, pauseAll);
+    ADD_ACTION(command, resume);
+    ADD_ACTION(command, pause);
+    ADD_ACTION(command, setPreferences);
+    ADD_ACTION(command, setFilePrio);
+    ADD_ACTION(command, getGlobalUpLimit);
+    ADD_ACTION(command, getGlobalDlLimit);
+    ADD_ACTION(command, setGlobalUpLimit);
+    ADD_ACTION(command, setGlobalDlLimit);
+    ADD_ACTION(command, getTorrentUpLimit);
+    ADD_ACTION(command, getTorrentDlLimit);
+    ADD_ACTION(command, setTorrentUpLimit);
+    ADD_ACTION(command, setTorrentDlLimit);
+    ADD_ACTION(command, delete);
+    ADD_ACTION(command, deletePerm);
+    ADD_ACTION(command, increasePrio);
+    ADD_ACTION(command, decreasePrio);
+    ADD_ACTION(command, topPrio);
+    ADD_ACTION(command, bottomPrio);
+    ADD_ACTION(command, recheck);
+
+    return actions;
 }
 
 void RequestHandler::action_public_index()
 {
-  QString path;
-  if (!args_.isEmpty())
-  {
-    if (args_.back() == "favicon.ico")
-      path = ":/Icons/skin/qbittorrent16.png";
-    else
-      path = WWW_FOLDER + args_.join("/");
-  }
+    QString path;
+
+    if (!args_.isEmpty()) {
+        if (args_.back() == "favicon.ico")
+            path = ":/Icons/skin/qbittorrent16.png";
+        else
+            path = WWW_FOLDER + args_.join("/");
+    }
 
-  printFile(path);
+    printFile(path);
 }
 
 void RequestHandler::action_public_webui()
 {
-  if (!sessionActive())
-    printFile(PRIVATE_FOLDER + "login.html");
-  else
-    printFile(PRIVATE_FOLDER + "index.html");
+    if (!sessionActive())
+        printFile(PRIVATE_FOLDER + "login.html");
+    else
+        printFile(PRIVATE_FOLDER + "index.html");
 }
 
 void RequestHandler::action_public_login()
 {
-  const Preferences* const pref = Preferences::instance();
-  QCryptographicHash md5(QCryptographicHash::Md5);
+    const Preferences* const pref = Preferences::instance();
+    QCryptographicHash md5(QCryptographicHash::Md5);
 
-  md5.addData(request().posts["password"].toLocal8Bit());
-  QString pass = md5.result().toHex();
+    md5.addData(request().posts["password"].toLocal8Bit());
+    QString pass = md5.result().toHex();
 
-  bool equalUser = misc::slowEquals(request().posts["username"].toUtf8(), pref->getWebUiUsername().toUtf8());
-  bool equalPass = misc::slowEquals(pass.toUtf8(), pref->getWebUiPassword().toUtf8());
+    bool equalUser = misc::slowEquals(request().posts["username"].toUtf8(), pref->getWebUiUsername().toUtf8());
+    bool equalPass = misc::slowEquals(pass.toUtf8(), pref->getWebUiPassword().toUtf8());
 
-  if (equalUser && equalPass)
-  {
-    sessionStart();
-    print(QByteArray("Ok."), CONTENT_TYPE_TXT);
-  }
-  else
-  {
-    QString addr = env().clientAddress.toString();
-    increaseFailedAttempts();
-    qDebug("client IP: %s (%d failed attempts)", qPrintable(addr), failedAttempts());
-    print(QByteArray("Fails."), CONTENT_TYPE_TXT);
-  }
+    if (equalUser && equalPass) {
+        sessionStart();
+        print(QByteArray("Ok."), CONTENT_TYPE_TXT);
+    }
+    else {
+        QString addr = env().clientAddress.toString();
+        increaseFailedAttempts();
+        qDebug("client IP: %s (%d failed attempts)", qPrintable(addr), failedAttempts());
+        print(QByteArray("Fails."), CONTENT_TYPE_TXT);
+    }
 }
 
 void RequestHandler::action_public_logout()
 {
-  sessionEnd();
+    sessionEnd();
 }
 
 void RequestHandler::action_public_theme()
 {
-  if (args_.size() != 1)
-  {
-    status(404, "Not Found");
-    return;
-  }
+    if (args_.size() != 1) {
+        status(404, "Not Found");
+        return;
+    }
 
 #ifdef DISABLE_GUI
-  QString url = ":/Icons/oxygen/" + args_.front() + ".png";
+    QString url = ":/Icons/oxygen/" + args_.front() + ".png";
 #else
-  QString url = IconProvider::instance()->getIconPath(args_.front());
+    QString url = IconProvider::instance()->getIconPath(args_.front());
 #endif
-  qDebug() << Q_FUNC_INFO << "There icon:" << url;
+    qDebug() << Q_FUNC_INFO << "There icon:" << url;
 
-  printFile(url);
+    printFile(url);
 }
 
 void RequestHandler::action_public_images()
 {
-  const QString path = ":/Icons/" + args_.join("/");
-  printFile(path);
+    const QString path = ":/Icons/" + args_.join("/");
+    printFile(path);
 }
 
 void RequestHandler::action_json_torrents()
 {
-  print(btjson::getTorrents(), CONTENT_TYPE_JS);
+    print(btjson::getTorrents(), CONTENT_TYPE_JS);
 }
 
 void RequestHandler::action_json_preferences()
 {
-  print(prefjson::getPreferences(), CONTENT_TYPE_JS);
+    print(prefjson::getPreferences(), CONTENT_TYPE_JS);
 }
 
 void RequestHandler::action_json_transferInfo()
 {
-  print(btjson::getTransferInfo(), CONTENT_TYPE_JS);
+    print(btjson::getTransferInfo(), CONTENT_TYPE_JS);
 }
 
 void RequestHandler::action_json_propertiesGeneral()
 {
-  print(btjson::getPropertiesForTorrent(args_.front()), CONTENT_TYPE_JS);
+    print(btjson::getPropertiesForTorrent(args_.front()), CONTENT_TYPE_JS);
 }
 
 void RequestHandler::action_json_propertiesTrackers()
 {
-  print(btjson::getTrackersForTorrent(args_.front()), CONTENT_TYPE_JS);
+    print(btjson::getTrackersForTorrent(args_.front()), CONTENT_TYPE_JS);
 }
 
 void RequestHandler::action_json_propertiesFiles()
 {
-  print(btjson::getFilesForTorrent(args_.front()), CONTENT_TYPE_JS);
+    print(btjson::getFilesForTorrent(args_.front()), CONTENT_TYPE_JS);
 }
 
 void RequestHandler::action_command_shutdown()
 {
-  qDebug() << "Shutdown request from Web UI";
-  // Special case handling for shutdown, we
-  // need to reply to the Web UI before
-  // actually shutting down.
+    qDebug() << "Shutdown request from Web UI";
+    // Special case handling for shutdown, we
+    // need to reply to the Web UI before
+    // actually shutting down.
 
-  QTimer::singleShot(0, qApp, SLOT(quit()));
+    QTimer::singleShot(0, qApp, SLOT(quit()));
 }
 
 void RequestHandler::action_command_download()
 {
-  QString urls = request().posts["urls"];
-  QStringList list = urls.split('\n');
-
-  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);
-      }
-      else if (url.startsWith("magnet:", Qt::CaseInsensitive))
-      {
-        QBtSession::instance()->addMagnetSkipAddDlg(url);
-      }
-      else
-      {
-        qDebug("Downloading url: %s", qPrintable(url));
-        QBtSession::instance()->downloadUrlAndSkipDialog(url);
-      }
+    QString urls = request().posts["urls"];
+    QStringList list = urls.split('\n');
+
+    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);
+            }
+            else if (url.startsWith("magnet:", Qt::CaseInsensitive)) {
+                QBtSession::instance()->addMagnetSkipAddDlg(url);
+            }
+            else {
+                qDebug("Downloading url: %s", qPrintable(url));
+                QBtSession::instance()->downloadUrlAndSkipDialog(url);
+            }
+        }
     }
-  }
 }
 
 void RequestHandler::action_command_upload()
 {
-  qDebug() << Q_FUNC_INFO;
-
-  foreach(const UploadedFile& torrent, request().files)
-  {
-    QString filePath = saveTmpFile(torrent.data);
-
-    if (!filePath.isEmpty())
-    {
-      QTorrentHandle h = QBtSession::instance()->addTorrent(filePath);
-      if (!h.is_valid()) {
-        status(415, "Internal Server Error");
-        print(QObject::tr("Error: '%1' is not a valid torrent file.\n").arg(torrent.filename), CONTENT_TYPE_TXT);
-      }
-      // Clean up
-      fsutils::forceRemove(filePath);
+    qDebug() << Q_FUNC_INFO;
+
+    foreach(const UploadedFile& torrent, request().files) {
+        QString filePath = saveTmpFile(torrent.data);
+
+        if (!filePath.isEmpty()) {
+            QTorrentHandle h = QBtSession::instance()->addTorrent(filePath);
+            if (!h.is_valid()) {
+                status(415, "Internal Server Error");
+                print(QObject::tr("Error: '%1' is not a valid torrent file.\n").arg(torrent.filename), CONTENT_TYPE_TXT);
+            }
+            // Clean up
+            fsutils::forceRemove(filePath);
+        }
+        else {
+            qWarning() << "I/O Error: Could not create temporary file";
+            status(500, "Internal Server Error");
+            print(QObject::tr("I/O Error: Could not create temporary file."), CONTENT_TYPE_TXT);
+        }
     }
-    else
-    {
-      qWarning() << "I/O Error: Could not create temporary file";
-      status(500, "Internal Server Error");
-      print(QObject::tr("I/O Error: Could not create temporary file."), CONTENT_TYPE_TXT);
-    }
-  }
 }
 
 void RequestHandler::action_command_addTrackers()
 {
-  QString hash = request().posts["hash"];
+    QString hash = request().posts["hash"];
 
-  if (!hash.isEmpty())
-  {
-    QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
+    if (!hash.isEmpty()) {
+        QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
 
-    if (h.is_valid() && h.has_metadata())
-    {
-      QString urls = request().posts["urls"];
-      QStringList list = urls.split('\n');
-
-      foreach (const QString& url, list)
-      {
-        announce_entry e(url.toStdString());
-        h.add_tracker(e);
-      }
+        if (h.is_valid() && h.has_metadata()) {
+            QString urls = request().posts["urls"];
+            QStringList list = urls.split('\n');
+
+            foreach (const QString& url, list) {
+                announce_entry e(url.toStdString());
+                h.add_tracker(e);
+            }
+        }
     }
-  }
 }
 
 void RequestHandler::action_command_resumeAll()
 {
-  QBtSession::instance()->resumeAllTorrents();
+    QBtSession::instance()->resumeAllTorrents();
 }
 
 void RequestHandler::action_command_pauseAll()
 {
-  QBtSession::instance()->pauseAllTorrents();
+    QBtSession::instance()->pauseAllTorrents();
 }
 
 void RequestHandler::action_command_resume()
 {
-  QBtSession::instance()->resumeTorrent(request().posts["hash"]);
+    QBtSession::instance()->resumeTorrent(request().posts["hash"]);
 }
 
 void RequestHandler::action_command_pause()
 {
-  QBtSession::instance()->pauseTorrent(request().posts["hash"]);
+    QBtSession::instance()->pauseTorrent(request().posts["hash"]);
 }
 
 void RequestHandler::action_command_setPreferences()
 {
-  prefjson::setPreferences(request().posts["json"]);
+    prefjson::setPreferences(request().posts["json"]);
 }
 
 void RequestHandler::action_command_setFilePrio()
 {
-  QString hash = request().posts["hash"];
-  int file_id = request().posts["id"].toInt();
-  int priority = request().posts["priority"].toInt();
-  QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
+    QString hash = request().posts["hash"];
+    int file_id = request().posts["id"].toInt();
+    int priority = request().posts["priority"].toInt();
+    QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
 
-  if (h.is_valid() && h.has_metadata())
-  {
-    h.file_priority(file_id, priority);
-  }
+    if (h.is_valid() && h.has_metadata())
+        h.file_priority(file_id, priority);
 }
 
 void RequestHandler::action_command_getGlobalUpLimit()
 {
-  print(QByteArray::number(QBtSession::instance()->getSession()->settings().upload_rate_limit));
+    print(QByteArray::number(QBtSession::instance()->getSession()->settings().upload_rate_limit));
 }
 
 void RequestHandler::action_command_getGlobalDlLimit()
 {
-  print(QByteArray::number(QBtSession::instance()->getSession()->settings().download_rate_limit));
+    print(QByteArray::number(QBtSession::instance()->getSession()->settings().download_rate_limit));
 }
 
 void RequestHandler::action_command_setGlobalUpLimit()
 {
-  qlonglong limit = request().posts["limit"].toLongLong();
-  if (limit == 0) limit = -1;
+    qlonglong limit = request().posts["limit"].toLongLong();
+    if (limit == 0) limit = -1;
 
-  QBtSession::instance()->setUploadRateLimit(limit);
-  Preferences::instance()->setGlobalUploadLimit(limit/1024.);
+    QBtSession::instance()->setUploadRateLimit(limit);
+    Preferences::instance()->setGlobalUploadLimit(limit / 1024.);
 }
 
 void RequestHandler::action_command_setGlobalDlLimit()
 {
-  qlonglong limit = request().posts["limit"].toLongLong();
-  if (limit == 0) limit = -1;
+    qlonglong limit = request().posts["limit"].toLongLong();
+    if (limit == 0) limit = -1;
 
-  QBtSession::instance()->setDownloadRateLimit(limit);
-  Preferences::instance()->setGlobalDownloadLimit(limit/1024.);
+    QBtSession::instance()->setDownloadRateLimit(limit);
+    Preferences::instance()->setGlobalDownloadLimit(limit / 1024.);
 }
 
 void RequestHandler::action_command_getTorrentUpLimit()
 {
-  QString hash = request().posts["hash"];
-  QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
+    QString hash = request().posts["hash"];
+    QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
 
-  if (h.is_valid())
-  {
-    print(QByteArray::number(h.upload_limit()));
-  }
+    if (h.is_valid())
+        print(QByteArray::number(h.upload_limit()));
 }
 
 void RequestHandler::action_command_getTorrentDlLimit()
 {
-  QString hash = request().posts["hash"];
-  QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
+    QString hash = request().posts["hash"];
+    QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
 
-  if (h.is_valid())
-  {
-    print(QByteArray::number(h.download_limit()));
-  }
+    if (h.is_valid())
+        print(QByteArray::number(h.download_limit()));
 }
 
 void RequestHandler::action_command_setTorrentUpLimit()
 {
-  QString hash = request().posts["hash"];
-  qlonglong limit = request().posts["limit"].toLongLong();
-  if (limit == 0) limit = -1;
-  QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
+    QString hash = request().posts["hash"];
+    qlonglong limit = request().posts["limit"].toLongLong();
+    if (limit == 0) limit = -1;
+    QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
 
-  if (h.is_valid())
-  {
-    h.set_upload_limit(limit);
-  }
+    if (h.is_valid())
+        h.set_upload_limit(limit);
 }
 
 void RequestHandler::action_command_setTorrentDlLimit()
 {
-  QString hash = request().posts["hash"];
-  qlonglong limit = request().posts["limit"].toLongLong();
-  if (limit == 0) limit = -1;
-  QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
+    QString hash = request().posts["hash"];
+    qlonglong limit = request().posts["limit"].toLongLong();
+    if (limit == 0) limit = -1;
+    QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
 
-  if (h.is_valid())
-  {
-    h.set_download_limit(limit);
-  }
+    if (h.is_valid())
+        h.set_download_limit(limit);
 }
 
 void RequestHandler::action_command_delete()
 {
-  QStringList hashes = request().posts["hashes"].split("|");
-
-  foreach (const QString &hash, hashes)
-  {
-    QBtSession::instance()->deleteTorrent(hash, false);
-  }
+    QStringList hashes = request().posts["hashes"].split("|");
+    foreach (const QString &hash, hashes)
+        QBtSession::instance()->deleteTorrent(hash, false);
 }
 
 void RequestHandler::action_command_deletePerm()
 {
-  QStringList hashes = request().posts["hashes"].split("|");
-
-  foreach (const QString &hash, hashes)
-  {
-    QBtSession::instance()->deleteTorrent(hash, true);
-  }
+    QStringList hashes = request().posts["hashes"].split("|");
+    foreach (const QString &hash, hashes)
+        QBtSession::instance()->deleteTorrent(hash, true);
 }
 
 void RequestHandler::action_command_increasePrio()
 {
-  QStringList hashes = request().posts["hashes"].split("|");
-  std::priority_queue<QPair<int, QTorrentHandle>,
-      std::vector<QPair<int, QTorrentHandle> >,
-      std::greater<QPair<int, QTorrentHandle> > > torrent_queue;
-
-  // Sort torrents by priority
-  foreach (const QString &hash, hashes)
-  {
-    try
-    {
-      QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
-      if (!h.is_seed())
-      {
-        torrent_queue.push(qMakePair(h.queue_position(), h));
-      }
-    }
-    catch(invalid_handle&) {}
-  }
+    QStringList hashes = request().posts["hashes"].split("|");
 
-  // Increase torrents priority (starting with the ones with highest priority)
-  while(!torrent_queue.empty())
-  {
-    QTorrentHandle h = torrent_queue.top().second;
+    std::priority_queue<QPair<int, QTorrentHandle>,
+                        std::vector<QPair<int, QTorrentHandle> >,
+                        std::greater<QPair<int, QTorrentHandle> > > torrent_queue;
 
-    try
-    {
-      h.queue_position_up();
+    // Sort torrents by priority
+    foreach (const QString &hash, hashes) {
+        try {
+            QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
+            if (!h.is_seed())
+                torrent_queue.push(qMakePair(h.queue_position(), h));
+        }
+        catch(invalid_handle&) {}
     }
-    catch(invalid_handle&) {}
 
-    torrent_queue.pop();
-  }
+    // Increase torrents priority (starting with the ones with highest priority)
+    while(!torrent_queue.empty()) {
+        QTorrentHandle h = torrent_queue.top().second;
+
+        try {
+            h.queue_position_up();
+        }
+        catch(invalid_handle&) {}
+
+        torrent_queue.pop();
+    }
 }
 
 void RequestHandler::action_command_decreasePrio()
 {
-  QStringList hashes = request().posts["hashes"].split("|");
-  std::priority_queue<QPair<int, QTorrentHandle>,
-      std::vector<QPair<int, QTorrentHandle> >,
-      std::less<QPair<int, QTorrentHandle> > > torrent_queue;
-
-  // Sort torrents by priority
-  foreach (const QString &hash, hashes)
-  {
-    try
-    {
-      QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
-
-      if (!h.is_seed())
-      {
-        torrent_queue.push(qMakePair(h.queue_position(), h));
-      }
-    }
-    catch(invalid_handle&) {}
-  }
+    QStringList hashes = request().posts["hashes"].split("|");
 
-  // Decrease torrents priority (starting with the ones with lowest priority)
-  while(!torrent_queue.empty())
-  {
-    QTorrentHandle h = torrent_queue.top().second;
+    std::priority_queue<QPair<int, QTorrentHandle>,
+                        std::vector<QPair<int, QTorrentHandle> >,
+                        std::less<QPair<int, QTorrentHandle> > > torrent_queue;
 
-    try
-    {
-      h.queue_position_down();
+    // Sort torrents by priority
+    foreach (const QString &hash, hashes) {
+        try {
+            QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
+
+            if (!h.is_seed())
+                torrent_queue.push(qMakePair(h.queue_position(), h));
+        }
+        catch(invalid_handle&) {}
     }
-    catch(invalid_handle&) {}
 
-    torrent_queue.pop();
-  }
+    // Decrease torrents priority (starting with the ones with lowest priority)
+    while(!torrent_queue.empty()) {
+        QTorrentHandle h = torrent_queue.top().second;
+
+        try {
+            h.queue_position_down();
+        }
+        catch(invalid_handle&) {}
+
+        torrent_queue.pop();
+    }
 }
 
 void RequestHandler::action_command_topPrio()
 {
-  foreach (const QString &hash, request().posts["hashes"].split("|"))
-  {
-    QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
-    if (h.is_valid()) h.queue_position_top();
-  }
+    foreach (const QString &hash, request().posts["hashes"].split("|")) {
+        QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
+        if (h.is_valid()) h.queue_position_top();
+    }
 }
 
 void RequestHandler::action_command_bottomPrio()
 {
-  foreach (const QString &hash, request().posts["hashes"].split("|"))
-  {
-    QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
-    if (h.is_valid()) h.queue_position_bottom();
-  }
+    foreach (const QString &hash, request().posts["hashes"].split("|")) {
+        QTorrentHandle h = QBtSession::instance()->getTorrentHandle(hash);
+        if (h.is_valid()) h.queue_position_bottom();
+    }
 }
 
 void RequestHandler::action_command_recheck()
 {
-  QBtSession::instance()->recheckTorrent(request().posts["hash"]);
+    QBtSession::instance()->recheckTorrent(request().posts["hash"]);
 }
 
 bool RequestHandler::isPublicScope()
 {
-  return (scope_ == DEFAULT_SCOPE);
+    return (scope_ == DEFAULT_SCOPE);
 }
 
 void RequestHandler::processRequest()
 {
-  if (args_.contains(".") || args_.contains(".."))
-  {
-    qDebug() << Q_FUNC_INFO << "Invalid path:" << request().path;
-    status(404, "Not Found");
-    return;
-  }
-
-  if (!isPublicScope() && !sessionActive())
-  {
-    status(403, "Forbidden");
-    return;
-  }
-
-  if (actions_.value(scope_).value(action_) != 0)
-  {
-    (this->*(actions_[scope_][action_]))();
-  }
-  else
-  {
-    status(404, "Not Found");
-    qDebug() << Q_FUNC_INFO << "Resource not found:" << request().path;
-  }
+    if (args_.contains(".") || args_.contains("..")) {
+        qDebug() << Q_FUNC_INFO << "Invalid path:" << request().path;
+        status(404, "Not Found");
+        return;
+    }
+
+    if (!isPublicScope() && !sessionActive()) {
+        status(403, "Forbidden");
+        return;
+    }
+
+    if (actions_.value(scope_).value(action_) != 0) {
+        (this->*(actions_[scope_][action_]))();
+    }
+    else {
+        status(404, "Not Found");
+        qDebug() << Q_FUNC_INFO << "Resource not found:" << request().path;
+    }
 }
 
 void RequestHandler::parsePath()
 {
-  if(request().path == "/") action_ = WEBUI_ACTION;
+    if(request().path == "/") action_ = WEBUI_ACTION;
 
-  // check action for requested path
-  QStringList pathItems = request().path.split('/', QString::SkipEmptyParts);
-  if (!pathItems.empty())
-  {
-    if (actions_.contains(pathItems.front()))
-    {
-      scope_ = pathItems.front();
-      pathItems.pop_front();
+    // check action for requested path
+    QStringList pathItems = request().path.split('/', QString::SkipEmptyParts);
+    if (!pathItems.empty()) {
+        if (actions_.contains(pathItems.front())) {
+            scope_ = pathItems.front();
+            pathItems.pop_front();
+        }
     }
-  }
-
-  if (!pathItems.empty())
-  {
-    if (actions_[scope_].contains(pathItems.front()))
-    {
-      action_ = pathItems.front();
-      pathItems.pop_front();
+
+    if (!pathItems.empty()) {
+        if (actions_[scope_].contains(pathItems.front())) {
+            action_ = pathItems.front();
+            pathItems.pop_front();
+        }
     }
-  }
 
-  args_ = pathItems;
+    args_ = pathItems;
 }
 
 RequestHandler::RequestHandler(const HttpRequest &request, const HttpEnvironment &env, WebApplication *app)
-  : AbstractRequestHandler(request, env, app), scope_(DEFAULT_SCOPE), action_(DEFAULT_ACTION)
+    : AbstractRequestHandler(request, env, app), scope_(DEFAULT_SCOPE), action_(DEFAULT_ACTION)
 {
-  parsePath();
+    parsePath();
 }
 
 QMap<QString, QMap<QString, RequestHandler::Action> > RequestHandler::actions_ = RequestHandler::initializeActions();
diff --git a/src/webui/requesthandler.h b/src/webui/requesthandler.h
index a92f85269..49d4e24b9 100644
--- a/src/webui/requesthandler.h
+++ b/src/webui/requesthandler.h
@@ -38,63 +38,63 @@ class WebApplication;
 class RequestHandler: public AbstractRequestHandler
 {
 public:
-  RequestHandler(
-      const HttpRequest& request, const HttpEnvironment& env,
-      WebApplication* app);
+    RequestHandler(
+        const HttpRequest& request, const HttpEnvironment& env,
+        WebApplication* app);
 
 private:
-  // Actions
-  void action_public_webui();
-  void action_public_index();
-  void action_public_login();
-  void action_public_logout();
-  void action_public_theme();
-  void action_public_images();
-  void action_json_torrents();
-  void action_json_preferences();
-  void action_json_transferInfo();
-  void action_json_propertiesGeneral();
-  void action_json_propertiesTrackers();
-  void action_json_propertiesFiles();
-  void action_command_shutdown();
-  void action_command_download();
-  void action_command_upload();
-  void action_command_addTrackers();
-  void action_command_resumeAll();
-  void action_command_pauseAll();
-  void action_command_resume();
-  void action_command_pause();
-  void action_command_setPreferences();
-  void action_command_setFilePrio();
-  void action_command_getGlobalUpLimit();
-  void action_command_getGlobalDlLimit();
-  void action_command_setGlobalUpLimit();
-  void action_command_setGlobalDlLimit();
-  void action_command_getTorrentUpLimit();
-  void action_command_getTorrentDlLimit();
-  void action_command_setTorrentUpLimit();
-  void action_command_setTorrentDlLimit();
-  void action_command_delete();
-  void action_command_deletePerm();
-  void action_command_increasePrio();
-  void action_command_decreasePrio();
-  void action_command_topPrio();
-  void action_command_bottomPrio();
-  void action_command_recheck();
+    // Actions
+    void action_public_webui();
+    void action_public_index();
+    void action_public_login();
+    void action_public_logout();
+    void action_public_theme();
+    void action_public_images();
+    void action_json_torrents();
+    void action_json_preferences();
+    void action_json_transferInfo();
+    void action_json_propertiesGeneral();
+    void action_json_propertiesTrackers();
+    void action_json_propertiesFiles();
+    void action_command_shutdown();
+    void action_command_download();
+    void action_command_upload();
+    void action_command_addTrackers();
+    void action_command_resumeAll();
+    void action_command_pauseAll();
+    void action_command_resume();
+    void action_command_pause();
+    void action_command_setPreferences();
+    void action_command_setFilePrio();
+    void action_command_getGlobalUpLimit();
+    void action_command_getGlobalDlLimit();
+    void action_command_setGlobalUpLimit();
+    void action_command_setGlobalDlLimit();
+    void action_command_getTorrentUpLimit();
+    void action_command_getTorrentDlLimit();
+    void action_command_setTorrentUpLimit();
+    void action_command_setTorrentDlLimit();
+    void action_command_delete();
+    void action_command_deletePerm();
+    void action_command_increasePrio();
+    void action_command_decreasePrio();
+    void action_command_topPrio();
+    void action_command_bottomPrio();
+    void action_command_recheck();
 
-  typedef void (RequestHandler::*Action)();
+    typedef void (RequestHandler::*Action)();
 
-  QString scope_;
-  QString action_;
-  QStringList args_;
+    QString scope_;
+    QString action_;
+    QStringList args_;
 
-  void processRequest();
+    void processRequest();
 
-  bool isPublicScope();
-  void parsePath();
+    bool isPublicScope();
+    void parsePath();
 
-  static QMap<QString, QMap<QString, Action> > initializeActions();
-  static QMap<QString, QMap<QString, Action> > actions_;
+    static QMap<QString, QMap<QString, Action> > initializeActions();
+    static QMap<QString, QMap<QString, Action> > actions_;
 };
 
 #endif // REQUESTHANDLER_H