From 49babe02f0a00fe2baff3950fbdcb725ce20d772 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Tue, 17 May 2011 13:43:30 +1000
Subject: Remove autotest code for Qt3Support library.

This commit deals with the simple cases -- mostly just removing blocks
of code enclosed in #ifdef QT3_SUPPORT.  Later commits will deal with
the trickier cases.

Change-Id: I280dea25b3754be175efe62fc7e5e4e7c304e658
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
---
 tests/auto/qdir/tst_qdir.cpp | 65 --------------------------------------------
 1 file changed, 65 deletions(-)

(limited to 'tests/auto/qdir')

diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp
index 8112814e35..bc5c6872ee 100644
--- a/tests/auto/qdir/tst_qdir.cpp
+++ b/tests/auto/qdir/tst_qdir.cpp
@@ -158,9 +158,6 @@ private slots:
     void operator_eq();
 
     void dotAndDotDot();
-#ifdef QT3_SUPPORT
-    void matchAllDirs();
-#endif
     void homePath();
     void tempPath();
     void rootPath();
@@ -193,10 +190,6 @@ private slots:
 
     void arrayOperator();
 
-#ifdef QT3_SUPPORT
-    void setNameFilter();
-#endif
-
     void equalityOperator_data();
     void equalityOperator();
 
@@ -553,17 +546,6 @@ void tst_QDir::entryList_data()
     QTest::newRow("QDir::AllDirs | QDir::NoSymLinks") << SRCDIR "entrylist/" << QStringList("*")
                                                       << int(QDir::AllDirs | QDir::NoSymLinks) << int(QDir::Name)
                                                       << filterLinks(QString(".,..,directory").split(','));
-#ifdef QT3_SUPPORT
-    QTest::newRow("QDir::All | QDir::Hidden | QDir::System") << SRCDIR "entrylist/" << QStringList("*")
-                                  << int(QDir::All | QDir::Hidden | QDir::System) << int(QDir::Name)
-                                  << filterLinks(QString(".,..,brokenlink.lnk,directory,file,linktodirectory.lnk,linktofile.lnk,writable").split(','));
-    QTest::newRow("QDir::All | QDir::Readable") << SRCDIR "entrylist/" << QStringList("*")
-                                  << int(QDir::All | QDir::Readable) << int(QDir::Name)
-                                                << filterLinks(QString(".,..,directory,file,linktodirectory.lnk,linktofile.lnk,writable").split(','));
-    QTest::newRow("QDir::All | QDir::Writable") << SRCDIR "entrylist/" << QStringList("*")
-                                  << int(QDir::All | QDir::Writable) << int(QDir::Name)
-                                  << filterLinks(QString(".,..,directory,linktodirectory.lnk,writable").split(','));
-#else
     QTest::newRow("QDir::AllEntries | QDir::Hidden | QDir::System") << SRCDIR "entrylist/" << QStringList("*")
                                   << int(QDir::AllEntries | QDir::Hidden | QDir::System) << int(QDir::Name)
                                   << filterLinks(QString(".,..,brokenlink.lnk,directory,file,linktodirectory.lnk,linktofile.lnk,writable").split(','));
@@ -573,7 +555,6 @@ void tst_QDir::entryList_data()
     QTest::newRow("QDir::AllEntries | QDir::Writable") << SRCDIR "entrylist/" << QStringList("*")
                                   << int(QDir::AllEntries | QDir::Writable) << int(QDir::Name)
                                   << filterLinks(QString(".,..,directory,linktodirectory.lnk,writable").split(','));
-#endif
     QTest::newRow("QDir::Files | QDir::Readable") << SRCDIR "entrylist/" << QStringList("*")
                                   << int(QDir::Files | QDir::Readable) << int(QDir::Name)
                                   << filterLinks(QString("file,linktofile.lnk,writable").split(','));
@@ -1346,26 +1327,6 @@ void tst_QDir::dotAndDotDot()
 #endif
 }
 
-#ifdef QT3_SUPPORT
-/*
-    Tets that the setMatchAllDirs setting survies a call to setFilter.
-*/
-void tst_QDir::matchAllDirs()
-{
-    QDir dir("/");
-    dir.setMatchAllDirs(true);
-    dir.setNameFilters(QStringList() << "*.foo");
-    dir.setFilter(QDir::Hidden);
-    QVERIFY(dir.matchAllDirs());
-    QVERIFY(dir.entryList().count() > 0);
-    dir.setMatchAllDirs(false);
-    dir.setFilter(QDir::Hidden);
-    QVERIFY(dir.matchAllDirs() == false);
-    QCOMPARE(dir.entryList().count(), 0);
-
-}
-#endif
-
 void tst_QDir::homePath()
 {
     QDir homeDir = QDir::home();
@@ -1890,32 +1851,6 @@ void tst_QDir::arrayOperator()
     }
 }
 
-#ifdef QT3_SUPPORT
-void tst_QDir::setNameFilter()
-{
-    QStringList filters;
-    filters << "*.jpg" << "*.png" << "*.gif";
-    QStringList filters2;
-    filters2 << "*.cpp" << "*.h" << "*.c";
-
-    QDir dir(SRCDIR "entrylist/");
-
-    dir.setNameFilter(filters.join(";"));
-    QCOMPARE(filters, dir.nameFilters());
-    QCOMPARE(filters, dir.nameFilter().split(';'));
-
-    dir.setNameFilters(filters2);
-    QCOMPARE(filters2, dir.nameFilter().split(';'));
-
-    dir.setNameFilter(filters.join(" "));
-    QCOMPARE(filters, dir.nameFilters());
-    QCOMPARE(filters, dir.nameFilter().split(' '));
-
-    dir.setNameFilters(filters2);
-    QCOMPARE(filters2, dir.nameFilter().split(' '));
-}
-#endif
-
 void tst_QDir::equalityOperator_data()
 {
     QTest::addColumn<QString>("leftPath");
-- 
cgit v1.2.3