Remove many deprecated methods

Remove methods that have been marked as deprecated
before Qt 4.6. Keep others, but inline them
where possible and mark them as QT_DEPRECATED_SINCE(5, 0).

Change-Id: If881821ae095f054b31cc13464f19e2007c20ed7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>

3 files changed, 33 insertions, 35 deletions

diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index 753b47dabf..14c2be5bd8 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -329,8 +329,8 @@ void tst_QFiledialog::filterSelectedSignal()
     filterChoices << "Image files (*.png *.xpm *.jpg)"
                   << "Text files (*.txt)"
                   << "Any files (*.*)";
-    fd.setFilters(filterChoices);
-    QCOMPARE(fd.filters(), filterChoices);
+    fd.setNameFilters(filterChoices);
+    QCOMPARE(fd.nameFilters(), filterChoices);
 
     QComboBox *filters = qFindChild<QComboBox*>(&fd, "fileTypeCombo");
     QVERIFY(filters);
@@ -354,7 +354,7 @@ void tst_QFiledialog::args()
 #ifndef Q_OS_WIN
     QCOMPARE(fd.directory(), QDir(directory));
 #endif
-    QCOMPARE(fd.filters(), QStringList(filter));
+    QCOMPARE(fd.nameFilters(), QStringList(filter));
 }
 
 void tst_QFiledialog::directory()
@@ -648,7 +648,7 @@ void tst_QFiledialog::filters()
     QSignalSpy spyDirectoryEntered(&fd, SIGNAL(directoryEntered(const QString &)));
     QSignalSpy spyFilesSelected(&fd, SIGNAL(filesSelected(const QStringList &)));
     QSignalSpy spyFilterSelected(&fd, SIGNAL(filterSelected(const QString &)));
-    QCOMPARE(fd.filters(), QStringList("All Files (*)"));
+    QCOMPARE(fd.nameFilters(), QStringList("All Files (*)"));
 
     // effects
     QList<QComboBox*> views = qFindChildren<QComboBox*>(&fd, "fileTypeCombo");
@@ -659,14 +659,14 @@ void tst_QFiledialog::filters()
     filters << "Image files (*.png *.xpm *.jpg)"
          << "Text files (*.txt)"
          << "Any files (*.*)";
-    fd.setFilters(filters);
+    fd.setNameFilters(filters);
     QCOMPARE(views.at(0)->isVisible(), false);
     fd.show();
     fd.setAcceptMode(QFileDialog::AcceptSave);
     QCOMPARE(views.at(0)->isVisible(), true);
-    QCOMPARE(fd.filters(), filters);
-    fd.setFilter("Image files (*.png *.xpm *.jpg);;Text files (*.txt);;Any files (*.*)");
-    QCOMPARE(fd.filters(), filters);
+    QCOMPARE(fd.nameFilters(), filters);
+    fd.setNameFilter("Image files (*.png *.xpm *.jpg);;Text files (*.txt);;Any files (*.*)");
+    QCOMPARE(fd.nameFilters(), filters);
     QCOMPARE(spyCurrentChanged.count(), 0);
     QCOMPARE(spyDirectoryEntered.count(), 0);
     QCOMPARE(spyFilesSelected.count(), 0);
@@ -682,38 +682,38 @@ void tst_QFiledialog::filters()
     QStringList expected;
     expected << "C++ Source Files(*.cpp)";
     expected << "Any(*.*)";
-    fd2.setFilter("C++ Source Files(*.cpp);;Any(*.*)");
-    QCOMPARE(expected, fd2.filters());
-    fd2.setFilter("C++ Source Files(*.cpp) ;;Any(*.*)");
-    QCOMPARE(expected, fd2.filters());
-    fd2.setFilter("C++ Source Files(*.cpp);; Any(*.*)");
-    QCOMPARE(expected, fd2.filters());
-    fd2.setFilter(" C++ Source Files(*.cpp);; Any(*.*)");
-    QCOMPARE(expected, fd2.filters());
-    fd2.setFilter("C++ Source Files(*.cpp) ;; Any(*.*)");
-    QCOMPARE(expected, fd2.filters());
+    fd2.setNameFilter("C++ Source Files(*.cpp);;Any(*.*)");
+    QCOMPARE(expected, fd2.nameFilters());
+    fd2.setNameFilter("C++ Source Files(*.cpp) ;;Any(*.*)");
+    QCOMPARE(expected, fd2.nameFilters());
+    fd2.setNameFilter("C++ Source Files(*.cpp);; Any(*.*)");
+    QCOMPARE(expected, fd2.nameFilters());
+    fd2.setNameFilter(" C++ Source Files(*.cpp);; Any(*.*)");
+    QCOMPARE(expected, fd2.nameFilters());
+    fd2.setNameFilter("C++ Source Files(*.cpp) ;; Any(*.*)");
+    QCOMPARE(expected, fd2.nameFilters());
 }
 
 void tst_QFiledialog::selectFilter()
 {
     QNonNativeFileDialog fd;
     QSignalSpy spyFilterSelected(&fd, SIGNAL(filterSelected(const QString &)));
-    QCOMPARE(fd.selectedFilter(), QString("All Files (*)"));
+    QCOMPARE(fd.selectedNameFilter(), QString("All Files (*)"));
     QStringList filters;
     filters << "Image files (*.png *.xpm *.jpg)"
          << "Text files (*.txt)"
          << "Any files (*.*)";
-    fd.setFilters(filters);
-    QCOMPARE(fd.selectedFilter(), filters.at(0));
-    fd.selectFilter(filters.at(1));
-    QCOMPARE(fd.selectedFilter(), filters.at(1));
-    fd.selectFilter(filters.at(2));
-    QCOMPARE(fd.selectedFilter(), filters.at(2));
-
-    fd.selectFilter("bob");
-    QCOMPARE(fd.selectedFilter(), filters.at(2));
-    fd.selectFilter("");
-    QCOMPARE(fd.selectedFilter(), filters.at(2));
+    fd.setNameFilters(filters);
+    QCOMPARE(fd.selectedNameFilter(), filters.at(0));
+    fd.selectNameFilter(filters.at(1));
+    QCOMPARE(fd.selectedNameFilter(), filters.at(1));
+    fd.selectNameFilter(filters.at(2));
+    QCOMPARE(fd.selectedNameFilter(), filters.at(2));
+
+    fd.selectNameFilter("bob");
+    QCOMPARE(fd.selectedNameFilter(), filters.at(2));
+    fd.selectNameFilter("");
+    QCOMPARE(fd.selectedNameFilter(), filters.at(2));
     QCOMPARE(spyFilterSelected.count(), 0);
 }
 
@@ -1004,8 +1004,8 @@ void tst_QFiledialog::proxymodel()
 void tst_QFiledialog::setNameFilter()
 {
     QNonNativeFileDialog fd;
-    fd.setFilter(QString());
-    fd.setFilters(QStringList());
+    fd.setNameFilter(QString());
+    fd.setNameFilters(QStringList());
 }
 
 void tst_QFiledialog::focus()
diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
index 9e0c6c6dbd..472469e797 100644
--- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
@@ -266,7 +266,7 @@ void tst_QFileDialog2::showNameFilterDetails()
     filterChoices << "Image files (*.png *.xpm *.jpg)"
                   << "Text files (*.txt)"
                   << "Any files (*.*)";
-    fd.setFilters(filterChoices);
+    fd.setNameFilters(filterChoices);
 
     fd.setNameFilterDetailsVisible(false);
     QCOMPARE(filters->itemText(0), QString("Image files"));
diff --git a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
index 2ec6a566f9..9e965ff235 100644
--- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
+++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
@@ -141,8 +141,6 @@ private:
 
 tst_QMessageBox::tst_QMessageBox() : keyToSend(-1)
 {
-    int argc = qApp->argc();
-    QT_REQUIRE_VERSION(argc, qApp->argv(), "4.6.2")
 }
 
 int tst_QMessageBox::exec(QMessageBox *msgBox, int key)