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>

2 files changed, 5 insertions, 5 deletions

diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
index bac6b82d37..9ed91af26e 100644
--- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
@@ -931,7 +931,7 @@ void tst_QFileDialog2::task251341_sideBarRemoveEntries()
     QCOMPARE(qvariant_cast<bool>(value), false);
 
     MyQSideBar mySideBar;
-    mySideBar.init(model, urls);
+    mySideBar.setModelAndUrls(model, urls);
     mySideBar.show();
     mySideBar.selectUrl(QUrl::fromLocalFile(testSubDir.absolutePath()));
     QTest::qWait(1000);
diff --git a/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp b/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp
index bb4c671d43..842f0e6022 100644
--- a/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp
+++ b/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp
@@ -84,7 +84,7 @@ void tst_QSidebar::setUrls()
     QList<QUrl> urls;
     QFileSystemModel fsmodel;
     QSidebar qsidebar;
-    qsidebar.init(&fsmodel, urls);
+    qsidebar.setModelAndUrls(&fsmodel, urls);
     QAbstractItemModel *model = qsidebar.model();
 
     urls << QUrl::fromLocalFile(QDir::rootPath())
@@ -105,7 +105,7 @@ void tst_QSidebar::selectUrls()
          << QUrl::fromLocalFile(QDir::temp().absolutePath());
     QFileSystemModel fsmodel;
     QSidebar qsidebar;
-    qsidebar.init(&fsmodel, urls);
+    qsidebar.setModelAndUrls(&fsmodel, urls);
 
     QSignalSpy spy(&qsidebar, SIGNAL(goToUrl(const QUrl &)));
     qsidebar.selectUrl(urls.at(0));
@@ -117,7 +117,7 @@ void tst_QSidebar::addUrls()
     QList<QUrl> emptyUrls;
     QFileSystemModel fsmodel;
     QSidebar qsidebar;
-    qsidebar.init(&fsmodel, emptyUrls);
+    qsidebar.setModelAndUrls(&fsmodel, emptyUrls);
     QAbstractItemModel *model = qsidebar.model();
     QDir testDir = QDir::home();
 
@@ -214,7 +214,7 @@ void tst_QSidebar::goToUrl()
          << QUrl::fromLocalFile(QDir::temp().absolutePath());
     QFileSystemModel fsmodel;
     QSidebar qsidebar;
-    qsidebar.init(&fsmodel, urls);
+    qsidebar.setModelAndUrls(&fsmodel, urls);
     qsidebar.show();
 
     QSignalSpy spy(&qsidebar, SIGNAL(goToUrl(const QUrl &)));