1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFileDialogComboBox: member variable is not initialized

Browse Source 
initialize d_ptr in the constructor

Pick-to: 6.2
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>
This commit is contained in:
Yang Yuyin 2021-08-20 15:41:31 +08:00 committed by David Skoland
parent 08180e76e6
commit 6e9cae0b77
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/widgets/dialogs/qfiledialog.cpp
View File

@ -4069,10 +4069,6 @@ void QFileDialogComboBox::paintEvent(QPaintEvent *)
painter.drawControl(QStyle::CE_ComboBoxLabel, opt); painter.drawControl(QStyle::CE_ComboBoxLabel, opt);
} }
QFileDialogListView::QFileDialogListView(QWidget *parent) : QListView(parent)
{
}
void QFileDialogListView::setFileDialogPrivate(QFileDialogPrivate *d_pointer) void QFileDialogListView::setFileDialogPrivate(QFileDialogPrivate *d_pointer)
{ {
d_ptr = d_pointer; d_ptr = d_pointer;
@ -4106,10 +4102,6 @@ void QFileDialogListView::keyPressEvent(QKeyEvent *e)
e->accept(); e->accept();
} }
QFileDialogTreeView::QFileDialogTreeView(QWidget *parent) : QTreeView(parent)
{
}
void QFileDialogTreeView::setFileDialogPrivate(QFileDialogPrivate *d_pointer) void QFileDialogTreeView::setFileDialogPrivate(QFileDialogPrivate *d_pointer)
{ {
d_ptr = d_pointer; d_ptr = d_pointer;

7
src/widgets/dialogs/qfiledialog_p.h
View File

@ -312,7 +312,8 @@ private:
class QFileDialogComboBox : public QComboBox class QFileDialogComboBox : public QComboBox
{ {
public: 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 setFileDialogPrivate(QFileDialogPrivate *d_pointer);
void showPopup() override; void showPopup() override;
void setHistory(const QStringList &paths); void setHistory(const QStringList &paths);
@ -328,7 +329,7 @@ private:
class QFileDialogListView : public QListView class QFileDialogListView : public QListView
{ {
public: public:
QFileDialogListView(QWidget *parent = nullptr); QFileDialogListView(QWidget *parent = nullptr) : QListView(parent), d_ptr(nullptr) {}
void setFileDialogPrivate(QFileDialogPrivate *d_pointer); void setFileDialogPrivate(QFileDialogPrivate *d_pointer);
QSize sizeHint() const override; QSize sizeHint() const override;
protected: protected:
@ -340,7 +341,7 @@ private:
class QFileDialogTreeView : public QTreeView class QFileDialogTreeView : public QTreeView
{ {
public: public:
QFileDialogTreeView(QWidget *parent); QFileDialogTreeView(QWidget *parent) : QTreeView(parent), d_ptr(nullptr) {}
void setFileDialogPrivate(QFileDialogPrivate *d_pointer); void setFileDialogPrivate(QFileDialogPrivate *d_pointer);
QSize sizeHint() const override; QSize sizeHint() const override;