Merge pull request #18936 from Chocobo1/tidy

Code clean up

src/app/application.cpp

@@ -224,7 +224,6 @@ namespace
 
 Application::Application(int &argc, char **argv)
     : BaseApplication(argc, argv)
-    , m_shutdownAct(ShutdownDialogAction::Exit)
     , m_commandLineArgs(parseCommandLine(Application::arguments()))
     , m_storeFileLoggerEnabled(FILELOGGER_SETTINGS_KEY(u"Enabled"_qs))
     , m_storeFileLoggerBackup(FILELOGGER_SETTINGS_KEY(u"Backup"_qs))

src/app/application.h

@@ -173,7 +173,7 @@ private:
     ApplicationInstanceManager *m_instanceManager = nullptr;
     QAtomicInt m_isCleanupRun;
     bool m_isProcessingParamsAllowed = false;
-    ShutdownDialogAction m_shutdownAct;
+    ShutdownDialogAction m_shutdownAct = ShutdownDialogAction::Exit;
     QBtCommandLineParameters m_commandLineArgs;
 
     // FileLog

src/app/cmdoptions.cpp

@@ -198,13 +198,15 @@ namespace
 
         int value(const QString &arg) const
         {
-            QString val = StringOption::value(arg);
+            const QString val = StringOption::value(arg);
             bool ok = false;
-            int res = val.toInt(&ok);
+            const int res = val.toInt(&ok);
             if (!ok)
+            {
                 throw CommandLineParameterError(QObject::tr("Parameter '%1' must follow syntax '%1=%2'",
                                                             "e.g. Parameter '--webui-port' must follow syntax '--webui-port=<value>'")
                                                 .arg(fullParameter(), u"<integer value>"_qs));
+            }
             return res;
         }
 

src/base/bittorrent/bandwidthscheduler.cpp

@@ -41,7 +41,6 @@ using namespace std::chrono_literals;
 
 BandwidthScheduler::BandwidthScheduler(QObject *parent)
     : QObject(parent)
-    , m_lastAlternative(false)
 {
     connect(&m_timer, &QTimer::timeout, this, &BandwidthScheduler::onTimeout);
 }

src/base/bittorrent/bandwidthscheduler.h

@@ -49,5 +49,5 @@ private:
     void onTimeout();
 
     QTimer m_timer;
-    bool m_lastAlternative;
+    bool m_lastAlternative = false;
 };

src/base/bittorrent/filterparserthread.cpp

@@ -89,7 +89,7 @@ namespace
         }
 
     private:
-        lt::address_v4::bytes_type m_buf;
+        lt::address_v4::bytes_type m_buf {};
     };
 
     bool parseIPAddress(const char *data, lt::address &address)
@@ -111,7 +111,6 @@ namespace
 
 FilterParserThread::FilterParserThread(QObject *parent)
     : QThread(parent)
-    , m_abort(false)
 {
 }
 

src/base/bittorrent/filterparserthread.h

@@ -62,7 +62,7 @@ private:
     int getlineInStream(QDataStream &stream, std::string &name, char delim);
     int parseP2BFilterFile();
 
-    bool m_abort;
+    bool m_abort = false;
     Path m_filePath;
     lt::ip_filter m_filter;
 };

src/base/bittorrent/loadtorrentparams.h

@@ -54,7 +54,7 @@ namespace BitTorrent
         bool firstLastPiecePriority = false;
         bool hasFinishedStatus = false;
         bool stopped = false;
-        Torrent::StopCondition stopCondition;
+        Torrent::StopCondition stopCondition = Torrent::StopCondition::None;
 
         bool addToQueueTop = false; // only for new torrents
 

src/base/bittorrent/magneturi.cpp

@@ -75,8 +75,7 @@ using namespace BitTorrent;
 const int magnetUriId = qRegisterMetaType<MagnetUri>();
 
 MagnetUri::MagnetUri(const QString &source)
-    : m_valid(false)
+    : m_url(source)
-    , m_url(source)
 {
     if (source.isEmpty()) return;
 

src/base/bittorrent/magneturi.h

@@ -54,7 +54,7 @@ namespace BitTorrent
         lt::add_torrent_params addTorrentParams() const;
 
     private:
-        bool m_valid;
+        bool m_valid = false;
         QString m_url;
         InfoHash m_infoHash;
         QString m_name;

src/base/bittorrent/sessionimpl.h

@@ -485,15 +485,15 @@ namespace BitTorrent
         {
             lt::torrent_handle torrentHandle;
             Path path;
-            MoveStorageMode mode;
+            MoveStorageMode mode {};
-            MoveStorageContext context;
+            MoveStorageContext context {};
         };
 
         struct RemovingTorrentData
         {
             QString name;
             Path pathToRemove;
-            DeleteOption deleteOption;
+            DeleteOption deleteOption {};
         };
 
         explicit SessionImpl(QObject *parent = nullptr);

src/base/bittorrent/torrentcreatorthread.h

@@ -46,14 +46,14 @@ namespace BitTorrent
 
     struct TorrentCreatorParams
     {
-        bool isPrivate;
+        bool isPrivate = false;
 #ifdef QBT_USES_LIBTORRENT2
-        TorrentFormat torrentFormat;
+        TorrentFormat torrentFormat = TorrentFormat::Hybrid;
 #else
         bool isAlignmentOptimized;
         int paddedFileSizeLimit;
 #endif
-        int pieceSize;
+        int pieceSize = 0;
         Path inputPath;
         Path savePath;
         QString comment;

src/base/bittorrent/torrentimpl.h

@@ -84,7 +84,7 @@ namespace BitTorrent
     struct FileErrorInfo
     {
         lt::error_code error;
-        lt::operation_t operation;
+        lt::operation_t operation = lt::operation_t::unknown;
     };
 
     class TorrentImpl final : public Torrent

src/base/http/requestparser.h

@@ -47,9 +47,9 @@ namespace Http
         struct ParseResult
         {
             // when `status != ParseStatus::OK`, `request` & `frameSize` are undefined
-            ParseStatus status;
+            ParseStatus status = ParseStatus::BadRequest;
             Request request;
-            long frameSize;  // http request frame size (bytes)
+            long frameSize = 0;  // http request frame size (bytes)
         };
 
         static ParseResult parse(const QByteArray &data);

src/base/http/types.h

@@ -79,10 +79,10 @@ namespace Http
     struct Environment
     {
         QHostAddress localAddress;
-        quint16 localPort;
+        quint16 localPort = 0;
 
         QHostAddress clientAddress;
-        quint16 clientPort;
+        quint16 clientPort = 0;
     };
 
     struct UploadedFile

src/base/logger.h

@@ -51,17 +51,17 @@ namespace Log
 
     struct Msg
     {
-        int id;
+        int id = -1;
-        MsgType type;
+        MsgType type = ALL;
-        qint64 timestamp;
+        qint64 timestamp = -1;
         QString message;
     };
 
     struct Peer
     {
-        int id;
+        int id = -1;
-        bool blocked;
+        bool blocked = false;
-        qint64 timestamp;
+        qint64 timestamp = -1;
         QString ip;
         QString reason;
     };

src/base/net/dnsupdater.cpp

@@ -44,8 +44,6 @@ const std::chrono::seconds IP_CHECK_INTERVAL = 30min;
 
 DNSUpdater::DNSUpdater(QObject *parent)
     : QObject(parent)
-    , m_state(OK)
-    , m_service(DNS::Service::None)
 {
     updateCredentials();
 

src/base/net/dnsupdater.h

@@ -74,9 +74,9 @@ namespace Net
         QHostAddress m_lastIP;
         QDateTime m_lastIPCheckTime;
         QTimer m_ipCheckTimer;
-        int m_state;
+        int m_state = OK;
         // Service creds
-        DNS::Service m_service;
+        DNS::Service m_service = DNS::Service::None;
         QString m_domain;
         QString m_username;
         QString m_password;

src/base/net/downloadmanager.h

@@ -103,7 +103,7 @@ namespace Net
     struct DownloadResult
     {
         QString url;
-        DownloadStatus status;
+        DownloadStatus status = DownloadStatus::Failed;
         QString errorString;
         QByteArray data;
         Path filePath;

src/base/profile_p.cpp

@@ -177,7 +177,7 @@ std::unique_ptr<QSettings> Private::CustomProfile::applicationSettings(const QSt
     const auto CONF_FILE_EXTENSION = u".conf"_qs;
 #endif
     const Path settingsFilePath = configLocation() / Path(name + CONF_FILE_EXTENSION);
-    return std::unique_ptr<QSettings>(new QSettings(settingsFilePath.data(), QSettings::IniFormat));
+    return std::make_unique<QSettings>(settingsFilePath.data(), QSettings::IniFormat);
 }
 
 Path Private::NoConvertConverter::fromPortablePath(const Path &portablePath) const

src/base/rss/rss_parser.cpp

@@ -723,13 +723,16 @@ void RSS::Private::Parser::parseAtomArticle(QXmlStreamReader &xml)
                                 : xml.attributes().value(u"href"_qs).toString());
 
                 if (link.startsWith(u"magnet:", Qt::CaseInsensitive))
+                {
                     article[Article::KeyTorrentURL] = link; // magnet link instead of a news URL
+                }
                 else
+                {
                     // Atom feeds can have relative links, work around this and
                     // take the stress of figuring article full URI from UI
                     // Assemble full URI
                     article[Article::KeyLink] = (m_baseUrl.isEmpty() ? link : m_baseUrl + link);
-
+                }
             }
             else if ((name == u"summary") || (name == u"content"))
             {

src/base/search/searchhandler.h

@@ -42,9 +42,9 @@ struct SearchResult
 {
     QString fileName;
     QString fileUrl;
-    qlonglong fileSize;
+    qlonglong fileSize = 0;
-    qlonglong nbSeeders;
+    qlonglong nbSeeders = 0;
-    qlonglong nbLeechers;
+    qlonglong nbLeechers = 0;
     QString siteUrl;
     QString descrLink;
 };

src/base/search/searchpluginmanager.cpp

@@ -366,7 +366,7 @@ QString SearchPluginManager::categoryFullName(const QString &categoryName)
     return categoryTable.value(categoryName);
 }
 
-QString SearchPluginManager::pluginFullName(const QString &pluginName)
+QString SearchPluginManager::pluginFullName(const QString &pluginName) const
 {
     return pluginInfo(pluginName) ? pluginInfo(pluginName)->fullName : QString();
 }

src/base/search/searchpluginmanager.h

@@ -52,7 +52,7 @@ struct PluginInfo
     QString url;
     QStringList supportedCategories;
     Path iconPath;
-    bool enabled;
+    bool enabled = false;
 };
 
 class SearchDownloadHandler;
@@ -88,7 +88,7 @@ public:
 
     static PluginVersion getPluginVersion(const Path &filePath);
     static QString categoryFullName(const QString &categoryName);
-    QString pluginFullName(const QString &pluginName);
+    QString pluginFullName(const QString &pluginName) const;
     static Path pluginsLocation();
     static Path engineLocation();
 

src/gui/powermanagement/powermanagement_x11.cpp

@@ -57,27 +57,21 @@ void PowerManagementInhibitor::requestIdle()
     if ((m_state == Error) || (m_state == Idle) || (m_state == RequestIdle) || (m_state == RequestBusy))
         return;
 
+    m_state = RequestIdle;
     qDebug("D-Bus: PowerManagementInhibitor: Requesting idle");
 
-    QDBusMessage call;
+    QDBusMessage call = m_useGSM
-    if (!m_useGSM)
+        ? QDBusMessage::createMethodCall(
-        call = QDBusMessage::createMethodCall(
+            u"org.gnome.SessionManager"_qs,
+            u"/org/gnome/SessionManager"_qs,
+            u"org.gnome.SessionManager"_qs,
+            u"Uninhibit"_qs)
+        : QDBusMessage::createMethodCall(
             u"org.freedesktop.PowerManagement"_qs,
             u"/org/freedesktop/PowerManagement/Inhibit"_qs,
             u"org.freedesktop.PowerManagement.Inhibit"_qs,
             u"UnInhibit"_qs);
-    else
+    call.setArguments({m_cookie});
-        call = QDBusMessage::createMethodCall(
-                u"org.gnome.SessionManager"_qs,
-                u"/org/gnome/SessionManager"_qs,
-                u"org.gnome.SessionManager"_qs,
-                u"Uninhibit"_qs);
-
-    m_state = RequestIdle;
-
-    QList<QVariant> args;
-    args << m_cookie;
-    call.setArguments(args);
 
     QDBusPendingCall pcall = QDBusConnection::sessionBus().asyncCall(call, 1000);
     auto *watcher = new QDBusPendingCallWatcher(pcall, this);
@@ -91,28 +85,27 @@ void PowerManagementInhibitor::requestBusy()
     if ((m_state == Error) || (m_state == Busy) || (m_state == RequestBusy) || (m_state == RequestIdle))
         return;
 
+    m_state = RequestBusy;
     qDebug("D-Bus: PowerManagementInhibitor: Requesting busy");
 
-    QDBusMessage call;
+    QDBusMessage call = m_useGSM
-    if (!m_useGSM)
+        ? QDBusMessage::createMethodCall(
-        call = QDBusMessage::createMethodCall(
-                u"org.freedesktop.PowerManagement"_qs,
-                u"/org/freedesktop/PowerManagement/Inhibit"_qs,
-                u"org.freedesktop.PowerManagement.Inhibit"_qs,
-                u"Inhibit"_qs);
-    else
-        call = QDBusMessage::createMethodCall(
             u"org.gnome.SessionManager"_qs,
             u"/org/gnome/SessionManager"_qs,
             u"org.gnome.SessionManager"_qs,
+            u"Inhibit"_qs)
+        : QDBusMessage::createMethodCall(
+                u"org.freedesktop.PowerManagement"_qs,
+                u"/org/freedesktop/PowerManagement/Inhibit"_qs,
+                u"org.freedesktop.PowerManagement.Inhibit"_qs,
                 u"Inhibit"_qs);
 
-    m_state = RequestBusy;
-
     QList<QVariant> args = {u"qBittorrent"_qs};
-    if (m_useGSM) args << 0u;
+    if (m_useGSM)
+        args << 0u;
     args << u"Active torrents are presented"_qs;
-    if (m_useGSM) args << 8u;
+    if (m_useGSM)
+        args << 8u;
     call.setArguments(args);
 
     QDBusPendingCall pcall = QDBusConnection::sessionBus().asyncCall(call, 1000);

src/gui/properties/speedplotview.h

@@ -139,5 +139,5 @@ private:
     Averager *m_currentAverager {&m_averager5Min};
 
     QMap<GraphID, GraphProperties> m_properties;
-    milliseconds m_currentMaxDuration;
+    milliseconds m_currentMaxDuration {0};
 };

src/gui/rss/feedlistwidget.cpp

@@ -243,16 +243,13 @@ void FeedListWidget::dragMoveEvent(QDragMoveEvent *event)
     QTreeWidget::dragMoveEvent(event);
 
     QTreeWidgetItem *item = itemAt(event->pos());
-    // Prohibit dropping onto global unread counter
+    if ((item == m_unreadStickyItem)  // Prohibit dropping onto global unread counter
-    if (item == m_unreadStickyItem)
+        || selectedItems().contains(m_unreadStickyItem)  // Prohibit dragging of global unread counter
-        event->ignore();
+        || (item && isFeed(item)))  // Prohibit dropping onto feeds
-    // Prohibit dragging of global unread counter
+    {
-    else if (selectedItems().contains(m_unreadStickyItem))
-        event->ignore();
-    // Prohibit dropping onto feeds
-    else if (item && isFeed(item))
         event->ignore();
     }
+}
 
 void FeedListWidget::dropEvent(QDropEvent *event)
 {

src/gui/search/searchsortmodel.cpp

@@ -32,13 +32,6 @@
 
 SearchSortModel::SearchSortModel(QObject *parent)
     : base(parent)
-    , m_isNameFilterEnabled(false)
-    , m_minSeeds(0)
-    , m_maxSeeds(-1)
-    , m_minLeeches(0)
-    , m_maxLeeches(-1)
-    , m_minSize(0)
-    , m_maxSize(-1)
 {
     setSortRole(UnderlyingDataRole);
     setFilterRole(UnderlyingDataRole);

src/gui/search/searchsortmodel.h

@@ -90,12 +90,12 @@ protected:
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
 
 private:
-    bool m_isNameFilterEnabled;
+    bool m_isNameFilterEnabled = false;
     QString m_searchTerm;
     QStringList m_searchTermWords;
-    int m_minSeeds, m_maxSeeds;
+    int m_minSeeds = 0, m_maxSeeds = -1;
-    int m_minLeeches, m_maxLeeches;
+    int m_minLeeches = 0, m_maxLeeches = -1;
-    qint64 m_minSize, m_maxSize;
+    qint64 m_minSize = 0, m_maxSize = -1;
 
     Utils::Compare::NaturalLessThan<Qt::CaseInsensitive> m_naturalLessThan;
 };

src/gui/search/searchwidget.cpp

@@ -75,7 +75,6 @@ namespace
         case SearchJobWidget::Status::Aborted:
             return u"task-reject"_qs;
         case SearchJobWidget::Status::Error:
-            return u"dialog-warning"_qs;
         case SearchJobWidget::Status::NoResults:
             return u"dialog-warning"_qs;
         default:
@@ -330,15 +329,15 @@ void SearchWidget::on_searchButton_clicked()
         return;
     }
 
+    const QString plugin = selectedPlugin();
+
     QStringList plugins;
-    if (selectedPlugin() == u"all")
+    if (plugin == u"all")
         plugins = SearchPluginManager::instance()->allPlugins();
-    else if (selectedPlugin() == u"enabled")
+    else if ((plugin == u"enabled") || (plugin == u"multi"))
-        plugins = SearchPluginManager::instance()->enabledPlugins();
-    else if (selectedPlugin() == u"multi")
         plugins = SearchPluginManager::instance()->enabledPlugins();
     else
-        plugins << selectedPlugin();
+        plugins << plugin;
 
     qDebug("Search with category: %s", qUtf8Printable(selectedCategory()));
 

src/gui/torrenttagsdialog.h

@@ -52,6 +52,6 @@ public:
 private:
     void addNewTag();
 
-    Ui::TorrentTagsDialog *m_ui;
+    Ui::TorrentTagsDialog *m_ui = nullptr;
     SettingValue<QSize> m_storeDialogSize;
 };

src/gui/transferlistfilters/categoryfiltermodel.cpp

@@ -40,7 +40,7 @@ class CategoryModelItem
 public:
     CategoryModelItem() = default;
 
-    CategoryModelItem(CategoryModelItem *parent, QString categoryName, int torrentsCount = 0)
+    CategoryModelItem(CategoryModelItem *parent, const QString &categoryName, const int torrentsCount = 0)
         : m_name(categoryName)
         , m_torrentsCount(torrentsCount)
     {

src/gui/transferlistfilters/categoryfiltermodel.h

@@ -72,6 +72,6 @@ private:
     QModelIndex index(CategoryModelItem *item) const;
     CategoryModelItem *findItem(const QString &fullName) const;
 
-    bool m_isSubcategoriesEnabled;
+    bool m_isSubcategoriesEnabled = false;
     CategoryModelItem *m_rootItem = nullptr;
 };

src/gui/tristatewidget.cpp

@@ -38,8 +38,6 @@
 
 TriStateWidget::TriStateWidget(const QString &text, QWidget *parent)
     : QWidget {parent}
-    , m_closeOnInteraction {true}
-    , m_checkState {Qt::Unchecked}
     , m_text {text}
 {
     setMouseTracking(true);  // for visual effects via mouse navigation

src/gui/tristatewidget.h

@@ -55,7 +55,7 @@ private:
 
     void toggleCheckState();
 
-    bool m_closeOnInteraction;
+    bool m_closeOnInteraction = true;
-    Qt::CheckState m_checkState;
+    Qt::CheckState m_checkState = Qt::Unchecked;
     const QString m_text;
 };

src/gui/uithemedialog.h

@@ -60,7 +60,7 @@ private:
     bool storeColors();
     bool storeIcons();
 
-    Ui::UIThemeDialog *m_ui;
+    Ui::UIThemeDialog *m_ui = nullptr;
     SettingValue<QSize> m_storeDialogSize;
 
     DefaultThemeSource m_defaultThemeSource;

src/webui/api/synccontroller.cpp

@@ -331,19 +331,25 @@ namespace
             for (const QVariant &item : data)
             {
                 if (!prevData.contains(item))
+                {
                     // new list item found - append it to syncData
                     syncData.append(item);
+                }
                 else
+                {
                     // unchanged list item found - remove it from prevData
                     prevData.removeOne(item);
                 }
+            }
 
             if (!prevData.isEmpty())
+            {
                 // prevData contains only items that are missing now -
                 // put them in removedItems
                 removedItems = prevData;
             }
         }
+    }
 
     QJsonObject generateSyncData(int acceptedResponseId, const QVariantMap &data, QVariantMap &lastAcceptedData, QVariantMap &lastData)
     {

src/webui/webapplication.cpp

@@ -730,9 +730,11 @@ bool WebApplication::isCrossSiteRequest(const Http::Request &request) const
     {
         const bool isInvalid = !isSameOrigin(urlFromHostHeader(targetOrigin), originValue);
         if (isInvalid)
+        {
             LogMsg(tr("WebUI: Origin header & Target origin mismatch! Source IP: '%1'. Origin header: '%2'. Target origin: '%3'")
                    .arg(m_env.clientAddress.toString(), originValue, targetOrigin)
                    , Log::WARNING);
+        }
         return isInvalid;
     }
 
@@ -740,9 +742,11 @@ bool WebApplication::isCrossSiteRequest(const Http::Request &request) const
     {
         const bool isInvalid = !isSameOrigin(urlFromHostHeader(targetOrigin), refererValue);
         if (isInvalid)
+        {
             LogMsg(tr("WebUI: Referer header & Target origin mismatch! Source IP: '%1'. Referer header: '%2'. Target origin: '%3'")
                    .arg(m_env.clientAddress.toString(), refererValue, targetOrigin)
                    , Log::WARNING);
+        }
         return isInvalid;
     }
 

src/webui/webapplication.h

@@ -222,21 +222,21 @@ private:
     bool m_translationFileLoaded = false;
 
     AuthController *m_authController = nullptr;
-    bool m_isLocalAuthEnabled;
+    bool m_isLocalAuthEnabled = false;
-    bool m_isAuthSubnetWhitelistEnabled;
+    bool m_isAuthSubnetWhitelistEnabled = false;
     QVector<Utils::Net::Subnet> m_authSubnetWhitelist;
-    int m_sessionTimeout;
+    int m_sessionTimeout = 0;
     QString m_sessionCookieName;
 
     // security related
     QStringList m_domainList;
-    bool m_isCSRFProtectionEnabled;
+    bool m_isCSRFProtectionEnabled = true;
-    bool m_isSecureCookieEnabled;
+    bool m_isSecureCookieEnabled = true;
-    bool m_isHostHeaderValidationEnabled;
+    bool m_isHostHeaderValidationEnabled = true;
-    bool m_isHttpsEnabled;
+    bool m_isHttpsEnabled = false;
 
     // Reverse proxy
-    bool m_isReverseProxySupportEnabled;
+    bool m_isReverseProxySupportEnabled = false;
     QVector<Utils::Net::Subnet> m_trustedReverseProxyList;
     QHostAddress m_clientAddress;