Coding style clean up

src/searchengine/engineselectdlg.cpp

@@ -76,15 +76,15 @@ engineSelectDlg::~engineSelectDlg() {
 void engineSelectDlg::dropEvent(QDropEvent *event) {
   event->acceptProposedAction();
   QStringList files=event->mimeData()->text().split(QString::fromUtf8("\n"));
-  foreach(QString file, files) {
+  foreach (QString file, files) {
     qDebug("dropped %s", qPrintable(file));
-    if(misc::isUrl(file)) {
+    if (misc::isUrl(file)) {
       setCursor(QCursor(Qt::WaitCursor));
       downloader->downloadUrl(file);
       continue;
     }
-    if(file.endsWith(".py", Qt::CaseInsensitive)) {
-      if(file.startsWith("file:", Qt::CaseInsensitive))
+    if (file.endsWith(".py", Qt::CaseInsensitive)) {
+      if (file.startsWith("file:", Qt::CaseInsensitive))
         file = QUrl(file).toLocalFile();
       QString plugin_name = misc::fileName(file);
       plugin_name.chop(3); // Remove extension
@@ -96,7 +96,7 @@ void engineSelectDlg::dropEvent(QDropEvent *event) {
 // Decode if we accept drag 'n drop or not
 void engineSelectDlg::dragEnterEvent(QDragEnterEvent *event) {
   QString mime;
-  foreach(mime, event->mimeData()->formats()){
+  foreach (mime, event->mimeData()->formats()){
     qDebug("mimeData: %s", qPrintable(mime));
   }
   if (event->mimeData()->hasFormat(QString::fromUtf8("text/plain")) || event->mimeData()->hasFormat(QString::fromUtf8("text/uri-list"))) {
@@ -113,7 +113,7 @@ void engineSelectDlg::on_updateButton_clicked() {
 void engineSelectDlg::toggleEngineState(QTreeWidgetItem *item, int) {
   SupportedEngine *engine = supported_engines->value(item->text(ENGINE_ID));
   engine->setEnabled(!engine->isEnabled());
-  if(engine->isEnabled()) {
+  if (engine->isEnabled()) {
     item->setText(ENGINE_STATE, tr("Yes"));
     setRowColor(pluginsTree->indexOfTopLevelItem(item), "green");
   } else {
@@ -126,7 +126,7 @@ void engineSelectDlg::displayContextMenu(const QPoint&) {
   QMenu myContextMenu(this);
   // Enable/disable pause/start action given the DL state
   QList<QTreeWidgetItem *> items = pluginsTree->selectedItems();
-  if(items.isEmpty()) return;
+  if (items.isEmpty()) return;
   QString first_id = items.first()->text(ENGINE_ID);
   actionEnable->setChecked(supported_engines->value(first_id)->isEnabled());
   myContextMenu.addAction(actionEnable);
@@ -143,11 +143,11 @@ void engineSelectDlg::on_actionUninstall_triggered() {
   QList<QTreeWidgetItem *> items = pluginsTree->selectedItems();
   QTreeWidgetItem *item;
   bool error = false;
-  foreach(item, items) {
+  foreach (item, items) {
     int index = pluginsTree->indexOfTopLevelItem(item);
     Q_ASSERT(index != -1);
     QString id = item->text(ENGINE_ID);
-    if(QFile::exists(":/nova/engines/"+id+".py")) {
+    if (QFile::exists(":/nova/engines/"+id+".py")) {
       error = true;
       // Disable it instead
       supported_engines->value(id)->setEnabled(false);
@@ -162,7 +162,7 @@ void engineSelectDlg::on_actionUninstall_triggered() {
       filters << id+".*";
       QStringList files = enginesFolder.entryList(filters, QDir::Files, QDir::Unsorted);
       QString file;
-      foreach(file, files) {
+      foreach (file, files) {
         enginesFolder.remove(file);
       }
       // Remove it from supported engines
@@ -170,7 +170,7 @@ void engineSelectDlg::on_actionUninstall_triggered() {
       delete item;
     }
   }
-  if(error)
+  if (error)
     QMessageBox::warning(0, tr("Uninstall warning"), tr("Some plugins could not be uninstalled because they are included in qBittorrent.\n Only the ones you added yourself can be uninstalled.\nHowever, those plugins were disabled."));
   else
     QMessageBox::information(0, tr("Uninstall success"), tr("All selected plugins were uninstalled successfully"));
@@ -179,12 +179,12 @@ void engineSelectDlg::on_actionUninstall_triggered() {
 void engineSelectDlg::enableSelection(bool enable) {
   QList<QTreeWidgetItem *> items = pluginsTree->selectedItems();
   QTreeWidgetItem *item;
-  foreach(item, items) {
+  foreach (item, items) {
     int index = pluginsTree->indexOfTopLevelItem(item);
     Q_ASSERT(index != -1);
     QString id = item->text(ENGINE_ID);
     supported_engines->value(id)->setEnabled(enable);
-    if(enable) {
+    if (enable) {
       item->setText(ENGINE_STATE, tr("Yes"));
       setRowColor(index, "green");
     } else {
@@ -197,16 +197,16 @@ void engineSelectDlg::enableSelection(bool enable) {
 // Set the color of a row in data model
 void engineSelectDlg::setRowColor(int row, QString color){
   QTreeWidgetItem *item = pluginsTree->topLevelItem(row);
-  for(int i=0; i<pluginsTree->columnCount(); ++i){
+  for (int i=0; i<pluginsTree->columnCount(); ++i){
     item->setData(i, Qt::ForegroundRole, QVariant(QColor(color)));
   }
 }
 
 QList<QTreeWidgetItem*> engineSelectDlg::findItemsWithUrl(QString url){
   QList<QTreeWidgetItem*> res;
-  for(int i=0; i<pluginsTree->topLevelItemCount(); ++i) {
+  for (int i=0; i<pluginsTree->topLevelItemCount(); ++i) {
     QTreeWidgetItem *item = pluginsTree->topLevelItem(i);
-    if(url.startsWith(item->text(ENGINE_URL), Qt::CaseInsensitive))
+    if (url.startsWith(item->text(ENGINE_URL), Qt::CaseInsensitive))
       res << item;
   }
   return res;
@@ -214,9 +214,9 @@ QList<QTreeWidgetItem*> engineSelectDlg::findItemsWithUrl(QString url){
 
 QTreeWidgetItem* engineSelectDlg::findItemWithID(QString id){
   QList<QTreeWidgetItem*> res;
-  for(int i=0; i<pluginsTree->topLevelItemCount(); ++i) {
+  for (int i=0; i<pluginsTree->topLevelItemCount(); ++i) {
     QTreeWidgetItem *item = pluginsTree->topLevelItem(i);
-    if(id == item->text(ENGINE_ID))
+    if (id == item->text(ENGINE_ID))
       return item;
   }
   return 0;
@@ -232,7 +232,7 @@ void engineSelectDlg::installPlugin(QString path, QString plugin_name) {
   qDebug("Asked to install plugin at %s", qPrintable(path));
   qreal new_version = SearchEngine::getPluginVersion(path);
   qDebug("Version to be installed: %.2f", new_version);
-  if(!isUpdateNeeded(plugin_name, new_version)) {
+  if (!isUpdateNeeded(plugin_name, new_version)) {
     qDebug("Apparently update is not needed, we have a more recent version");
     QMessageBox::information(this, tr("Search plugin install")+" -- "+tr("qBittorrent"), tr("A more recent version of %1 search engine plugin is already installed.", "%1 is the name of the search engine").arg(plugin_name));
     return;
@@ -240,7 +240,7 @@ void engineSelectDlg::installPlugin(QString path, QString plugin_name) {
   // Process with install
   QString dest_path = misc::searchEngineLocation()+QDir::separator()+"engines"+QDir::separator()+plugin_name+".py";
   bool update = false;
-  if(QFile::exists(dest_path)) {
+  if (QFile::exists(dest_path)) {
     // Backup in case install fails
     QFile::copy(dest_path, dest_path+".bak");
     QFile::remove(dest_path);
@@ -252,8 +252,8 @@ void engineSelectDlg::installPlugin(QString path, QString plugin_name) {
   // Update supported plugins
   supported_engines->update();
   // Check if this was correctly installed
-  if(!supported_engines->contains(plugin_name)) {
-    if(update) {
+  if (!supported_engines->contains(plugin_name)) {
+    if (update) {
       // Remove broken file
       QFile::remove(dest_path);
       // restore backup
@@ -269,10 +269,10 @@ void engineSelectDlg::installPlugin(QString path, QString plugin_name) {
     }
   }
   // Install was successful, remove backup
-  if(update) {
+  if (update) {
     QFile::remove(dest_path+".bak");
   }
-  if(update) {
+  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));
     return;
   } else {
@@ -284,7 +284,7 @@ void engineSelectDlg::installPlugin(QString path, QString plugin_name) {
 void engineSelectDlg::loadSupportedSearchEngines() {
   // Some clean up first
   pluginsTree->clear();
-  foreach(QString name, supported_engines->keys()) {
+  foreach (QString name, supported_engines->keys()) {
     addNewEngine(name);
   }
 }
@@ -295,7 +295,7 @@ void engineSelectDlg::addNewEngine(QString engine_name) {
   item->setText(ENGINE_NAME, engine->getFullName());
   item->setText(ENGINE_URL, engine->getUrl());
   item->setText(ENGINE_ID, engine->getName());
-  if(engine->isEnabled()) {
+  if (engine->isEnabled()) {
     item->setText(ENGINE_STATE, tr("Yes"));
     setRowColor(pluginsTree->indexOfTopLevelItem(item), "green");
   } else {
@@ -304,12 +304,12 @@ void engineSelectDlg::addNewEngine(QString engine_name) {
   }
   // Handle icon
   QString iconPath = misc::searchEngineLocation()+QDir::separator()+"engines"+QDir::separator()+engine->getName()+".png";
-  if(QFile::exists(iconPath)) {
+  if (QFile::exists(iconPath)) {
     // Good, we already have the icon
     item->setData(ENGINE_NAME, Qt::DecorationRole, QVariant(QIcon(iconPath)));
   } else {
     iconPath = misc::searchEngineLocation()+QDir::separator()+"engines"+QDir::separator()+engine->getName()+".ico";
-    if(QFile::exists(iconPath)) { // ICO support
+    if (QFile::exists(iconPath)) { // ICO support
       item->setData(ENGINE_NAME, Qt::DecorationRole, QVariant(QIcon(iconPath)));
     } else {
       // Icon is missing, we must download it
@@ -340,8 +340,8 @@ void engineSelectDlg::askForLocalPlugin() {
                                                         tr("Select search plugins"), QDir::homePath(),
                                                         tr("qBittorrent search plugins")+QString::fromUtf8(" (*.py)"));
   QString path;
-  foreach(path, pathsList) {
-    if(path.endsWith(".py", Qt::CaseInsensitive)) {
+  foreach (path, pathsList) {
+    if (path.endsWith(".py", Qt::CaseInsensitive)) {
       QString plugin_name = path.split(QDir::separator()).last();
       plugin_name.replace(".py", "", Qt::CaseInsensitive);
       installPlugin(path, plugin_name);
@@ -353,7 +353,7 @@ bool engineSelectDlg::parseVersionsFile(QString versions_file) {
   qDebug("Checking if update is needed");
   bool file_correct = false;
   QFile versions(versions_file);
-  if(!versions.open(QIODevice::ReadOnly | QIODevice::Text)){
+  if (!versions.open(QIODevice::ReadOnly | QIODevice::Text)){
     qDebug("* Error: Could not read versions.txt file");
     return false;
   }
@@ -362,19 +362,19 @@ bool engineSelectDlg::parseVersionsFile(QString versions_file) {
     QByteArray line = versions.readLine();
     line.replace("\n", "");
     line = line.trimmed();
-    if(line.isEmpty()) continue;
-    if(line.startsWith("#")) continue;
+    if (line.isEmpty()) continue;
+    if (line.startsWith("#")) continue;
     QList<QByteArray> list = line.split(' ');
-    if(list.size() != 2) continue;
+    if (list.size() != 2) continue;
     QString plugin_name = QString(list.first());
-    if(!plugin_name.endsWith(":")) continue;
+    if (!plugin_name.endsWith(":")) continue;
     plugin_name.chop(1); // remove trailing ':'
     bool ok;
     qreal version = list.last().toFloat(&ok);
     qDebug("read line %s: %.2f", qPrintable(plugin_name), version);
-    if(!ok) continue;
+    if (!ok) continue;
     file_correct = true;
-    if(isUpdateNeeded(plugin_name, version)) {
+    if (isUpdateNeeded(plugin_name, version)) {
       qDebug("Plugin: %s is outdated", qPrintable(plugin_name));
       // Downloading update
       setCursor(QCursor(Qt::WaitCursor));
@@ -389,7 +389,7 @@ bool engineSelectDlg::parseVersionsFile(QString versions_file) {
   versions.close();
   // Clean up tmp file
   QFile::remove(versions_file);
-  if(file_correct && !updated) {
+  if (file_correct && !updated) {
     QMessageBox::information(this, tr("Search plugin update")+" -- "+tr("qBittorrent"), tr("All your plugins are already up to date."));
   }
   return file_correct;
@@ -398,18 +398,18 @@ bool engineSelectDlg::parseVersionsFile(QString versions_file) {
 void engineSelectDlg::processDownloadedFile(QString url, QString filePath) {
   setCursor(QCursor(Qt::ArrowCursor));
   qDebug("engineSelectDlg received %s", qPrintable(url));
-  if(url.endsWith("favicon.ico", Qt::CaseInsensitive)){
+  if (url.endsWith("favicon.ico", Qt::CaseInsensitive)){
     // Icon downloaded
     QImage fileIcon;
-    if(fileIcon.load(filePath)) {
+    if (fileIcon.load(filePath)) {
       QList<QTreeWidgetItem*> items = findItemsWithUrl(url);
       QTreeWidgetItem *item;
-      foreach(item, items){
+      foreach (item, items){
         QString id = item->text(ENGINE_ID);
         QString iconPath;
         QFile icon(filePath);
         icon.open(QIODevice::ReadOnly);
-        if(ICOHandler::canRead(&icon))
+        if (ICOHandler::canRead(&icon))
           iconPath = misc::searchEngineLocation()+QDir::separator()+"engines"+QDir::separator()+id+".ico";
         else
           iconPath = misc::searchEngineLocation()+QDir::separator()+"engines"+QDir::separator()+id+".png";
@@ -421,14 +421,14 @@ void engineSelectDlg::processDownloadedFile(QString url, QString filePath) {
     QFile::remove(filePath);
     return;
   }
-  if(url.endsWith("versions.txt")) {
-    if(!parseVersionsFile(filePath)) {
+  if (url.endsWith("versions.txt")) {
+    if (!parseVersionsFile(filePath)) {
       QMessageBox::warning(this, tr("Search plugin update")+" -- "+tr("qBittorrent"), tr("Sorry, update server is temporarily unavailable."));
     }
     QFile::remove(filePath);
     return;
   }
-  if(url.endsWith(".py", Qt::CaseInsensitive)) {
+  if (url.endsWith(".py", Qt::CaseInsensitive)) {
     QString plugin_name = misc::fileName(url);
     plugin_name.chop(3); // Remove extension
     installPlugin(filePath, plugin_name);
@@ -439,15 +439,15 @@ void engineSelectDlg::processDownloadedFile(QString url, QString filePath) {
 
 void engineSelectDlg::handleDownloadFailure(QString url, QString reason) {
   setCursor(QCursor(Qt::ArrowCursor));
-  if(url.endsWith("favicon.ico", Qt::CaseInsensitive)){
+  if (url.endsWith("favicon.ico", Qt::CaseInsensitive)){
     qDebug("Could not download favicon: %s, reason: %s", qPrintable(url), qPrintable(reason));
     return;
   }
-  if(url.endsWith("versions.txt")) {
+  if (url.endsWith("versions.txt")) {
     QMessageBox::warning(this, tr("Search plugin update")+" -- "+tr("qBittorrent"), tr("Sorry, update server is temporarily unavailable."));
     return;
   }
-  if(url.endsWith(".py", Qt::CaseInsensitive)) {
+  if (url.endsWith(".py", Qt::CaseInsensitive)) {
     // a plugin update download has been failed
     QString plugin_name = url.split('/').last();
     plugin_name.replace(".py", "", Qt::CaseInsensitive);

src/searchengine/searchengine.cpp

@@ -114,7 +114,7 @@ void SearchEngine::fillCatCombobox() {
   comboCategory->clear();
   comboCategory->addItem(full_cat_names["all"], QVariant("all"));
   QStringList supported_cat = supported_engines->supportedCategories();
-  foreach(QString cat, supported_cat) {
+  foreach (QString cat, supported_cat) {
     qDebug("Supported category: %s", qPrintable(cat));
     comboCategory->addItem(full_cat_names[cat], QVariant(cat));
   }
@@ -123,10 +123,10 @@ void SearchEngine::fillCatCombobox() {
 #ifdef Q_WS_WIN
 bool SearchEngine::addPythonPathToEnv() {
   QString python_path = Preferences::getPythonPath();
-  if(!python_path.isEmpty()) {
+  if (!python_path.isEmpty()) {
     // Add it to PATH envvar
     QString path_envar = QString::fromLocal8Bit(qgetenv("PATH").constData());
-    if(path_envar.isNull()) {
+    if (path_envar.isNull()) {
       path_envar = "";
     }
     path_envar = python_path+";"+path_envar;
@@ -162,7 +162,7 @@ void SearchEngine::pythonDownloadSuccess(QString url, QString file_path) {
   qDebug("Setup should be complete!");
   // Reload search engine
   has_python = addPythonPathToEnv();
-  if(has_python) {
+  if (has_python) {
     supported_engines->update();
     // Launch the search again
     on_search_button_clicked();
@@ -189,7 +189,7 @@ SearchEngine::~SearchEngine(){
   saveSearchHistory();
   searchProcess->kill();
   searchProcess->waitForFinished();
-  foreach(QProcess *downloader, downloaders) {
+  foreach (QProcess *downloader, downloaders) {
     // Make sure we disconnect the SIGNAL/SLOT first
     // To avoid qreal free
     downloader->disconnect();
@@ -203,7 +203,7 @@ SearchEngine::~SearchEngine(){
   delete searchTimeout;
   delete searchProcess;
   delete supported_engines;
-  if(searchCompleter)
+  if (searchCompleter)
     delete searchCompleter;
 }
 
@@ -215,24 +215,24 @@ void SearchEngine::displayPatternContextMenu(QPoint) {
   QAction clearAct(IconProvider::instance()->getIcon("edit-clear"), tr("Clear field"), &myMenu);
   QAction clearHistoryAct(IconProvider::instance()->getIcon("edit-clear-history"), tr("Clear completion history"), &myMenu);
   bool hasCopyAct = false;
-  if(search_pattern->hasSelectedText()) {
+  if (search_pattern->hasSelectedText()) {
     myMenu.addAction(&cutAct);
     myMenu.addAction(&copyAct);
     hasCopyAct = true;
   }
-  if(qApp->clipboard()->mimeData()->hasText()) {
+  if (qApp->clipboard()->mimeData()->hasText()) {
     myMenu.addAction(&pasteAct);
     hasCopyAct = true;
   }
-  if(hasCopyAct)
+  if (hasCopyAct)
     myMenu.addSeparator();
   myMenu.addAction(&clearHistoryAct);
   myMenu.addAction(&clearAct);
   QAction *act = myMenu.exec(QCursor::pos());
-  if(act != 0) {
-    if(act == &clearHistoryAct) {
+  if (act != 0) {
+    if (act == &clearHistoryAct) {
       // Ask for confirmation
-      if(QMessageBox::question(this, tr("Confirmation"), tr("Are you sure you want to clear the history?"), QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes) {
+      if (QMessageBox::question(this, tr("Confirmation"), tr("Are you sure you want to clear the history?"), QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes) {
         // Clear history
         searchHistory.setStringList(QStringList());
       }
@@ -255,9 +255,9 @@ void SearchEngine::displayPatternContextMenu(QPoint) {
 void SearchEngine::tab_changed(int t)
 {//when we switch from a tab that is not empty to another that is empty the download button 
   //doesn't have to be available
-  if(t>-1)
+  if (t>-1)
   {//-1 = no more tab
-    if(all_tab.at(tabWidget->currentIndex())->getCurrentSearchListModel()->rowCount()) {
+    if (all_tab.at(tabWidget->currentIndex())->getCurrentSearchListModel()->rowCount()) {
       download_button->setEnabled(true);
       goToDescBtn->setEnabled(true);
     } else {
@@ -296,8 +296,8 @@ void SearchEngine::giveFocusToSearchInput() {
 // Function called when we click on search button
 void SearchEngine::on_search_button_clicked(){
 #ifdef Q_WS_WIN
-  if(!has_python) {
-    if(QMessageBox::question(this, tr("Missing Python Interpreter"),
+  if (!has_python) {
+    if (QMessageBox::question(this, tr("Missing Python Interpreter"),
                              tr("Python 2.x is required to use the search engine but it does not seem to be installed.\nDo you want to install it now?"),
                              QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes) {
       // Download and Install Python
@@ -306,17 +306,17 @@ void SearchEngine::on_search_button_clicked(){
     return;
   }
 #endif
-  if(searchProcess->state() != QProcess::NotRunning){
+  if (searchProcess->state() != QProcess::NotRunning){
 #ifdef Q_WS_WIN
     searchProcess->kill();
 #else
     searchProcess->terminate();
 #endif
     search_stopped = true;
-    if(searchTimeout->isActive()) {
+    if (searchTimeout->isActive()) {
       searchTimeout->stop();
     }
-    if(search_button->text() != tr("Search")) {
+    if (search_button->text() != tr("Search")) {
       search_button->setText(tr("Search"));
       return;
     }
@@ -327,7 +327,7 @@ void SearchEngine::on_search_button_clicked(){
 
   const QString pattern = search_pattern->text().trimmed();
   // No search pattern entered
-  if(pattern.isEmpty()){
+  if (pattern.isEmpty()){
     QMessageBox::critical(0, tr("Empty search pattern"), tr("Please type a search pattern first"));
     return;
   }
@@ -344,11 +344,11 @@ void SearchEngine::on_search_button_clicked(){
 #endif
   // if the pattern is not in the pattern
   QStringList wordList = searchHistory.stringList();
-  if(wordList.indexOf(pattern) == -1){
+  if (wordList.indexOf(pattern) == -1){
     //update the searchHistory list
     wordList.append(pattern);
     // verify the max size of the history
-    if(wordList.size() > SEARCHHISTORY_MAXSIZE)
+    if (wordList.size() > SEARCHHISTORY_MAXSIZE)
       wordList = wordList.mid(wordList.size()/2);
     searchHistory.setStringList(wordList);
   }
@@ -373,7 +373,7 @@ void SearchEngine::on_search_button_clicked(){
 }
 
 void SearchEngine::createCompleter() {
-  if(searchCompleter)
+  if (searchCompleter)
     delete searchCompleter;
   searchCompleter = new QCompleter(&searchHistory);
   searchCompleter->setCaseSensitivity(Qt::CaseInsensitive);
@@ -381,14 +381,14 @@ void SearchEngine::createCompleter() {
 }
 
 void SearchEngine::propagateSectionResized(int index, int , int newsize) {
-  foreach(SearchTab * tab, all_tab) {
+  foreach (SearchTab * tab, all_tab) {
     tab->getCurrentTreeView()->setColumnWidth(index, newsize);
   }
   saveResultsColumnsWidth();
 }
 
 void SearchEngine::saveResultsColumnsWidth() {
-  if(all_tab.size() > 0) {
+  if (all_tab.size() > 0) {
     QTreeView* treeview = all_tab.first()->getCurrentTreeView();
     QIniSettings settings("qBittorrent", "qBittorrent");
     QStringList width_list;
@@ -396,14 +396,14 @@ void SearchEngine::saveResultsColumnsWidth() {
     short nbColumns = all_tab.first()->getCurrentSearchListModel()->columnCount();
 
     QString line = settings.value("SearchResultsColsWidth", QString()).toString();
-    if(!line.isEmpty()) {
+    if (!line.isEmpty()) {
       width_list = line.split(' ');
     }
-    for(short i=0; i<nbColumns; ++i){
-      if(treeview->columnWidth(i)<1 && width_list.size() == nbColumns && width_list.at(i).toInt()>=1) {
+    for (short i=0; i<nbColumns; ++i){
+      if (treeview->columnWidth(i)<1 && width_list.size() == nbColumns && width_list.at(i).toInt()>=1) {
         // load the former width
         new_width_list << width_list.at(i);
-      } else if(treeview->columnWidth(i)>=1) {
+      } else if (treeview->columnWidth(i)>=1) {
         // usual case, save the current width
         new_width_list << QString::number(treeview->columnWidth(i));
       } else {
@@ -417,11 +417,11 @@ void SearchEngine::saveResultsColumnsWidth() {
 }
 
 void SearchEngine::downloadTorrent(QString engine_url, QString torrent_url) {
-  if(torrent_url.startsWith("bc://bt/", Qt::CaseInsensitive)) {
+  if (torrent_url.startsWith("bc://bt/", Qt::CaseInsensitive)) {
     qDebug("Converting bc link to magnet link");
     torrent_url = misc::bcLinkToMagnet(torrent_url);
   }
-  if(torrent_url.startsWith("magnet:")) {
+  if (torrent_url.startsWith("magnet:")) {
     QStringList urls;
     urls << torrent_url;
     mp_mainWindow->downloadFromURLList(urls);
@@ -453,24 +453,24 @@ void SearchEngine::readSearchOutput(){
   QByteArray output = searchProcess->readAllStandardOutput();
   output.replace("\r", "");
   QList<QByteArray> lines_list = output.split('\n');
-  if(!search_result_line_truncated.isEmpty()){
+  if (!search_result_line_truncated.isEmpty()){
     QByteArray end_of_line = lines_list.takeFirst();
     lines_list.prepend(search_result_line_truncated+end_of_line);
   }
   search_result_line_truncated = lines_list.takeLast().trimmed();
-  foreach(const QByteArray &line, lines_list){
+  foreach (const QByteArray &line, lines_list){
     appendSearchResult(QString::fromUtf8(line));
   }
-  if(currentSearchTab)
+  if (currentSearchTab)
     currentSearchTab->getCurrentLabel()->setText(tr("Results")+QString::fromUtf8(" <i>(")+QString::number(nb_search_results)+QString::fromUtf8(")</i>:"));
 }
 
 void SearchEngine::downloadFinished(int exitcode, QProcess::ExitStatus) {
   QProcess *downloadProcess = (QProcess*)sender();
-  if(exitcode == 0) {
+  if (exitcode == 0) {
     QString line = QString::fromUtf8(downloadProcess->readAllStandardOutput()).trimmed();
     QStringList parts = line.split(' ');
-    if(parts.size() == 2) {
+    if (parts.size() == 2) {
       QString path = parts[0];
       QString url = parts[1];
       QBtSession::instance()->processDownloadedFile(url, path);
@@ -490,7 +490,7 @@ void SearchEngine::updateNova() {
   QFile package_file(search_dir.absoluteFilePath("__init__.py"));
   package_file.open(QIODevice::WriteOnly | QIODevice::Text);
   package_file.close();
-  if(!search_dir.exists("engines")){
+  if (!search_dir.exists("engines")){
     search_dir.mkdir("engines");
   }
   QFile package_file2(search_dir.absolutePath().replace("\\", "/")+"/engines/__init__.py");
@@ -498,8 +498,8 @@ void SearchEngine::updateNova() {
   package_file2.close();
   // Copy search plugin files (if necessary)
   QString filePath = search_dir.absoluteFilePath("nova2.py");
-  if(getPluginVersion(":/"+nova_folder+"/nova2.py") > getPluginVersion(filePath)) {
-    if(QFile::exists(filePath)) {
+  if (getPluginVersion(":/"+nova_folder+"/nova2.py") > getPluginVersion(filePath)) {
+    if (QFile::exists(filePath)) {
       QFile::remove(filePath);
       QFile::remove(filePath+"c");
     }
@@ -507,8 +507,8 @@ void SearchEngine::updateNova() {
   }
 
   filePath = search_dir.absoluteFilePath("nova2dl.py");
-  if(getPluginVersion(":/"+nova_folder+"/nova2dl.py") > getPluginVersion(filePath)) {
-    if(QFile::exists(filePath)){
+  if (getPluginVersion(":/"+nova_folder+"/nova2dl.py") > getPluginVersion(filePath)) {
+    if (QFile::exists(filePath)){
       QFile::remove(filePath);
       QFile::remove(filePath+"c");
     }
@@ -516,8 +516,8 @@ void SearchEngine::updateNova() {
   }
 
   filePath = search_dir.absoluteFilePath("novaprinter.py");
-  if(getPluginVersion(":/"+nova_folder+"/novaprinter.py") > getPluginVersion(filePath)) {
-    if(QFile::exists(filePath)){
+  if (getPluginVersion(":/"+nova_folder+"/novaprinter.py") > getPluginVersion(filePath)) {
+    if (QFile::exists(filePath)){
       QFile::remove(filePath);
       QFile::remove(filePath+"c");
     }
@@ -525,8 +525,8 @@ void SearchEngine::updateNova() {
   }
 
   filePath = search_dir.absoluteFilePath("helpers.py");
-  if(getPluginVersion(":/"+nova_folder+"/helpers.py") > getPluginVersion(filePath)) {
-    if(QFile::exists(filePath)){
+  if (getPluginVersion(":/"+nova_folder+"/helpers.py") > getPluginVersion(filePath)) {
+    if (QFile::exists(filePath)){
       QFile::remove(filePath);
       QFile::remove(filePath+"c");
     }
@@ -534,7 +534,7 @@ void SearchEngine::updateNova() {
   }
 
   filePath = search_dir.absoluteFilePath("socks.py");
-  if(QFile::exists(filePath)){
+  if (QFile::exists(filePath)){
     QFile::remove(filePath);
     QFile::remove(filePath+"c");
   }
@@ -542,7 +542,7 @@ void SearchEngine::updateNova() {
 
   if (nova_folder == "nova3") {
     filePath = search_dir.absoluteFilePath("sgmllib3.py");
-    if(QFile::exists(filePath)){
+    if (QFile::exists(filePath)){
       QFile::remove(filePath);
       QFile::remove(filePath+"c");
     }
@@ -551,14 +551,14 @@ void SearchEngine::updateNova() {
   QDir destDir(QDir(misc::searchEngineLocation()).absoluteFilePath("engines"));
   QDir shipped_subDir(":/"+nova_folder+"/engines/");
   QStringList files = shipped_subDir.entryList();
-  foreach(const QString &file, files){
+  foreach (const QString &file, files){
     QString shipped_file = shipped_subDir.absoluteFilePath(file);
     // Copy python classes
-    if(file.endsWith(".py")) {
+    if (file.endsWith(".py")) {
       const QString dest_file = destDir.absoluteFilePath(file);
-      if(getPluginVersion(shipped_file) > getPluginVersion(dest_file) ) {
+      if (getPluginVersion(shipped_file) > getPluginVersion(dest_file) ) {
         qDebug("shipped %s is more recent then local plugin, updating...", qPrintable(file));
-        if(QFile::exists(dest_file)) {
+        if (QFile::exists(dest_file)) {
           qDebug("Removing old %s", qPrintable(dest_file));
           QFile::remove(dest_file);
           QFile::remove(dest_file+"c");
@@ -568,8 +568,8 @@ void SearchEngine::updateNova() {
       }
     } else {
       // Copy icons
-      if(file.endsWith(".png")) {
-        if(!QFile::exists(destDir.absoluteFilePath(file))) {
+      if (file.endsWith(".png")) {
+        if (!QFile::exists(destDir.absoluteFilePath(file))) {
           QFile::copy(shipped_file, destDir.absoluteFilePath(file));
         }
       }
@@ -581,32 +581,32 @@ void SearchEngine::updateNova() {
 // Search can be finished for 3 reasons :
 // Error | Stopped by user | Finished normally
 void SearchEngine::searchFinished(int exitcode,QProcess::ExitStatus){
-  if(searchTimeout->isActive()) {
+  if (searchTimeout->isActive()) {
     searchTimeout->stop();
   }
   QIniSettings settings("qBittorrent", "qBittorrent");
   bool useNotificationBalloons = settings.value("Preferences/General/NotificationBaloons", true).toBool();
-  if(useNotificationBalloons && mp_mainWindow->getCurrentTabWidget() != this) {
+  if (useNotificationBalloons && mp_mainWindow->getCurrentTabWidget() != this) {
     mp_mainWindow->showNotificationBaloon(tr("Search Engine"), tr("Search has finished"));
   }
-  if(exitcode){
+  if (exitcode){
 #ifdef Q_WS_WIN
     search_status->setText(tr("Search aborted"));
 #else
     search_status->setText(tr("An error occured during search..."));
 #endif
   }else{
-    if(search_stopped){
+    if (search_stopped){
       search_status->setText(tr("Search aborted"));
     }else{
-      if(no_search_results){
+      if (no_search_results){
         search_status->setText(tr("Search returned no results"));
       }else{
         search_status->setText(tr("Search has finished"));
       }
     }
   }
-  if(currentSearchTab)
+  if (currentSearchTab)
     currentSearchTab->getCurrentLabel()->setText(tr("Results", "i.e: Search results")+QString::fromUtf8(" <i>(")+QString::number(nb_search_results)+QString::fromUtf8(")</i>:"));
   search_button->setText("Search");
 }
@@ -615,11 +615,11 @@ void SearchEngine::searchFinished(int exitcode,QProcess::ExitStatus){
 // Line is in the following form :
 // file url | file name | file size | nb seeds | nb leechers | Search engine url
 void SearchEngine::appendSearchResult(const QString &line){
-  if(!currentSearchTab) {
-    if(searchProcess->state() != QProcess::NotRunning){
+  if (!currentSearchTab) {
+    if (searchProcess->state() != QProcess::NotRunning){
       searchProcess->terminate();
     }
-    if(searchTimeout->isActive()) {
+    if (searchTimeout->isActive()) {
       searchTimeout->stop();
     }
     search_stopped = true;
@@ -627,7 +627,7 @@ void SearchEngine::appendSearchResult(const QString &line){
   }
   const QStringList parts = line.split("|");
   const int nb_fields = parts.size();
-  if(nb_fields < NB_PLUGIN_COLUMNS-1){ //-1 because desc_link is optional
+  if (nb_fields < NB_PLUGIN_COLUMNS-1){ //-1 because desc_link is optional
     return;
   }
   Q_ASSERT(currentSearchTab);
@@ -642,20 +642,20 @@ void SearchEngine::appendSearchResult(const QString &line){
   cur_model->setData(cur_model->index(row, SIZE), parts.at(PL_SIZE).trimmed().toLongLong()); // Size
   bool ok = false;
   qlonglong nb_seeders = parts.at(PL_SEEDS).trimmed().toLongLong(&ok);
-  if(!ok || nb_seeders < 0) {
+  if (!ok || nb_seeders < 0) {
     cur_model->setData(cur_model->index(row, SEEDS), tr("Unknown")); // Seeders
   } else {
     cur_model->setData(cur_model->index(row, SEEDS), nb_seeders); // Seeders
   }
   qlonglong nb_leechers = parts.at(PL_LEECHS).trimmed().toLongLong(&ok);
-  if(!ok || nb_leechers < 0) {
+  if (!ok || nb_leechers < 0) {
     cur_model->setData(cur_model->index(row, LEECHS), tr("Unknown")); // Leechers
   } else {
     cur_model->setData(cur_model->index(row, LEECHS), nb_leechers); // Leechers
   }
   cur_model->setData(cur_model->index(row, ENGINE_URL), parts.at(PL_ENGINE_URL).trimmed()); // Engine URL
   // Description Link
-  if(nb_fields == NB_PLUGIN_COLUMNS)
+  if (nb_fields == NB_PLUGIN_COLUMNS)
     cur_model->setData(cur_model->index(row, DESC_LINK), parts.at(PL_DESC_LINK).trimmed());
 
   no_search_results = false;
@@ -667,19 +667,19 @@ void SearchEngine::appendSearchResult(const QString &line){
 
 #if QT_VERSION >= 0x040500
 void SearchEngine::closeTab(int index) {
-  if(index == tabWidget->indexOf(currentSearchTab)) {
+  if (index == tabWidget->indexOf(currentSearchTab)) {
     qDebug("Deleted current search Tab");
-    if(searchProcess->state() != QProcess::NotRunning){
+    if (searchProcess->state() != QProcess::NotRunning){
       searchProcess->terminate();
     }
-    if(searchTimeout->isActive()) {
+    if (searchTimeout->isActive()) {
       searchTimeout->stop();
     }
     search_stopped = true;
     currentSearchTab = 0;
   }
   delete all_tab.takeAt(index);
-  if(!all_tab.size()) {
+  if (!all_tab.size()) {
     download_button->setEnabled(false);
     goToDescBtn->setEnabled(false);
   }
@@ -687,22 +687,22 @@ void SearchEngine::closeTab(int index) {
 #else
 // Clear search results list
 void SearchEngine::closeTab_button_clicked(){
-  if(all_tab.size()) {
+  if (all_tab.size()) {
     qDebug("currentTab rank: %d", tabWidget->currentIndex());
     qDebug("currentSearchTab rank: %d", tabWidget->indexOf(currentSearchTab));
-    if(tabWidget->currentIndex() == tabWidget->indexOf(currentSearchTab)) {
+    if (tabWidget->currentIndex() == tabWidget->indexOf(currentSearchTab)) {
       qDebug("Deleted current search Tab");
-      if(searchProcess->state() != QProcess::NotRunning){
+      if (searchProcess->state() != QProcess::NotRunning){
         searchProcess->terminate();
       }
-      if(searchTimeout->isActive()) {
+      if (searchTimeout->isActive()) {
         searchTimeout->stop();
       }
       search_stopped = true;
       currentSearchTab = 0;
     }
     delete all_tab.takeAt(tabWidget->currentIndex());
-    if(!all_tab.size()) {
+    if (!all_tab.size()) {
       closeTab_button->setEnabled(false);
       download_button->setEnabled(false);
     }
@@ -714,8 +714,8 @@ void SearchEngine::closeTab_button_clicked(){
 void SearchEngine::on_download_button_clicked(){
   //QModelIndexList selectedIndexes = currentSearchTab->getCurrentTreeView()->selectionModel()->selectedIndexes();
   QModelIndexList selectedIndexes = all_tab.at(tabWidget->currentIndex())->getCurrentTreeView()->selectionModel()->selectedIndexes();
-  foreach(const QModelIndex &index, selectedIndexes){
-    if(index.column() == NAME){
+  foreach (const QModelIndex &index, selectedIndexes){
+    if (index.column() == NAME){
       // Get Item url
       QSortFilterProxyModel* model = all_tab.at(tabWidget->currentIndex())->getCurrentSearchListProxy();
       QString torrent_url = model->data(model->index(index.row(), URL_COLUMN)).toString();
@@ -729,11 +729,11 @@ void SearchEngine::on_download_button_clicked(){
 void SearchEngine::on_goToDescBtn_clicked()
 {
   QModelIndexList selectedIndexes = all_tab.at(tabWidget->currentIndex())->getCurrentTreeView()->selectionModel()->selectedIndexes();
-  foreach(const QModelIndex &index, selectedIndexes){
-    if(index.column() == NAME) {
+  foreach (const QModelIndex &index, selectedIndexes){
+    if (index.column() == NAME) {
       QSortFilterProxyModel* model = all_tab.at(tabWidget->currentIndex())->getCurrentSearchListProxy();
       const QString desc_url = model->data(model->index(index.row(), DESC_LINK)).toString();
-      if(!desc_url.isEmpty())
+      if (!desc_url.isEmpty())
         QDesktopServices::openUrl(QUrl::fromEncoded(desc_url.toUtf8()));
     }
   }

src/searchengine/searchengine.h

@@ -65,17 +65,17 @@ public:
 
   static qreal getPluginVersion(QString filePath) {
     QFile plugin(filePath);
-    if(!plugin.exists()){
+    if (!plugin.exists()){
       qDebug("%s plugin does not exist, returning 0.0", qPrintable(filePath));
       return 0.0;
     }
-    if(!plugin.open(QIODevice::ReadOnly | QIODevice::Text)){
+    if (!plugin.open(QIODevice::ReadOnly | QIODevice::Text)){
       return 0.0;
     }
     qreal version = 0.0;
     while (!plugin.atEnd()){
       QByteArray line = plugin.readLine();
-      if(line.startsWith("#VERSION: ")){
+      if (line.startsWith("#VERSION: ")){
         line = line.split(' ').last().trimmed();
         version = line.toFloat();
         qDebug("plugin %s version: %.2f", qPrintable(filePath), version);

src/searchengine/searchtab.cpp

@@ -77,7 +77,7 @@ SearchTab::SearchTab(SearchEngine *parent) : QWidget(), parent(parent)
   connect(resultsBrowser, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(downloadSelectedItem(const QModelIndex&)));
 
   // Load last columns width for search results list
-  if(!loadColWidthResultsList()){
+  if (!loadColWidthResultsList()){
     resultsBrowser->header()->resizeSection(0, 275);
   }
 
@@ -108,13 +108,13 @@ QHeaderView* SearchTab::header() const {
 bool SearchTab::loadColWidthResultsList() {
   QIniSettings settings("qBittorrent", "qBittorrent");
   QString line = settings.value("SearchResultsColsWidth", QString()).toString();
-  if(line.isEmpty())
+  if (line.isEmpty())
     return false;
   QStringList width_list = line.split(' ');
-  if(width_list.size() < SearchListModel->columnCount())
+  if (width_list.size() < SearchListModel->columnCount())
     return false;
   unsigned int listSize = width_list.size();
-  for(unsigned int i=0; i<listSize; ++i){
+  for (unsigned int i=0; i<listSize; ++i){
     resultsBrowser->header()->resizeSection(i, width_list.at(i).toInt());
   }
   return true;
@@ -143,7 +143,7 @@ QStandardItemModel* SearchTab::getCurrentSearchListModel() const
 // Set the color of a row in data model
 void SearchTab::setRowColor(int row, QString color){
   proxyModel->setDynamicSortFilter(false);
-  for(int i=0; i<proxyModel->columnCount(); ++i){
+  for (int i=0; i<proxyModel->columnCount(); ++i){
     proxyModel->setData(proxyModel->index(row, i), QVariant(QColor(color)), Qt::ForegroundRole);
   }
   proxyModel->setDynamicSortFilter(true);

src/searchengine/supportedengines.h

@@ -89,7 +89,7 @@ public:
     // Save to Hard disk
     QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
     QStringList disabled_engines = settings.value(QString::fromUtf8("SearchEngines/disabledEngines"), QStringList()).toStringList();
-    if(enabled) {
+    if (enabled) {
       disabled_engines.removeAll(name);
     } else {
       disabled_engines.append(name);
@@ -106,7 +106,7 @@ signals:
 
 public:
   SupportedEngines(bool has_python = true) {
-    if(has_python)
+    if (has_python)
       update();
   }
 
@@ -116,8 +116,8 @@ public:
 
   QStringList enginesEnabled() const {
     QStringList engines;
-    foreach(const SupportedEngine *engine, values()) {
-      if(engine->isEnabled())
+    foreach (const SupportedEngine *engine, values()) {
+      if (engine->isEnabled())
         engines << engine->getName();
     }
     return engines;
@@ -125,12 +125,12 @@ public:
 
   QStringList supportedCategories() const {
     QStringList supported_cat;
-    foreach(const SupportedEngine *engine, values()) {
-      if(engine->isEnabled()) {
+    foreach (const SupportedEngine *engine, values()) {
+      if (engine->isEnabled()) {
         const QStringList &s = engine->getSupportedCategories();
-        foreach(QString cat, s) {
+        foreach (QString cat, s) {
           cat = cat.trimmed();
-          if(!cat.isEmpty() && !supported_cat.contains(cat))
+          if (!cat.isEmpty() && !supported_cat.contains(cat))
             supported_cat << cat;
         }
       }
@@ -150,21 +150,21 @@ public slots:
     nova.waitForFinished();
     QString capabilities = QString(nova.readAll());
     QDomDocument xml_doc;
-    if(!xml_doc.setContent(capabilities)) {
+    if (!xml_doc.setContent(capabilities)) {
       std::cerr << "Could not parse Nova search engine capabilities, msg: " << capabilities.toLocal8Bit().data() << std::endl;
       std::cerr << "Error: " << nova.readAllStandardError().constData() << std::endl;
       return;
     }
     QDomElement root = xml_doc.documentElement();
-    if(root.tagName() != "capabilities") {
+    if (root.tagName() != "capabilities") {
       std::cout << "Invalid XML file for Nova search engine capabilities, msg: " << capabilities.toLocal8Bit().data() << std::endl;
       return;
     }
-    for(QDomNode engine_node = root.firstChild(); !engine_node.isNull(); engine_node = engine_node.nextSibling()) {
+    for (QDomNode engine_node = root.firstChild(); !engine_node.isNull(); engine_node = engine_node.nextSibling()) {
       QDomElement engine_elem = engine_node.toElement();
-      if(!engine_elem.isNull()) {
+      if (!engine_elem.isNull()) {
         SupportedEngine *s = new SupportedEngine(engine_elem);
-        if(this->contains(s->getName())) {
+        if (this->contains(s->getName())) {
           // Already in the list
           delete s;
         } else {