Uncrustify misc.cpp

src/base/utils/misc.cpp

@@ -233,6 +233,7 @@ QPoint Utils::Misc::screenCenter(QWidget *win)
     QRect desk(QApplication::desktop()->availableGeometry(scrn));
     return QPoint((desk.width() - win->frameGeometry().width()) / 2, (desk.height() - win->frameGeometry().height()) / 2);
 }
+
 #endif
 
 /**
@@ -267,12 +268,12 @@ QString Utils::Misc::pythonExecutable()
          * http://legacy.python.org/dev/peps/pep-0394/
          */
         pythonProc.start("python3", QStringList() << "--version", QIODevice::ReadOnly);
-        if (pythonProc.waitForFinished() && pythonProc.exitCode() == 0) {
+        if (pythonProc.waitForFinished() && (pythonProc.exitCode() == 0)) {
             executable = "python3";
             return executable;
         }
         pythonProc.start("python2", QStringList() << "--version", QIODevice::ReadOnly);
-        if (pythonProc.waitForFinished() && pythonProc.exitCode() == 0) {
+        if (pythonProc.waitForFinished() && (pythonProc.exitCode() == 0)) {
             executable = "python2";
             return executable;
         }
@@ -280,7 +281,7 @@ QString Utils::Misc::pythonExecutable()
         // Look for "python" in Windows and in UNIX if "python2" and "python3" are
         // not detected.
         pythonProc.start("python", QStringList() << "--version", QIODevice::ReadOnly);
-        if (pythonProc.waitForFinished() && pythonProc.exitCode() == 0)
+        if (pythonProc.waitForFinished() && (pythonProc.exitCode() == 0))
             executable = "python";
         else
             Logger::instance()->addMessage(QCoreApplication::translate("misc", "Python not detected"), Log::INFO);
@@ -293,14 +294,15 @@ QString Utils::Misc::pythonExecutable()
  * eg 2.7.9
  * Make sure to have setup python first
  */
-QString Utils::Misc::pythonVersionComplete() {
+QString Utils::Misc::pythonVersionComplete()
+{
     static QString version;
     if (version.isEmpty()) {
         if (pythonExecutable().isEmpty())
             return version;
         QProcess pythonProc;
         pythonProc.start(pythonExecutable(), QStringList() << "--version", QIODevice::ReadOnly);
-        if (pythonProc.waitForFinished() && pythonProc.exitCode() == 0) {
+        if (pythonProc.waitForFinished() && (pythonProc.exitCode() == 0)) {
             QByteArray output = pythonProc.readAllStandardOutput();
             if (output.isEmpty())
                 output = pythonProc.readAllStandardError();
@@ -349,9 +351,8 @@ QString Utils::Misc::friendlyUnit(qint64 bytesValue, bool isSpeed)
 {
     SizeUnit unit;
     qreal friendlyVal;
-    if (!friendlyUnit(bytesValue, friendlyVal, unit)) {
+    if (!friendlyUnit(bytesValue, friendlyVal, unit))
         return QCoreApplication::translate("misc", "Unknown", "Unknown (size)");
-    }
     QString ret;
     if (unit == SizeUnit::Byte)
         ret = QString::number(bytesValue) + " " + unitString(unit);
@@ -364,9 +365,8 @@ QString Utils::Misc::friendlyUnit(qint64 bytesValue, bool isSpeed)
 
 qlonglong Utils::Misc::sizeInBytes(qreal size, Utils::Misc::SizeUnit unit)
 {
-    for (int i = 0; i < static_cast<int>(unit); ++i) {
+    for (int i = 0; i < static_cast<int>(unit); ++i)
         size *= 1024;
-    }
     return size;
 }
 
@@ -427,7 +427,7 @@ bool Utils::Misc::isPreviewable(const QString& extension)
 // time duration like "1d 2h 10m".
 QString Utils::Misc::userFriendlyDuration(qlonglong seconds)
 {
-    if (seconds < 0 || seconds >= MAX_ETA)
+    if ((seconds < 0) || (seconds >= MAX_ETA))
         return QString::fromUtf8(C_INFINITY);
     if (seconds == 0)
         return "0";
@@ -614,20 +614,19 @@ void Utils::Misc::openFolderSelect(const QString& absolutePath)
         proc.start("xdg-mime", QStringList() << "query" << "default" << "inode/directory");
         proc.waitForFinished();
         QString output = proc.readLine().simplified();
-        if (output == "dolphin.desktop" || output == "org.kde.dolphin.desktop")
+        if ((output == "dolphin.desktop") || (output == "org.kde.dolphin.desktop"))
             proc.startDetached("dolphin", QStringList() << "--select" << Utils::Fs::toNativePath(path));
-        else if (output == "nautilus.desktop" || output == "org.gnome.Nautilus.desktop"
-                 || output == "nautilus-folder-handler.desktop")
+        else if ((output == "nautilus.desktop") || (output == "org.gnome.Nautilus.desktop")
+                 || (output == "nautilus-folder-handler.desktop"))
             proc.startDetached("nautilus", QStringList() << "--no-desktop" << Utils::Fs::toNativePath(path));
         else if (output == "nemo.desktop")
             proc.startDetached("nemo", QStringList() << "--no-desktop" << Utils::Fs::toNativePath(path));
-        else if (output == "konqueror.desktop" || output == "kfmclient_dir.desktop")
+        else if ((output == "konqueror.desktop") || (output == "kfmclient_dir.desktop"))
             proc.startDetached("konqueror", QStringList() << "--select" << Utils::Fs::toNativePath(path));
-        else {
+        else
             // "caja" manager can't pinpoint the file, see: https://github.com/qbittorrent/qBittorrent/issues/5003
             openPath(path.left(path.lastIndexOf("/")));
     }
-    }
     else {
         // If the item to select doesn't exist, try to open its parent
         openPath(path.left(path.lastIndexOf("/")));
@@ -636,6 +635,7 @@ void Utils::Misc::openFolderSelect(const QString& absolutePath)
     openPath(path.left(path.lastIndexOf("/")));
 #endif
 }
+
 #endif // DISABLE_GUI
 
 namespace
@@ -663,6 +663,7 @@ QSize Utils::Misc::smallIconSize()
     int s = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
     return QSize(s, s);
 }
+
 #endif
 
 QString Utils::Misc::osName()