From dc36aee7fff913e985b10f63f15790c25b568d81 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 26 Jun 2020 22:41:38 +0200 Subject: [PATCH] Change some explicit usage --- 3rdparty/singleapplication/singleapplication_p.h | 2 +- 3rdparty/singleapplication/singlecoreapplication_p.h | 2 +- ext/libstrawberry-common/core/concurrentrun.h | 4 ++-- ext/libstrawberry-common/core/logging.cpp | 6 +++--- ext/libstrawberry-common/core/messagereply.h | 4 ++-- ext/libstrawberry-common/core/workerpool.h | 4 ++-- ext/strawberry-tagreader/tagreaderworker.h | 2 +- src/analyzer/blockanalyzer.h | 2 +- src/analyzer/boomanalyzer.h | 2 +- src/analyzer/fht.h | 2 +- src/analyzer/rainbowanalyzer.h | 4 ++-- src/collection/collectionmodel.h | 2 +- src/context/contextalbumsview.h | 2 +- src/core/database.h | 2 +- src/core/mimedata.h | 2 +- src/core/qtsystemtrayicon.h | 2 +- src/core/scopedgobject.h | 2 +- src/core/urlhandler.h | 2 +- src/core/utilities.h | 2 +- src/device/devicedatabasebackend.h | 2 +- src/dialogs/about.h | 2 +- src/dialogs/addstreamdialog.h | 2 +- src/dialogs/edittagdialog.h | 4 ++-- src/engine/vlcscopedref.h | 2 +- src/playlist/playlistdelegates.h | 6 +++--- src/transcoder/transcoder.cpp | 2 +- tests/src/mock_networkaccessmanager.h | 2 +- tests/src/test_utils.h | 4 ++-- 28 files changed, 38 insertions(+), 38 deletions(-) diff --git a/3rdparty/singleapplication/singleapplication_p.h b/3rdparty/singleapplication/singleapplication_p.h index dc970394..d4b128c4 100644 --- a/3rdparty/singleapplication/singleapplication_p.h +++ b/3rdparty/singleapplication/singleapplication_p.h @@ -74,7 +74,7 @@ class SingleApplicationPrivate : public QObject { }; Q_DECLARE_PUBLIC(SingleApplication) - SingleApplicationPrivate(SingleApplication *_q_ptr); + explicit SingleApplicationPrivate(SingleApplication *_q_ptr); ~SingleApplicationPrivate(); void genBlockServerName(); diff --git a/3rdparty/singleapplication/singlecoreapplication_p.h b/3rdparty/singleapplication/singlecoreapplication_p.h index 05525ac3..869ade74 100644 --- a/3rdparty/singleapplication/singlecoreapplication_p.h +++ b/3rdparty/singleapplication/singlecoreapplication_p.h @@ -74,7 +74,7 @@ class SingleCoreApplicationPrivate : public QObject { }; Q_DECLARE_PUBLIC(SingleCoreApplication) - SingleCoreApplicationPrivate(SingleCoreApplication *_q_ptr); + explicit SingleCoreApplicationPrivate(SingleCoreApplication *_q_ptr); ~SingleCoreApplicationPrivate(); void genBlockServerName(); diff --git a/ext/libstrawberry-common/core/concurrentrun.h b/ext/libstrawberry-common/core/concurrentrun.h index 351d324f..6c51a39c 100644 --- a/ext/libstrawberry-common/core/concurrentrun.h +++ b/ext/libstrawberry-common/core/concurrentrun.h @@ -65,7 +65,7 @@ class ThreadFunctorBase : public QFutureInterface, public QRunnable template class ThreadFunctor : public ThreadFunctorBase { public: - ThreadFunctor(std::function function, Args... args) + explicit ThreadFunctor(std::function function, Args... args) : function_(std::bind(function, args...)) { } @@ -82,7 +82,7 @@ class ThreadFunctor : public ThreadFunctorBase { template class ThreadFunctor : public ThreadFunctorBase { public: - ThreadFunctor(std::function function, Args... args) + explicit ThreadFunctor(std::function function, Args... args) : function_(std::bind(function, args...)) { } diff --git a/ext/libstrawberry-common/core/logging.cpp b/ext/libstrawberry-common/core/logging.cpp index 9ccbe0d2..5353535a 100644 --- a/ext/libstrawberry-common/core/logging.cpp +++ b/ext/libstrawberry-common/core/logging.cpp @@ -89,7 +89,7 @@ template class DebugBase : public QDebug { public: DebugBase() : QDebug(sNullDevice) {} - DebugBase(QtMsgType t) : QDebug(t) {} + explicit DebugBase(QtMsgType t) : QDebug(t) {} T& space() { return static_cast(QDebug::space()); } T& noSpace() { return static_cast(QDebug::nospace()); } }; @@ -98,7 +98,7 @@ class DebugBase : public QDebug { class BufferedDebug : public DebugBase { public: BufferedDebug() {} - BufferedDebug(QtMsgType) : buf_(new QBuffer, later_deleter) { + explicit BufferedDebug(QtMsgType) : buf_(new QBuffer, later_deleter) { buf_->open(QIODevice::WriteOnly); // QDebug doesn't have a method to set a new io device, but swap() allows the devices to be swapped between two instances. @@ -117,7 +117,7 @@ class BufferedDebug : public DebugBase { class LoggedDebug : public DebugBase { public: LoggedDebug() {} - LoggedDebug(QtMsgType t) : DebugBase(t) { nospace() << kMessageHandlerMagic; } + explicit LoggedDebug(QtMsgType t) : DebugBase(t) { nospace() << kMessageHandlerMagic; } }; static void MessageHandler(QtMsgType type, const QMessageLogContext&, const QString &message) { diff --git a/ext/libstrawberry-common/core/messagereply.h b/ext/libstrawberry-common/core/messagereply.h index eb4847a8..30ec2149 100644 --- a/ext/libstrawberry-common/core/messagereply.h +++ b/ext/libstrawberry-common/core/messagereply.h @@ -31,7 +31,7 @@ class _MessageReplyBase : public QObject { Q_OBJECT public: - _MessageReplyBase(QObject *parent = nullptr); + explicit _MessageReplyBase(QObject *parent = nullptr); virtual int id() const = 0; bool is_finished() const { return finished_; } @@ -57,7 +57,7 @@ class _MessageReplyBase : public QObject { template class MessageReply : public _MessageReplyBase { public: - MessageReply(const MessageType& request_message, QObject *parent = nullptr); + explicit MessageReply(const MessageType& request_message, QObject *parent = nullptr); int id() const { return request_message_.id(); } const MessageType& request_message() const { return request_message_; } diff --git a/ext/libstrawberry-common/core/workerpool.h b/ext/libstrawberry-common/core/workerpool.h index 01d5082d..70ca08b2 100644 --- a/ext/libstrawberry-common/core/workerpool.h +++ b/ext/libstrawberry-common/core/workerpool.h @@ -46,7 +46,7 @@ class _WorkerPoolBase : public QObject { Q_OBJECT public: - _WorkerPoolBase(QObject *parent = nullptr); + explicit _WorkerPoolBase(QObject *parent = nullptr); signals: // Emitted when a worker failed to start. This usually happens when the worker wasn't found, or couldn't be executed. @@ -67,7 +67,7 @@ protected slots: template class WorkerPool : public _WorkerPoolBase { public: - WorkerPool(QObject *parent = nullptr); + explicit WorkerPool(QObject *parent = nullptr); ~WorkerPool(); typedef typename HandlerType::MessageType MessageType; diff --git a/ext/strawberry-tagreader/tagreaderworker.h b/ext/strawberry-tagreader/tagreaderworker.h index 80c677ed..074fddeb 100644 --- a/ext/strawberry-tagreader/tagreaderworker.h +++ b/ext/strawberry-tagreader/tagreaderworker.h @@ -30,7 +30,7 @@ class QIODevice; class TagReaderWorker : public AbstractMessageHandler { public: - TagReaderWorker(QIODevice *socket, QObject *parent = nullptr); + explicit TagReaderWorker(QIODevice *socket, QObject *parent = nullptr); protected: void MessageArrived(const pb::tagreader::Message &message); diff --git a/src/analyzer/blockanalyzer.h b/src/analyzer/blockanalyzer.h index fba2a456..bdf56876 100644 --- a/src/analyzer/blockanalyzer.h +++ b/src/analyzer/blockanalyzer.h @@ -41,7 +41,7 @@ class BlockAnalyzer : public Analyzer::Base { Q_OBJECT public: - Q_INVOKABLE BlockAnalyzer(QWidget*); + Q_INVOKABLE explicit BlockAnalyzer(QWidget*); static const uint kHeight; static const uint kWidth; diff --git a/src/analyzer/boomanalyzer.h b/src/analyzer/boomanalyzer.h index 19129c1e..00e8304a 100644 --- a/src/analyzer/boomanalyzer.h +++ b/src/analyzer/boomanalyzer.h @@ -40,7 +40,7 @@ class BoomAnalyzer : public Analyzer::Base { Q_OBJECT public: - Q_INVOKABLE BoomAnalyzer(QWidget*); + Q_INVOKABLE explicit BoomAnalyzer(QWidget*); static const char* kName; diff --git a/src/analyzer/fht.h b/src/analyzer/fht.h index 5b79679b..be17430d 100644 --- a/src/analyzer/fht.h +++ b/src/analyzer/fht.h @@ -63,7 +63,7 @@ class FHT { * should be at least 3. Values of more than 3 need a trigonometry table. * @see makeCasTable() */ - FHT(int); + explicit FHT(int); ~FHT(); int sizeExp() const; diff --git a/src/analyzer/rainbowanalyzer.h b/src/analyzer/rainbowanalyzer.h index d621b9c8..9d0331c9 100644 --- a/src/analyzer/rainbowanalyzer.h +++ b/src/analyzer/rainbowanalyzer.h @@ -129,7 +129,7 @@ class NyanCatAnalyzer : public RainbowAnalyzer { Q_OBJECT public: - Q_INVOKABLE NyanCatAnalyzer(QWidget* parent); + Q_INVOKABLE explicit NyanCatAnalyzer(QWidget* parent); static const char* kName; }; @@ -138,7 +138,7 @@ class RainbowDashAnalyzer : public RainbowAnalyzer { Q_OBJECT public: - Q_INVOKABLE RainbowDashAnalyzer(QWidget* parent); + Q_INVOKABLE explicit RainbowDashAnalyzer(QWidget* parent); static const char* kName; }; diff --git a/src/collection/collectionmodel.h b/src/collection/collectionmodel.h index 65d90242..949820b2 100644 --- a/src/collection/collectionmodel.h +++ b/src/collection/collectionmodel.h @@ -107,7 +107,7 @@ class CollectionModel : public SimpleTreeModel { }; struct Grouping { - Grouping(GroupBy f = GroupBy_None, GroupBy s = GroupBy_None, GroupBy t = GroupBy_None) + explicit Grouping(GroupBy f = GroupBy_None, GroupBy s = GroupBy_None, GroupBy t = GroupBy_None) : first(f), second(s), third(t) {} GroupBy first; diff --git a/src/context/contextalbumsview.h b/src/context/contextalbumsview.h index 441f22ca..50b6268c 100644 --- a/src/context/contextalbumsview.h +++ b/src/context/contextalbumsview.h @@ -64,7 +64,7 @@ class ContextAlbumsView : public AutoExpandingTreeView { Q_OBJECT public: - ContextAlbumsView(QWidget *parent = nullptr); + explicit ContextAlbumsView(QWidget *parent = nullptr); ~ContextAlbumsView() override; // Returns Songs currently selected in the collection view. diff --git a/src/core/database.h b/src/core/database.h index 8cd3eb2f..0d0d1aa8 100644 --- a/src/core/database.h +++ b/src/core/database.h @@ -129,7 +129,7 @@ class Database : public QObject { class MemoryDatabase : public Database { public: - MemoryDatabase(Application *app, QObject *parent = nullptr) + explicit MemoryDatabase(Application *app, QObject *parent = nullptr) : Database(app, parent, ":memory:") {} ~MemoryDatabase() override { // Make sure Qt doesn't reuse the same database diff --git a/src/core/mimedata.h b/src/core/mimedata.h index 8a2d4b46..d4c9a9dc 100644 --- a/src/core/mimedata.h +++ b/src/core/mimedata.h @@ -31,7 +31,7 @@ class MimeData : public QMimeData { Q_OBJECT public: - MimeData(bool clear = false, bool play_now = false, bool enqueue = false, bool enqueue_next_now = false, bool open_in_new_playlist = false) + explicit MimeData(bool clear = false, bool play_now = false, bool enqueue = false, bool enqueue_next_now = false, bool open_in_new_playlist = false) : override_user_settings_(false), clear_first_(clear), play_now_(play_now), diff --git a/src/core/qtsystemtrayicon.h b/src/core/qtsystemtrayicon.h index a068ad71..862c7122 100644 --- a/src/core/qtsystemtrayicon.h +++ b/src/core/qtsystemtrayicon.h @@ -43,7 +43,7 @@ class QtSystemTrayIcon : public SystemTrayIcon { Q_OBJECT public: - QtSystemTrayIcon(QObject *parent = nullptr); + explicit QtSystemTrayIcon(QObject *parent = nullptr); ~QtSystemTrayIcon() override; void SetupMenu(QAction *previous, QAction *play, QAction *stop, QAction *stop_after, QAction *next, QAction *mute, QAction *love, QAction *quit) override; diff --git a/src/core/scopedgobject.h b/src/core/scopedgobject.h index f7f01623..f5a27606 100644 --- a/src/core/scopedgobject.h +++ b/src/core/scopedgobject.h @@ -32,7 +32,7 @@ class ScopedGObject { public: ScopedGObject() : object_(nullptr) {} - explicit ScopedGObject(const ScopedGObject& other) : object_(nullptr) { + ScopedGObject(const ScopedGObject& other) : object_(nullptr) { reset(other.object_); } diff --git a/src/core/urlhandler.h b/src/core/urlhandler.h index 4411ccb4..ff8d25ab 100644 --- a/src/core/urlhandler.h +++ b/src/core/urlhandler.h @@ -57,7 +57,7 @@ class UrlHandler : public QObject { Error, }; - LoadResult(const QUrl &original_url = QUrl(), const Type type = NoMoreTracks, const QUrl &stream_url = QUrl(), const Song::FileType filetype = Song::FileType_Stream, const int samplerate = -1, const int bit_depth = -1, const qint64 length_nanosec = -1, const QString error = QString()); + explicit LoadResult(const QUrl &original_url = QUrl(), const Type type = NoMoreTracks, const QUrl &stream_url = QUrl(), const Song::FileType filetype = Song::FileType_Stream, const int samplerate = -1, const int bit_depth = -1, const qint64 length_nanosec = -1, const QString error = QString()); // The url that the playlist item has in Url(). // Might be something unplayable like lastfm://... diff --git a/src/core/utilities.h b/src/core/utilities.h index af36b4db..53a14b81 100644 --- a/src/core/utilities.h +++ b/src/core/utilities.h @@ -174,7 +174,7 @@ class ScopedWCharArray { QString ToString() const { return QString::fromWCharArray(data_.get()); } wchar_t *get() const { return data_.get(); } - operator wchar_t*() const { return get(); } + explicit operator wchar_t*() const { return get(); } int characters() const { return chars_; } int bytes() const { return (chars_ + 1) *sizeof(wchar_t); } diff --git a/src/device/devicedatabasebackend.h b/src/device/devicedatabasebackend.h index 3c7d745c..3debe355 100644 --- a/src/device/devicedatabasebackend.h +++ b/src/device/devicedatabasebackend.h @@ -38,7 +38,7 @@ class DeviceDatabaseBackend : public QObject { Q_OBJECT public: - Q_INVOKABLE DeviceDatabaseBackend(QObject *parent = nullptr); + Q_INVOKABLE explicit DeviceDatabaseBackend(QObject *parent = nullptr); struct Device { Device() : id_(-1) {} diff --git a/src/dialogs/about.h b/src/dialogs/about.h index 30fb97e1..68d1f889 100644 --- a/src/dialogs/about.h +++ b/src/dialogs/about.h @@ -41,7 +41,7 @@ class About : public QDialog { private: struct Person { - Person(const QString &n, const QString &e = QString()) : name(n), email(e) {} + explicit Person(const QString &n, const QString &e = QString()) : name(n), email(e) {} bool operator<(const Person &other) const { return name < other.name; } QString name; QString email; diff --git a/src/dialogs/addstreamdialog.h b/src/dialogs/addstreamdialog.h index 3ec824ce..3bf7a634 100644 --- a/src/dialogs/addstreamdialog.h +++ b/src/dialogs/addstreamdialog.h @@ -31,7 +31,7 @@ class AddStreamDialog : public QDialog { Q_OBJECT public: - AddStreamDialog(QWidget *parent = nullptr); + explicit AddStreamDialog(QWidget *parent = nullptr); ~AddStreamDialog() override; QUrl url() const { return QUrl(ui_->url->text()); } diff --git a/src/dialogs/edittagdialog.h b/src/dialogs/edittagdialog.h index d101d581..1f926f65 100644 --- a/src/dialogs/edittagdialog.h +++ b/src/dialogs/edittagdialog.h @@ -83,7 +83,7 @@ class EditTagDialog : public QDialog { private: struct Data { - Data(const Song &song = Song()) : original_(song), current_(song) {} + explicit Data(const Song &song = Song()) : original_(song), current_(song) {} static QVariant value(const Song &song, const QString &id); QVariant original_value(const QString &id) const { @@ -127,7 +127,7 @@ class EditTagDialog : public QDialog { private: struct FieldData { - FieldData(QLabel *label = nullptr, QWidget *editor = nullptr, const QString &id = QString()) + explicit FieldData(QLabel *label = nullptr, QWidget *editor = nullptr, const QString &id = QString()) : label_(label), editor_(editor), id_(id) {} QLabel *label_; diff --git a/src/engine/vlcscopedref.h b/src/engine/vlcscopedref.h index 12e1b2b7..85c0ac52 100644 --- a/src/engine/vlcscopedref.h +++ b/src/engine/vlcscopedref.h @@ -36,7 +36,7 @@ class VlcScopedRef { T* operator ->() const { return ptr_; } private: - explicit VlcScopedRef(VlcScopedRef&) {} + VlcScopedRef(VlcScopedRef&) {} VlcScopedRef& operator =(const VlcScopedRef&) { return *this; } T* ptr_; diff --git a/src/playlist/playlistdelegates.h b/src/playlist/playlistdelegates.h index e76b6321..7b416bcd 100644 --- a/src/playlist/playlistdelegates.h +++ b/src/playlist/playlistdelegates.h @@ -57,7 +57,7 @@ class Player; class QueuedItemDelegate : public QStyledItemDelegate { public: - QueuedItemDelegate(QObject *parent, int indicator_column = Playlist::Column_Title); + explicit QueuedItemDelegate(QObject *parent, int indicator_column = Playlist::Column_Title); void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; void DrawBox(QPainter *painter, const QRect &line_rect, const QFont &font, const QString &text, int width = -1) const; @@ -118,13 +118,13 @@ class DateItemDelegate : public PlaylistDelegateBase { class LastPlayedItemDelegate : public PlaylistDelegateBase { public: - LastPlayedItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {} + explicit LastPlayedItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {} QString displayText(const QVariant &value, const QLocale &locale) const override; }; class FileTypeItemDelegate : public PlaylistDelegateBase { public: - FileTypeItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {} + explicit FileTypeItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {} QString displayText(const QVariant &value, const QLocale &locale) const override; }; diff --git a/src/transcoder/transcoder.cpp b/src/transcoder/transcoder.cpp index 0ae70301..8e1b5c4a 100644 --- a/src/transcoder/transcoder.cpp +++ b/src/transcoder/transcoder.cpp @@ -75,7 +75,7 @@ GstElement *Transcoder::CreateElement(const QString &factory_name, GstElement *b struct SuitableElement { - SuitableElement(const QString &name = QString(), int rank = 0) : name_(name), rank_(rank) {} + explicit SuitableElement(const QString &name = QString(), int rank = 0) : name_(name), rank_(rank) {} bool operator<(const SuitableElement &other) const { return rank_ < other.rank_; diff --git a/tests/src/mock_networkaccessmanager.h b/tests/src/mock_networkaccessmanager.h index 2721b7a7..a51877d5 100644 --- a/tests/src/mock_networkaccessmanager.h +++ b/tests/src/mock_networkaccessmanager.h @@ -40,7 +40,7 @@ class MockNetworkReply : public QNetworkReply { Q_OBJECT public: MockNetworkReply(); - MockNetworkReply(const QByteArray& data); + explicit explicit MockNetworkReply(const QByteArray& data); // Use these to set expectations. void SetData(const QByteArray& data); diff --git a/tests/src/test_utils.h b/tests/src/test_utils.h index 1343b5f7..2681f96b 100644 --- a/tests/src/test_utils.h +++ b/tests/src/test_utils.h @@ -62,13 +62,13 @@ Q_DECLARE_METATYPE(QModelIndex) class TemporaryResource : public QTemporaryFile { public: - TemporaryResource(const QString& filename); + explicit explicit TemporaryResource(const QString& filename); }; class TestQObject : public QObject { Q_OBJECT public: - TestQObject(QObject* parent = nullptr); + explicit explicit TestQObject(QObject* parent = nullptr); void Emit();