diff options
-rw-r--r-- | tests/auto/lancelot/scripts/sizes.qps | 60 | ||||
-rw-r--r-- | tests/auto/maketestselftest/tst_maketestselftest.cpp | 1 | ||||
-rw-r--r-- | tests/auto/qalgorithms/q3tl.h | 212 | ||||
-rw-r--r-- | tests/auto/qalgorithms/tst_qalgorithms.cpp | 178 | ||||
-rw-r--r-- | tests/auto/qmessagebox/qmessagebox.pro | 3 |
5 files changed, 2 insertions, 452 deletions
diff --git a/tests/auto/lancelot/scripts/sizes.qps b/tests/auto/lancelot/scripts/sizes.qps index 268808ec09..68e01c3262 100644 --- a/tests/auto/lancelot/scripts/sizes.qps +++ b/tests/auto/lancelot/scripts/sizes.qps @@ -17,16 +17,6 @@ drawRect 120 0 16 16 drawRect 140 0 17 17 drawRect 160 0 18 18 drawRect 180 0 19 19 -# qt3_drawRect 200 0 10 10 -# qt3_drawRect 220 0 11 11 -# qt3_drawRect 240 0 12 12 -# qt3_drawRect 260 0 13 13 -# qt3_drawRect 280 0 14 14 -# qt3_drawRect 300 0 15 15 -# qt3_drawRect 320 0 16 16 -# qt3_drawRect 340 0 17 17 -# qt3_drawRect 360 0 18 18 -# qt3_drawRect 380 0 19 19 drawEllipse 0 20 10 10 drawEllipse 20 20 11 11 @@ -38,16 +28,6 @@ drawEllipse 120 20 16 16 drawEllipse 140 20 17 17 drawEllipse 160 20 18 18 drawEllipse 180 20 19 19 -# qt3_drawEllipse 200 20 10 10 -# qt3_drawEllipse 220 20 11 11 -# qt3_drawEllipse 240 20 12 12 -# qt3_drawEllipse 260 20 13 13 -# qt3_drawEllipse 280 20 14 14 -# qt3_drawEllipse 300 20 15 15 -# qt3_drawEllipse 320 20 16 16 -# qt3_drawEllipse 340 20 17 17 -# qt3_drawEllipse 360 20 18 18 -# qt3_drawEllipse 380 20 19 19 drawRoundRect 0 40 10 10 drawRoundRect 20 40 11 11 @@ -59,16 +39,6 @@ drawRoundRect 120 40 16 16 drawRoundRect 140 40 17 17 drawRoundRect 160 40 18 18 drawRoundRect 180 40 19 19 -# qt3_drawRoundRect 200 40 10 10 -# qt3_drawRoundRect 220 40 11 11 -# qt3_drawRoundRect 240 40 12 12 -# qt3_drawRoundRect 260 40 13 13 -# qt3_drawRoundRect 280 40 14 14 -# qt3_drawRoundRect 300 40 15 15 -# qt3_drawRoundRect 320 40 16 16 -# qt3_drawRoundRect 340 40 17 17 -# qt3_drawRoundRect 360 40 18 18 -# qt3_drawRoundRect 380 40 19 19 drawPie 0 60 10 10 0 4320 drawPie 20 60 11 11 0 4320 @@ -80,16 +50,6 @@ drawPie 120 60 16 16 0 4320 drawPie 140 60 17 17 0 4320 drawPie 160 60 18 18 0 4320 drawPie 180 60 19 19 0 4320 -# qt3_drawPie 200 60 10 10 0 4320 -# qt3_drawPie 220 60 11 11 0 4320 -# qt3_drawPie 240 60 12 12 0 4320 -# qt3_drawPie 260 60 13 13 0 4320 -# qt3_drawPie 280 60 14 14 0 4320 -# qt3_drawPie 300 60 15 15 0 4320 -# qt3_drawPie 320 60 16 16 0 4320 -# qt3_drawPie 340 60 17 17 0 4320 -# qt3_drawPie 360 60 18 18 0 4320 -# qt3_drawPie 380 60 19 19 0 4320 drawArc 0 80 10 10 0 4320 drawArc 20 80 11 11 0 4320 @@ -101,16 +61,6 @@ drawArc 120 80 16 16 0 4320 drawArc 140 80 17 17 0 4320 drawArc 160 80 18 18 0 4320 drawArc 180 80 19 19 0 4320 -# qt3_drawArc 200 80 10 10 0 4320 -# qt3_drawArc 220 80 11 11 0 4320 -# qt3_drawArc 240 80 12 12 0 4320 -# qt3_drawArc 260 80 13 13 0 4320 -# qt3_drawArc 280 80 14 14 0 4320 -# qt3_drawArc 300 80 15 15 0 4320 -# qt3_drawArc 320 80 16 16 0 4320 -# qt3_drawArc 340 80 17 17 0 4320 -# qt3_drawArc 360 80 18 18 0 4320 -# qt3_drawArc 380 80 19 19 0 4320 drawChord 0 100 10 10 0 4320 drawChord 20 100 11 11 0 4320 @@ -122,16 +72,6 @@ drawChord 120 100 16 16 0 4320 drawChord 140 100 17 17 0 4320 drawChord 160 100 18 18 0 4320 drawChord 180 100 19 19 0 4320 -# qt3_drawChord 200 100 10 10 0 4320 -# qt3_drawChord 220 100 11 11 0 4320 -# qt3_drawChord 240 100 12 12 0 4320 -# qt3_drawChord 260 100 13 13 0 4320 -# qt3_drawChord 280 100 14 14 0 4320 -# qt3_drawChord 300 100 15 15 0 4320 -# qt3_drawChord 320 100 16 16 0 4320 -# qt3_drawChord 340 100 17 17 0 4320 -# qt3_drawChord 360 100 18 18 0 4320 -# qt3_drawChord 380 100 19 19 0 4320 end_block diff --git a/tests/auto/maketestselftest/tst_maketestselftest.cpp b/tests/auto/maketestselftest/tst_maketestselftest.cpp index 9fbfd5a2c6..7069fdf3eb 100644 --- a/tests/auto/maketestselftest/tst_maketestselftest.cpp +++ b/tests/auto/maketestselftest/tst_maketestselftest.cpp @@ -348,7 +348,6 @@ QStringList tst_MakeTestSelfTest::find_subdirs(QString const& pro_file, FindSubd << "QT_CONFIG+=phonon" << "QT_CONFIG+=private_tests" << "QT_CONFIG+=pulseaudio" - << "QT_CONFIG+=qt3support" << "QT_CONFIG+=script" << "QT_CONFIG+=svg" << "QT_CONFIG+=webkit" diff --git a/tests/auto/qalgorithms/q3tl.h b/tests/auto/qalgorithms/q3tl.h deleted file mode 100644 index c856cbf533..0000000000 --- a/tests/auto/qalgorithms/q3tl.h +++ /dev/null @@ -1,212 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt3Support module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef Q3TL_H -#define Q3TL_H - -#include <QtCore/qalgorithms.h> - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Qt3SupportLight) - -template <typename T, typename LessThan> -Q_OUTOFLINE_TEMPLATE void qHeapSortPushDown(T *heap, int first, int last, LessThan lessThan) -{ - int r = first; - while (r <= last / 2) { - if (last == 2 * r) { - // node r has only one child - if (lessThan(heap[2 * r], heap[r])) - qSwap(heap[r], heap[2 * r]); - r = last; - } else { - // node r has two children - if (lessThan(heap[2 * r], heap[r]) && !lessThan(heap[2 * r + 1], heap[2 * r])) { - // swap with left child - qSwap(heap[r], heap[2 * r]); - r *= 2; - } else if (lessThan(heap[2 * r + 1], heap[r]) - && lessThan(heap[2 * r + 1], heap[2 * r])) { - // swap with right child - qSwap(heap[r], heap[2 * r + 1]); - r = 2 * r + 1; - } else { - r = last; - } - } - } -} - -template <typename BiIterator, typename T, typename LessThan> -Q_OUTOFLINE_TEMPLATE void qHeapSortHelper(BiIterator begin, BiIterator end, const T & /* dummy */, LessThan lessThan) -{ - BiIterator it = begin; - uint n = 0; - while (it != end) { - ++n; - ++it; - } - if (n == 0) - return; - - // Create the heap - BiIterator insert = begin; - T *realheap = new T[n]; - T *heap = realheap - 1; - int size = 0; - for(; insert != end; ++insert) { - heap[++size] = *insert; - int i = size; - while (i > 1 && lessThan(heap[i], heap[i / 2])) { - qSwap(heap[i], heap[i / 2]); - i /= 2; - } - } - - // Now do the sorting - for (int i = n; i > 0; i--) { - *begin++ = heap[1]; - if (i > 1) { - heap[1] = heap[i]; - qHeapSortPushDown(heap, 1, i - 1, lessThan); - } - } - - delete[] realheap; -} - -template <typename BiIterator, typename T> -inline void qHeapSortHelper(BiIterator begin, BiIterator end, const T &dummy) -{ - qHeapSortHelper(begin, end, dummy, qLess<T>()); -} - -template <typename BiIterator, typename LessThan> -inline void qHeapSort(BiIterator begin, BiIterator end, LessThan lessThan) -{ - if (begin != end) - qHeapSortHelper(begin, end, *begin, lessThan); -} - -template <typename BiIterator> -inline void qHeapSort(BiIterator begin, BiIterator end) -{ - if (begin != end) - qHeapSortHelper(begin, end, *begin); -} - -template <typename Container> -inline void qHeapSort(Container &c) -{ -#ifdef Q_CC_BOR - // Work around Borland 5.5 optimizer bug - c.detach(); -#endif - if (!c.empty()) - qHeapSortHelper(c.begin(), c.end(), *c.begin()); -} - - -template <typename BiIterator, typename LessThan> -void qBubbleSort(BiIterator begin, BiIterator end, LessThan lessThan) -{ - // Goto last element; - BiIterator last = end; - - // empty list - if (begin == end) - return; - - --last; - // only one element ? - if (last == begin) - return; - - // So we have at least two elements in here - while (begin != last) { - bool swapped = false; - BiIterator swapPos = begin; - BiIterator x = end; - BiIterator y = x; - y--; - do { - --x; - --y; - if (lessThan(*x, *y)) { - swapped = true; - qSwap(*x, *y); - swapPos = y; - } - } while (y != begin); - if (!swapped) - return; - begin = swapPos; - ++begin; - } -} - -template <typename BiIterator, typename T> -void qBubbleSortHelper(BiIterator begin, BiIterator end, T) -{ - qBubbleSort(begin, end, qLess<T>()); -} - -template <typename BiIterator> -void qBubbleSort(BiIterator begin, BiIterator end) -{ - if (begin != end) - qBubbleSortHelper(begin, end, *begin); -} - -template <typename Container> -inline void qBubbleSort(Container &c) -{ - qBubbleSort(c.begin(), c.end()); -} - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // Q3TL_H diff --git a/tests/auto/qalgorithms/tst_qalgorithms.cpp b/tests/auto/qalgorithms/tst_qalgorithms.cpp index f14ba1f140..75df1fea79 100644 --- a/tests/auto/qalgorithms/tst_qalgorithms.cpp +++ b/tests/auto/qalgorithms/tst_qalgorithms.cpp @@ -47,7 +47,6 @@ #include <sstream> #include <algorithm> #include <qalgorithms.h> -#include "q3tl.h" #include <QStringList> #include <QString> #include <QVector> @@ -71,8 +70,6 @@ public slots: void cleanup(); private slots: - void qBubbleSort(); - void qHeapSort(); void test_qLowerBound_data(); void test_qLowerBound(); void test_qUpperBound_data(); @@ -100,13 +97,11 @@ private: }; tst_QAlgorithms::tst_QAlgorithms() - { } tst_QAlgorithms::~tst_QAlgorithms() { - } void tst_QAlgorithms::init() @@ -267,149 +262,6 @@ void testAlgorithm(Algorithm algorithm, QStringList &dataSetTypes) } } #endif -static bool userFunction1(char ch1, char ch2) -{ - return (ch1 ^ 1) < (ch2 ^ 1); -} - -bool userFunction2(const char &ch1, char ch2) -{ - return (ch1 ^ 1) < (ch2 ^ 1); -} - -static inline bool userFunction3(char ch1, const char &ch2) -{ - return (ch1 ^ 1) < (ch2 ^ 1); -} - -inline bool userFunction4(const char &ch1, const char &ch2) -{ - return (ch1 ^ 1) < (ch2 ^ 1); -} - -class UserFunctor1 -{ -public: - UserFunctor1(int x = 1) : y(x) {} - - bool operator()(char ch1, char ch2) - { - return (ch1 ^ y) < (ch2 ^ y); - } - - char y; -}; - -void tst_QAlgorithms::qHeapSort() -{ - char array1[] = "3141592"; - ::qHeapSort((char *)array1, array1 + strlen(array1)); - QVERIFY(strcmp(array1, "1123459") == 0); - - ::qHeapSort((char *)array1, array1 + strlen(array1), qGreater<char>()); - QVERIFY(strcmp(array1, "9543211") == 0); - - ::qHeapSort((char *)array1, array1 + strlen(array1), qLess<char>()); - QVERIFY(strcmp(array1, "1123459") == 0); - { - char array2[] = "0123456789@ABCDE"; - ::qHeapSort((char *)array2, array2 + strlen(array2), userFunction1); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - } - - { - char array2[] = "0123456789@ABCDE"; - ::qHeapSort((char *)array2, array2 + strlen(array2), userFunction2); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - } - - { - char array2[] = "0123456789@ABCDE"; - ::qHeapSort((char *)array2, array2 + strlen(array2), userFunction3); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - } - - { - char array2[] = "0123456789@ABCDE"; - ::qHeapSort((char *)array2, array2 + strlen(array2), userFunction4); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - } - - { - UserFunctor1 userFunctor1; - char array2[] = "0123456789@ABCDE"; - ::qHeapSort((char *)array2, array2 + strlen(array2), userFunctor1); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - } - - { - char array2[] = "0123456789@ABCDE"; - ::qHeapSort((char *)array2, array2 + strlen(array2), UserFunctor1()); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - ::qHeapSort((char *)array2, array2 + strlen(array2), UserFunctor1(1)); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - ::qHeapSort((char *)array2, array2 + strlen(array2), UserFunctor1(3)); - QVERIFY(strcmp(array2, "3210765498CBA@ED") == 0); - ::qHeapSort((char *)array2, array2 + strlen(array2), UserFunctor1(0)); - QVERIFY(strcmp(array2, "0123456789@ABCDE") == 0); - } -} - -void tst_QAlgorithms::qBubbleSort() -{ - char array1[] = "3141592"; - ::qBubbleSort((char *)array1, array1 + strlen(array1)); - QVERIFY(strcmp(array1, "1123459") == 0); - - ::qBubbleSort((char *)array1, array1 + strlen(array1), qGreater<char>()); - QVERIFY(strcmp(array1, "9543211") == 0); - - ::qBubbleSort((char *)array1, array1 + strlen(array1), qLess<char>()); - QVERIFY(strcmp(array1, "1123459") == 0); - - { - char array2[] = "0123456789@ABCDE"; - ::qBubbleSort((char *)array2, array2 + strlen(array2), userFunction1); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - } - - { - char array2[] = "0123456789@ABCDE"; - ::qBubbleSort((char *)array2, array2 + strlen(array2), userFunction2); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - } - - { - char array2[] = "0123456789@ABCDE"; - ::qBubbleSort((char *)array2, array2 + strlen(array2), userFunction3); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - } - - { - char array2[] = "0123456789@ABCDE"; - ::qBubbleSort((char *)array2, array2 + strlen(array2), userFunction4); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - } - - { - UserFunctor1 userFunctor1; - char array2[] = "0123456789@ABCDE"; - ::qBubbleSort((char *)array2, array2 + strlen(array2), userFunctor1); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - } - - { - char array2[] = "0123456789@ABCDE"; - ::qBubbleSort((char *)array2, array2 + strlen(array2), UserFunctor1()); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - ::qBubbleSort((char *)array2, array2 + strlen(array2), UserFunctor1(1)); - QVERIFY(strcmp(array2, "1032547698A@CBED") == 0); - ::qBubbleSort((char *)array2, array2 + strlen(array2), UserFunctor1(3)); - QVERIFY(strcmp(array2, "3210765498CBA@ED") == 0); - ::qBubbleSort((char *)array2, array2 + strlen(array2), UserFunctor1(0)); - QVERIFY(strcmp(array2, "0123456789@ABCDE") == 0); - } -} void tst_QAlgorithms::swap() { @@ -558,7 +410,7 @@ void tst_QAlgorithms::sortedList() QList<int> list; list << 4 << 3 << 6; - ::qHeapSort(list.begin(), list.end()); + ::qSort(list.begin(), list.end()); QCOMPARE(list.count(), 3); QCOMPARE(list.at(0), 3); @@ -879,26 +731,6 @@ void tst_QAlgorithms::convenienceAPI() } template <typename DataType> -class HeapSortHelper -{ -public: - void operator()(QVector<DataType> list) - { - ::qHeapSort(list); - } -}; - -template <typename DataType> -class BubbleSortHelper -{ -public: - void operator()(QVector<DataType> list) - { - ::qBubbleSort(list); - } -}; - -template <typename DataType> class QuickSortHelper { public: @@ -949,22 +781,14 @@ void tst_QAlgorithms::performance() testAlgorithm<StlSortHelper<TestInt>, TestInt>(StlSortHelper<TestInt>(), dataSetTypes); cout << endl << "std::stable_sort" << endl; testAlgorithm<StlStableSortHelper<TestInt>, TestInt>(StlStableSortHelper<TestInt>(), dataSetTypes); - cout << "Heap sort" << endl; - testAlgorithm<HeapSortHelper<TestInt>, TestInt>(HeapSortHelper<TestInt>(), dataSetTypes); - cout << endl << "Bubble sort" << endl; - testAlgorithm<BubbleSortHelper<TestInt>, TestInt>(BubbleSortHelper<TestInt>(), dataSetTypes); /* cout << endl << "Sorting lists of ints" << endl; - cout << "Heap sort" << endl; - testAlgorithm<HeapSortHelper<int>, int>(HeapSortHelper<int>(), dataSetTypes); cout << endl << "Quick sort" << endl; testAlgorithm<QuickSortHelper<int>, int>(QuickSortHelper<int>(), dataSetTypes); cout << endl << "std::sort" << endl; testAlgorithm<StlSortHelper<int>, int>(StlSortHelper<int>(), dataSetTypes); cout << endl << "std::stable_sort" << endl; testAlgorithm<StlStableSortHelper<int>, int>(StlStableSortHelper<int>(), dataSetTypes); - cout << endl << "Bubble sort" << endl; - testAlgorithm<BubbleSortHelper<int>, int>(BubbleSortHelper<int>(), dataSetTypes); */ } #endif diff --git a/tests/auto/qmessagebox/qmessagebox.pro b/tests/auto/qmessagebox/qmessagebox.pro index 8eeac774e9..9fa1738a79 100644 --- a/tests/auto/qmessagebox/qmessagebox.pro +++ b/tests/auto/qmessagebox/qmessagebox.pro @@ -7,8 +7,7 @@ TARGET = tst_qmessagebox DEPENDPATH += . INCLUDEPATH += . -CONFIG += console qtestlib qt3support -wince*: CONFIG -= qt3support +CONFIG += console qtestlib # Input SOURCES += tst_qmessagebox.cpp |