diff options
author | Arno <arno@disconnect.de> | 2020-07-19 12:36:48 +0200 |
---|---|---|
committer | Arno <arno@disconnect.de> | 2020-07-19 12:36:48 +0200 |
commit | 4c3d6d9e620df68cdbb4a497a47bb8002ccc2e34 (patch) | |
tree | bcccbc272d1ec378659c578e31d35301d8264735 | |
parent | f2c94a38a333884a7f5d49a4b11273a5682af4e4 (diff) | |
download | SheMov-4c3d6d9e620df68cdbb4a497a47bb8002ccc2e34.tar.gz SheMov-4c3d6d9e620df68cdbb4a497a47bb8002ccc2e34.tar.bz2 SheMov-4c3d6d9e620df68cdbb4a497a47bb8002ccc2e34.zip |
Fix Qt::Windowflags nullptr deprecation warnings
-rw-r--r-- | filepropertiesdialog.h | 2 | ||||
-rw-r--r-- | mappingeditdialog.h | 2 | ||||
-rw-r--r-- | mappinginputdialog.h | 2 | ||||
-rw-r--r-- | mappingtablemodel.cpp | 2 | ||||
-rw-r--r-- | mappingtablewidget.h | 2 | ||||
-rw-r--r-- | newpicsdialog.h | 2 | ||||
-rw-r--r-- | shemov.h | 2 | ||||
-rw-r--r-- | viewer.h | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/filepropertiesdialog.h b/filepropertiesdialog.h index 9d8b7da..b8389f7 100644 --- a/filepropertiesdialog.h +++ b/filepropertiesdialog.h @@ -18,7 +18,7 @@ class QLabel; class FilePropertiesDialog : public SmDialog { Q_OBJECT public: - explicit FilePropertiesDialog(const QString &file, QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); + explicit FilePropertiesDialog(const QString &file, QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); private: void movieData(); diff --git a/mappingeditdialog.h b/mappingeditdialog.h index 9defd83..95a5893 100644 --- a/mappingeditdialog.h +++ b/mappingeditdialog.h @@ -15,7 +15,7 @@ class MappingEditWidget; class MappingEditDialog : public QDialog { Q_OBJECT public: - explicit MappingEditDialog(QWidget *parent, Qt::WindowFlags f = nullptr); + explicit MappingEditDialog(QWidget *parent, Qt::WindowFlags f = Qt::WindowFlags()); MappingEditWidget *editWidget() const { return mEditWidget; } private: diff --git a/mappinginputdialog.h b/mappinginputdialog.h index ccec561..4197ebc 100644 --- a/mappinginputdialog.h +++ b/mappinginputdialog.h @@ -16,7 +16,7 @@ class QCheckBox; class MappingInputDialog : public QDialog { Q_OBJECT public: - explicit MappingInputDialog(QWidget *parent, Qt::WindowFlags f = nullptr); + explicit MappingInputDialog(QWidget *parent, Qt::WindowFlags f = Qt::WindowFlags()); QString mappingName() const; bool createRoot() const; diff --git a/mappingtablemodel.cpp b/mappingtablemodel.cpp index 5ef0e0a..d472ef8 100644 --- a/mappingtablemodel.cpp +++ b/mappingtablemodel.cpp @@ -52,7 +52,7 @@ MappingTableModel::MappingTableModel(QStringList &headers, const QString &table, Qt::ItemFlags MappingTableModel::flags(const QModelIndex &index) const{ if(!index.isValid()){ - return 0; + return Qt::ItemFlags(); } Qt::ItemFlags retval = Qt::ItemIsEnabled | Qt::ItemIsSelectable; if(index.column() == ItemName){ diff --git a/mappingtablewidget.h b/mappingtablewidget.h index 8f8f07e..462cb5f 100644 --- a/mappingtablewidget.h +++ b/mappingtablewidget.h @@ -68,7 +68,7 @@ class MappingTableItemModel : public QStringListModel { class MappingTableResultDialog : public SmDialog { Q_OBJECT public: - explicit MappingTableResultDialog(const QStringList &results, QWidget *parent = 0, Qt::WindowFlags f = 0); + explicit MappingTableResultDialog(const QStringList &results, QWidget *parent = 0, Qt::WindowFlags f = Qt::WindowFlags()); QString selectedText() const { return mSelectedText; } private slots: diff --git a/newpicsdialog.h b/newpicsdialog.h index a3e1f65..a3db0de 100644 --- a/newpicsdialog.h +++ b/newpicsdialog.h @@ -29,7 +29,7 @@ struct FileData; class NewPicsDialog : public QDialog { Q_OBJECT public: - explicit NewPicsDialog(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); + explicit NewPicsDialog(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); public slots: void selectFiles(); @@ -29,7 +29,7 @@ class MovieWidget; class SheMov : public QMainWindow { Q_OBJECT public: - SheMov(QWidget *parent = nullptr, Qt::WindowFlags flags = nullptr); + SheMov(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); enum TabNum { FileManager = 0, Movies = 1, Pictures = 2, ArchiveBrowserTab = 3, RandomDisp = 4 }; virtual ~SheMov() {} @@ -7,7 +7,7 @@ class QLabel; class Viewer : public QWidget {
public:
- Viewer(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr);
+ Viewer(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
void setFile(const QString &file, bool allFiles = true);
void setFiles(const QStringList &files);
void preview(const QString &file);
|