From 89dce36e9892f066fa5056275b52a4d9790a8f98 Mon Sep 17 00:00:00 2001 From: thalieht Date: Fri, 22 Feb 2019 03:33:04 +0200 Subject: [PATCH] Use uniform initialization on some default arguments --- src/app/cmdoptions.cpp | 2 +- src/base/bittorrent/magneturi.h | 2 +- src/base/bittorrent/session.h | 2 +- src/base/bittorrent/torrentinfo.h | 2 +- src/base/logger.h | 2 +- src/base/net/smtp.h | 4 ++-- src/base/preferences.h | 2 +- src/base/scanfoldersmodel.h | 4 ++-- src/base/settingsstorage.h | 2 +- src/base/torrentfileguard.h | 4 ++-- src/base/utils/foreignapps.cpp | 2 +- src/gui/addnewtorrentdialog.h | 2 +- src/gui/autoexpandabledialog.h | 2 +- src/gui/categoryfiltermodel.h | 6 +++--- src/gui/cookiesmodel.h | 10 +++++----- src/gui/mainwindow.h | 2 +- src/gui/search/searchsortmodel.h | 2 +- src/gui/tagfiltermodel.h | 4 ++-- src/gui/torrentcategorydialog.h | 2 +- src/gui/torrentcontentmodel.h | 6 +++--- src/gui/torrentcreatordialog.h | 2 +- src/gui/transferlistmodel.h | 2 +- 22 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/app/cmdoptions.cpp b/src/app/cmdoptions.cpp index 3e23e120b..a0339fbb5 100644 --- a/src/app/cmdoptions.cpp +++ b/src/app/cmdoptions.cpp @@ -159,7 +159,7 @@ namespace .arg(fullParameter()).arg(QLatin1String(""))); } - QString value(const QProcessEnvironment &env, const QString &defaultValue = QString()) const + QString value(const QProcessEnvironment &env, const QString &defaultValue = {}) const { QString val = env.value(envVarName()); return val.isEmpty() ? defaultValue : Utils::String::unquote(val, QLatin1String("'\"")); diff --git a/src/base/bittorrent/magneturi.h b/src/base/bittorrent/magneturi.h index 07981f85b..d6e8baa8a 100644 --- a/src/base/bittorrent/magneturi.h +++ b/src/base/bittorrent/magneturi.h @@ -43,7 +43,7 @@ namespace BitTorrent class MagnetUri { public: - explicit MagnetUri(const QString &source = QString()); + explicit MagnetUri(const QString &source = {}); bool isValid() const; InfoHash hash() const; diff --git a/src/base/bittorrent/session.h b/src/base/bittorrent/session.h index 7a924a245..45629acd2 100644 --- a/src/base/bittorrent/session.h +++ b/src/base/bittorrent/session.h @@ -581,7 +581,7 @@ namespace BitTorrent bool addTorrent_impl(CreateTorrentParams params, const MagnetUri &magnetUri, TorrentInfo torrentInfo = TorrentInfo(), - const QByteArray &fastresumeData = QByteArray()); + const QByteArray &fastresumeData = {}); bool findIncompleteFiles(TorrentInfo &torrentInfo, QString &savePath) const; void updateSeedingLimitTimer(); diff --git a/src/base/bittorrent/torrentinfo.h b/src/base/bittorrent/torrentinfo.h index e10e4e35c..972ff6aab 100644 --- a/src/base/bittorrent/torrentinfo.h +++ b/src/base/bittorrent/torrentinfo.h @@ -57,7 +57,7 @@ namespace BitTorrent typedef boost::shared_ptr NativeConstPtr; typedef boost::shared_ptr NativePtr; - explicit TorrentInfo(NativeConstPtr nativeInfo = NativeConstPtr()); + explicit TorrentInfo(NativeConstPtr nativeInfo = {}); TorrentInfo(const TorrentInfo &other); static TorrentInfo load(const QByteArray &data, QString *error = nullptr) noexcept; diff --git a/src/base/logger.h b/src/base/logger.h index 81ef7e0d1..f6be24b4f 100644 --- a/src/base/logger.h +++ b/src/base/logger.h @@ -79,7 +79,7 @@ public: static Logger *instance(); void addMessage(const QString &message, const Log::MsgType &type = Log::NORMAL); - void addPeer(const QString &ip, bool blocked, const QString &reason = QString()); + void addPeer(const QString &ip, bool blocked, const QString &reason = {}); QVector getMessages(int lastKnownId = -1) const; QVector getPeers(int lastKnownId = -1) const; diff --git a/src/base/net/smtp.h b/src/base/net/smtp.h index d1944bd49..415aa3a72 100644 --- a/src/base/net/smtp.h +++ b/src/base/net/smtp.h @@ -90,13 +90,13 @@ namespace Net AuthCramMD5 }; - QByteArray encodeMimeHeader(const QString &key, const QString &value, QTextCodec *latin1, const QByteArray &prefix = QByteArray()); + QByteArray encodeMimeHeader(const QString &key, const QString &value, QTextCodec *latin1, const QByteArray &prefix = {}); void ehlo(); void helo(); void parseEhloResponse(const QByteArray &code, bool continued, const QString &line); void authenticate(); void startTLS(); - void authCramMD5(const QByteArray &challenge = QByteArray()); + void authCramMD5(const QByteArray &challenge = {}); void authPlain(); void authLogin(); void logError(const QString &msg); diff --git a/src/base/preferences.h b/src/base/preferences.h index 305b4c85f..d8aaab2e2 100644 --- a/src/base/preferences.h +++ b/src/base/preferences.h @@ -83,7 +83,7 @@ class Preferences : public QObject Preferences(); - const QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const; + const QVariant value(const QString &key, const QVariant &defaultValue = {}) const; void setValue(const QString &key, const QVariant &value); static Preferences *m_instance; diff --git a/src/base/scanfoldersmodel.h b/src/base/scanfoldersmodel.h index e590fcd32..a2c3e2151 100644 --- a/src/base/scanfoldersmodel.h +++ b/src/base/scanfoldersmodel.h @@ -70,8 +70,8 @@ public: static QString pathTypeDisplayName(PathType type); - int rowCount(const QModelIndex &parent = QModelIndex()) const; - int columnCount(const QModelIndex &parent = QModelIndex()) const; + int rowCount(const QModelIndex &parent = {}) const; + int columnCount(const QModelIndex &parent = {}) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; Qt::ItemFlags flags(const QModelIndex &index) const; diff --git a/src/base/settingsstorage.h b/src/base/settingsstorage.h index 15391f3eb..060e49a72 100644 --- a/src/base/settingsstorage.h +++ b/src/base/settingsstorage.h @@ -46,7 +46,7 @@ public: static void freeInstance(); static SettingsStorage *instance(); - QVariant loadValue(const QString &key, const QVariant &defaultValue = QVariant()) const; + QVariant loadValue(const QString &key, const QVariant &defaultValue = {}) const; void storeValue(const QString &key, const QVariant &value); void removeValue(const QString &key); diff --git a/src/base/torrentfileguard.h b/src/base/torrentfileguard.h index 0ca772c94..f378a01c0 100644 --- a/src/base/torrentfileguard.h +++ b/src/base/torrentfileguard.h @@ -37,7 +37,7 @@ template class CachedSettingValue; class FileGuard { public: - explicit FileGuard(const QString &path = QString()); + explicit FileGuard(const QString &path = {}); ~FileGuard(); /// Cancels or re-enables deferred file deletion @@ -55,7 +55,7 @@ class TorrentFileGuard : private FileGuard Q_GADGET public: - explicit TorrentFileGuard(const QString &path = QString()); + explicit TorrentFileGuard(const QString &path = {}); ~TorrentFileGuard(); /// marks the torrent file as loaded (added) into the BitTorrent::Session diff --git a/src/base/utils/foreignapps.cpp b/src/base/utils/foreignapps.cpp index 5a2de1b39..8047a827d 100644 --- a/src/base/utils/foreignapps.cpp +++ b/src/base/utils/foreignapps.cpp @@ -119,7 +119,7 @@ namespace return keys; } - QString getRegValue(const HKEY handle, const QString &name = QString()) + QString getRegValue(const HKEY handle, const QString &name = {}) { QString result; diff --git a/src/gui/addnewtorrentdialog.h b/src/gui/addnewtorrentdialog.h index f6c4b8e06..a3e3f2197 100644 --- a/src/gui/addnewtorrentdialog.h +++ b/src/gui/addnewtorrentdialog.h @@ -98,7 +98,7 @@ private: int indexOfSavePath(const QString &savePath); void loadState(); void saveState(); - void setMetadataProgressIndicator(bool visibleIndicator, const QString &labelText = QString()); + void setMetadataProgressIndicator(bool visibleIndicator, const QString &labelText = {}); void setupTreeview(); void setCommentText(const QString &str) const; void setSavePath(const QString &newPath); diff --git a/src/gui/autoexpandabledialog.h b/src/gui/autoexpandabledialog.h index 2768304be..73f2cdbad 100644 --- a/src/gui/autoexpandabledialog.h +++ b/src/gui/autoexpandabledialog.h @@ -47,7 +47,7 @@ public: ~AutoExpandableDialog(); static QString getText(QWidget *parent, const QString &title, const QString &label, - QLineEdit::EchoMode mode = QLineEdit::Normal, const QString &text = QString(), + QLineEdit::EchoMode mode = QLineEdit::Normal, const QString &text = {}, bool *ok = nullptr, bool excludeExtension = false, Qt::InputMethodHints inputMethodHints = Qt::ImhNone); protected: diff --git a/src/gui/categoryfiltermodel.h b/src/gui/categoryfiltermodel.h index 15609ccbf..2fd058fb0 100644 --- a/src/gui/categoryfiltermodel.h +++ b/src/gui/categoryfiltermodel.h @@ -49,13 +49,13 @@ public: static bool isSpecialItem(const QModelIndex &index); - int columnCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = {}) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; Qt::ItemFlags flags(const QModelIndex &index) const override; QVariant headerData(int section, Qt::Orientation orientation, int role) const override; - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex index(int row, int column, const QModelIndex &parent = {}) const override; QModelIndex parent(const QModelIndex &index) const override; - int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int rowCount(const QModelIndex &parent = {}) const override; QModelIndex index(const QString &categoryName) const; QString categoryName(const QModelIndex &index) const; diff --git a/src/gui/cookiesmodel.h b/src/gui/cookiesmodel.h index 4e203123d..7d12472be 100644 --- a/src/gui/cookiesmodel.h +++ b/src/gui/cookiesmodel.h @@ -54,18 +54,18 @@ public: QList cookies() const; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex index(int row, int column, const QModelIndex &parent = {}) const override; QModelIndex parent(const QModelIndex &index) const override; - int rowCount(const QModelIndex &parent = QModelIndex()) const override; - int columnCount(const QModelIndex &parent = QModelIndex()) const override; + int rowCount(const QModelIndex &parent = {}) const override; + int columnCount(const QModelIndex &parent = {}) const override; Qt::ItemFlags flags(const QModelIndex &index) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; bool setData(const QModelIndex &index, const QVariant &value, int role) override; - bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; - bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; + bool insertRows(int row, int count, const QModelIndex &parent = {}) override; + bool removeRows(int row, int count, const QModelIndex &parent = {}) override; private: mutable QList m_cookies; diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index b40322519..f02983921 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -209,7 +209,7 @@ private: bool event(QEvent *e) override; void displayRSSTab(bool enable); void displaySearchTab(bool enable); - void createTorrentTriggered(const QString &path = QString()); + void createTorrentTriggered(const QString &path = {}); void showStatusBar(bool show); Ui::MainWindow *m_ui; diff --git a/src/gui/search/searchsortmodel.h b/src/gui/search/searchsortmodel.h index 369058de7..6434b3dcd 100644 --- a/src/gui/search/searchsortmodel.h +++ b/src/gui/search/searchsortmodel.h @@ -53,7 +53,7 @@ public: explicit SearchSortModel(QObject *parent = nullptr); void enableNameFilter(bool enabled); - void setNameFilter(const QString &searchTerm = QString()); + void setNameFilter(const QString &searchTerm = {}); //! \brief Sets parameters for filtering by size //! \param minSize minimal size in bytes diff --git a/src/gui/tagfiltermodel.h b/src/gui/tagfiltermodel.h index c1efaf76f..19451bf94 100644 --- a/src/gui/tagfiltermodel.h +++ b/src/gui/tagfiltermodel.h @@ -54,8 +54,8 @@ public: QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; Qt::ItemFlags flags(const QModelIndex &index) const override; QVariant headerData(int section, Qt::Orientation orientation, int role) const override; - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; - int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QModelIndex index(int row, int column, const QModelIndex &parent = {}) const override; + int rowCount(const QModelIndex &parent = {}) const override; QModelIndex index(const QString &tag) const; QString tag(const QModelIndex &index) const; diff --git a/src/gui/torrentcategorydialog.h b/src/gui/torrentcategorydialog.h index 9addebb8f..54d6f0eeb 100644 --- a/src/gui/torrentcategorydialog.h +++ b/src/gui/torrentcategorydialog.h @@ -41,7 +41,7 @@ class TorrentCategoryDialog : public QDialog Q_DISABLE_COPY(TorrentCategoryDialog) public: - static QString createCategory(QWidget *parent, const QString &parentCategoryName = QString()); + static QString createCategory(QWidget *parent, const QString &parentCategoryName = {}); static void editCategory(QWidget *parent, const QString &categoryName); explicit TorrentCategoryDialog(QWidget *parent = nullptr); diff --git a/src/gui/torrentcontentmodel.h b/src/gui/torrentcontentmodel.h index 921310ef9..1f6980af2 100644 --- a/src/gui/torrentcontentmodel.h +++ b/src/gui/torrentcontentmodel.h @@ -53,16 +53,16 @@ public: void updateFilesAvailability(const QVector &fa); QVector getFilePriorities() const; bool allFiltered() const; - int columnCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = {}) const override; bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; TorrentContentModelItem::ItemType itemType(const QModelIndex &index) const; int getFileIndex(const QModelIndex &index); QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; Qt::ItemFlags flags(const QModelIndex &index) const override; QVariant headerData(int section, Qt::Orientation orientation, int role) const override; - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex index(int row, int column, const QModelIndex &parent = {}) const override; QModelIndex parent(const QModelIndex &index) const override; - int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int rowCount(const QModelIndex &parent = {}) const override; void clear(); void setupModelData(const BitTorrent::TorrentInfo &info); diff --git a/src/gui/torrentcreatordialog.h b/src/gui/torrentcreatordialog.h index 1362c0f62..bd94475bf 100644 --- a/src/gui/torrentcreatordialog.h +++ b/src/gui/torrentcreatordialog.h @@ -49,7 +49,7 @@ class TorrentCreatorDialog : public QDialog Q_OBJECT public: - TorrentCreatorDialog(QWidget *parent = nullptr, const QString &defaultPath = QString()); + TorrentCreatorDialog(QWidget *parent = nullptr, const QString &defaultPath = {}); ~TorrentCreatorDialog() override; void updateInputPath(const QString &path); diff --git a/src/gui/transferlistmodel.h b/src/gui/transferlistmodel.h index a7eb4bf24..92ea137e7 100644 --- a/src/gui/transferlistmodel.h +++ b/src/gui/transferlistmodel.h @@ -83,7 +83,7 @@ public: explicit TransferListModel(QObject *parent = nullptr); - int rowCount(const QModelIndex &index = QModelIndex()) const override; + int rowCount(const QModelIndex &index = {}) const override; int columnCount(const QModelIndex &parent=QModelIndex()) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; bool setData(const QModelIndex &index, const QVariant &value, int role) override;