diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2011-12-09 14:36:33 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-12 08:56:53 +0100 |
commit | 77f41a68b30b93e95808b86fc9d36838e690c8cc (patch) | |
tree | ef613093b7b0a4d00e64f84083c9253568e219ca /src/widgets/dialogs/qfiledialog_p.h | |
parent | c07b840739d28366004242971d1f4ab7ae1546f3 (diff) |
Silence -Woverloaded-virtual warnings in QFileDialog
The QPaintDevice::init() virtual, reimplemented in QWidget, is hidden by
these declarations, and clang (and gcc with -Woverloaded-virtual) warns
about this. There is no need to overload the init() name, use more
descriptive names instead.
dialogs/qsidebar_p.h:124:10: warning: 'QSidebar::init' hides overloaded
virtual
function [-Woverloaded-virtual]
void init(QFileSystemModel *model, const QList<QUrl> &newUrls);
^
dialogs/qfiledialog_p.h:303:10: warning: 'QFileDialogLineEdit::init'
hides
overloaded virtual function [-Woverloaded-virtual]
void init(QFileDialogPrivate *d_pointer) {d_ptr = d_pointer; }
^
dialogs/qfiledialog_p.h:314:10: warning: 'QFileDialogComboBox::init'
hides
overloaded virtual function [-Woverloaded-virtual]
void init(QFileDialogPrivate *d_pointer);
^
dialogs/qfiledialog_p.h:330:10: warning: 'QFileDialogListView::init'
hides
overloaded virtual function [-Woverloaded-virtual]
void init(QFileDialogPrivate *d_pointer);
^
dialogs/qfiledialog_p.h:342:10: warning: 'QFileDialogTreeView::init'
hides
overloaded virtual function [-Woverloaded-virtual]
void init(QFileDialogPrivate *d_pointer);
^
kernel/qwidget.h:682:10: note:
hidden overloaded virtual function 'QWidget::init' declared here
void init(QPainter *painter) const;
^
Change-Id: I7a317a551b92fde966e61958dcaf25dea94d69b4
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/widgets/dialogs/qfiledialog_p.h')
-rw-r--r-- | src/widgets/dialogs/qfiledialog_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h index 383734950c..1780fff72c 100644 --- a/src/widgets/dialogs/qfiledialog_p.h +++ b/src/widgets/dialogs/qfiledialog_p.h @@ -300,7 +300,7 @@ class QFileDialogLineEdit : public QLineEdit { public: QFileDialogLineEdit(QWidget *parent = 0) : QLineEdit(parent), hideOnEsc(false), d_ptr(0){} - void init(QFileDialogPrivate *d_pointer) {d_ptr = d_pointer; } + void setFileDialogPrivate(QFileDialogPrivate *d_pointer) {d_ptr = d_pointer; } void keyPressEvent(QKeyEvent *e); bool hideOnEsc; private: @@ -311,7 +311,7 @@ class QFileDialogComboBox : public QComboBox { public: QFileDialogComboBox(QWidget *parent = 0) : QComboBox(parent), urlModel(0) {} - void init(QFileDialogPrivate *d_pointer); + void setFileDialogPrivate(QFileDialogPrivate *d_pointer); void showPopup(); void setHistory(const QStringList &paths); QStringList history() const { return m_history; } @@ -327,7 +327,7 @@ class QFileDialogListView : public QListView { public: QFileDialogListView(QWidget *parent = 0); - void init(QFileDialogPrivate *d_pointer); + void setFileDialogPrivate(QFileDialogPrivate *d_pointer); QSize sizeHint() const; protected: void keyPressEvent(QKeyEvent *e); @@ -339,7 +339,7 @@ class QFileDialogTreeView : public QTreeView { public: QFileDialogTreeView(QWidget *parent); - void init(QFileDialogPrivate *d_pointer); + void setFileDialogPrivate(QFileDialogPrivate *d_pointer); QSize sizeHint() const; protected: |