From 92ada0efad9f0b0a3263e4245cfd1441f4b9f7a9 Mon Sep 17 00:00:00 2001 From: Arno Date: Fri, 23 Nov 2018 18:11:10 +0100 Subject: Clang fixes, nullptr and WindowFlags... --- archivebrowsermodel.h | 4 ++-- archiveview.h | 10 +++++----- configurationdialog.h | 2 +- consistencycheck.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/archivebrowsermodel.h b/archivebrowsermodel.h index 3150a5e..c72fe9e 100644 --- a/archivebrowsermodel.h +++ b/archivebrowsermodel.h @@ -20,7 +20,7 @@ class ArchiveBrowserModel : public SmTreeModel { enum CustomRoles { ExpansionRole = Qt::UserRole + 1, NameRole = Qt::UserRole + 2, GenericIdRole = Qt::UserRole + 3, NodeTypeRole = Qt::UserRole + 4, TotalSizeRole = Qt::UserRole + 5, QualityRole = 6, FileTypeRole = Qt::UserRole + 7, FullPathRole = Qt::UserRole + 8, SelectedRole = Qt::UserRole + 9 }; enum Fields { Expansion = 0, Name = 1, GenericId = 2, NodeType = 3, TotalSize = 4, Quality = 5, FileType = 6, FullPath = 7, Selected = 8 }; enum NodeTypes { SeriesPartNode = 1, FileNode = 2 }; - explicit ArchiveBrowserModel(const QStringList &headers, QObject *parent = 0); + explicit ArchiveBrowserModel(const QStringList &headers, QObject *parent = nullptr); virtual QVariant data(const QModelIndex &index, int role) const; virtual bool setData(const QModelIndex &index, const QVariant &value, int role); void updateDVDNo(const QList fileNos); @@ -46,7 +46,7 @@ class ArchiveBrowserModel : public SmTreeModel { class ArchiveBrowserModelProxy : public QSortFilterProxyModel { Q_OBJECT public: - explicit ArchiveBrowserModelProxy(QObject *parent = 0); + explicit ArchiveBrowserModelProxy(QObject *parent = nullptr); public slots: void setQualityFilter(QString quality); diff --git a/archiveview.h b/archiveview.h index 1d0f50f..13b572a 100644 --- a/archiveview.h +++ b/archiveview.h @@ -36,7 +36,7 @@ class QRadioButton; class MappingEditorWidget : public QWidget { Q_OBJECT public: - explicit MappingEditorWidget(const QString &caption, bool showClearButton = false, QWidget *parent = 0); + explicit MappingEditorWidget(const QString &caption, bool showClearButton = false, QWidget *parent = nullptr); void fillCompleter(const QStringList &completions); void setCurrentItems(const QStringList &items); QStringList items() const; @@ -70,7 +70,7 @@ class MappingEditorWidget : public QWidget { class MappingEditor : public QDialog { Q_OBJECT public: - explicit MappingEditor(const QString &caption, QWidget *parent = 0, Qt::WindowFlags f = 0); + explicit MappingEditor(const QString &caption, QWidget *parent = nullptr, Qt::WindowFlags f = Qt::Widget); MappingEditorWidget *widget() { return mWidget; } private: @@ -82,7 +82,7 @@ class MappingEditor : public QDialog { class MetadataEditorWidget : public QWidget { Q_OBJECT public: - explicit MetadataEditorWidget(QWidget *parent = 0); + explicit MetadataEditorWidget(QWidget *parent = nullptr); void setMetadata(const QList &data); QList metadata() const; @@ -106,7 +106,7 @@ class MetadataEditorWidget : public QWidget { class MetadataEditor : public QDialog { Q_OBJECT public: - explicit MetadataEditor(QWidget *parent = 0, Qt::WindowFlags f = 0); + explicit MetadataEditor(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::Widget); MetadataEditorWidget *widget() { return mWidget; } private: @@ -119,7 +119,7 @@ class MetadataEditor : public QDialog { class PartEditor : public QDialog { Q_OBJECT public: - explicit PartEditor(QWidget *parent = 0, Qt::WindowFlags f = 0); + explicit PartEditor(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::Widget); void setPartNo(int partNo); int partNo() const; void setSubtitle(const QString &subtitle); diff --git a/configurationdialog.h b/configurationdialog.h index cc3ed06..d3f5463 100644 --- a/configurationdialog.h +++ b/configurationdialog.h @@ -27,7 +27,7 @@ class ConfigurationDialog : public SmDialog { Q_OBJECT public: enum Position { TopLeft = 0, TopRight = 1, BottomLeft = 2, BottomRigth = 3, Moveable = 4, NoDisplay = 5 }; - ConfigurationDialog(QWidget *parent = 0, Qt::WindowFlags f = 0); + ConfigurationDialog(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::Widget); ~ConfigurationDialog() {} public slots: diff --git a/consistencycheck.h b/consistencycheck.h index 7f445eb..5c8dfb5 100644 --- a/consistencycheck.h +++ b/consistencycheck.h @@ -29,7 +29,7 @@ class ConsistencyCheck : public SmDialog { Q_OBJECT public: enum Mode { DbCheck, FsCheck }; - explicit ConsistencyCheck(QWidget *parent = 0, Qt::WindowFlags f = 0); + explicit ConsistencyCheck(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::Widget); ~ConsistencyCheck(); public slots: @@ -61,7 +61,7 @@ class ConsistencyChecker : public QThread { Q_OBJECT public: enum Status { Ok, Fail }; - explicit ConsistencyChecker(QObject *parent = 0); + explicit ConsistencyChecker(QObject *parent = nullptr); ~ConsistencyChecker(); int mode() const { return mMode; } int count() const { return mCurCount; } -- cgit v1.2.3-70-g09d2