diff options
author | Yang Yuyin <yangyuyin@uniontech.com> | 2021-08-20 15:41:31 +0800 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-31 11:48:26 +0000 |
commit | f2cd04584ae62ccdcff3585c7b7b9f1e294eca1b (patch) | |
tree | b006f93de791bf42050b257a4a0e5bd9ad5717c2 | |
parent | 565c865c8a8046d8eaf5de669749fc89ed3246bf (diff) |
QFileDialogComboBox: member variable is not initialized
initialize d_ptr in the constructor
Change-Id: I5a8062dd0a81023e6c1a5858bb8603d279cdbcee
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
(cherry picked from commit 6e9cae0b77dbc9a59e500ea8ceb6b60b74b1988b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/widgets/dialogs/qfiledialog.cpp | 8 | ||||
-rw-r--r-- | src/widgets/dialogs/qfiledialog_p.h | 7 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index 74484b629d..832fc40de6 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -4069,10 +4069,6 @@ void QFileDialogComboBox::paintEvent(QPaintEvent *) painter.drawControl(QStyle::CE_ComboBoxLabel, opt); } -QFileDialogListView::QFileDialogListView(QWidget *parent) : QListView(parent) -{ -} - void QFileDialogListView::setFileDialogPrivate(QFileDialogPrivate *d_pointer) { d_ptr = d_pointer; @@ -4106,10 +4102,6 @@ void QFileDialogListView::keyPressEvent(QKeyEvent *e) e->accept(); } -QFileDialogTreeView::QFileDialogTreeView(QWidget *parent) : QTreeView(parent) -{ -} - void QFileDialogTreeView::setFileDialogPrivate(QFileDialogPrivate *d_pointer) { d_ptr = d_pointer; diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h index 16b8b2f45b..28750ca22c 100644 --- a/src/widgets/dialogs/qfiledialog_p.h +++ b/src/widgets/dialogs/qfiledialog_p.h @@ -312,7 +312,8 @@ private: class QFileDialogComboBox : public QComboBox { public: - QFileDialogComboBox(QWidget *parent = nullptr) : QComboBox(parent), urlModel(nullptr) {} + QFileDialogComboBox(QWidget *parent = nullptr) : + QComboBox(parent), urlModel(nullptr), d_ptr(nullptr) {} void setFileDialogPrivate(QFileDialogPrivate *d_pointer); void showPopup() override; void setHistory(const QStringList &paths); @@ -328,7 +329,7 @@ private: class QFileDialogListView : public QListView { public: - QFileDialogListView(QWidget *parent = nullptr); + QFileDialogListView(QWidget *parent = nullptr) : QListView(parent), d_ptr(nullptr) {} void setFileDialogPrivate(QFileDialogPrivate *d_pointer); QSize sizeHint() const override; protected: @@ -340,7 +341,7 @@ private: class QFileDialogTreeView : public QTreeView { public: - QFileDialogTreeView(QWidget *parent); + QFileDialogTreeView(QWidget *parent) : QTreeView(parent), d_ptr(nullptr) {} void setFileDialogPrivate(QFileDialogPrivate *d_pointer); QSize sizeHint() const override; |