diff options
Diffstat (limited to 'tests')
1202 files changed, 1764 insertions, 17592 deletions
diff --git a/tests/arthur/common/common.pro b/tests/arthur/common/common.pro index 9510f87f06..2a1f8f04fb 100644 --- a/tests/arthur/common/common.pro +++ b/tests/arthur/common/common.pro @@ -6,7 +6,7 @@ #include(../arthurtester.pri) #TEMPLATE = lib #CONFIG += static -#QT += xml opengl svg qt3support +#QT += xml opengl svg #build_all:!build_pass { # CONFIG -= build_all diff --git a/tests/arthur/common/paintcommands.cpp b/tests/arthur/common/paintcommands.cpp index 9273142905..a6762082cb 100644 --- a/tests/arthur/common/paintcommands.cpp +++ b/tests/arthur/common/paintcommands.cpp @@ -49,10 +49,6 @@ #include <qtextlayout.h> #include <qdebug.h> -#ifdef QT3_SUPPORT -#include <q3painter.h> -#endif - #ifndef QT_NO_OPENGL #include <qglpixelbuffer.h> #endif @@ -364,33 +360,6 @@ void PaintCommands::staticInit() "^gradient_setCoordinateMode\\s+(\\w*)$", "gradient_setCoordinateMode <coordinate method enum>", "gradient_setCoordinateMode ObjectBoundingMode"); -#ifdef QT3_SUPPORT - DECL_PAINTCOMMANDSECTION("qt3 drawing ops"); - DECL_PAINTCOMMAND("qt3_drawArc", command_qt3_drawArc, - "^qt3_drawArc\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)$", - "qt3_drawArc <x> <y> <w> <h> <angleStart> <angleArc>\n - angles are expressed in 1/16th of degree", - "qt3_drawArc 10 10 20 20 0 5760"); - DECL_PAINTCOMMAND("qt3_drawChord", command_qt3_drawChord, - "^qt3_drawChord\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)$", - "qt3_drawChord <x> <y> <w> <h> <angleStart> <angleArc>\n - angles are expressed in 1/16th of degree", - "qt3_drawChord 10 10 20 20 0 5760"); - DECL_PAINTCOMMAND("qt3_drawEllipse", command_qt3_drawEllipse, - "^qt3_drawEllipse\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)$", - "qt3_drawEllipse <x> <y> <w> <h>", - "qt3_drawEllipse 10 10 20 20"); - DECL_PAINTCOMMAND("qt3_drawPie", command_qt3_drawPie, - "^qt3_drawPie\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)$", - "qt3_drawPie <x> <y> <w> <h> <angleStart> <angleArc>\n - angles are expressed in 1/16th of degree", - "qt3_drawPie 10 10 20 20 0 5760"); - DECL_PAINTCOMMAND("qt3_drawRect", command_qt3_drawRect, - "^qt3_drawRect\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)$", - "qt3_drawRect <x> <y> <w> <h>", - "qt3_drawRect 10 10 20 20"); - DECL_PAINTCOMMAND("qt3_drawRoundRect", command_qt3_drawRoundRect, - "^qt3_drawRoundRect\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s*(-?\\w)?\\s*(-?\\w)?$", - "qt3_drawRoundRect <x> <y> <w> <h> [rx] [ry]", - "qt3_drawRoundRect 10 10 20 20 3 3"); -#endif DECL_PAINTCOMMANDSECTION("drawing ops"); DECL_PAINTCOMMAND("drawPoint", command_drawPoint, "^drawPoint\\s+(-?[\\w.]*)\\s+(-?[\\w.]*)$", @@ -1271,123 +1240,6 @@ void PaintCommands::command_drawArc(QRegExp re) m_painter->drawArc(x, y, w, h, angle, sweep); } -#ifdef QT3_SUPPORT -/***************************************************************************************************/ -void PaintCommands::command_qt3_drawRect(QRegExp re) -{ - Q_UNUSED(re); -#ifdef QT3_SUPPORT - QStringList caps = re.capturedTexts(); - int x = convertToInt(caps.at(1)); - int y = convertToInt(caps.at(2)); - int w = convertToInt(caps.at(3)); - int h = convertToInt(caps.at(4)); - - if (m_verboseMode) - printf(" -(lance) qt3_drawRect(%d, %d, %d, %d)\n", x, y, w, h); - - static_cast<Q3Painter*>(m_painter)->drawRect(x, y, w, h); -#endif -} - -/***************************************************************************************************/ -void PaintCommands::command_qt3_drawRoundRect(QRegExp re) -{ - Q_UNUSED(re); -#ifdef QT3_SUPPORT - QStringList caps = re.capturedTexts(); - int x = convertToInt(caps.at(1)); - int y = convertToInt(caps.at(2)); - int w = convertToInt(caps.at(3)); - int h = convertToInt(caps.at(4)); - int xrnd = caps.at(5).isEmpty() ? 25 : convertToInt(caps.at(5)); - int yrnd = caps.at(6).isEmpty() ? 25 : convertToInt(caps.at(6)); - - if (m_verboseMode) - printf(" -(lance) qt3_drawRoundRect(%d, %d, %d, %d), %d, %d\n", x, y, w, h, xrnd, yrnd); - - static_cast<Q3Painter*>(m_painter)->drawRoundRect(x, y, w, h, xrnd, yrnd); -#endif -} - -/***************************************************************************************************/ -void PaintCommands::command_qt3_drawEllipse(QRegExp re) -{ - Q_UNUSED(re); -#ifdef QT3_SUPPORT - QStringList caps = re.capturedTexts(); - int x = convertToInt(caps.at(1)); - int y = convertToInt(caps.at(2)); - int w = convertToInt(caps.at(3)); - int h = convertToInt(caps.at(4)); - - if (m_verboseMode) - printf(" -(lance) qt3_drawEllipse(%d, %d, %d, %d)\n", x, y, w, h); - - static_cast<Q3Painter*>(m_painter)->drawEllipse(x, y, w, h); -#endif -} - -/***************************************************************************************************/ -void PaintCommands::command_qt3_drawPie(QRegExp re) -{ - Q_UNUSED(re); -#ifdef QT3_SUPPORT - QStringList caps = re.capturedTexts(); - int x = convertToInt(caps.at(1)); - int y = convertToInt(caps.at(2)); - int w = convertToInt(caps.at(3)); - int h = convertToInt(caps.at(4)); - int angle = convertToInt(caps.at(5)); - int sweep = convertToInt(caps.at(6)); - - if (m_verboseMode) - printf(" -(lance) qt3_drawPie(%d, %d, %d, %d, %d, %d)\n", x, y, w, h, angle, sweep); - - static_cast<Q3Painter*>(m_painter)->drawPie(x, y, w, h, angle, sweep); -#endif -} - -/***************************************************************************************************/ -void PaintCommands::command_qt3_drawChord(QRegExp re) -{ - Q_UNUSED(re); -#ifdef QT3_SUPPORT - QStringList caps = re.capturedTexts(); - int x = convertToInt(caps.at(1)); - int y = convertToInt(caps.at(2)); - int w = convertToInt(caps.at(3)); - int h = convertToInt(caps.at(4)); - int angle = convertToInt(caps.at(5)); - int sweep = convertToInt(caps.at(6)); - - if (m_verboseMode) - printf(" -(lance) qt3_drawChord(%d, %d, %d, %d, %d, %d)\n", x, y, w, h, angle, sweep); - - static_cast<Q3Painter*>(m_painter)->drawChord(x, y, w, h, angle, sweep); -#endif -} - -/***************************************************************************************************/ -void PaintCommands::command_qt3_drawArc(QRegExp re) -{ - Q_UNUSED(re); -#ifdef QT3_SUPPORT - QStringList caps = re.capturedTexts(); - int x = convertToInt(caps.at(1)); - int y = convertToInt(caps.at(2)); - int w = convertToInt(caps.at(3)); - int h = convertToInt(caps.at(4)); - int angle = convertToInt(caps.at(5)); - int sweep = convertToInt(caps.at(6)); - - if (m_verboseMode) - printf(" -(lance) qt3_drawArc(%d, %d, %d, %d, %d, %d)\n", x, y, w, h, angle, sweep); - - static_cast<Q3Painter*>(m_painter)->drawArc(x, y, w, h, angle, sweep); -#endif -} -#endif //QT3_SUPPORT /***************************************************************************************************/ void PaintCommands::command_drawText(QRegExp re) { diff --git a/tests/arthur/common/paintcommands.h b/tests/arthur/common/paintcommands.h index 08c0e25a7b..786ff64943 100644 --- a/tests/arthur/common/paintcommands.h +++ b/tests/arthur/common/paintcommands.h @@ -185,14 +185,6 @@ private: void command_gradient_setCoordinateMode(QRegExp re); // commands: drawing ops -#ifdef QT3_SUPPORT - void command_qt3_drawArc(QRegExp re); - void command_qt3_drawChord(QRegExp re); - void command_qt3_drawEllipse(QRegExp re); - void command_qt3_drawPie(QRegExp re); - void command_qt3_drawRect(QRegExp re); - void command_qt3_drawRoundRect(QRegExp re); -#endif void command_drawArc(QRegExp re); void command_drawChord(QRegExp re); void command_drawConvexPolygon(QRegExp re); diff --git a/tests/arthur/data/qps/sizes.qps b/tests/arthur/data/qps/sizes.qps index 30f6557538..c585e5a01f 100644 --- a/tests/arthur/data/qps/sizes.qps +++ b/tests/arthur/data/qps/sizes.qps @@ -14,16 +14,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 @@ -35,16 +25,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 @@ -56,16 +36,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 @@ -77,16 +47,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 @@ -98,16 +58,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 @@ -119,16 +69,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/arthur/datagenerator/datagenerator.pro b/tests/arthur/datagenerator/datagenerator.pro index 9da6fcd5c5..2c320a3418 100644 --- a/tests/arthur/datagenerator/datagenerator.pro +++ b/tests/arthur/datagenerator/datagenerator.pro @@ -8,9 +8,8 @@ DEPENDPATH += . INCLUDEPATH += . DESTDIR = ../bin -QT += svg xml +QT += svg xml core-private gui-private contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl -contains(QT_CONFIG, qt3support):QT += qt3support # Input HEADERS += datagenerator.h \ diff --git a/tests/arthur/htmlgenerator/htmlgenerator.pro b/tests/arthur/htmlgenerator/htmlgenerator.pro index 4a1c8ba89b..4f5d5c8c16 100644 --- a/tests/arthur/htmlgenerator/htmlgenerator.pro +++ b/tests/arthur/htmlgenerator/htmlgenerator.pro @@ -9,9 +9,8 @@ DESTDIR = ../bin CONFIG += console -QT += svg xml +QT += svg xml core-private gui-private contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl -contains(QT_CONFIG, qt3support):QT += qt3support # Input HEADERS += htmlgenerator.h diff --git a/tests/arthur/lance/lance.pro b/tests/arthur/lance/lance.pro index 56b7f25b81..8f3407cfc9 100644 --- a/tests/arthur/lance/lance.pro +++ b/tests/arthur/lance/lance.pro @@ -10,7 +10,6 @@ SOURCES += interactivewidget.cpp main.cpp RESOURCES += icons.qrc contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl -contains(QT_CONFIG, qt3support):QT += qt3support symbian*: { testData.files = $$QT_BUILD_TREE/tests/arthur/data/qps @@ -18,6 +17,6 @@ symbian*: { DEPLOYMENT += testData } -QT += xml svg +QT += xml svg core-private gui-private diff --git a/tests/arthur/lance/main.cpp b/tests/arthur/lance/main.cpp index 2bda932130..9e8e07f96d 100644 --- a/tests/arthur/lance/main.cpp +++ b/tests/arthur/lance/main.cpp @@ -137,14 +137,6 @@ static void displayCommands() " drawText x y \"text\"\n" " drawTiledPixmap pixmapfile x y width height sx sy\n" "\n" - "Compat functions for Qt 3:\n" - " qt3_drawArc x y width height angle sweep\n" - " qt3_drawChord x y width height angle sweep\n" - " qt3_drawEllipse x y width height\n" - " qt3_drawPie x y width height angle sweep\n" - " qt3_drawRect x y width height\n" - " qt3_drawRoundRect x y width height xfactor yfactor\n" - "\n" "Path commands:\n" " path_addEllipse pathname x y width height\n" " path_addPolygon pathname [ x1 y1 x2 y2 ... ] winding?\n" diff --git a/tests/arthur/performancediff/performancediff.pro b/tests/arthur/performancediff/performancediff.pro index 15d5ec5956..8c1fb98047 100644 --- a/tests/arthur/performancediff/performancediff.pro +++ b/tests/arthur/performancediff/performancediff.pro @@ -9,9 +9,8 @@ DESTDIR = ../bin CONFIG += console -QT += xml svg +QT += xml svg core-private gui-private contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl -contains(QT_CONFIG, qt3support):QT += qt3support # Input HEADERS += performancediff.h diff --git a/tests/arthur/shower/shower.pro b/tests/arthur/shower/shower.pro index c02ded0865..f4f8d47809 100644 --- a/tests/arthur/shower/shower.pro +++ b/tests/arthur/shower/shower.pro @@ -7,9 +7,8 @@ DEPENDPATH += . INCLUDEPATH += . DESTDIR = ../bin -QT += xml svg +QT += xml svg core-private gui-private contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl -contains(QT_CONFIG, qt3support):QT += qt3support # Input HEADERS += shower.h diff --git a/tests/auto/collections/tst_collections.cpp b/tests/auto/collections/tst_collections.cpp index b1ea32629b..18a32fd486 100644 --- a/tests/auto/collections/tst_collections.cpp +++ b/tests/auto/collections/tst_collections.cpp @@ -100,10 +100,6 @@ void foo() #include "qvector.h" #include "qqueue.h" -#ifdef QT3_SUPPORT -#include "q3cleanuphandler.h" -#endif - template class QList<int>; //TESTED_FILES= @@ -133,7 +129,6 @@ private slots: void cache(); void regexp(); void pair(); - void cleanupHandler(); void sharableQList(); void sharableQLinkedList(); void sharableQVector(); @@ -2191,14 +2186,7 @@ void tst_Collections::qstring() QVERIFY(s.toLatin1() == "first"); s = "second"; QVERIFY(s.toLatin1() == "second"); -#ifdef QT3_SUPPORT - const char* cache = s.latin1(); - QVERIFY(cache == s.latin1()); -#endif s.clear(); -#ifdef QT3_SUPPORT - QVERIFY(*s.latin1() == '\0'); -#endif QVERIFY(s.isNull()); QVERIFY(s.toLatin1().size() == 0); QVERIFY(s.toLatin1().isEmpty()); @@ -2208,14 +2196,7 @@ void tst_Collections::qstring() QVERIFY(s.toUtf8() == "first-utf8"); s = "second-utf8"; QVERIFY(s.toUtf8() == "second-utf8"); -#ifdef QT3_SUPPORT - cache = s.utf8(); - QVERIFY(cache == s.utf8()); -#endif s.clear(); -#ifdef QT3_SUPPORT - QVERIFY(*s.utf8() == '\0'); -#endif QVERIFY(s.isNull()); QVERIFY(s.toUtf8().size() == 0); QVERIFY(s.toUtf8().isEmpty()); @@ -2225,14 +2206,7 @@ void tst_Collections::qstring() QVERIFY(s.toUtf8() == "first-utf8"); s = "second-utf8"; QVERIFY(s.toUtf8() == "second-utf8"); -#ifdef QT3_SUPPORT - cache = s.utf8(); - QVERIFY(cache == s.utf8()); -#endif s.clear(); -#ifdef QT3_SUPPORT - QVERIFY(*s.utf8() == '\0'); -#endif QVERIFY(s.isNull()); QVERIFY(s.toUtf8().size() == 0); QVERIFY(s.toUtf8().isEmpty()); @@ -2242,14 +2216,7 @@ void tst_Collections::qstring() QVERIFY(s.toLocal8Bit() == "first-local8Bit"); s = "second-local8Bit"; QVERIFY(s.toLocal8Bit() == "second-local8Bit"); -#ifdef QT3_SUPPORT - cache = s.local8Bit(); - QVERIFY(cache == s.local8Bit()); -#endif s.clear(); -#ifdef QT3_SUPPORT - QVERIFY(*s.local8Bit() == '\0'); -#endif QVERIFY(s.isNull()); QVERIFY(s.toLocal8Bit().size() == 0); QVERIFY(s.toLocal8Bit().isEmpty()); @@ -2258,14 +2225,7 @@ void tst_Collections::qstring() QVERIFY(s.toAscii() == "first-ascii"); s = "second-ascii"; QVERIFY(s.toAscii() == "second-ascii"); -#ifdef QT3_SUPPORT - cache = s.ascii(); - QVERIFY(cache == s.ascii()); -#endif s.clear(); -#ifdef QT3_SUPPORT - QVERIFY(*s.ascii() == '\0'); -#endif QVERIFY(s.isNull()); QVERIFY(s.toAscii().size() == 0); QVERIFY(s.toAscii().isEmpty()); @@ -2508,24 +2468,6 @@ void tst_Collections::pair() QVERIFY(!(a > a || b > b || c > c || d > d || e > e)); } -void tst_Collections::cleanupHandler() -{ -#ifdef QT3_SUPPORT - LargeStatic * f1 = 0; - LargeStatic * f2 = 0; - { - Q3CleanupHandler<LargeStatic> cleanup; - f1 = new LargeStatic; - f2 = new LargeStatic; - cleanup.add(&f1); - cleanup.add(&f2); - } - QVERIFY(f1 == 0 && f2 == 0); -#else - QSKIP("No Qt3 support", SkipAll); -#endif -} - /* These test that Java-style mutable iterators don't trash shared copy (the setSharable() mechanism). diff --git a/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp b/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp index e7e516eddd..d167228b7b 100644 --- a/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp +++ b/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp @@ -60,7 +60,7 @@ QT_USE_NAMESPACE #include "3rdparty/memcheck.h" #endif -class tst_ExceptionSafetyObjects: public QObject +class tst_ExceptionSafety_Objects: public QObject { Q_OBJECT @@ -156,7 +156,7 @@ struct DirCreator : public AbstractTester } }; -void tst_ExceptionSafetyObjects::objects_data() +void tst_ExceptionSafety_Objects::objects_data() { QTest::addColumn<AbstractTester *>("objectCreator"); @@ -164,12 +164,12 @@ void tst_ExceptionSafetyObjects::objects_data() NEWROW(QObject); NEWROW(QBuffer); NEWROW(QFile); + NEWROW(QFSFileEngine); NEWROW(QProcess); NEWROW(QSettings); NEWROW(QThread); NEWROW(QThreadPool); NEWROW(QTranslator); - NEWROW(QFSFileEngine); #define NEWROW2(T, CREATOR) QTest::newRow(#T) << static_cast<AbstractTester *>(new CREATOR) NEWROW2(QBitArray, BitArrayCreator); @@ -177,7 +177,6 @@ void tst_ExceptionSafetyObjects::objects_data() NEWROW2(QCryptographicHash, CryptographicHashCreator); NEWROW2(QDataStream, DataStreamCreator); NEWROW2(QDir, DirCreator); - } // create and destructs an object, and lets each and every allocation @@ -274,9 +273,9 @@ public: } }; -QtMsgHandler tst_ExceptionSafetyObjects::testMessageHandler; +QtMsgHandler tst_ExceptionSafety_Objects::testMessageHandler; -void tst_ExceptionSafetyObjects::safeMessageHandler(QtMsgType type, const char *msg) +void tst_ExceptionSafety_Objects::safeMessageHandler(QtMsgType type, const char *msg) { // this temporarily suspends OOM testing while handling a message int currentIndex = mallocFailIndex; @@ -301,7 +300,7 @@ void debugUnexpected() (*defaultUnexpected)(); } -void tst_ExceptionSafetyObjects::initTestCase() +void tst_ExceptionSafety_Objects::initTestCase() { // set handlers for bad exception cases, you might want to step in and breakpoint the default handlers too defaultTerminate = std::set_terminate(&debugTerminate); @@ -345,17 +344,25 @@ void tst_ExceptionSafetyObjects::initTestCase() QCOMPARE(malloc2Failed, 1); } -void tst_ExceptionSafetyObjects::cleanupTestCase() +void tst_ExceptionSafety_Objects::cleanupTestCase() { qInstallMsgHandler(testMessageHandler); } -void tst_ExceptionSafetyObjects::objects() +void tst_ExceptionSafety_Objects::objects() { + QLatin1String tag = QLatin1String(QTest::currentDataTag()); + if (tag == QLatin1String("QFile") + || tag == QLatin1String("QProcess") + || tag == QLatin1String("QSettings") + || tag == QLatin1String("QThread") + || tag == QLatin1String("QThreadPool")) + QSKIP("This type of object is not currently strongly exception safe", SkipSingle); + QFETCH(AbstractTester *, objectCreator); doOOMTest(*objectCreator, 0); - + delete objectCreator; } @@ -364,7 +371,8 @@ struct WidgetCreator : public AbstractTester { void operator()(QObject *parent) { - Q_ASSERT(!parent || parent->isWidgetType()); + if (parent && !parent->isWidgetType()) + qFatal("%s: parent must be either null or a widget type", Q_FUNC_INFO); QScopedPointer<T> ptr(parent ? new T(static_cast<QWidget *>(parent)) : new T); } }; @@ -374,7 +382,8 @@ template <> struct WidgetCreator<QSizeGrip> : public AbstractTester { void operator()(QObject *parent) { - Q_ASSERT(!parent || parent->isWidgetType()); + if (parent && !parent->isWidgetType()) + qFatal("%s: parent must be either null or a widget type", Q_FUNC_INFO); QScopedPointer<QSizeGrip> ptr(new QSizeGrip(static_cast<QWidget *>(parent))); } }; @@ -384,17 +393,18 @@ template <> struct WidgetCreator<QDesktopWidget> : public AbstractTester { void operator()(QObject *parent) { - Q_ASSERT(!parent || parent->isWidgetType()); + if (parent && !parent->isWidgetType()) + qFatal("%s: parent must be either null or a widget type", Q_FUNC_INFO); QScopedPointer<QDesktopWidget> ptr(new QDesktopWidget()); } }; -void tst_ExceptionSafetyObjects::widgets_data() +void tst_ExceptionSafety_Objects::widgets_data() { #ifdef Q_OS_SYMBIAN // Initialise the S60 rasteriser, which crashes if started while out of memory - QImage image(20, 20, QImage::Format_RGB32); - QPainter p(&image); - p.drawText(0, 15, "foo"); + QImage image(20, 20, QImage::Format_RGB32); + QPainter p(&image); + p.drawText(0, 15, "foo"); #endif QTest::addColumn<AbstractTester *>("widgetCreator"); @@ -405,23 +415,27 @@ void tst_ExceptionSafetyObjects::widgets_data() NEWROW(QWidget); NEWROW(QButtonGroup); - NEWROW(QDesktopWidget); NEWROW(QCheckBox); + NEWROW(QColumnView); NEWROW(QComboBox); NEWROW(QCommandLinkButton); NEWROW(QDateEdit); NEWROW(QDateTimeEdit); + NEWROW(QDesktopWidget); NEWROW(QDial); NEWROW(QDoubleSpinBox); NEWROW(QFocusFrame); NEWROW(QFontComboBox); NEWROW(QFrame); NEWROW(QGroupBox); - NEWROW(QLCDNumber); NEWROW(QLabel); NEWROW(QLCDNumber); NEWROW(QLineEdit); + NEWROW(QListView); + NEWROW(QListWidget); + NEWROW(QMainWindow); NEWROW(QMenu); + NEWROW(QMenuBar); NEWROW(QPlainTextEdit); NEWROW(QProgressBar); NEWROW(QPushButton); @@ -435,28 +449,58 @@ void tst_ExceptionSafetyObjects::widgets_data() NEWROW(QStackedWidget); NEWROW(QStatusBar); NEWROW(QTabBar); + NEWROW(QTableView); + NEWROW(QTableWidget); NEWROW(QTabWidget); NEWROW(QTextBrowser); NEWROW(QTextEdit); NEWROW(QTimeEdit); + NEWROW(QToolBar); NEWROW(QToolBox); NEWROW(QToolButton); - NEWROW(QStatusBar); - NEWROW(QToolBar); - NEWROW(QMenuBar); - NEWROW(QMainWindow); - NEWROW(QWorkspace); - NEWROW(QColumnView); - NEWROW(QListView); - NEWROW(QListWidget); - NEWROW(QTableView); - NEWROW(QTableWidget); NEWROW(QTreeView); NEWROW(QTreeWidget); + NEWROW(QWorkspace); } -void tst_ExceptionSafetyObjects::widgets() -{ +void tst_ExceptionSafety_Objects::widgets() +{ + QLatin1String tag = QLatin1String(QTest::currentDataTag()); + if (tag == QLatin1String("QColumnView") + || tag == QLatin1String("QComboBox") + || tag == QLatin1String("QCommandLinkButton") + || tag == QLatin1String("QDateEdit") + || tag == QLatin1String("QDateTimeEdit") + || tag == QLatin1String("QDesktopWidget") + || tag == QLatin1String("QDoubleSpinBox") + || tag == QLatin1String("QFontComboBox") + || tag == QLatin1String("QGroupBox") + || tag == QLatin1String("QLineEdit") + || tag == QLatin1String("QListView") + || tag == QLatin1String("QListWidget") + || tag == QLatin1String("QMainWindow") + || tag == QLatin1String("QMenu") + || tag == QLatin1String("QMenuBar") + || tag == QLatin1String("QPlainTextEdit") + || tag == QLatin1String("QProgressBar") + || tag == QLatin1String("QPushButton") + || tag == QLatin1String("QScrollArea") + || tag == QLatin1String("QSpinBox") + || tag == QLatin1String("QStackedWidget") + || tag == QLatin1String("QStatusBar") + || tag == QLatin1String("QTableView") + || tag == QLatin1String("QTableWidget") + || tag == QLatin1String("QTabWidget") + || tag == QLatin1String("QTextBrowser") + || tag == QLatin1String("QTextEdit") + || tag == QLatin1String("QTimeEdit") + || tag == QLatin1String("QToolBar") + || tag == QLatin1String("QToolBox") + || tag == QLatin1String("QTreeView") + || tag == QLatin1String("QTreeWidget") + || tag == QLatin1String("QWorkspace")) + QSKIP("This type of widget is not currently strongly exception safe", SkipSingle); + QFETCH(AbstractTester *, widgetCreator); doOOMTest(*widgetCreator, 0, 00000); @@ -547,7 +591,9 @@ struct IntegerMoveable }; int IntegerMoveable::instanceCount = 0; +QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(IntegerMoveable, Q_MOVABLE_TYPE); +QT_END_NAMESPACE template <typename T, template<typename> class Container> void containerInsertTest(QObject*) @@ -720,12 +766,12 @@ static void containerData() QTest::newRow("erase moveable") << static_cast<TestFunction>(containerEraseTest<IntegerMoveable, Container>); } -void tst_ExceptionSafetyObjects::vector_data() +void tst_ExceptionSafety_Objects::vector_data() { containerData<QVector>(); } -void tst_ExceptionSafetyObjects::vector() +void tst_ExceptionSafety_Objects::vector() { QFETCH(TestFunction, testFunction); @@ -736,30 +782,30 @@ void tst_ExceptionSafetyObjects::vector() doOOMTest(testFunction, 0); } -void tst_ExceptionSafetyObjects::list_data() +void tst_ExceptionSafety_Objects::list_data() { containerData<QList>(); } -void tst_ExceptionSafetyObjects::list() +void tst_ExceptionSafety_Objects::list() { QFETCH(TestFunction, testFunction); doOOMTest(testFunction, 0); } -void tst_ExceptionSafetyObjects::linkedList_data() +void tst_ExceptionSafety_Objects::linkedList_data() { containerData<QLinkedList>(); } -void tst_ExceptionSafetyObjects::linkedList() +void tst_ExceptionSafety_Objects::linkedList() { QFETCH(TestFunction, testFunction); doOOMTest(testFunction, 0); } -QTEST_MAIN(tst_ExceptionSafetyObjects) +QTEST_MAIN(tst_ExceptionSafety_Objects) #include "tst_exceptionsafety_objects.moc" #endif // QT_NO_EXCEPTIONS diff --git a/tests/auto/gestures/tst_gestures.cpp b/tests/auto/gestures/tst_gestures.cpp index 7327a49169..d580c8bb91 100644 --- a/tests/auto/gestures/tst_gestures.cpp +++ b/tests/auto/gestures/tst_gestures.cpp @@ -280,7 +280,7 @@ protected: eventsPtr->canceled << g->gestureType(); break; default: - Q_ASSERT(false); + qWarning() << "Unknown GestureState enum value:" << static_cast<int>(g->state()); } } } else if (event->type() == CustomEvent::EventType) { @@ -823,7 +823,7 @@ public: emit gestureCanceled(e->type(), g); break; default: - Q_ASSERT(false); + qWarning() << "Unknown GestureState enum value:" << static_cast<int>(g->state()); } } } else if (event->type() == CustomEvent::EventType) { @@ -1518,17 +1518,20 @@ void tst_Gestures::autoCancelGestures() { class MockWidget : public GestureWidget { public: - MockWidget(const char *name) : GestureWidget(name) { } + MockWidget(const char *name) : GestureWidget(name), badGestureEvents(0) { } bool event(QEvent *event) { if (event->type() == QEvent::Gesture) { QGestureEvent *ge = static_cast<QGestureEvent*>(event); - Q_ASSERT(ge->gestures().count() == 1); // can't use QCOMPARE here... + if (ge->gestures().count() != 1) + ++badGestureEvents; // event should contain exactly one gesture ge->gestures().first()->setGestureCancelPolicy(QGesture::CancelAllInContext); } return GestureWidget::event(event); } + + int badGestureEvents; }; const Qt::GestureType secondGesture = QGestureRecognizer::registerRecognizer(new CustomGestureRecognizer); @@ -1563,22 +1566,26 @@ void tst_Gestures::autoCancelGestures() event.serial = CustomGesture::SerialFinishedThreshold; QApplication::sendEvent(child, &event); QCOMPARE(parent.events.all.count(), 2); + QCOMPARE(parent.badGestureEvents, 0); } void tst_Gestures::autoCancelGestures2() { class MockItem : public GestureItem { public: - MockItem(const char *name) : GestureItem(name) { } + MockItem(const char *name) : GestureItem(name), badGestureEvents(0) { } bool event(QEvent *event) { if (event->type() == QEvent::Gesture) { QGestureEvent *ge = static_cast<QGestureEvent*>(event); - Q_ASSERT(ge->gestures().count() == 1); // can't use QCOMPARE here... + if (ge->gestures().count() != 1) + ++badGestureEvents; // event should contain exactly one gesture ge->gestures().first()->setGestureCancelPolicy(QGesture::CancelAllInContext); } return GestureItem::event(event); } + + int badGestureEvents; }; const Qt::GestureType secondGesture = QGestureRecognizer ::registerRecognizer(new CustomGestureRecognizer); @@ -1614,6 +1621,7 @@ void tst_Gestures::autoCancelGestures2() event.serial = CustomGesture::SerialFinishedThreshold; scene.sendEvent(child, &event); QCOMPARE(parent->events.all.count(), 2); + QCOMPARE(parent->badGestureEvents, 0); } void tst_Gestures::graphicsViewParentPropagation() 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/moc/no-keywords.h b/tests/auto/moc/no-keywords.h index 1ebc4062c2..bec39a1512 100644 --- a/tests/auto/moc/no-keywords.h +++ b/tests/auto/moc/no-keywords.h @@ -52,9 +52,6 @@ #include <QtNetwork/QtNetwork> #include <QtSql/QtSql> //#include <QtSvg> -#if defined(QT3_SUPPORT) -#include <Qt3Support> -#endif #if defined(WITH_DBUS) #include <QtDBus> #endif diff --git a/tests/auto/modeltest/dynamictreemodel.cpp b/tests/auto/modeltest/dynamictreemodel.cpp index fa634b6a5f..80708d440e 100644 --- a/tests/auto/modeltest/dynamictreemodel.cpp +++ b/tests/auto/modeltest/dynamictreemodel.cpp @@ -44,6 +44,7 @@ #include <QtCore/QHash> #include <QtCore/QList> #include <QtCore/QTimer> +#include <QtCore/QDebug> DynamicTreeModel::DynamicTreeModel(QObject *parent) @@ -66,9 +67,11 @@ QModelIndex DynamicTreeModel::index(int row, int column, const QModelIndex &pare const qint64 grandParent = findParentId(parent.internalId()); if (grandParent >= 0) { QList<QList<qint64> > parentTable = m_childItems.value(grandParent); - Q_ASSERT(parent.column() < parentTable.size()); + if (parent.column() >= parentTable.size()) + qFatal("%s: parent.column() must be less than parentTable.size()", Q_FUNC_INFO); QList<qint64> parentSiblings = parentTable.at(parent.column()); - Q_ASSERT(parent.row() < parentSiblings.size()); + if (parent.row() >= parentSiblings.size()) + qFatal("%s: parent.row() must be less than parentSiblings.size()", Q_FUNC_INFO); } if (childIdColumns.size() == 0) @@ -189,7 +192,8 @@ QModelIndex ModelChangeCommand::findIndex(QList<int> rows) while (i.hasNext()) { parent = m_model->index(i.next(), col, parent); - Q_ASSERT(parent.isValid()); + if (!parent.isValid()) + qFatal("%s: parent must be valid", Q_FUNC_INFO); } return parent; } diff --git a/tests/auto/modeltest/modeltest.cpp b/tests/auto/modeltest/modeltest.cpp index 98d707c8da..f60f86d09c 100644 --- a/tests/auto/modeltest/modeltest.cpp +++ b/tests/auto/modeltest/modeltest.cpp @@ -45,8 +45,6 @@ #include "modeltest.h" #include <QtTest/QtTest> -#undef Q_ASSERT -#define Q_ASSERT QVERIFY Q_DECLARE_METATYPE ( QModelIndex ) @@ -55,7 +53,8 @@ Q_DECLARE_METATYPE ( QModelIndex ) */ ModelTest::ModelTest ( QAbstractItemModel *_model, QObject *parent ) : QObject ( parent ), model ( _model ), fetchingMore ( false ) { - Q_ASSERT ( model ); + if (!model) + qFatal("%s: model must not be null", Q_FUNC_INFO); connect ( model, SIGNAL ( columnsAboutToBeInserted ( const QModelIndex &, int, int ) ), this, SLOT ( runAllTests() ) ); @@ -118,15 +117,15 @@ void ModelTest::runAllTests() */ void ModelTest::nonDestructiveBasicTest() { - Q_ASSERT ( model->buddy ( QModelIndex() ) == QModelIndex() ); + QVERIFY( model->buddy ( QModelIndex() ) == QModelIndex() ); model->canFetchMore ( QModelIndex() ); - Q_ASSERT ( model->columnCount ( QModelIndex() ) >= 0 ); - Q_ASSERT ( model->data ( QModelIndex() ) == QVariant() ); + QVERIFY( model->columnCount ( QModelIndex() ) >= 0 ); + QVERIFY( model->data ( QModelIndex() ) == QVariant() ); fetchingMore = true; model->fetchMore ( QModelIndex() ); fetchingMore = false; Qt::ItemFlags flags = model->flags ( QModelIndex() ); - Q_ASSERT ( flags == Qt::ItemIsDropEnabled || flags == 0 ); + QVERIFY( flags == Qt::ItemIsDropEnabled || flags == 0 ); model->hasChildren ( QModelIndex() ); model->hasIndex ( 0, 0 ); model->headerData ( 0, Qt::Horizontal ); @@ -135,8 +134,8 @@ void ModelTest::nonDestructiveBasicTest() QVariant cache; model->match ( QModelIndex(), -1, cache ); model->mimeTypes(); - Q_ASSERT ( model->parent ( QModelIndex() ) == QModelIndex() ); - Q_ASSERT ( model->rowCount() >= 0 ); + QVERIFY( model->parent ( QModelIndex() ) == QModelIndex() ); + QVERIFY( model->rowCount() >= 0 ); QVariant variant; model->setData ( QModelIndex(), variant, -1 ); model->setHeaderData ( -1, Qt::Horizontal, QVariant() ); @@ -158,17 +157,17 @@ void ModelTest::rowCount() // check top row QModelIndex topIndex = model->index ( 0, 0, QModelIndex() ); int rows = model->rowCount ( topIndex ); - Q_ASSERT ( rows >= 0 ); + QVERIFY( rows >= 0 ); if ( rows > 0 ) - Q_ASSERT ( model->hasChildren ( topIndex ) == true ); + QVERIFY( model->hasChildren ( topIndex ) ); QModelIndex secondLevelIndex = model->index ( 0, 0, topIndex ); if ( secondLevelIndex.isValid() ) { // not the top level // check a row count where parent is valid rows = model->rowCount ( secondLevelIndex ); - Q_ASSERT ( rows >= 0 ); + QVERIFY( rows >= 0 ); if ( rows > 0 ) - Q_ASSERT ( model->hasChildren ( secondLevelIndex ) == true ); + QVERIFY( model->hasChildren ( secondLevelIndex ) ); } // The models rowCount() is tested more extensively in checkChildren(), @@ -182,12 +181,12 @@ void ModelTest::columnCount() { // check top row QModelIndex topIndex = model->index ( 0, 0, QModelIndex() ); - Q_ASSERT ( model->columnCount ( topIndex ) >= 0 ); + QVERIFY( model->columnCount ( topIndex ) >= 0 ); // check a column count where parent is valid QModelIndex childIndex = model->index ( 0, 0, topIndex ); if ( childIndex.isValid() ) - Q_ASSERT ( model->columnCount ( childIndex ) >= 0 ); + QVERIFY( model->columnCount ( childIndex ) >= 0 ); // columnCount() is tested more extensively in checkChildren(), // but this catches the big mistakes @@ -200,19 +199,19 @@ void ModelTest::hasIndex() { // qDebug() << "hi"; // Make sure that invalid values returns an invalid index - Q_ASSERT ( model->hasIndex ( -2, -2 ) == false ); - Q_ASSERT ( model->hasIndex ( -2, 0 ) == false ); - Q_ASSERT ( model->hasIndex ( 0, -2 ) == false ); + QVERIFY( !model->hasIndex ( -2, -2 ) ); + QVERIFY( !model->hasIndex ( -2, 0 ) ); + QVERIFY( !model->hasIndex ( 0, -2 ) ); int rows = model->rowCount(); int columns = model->columnCount(); // check out of bounds - Q_ASSERT ( model->hasIndex ( rows, columns ) == false ); - Q_ASSERT ( model->hasIndex ( rows + 1, columns + 1 ) == false ); + QVERIFY( !model->hasIndex ( rows, columns ) ); + QVERIFY( !model->hasIndex ( rows + 1, columns + 1 ) ); if ( rows > 0 ) - Q_ASSERT ( model->hasIndex ( 0, 0 ) == true ); + QVERIFY( model->hasIndex ( 0, 0 ) ); // hasIndex() is tested more extensively in checkChildren(), // but this catches the big mistakes @@ -225,9 +224,9 @@ void ModelTest::index() { // qDebug() << "i"; // Make sure that invalid values returns an invalid index - Q_ASSERT ( model->index ( -2, -2 ) == QModelIndex() ); - Q_ASSERT ( model->index ( -2, 0 ) == QModelIndex() ); - Q_ASSERT ( model->index ( 0, -2 ) == QModelIndex() ); + QVERIFY( model->index ( -2, -2 ) == QModelIndex() ); + QVERIFY( model->index ( -2, 0 ) == QModelIndex() ); + QVERIFY( model->index ( 0, -2 ) == QModelIndex() ); int rows = model->rowCount(); int columns = model->columnCount(); @@ -236,13 +235,13 @@ void ModelTest::index() return; // Catch off by one errors - Q_ASSERT ( model->index ( rows, columns ) == QModelIndex() ); - Q_ASSERT ( model->index ( 0, 0 ).isValid() == true ); + QVERIFY( model->index ( rows, columns ) == QModelIndex() ); + QVERIFY( model->index ( 0, 0 ).isValid() ); // Make sure that the same index is *always* returned QModelIndex a = model->index ( 0, 0 ); QModelIndex b = model->index ( 0, 0 ); - Q_ASSERT ( a == b ); + QVERIFY( a == b ); // index() is tested more extensively in checkChildren(), // but this catches the big mistakes @@ -256,7 +255,7 @@ void ModelTest::parent() // qDebug() << "p"; // Make sure the model wont crash and will return an invalid QModelIndex // when asked for the parent of an invalid index. - Q_ASSERT ( model->parent ( QModelIndex() ) == QModelIndex() ); + QVERIFY( model->parent ( QModelIndex() ) == QModelIndex() ); if ( model->rowCount() == 0 ) return; @@ -269,13 +268,13 @@ void ModelTest::parent() // Common error test #1, make sure that a top level index has a parent // that is a invalid QModelIndex. QModelIndex topIndex = model->index ( 0, 0, QModelIndex() ); - Q_ASSERT ( model->parent ( topIndex ) == QModelIndex() ); + QVERIFY( model->parent ( topIndex ) == QModelIndex() ); // Common error test #2, make sure that a second level index has a parent // that is the first level index. if ( model->rowCount ( topIndex ) > 0 ) { QModelIndex childIndex = model->index ( 0, 0, topIndex ); - Q_ASSERT ( model->parent ( childIndex ) == topIndex ); + QVERIFY( model->parent ( childIndex ) == topIndex ); } // Common error test #3, the second column should NOT have the same children @@ -285,7 +284,7 @@ void ModelTest::parent() if ( model->rowCount ( topIndex1 ) > 0 ) { QModelIndex childIndex = model->index ( 0, 0, topIndex ); QModelIndex childIndex1 = model->index ( 0, 0, topIndex1 ); - Q_ASSERT ( childIndex != childIndex1 ); + QVERIFY( childIndex != childIndex1 ); } // Full test, walk n levels deep through the model making sure that all @@ -325,47 +324,47 @@ void ModelTest::checkChildren ( const QModelIndex &parent, int currentDepth ) int columns = model->columnCount ( parent ); if ( rows > 0 ) - Q_ASSERT ( model->hasChildren ( parent ) ); + QVERIFY( model->hasChildren ( parent ) ); // Some further testing against rows(), columns(), and hasChildren() - Q_ASSERT ( rows >= 0 ); - Q_ASSERT ( columns >= 0 ); + QVERIFY( rows >= 0 ); + QVERIFY( columns >= 0 ); if ( rows > 0 ) - Q_ASSERT ( model->hasChildren ( parent ) == true ); + QVERIFY( model->hasChildren ( parent ) ); //qDebug() << "parent:" << model->data(parent).toString() << "rows:" << rows // << "columns:" << columns << "parent column:" << parent.column(); - Q_ASSERT ( model->hasIndex ( rows + 1, 0, parent ) == false ); + QVERIFY( !model->hasIndex ( rows + 1, 0, parent ) ); for ( int r = 0; r < rows; ++r ) { if ( model->canFetchMore ( parent ) ) { fetchingMore = true; model->fetchMore ( parent ); fetchingMore = false; } - Q_ASSERT ( model->hasIndex ( r, columns + 1, parent ) == false ); + QVERIFY( !model->hasIndex ( r, columns + 1, parent ) ); for ( int c = 0; c < columns; ++c ) { - Q_ASSERT ( model->hasIndex ( r, c, parent ) == true ); + QVERIFY( model->hasIndex ( r, c, parent ) ); QModelIndex index = model->index ( r, c, parent ); // rowCount() and columnCount() said that it existed... - Q_ASSERT ( index.isValid() == true ); + QVERIFY( index.isValid() ); // index() should always return the same index when called twice in a row QModelIndex modifiedIndex = model->index ( r, c, parent ); - Q_ASSERT ( index == modifiedIndex ); + QVERIFY( index == modifiedIndex ); // Make sure we get the same index if we request it twice in a row QModelIndex a = model->index ( r, c, parent ); QModelIndex b = model->index ( r, c, parent ); - Q_ASSERT ( a == b ); + QVERIFY( a == b ); // Some basic checking on the index that is returned - Q_ASSERT ( index.model() == model ); - Q_ASSERT ( index.row() == r ); - Q_ASSERT ( index.column() == c ); + QVERIFY( index.model() == model ); + QCOMPARE( index.row(), r ); + QCOMPARE( index.column(), c ); // While you can technically return a QVariant usually this is a sign - // of an bug in data() Disable if this really is ok in your model. -// Q_ASSERT ( model->data ( index, Qt::DisplayRole ).isValid() == true ); + // of a bug in data(). Disable if this really is ok in your model. +// QVERIFY( model->data ( index, Qt::DisplayRole ).isValid() ); // If the next test fails here is some somewhat useful debug you play with. @@ -380,8 +379,7 @@ void ModelTest::checkChildren ( const QModelIndex &parent, int currentDepth ) } // Check that we can get back our real parent. -// qDebug() << model->parent ( index ) << parent ; - Q_ASSERT ( model->parent ( index ) == parent ); + QCOMPARE( model->parent ( index ), parent ); // recursively go down the children if ( model->hasChildren ( index ) && currentDepth < 10 ) { @@ -391,7 +389,7 @@ void ModelTest::checkChildren ( const QModelIndex &parent, int currentDepth ) // make sure that after testing the children that the index doesn't change. QModelIndex newerIndex = model->index ( r, c, parent ); - Q_ASSERT ( index == newerIndex ); + QVERIFY( index == newerIndex ); } } } @@ -402,68 +400,68 @@ void ModelTest::checkChildren ( const QModelIndex &parent, int currentDepth ) void ModelTest::data() { // Invalid index should return an invalid qvariant - Q_ASSERT ( !model->data ( QModelIndex() ).isValid() ); + QVERIFY( !model->data ( QModelIndex() ).isValid() ); if ( model->rowCount() == 0 ) return; // A valid index should have a valid QVariant data - Q_ASSERT ( model->index ( 0, 0 ).isValid() ); + QVERIFY( model->index ( 0, 0 ).isValid() ); // shouldn't be able to set data on an invalid index - Q_ASSERT ( model->setData ( QModelIndex(), QLatin1String ( "foo" ), Qt::DisplayRole ) == false ); + QVERIFY( !model->setData ( QModelIndex(), QLatin1String ( "foo" ), Qt::DisplayRole ) ); // General Purpose roles that should return a QString QVariant variant = model->data ( model->index ( 0, 0 ), Qt::ToolTipRole ); if ( variant.isValid() ) { - Q_ASSERT ( qVariantCanConvert<QString> ( variant ) ); + QVERIFY( qVariantCanConvert<QString> ( variant ) ); } variant = model->data ( model->index ( 0, 0 ), Qt::StatusTipRole ); if ( variant.isValid() ) { - Q_ASSERT ( qVariantCanConvert<QString> ( variant ) ); + QVERIFY( qVariantCanConvert<QString> ( variant ) ); } variant = model->data ( model->index ( 0, 0 ), Qt::WhatsThisRole ); if ( variant.isValid() ) { - Q_ASSERT ( qVariantCanConvert<QString> ( variant ) ); + QVERIFY( qVariantCanConvert<QString> ( variant ) ); } // General Purpose roles that should return a QSize variant = model->data ( model->index ( 0, 0 ), Qt::SizeHintRole ); if ( variant.isValid() ) { - Q_ASSERT ( qVariantCanConvert<QSize> ( variant ) ); + QVERIFY( qVariantCanConvert<QSize> ( variant ) ); } // General Purpose roles that should return a QFont QVariant fontVariant = model->data ( model->index ( 0, 0 ), Qt::FontRole ); if ( fontVariant.isValid() ) { - Q_ASSERT ( qVariantCanConvert<QFont> ( fontVariant ) ); + QVERIFY( qVariantCanConvert<QFont> ( fontVariant ) ); } // Check that the alignment is one we know about QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole ); if ( textAlignmentVariant.isValid() ) { int alignment = textAlignmentVariant.toInt(); - Q_ASSERT ( alignment == ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) ); + QCOMPARE( alignment, ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) ); } // General Purpose roles that should return a QColor QVariant colorVariant = model->data ( model->index ( 0, 0 ), Qt::BackgroundColorRole ); if ( colorVariant.isValid() ) { - Q_ASSERT ( qVariantCanConvert<QColor> ( colorVariant ) ); + QVERIFY( qVariantCanConvert<QColor> ( colorVariant ) ); } colorVariant = model->data ( model->index ( 0, 0 ), Qt::TextColorRole ); if ( colorVariant.isValid() ) { - Q_ASSERT ( qVariantCanConvert<QColor> ( colorVariant ) ); + QVERIFY( qVariantCanConvert<QColor> ( colorVariant ) ); } // Check that the "check state" is one we know about. QVariant checkStateVariant = model->data ( model->index ( 0, 0 ), Qt::CheckStateRole ); if ( checkStateVariant.isValid() ) { int state = checkStateVariant.toInt(); - Q_ASSERT ( state == Qt::Unchecked || - state == Qt::PartiallyChecked || - state == Qt::Checked ); + QVERIFY( state == Qt::Unchecked || + state == Qt::PartiallyChecked || + state == Qt::Checked ); } } @@ -472,7 +470,7 @@ void ModelTest::data() \sa rowsInserted() */ -void ModelTest::rowsAboutToBeInserted ( const QModelIndex &parent, int start, int end ) +void ModelTest::rowsAboutToBeInserted ( const QModelIndex &parent, int start, int /* end */) { // Q_UNUSED(end); // qDebug() << "rowsAboutToBeInserted" << "start=" << start << "end=" << end << "parent=" << model->data ( parent ).toString() @@ -494,7 +492,7 @@ void ModelTest::rowsAboutToBeInserted ( const QModelIndex &parent, int start, in void ModelTest::rowsInserted ( const QModelIndex & parent, int start, int end ) { Changing c = insert.pop(); - Q_ASSERT ( c.parent == parent ); + QVERIFY( c.parent == parent ); // qDebug() << "rowsInserted" << "start=" << start << "end=" << end << "oldsize=" << c.oldSize // << "parent=" << model->data ( parent ).toString() << "current rowcount of parent=" << model->rowCount ( parent ); @@ -504,8 +502,8 @@ void ModelTest::rowsInserted ( const QModelIndex & parent, int start, int end ) // } // qDebug(); - Q_ASSERT ( c.oldSize + ( end - start + 1 ) == model->rowCount ( parent ) ); - Q_ASSERT ( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) ); + QVERIFY( c.oldSize + ( end - start + 1 ) == model->rowCount ( parent ) ); + QVERIFY( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) ); if (c.next != model->data(model->index(end + 1, 0, c.parent))) { qDebug() << start << end; @@ -514,7 +512,7 @@ void ModelTest::rowsInserted ( const QModelIndex & parent, int start, int end ) qDebug() << c.next << model->data(model->index(end + 1, 0, c.parent)); } - Q_ASSERT ( c.next == model->data ( model->index ( end + 1, 0, c.parent ) ) ); + QVERIFY( c.next == model->data ( model->index ( end + 1, 0, c.parent ) ) ); } void ModelTest::layoutAboutToBeChanged() @@ -527,7 +525,7 @@ void ModelTest::layoutChanged() { for ( int i = 0; i < changing.count(); ++i ) { QPersistentModelIndex p = changing[i]; - Q_ASSERT ( p == model->index ( p.row(), p.column(), p.parent() ) ); + QVERIFY( p == model->index ( p.row(), p.column(), p.parent() ) ); } changing.clear(); } @@ -557,10 +555,10 @@ void ModelTest::rowsRemoved ( const QModelIndex & parent, int start, int end ) { qDebug() << "rr" << parent << start << end; Changing c = remove.pop(); - Q_ASSERT ( c.parent == parent ); - Q_ASSERT ( c.oldSize - ( end - start + 1 ) == model->rowCount ( parent ) ); - Q_ASSERT ( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) ); - Q_ASSERT ( c.next == model->data ( model->index ( start, 0, c.parent ) ) ); + QVERIFY( c.parent == parent ); + QVERIFY( c.oldSize - ( end - start + 1 ) == model->rowCount ( parent ) ); + QVERIFY( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) ); + QVERIFY( c.next == model->data ( model->index ( start, 0, c.parent ) ) ); } diff --git a/tests/auto/modeltest/tst_modeltest.cpp b/tests/auto/modeltest/tst_modeltest.cpp index a75fe5b3c0..aedaffe5fb 100644 --- a/tests/auto/modeltest/tst_modeltest.cpp +++ b/tests/auto/modeltest/tst_modeltest.cpp @@ -201,8 +201,10 @@ class ObservingObject : public QObject Q_OBJECT public: ObservingObject(AccessibleProxyModel *proxy, QObject *parent = 0) - : QObject(parent), - m_proxy(proxy) + : QObject(parent) + , m_proxy(proxy) + , storePersistentFailureCount(0) + , checkPersistentFailureCount(0) { connect(m_proxy, SIGNAL(layoutAboutToBeChanged()), SLOT(storePersistent())); connect(m_proxy, SIGNAL(layoutChanged()), SLOT(checkPersistent())); @@ -215,8 +217,14 @@ public slots: for (int row = 0; row < m_proxy->rowCount(parent); ++row) { QModelIndex proxyIndex = m_proxy->index(row, 0, parent); QModelIndex sourceIndex = m_proxy->mapToSource(proxyIndex); - Q_ASSERT(proxyIndex.isValid()); - Q_ASSERT(sourceIndex.isValid()); + if (!proxyIndex.isValid()) { + qWarning("%s: Invalid proxy index", Q_FUNC_INFO); + ++storePersistentFailureCount; + } + if (!sourceIndex.isValid()) { + qWarning("%s: invalid source index", Q_FUNC_INFO); + ++storePersistentFailureCount; + } m_persistentSourceIndexes.append(sourceIndex); m_persistentProxyIndexes.append(proxyIndex); if (m_proxy->hasChildren(proxyIndex)) @@ -226,12 +234,24 @@ public slots: void storePersistent() { - foreach(const QModelIndex &idx, m_persistentProxyIndexes) - Q_ASSERT(idx.isValid()); // This is called from layoutAboutToBeChanged. Persistent indexes should be valid - - Q_ASSERT(m_proxy->persistent().isEmpty()); + // This method is called from layoutAboutToBeChanged. Persistent indexes should be valid + foreach(const QModelIndex &idx, m_persistentProxyIndexes) + if (!idx.isValid()) { + qWarning("%s: persistentProxyIndexes contains invalid index", Q_FUNC_INFO); + ++storePersistentFailureCount; + } + + if (!m_proxy->persistent().isEmpty()) { + qWarning("%s: proxy should have no persistent indexes when storePersistent called", + Q_FUNC_INFO); + ++storePersistentFailureCount; + } storePersistent(QModelIndex()); - Q_ASSERT(!m_proxy->persistent().isEmpty()); + if (m_proxy->persistent().isEmpty()) { + qWarning("%s: proxy should have persistent index after storePersistent called", + Q_FUNC_INFO); + ++storePersistentFailureCount; + } } void checkPersistent() @@ -243,7 +263,10 @@ public slots: for (int row = 0; row < m_persistentProxyIndexes.size(); ++row) { QModelIndex updatedProxy = m_persistentProxyIndexes.at(row); QModelIndex updatedSource = m_persistentSourceIndexes.at(row); - QCOMPARE(m_proxy->mapToSource(updatedProxy), updatedSource); + if (m_proxy->mapToSource(updatedProxy) != updatedSource) { + qWarning("%s: check failed at row %d", Q_FUNC_INFO, row); + ++checkPersistentFailureCount; + } } m_persistentSourceIndexes.clear(); m_persistentProxyIndexes.clear(); @@ -253,6 +276,9 @@ private: AccessibleProxyModel *m_proxy; QList<QPersistentModelIndex> m_persistentSourceIndexes; QList<QPersistentModelIndex> m_persistentProxyIndexes; +public: + int storePersistentFailureCount; + int checkPersistentFailureCount; }; void tst_ModelTest::moveSourceItems() @@ -280,6 +306,9 @@ void tst_ModelTest::moveSourceItems() moveCommand->setDestAncestors(QList<int>() << 1); moveCommand->setDestRow(0); moveCommand->doCommand(); + + QCOMPARE(observer.storePersistentFailureCount, 0); + QCOMPARE(observer.checkPersistentFailureCount, 0); } void tst_ModelTest::testResetThroughProxy() @@ -302,6 +331,9 @@ void tst_ModelTest::testResetThroughProxy() ModelResetCommand *resetCommand = new ModelResetCommand(model, this); resetCommand->setNumCols(0); resetCommand->doCommand(); + + QCOMPARE(observer.storePersistentFailureCount, 0); + QCOMPARE(observer.checkPersistentFailureCount, 0); } diff --git a/tests/auto/other.pro b/tests/auto/other.pro index a84ab05104..b50e1697b3 100644 --- a/tests/auto/other.pro +++ b/tests/auto/other.pro @@ -3,14 +3,12 @@ TEMPLATE=subdirs SUBDIRS=\ -# exceptionsafety_objects \ shouldn't enable it # baselineexample \ Just an example demonstrating qbaselinetest usage lancelot \ - qaccessibility \ qalgorithms \ qcombobox \ qcssparser \ - #qdatastream \ # FIXME: uses qtsvg (QTBUG-19244) + qdatastream \ qdir \ qfocusevent \ qimage \ @@ -37,6 +35,8 @@ SUBDIRS=\ windowsmobile \ nativeimagehandleprovider +contains(QT_CONFIG, accessibility):SUBDIRS += qaccessibility + contains(QT_CONFIG, OdfWriter):SUBDIRS += qzip qtextodfwriter mac: { SUBDIRS += macgui \ @@ -56,6 +56,8 @@ symbian { qs60mainapplication } +!win32-msvc*:!wince*:SUBDIRS += exceptionsafety_objects + # Following tests depends on private API !contains(QT_CONFIG, private_tests): SUBDIRS -= \ qcombobox \ diff --git a/tests/auto/platformsocketengine/platformsocketengine.pro b/tests/auto/platformsocketengine/platformsocketengine.pro index faf745c679..99ae358a93 100644 --- a/tests/auto/platformsocketengine/platformsocketengine.pro +++ b/tests/auto/platformsocketengine/platformsocketengine.pro @@ -7,7 +7,7 @@ requires(contains(QT_CONFIG,private_tests)) MOC_DIR=tmp -QT = core network +QT = core-private network-private symbian { TARGET.CAPABILITY = NetworkServices diff --git a/tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp b/tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp index 1178169ab1..e77b7bb95e 100644 --- a/tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp +++ b/tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp @@ -83,8 +83,12 @@ public: bool open(QIODevice::OpenMode openMode) { - Q_ASSERT(!openForRead_); - Q_ASSERT(!openForWrite_); + if (openForRead_ || openForWrite_) { + qWarning("%s: file is already open for %s", + Q_FUNC_INFO, + (openForRead_ ? "reading" : "writing")); + return false; + } openFile_ = resolveFile(openMode & QIODevice::WriteOnly); if (!openFile_) @@ -132,13 +136,19 @@ public: qint64 pos() const { - Q_ASSERT(openForRead_ || openForWrite_); + if (!openForRead_ && !openForWrite_) { + qWarning("%s: file is not open", Q_FUNC_INFO); + return -1; + } return position_; } bool seek(qint64 pos) { - Q_ASSERT(openForRead_ || openForWrite_); + if (!openForRead_ && !openForWrite_) { + qWarning("%s: file is not open", Q_FUNC_INFO); + return false; + } if (pos >= 0) { position_ = pos; @@ -150,7 +160,11 @@ public: bool flush() { - Q_ASSERT(openForRead_ || openForWrite_); + if (!openForRead_ && !openForWrite_) { + qWarning("%s: file is not open", Q_FUNC_INFO); + return false; + } + return true; } @@ -346,10 +360,10 @@ public: void setFileName(const QString &file) { - Q_ASSERT(!openForRead_); - Q_ASSERT(!openForWrite_); - - fileName_ = file; + if (openForRead_ || openForWrite_) + qWarning("%s: Can't set file name while file is open", Q_FUNC_INFO); + else + fileName_ = file; } // typedef QAbstractFileEngineIterator Iterator; @@ -368,9 +382,16 @@ public: qint64 read(char *data, qint64 maxLen) { - Q_ASSERT(openForRead_); + if (!openForRead_) { + qWarning("%s: file must be open for reading", Q_FUNC_INFO); + return -1; + } + + if (openFile_.isNull()) { + qWarning("%s: file must not be null", Q_FUNC_INFO); + return -1; + } - Q_ASSERT(!openFile_.isNull()); QMutexLocker lock(&openFile_->mutex); qint64 readSize = qMin(openFile_->content.size() - position_, maxLen); if (readSize < 0) @@ -384,12 +405,19 @@ public: qint64 write(const char *data, qint64 length) { - Q_ASSERT(openForWrite_); + if (!openForWrite_) { + qWarning("%s: file must be open for writing", Q_FUNC_INFO); + return -1; + } + + if (openFile_.isNull()) { + qWarning("%s: file must not be null", Q_FUNC_INFO); + return -1; + } if (length < 0) return -1; - Q_ASSERT(!openFile_.isNull()); QMutexLocker lock(&openFile_->mutex); if (openFile_->content.size() == position_) openFile_->content.append(data, length); @@ -434,7 +462,8 @@ protected: QSharedPointer<File> resolveFile(bool create) const { if (openForRead_ || openForWrite_) { - Q_ASSERT(openFile_); + if (!openFile_) + qWarning("%s: file should not be null", Q_FUNC_INFO); return openFile_; } diff --git a/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp b/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp index f15244525d..3c202920d6 100644 --- a/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp +++ b/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp @@ -299,7 +299,7 @@ public: startTimer(2000); } - void timerEvent(QTimerEvent *event) + void timerEvent(QTimerEvent * /* event */) { // should not crash. (void)new QScrollArea(this); diff --git a/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp b/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp index 11730f277c..8dfa37fc39 100644 --- a/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp +++ b/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp @@ -90,7 +90,7 @@ public: QSizeF documentSize() const { return QSizeF(); } QRectF frameBoundingRect(QTextFrame *) const { return QRectF(); } QRectF blockBoundingRect(const QTextBlock &) const { return QRectF(); } - void documentChanged(int from, int oldLength, int length) { + void documentChanged(int from, int /* oldLength */, int length) { ++changeEvents; QTextBlock last = document()->lastBlock(); diff --git a/tests/auto/qaccessibility/qaccessibility.pro b/tests/auto/qaccessibility/qaccessibility.pro index 21e286baea..75fd1e9793 100644 --- a/tests/auto/qaccessibility/qaccessibility.pro +++ b/tests/auto/qaccessibility/qaccessibility.pro @@ -1,4 +1,5 @@ load(qttest_p4) +requires(contains(QT_CONFIG,accessibility)) SOURCES += tst_qaccessibility.cpp unix:!mac:LIBS+=-lm diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp index 7ff1a0867c..9110bd717d 100644 --- a/tests/auto/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp @@ -40,9 +40,6 @@ ****************************************************************************/ -#ifdef QT3_SUPPORT -#include <Qt3Support/Qt3Support> -#endif #include <QtTest/QtTest> #ifndef Q_OS_WINCE #include "../../shared/util.h" @@ -228,17 +225,10 @@ private slots: void customWidget(); void deletedWidget(); - void childCount(); - void childAt(); // also indexOfChild - void relationTo(); void navigateGeometric(); void navigateHierarchy(); void navigateSlider(); void navigateCovered(); - void navigateControllers(); - void navigateLabels(); - void text(); - void setText(); void hideShowTest(); void userActionCount(); @@ -248,7 +238,6 @@ private slots: void applicationTest(); void mainWindowTest(); void buttonTest(); - void sliderTest(); void scrollBarTest(); void tabTest(); void tabWidgetTest(); @@ -271,15 +260,11 @@ private slots: void tableViewTest(); void calendarWidgetTest(); void dockWidgetTest(); - void pushButtonTest(); void comboBoxTest(); void accessibleName(); void treeWidgetTest(); void labelTest(); void accelerators(); - -private: - QWidget *createGUI(); }; const double Q_PI = 3.14159265358979323846; @@ -326,69 +311,16 @@ QString eventName(const int ev) } } -static QString stateNames(int state) -{ - QString stateString; - if (state == 0x00000000) stateString += " Normal"; - if (state & 0x00000001) stateString += " Unavailable"; - if (state & 0x00000002) stateString += " Selected"; - if (state & 0x00000004) stateString += " Focused"; - if (state & 0x00000008) stateString += " Pressed"; - if (state & 0x00000010) stateString += " Checked"; - if (state & 0x00000020) stateString += " Mixed"; - if (state & 0x00000040) stateString += " ReadOnly"; - if (state & 0x00000080) stateString += " HotTracked"; - if (state & 0x00000100) stateString += " DefaultButton"; - if (state & 0x00000200) stateString += " Expanded"; - if (state & 0x00000400) stateString += " Collapsed"; - if (state & 0x00000800) stateString += " Busy"; - if (state & 0x00001000) stateString += " Floating"; - if (state & 0x00002000) stateString += " Marqueed"; - if (state & 0x00004000) stateString += " Animated"; - if (state & 0x00008000) stateString += " Invisible"; - if (state & 0x00010000) stateString += " Offscreen"; - if (state & 0x00020000) stateString += " Sizeable"; - if (state & 0x00040000) stateString += " Moveable"; - if (state & 0x00080000) stateString += " SelfVoicing"; - if (state & 0x00100000) stateString += " Focusable"; - if (state & 0x00200000) stateString += " Selectable"; - if (state & 0x00400000) stateString += " Linked"; - if (state & 0x00800000) stateString += " Traversed"; - if (state & 0x01000000) stateString += " MultiSelectable"; - if (state & 0x02000000) stateString += " ExtSelectable"; - if (state & 0x04000000) stateString += " AlertLow"; - if (state & 0x08000000) stateString += " AlertMedium"; - if (state & 0x10000000) stateString += " AlertHigh"; - if (state & 0x20000000) stateString += " Protected"; - if (state & 0x3fffffff) stateString += " Valid"; - - if (stateString.isEmpty()) - stateString = "Unknown state " + QString::number(state); - - return stateString; -} - QAccessible::State state(QWidget * const widget) { QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(widget); - Q_ASSERT(iface); - QAccessible::State state = iface->state(0); + if (!iface) + qWarning() << "Cannot get QAccessibleInterface for widget"; + QAccessible::State state = (iface ? iface->state(0) : static_cast<QAccessible::State>(0)); delete iface; return state; } -void printState(QWidget * const widget) -{ - qDebug() << "State for" << widget->metaObject()->className() << stateNames(state(widget)); -} - -void printState(QAccessibleInterface * const iface, const int child = 0) -{ - qDebug() << "State for" << iface->object()->metaObject()->className() << "child" << child - << iface->text(QAccessible::Name, child) << stateNames(iface->state(child)); -} - - class QtTestAccessibleWidget: public QWidget { Q_OBJECT @@ -403,7 +335,6 @@ public: } }; -#ifdef QTEST_ACCESSIBILITY class QtTestAccessibleWidgetIface: public QAccessibleWidget { public: @@ -421,7 +352,6 @@ public: return 0; } }; -#endif tst_QAccessibility::tst_QAccessibility() { @@ -433,17 +363,13 @@ tst_QAccessibility::~tst_QAccessibility() void tst_QAccessibility::initTestCase() { -#ifdef QTEST_ACCESSIBILITY QTestAccessibility::initialize(); QAccessible::installFactory(QtTestAccessibleWidgetIface::ifaceFactory); -#endif } void tst_QAccessibility::cleanupTestCase() { -#ifdef QTEST_ACCESSIBILITY QTestAccessibility::cleanup(); -#endif } void tst_QAccessibility::init() @@ -453,7 +379,6 @@ void tst_QAccessibility::init() void tst_QAccessibility::cleanup() { -#ifdef QTEST_ACCESSIBILITY const EventList list = QTestAccessibility::events(); if (!list.isEmpty()) { qWarning("%d accessibility event(s) were not handled in testfunction '%s':", list.count(), @@ -463,14 +388,10 @@ void tst_QAccessibility::cleanup() eventName(list.at(i).event).toAscii().constData(), list.at(i).event, list.at(i).child); } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::eventTest() { -#ifdef QTEST_ACCESSIBILITY QPushButton* button = new QPushButton(0); button->setObjectName(QString("Olaf")); @@ -491,14 +412,10 @@ void tst_QAccessibility::eventTest() QVERIFY_EVENT(button, 0, QAccessible::ObjectHide); delete button; -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::customWidget() { -#ifdef QTEST_ACCESSIBILITY QtTestAccessibleWidget* widget = new QtTestAccessibleWidget(0, "Heinz"); QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(widget); @@ -510,14 +427,10 @@ void tst_QAccessibility::customWidget() delete iface; delete widget; -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::deletedWidget() { -#ifdef QTEST_ACCESSIBILITY QtTestAccessibleWidget *widget = new QtTestAccessibleWidget(0, "Ralf"); QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(widget); QVERIFY(iface != 0); @@ -528,403 +441,10 @@ void tst_QAccessibility::deletedWidget() widget = 0; QVERIFY(!iface->isValid()); delete iface; -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -} - -QWidget *tst_QAccessibility::createGUI() -{ -#if !defined(QT3_SUPPORT) - qWarning( "Should never get here without Qt3Support"); - return 0; -#else -# ifdef QTEST_ACCESSIBILITY - QWidget *toplevel = new QWidget(0, Qt::X11BypassWindowManagerHint); - QGridLayout *grid = new QGridLayout(toplevel, 2, 2); - - // topLeft - hierarchies - Q3VBox *topLeft = new Q3VBox(toplevel, "topLeft"); - topLeft->setSpacing(2); - grid->addWidget(topLeft, 0, 0); - - Q3VButtonGroup *group1 = new Q3VButtonGroup("Title1:", topLeft, "group1"); - /*QPushButton *pb1 = */ new QPushButton("Button&1", group1, "pb1"); - Q3VButtonGroup *group2 = new Q3VButtonGroup("Title2:", topLeft, "group2"); - /*QPushButton *pb2 = */ new QPushButton("Button2", group2, "pb2"); - - Q3WidgetStack *stack = new Q3WidgetStack(topLeft, "stack"); - QLabel *page1 = new QLabel("Page 1", stack, "page1"); - stack->addWidget(page1); - QLabel *page2 = new QLabel("Page 2", stack, "page2"); - stack->addWidget(page2); - QLabel *page3 = new QLabel("Page 3", stack, "page3"); - stack->addWidget(page3); - - // topRight - controlling - Q3VBox *topRight= new Q3VBox(toplevel, "topRight"); - grid->addWidget(topRight, 0, 1); - - QPushButton *pbOk = new QPushButton("Ok", topRight, "pbOk" ); - pbOk->setDefault(TRUE); - QSlider *slider = new QSlider(Qt::Horizontal, topRight, "slider"); - QLCDNumber *sliderLcd = new QLCDNumber(topRight, "sliderLcd"); - QSpinBox *spinBox = new QSpinBox(topRight, "spinBox"); - - connect(pbOk, SIGNAL(clicked()), toplevel, SLOT(close()) ); - connect(slider, SIGNAL(valueChanged(int)), sliderLcd, SLOT(display(int))); - connect(spinBox, SIGNAL(valueChanged(int)), slider, SLOT(setValue(int))); - - spinBox->setValue(50); - - // bottomLeft - labeling and controlling - Q3HBox *bottomLeft = new Q3HBox(toplevel, "bottomLeft"); - grid->addWidget(bottomLeft, 1, 0); - - QLabel *label = new QLabel("This is a &lineedit:", bottomLeft, "label"); - QLineEdit *lineedit = new QLineEdit(bottomLeft, "lineedit"); - label->setBuddy(lineedit); - QLabel *label2 = new QLabel(bottomLeft, "label2"); - - connect(lineedit, SIGNAL(textChanged(const QString&)), label2, SLOT(setText(const QString&))); - - Q3VButtonGroup *radiogroup = new Q3VButtonGroup("Exclusive &choices:", bottomLeft, "radiogroup"); - QLineEdit *frequency = new QLineEdit(radiogroup, "frequency"); - frequency->setText("100 Mhz"); - QRadioButton *radioAM = new QRadioButton("&AM", radiogroup, "radioAM"); - /* QRadioButton *radioFM = */ new QRadioButton("&FM", radiogroup, "radioFM"); - /* QRadioButton *radioSW = */ new QRadioButton("&Shortwave", radiogroup, "radioSW"); - - // bottomRight - ### empty - Q3HBox *bottomRight = new Q3HBox(toplevel, "bottomRight"); - grid->addWidget(bottomRight, 1, 1); - - toplevel->adjustSize(); // sends layout and child events - - // some tooltips - QToolTip::add(label, "A label"); - QToolTip::add(lineedit, "A line edit"); - // some whatsthis - QWhatsThis::add(label, "A label displays static text"); - QWhatsThis::add(frequency, "You can enter a single line of text here"); - - radioAM->setFocus(); - QTestAccessibility::clearEvents(); - return toplevel; -# else - Q_ASSERT(0); // this function cannot be called without accessibility support - return 0; -# endif -#endif // !QT3_SUPPORT -} - -void tst_QAccessibility::childAt() -{ -#if !defined(QT3_SUPPORT) - QSKIP("This test needs Qt3Support", SkipAll); -#else -#ifdef QTEST_ACCESSIBILITY - QWidget *toplevel = createGUI(); - QAccessibleInterface *acc_toplevel = QAccessible::queryAccessibleInterface(toplevel); - QVERIFY(acc_toplevel); - // this is necessary to have the layout setup correctly - toplevel->show(); - - QObjectList children = toplevel->queryList("QWidget", 0, 0, 0); - for (int c = 1; c <= children.count(); ++c) { - QWidget *child = qobject_cast<QWidget*>(children.at(c-1)); - QAccessibleInterface *acc_child = QAccessible::queryAccessibleInterface(child); - QVERIFY(acc_child); - QCOMPARE(acc_child->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, QAccessible::Child); - - QPoint center(child->mapToGlobal(child->rect().center())); - QRect childRect(child->geometry()); - childRect.moveCenter(center); - - QCOMPARE(acc_child->rect(0), childRect); - QCOMPARE(acc_toplevel->childAt(childRect.center().x(), childRect.center().y()), c); - QCOMPARE(acc_toplevel->childAt(childRect.left(), childRect.top()), c); - QCOMPARE(acc_toplevel->childAt(childRect.left(), childRect.bottom()), c); - QCOMPARE(acc_toplevel->childAt(childRect.right(), childRect.top()), c); - QCOMPARE(acc_toplevel->childAt(childRect.right(), childRect.bottom()), c); - - QCOMPARE(acc_toplevel->indexOfChild(acc_child), c); - delete acc_child; - } - - delete acc_toplevel; - delete toplevel; - QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -#endif // !QT3_SUPPORT -} - -void tst_QAccessibility::childCount() -{ -#if !defined(QT3_SUPPORT) - QSKIP("This test needs Qt3Support", SkipAll); -#else -#ifdef QTEST_ACCESSIBILITY - QWidget *toplevel = createGUI(); - QObject *topLeft = toplevel->child("topLeft"); - QObject *topRight = toplevel->child("topRight"); - QObject *bottomLeft = toplevel->child("bottomLeft"); - QObject *bottomRight = toplevel->child("bottomRight"); - - QAccessibleInterface* acc_toplevel = QAccessible::queryAccessibleInterface(toplevel); - QAccessibleInterface* acc_topLeft = QAccessible::queryAccessibleInterface(topLeft); - QAccessibleInterface* acc_topRight = QAccessible::queryAccessibleInterface(topRight); - QAccessibleInterface* acc_bottomLeft = QAccessible::queryAccessibleInterface(bottomLeft); - QAccessibleInterface* acc_bottomRight = QAccessible::queryAccessibleInterface(bottomRight); - - QVERIFY(acc_toplevel); - QVERIFY(acc_topLeft); - QVERIFY(acc_topRight); - QVERIFY(acc_bottomLeft); - QVERIFY(acc_bottomRight); - - toplevel->show(); - QCOMPARE(acc_toplevel->childCount(), toplevel->queryList("QWidget", 0, 0, 0).count()); - QCOMPARE(acc_topLeft->childCount(), topLeft->queryList("QWidget", 0, 0, 0).count()); - QCOMPARE(acc_topRight->childCount(), topRight->queryList("QWidget", 0, 0, 0).count()); - QCOMPARE(acc_bottomLeft->childCount(), bottomLeft->queryList("QWidget", 0, 0, 0).count()); - QCOMPARE(acc_bottomRight->childCount(), bottomRight->queryList("QWidget", 0, 0, 0).count()); - - delete acc_toplevel; - delete acc_topLeft; - delete acc_topRight; - delete acc_bottomLeft; - delete acc_bottomRight; - delete toplevel; - QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -#endif // !QT3_SUPPORT -} - -void tst_QAccessibility::relationTo() -{ -#if !defined(QT3_SUPPORT) - QSKIP("This test needs Qt3Support", SkipAll); -#else -#ifdef QTEST_ACCESSIBILITY - QWidget *toplevel = createGUI(); - toplevel->resize(400,300); - QObject *topLeft = toplevel->child("topLeft"); - QObject *topRight = toplevel->child("topRight"); - QObject *bottomLeft = toplevel->child("bottomLeft"); - QObject *bottomRight = toplevel->child("bottomRight"); - - toplevel->show(); - - QAccessibleInterface *acc_toplevel = QAccessible::queryAccessibleInterface(toplevel); - - QAccessibleInterface *acc_topLeft = QAccessible::queryAccessibleInterface(topLeft); - QAccessibleInterface *acc_group1 = QAccessible::queryAccessibleInterface(topLeft->child("group1")); - QVERIFY(topLeft->child("group1")); - QAccessibleInterface *acc_pb1 = QAccessible::queryAccessibleInterface(topLeft->child("group1")->child("pb1")); - QAccessibleInterface *acc_group2 = QAccessible::queryAccessibleInterface(topLeft->child("group2")); - QAccessibleInterface *acc_pb2 = 0; - QAccessibleInterface *acc_stack = QAccessible::queryAccessibleInterface(topLeft->child("stack")); - QAccessibleInterface *acc_page1 = QAccessible::queryAccessibleInterface(topLeft->child("stack")->child("page1")); - QAccessibleInterface *acc_page2 = QAccessible::queryAccessibleInterface(topLeft->child("stack")->child("page2")); - QAccessibleInterface *acc_page3 = QAccessible::queryAccessibleInterface(topLeft->child("stack")->child("page3")); - QAccessibleInterface *acc_topRight = QAccessible::queryAccessibleInterface(topRight); - QAccessibleInterface *acc_pbOk = QAccessible::queryAccessibleInterface(topRight->child("pbOk")); - QAccessibleInterface *acc_slider = QAccessible::queryAccessibleInterface(topRight->child("slider")); - QAccessibleInterface *acc_spinBox = QAccessible::queryAccessibleInterface(topRight->child("spinBox")); - QAccessibleInterface *acc_sliderLcd = QAccessible::queryAccessibleInterface(topRight->child("sliderLcd")); - - QAccessibleInterface *acc_bottomLeft = QAccessible::queryAccessibleInterface(bottomLeft); - QAccessibleInterface *acc_label = QAccessible::queryAccessibleInterface(bottomLeft->child("label")); - QAccessibleInterface *acc_lineedit = QAccessible::queryAccessibleInterface(bottomLeft->child("lineedit")); - QAccessibleInterface *acc_label2 = QAccessible::queryAccessibleInterface(bottomLeft->child("label2")); - QAccessibleInterface *acc_radiogroup = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")); - QAccessibleInterface *acc_radioAM = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("radioAM")); - QAccessibleInterface *acc_radioFM = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("radioFM")); - QAccessibleInterface *acc_radioSW = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("radioSW")); - QAccessibleInterface *acc_frequency = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("frequency")); - - QAccessibleInterface *acc_bottomRight = QAccessible::queryAccessibleInterface(bottomRight); - - QVERIFY(acc_toplevel); - QVERIFY(acc_topLeft); - QVERIFY(acc_topRight); - QVERIFY(acc_bottomLeft); - QVERIFY(acc_bottomRight); - QVERIFY(acc_group1); - QVERIFY(acc_group2); - QVERIFY(acc_stack); - QVERIFY(acc_page1); - QVERIFY(acc_page2); - QVERIFY(acc_page3); - QVERIFY(acc_pbOk); - QVERIFY(acc_slider); - QVERIFY(acc_spinBox); - QVERIFY(acc_sliderLcd); - QVERIFY(acc_label); - QVERIFY(acc_lineedit); - QVERIFY(acc_radiogroup); - QVERIFY(acc_radioAM); - QVERIFY(acc_radioFM); - QVERIFY(acc_radioSW); - QVERIFY(acc_frequency); - - // hierachy relations - QCOMPARE(acc_toplevel->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Self); - QCOMPARE(acc_toplevel->relationTo(1, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Child); - QCOMPARE(acc_toplevel->relationTo(0, acc_toplevel, 1) & QAccessible::HierarchyMask, - QAccessible::Ancestor); - - QCOMPARE(acc_toplevel->relationTo(0, acc_topLeft, 0) & QAccessible::HierarchyMask, - QAccessible::Ancestor); - QCOMPARE(acc_toplevel->relationTo(0, acc_topRight, 0) & QAccessible::HierarchyMask, - QAccessible::Ancestor); - QCOMPARE(acc_toplevel->relationTo(0, acc_bottomLeft, 0) & QAccessible::HierarchyMask, - QAccessible::Ancestor); - QCOMPARE(acc_toplevel->relationTo(0, acc_bottomRight, 0) & QAccessible::HierarchyMask, - QAccessible::Ancestor); - - QCOMPARE(acc_toplevel->relationTo(0, acc_group1, 0) & QAccessible::HierarchyMask, - QAccessible::Ancestor); - QCOMPARE(acc_toplevel->relationTo(0, acc_page1, 0) & QAccessible::HierarchyMask, - QAccessible::Ancestor); - QCOMPARE(acc_group1->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Descendent); - QCOMPARE(acc_stack->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Descendent); - QCOMPARE(acc_page1->relationTo(0, acc_stack, 0) & QAccessible::HierarchyMask, - QAccessible::Child); - QCOMPARE(acc_page1->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Descendent); - - QCOMPARE(acc_topLeft->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Child); - QCOMPARE(acc_topRight->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Child); - QCOMPARE(acc_bottomLeft->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Child); - QCOMPARE(acc_bottomRight->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, - QAccessible::Child); - - QCOMPARE(acc_topLeft->relationTo(0, acc_topRight, 0) & QAccessible::HierarchyMask, - QAccessible::Sibling); - QCOMPARE(acc_topLeft->relationTo(0, acc_bottomLeft, 0) & QAccessible::HierarchyMask, - QAccessible::Sibling); - QCOMPARE(acc_topLeft->relationTo(0, acc_bottomRight, 0) & QAccessible::HierarchyMask, - QAccessible::Sibling); - - QCOMPARE(acc_pb1->relationTo(0, acc_pb2, 0), QAccessible::Unrelated); - - // geometrical relations - only valid for siblings - QCOMPARE(acc_topLeft->relationTo(0, acc_topRight, 0), QAccessible::Sibling | QAccessible::Left); - QCOMPARE(acc_topLeft->relationTo(0, acc_bottomLeft, 0), QAccessible::Sibling | QAccessible::Up); - QCOMPARE(acc_topLeft->relationTo(0, acc_bottomRight, 0), QAccessible::Sibling | QAccessible::Left | QAccessible::Up); - - QCOMPARE(acc_bottomRight->relationTo(0, acc_topLeft, 0), QAccessible::Sibling | QAccessible::Right | QAccessible::Down); - QCOMPARE(acc_bottomRight->relationTo(0, acc_topRight, 0), QAccessible::Sibling | QAccessible::Down); - QCOMPARE(acc_bottomRight->relationTo(0, acc_bottomLeft, 0), QAccessible::Sibling | QAccessible::Right); -#ifdef Q_WS_MAC - QEXPECT_FAIL("", "Task 155501", Continue); -#endif - QCOMPARE(acc_group1->relationTo(0, acc_group2, 0), QAccessible::Sibling | QAccessible::Up); -#ifdef Q_WS_MAC - QEXPECT_FAIL("", "Task 155501", Continue); -#endif - QCOMPARE(acc_group2->relationTo(0, acc_group1, 0), QAccessible::Sibling | QAccessible::Down); - - // Covers/Covered tested in navigateCovered - - // logical relations - focus - QCOMPARE(acc_radioAM->relationTo(0, acc_radioFM, 0) & QAccessible::FocusChild, - QAccessible::Unrelated); - QCOMPARE(acc_radioAM->relationTo(0, acc_radiogroup, 0) & QAccessible::FocusChild, - QAccessible::FocusChild); - QCOMPARE(acc_radioAM->relationTo(0, acc_bottomLeft, 0) & QAccessible::FocusChild, - QAccessible::FocusChild); - QCOMPARE(acc_radioAM->relationTo(0, acc_topLeft, 0) & QAccessible::FocusChild, - QAccessible::Unrelated); - QCOMPARE(acc_radioAM->relationTo(0, acc_toplevel, 0) & QAccessible::FocusChild, - QAccessible::FocusChild); - - // logical relations - labels - QCOMPARE(acc_label->relationTo(0, acc_lineedit, 0) & QAccessible::LogicalMask, - QAccessible::Label); - QCOMPARE(acc_lineedit->relationTo(0, acc_label, 0) & QAccessible::LogicalMask, - QAccessible::Labelled); - QCOMPARE(acc_label->relationTo(0, acc_radiogroup, 0) & QAccessible::LogicalMask, - QAccessible::Unrelated); - QCOMPARE(acc_lineedit->relationTo(0, acc_lineedit, 0) & QAccessible::LogicalMask, - QAccessible::Unrelated); - - QEXPECT_FAIL("", "Make me accessible", Continue); - QCOMPARE(acc_radiogroup->relationTo(0, acc_radioAM, 0) & QAccessible::LogicalMask, - QAccessible::Label | QAccessible::Controlled); - QEXPECT_FAIL("", "Make me accessible", Continue); - QCOMPARE(acc_radiogroup->relationTo(0, acc_radioFM, 0) & QAccessible::LogicalMask, - QAccessible::Label | QAccessible::Controlled); - QEXPECT_FAIL("", "Make me accessible", Continue); - QCOMPARE(acc_radiogroup->relationTo(0, acc_radioSW, 0) & QAccessible::LogicalMask, - QAccessible::Label | QAccessible::Controlled); - QCOMPARE(acc_radiogroup->relationTo(0, acc_frequency, 0) & QAccessible::LogicalMask, - QAccessible::Label); - QCOMPARE(acc_frequency->relationTo(0, acc_radiogroup, 0) & QAccessible::LogicalMask, - QAccessible::Labelled); - QCOMPARE(acc_radiogroup->relationTo(0, acc_lineedit, 0) & QAccessible::LogicalMask, - QAccessible::Unrelated); - - // logical relations - controller - QCOMPARE(acc_pbOk->relationTo(0, acc_toplevel, 0) & QAccessible::LogicalMask, - QAccessible::Controller); - QCOMPARE(acc_slider->relationTo(0, acc_sliderLcd, 0) & QAccessible::LogicalMask, - QAccessible::Controller); - QCOMPARE(acc_spinBox->relationTo(0, acc_slider, 0) & QAccessible::LogicalMask, - QAccessible::Controller); - QCOMPARE(acc_lineedit->relationTo(0, acc_label2, 0) & QAccessible::LogicalMask, - QAccessible::Controller); - - delete acc_toplevel; - delete acc_topLeft; - delete acc_group1; - delete acc_pb1; - delete acc_group2; - delete acc_stack; - delete acc_page1; - delete acc_page2; - delete acc_page3; - delete acc_topRight; - delete acc_pbOk; - delete acc_slider; - delete acc_spinBox; - delete acc_sliderLcd; - delete acc_bottomLeft; - delete acc_label; - delete acc_lineedit; - delete acc_label2; - delete acc_radiogroup; - delete acc_radioAM; - delete acc_radioFM; - delete acc_radioSW; - delete acc_frequency; - delete acc_bottomRight; - - delete toplevel; - - QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -#endif // !QT3_SUPPORT } void tst_QAccessibility::navigateGeometric() { -#ifdef QTEST_ACCESSIBILITY { static const int skip = 20; //speed the test up significantly static const double step = Q_PI / 180; @@ -1020,14 +540,10 @@ void tst_QAccessibility::navigateGeometric() delete w; } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::navigateSlider() { -#ifdef QTEST_ACCESSIBILITY { QSlider *slider = new QSlider(0); slider->setObjectName(QString("Slidy")); @@ -1054,14 +570,10 @@ void tst_QAccessibility::navigateSlider() delete slider; } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::navigateCovered() { -#ifdef QTEST_ACCESSIBILITY { QWidget *w = new QWidget(0); w->setObjectName(QString("Harry")); @@ -1164,14 +676,10 @@ void tst_QAccessibility::navigateCovered() delete w; } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::navigateHierarchy() { -#ifdef QTEST_ACCESSIBILITY { QWidget *w = new QWidget(0); w->setObjectName(QString("Hans")); @@ -1267,241 +775,11 @@ void tst_QAccessibility::navigateHierarchy() delete w; } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } #define QSETCOMPARE(thetypename, elements, otherelements) \ QCOMPARE((QSet<thetypename>() << elements), (QSet<thetypename>() << otherelements)) -void tst_QAccessibility::navigateControllers() -{ -#if !defined(QT3_SUPPORT) - QSKIP("This test needs Qt3Support", SkipAll); -#else -#ifdef QTEST_ACCESSIBILITY - { - Q3VBox vbox; - QSlider slider(&vbox); - QSpinBox spinBox(&vbox); - QLCDNumber lcd1(&vbox); - QLCDNumber lcd2(&vbox); - QLabel label(&vbox); - vbox.show(); - - slider.setObjectName("slider"); - spinBox.setObjectName("spinBox"); - lcd1.setObjectName("lcd1"); - lcd2.setObjectName("lcd2"); - label.setObjectName("label"); - - QTestAccessibility::clearEvents(); - - connect(&slider, SIGNAL(valueChanged(int)), &lcd1, SLOT(display(int))); - connect(&slider, SIGNAL(valueChanged(int)), &lcd2, SLOT(display(int))); - connect(&spinBox, SIGNAL(valueChanged(int)), &lcd2, SLOT(display(int))); - connect(&spinBox, SIGNAL(valueChanged(int)), &lcd1, SLOT(display(int))); - connect(&spinBox, SIGNAL(valueChanged(const QString&)), &label, SLOT(setText(const QString&))); - - QAccessibleInterface *acc_slider = QAccessible::queryAccessibleInterface(&slider); - QAccessibleInterface *acc_spinBox = QAccessible::queryAccessibleInterface(&spinBox); - QAccessibleInterface *acc_lcd1 = QAccessible::queryAccessibleInterface(&lcd1); - QAccessibleInterface *acc_lcd2 = QAccessible::queryAccessibleInterface(&lcd2); - QAccessibleInterface *acc_label = QAccessible::queryAccessibleInterface(&label); - - QVERIFY(acc_slider->relationTo(0, acc_lcd1, 0) & QAccessible::Controller); - QVERIFY(acc_slider->relationTo(0, acc_lcd2, 0) & QAccessible::Controller); - QVERIFY(acc_spinBox->relationTo(0, acc_lcd1, 0) & QAccessible::Controller); - QVERIFY(acc_spinBox->relationTo(0, acc_lcd2, 0) & QAccessible::Controller); - QVERIFY(acc_spinBox->relationTo(0, acc_label, 0) & QAccessible::Controller); - - QAccessibleInterface *acc_target1, *acc_target2, *acc_target3; - // from controller - QCOMPARE(acc_slider->navigate(QAccessible::Controlled, 0, &acc_target1), -1); - QVERIFY(!acc_target1); - QCOMPARE(acc_slider->navigate(QAccessible::Controlled, 1, &acc_target1), 0); - QCOMPARE(acc_slider->navigate(QAccessible::Controlled, 2, &acc_target2), 0); - QSETCOMPARE(QObject*, acc_lcd1->object() << acc_lcd2->object(), - acc_target1->object() << acc_target2->object()); - delete acc_target1; - delete acc_target2; - - QCOMPARE(acc_slider->navigate(QAccessible::Controlled, 3, &acc_target1), -1); - QVERIFY(!acc_target1); - - QCOMPARE(acc_spinBox->navigate(QAccessible::Controlled, 0, &acc_target1), -1); - QVERIFY(!acc_target1); - QCOMPARE(acc_spinBox->navigate(QAccessible::Controlled, 1, &acc_target1), 0); - QCOMPARE(acc_spinBox->navigate(QAccessible::Controlled, 2, &acc_target2), 0); - QCOMPARE(acc_spinBox->navigate(QAccessible::Controlled, 3, &acc_target3), 0); - QSETCOMPARE(QObject*, acc_lcd1->object() << acc_lcd2->object() << acc_label->object(), - acc_target1->object() << acc_target2->object() << acc_target3->object()); - delete acc_target1; - delete acc_target2; - delete acc_target3; - - QCOMPARE(acc_spinBox->navigate(QAccessible::Controlled, 4, &acc_target1), -1); - QVERIFY(!acc_target1); - - // to controller - QCOMPARE(acc_lcd1->navigate(QAccessible::Controller, 0, &acc_target1), -1); - QVERIFY(!acc_target1); - QCOMPARE(acc_lcd1->navigate(QAccessible::Controller, 1, &acc_target1), 0); - QCOMPARE(acc_lcd1->navigate(QAccessible::Controller, 2, &acc_target2), 0); - QSETCOMPARE(QObject*, acc_slider->object() << acc_spinBox->object(), - acc_target1->object() << acc_target2->object()); - delete acc_target1; - delete acc_target2; - QCOMPARE(acc_lcd1->navigate(QAccessible::Controller, 3, &acc_target1), -1); - QVERIFY(!acc_target1); - - delete acc_label; - delete acc_lcd2; - delete acc_lcd1; - delete acc_spinBox; - delete acc_slider; - } - QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -#endif // !QT3_SUPPORT -} - -void tst_QAccessibility::navigateLabels() -{ -#if !defined(QT3_SUPPORT) - QSKIP("This test needs Qt3Support", SkipAll); -#else -#ifdef QTEST_ACCESSIBILITY - { - Q3VBox vbox; - Q3HBox hbox(&vbox); - - QLabel label(&hbox); - label.setText("This is a lineedit:"); - QLineEdit lineedit(&hbox); - label.setBuddy(&lineedit); - - Q3VButtonGroup groupbox(&vbox); - groupbox.setTitle("Be my children!"); - QRadioButton radio(&groupbox); - QLabel label2(&groupbox); - label2.setText("Another lineedit:"); - QLineEdit lineedit2(&groupbox); - label2.setBuddy(&lineedit2); - Q3GroupBox groupbox2(&groupbox); - groupbox2.setTitle("Some grand-children"); - QLineEdit grandchild(&groupbox2); - - Q3GroupBox border(&vbox); - QLineEdit lineedit3(&border); - vbox.show(); - QTestAccessibility::clearEvents(); - - QAccessibleInterface *acc_label = QAccessible::queryAccessibleInterface(&label); - QAccessibleInterface *acc_lineedit = QAccessible::queryAccessibleInterface(&lineedit); - QAccessibleInterface *acc_groupbox = QAccessible::queryAccessibleInterface(&groupbox); - QAccessibleInterface *acc_radio = QAccessible::queryAccessibleInterface(&radio); - QAccessibleInterface *acc_label2 = QAccessible::queryAccessibleInterface(&label2); - QAccessibleInterface *acc_lineedit2 = QAccessible::queryAccessibleInterface(&lineedit2); - QAccessibleInterface *acc_groupbox2 = QAccessible::queryAccessibleInterface(&groupbox2); - QAccessibleInterface *acc_grandchild = QAccessible::queryAccessibleInterface(&grandchild); - QAccessibleInterface *acc_border = QAccessible::queryAccessibleInterface(&border); - QAccessibleInterface *acc_lineedit3 = QAccessible::queryAccessibleInterface(&lineedit3); - - QVERIFY(acc_label->relationTo(0, acc_lineedit,0) & QAccessible::Label); - QVERIFY(acc_groupbox->relationTo(0, acc_radio,0) & QAccessible::Label); - QVERIFY(acc_groupbox->relationTo(0, acc_lineedit2,0) & QAccessible::Label); - QVERIFY(acc_groupbox->relationTo(0, acc_groupbox2,0) & QAccessible::Label); - QVERIFY(acc_groupbox2->relationTo(0, acc_grandchild,0) & QAccessible::Label); - QVERIFY(!(acc_border->relationTo(0, acc_lineedit3,0) & QAccessible::Label)); - - QAccessibleInterface *acc_target; - // from label - QCOMPARE(acc_label->navigate(QAccessible::Labelled, 0, &acc_target), -1); - QVERIFY(!acc_target); - QCOMPARE(acc_label->navigate(QAccessible::Labelled, 1, &acc_target), 0); - QVERIFY(acc_target->object() == acc_lineedit->object()); - delete acc_target; acc_target = 0; - QCOMPARE(acc_label->navigate(QAccessible::Labelled, 2, &acc_target), -1); - QVERIFY(!acc_target); - - QCOMPARE(acc_groupbox->navigate(QAccessible::Labelled, 0, &acc_target), -1); - QVERIFY(!acc_target); - QCOMPARE(acc_groupbox->navigate(QAccessible::Labelled, 1, &acc_target), 0); - QVERIFY(acc_target->object() == acc_radio->object()); - delete acc_target; acc_target = 0; - QCOMPARE(acc_groupbox->navigate(QAccessible::Labelled, 2, &acc_target), 0); - QVERIFY(acc_target->object() == acc_label2->object()); - delete acc_target; acc_target = 0; - QCOMPARE(acc_groupbox->navigate(QAccessible::Labelled, 3, &acc_target), 0); - QVERIFY(acc_target->object() == acc_lineedit2->object()); - delete acc_target; acc_target = 0; - QCOMPARE(acc_groupbox->navigate(QAccessible::Labelled, 4, &acc_target), 0); - QVERIFY(acc_target->object() == acc_groupbox2->object()); - delete acc_target; acc_target = 0; - QCOMPARE(acc_groupbox->navigate(QAccessible::Labelled, 5, &acc_target), -1); - QVERIFY(!acc_target); - - QCOMPARE(acc_border->navigate(QAccessible::Labelled, 0, &acc_target), -1); - QVERIFY(!acc_target); - QCOMPARE(acc_border->navigate(QAccessible::Labelled, 1, &acc_target), -1); - QVERIFY(!acc_target); - - // to label - QCOMPARE(acc_lineedit->navigate(QAccessible::Label, 0, &acc_target), -1); - QVERIFY(!acc_target); - QCOMPARE(acc_lineedit->navigate(QAccessible::Label, 1, &acc_target), 0); - QVERIFY(acc_target->object() == acc_label->object()); - delete acc_target; acc_target = 0; - QCOMPARE(acc_lineedit->navigate(QAccessible::Label, 2, &acc_target), -1); - QVERIFY(!acc_target); - - QCOMPARE(acc_radio->navigate(QAccessible::Label, 0, &acc_target), -1); - QVERIFY(!acc_target); - QCOMPARE(acc_radio->navigate(QAccessible::Label, 1, &acc_target), 0); - QVERIFY(acc_target->object() == acc_groupbox->object()); - delete acc_target; acc_target = 0; - QCOMPARE(acc_radio->navigate(QAccessible::Label, 2, &acc_target), -1); - QVERIFY(!acc_target); - - QCOMPARE(acc_lineedit2->navigate(QAccessible::Label, 1, &acc_target), 0); - QVERIFY(acc_target->object() == acc_label2->object()); - delete acc_target; acc_target = 0; - QCOMPARE(acc_lineedit2->navigate(QAccessible::Label, 2, &acc_target), 0); - QVERIFY(acc_target->object() == acc_groupbox->object()); - delete acc_target; acc_target = 0; - QCOMPARE(acc_lineedit2->navigate(QAccessible::Label, 3, &acc_target), -1); - QVERIFY(!acc_target); - - QCOMPARE(acc_grandchild->navigate(QAccessible::Label, 1, &acc_target), 0); - QVERIFY(acc_target->object() == acc_groupbox2->object()); - delete acc_target; acc_target = 0; - QCOMPARE(acc_grandchild->navigate(QAccessible::Label, 2, &acc_target), -1); - QVERIFY(!acc_target); - QCOMPARE(acc_grandchild->navigate(QAccessible::Label, 3, &acc_target), -1); - QVERIFY(!acc_target); - - delete acc_label; - delete acc_lineedit; - delete acc_groupbox; - delete acc_radio; - delete acc_label2; - delete acc_lineedit2; - delete acc_groupbox2; - delete acc_grandchild; - delete acc_border; - delete acc_lineedit3; - } - QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -#endif // !QT3_SUPPORT -} - static QWidget *createWidgets() { QWidget *w = new QWidget(); @@ -1550,7 +828,6 @@ static QWidget *createWidgets() void tst_QAccessibility::accessibleName() { -#ifdef QTEST_ACCESSIBILITY QWidget *toplevel = createWidgets(); toplevel->show(); #if defined(Q_WS_X11) @@ -1575,158 +852,10 @@ void tst_QAccessibility::accessibleName() delete toplevel; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -} - -void tst_QAccessibility::text() -{ -#if !defined(QT3_SUPPORT) - QSKIP("This test needs Qt3Support", SkipAll); -#else -#ifdef QTEST_ACCESSIBILITY - QWidget *toplevel = createGUI(); - toplevel->show(); -#if defined(Q_WS_X11) - qt_x11_wait_for_window_manager(toplevel); - QTest::qWait(100); -#endif - QObject *topLeft = toplevel->child("topLeft"); - QObject *topRight = toplevel->child("topRight"); - QObject *bottomLeft = toplevel->child("bottomLeft"); - - QAccessibleInterface *acc_pb1 = QAccessible::queryAccessibleInterface(topLeft->child("pb1")); - - QAccessibleInterface *acc_pbOk = QAccessible::queryAccessibleInterface(topRight->child("pbOk")); - QAccessibleInterface *acc_slider = QAccessible::queryAccessibleInterface(topRight->child("slider")); - QAccessibleInterface *acc_spinBox = QAccessible::queryAccessibleInterface(topRight->child("spinBox")); - QAccessibleInterface *acc_sliderLcd = QAccessible::queryAccessibleInterface(topRight->child("sliderLcd")); - - QAccessibleInterface *acc_label = QAccessible::queryAccessibleInterface(bottomLeft->child("label")); - QAccessibleInterface *acc_lineedit = QAccessible::queryAccessibleInterface(bottomLeft->child("lineedit")); - QAccessibleInterface *acc_radiogroup = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")); - QVERIFY(bottomLeft->child("radiogroup")); - QAccessibleInterface *acc_radioAM = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("radioAM")); - QAccessibleInterface *acc_frequency = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("frequency")); - - QVERIFY(acc_pb1); - - QVERIFY(acc_pbOk); - QVERIFY(acc_slider); - QVERIFY(acc_spinBox); - QVERIFY(acc_sliderLcd); - - QVERIFY(acc_label); - QVERIFY(acc_lineedit); - QVERIFY(acc_radiogroup); - QVERIFY(acc_radioAM); - QVERIFY(acc_frequency); - - QVERIFY(acc_label->relationTo(0, acc_lineedit, 0) & QAccessible::Label); - QVERIFY(acc_radiogroup->relationTo(0, acc_frequency, 0) & QAccessible::Label); - QVERIFY(acc_slider->relationTo(0, acc_sliderLcd, 0) & QAccessible::Controller); - QVERIFY(acc_spinBox->relationTo(0, acc_slider, 0) & QAccessible::Controller); - - // Name - QCOMPARE(acc_lineedit->text(QAccessible::Name, 0), acc_label->text(QAccessible::Name,0)); - QCOMPARE(acc_frequency->text(QAccessible::Name, 0), acc_radiogroup->text(QAccessible::Name,0)); - QCOMPARE(acc_sliderLcd->text(QAccessible::Name, 0), acc_slider->text(QAccessible::Value,0)); - QCOMPARE(acc_pbOk->text(QAccessible::Name, 0), QString("Ok")); - QCOMPARE(acc_radioAM->text(QAccessible::Name, 0), QString("AM")); - QCOMPARE(acc_pb1->text(QAccessible::Name, 0), QString("Button1")); - - // Description - QString desc = qobject_cast<QWidget*>(acc_label->object())->toolTip(); - QVERIFY(!desc.isEmpty()); - QCOMPARE(acc_label->text(QAccessible::Description, 0), desc); - desc = qobject_cast<QWidget*>(acc_lineedit->object())->toolTip(); - QVERIFY(!desc.isEmpty()); - QCOMPARE(acc_lineedit->text(QAccessible::Description, 0), desc); - - // Help - QString help = qobject_cast<QWidget*>(acc_label->object())->whatsThis(); - QVERIFY(!help.isEmpty()); - QCOMPARE(acc_label->text(QAccessible::Help, 0), help); - help = qobject_cast<QWidget*>(acc_frequency->object())->whatsThis(); - QVERIFY(!help.isEmpty()); - QCOMPARE(acc_frequency->text(QAccessible::Help, 0), help); - - // Value - QString value = acc_frequency->object()->property("text").toString(); - QVERIFY(!value.isEmpty()); - QCOMPARE(acc_frequency->text(QAccessible::Value, 0), value); - value = acc_slider->object()->property("value").toString(); - QVERIFY(!value.isEmpty()); - QCOMPARE(acc_slider->text(QAccessible::Value, 0), value); - QCOMPARE(acc_spinBox->text(QAccessible::Value, 0), value); - - // Accelerator - QCOMPARE(acc_pbOk->text(QAccessible::Accelerator, 0), Q3Accel::keyToString(Qt::Key_Enter)); - QCOMPARE(acc_pb1->text(QAccessible::Accelerator, 0), Q3Accel::keyToString(Qt::ALT + Qt::Key_1)); - QCOMPARE(acc_lineedit->text(QAccessible::Accelerator, 0), Q3Accel::keyToString(Qt::ALT) + "L"); - QCOMPARE(acc_frequency->text(QAccessible::Accelerator, 0), Q3Accel::keyToString(Qt::ALT) + "C"); - - delete acc_pb1; - delete acc_pbOk; - delete acc_slider; - delete acc_spinBox; - delete acc_sliderLcd; - - delete acc_label; - delete acc_lineedit; - delete acc_radiogroup; - delete acc_radioAM; - delete acc_frequency; - - delete toplevel; - QTestAccessibility::clearEvents(); - -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -#endif // !QT3_SUPPORT -} - -void tst_QAccessibility::setText() -{ -#if !defined(QT3_SUPPORT) - QSKIP("This test needs Qt3Support", SkipAll); -#else -#ifdef QTEST_ACCESSIBILITY - QWidget *toplevel = createGUI(); - toplevel->show(); - QObject *bottomLeft = toplevel->findChild<QObject *>("bottomLeft"); - - QAccessibleInterface *acc_lineedit = QAccessible::queryAccessibleInterface(bottomLeft->findChild<QLineEdit *>("lineedit")); - // Value, read-write - QString txt = acc_lineedit->text(QAccessible::Value, 0); - QVERIFY(txt.isEmpty()); - txt = QLatin1String("Writable"); - acc_lineedit->setText(QAccessible::Value, 0, txt); - QCOMPARE(acc_lineedit->text(QAccessible::Value, 0), txt); - - // Description, read-only - txt = acc_lineedit->text(QAccessible::Description, 0); - QVERIFY(!txt.isEmpty()); - acc_lineedit->setText(QAccessible::Description, 0, QLatin1String("")); - QCOMPARE(acc_lineedit->text(QAccessible::Description, 0), txt); - - QVERIFY(acc_lineedit); - - delete acc_lineedit; - delete toplevel; - QTestAccessibility::clearEvents(); - -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -#endif //QT3_SUPPORT } void tst_QAccessibility::hideShowTest() { -#ifdef QTEST_ACCESSIBILITY QWidget * const window = new QWidget(); QWidget * const child = new QWidget(window); @@ -1753,14 +882,10 @@ void tst_QAccessibility::hideShowTest() delete window; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::userActionCount() { -#ifdef QTEST_ACCESSIBILITY QWidget widget; QAccessibleInterface *test = QAccessible::queryAccessibleInterface(&widget); @@ -1790,18 +915,14 @@ void tst_QAccessibility::userActionCount() QCOMPARE(test->userActionCount(1), 0); QCOMPARE(test->userActionCount(-1), 0); delete test; test = 0; -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::actionText() { -#ifdef QTEST_ACCESSIBILITY - QWidget widget; - widget.show(); + QWidget *widget = new QWidget; + widget->show(); - QAccessibleInterface *test = QAccessible::queryAccessibleInterface(&widget); + QAccessibleInterface *test = QAccessible::queryAccessibleInterface(widget); QVERIFY(test); QVERIFY(test->isValid()); @@ -1813,20 +934,15 @@ void tst_QAccessibility::actionText() QCOMPARE(test->actionText(QAccessible::DefaultAction, QAccessible::Name, 0), QString("SetFocus")); QCOMPARE(test->actionText(QAccessible::SetFocus, QAccessible::Name, 0), QString("SetFocus")); - delete test; test = 0; + delete test; + delete widget; -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif + QTestAccessibility::clearEvents(); } void tst_QAccessibility::doAction() { -#ifdef QTEST_ACCESSIBILITY QSKIP("TODO: Implement me", SkipAll); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::applicationTest() @@ -1881,7 +997,6 @@ public Q_SLOTS: void tst_QAccessibility::buttonTest() { -#ifdef QTEST_ACCESSIBILITY QWidget window; window.setLayout(new QVBoxLayout); @@ -1913,32 +1028,6 @@ void tst_QAccessibility::buttonTest() toggletool.setText("Toggle"); toggletool.setMinimumSize(20,20); -#if 0 - // QT3_SUPPORT - // push button with a menu - QPushButton menuButton("Menu", &window); - Q3PopupMenu buttonMenu(&menuButton); - buttonMenu.insertItem("Some item"); - menuButton.setPopup(&buttonMenu); - - // menu toolbutton - QToolButton menuToolButton(&window); - menuToolButton.setText("Menu Tool"); - Q3PopupMenu toolMenu(&menuToolButton); - toolMenu.insertItem("Some item"); - menuToolButton.setPopup(&toolMenu); - menuToolButton.setMinimumSize(20,20); - - // splitted menu toolbutton - QToolButton splitToolButton(&window); - splitToolButton.setTextLabel("Split Tool"); - Q3PopupMenu splitMenu(&splitToolButton); - splitMenu.insertItem("Some item"); - splitToolButton.setPopup(&splitMenu); - splitToolButton.setPopupDelay(0); - splitToolButton.setMinimumSize(20,20); -#endif - // test push button QAccessibleInterface* interface = QAccessible::queryAccessibleInterface(&pushButton); QAccessibleActionInterface* actionInterface = interface->actionInterface(); @@ -2070,215 +1159,10 @@ void tst_QAccessibility::buttonTest() // test->release(); QTestAccessibility::clearEvents(); - -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -} - -void tst_QAccessibility::sliderTest() -{ -#if !defined(QT3_SUPPORT) - QSKIP("This test needs Qt3Support", SkipAll); -#else -#ifdef QTEST_ACCESSIBILITY - QAccessibleInterface *test = 0; - Q3VBox vbox; - QLabel labelHorizontal("Horizontal", &vbox); - QSlider sliderHorizontal(Qt::Horizontal, &vbox); - labelHorizontal.setBuddy(&sliderHorizontal); - - QLabel labelVertical("Vertical", &vbox); - QSlider sliderVertical(Qt::Vertical, &vbox); - labelVertical.setBuddy(&sliderVertical); - vbox.show(); - - // test horizontal slider - test = QAccessible::queryAccessibleInterface(&sliderHorizontal); - QVERIFY(test); - QCOMPARE(test->childCount(), 3); - QCOMPARE(test->role(0), QAccessible::Slider); - QCOMPARE(test->role(1), QAccessible::PushButton); - QCOMPARE(test->role(2), QAccessible::Indicator); - QCOMPARE(test->role(3), QAccessible::PushButton); - - QCOMPARE(test->text(QAccessible::Name, 0), labelHorizontal.text()); - QCOMPARE(test->text(QAccessible::Name, 1), QSlider::tr("Page left")); - QCOMPARE(test->text(QAccessible::Name, 2), QSlider::tr("Position")); - QCOMPARE(test->text(QAccessible::Name, 3), QSlider::tr("Page right")); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderHorizontal.value())); - QCOMPARE(test->text(QAccessible::Value, 1), QString()); - QCOMPARE(test->text(QAccessible::Value, 2), QString::number(sliderHorizontal.value())); - QCOMPARE(test->text(QAccessible::Value, 3), QString()); -// Skip acton tests. -#if 0 - QCOMPARE(test->defaultAction(0), QAccessible::SetFocus); - QCOMPARE(test->defaultAction(1), QAccessible::Press); - QCOMPARE(test->defaultAction(2), QAccessible::NoAction); - QCOMPARE(test->defaultAction(3), QAccessible::Press); - QCOMPARE(test->actionText(QAccessible::SetFocus, QAccessible::Name, 0), QSlider::tr("Set Focus")); - QCOMPARE(test->actionText(QAccessible::Press, QAccessible::Name, 1), QSlider::tr("Press")); - QCOMPARE(test->actionText(QAccessible::Increase, QAccessible::Name, 2), QSlider::tr("Increase")); - QCOMPARE(test->actionText(QAccessible::Decrease, QAccessible::Name, 2), QSlider::tr("Decrease")); - QCOMPARE(test->actionText(QAccessible::Press, QAccessible::Name, 3), QSlider::tr("Press")); - QVERIFY(test->doAction(QAccessible::Press, 3)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderHorizontal.pageStep())); - QVERIFY(test->doAction(QAccessible::Press, 3)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(2*sliderHorizontal.pageStep())); - QVERIFY(test->doAction(QAccessible::Press, 1)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderHorizontal.pageStep())); - QVERIFY(test->doAction(QAccessible::Press, 1)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(0)); - QVERIFY(test->doAction(QAccessible::Increase, 2)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderHorizontal.lineStep())); - QVERIFY(test->doAction(QAccessible::Increase, 2)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(2*sliderHorizontal.lineStep())); - QVERIFY(test->doAction(QAccessible::Decrease, 2)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderHorizontal.lineStep())); - QVERIFY(test->doAction(QAccessible::Decrease, 2)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(0)); -#endif - delete test; - - // test vertical slider - test = QAccessible::queryAccessibleInterface(&sliderVertical); - QVERIFY(test); - QCOMPARE(test->childCount(), 3); - QCOMPARE(test->role(0), QAccessible::Slider); - QCOMPARE(test->role(1), QAccessible::PushButton); - QCOMPARE(test->role(2), QAccessible::Indicator); - QCOMPARE(test->role(3), QAccessible::PushButton); - - QCOMPARE(test->text(QAccessible::Name, 0), labelVertical.text()); - QCOMPARE(test->text(QAccessible::Name, 1), QSlider::tr("Page up")); - QCOMPARE(test->text(QAccessible::Name, 2), QSlider::tr("Position")); - QCOMPARE(test->text(QAccessible::Name, 3), QSlider::tr("Page down")); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderVertical.value())); - QCOMPARE(test->text(QAccessible::Value, 1), QString()); - QCOMPARE(test->text(QAccessible::Value, 2), QString::number(sliderVertical.value())); - QCOMPARE(test->text(QAccessible::Value, 3), QString()); -// Skip acton tests. -#if 0 - QCOMPARE(test->defaultAction(0), QAccessible::SetFocus); - QCOMPARE(test->defaultAction(1), QAccessible::Press); - QCOMPARE(test->defaultAction(2), QAccessible::NoAction); - QCOMPARE(test->defaultAction(3), QAccessible::Press); - QCOMPARE(test->actionText(QAccessible::SetFocus, QAccessible::Name, 0), QSlider::tr("Set Focus")); - QCOMPARE(test->actionText(QAccessible::Press, QAccessible::Name, 1), QSlider::tr("Press")); - QCOMPARE(test->actionText(QAccessible::Increase, QAccessible::Name, 2), QSlider::tr("Increase")); - QCOMPARE(test->actionText(QAccessible::Decrease, QAccessible::Name, 2), QSlider::tr("Decrease")); - QCOMPARE(test->actionText(QAccessible::Press, QAccessible::Name, 3), QSlider::tr("Press")); - QVERIFY(test->doAction(QAccessible::Press, 3)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderVertical.pageStep())); - QVERIFY(test->doAction(QAccessible::Press, 3)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(2*sliderVertical.pageStep())); - QVERIFY(test->doAction(QAccessible::Press, 1)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderVertical.pageStep())); - QVERIFY(test->doAction(QAccessible::Press, 1)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(0)); - QVERIFY(test->doAction(QAccessible::Increase, 2)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderVertical.lineStep())); - QVERIFY(test->doAction(QAccessible::Increase, 2)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(2*sliderVertical.lineStep())); - QVERIFY(test->doAction(QAccessible::Decrease, 2)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderVertical.lineStep())); - QVERIFY(test->doAction(QAccessible::Decrease, 2)); - QCOMPARE(test->text(QAccessible::Value, 0), QString::number(0)); -#endif - delete test; - - // Test that when we hide() a slider, the PageLeft, Indicator, and PageRight also gets the - // Invisible state bit set. - enum SubControls { PageLeft = 1, Position = 2, PageRight = 3 }; - - QSlider *slider = new QSlider(); - QAccessibleInterface * const sliderInterface = QAccessible::queryAccessibleInterface(slider); - QVERIFY(sliderInterface); - - QVERIFY(sliderInterface->state(0) & QAccessible::Invisible); - QVERIFY(sliderInterface->state(PageLeft) & QAccessible::Invisible); - QVERIFY(sliderInterface->state(Position) & QAccessible::Invisible); - QVERIFY(sliderInterface->state(PageRight) & QAccessible::Invisible); - - slider->show(); - QVERIFY(sliderInterface->state(0) ^ QAccessible::Invisible); - QVERIFY(sliderInterface->state(PageLeft) ^ QAccessible::Invisible); - QVERIFY(sliderInterface->state(Position) ^ QAccessible::Invisible); - QVERIFY(sliderInterface->state(PageRight) ^ QAccessible::Invisible); - QVERIFY(QTestAccessibility::events().contains(QTestAccessibilityEvent(slider, 0, QAccessible::ObjectShow))); - QTestAccessibility::clearEvents(); - - slider->hide(); - QVERIFY(sliderInterface->state(0) & QAccessible::Invisible); - QVERIFY(sliderInterface->state(PageLeft) & QAccessible::Invisible); - QVERIFY(sliderInterface->state(Position) & QAccessible::Invisible); - QVERIFY(sliderInterface->state(PageRight) & QAccessible::Invisible); - QVERIFY(QTestAccessibility::events().contains(QTestAccessibilityEvent(slider, 0, QAccessible::ObjectHide))); - QTestAccessibility::clearEvents(); - - // Test that the left/right subcontrols are set to unavailable when the slider is at the minimum/maximum. - slider->show(); - slider->setMinimum(0); - slider->setMaximum(100); - - slider->setValue(50); - QVERIFY(sliderInterface->state(PageLeft) ^ QAccessible::Unavailable); - QVERIFY(sliderInterface->state(Position) ^ QAccessible::Unavailable); - QVERIFY(sliderInterface->state(PageRight) ^ QAccessible::Unavailable); - - slider->setValue(0); - QVERIFY(sliderInterface->state(PageLeft) & QAccessible::Unavailable); - QVERIFY(sliderInterface->state(Position) ^ QAccessible::Unavailable); - QVERIFY(sliderInterface->state(PageRight) ^ QAccessible::Unavailable); - - slider->setValue(100); - QVERIFY(sliderInterface->state(PageLeft) ^ QAccessible::Unavailable); - QVERIFY(sliderInterface->state(Position) ^ QAccessible::Unavailable); - QVERIFY(sliderInterface->state(PageRight) & QAccessible::Unavailable); - - delete sliderInterface; - delete slider; - - // Test that the rects are ok. - { - QSlider *slider = new QSlider(Qt::Horizontal); - slider->show(); -#if defined(Q_WS_X11) - qt_x11_wait_for_window_manager(slider); - QTest::qWait(100); -#endif - QAccessibleInterface * const sliderInterface = QAccessible::queryAccessibleInterface(slider); - QVERIFY(sliderInterface); - - slider->setMinimum(0); - slider->setMaximum(100); - slider->setValue(50); - - const QRect sliderRect = sliderInterface->rect(0); - QVERIFY(sliderRect.isValid()); - - // Verify that the sub-control rects are valid and inside the slider rect. - for (int i = PageLeft; i <= PageRight; ++i) { - const QRect testRect = sliderInterface->rect(i); - QVERIFY(testRect.isValid()); - QVERIFY(sliderRect.contains(testRect)); - } - - delete slider; - delete sliderInterface; - } - - - QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -#endif //!QT3_SUPPORT } void tst_QAccessibility::scrollBarTest() { -#ifdef QTEST_ACCESSIBILITY // Test that when we hide() a slider, the PageLeft, Indicator, and PageRight also gets the // Invisible state bit set. enum SubControls { LineUp = 1, @@ -2286,7 +1170,7 @@ void tst_QAccessibility::scrollBarTest() Position = 3, PageDown = 4, LineDown = 5 - }; + }; QScrollBar *scrollBar = new QScrollBar(); QAccessibleInterface * const scrollBarInterface = QAccessible::queryAccessibleInterface(scrollBar); @@ -2368,15 +1252,10 @@ void tst_QAccessibility::scrollBarTest() } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif - } void tst_QAccessibility::tabTest() { -#ifdef QTEST_ACCESSIBILITY QTabBar *tabBar = new QTabBar(); tabBar->show(); @@ -2412,9 +1291,6 @@ void tst_QAccessibility::tabTest() delete tabBar; delete interface; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::tabWidgetTest() @@ -2512,7 +1388,6 @@ void tst_QAccessibility::tabWidgetTest() void tst_QAccessibility::menuTest() { -#ifdef QTEST_ACCESSIBILITY { QMainWindow mw; mw.resize(300, 200); @@ -2758,14 +1633,10 @@ void tst_QAccessibility::menuTest() } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); -#endif } void tst_QAccessibility::spinBoxTest() { -#ifdef QTEST_ACCESSIBILITY QSpinBox * const spinBox = new QSpinBox(); spinBox->show(); @@ -2792,14 +1663,10 @@ void tst_QAccessibility::spinBoxTest() QVERIFY(events.contains(expectedEvent)); delete spinBox; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::doubleSpinBoxTest() { -#ifdef QTEST_ACCESSIBILITY QDoubleSpinBox *doubleSpinBox = new QDoubleSpinBox; doubleSpinBox->show(); @@ -2819,14 +1686,10 @@ void tst_QAccessibility::doubleSpinBoxTest() delete doubleSpinBox; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::textEditTest() { -#ifdef QTEST_ACCESSIBILITY { QTextEdit edit; QString text = "hello world\nhow are you today?\n"; @@ -2846,14 +1709,10 @@ void tst_QAccessibility::textEditTest() QCOMPARE(iface->textInterface()->characterRect(6, QAccessible2::RelativeToParent).size(), QSize(fm.width("w"), fm.height())); } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::textBrowserTest() { -#ifdef QTEST_ACCESSIBILITY { QTextBrowser textBrowser; QString text = QLatin1String("Hello world\nhow are you today?\n"); @@ -2870,14 +1729,10 @@ void tst_QAccessibility::textBrowserTest() QCOMPARE(interface->text(QAccessible::Value, 6), QString()); } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::listViewTest() { -#if 1 //def QTEST_ACCESSIBILITY { QListView listView; QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(&listView); @@ -2943,15 +1798,11 @@ void tst_QAccessibility::listViewTest() } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::mdiAreaTest() { -#ifdef QTEST_ACCESSIBILITY { QMdiArea mdiArea; mdiArea.resize(400,300); @@ -3000,14 +1851,10 @@ void tst_QAccessibility::mdiAreaTest() } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::mdiSubWindowTest() { -#ifdef QTEST_ACCESSIBILITY { QMdiArea mdiArea; mdiArea.show(); @@ -3130,14 +1977,10 @@ void tst_QAccessibility::mdiSubWindowTest() } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::lineEditTest() { -#ifdef QTEST_ACCESSIBILITY QLineEdit *le = new QLineEdit; QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(le); QVERIFY(iface); @@ -3195,14 +2038,10 @@ void tst_QAccessibility::lineEditTest() delete le2; delete toplevel; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::workspaceTest() { -#ifdef QTEST_ACCESSIBILITY { QWorkspace workspace; workspace.resize(400,300); @@ -3256,14 +2095,10 @@ void tst_QAccessibility::workspaceTest() } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::dialogButtonBoxTest() { -#ifdef QTEST_ACCESSIBILITY { QDialogButtonBox box(QDialogButtonBox::Reset | QDialogButtonBox::Help | @@ -3376,14 +2211,10 @@ void tst_QAccessibility::dialogButtonBoxTest() } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::dialTest() { -#ifdef QTEST_ACCESSIBILITY { QDial dial; dial.setValue(20); @@ -3425,28 +2256,20 @@ void tst_QAccessibility::dialTest() } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::rubberBandTest() { -#ifdef QTEST_ACCESSIBILITY QRubberBand rubberBand(QRubberBand::Rectangle); QAccessibleInterface *interface = QAccessible::queryAccessibleInterface(&rubberBand); QVERIFY(interface); QCOMPARE(interface->role(0), QAccessible::Border); delete interface; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::abstractScrollAreaTest() { -#ifdef QTEST_ACCESSIBILITY { QAbstractScrollArea abstractScrollArea; @@ -3604,14 +2427,10 @@ void tst_QAccessibility::abstractScrollAreaTest() } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::scrollAreaTest() { -#ifdef QTEST_ACCESSIBILITY { QScrollArea scrollArea; scrollArea.show(); @@ -3625,14 +2444,10 @@ void tst_QAccessibility::scrollAreaTest() delete interface; } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::tableWidgetTest() { -#ifdef QTEST_ACCESSIBILITY { QWidget *topLevel = new QWidget; QTableWidget *w = new QTableWidget(8,4,topLevel); @@ -3672,10 +2487,6 @@ void tst_QAccessibility::tableWidgetTest() delete topLevel; } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif - } class QtTestTableModel: public QAbstractTableModel @@ -3758,7 +2569,6 @@ public: void tst_QAccessibility::tableViewTest() { -#ifdef QTEST_ACCESSIBILITY { QtTestTableModel *model = new QtTestTableModel(3, 4); QTableView *w = new QTableView(); @@ -3838,15 +2648,11 @@ void tst_QAccessibility::tableViewTest() delete model; } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::calendarWidgetTest() { #ifndef QT_NO_CALENDARWIDGET -#ifdef QTEST_ACCESSIBILITY { QCalendarWidget calendarWidget; @@ -3939,17 +2745,12 @@ void tst_QAccessibility::calendarWidgetTest() } QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif #endif // QT_NO_CALENDARWIDGET } void tst_QAccessibility::dockWidgetTest() { #ifndef QT_NO_DOCKWIDGET - -#ifdef QTEST_ACCESSIBILITY // Set up a proper main window with two dock widgets QMainWindow *mw = new QMainWindow(); QFrame *central = new QFrame(mw); @@ -4017,61 +2818,11 @@ void tst_QAccessibility::dockWidgetTest() delete dock2; delete mw; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif #endif // QT_NO_DOCKWIDGET } -void tst_QAccessibility::pushButtonTest() -{ -#if !defined(QT3_SUPPORT) - qWarning( "Should never get here without Qt3Support"); - return ; -#else -#ifdef QTEST_ACCESSIBILITY - // Set up a proper main window with two dock widgets - QWidget *toplevel = createGUI(); - QObject *topRight = toplevel->findChild<QObject *>("topRight"); - - toplevel->show(); -#if defined(Q_WS_X11) - qt_x11_wait_for_window_manager(toplevel); - QTest::qWait(100); -#endif - QPushButton *pb = qobject_cast<QPushButton*>(topRight->findChild<QPushButton *>("pbOk")); - QPoint pt = pb->mapToGlobal(pb->geometry().topLeft()); - QRect rect(pt, pb->geometry().size()); - pt = rect.center(); - - QAccessibleInterface *accToplevel = QAccessible::queryAccessibleInterface(toplevel); - QAccessibleInterface *acc; - QAccessibleInterface *acc2; - int entry = accToplevel->childAt(pt.x(), pt.y()); - accToplevel->navigate(QAccessible::Child, entry, &acc); - if (acc) { - entry = acc->childAt(pt.x(), pt.y()); - acc->navigate(QAccessible::Child, entry, &acc2); - delete acc; - acc = acc2; - } - QCOMPARE(acc->role(0), QAccessible::PushButton); - QCOMPARE(acc->rect(0), rect); - QCOMPARE(acc->childAt(pt.x(), pt.y()), 0); - - delete acc; - delete accToplevel; - delete toplevel; - QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif -#endif //QT3_SUPPORT -} - void tst_QAccessibility::comboBoxTest() { -#ifdef QTEST_ACCESSIBILITY #if defined(Q_OS_WINCE) if (!IsValidCEPlatform()) { QSKIP("Test skipped on Windows Mobile test hardware", SkipAll); @@ -4109,15 +2860,10 @@ void tst_QAccessibility::comboBoxTest() delete w; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif - } void tst_QAccessibility::treeWidgetTest() { -#ifdef QTEST_ACCESSIBILITY QWidget *w = new QWidget; QTreeWidget *tree = new QTreeWidget(w); QHBoxLayout *l = new QHBoxLayout(w); @@ -4175,14 +2921,10 @@ void tst_QAccessibility::treeWidgetTest() delete w; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::labelTest() { -#ifdef QTEST_ACCESSIBILITY QString text = "Hello World"; QLabel *label = new QLabel(text); label->show(); @@ -4221,14 +2963,10 @@ void tst_QAccessibility::labelTest() delete acc_label; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs accessibility support.", SkipAll); -#endif } void tst_QAccessibility::accelerators() { -#ifdef QTEST_ACCESSIBILITY QWidget *window = new QWidget; QHBoxLayout *lay = new QHBoxLayout(window); QLabel *label = new QLabel(tr("&Line edit"), window); @@ -4252,6 +2990,10 @@ void tst_QAccessibility::accelerators() QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QKeySequence(Qt::ALT).toString(QKeySequence::NativeText) + QLatin1String("A")); label->setText(tr("Q &&A")); QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QString()); + +#if !defined(QT_NO_DEBUG) && !defined(Q_WS_MAC) + QTest::ignoreMessage(QtWarningMsg, "QKeySequence::mnemonic: \"Q &A&B\" contains multiple occurrences of '&'"); +#endif label->setText(tr("Q &A&B")); QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QKeySequence(Qt::ALT).toString(QKeySequence::NativeText) + QLatin1String("A")); @@ -4261,9 +3003,6 @@ void tst_QAccessibility::accelerators() QTest::qWait(100); delete window; QTestAccessibility::clearEvents(); -#else - QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll); -#endif } 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 d0d8e9aead..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() @@ -241,7 +236,8 @@ QList<ResultSet> testAlgorithm(Algorithm &algorithm, QStringList dataSetTypes, foreach(QString dataSetType, dataSetTypes) { QVector<DataType> container = generateData<DataType>(dataSetType, size); results.append(testRun(container, algorithm, time)); - Q_ASSERT(isSorted(container)); + if (!isSorted(container)) + qWarning("%s: container is not sorted after test", Q_FUNC_INFO); } return results; } @@ -266,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() { @@ -557,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); @@ -878,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: @@ -948,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/qapplication/modal/main.cpp b/tests/auto/qapplication/modal/main.cpp index 2365991084..8ff6f330fd 100644 --- a/tests/auto/qapplication/modal/main.cpp +++ b/tests/auto/qapplication/modal/main.cpp @@ -49,5 +49,6 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); QApplication::setAttribute(Qt::AA_NativeWindows); //QTBUG-15774 base *b = new base(); + Q_UNUSED(b); return app.exec(); } diff --git a/tests/auto/qatomicint/tst_qatomicint.cpp b/tests/auto/qatomicint/tst_qatomicint.cpp index 717187a2a6..5ccb997290 100644 --- a/tests/auto/qatomicint/tst_qatomicint.cpp +++ b/tests/auto/qatomicint/tst_qatomicint.cpp @@ -116,8 +116,7 @@ tst_QAtomicInt::~tst_QAtomicInt() void tst_QAtomicInt::warningFreeHelper() { - Q_ASSERT(false); - // The code below is bogus, and shouldn't be run. We're looking for warnings, only. + qFatal("This code is bogus, and shouldn't be run. We're looking for compiler warnings only."); QBasicAtomicInt i = Q_BASIC_ATOMIC_INITIALIZER(0); diff --git a/tests/auto/qatomicpointer/tst_qatomicpointer.cpp b/tests/auto/qatomicpointer/tst_qatomicpointer.cpp index af8fabc962..05f8294148 100644 --- a/tests/auto/qatomicpointer/tst_qatomicpointer.cpp +++ b/tests/auto/qatomicpointer/tst_qatomicpointer.cpp @@ -98,8 +98,7 @@ struct WFHC void tst_QAtomicPointer::warningFreeHelper() { - Q_ASSERT(false); - // The code below is bogus, and shouldn't be run. We're looking for warnings, only. + qFatal("This code is bogus, and shouldn't be run. We're looking for compiler warnings only."); QBasicAtomicPointer<WFHC> p = Q_BASIC_ATOMIC_INITIALIZER(0); diff --git a/tests/auto/qauthenticator/qauthenticator.pro b/tests/auto/qauthenticator/qauthenticator.pro index 05f83bc166..8ddb13b0df 100644 --- a/tests/auto/qauthenticator/qauthenticator.pro +++ b/tests/auto/qauthenticator/qauthenticator.pro @@ -1,5 +1,5 @@ load(qttest_p4) requires(contains(QT_CONFIG,private_tests)) -QT = core network +QT = core network-private SOURCES += tst_qauthenticator.cpp DEFINES += SRCDIR=\\\"$$PWD/\\\" diff --git a/tests/auto/qbuffer/tst_qbuffer.cpp b/tests/auto/qbuffer/tst_qbuffer.cpp index 3e3cc739bf..5d6b84f827 100644 --- a/tests/auto/qbuffer/tst_qbuffer.cpp +++ b/tests/auto/qbuffer/tst_qbuffer.cpp @@ -309,8 +309,7 @@ void tst_QBuffer::seekTest() // (see Task 184730) { char c; - const int offset = 1; - Q_ASSERT(offset > 0); // any positive integer will do + const int offset = 1; // any positive integer will do const qint64 pos = buf.size() + offset; QVERIFY(buf.seek(pos)); QCOMPARE(buf.pos(), pos); diff --git a/tests/auto/qchar/tst_qchar.cpp b/tests/auto/qchar/tst_qchar.cpp index 45dd7ebed1..911a30cc77 100644 --- a/tests/auto/qchar/tst_qchar.cpp +++ b/tests/auto/qchar/tst_qchar.cpp @@ -548,14 +548,14 @@ void tst_QChar::normalization_data() QList<QByteArray> l = line.split(';'); - Q_ASSERT(l.size() == 5); + QCOMPARE(l.size(), 5); QStringList columns; for (int i = 0; i < 5; ++i) { columns.append(QString()); QList<QByteArray> c = l.at(i).split(' '); - Q_ASSERT(!c.isEmpty()); + QVERIFY(!c.isEmpty()); for (int j = 0; j < c.size(); ++j) { bool ok; diff --git a/tests/auto/qcolor/tst_qcolor.cpp b/tests/auto/qcolor/tst_qcolor.cpp index d42c26cbd6..b02537ec57 100644 --- a/tests/auto/qcolor/tst_qcolor.cpp +++ b/tests/auto/qcolor/tst_qcolor.cpp @@ -1506,7 +1506,6 @@ void tst_QColor::setallowX11ColorNames() for (int i = 0; i < x11RgbTblSize; ++i) { QString colorName = QLatin1String(x11RgbTbl[i].name); QColor color; - QTest::ignoreMessage(QtWarningMsg, QString("QColor::setNamedColor: Unknown color name '%1'").arg(colorName).toLatin1()); color.setNamedColor(colorName); QVERIFY(!color.isValid()); } @@ -1528,7 +1527,6 @@ void tst_QColor::setallowX11ColorNames() for (int i = 0; i < x11RgbTblSize; ++i) { QString colorName = QLatin1String(x11RgbTbl[i].name); QColor color; - QTest::ignoreMessage(QtWarningMsg, QString("QColor::setNamedColor: Unknown color name '%1'").arg(colorName).toLatin1()); color.setNamedColor(colorName); QVERIFY(!color.isValid()); } diff --git a/tests/auto/qcolumnview/qcolumnview.pro b/tests/auto/qcolumnview/qcolumnview.pro index 754f06fd49..e36df030c2 100644 --- a/tests/auto/qcolumnview/qcolumnview.pro +++ b/tests/auto/qcolumnview/qcolumnview.pro @@ -1,4 +1,5 @@ CONFIG += qttest_p4 +QT += gui-private core-private SOURCES += tst_qcolumnview.cpp TARGET = tst_qcolumnview diff --git a/tests/auto/qcombobox/qcombobox.pro b/tests/auto/qcombobox/qcombobox.pro index 2ac5c7c53b..a8f0e6ad23 100644 --- a/tests/auto/qcombobox/qcombobox.pro +++ b/tests/auto/qcombobox/qcombobox.pro @@ -1,3 +1,4 @@ load(qttest_p4) +QT += gui-private core-private SOURCES += tst_qcombobox.cpp diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp index d525068893..33a630076e 100644 --- a/tests/auto/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/qcombobox/tst_qcombobox.cpp @@ -1230,21 +1230,17 @@ void tst_QComboBox::insertItem_data() QTest::addColumn<int>("insertIndex"); QTest::addColumn<QString>("itemLabel"); QTest::addColumn<int>("expectedIndex"); - QTest::addColumn<bool>("testQt3Support"); QTest::addColumn<bool>("editable"); QStringList initialItems; initialItems << "foo" << "bar"; for(int e = 0 ; e<2 ; e++) { bool editable = (e==0); - QTest::newRow("Insert less then 0") << initialItems << -1 << "inserted" << 0 << false << editable; - QTest::newRow("Insert at 0") << initialItems << 0 << "inserted" << 0 << false << editable; - QTest::newRow("Insert beyond count") << initialItems << 3 << "inserted" << 2 << false << editable; - QTest::newRow("Insert at count") << initialItems << 2 << "inserted" << 2 << false << editable; - QTest::newRow("Insert in the middle") << initialItems << 1 << "inserted" << 1 << false << editable; -#if defined(QT3_SUPPORT) - QTest::newRow("Qt3Support: Insert less then 0") << initialItems << -1 << "inserted" << 2 << true << editable; -#endif + QTest::newRow("Insert less then 0") << initialItems << -1 << "inserted" << 0 << editable; + QTest::newRow("Insert at 0") << initialItems << 0 << "inserted" << 0 << editable; + QTest::newRow("Insert beyond count") << initialItems << 3 << "inserted" << 2 << editable; + QTest::newRow("Insert at count") << initialItems << 2 << "inserted" << 2 << editable; + QTest::newRow("Insert in the middle") << initialItems << 1 << "inserted" << 1 << editable; } } @@ -1254,7 +1250,6 @@ void tst_QComboBox::insertItem() QFETCH(int, insertIndex); QFETCH(QString, itemLabel); QFETCH(int, expectedIndex); - QFETCH(bool, testQt3Support); QFETCH(bool, editable); testWidget->insertItems(0, initialItems); @@ -1263,16 +1258,7 @@ void tst_QComboBox::insertItem() testWidget->setEditable(true); if (editable) testWidget->setEditText("FOO"); -#if defined (QT3_SUPPORT) - if (testQt3Support) - testWidget->insertItem(itemLabel, insertIndex); - else - testWidget->insertItem(insertIndex, itemLabel); -#else - Q_UNUSED(testQt3Support); testWidget->insertItem(insertIndex, itemLabel); -#endif - QCOMPARE(testWidget->count(), initialItems.count() + 1); QCOMPARE(testWidget->itemText(expectedIndex), itemLabel); diff --git a/tests/auto/qcompleter/tst_qcompleter.cpp b/tests/auto/qcompleter/tst_qcompleter.cpp index 932c19ea54..b0d40d0d22 100644 --- a/tests/auto/qcompleter/tst_qcompleter.cpp +++ b/tests/auto/qcompleter/tst_qcompleter.cpp @@ -277,7 +277,9 @@ retry: case 'L': row = completer->completionCount() - 1; break; case 'F': row = 0; break; default: - Q_ASSERT(false); + QFAIL(qPrintable(QString( + "Problem with 'step' value in test data: %1 (only P, N, L and F are allowed)." + ).arg(step[i]))); } completer->setCurrentRow(row); } @@ -1248,9 +1250,7 @@ public: void tst_QCompleter::task189564_omitNonSelectableItems() { const QString prefix("a"); - Q_ASSERT(!prefix.isEmpty()); const int n = 5; - Q_ASSERT(n > 0); QStringList strings; for (int i = 0; i < n; ++i) @@ -1278,10 +1278,11 @@ public: { setEditable(true); setInsertPolicy(NoInsert); - Q_ASSERT(completer()); - completer()->setCompletionMode(QCompleter::PopupCompletion); - completer()->setCompletionRole(Qt::DisplayRole); - connect(lineEdit(), SIGNAL(editingFinished()), SLOT(setCompletionPrefix())); + if (completer()) { + completer()->setCompletionMode(QCompleter::PopupCompletion); + completer()->setCompletionRole(Qt::DisplayRole); + connect(lineEdit(), SIGNAL(editingFinished()), SLOT(setCompletionPrefix())); + } } private slots: void setCompletionPrefix() { completer()->setCompletionPrefix(lineEdit()->text()); } @@ -1290,6 +1291,7 @@ private slots: void tst_QCompleter::task246056_setCompletionPrefix() { task246056_ComboBox *comboBox = new task246056_ComboBox; + QVERIFY(comboBox->completer()); comboBox->addItem(""); comboBox->addItem("a1"); comboBox->addItem("a2"); diff --git a/tests/auto/qcopchannel/testSend/main.cpp b/tests/auto/qcopchannel/testSend/main.cpp index 91628e501f..a56883be99 100644 --- a/tests/auto/qcopchannel/testSend/main.cpp +++ b/tests/auto/qcopchannel/testSend/main.cpp @@ -49,7 +49,11 @@ int main(int argc, char** argv) #ifdef Q_WS_QWS QApplication app(argc, argv); QStringList args = app.arguments(); - Q_ASSERT(args.count() == 3 || args.count() == 4); + if (args.count() != 3 && args.count() != 4) { + fprintf(stdout,qPrintable(QString("Usage: %1 channel message [data]").arg(args.at(0)))); + fflush(stdout); + return 1; + } QString channelName = args.at(1); QString msg = args.at(2); QByteArray data; diff --git a/tests/auto/qcssparser/qcssparser.pro b/tests/auto/qcssparser/qcssparser.pro index f696f195de..16fa265231 100644 --- a/tests/auto/qcssparser/qcssparser.pro +++ b/tests/auto/qcssparser/qcssparser.pro @@ -1,6 +1,6 @@ load(qttest_p4) SOURCES += tst_qcssparser.cpp -QT += xml +QT += xml gui-private requires(contains(QT_CONFIG,private_tests)) !symbian: { diff --git a/tests/auto/qcssparser/tst_qcssparser.cpp b/tests/auto/qcssparser/tst_qcssparser.cpp index 86cca2daae..ddee2dd713 100644 --- a/tests/auto/qcssparser/tst_qcssparser.cpp +++ b/tests/auto/qcssparser/tst_qcssparser.cpp @@ -148,7 +148,7 @@ void tst_QCssParser::scanner_data() } -static char *tokenName(QCss::TokenType t) +static const char *tokenName(QCss::TokenType t) { switch (t) { case QCss::NONE: return "NONE"; diff --git a/tests/auto/qdatastream/gearflowers.svg b/tests/auto/qdatastream/gearflowers.svg deleted file mode 100644 index 038e202d28..0000000000 --- a/tests/auto/qdatastream/gearflowers.svg +++ /dev/null @@ -1,8342 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" -"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - width="1024pt" - height="768pt" - id="svg1061" - sodipodi:version="0.32" - inkscape:version="0.40" - sodipodi:docbase="/home/xrostov/svg" - sodipodi:docname="gearflowers.svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:cc="http://web.resource.org/cc/" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:xlink="http://www.w3.org/1999/xlink" - inkscape:export-filename="/home/xrostov/svg/kde/gearflowers.png" - inkscape:export-xdpi="72.000000" - inkscape:export-ydpi="72.000000"> - <defs - id="defs3"> - <linearGradient - id="linearGradient21439"> - <stop - style="stop-color:#f1f1dd;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop21440" /> - <stop - style="stop-color:#e8e8d5;stop-opacity:0.0000000;" - offset="1.0000000" - id="stop21441" /> - </linearGradient> - <linearGradient - id="linearGradient18861"> - <stop - style="stop-color:#9afd4e;stop-opacity:0.67843139;" - offset="0.0000000" - id="stop18862" /> - <stop - style="stop-color:#d7dfd2;stop-opacity:0.043715846;" - offset="0.68571430" - id="stop18863" /> - <stop - style="stop-color:#d7dfd2;stop-opacity:0.33152175;" - offset="0.93414968" - id="stop18865" /> - <stop - style="stop-color:#d7dfd2;stop-opacity:0.078431375;" - offset="1.0000000" - id="stop18864" /> - </linearGradient> - <linearGradient - id="linearGradient18234"> - <stop - style="stop-color:#c5dad1;stop-opacity:0.80392158;" - offset="0.0000000" - id="stop18235" /> - <stop - style="stop-color:#bfd7e2;stop-opacity:0.0000000;" - offset="1.0000000" - id="stop18236" /> - </linearGradient> - <linearGradient - id="linearGradient16328"> - <stop - style="stop-color:#aedced;stop-opacity:0.45405406;" - offset="0.0000000" - id="stop16329" /> - <stop - style="stop-color:#59afd3;stop-opacity:0.49729729;" - offset="1.0000000" - id="stop16330" /> - </linearGradient> - <linearGradient - id="linearGradient16323"> - <stop - style="stop-color:#ecf3f6;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop16324" /> - <stop - style="stop-color:#97ceed;stop-opacity:0.38043478;" - offset="1.0000000" - id="stop16325" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient16311"> - <stop - style="stop-color:#5783c3;stop-opacity:1;" - offset="0" - id="stop16312" /> - <stop - style="stop-color:#5783c3;stop-opacity:0;" - offset="1" - id="stop16313" /> - </linearGradient> - <linearGradient - id="linearGradient16306"> - <stop - style="stop-color:#3693ce;stop-opacity:0.0000000;" - offset="0.0000000" - id="stop16307" /> - <stop - style="stop-color:#3693ce;stop-opacity:0.76502734;" - offset="0.50000000" - id="stop16310" /> - <stop - style="stop-color:#3693ce;stop-opacity:0;" - offset="1.0000000" - id="stop16308" /> - </linearGradient> - <linearGradient - id="linearGradient12484"> - <stop - style="stop-color:#6cafd9;stop-opacity:0.40000001;" - offset="0.0000000" - id="stop12485" /> - <stop - style="stop-color:#6cc4b2;stop-opacity:1.0000000;" - offset="0.39047620" - id="stop12488" /> - <stop - style="stop-color:#6cce9e;stop-opacity:0.89411765;" - offset="0.58784580" - id="stop12489" /> - <stop - style="stop-color:#88e8a3;stop-opacity:0.0000000;" - offset="1.0000000" - id="stop12486" /> - </linearGradient> - <linearGradient - id="linearGradient11858"> - <stop - style="stop-color:#7f88ec;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop11859" /> - <stop - style="stop-color:#1d73ec;stop-opacity:0.0000000;" - offset="1.0000000" - id="stop11860" /> - </linearGradient> - <linearGradient - id="linearGradient9363"> - <stop - style="stop-color:#2f3fec;stop-opacity:0.58823532;" - offset="0.0000000" - id="stop9364" /> - <stop - style="stop-color:#6974ec;stop-opacity:0.038043477;" - offset="1.0000000" - id="stop9365" /> - </linearGradient> - <linearGradient - id="linearGradient8737"> - <stop - style="stop-color:#3186ec;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop8738" /> - <stop - style="stop-color:#73a4df;stop-opacity:0.11413044;" - offset="1.0000000" - id="stop8739" /> - </linearGradient> - <linearGradient - id="linearGradient6847"> - <stop - style="stop-color:#353b3d;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop6848" /> - <stop - style="stop-color:#7f9bbe;stop-opacity:0.0000000;" - offset="1.0000000" - id="stop6849" /> - </linearGradient> - <linearGradient - id="linearGradient4134"> - <stop - style="stop-color:#9afd4e;stop-opacity:0.67843139;" - offset="0.0000000" - id="stop4135" /> - <stop - style="stop-color:#d7dfd2;stop-opacity:0.043715846;" - offset="0.68571430" - id="stop16958" /> - <stop - style="stop-color:#d7dfd2;stop-opacity:0.55737704;" - offset="1.0000000" - id="stop4136" /> - </linearGradient> - <linearGradient - id="linearGradient3347"> - <stop - style="stop-color:#e9e9d6;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop3348" /> - <stop - style="stop-color:#ffffea;stop-opacity:0;" - offset="1" - id="stop3349" /> - </linearGradient> - <linearGradient - id="linearGradient2582"> - <stop - style="stop-color:#3ba80c;stop-opacity:0.26630434;" - offset="0.0000000" - id="stop2583" /> - <stop - style="stop-color:#076253;stop-opacity:0.0000000;" - offset="1.0000000" - id="stop2584" /> - </linearGradient> - <linearGradient - id="linearGradient15803"> - <stop - style="stop-color:#a4e019;stop-opacity:0.0000000;" - offset="0.0000000" - id="stop15804" /> - <stop - style="stop-color:#b4e072;stop-opacity:0.88043481;" - offset="0.50000000" - id="stop15807" /> - <stop - style="stop-color:#a5e078;stop-opacity:0;" - offset="1" - id="stop15805" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient14553"> - <stop - style="stop-color:#e4e4df;stop-opacity:1;" - offset="0" - id="stop14554" /> - <stop - style="stop-color:#e4e4df;stop-opacity:0;" - offset="1" - id="stop14555" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient13927"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop13928" /> - <stop - style="stop-color:#ffffff;stop-opacity:0;" - offset="1" - id="stop13929" /> - </linearGradient> - <linearGradient - id="linearGradient11439"> - <stop - style="stop-color:#0d0ca8;stop-opacity:0.58039218;" - offset="0.0000000" - id="stop11440" /> - <stop - style="stop-color:#075662;stop-opacity:0.0000000;" - offset="1.0000000" - id="stop11441" /> - </linearGradient> - <linearGradient - id="linearGradient10815"> - <stop - style="stop-color:#076232;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop10816" /> - <stop - style="stop-color:#080762;stop-opacity:0;" - offset="1" - id="stop10817" /> - </linearGradient> - <linearGradient - id="linearGradient10191"> - <stop - style="stop-color:#038906;stop-opacity:0.46739131;" - offset="0.0000000" - id="stop10192" /> - <stop - style="stop-color:#0b0a8d;stop-opacity:0.065217391;" - offset="1.0000000" - id="stop10193" /> - </linearGradient> - <linearGradient - id="linearGradient9528"> - <stop - style="stop-color:#080762;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop9529" /> - <stop - style="stop-color:#080762;stop-opacity:0;" - offset="1" - id="stop9530" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient7645"> - <stop - style="stop-color:#3693ce;stop-opacity:1;" - offset="0" - id="stop7646" /> - <stop - style="stop-color:#3693ce;stop-opacity:0;" - offset="1" - id="stop7647" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient7625"> - <stop - style="stop-color:#b4d4e8;stop-opacity:1;" - offset="0" - id="stop7626" /> - <stop - style="stop-color:#b4d4e8;stop-opacity:0;" - offset="1" - id="stop7627" /> - </linearGradient> - <linearGradient - id="linearGradient7618"> - <stop - style="stop-color:#6cafdc;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop7619" /> - <stop - style="stop-color:#6cafdc;stop-opacity:0;" - offset="1" - id="stop7620" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient6992"> - <stop - style="stop-color:#6cafdc;stop-opacity:1;" - offset="0" - id="stop6993" /> - <stop - style="stop-color:#6cafdc;stop-opacity:0;" - offset="1" - id="stop6994" /> - </linearGradient> - <linearGradient - id="linearGradient5124"> - <stop - style="stop-color:#0f7cc4;stop-opacity:0.0000000;" - offset="0.0000000" - id="stop5125" /> - <stop - style="stop-color:#3f7294;stop-opacity:1.0000000;" - offset="1.0000000" - id="stop5126" /> - </linearGradient> - <linearGradient - id="linearGradient4493"> - <stop - style="stop-color:#6cafdc;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop4494" /> - <stop - style="stop-color:#5b94ba;stop-opacity:1.0000000;" - offset="1.0000000" - id="stop4495" /> - </linearGradient> - <linearGradient - id="linearGradient3867"> - <stop - style="stop-color:#2270c8;stop-opacity:0.63586956;" - offset="0.0000000" - id="stop3868" /> - <stop - style="stop-color:#216bbe;stop-opacity:0.64313728;" - offset="0.42825395" - id="stop3870" /> - <stop - style="stop-color:#0772eb;stop-opacity:0.53725493;" - offset="0.91768706" - id="stop3871" /> - <stop - style="stop-color:#3d8feb;stop-opacity:0.77717394;" - offset="1.0000000" - id="stop3869" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3236"> - <stop - style="stop-color:#b2d9ef;stop-opacity:1;" - offset="0" - id="stop3237" /> - <stop - style="stop-color:#b2d9ef;stop-opacity:0;" - offset="1" - id="stop3238" /> - </linearGradient> - <linearGradient - id="linearGradient2610"> - <stop - style="stop-color:#2984eb;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop2611" /> - <stop - style="stop-color:#2984eb;stop-opacity:0;" - offset="1" - id="stop2612" /> - </linearGradient> - <linearGradient - id="linearGradient32557"> - <stop - style="stop-color:#d5e9d7;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop32558" /> - <stop - style="stop-color:#ffffff;stop-opacity:0.45108697;" - offset="1.0000000" - id="stop32559" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient31654"> - <stop - style="stop-color:#9cf257;stop-opacity:1;" - offset="0" - id="stop31655" /> - <stop - style="stop-color:#9cf257;stop-opacity:0;" - offset="1" - id="stop31656" /> - </linearGradient> - <linearGradient - id="linearGradient29920"> - <stop - style="stop-color:#86f721;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop29921" /> - <stop - style="stop-color:#d8f2c1;stop-opacity:0;" - offset="1" - id="stop29922" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient29210"> - <stop - style="stop-color:#ffffea;stop-opacity:1;" - offset="0" - id="stop29211" /> - <stop - style="stop-color:#ffffea;stop-opacity:0;" - offset="1" - id="stop29212" /> - </linearGradient> - <linearGradient - id="linearGradient29207"> - <stop - style="stop-color:#eb552f;stop-opacity:0.77254903;" - offset="0.0000000" - id="stop29208" /> - <stop - style="stop-color:#d64e2b;stop-opacity:0;" - offset="1" - id="stop29209" /> - </linearGradient> - <linearGradient - id="linearGradient27896"> - <stop - style="stop-color:#372820;stop-opacity:0.86956519;" - offset="0.0000000" - id="stop27897" /> - <stop - style="stop-color:#0f0503;stop-opacity:0.0000000;" - offset="1.0000000" - id="stop27898" /> - </linearGradient> - <linearGradient - id="linearGradient26575"> - <stop - style="stop-color:#f45a30;stop-opacity:0.86956519;" - offset="0.0000000" - id="stop26576" /> - <stop - style="stop-color:#d64e2b;stop-opacity:0.0000000;" - offset="1.0000000" - id="stop26577" /> - </linearGradient> - <linearGradient - id="linearGradient24703"> - <stop - style="stop-color:#aff274;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop24704" /> - <stop - style="stop-color:#f1f2f0;stop-opacity:0.32608697;" - offset="1.0000000" - id="stop24705" /> - </linearGradient> - <linearGradient - id="linearGradient22651"> - <stop - style="stop-color:#1add6a;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop22652" /> - <stop - style="stop-color:#1add6a;stop-opacity:0.54347825;" - offset="1.0000000" - id="stop22653" /> - </linearGradient> - <linearGradient - id="linearGradient19525"> - <stop - style="stop-color:#3de58d;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop19526" /> - <stop - style="stop-color:#3de5c4;stop-opacity:0.49803922;" - offset="0.50000000" - id="stop19528" /> - <stop - style="stop-color:#3de58d;stop-opacity:1.0000000;" - offset="1.0000000" - id="stop19527" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient19517"> - <stop - style="stop-color:#66e5a2;stop-opacity:1;" - offset="0" - id="stop19518" /> - <stop - style="stop-color:#66e5a2;stop-opacity:0;" - offset="1" - id="stop19519" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient18127"> - <stop - style="stop-color:#ce0329;stop-opacity:1;" - offset="0" - id="stop18128" /> - <stop - style="stop-color:#ce0329;stop-opacity:0;" - offset="1" - id="stop18129" /> - </linearGradient> - <linearGradient - id="linearGradient16187"> - <stop - style="stop-color:#29e57b;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop16188" /> - <stop - style="stop-color:#29e57b;stop-opacity:0.45652175;" - offset="1.0000000" - id="stop16189" /> - </linearGradient> - <linearGradient - id="linearGradient16183"> - <stop - style="stop-color:#29e59a;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop16184" /> - <stop - style="stop-color:#29d3e5;stop-opacity:0.45652175;" - offset="1.0000000" - id="stop16185" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient16179"> - <stop - style="stop-color:#29e582;stop-opacity:1;" - offset="0" - id="stop16180" /> - <stop - style="stop-color:#29e582;stop-opacity:0;" - offset="1" - id="stop16181" /> - </linearGradient> - <linearGradient - id="linearGradient16170"> - <stop - style="stop-color:#29e58e;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop16171" /> - <stop - style="stop-color:#45a2e5;stop-opacity:0.94565219;" - offset="0.50000000" - id="stop16174" /> - <stop - style="stop-color:#29e58e;stop-opacity:0.99456519;" - offset="1.0000000" - id="stop16172" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient11111"> - <stop - style="stop-color:#5794d8;stop-opacity:1;" - offset="0" - id="stop11112" /> - <stop - style="stop-color:#5794d8;stop-opacity:0;" - offset="1" - id="stop11113" /> - </linearGradient> - <linearGradient - id="linearGradient11099"> - <stop - style="stop-color:#589eea;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop11100" /> - <stop - style="stop-color:#79afea;stop-opacity:0;" - offset="1" - id="stop11101" /> - </linearGradient> - <linearGradient - id="linearGradient11083"> - <stop - style="stop-color:#a7b5ea;stop-opacity:0.043478262;" - offset="0.0000000" - id="stop11084" /> - <stop - style="stop-color:#5146ea;stop-opacity:1.0000000;" - offset="1.0000000" - id="stop11085" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient4818"> - <stop - style="stop-color:#e9390d;stop-opacity:1;" - offset="0" - id="stop4819" /> - <stop - style="stop-color:#e9390d;stop-opacity:0;" - offset="1" - id="stop4820" /> - </linearGradient> - <linearGradient - id="linearGradient4190"> - <stop - style="stop-color:#86ed18;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop4191" /> - <stop - style="stop-color:#bcecbf;stop-opacity:0.0000000;" - offset="1.0000000" - id="stop4192" /> - </linearGradient> - <linearGradient - id="linearGradient3564"> - <stop - style="stop-color:#000000;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop3565" /> - <stop - style="stop-color:#000000;stop-opacity:0;" - offset="1" - id="stop3566" /> - </linearGradient> - <linearGradient - id="linearGradient1695"> - <stop - style="stop-color:#b17b1b;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop1696" /> - <stop - style="stop-color:#583d0d;stop-opacity:1.0000000;" - offset="0.50000000" - id="stop1699" /> - <stop - style="stop-color:#c7922e;stop-opacity:1.0000000;" - offset="1.0000000" - id="stop1697" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient1695" - id="linearGradient1698" - gradientTransform="scale(1.666753,0.599969)" - x1="306.40466" - y1="742.39771" - x2="288.73209" - y2="703.21155" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3564" - id="linearGradient3567" - gradientTransform="scale(1.081233,0.924870)" - x1="499.80753" - y1="435.86755" - x2="550.16528" - y2="495.51517" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4190" - id="linearGradient4193" - gradientTransform="scale(1.040888,0.960718)" - x1="709.13391" - y1="445.11514" - x2="525.49945" - y2="652.39642" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4818" - id="linearGradient4821" - gradientTransform="matrix(1.310266,0.000000,0.000000,0.857544,-19.69210,-35.84892)" - x1="442.46298" - y1="540.10565" - x2="485.50449" - y2="578.96753" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient11083" - id="radialGradient11086" - gradientTransform="scale(0.980331,1.020064)" - cx="433.95916" - cy="440.16448" - fx="433.95916" - fy="440.16448" - r="149.47448" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient11099" - id="radialGradient11102" - gradientTransform="scale(1.077813,0.927805)" - cx="407.24873" - cy="602.51922" - fx="407.24873" - fy="602.51922" - r="25.687024" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient11111" - id="radialGradient11114" - gradientTransform="scale(1.060653,0.942816)" - cx="482.54009" - cy="581.81309" - fx="482.54009" - fy="581.81309" - r="27.273221" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient16170" - id="linearGradient16173" - gradientTransform="scale(1.266827,0.789374)" - x1="338.52740" - y1="497.77591" - x2="397.40027" - y2="626.40479" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient16170" - id="linearGradient16178" - gradientTransform="scale(0.876284,1.141182)" - x1="457.80389" - y1="352.55243" - x2="507.93503" - y2="370.55652" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient16179" - id="linearGradient16182" - gradientTransform="scale(0.754458,1.325456)" - x1="439.42288" - y1="318.50616" - x2="555.40745" - y2="318.50616" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient16183" - id="radialGradient16186" - gradientTransform="scale(0.970016,1.030911)" - cx="424.20871" - cy="485.59210" - fx="424.20871" - fy="485.59210" - r="34.210431" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient16187" - id="radialGradient16191" - gradientTransform="scale(1.503775,0.664993)" - cx="301.35504" - cy="785.52722" - fx="301.35504" - fy="785.52722" - r="51.984039" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient18127" - id="linearGradient18130" - gradientTransform="scale(1.279830,0.781354)" - x1="448.08412" - y1="529.98144" - x2="463.89505" - y2="529.98144" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient11083" - id="radialGradient18810" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(0.980331,1.020064)" - cx="433.95916" - cy="440.16448" - fx="433.95916" - fy="440.16448" - r="149.47448" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient11111" - id="radialGradient18811" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.060653,0.942816)" - cx="482.54009" - cy="581.81309" - fx="482.54009" - fy="581.81309" - r="27.273221" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient11099" - id="radialGradient18812" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.077813,0.927805)" - cx="407.24873" - cy="602.51922" - fx="407.24873" - fy="602.51922" - r="25.687024" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient11083" - id="radialGradient18829" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(0.980331,1.020064)" - cx="433.95916" - cy="440.16448" - fx="433.95916" - fy="440.16448" - r="149.47448" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient11111" - id="radialGradient18830" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.060653,0.942816)" - cx="482.54009" - cy="581.81309" - fx="482.54009" - fy="581.81309" - r="27.273221" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient11099" - id="radialGradient18831" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.077813,0.927805)" - cx="407.24873" - cy="602.51922" - fx="407.24873" - fy="602.51922" - r="25.687024" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient11083" - id="radialGradient18844" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(0.980331,1.020064)" - cx="433.95916" - cy="440.16448" - fx="433.95916" - fy="440.16448" - r="149.47448" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient11111" - id="radialGradient18845" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.060653,0.942816)" - cx="482.54009" - cy="581.81309" - fx="482.54009" - fy="581.81309" - r="27.273221" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient11099" - id="radialGradient18846" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.077813,0.927805)" - cx="407.24873" - cy="602.51922" - fx="407.24873" - fy="602.51922" - r="25.687024" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient11083" - id="radialGradient18858" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(0.980331,1.020064)" - cx="433.95916" - cy="440.16448" - fx="433.95916" - fy="440.16448" - r="149.47448" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient11111" - id="radialGradient18859" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.060653,0.942816)" - cx="482.54009" - cy="581.81309" - fx="482.54009" - fy="581.81309" - r="27.273221" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient11099" - id="radialGradient18860" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.077813,0.927805)" - cx="407.24873" - cy="602.51922" - fx="407.24873" - fy="602.51922" - r="25.687024" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient11083" - id="radialGradient18872" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(0.980331,1.020064)" - cx="433.95916" - cy="440.16448" - fx="433.95916" - fy="440.16448" - r="149.47448" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient11111" - id="radialGradient18873" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.060653,0.942816)" - cx="482.54009" - cy="581.81309" - fx="482.54009" - fy="581.81309" - r="27.273221" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient11099" - id="radialGradient18874" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.077813,0.927805)" - cx="407.24873" - cy="602.51922" - fx="407.24873" - fy="602.51922" - r="25.687024" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient19517" - id="linearGradient19520" - gradientTransform="scale(1.214521,0.823370)" - x1="169.38230" - y1="829.35319" - x2="354.75676" - y2="829.35319" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient19525" - id="linearGradient19524" - gradientTransform="scale(1.077049,0.928463)" - x1="214.43430" - y1="925.64703" - x2="314.95380" - y2="797.13611" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient16183" - id="linearGradient20153" - gradientTransform="scale(0.959947,1.041724)" - x1="123.61769" - y1="762.71704" - x2="297.13574" - y2="762.71704" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient16170" - id="linearGradient20778" - gradientTransform="scale(1.127960,0.886557)" - x1="100.04546" - y1="810.50677" - x2="140.80148" - y2="896.01904" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient16179" - id="linearGradient21403" - gradientTransform="scale(1.042594,0.959147)" - x1="60.617191" - y1="689.21771" - x2="213.33556" - y2="689.21771" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient16170" - id="radialGradient22029" - gradientTransform="scale(0.851142,1.174892)" - cx="235.80563" - cy="607.92432" - fx="235.80563" - fy="607.92432" - r="154.82706" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient22651" - id="linearGradient22654" - gradientTransform="scale(0.876829,1.140474)" - x1="239.28758" - y1="552.20875" - x2="410.63165" - y2="552.20875" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient16170" - id="linearGradient22753" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(0.876284,1.141182)" - x1="457.80389" - y1="352.55243" - x2="507.93503" - y2="370.55652" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient16170" - id="linearGradient22754" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.266827,0.789374)" - x1="338.52740" - y1="497.77591" - x2="397.40027" - y2="626.40479" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient16179" - id="linearGradient22755" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(0.754458,1.325456)" - x1="439.42288" - y1="318.50616" - x2="555.40745" - y2="318.50616" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient16187" - id="radialGradient22756" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.503775,0.664993)" - cx="301.35504" - cy="785.52722" - fx="301.35504" - fy="785.52722" - r="51.984039" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient16183" - id="radialGradient22757" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(0.970016,1.030911)" - cx="424.20871" - cy="485.59210" - fx="424.20871" - fy="485.59210" - r="34.210431" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient16170" - id="linearGradient22768" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(0.876284,1.141182)" - x1="457.80389" - y1="352.55243" - x2="507.93503" - y2="370.55652" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient16170" - id="linearGradient22769" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.266827,0.789374)" - x1="338.52740" - y1="497.77591" - x2="397.40027" - y2="626.40479" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient16179" - id="linearGradient22770" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(0.754458,1.325456)" - x1="439.42288" - y1="318.50616" - x2="555.40745" - y2="318.50616" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient16187" - id="radialGradient22771" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.503775,0.664993)" - cx="301.35504" - cy="785.52722" - fx="301.35504" - fy="785.52722" - r="51.984039" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient16183" - id="radialGradient22772" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(0.970016,1.030911)" - cx="424.20871" - cy="485.59210" - fx="424.20871" - fy="485.59210" - r="34.210431" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient22651" - id="linearGradient22796" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.747936,-0.263564,0.253248,0.812886,-66.00252,-522.2351)" - x1="239.28758" - y1="552.20875" - x2="410.63165" - y2="552.20875" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient19517" - id="linearGradient22797" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.035987,-0.365071,0.182835,0.586866,-66.00252,-522.2351)" - x1="169.38230" - y1="829.35319" - x2="354.75676" - y2="829.35319" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient19525" - id="linearGradient22798" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.780840,-0.608176,0.387303,0.562453,-192.5983,-395.8742)" - x1="214.43430" - y1="925.64703" - x2="314.95380" - y2="797.13611" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient16170" - id="radialGradient22799" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.726024,-0.255844,0.260891,0.837418,-66.00252,-522.2351)" - cx="235.80563" - cy="607.92432" - fx="235.80563" - fy="607.92432" - r="154.82706" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient16179" - id="linearGradient22800" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.889333,-0.313391,0.212986,0.683642,-66.00252,-522.2351)" - x1="60.617191" - y1="689.21771" - x2="213.33556" - y2="689.21771" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient16170" - id="linearGradient22801" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.917392,0.641787,-0.539887,0.559882,577.3328,-620.4757)" - x1="100.04546" - y1="810.50677" - x2="140.80148" - y2="896.01904" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient16183" - id="linearGradient22802" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.837713,0.196357,-5.692751e-2,-0.547806,526.2861,312.8796)" - x1="123.61769" - y1="762.71704" - x2="297.13574" - y2="762.71704" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient16170" - id="linearGradient22812" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(0.876284,1.141182)" - x1="457.80389" - y1="352.55243" - x2="507.93503" - y2="370.55652" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient16170" - id="linearGradient22813" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.266827,0.789374)" - x1="338.52740" - y1="497.77591" - x2="397.40027" - y2="626.40479" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient16179" - id="linearGradient22814" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(0.754458,1.325456)" - x1="439.42288" - y1="318.50616" - x2="555.40745" - y2="318.50616" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient16187" - id="radialGradient22815" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.503775,0.664993)" - cx="301.35504" - cy="785.52722" - fx="301.35504" - fy="785.52722" - r="51.984039" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient16183" - id="radialGradient22816" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.437602,-0.617552,0.407925,1.560044,-389.8963,-14.17233)" - cx="424.20871" - cy="485.59210" - fx="424.20871" - fy="485.59210" - r="34.210431" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient24703" - id="linearGradient24706" - gradientTransform="scale(0.883761,1.131527)" - x1="721.40253" - y1="415.81317" - x2="850.33508" - y2="369.74554" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27206" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,-20.78082,-22.33888)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27208" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,-14.32887,-25.06855)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27210" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,-17.55484,-15.39063)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27212" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,-9.117686,-18.12030)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27214" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,-3.410197,-23.57964)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27216" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,-0.432377,-14.89433)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27218" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,-8.621383,-10.67575)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27222" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,-12.59181,-6.209019)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27224" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,3.289898,-20.35366)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27226" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,5.275111,-13.65357)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27228" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,0.560229,-7.449777)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27230" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,-5.395411,-3.231199)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27232" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,-3.162046,2.724441)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27234" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,3.289898,-5.227275e-3)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27236" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,6.515870,-4.968261)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27238" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,11.97521,-11.17205)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27240" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,19.41976,-8.442384)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27242" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,15.44933,-4.223806)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27244" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,7.260325,0.987379)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27246" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,1.552836,7.191171)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27248" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,5.523263,13.64311)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27252" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,11.72705,7.935626)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27254" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,15.69748,1.979986)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27256" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,21.40497,-2.238592)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27258" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,30.09028,-5.960867)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27260" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,36.54222,-6.209019)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27262" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,24.83506,0.530754)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27264" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,18.18634,8.643387)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27266" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,16.92058,19.75586)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27268" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987894,0.000000,0.000000,1.012254,6.800716,19.31391)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27272" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.937251,-0.312243,0.319943,0.960362,-73.56507,191.5260)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27274" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.427858,-0.890434,0.912390,0.438408,-112.3984,741.8942)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27900" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.427858,-0.890434,0.912390,0.438408,-105.0254,734.8160)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27902" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.427858,-0.890434,0.912390,0.438408,-100.0624,741.0198)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27904" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.427858,-0.890434,0.912390,0.438408,-103.7847,743.9976)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27906" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.427858,-0.890434,0.912390,0.438408,-93.36228,743.9976)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27908" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.427858,-0.890434,0.912390,0.438408,-91.15093,735.9951)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27910" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.427858,-0.890434,0.912390,0.438408,-95.84380,730.3493)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27912" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.514186,-1.072342,1.096482,0.527971,-219.3567,791.6351)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27914" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.427858,-0.890434,0.912390,0.438408,-80.63751,724.2292)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27916" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.664584,-0.730933,0.748956,0.680972,-151.2493,542.3806)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27918" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.889151,-0.430517,0.441133,0.911076,-136.0881,269.0064)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27920" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.427858,-0.890434,0.912390,0.438408,-73.26199,724.6418)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27922" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.427858,-0.890434,0.912390,0.438408,-76.48797,745.7347)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27924" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.427858,-0.890434,0.912390,0.438408,-71.77309,755.1644)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27926" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.427858,-0.890434,0.912390,0.438408,-68.29896,748.4643)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27928" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.427858,-0.890434,0.912390,0.438408,-66.56190,741.7642)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27930" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.427858,-0.890434,0.912390,0.438408,-62.59148,733.0789)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27932" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.427858,-0.890434,0.912390,0.438408,-65.56930,727.6196)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27934" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.793371,-0.588640,0.603155,0.812934,-128.8736,388.4537)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27936" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.018401,-0.517302,0.507610,1.089658,-220.2464,232.2565)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27938" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.943971,-0.550652,0.583011,0.936086,-211.4401,331.5020)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27940" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.427858,-0.890434,0.912390,0.438408,-66.06560,759.3830)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27942" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.427858,-0.890434,0.912390,0.438408,-57.87659,764.5942)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27944" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.427858,-0.890434,0.912390,0.438408,-51.92095,759.1348)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27946" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.427858,-0.890434,0.912390,0.438408,-50.54511,749.7667)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27948" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.427858,-0.890434,0.912390,0.438408,-50.35567,743.5233)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27950" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.801512,-0.577507,0.591747,0.821275,-119.8147,382.4496)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27952" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.982115,-0.551060,0.779595,0.728869,-306.3692,421.7354)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27954" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.029952,-0.715437,1.108330,0.698035,-478.7668,522.2340)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27956" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.012317,-0.268694,0.615328,0.970025,-252.5294,156.2318)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient27958" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.427858,-0.890434,0.912390,0.438408,-49.43944,765.3386)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient26575" - id="linearGradient27960" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.778543,-0.725499,0.863160,0.687046,-256.7091,527.2207)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29213" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-30.78662,6.259520)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29217" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-20.18376,-5.109815)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29219" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-15.32944,-13.15777)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29221" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,2.810396,-40.87850)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29223" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,7.920208,-49.43744)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29225" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,12.77453,-39.47330)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29227" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,15.71267,-44.83861)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29229" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,6.131774,-30.40339)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29231" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-2.043926,-22.35543)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29233" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-10.98610,-18.39533)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29235" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-29.25368,14.05198)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29237" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-23.50514,19.92827)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29239" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-20.82249,14.17973)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29241" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-22.09994,9.453150)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29243" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-17.24562,23.63288)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29245" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-12.26355,19.80052)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29247" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-23.50514,4.726573)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29249" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-15.71267,29.25367)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29251" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-7.664719,34.49123)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29253" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-7.025993,25.80455)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29255" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-8.666743e-7,36.66290)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29257" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-0.638727,30.53113)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29259" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-17.50111,1.660686)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29261" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-12.64679,-4.982070)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29263" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-6.131776,-13.15777)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29265" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,9.580897,-41.77272)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29267" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,7.536972,-21.07798)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29269" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,7.281482,-11.36934)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29275" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.868395,0.253674,1.568375,1.457824,-1180.288,-292.0646)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29277" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.868395,0.253674,1.568375,1.457824,-1186.676,-298.8351)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29279" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.868395,0.253674,1.568375,1.457824,-1181.310,-302.7952)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29281" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.827425,0.464507,1.392413,1.626726,-1066.229,-520.6123)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29283" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.835781,0.430301,1.422547,1.600440,-1079.567,-494.5802)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29285" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.834396,0.436167,1.417424,1.604980,-1083.711,-510.0830)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29287" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.868395,0.253674,1.568375,1.457824,-1180.799,-314.0368)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29289" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.868395,0.253674,1.568375,1.457824,-1193.829,-311.3542)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29291" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.810800,0.525597,1.337014,1.672556,-1035.630,-591.5112)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29293" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.868395,0.253674,1.568375,1.457824,-1200.600,-306.2444)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29295" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.868395,0.253674,1.568375,1.457824,-1208.265,-297.0467)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient29296" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.849689,0.365927,1.477572,1.549785,-1140.632,-404.9573)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29923" - gradientTransform="scale(0.987575,1.012581)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29925" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-13.90681,-18.79995)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29927" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-15.96708,-32.19169)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29929" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-16.73968,-36.82729)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29931" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-4.635605,-39.66016)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29933" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,4.635603,-32.96429)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29935" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,16.48215,-27.04102)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29937" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,26.52596,-23.95062)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29939" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,36.82730,-17.51228)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29941" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-11.07394,-3.347932)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29943" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-5.665740,-15.19448)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29945" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-2.575337,-26.26842)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29947" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-14.67941,7.468477)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29949" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-6.438340,16.22462)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29951" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,43.26564,-12.87667)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29953" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,58.20258,1.802739)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29955" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,39.91770,9.528745)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29957" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,16.73968,-3.863000)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29959" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,7.726005,19.57255)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29961" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,22.40542,19.57255)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29963" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,38.11497,16.48215)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29965" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,56.39985,16.73969)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29967" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,63.35325,19.05749)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29969" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,1.802733,20.60269)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29971" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-13.39175,14.67942)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29973" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,12.61914,15.19448)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29975" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,9.013673,5.665742)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29977" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,7.210938,-10.55887)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29979" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,32.19169,3.347940)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29981" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,18.54241,5.665742)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29983" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-0.772602,7.468477)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29985" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,3.090401,-5.665735)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29987" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,4.893136,-15.96708)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,29.87389,9.271212)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29991" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,53.05191,12.36161)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29993" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,43.78070,12.10408)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29995" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,27.55609,16.48215)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29997" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,79.06280,13.90682)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient29999" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,41.72043,-18.79995)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient30001" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,16.22461,-32.19169)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient30003" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-14.42188,-7.468469)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient30005" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-20.34515,-8.498604)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient30007" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-20.08762,-16.99721)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient30009" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-18.54242,5.150675)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient30011" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,10.30134,14.93695)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient30013" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,18.79995,20.86022)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient30015" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,46.35604,16.22462)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient30017" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-1.030136,-6.953402)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient30019" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-20.08762,-0.515063)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient30021" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-11.33148,-52.53684)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient30023" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-17.51228,-44.03823)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29920" - id="linearGradient30025" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-20.08762,-21.11775)" - x1="658.40747" - y1="488.13486" - x2="651.27698" - y2="479.61664" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31657" - gradientTransform="matrix(1.209609,0.000000,0.000000,0.826714,-10.30134,-1.030134)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31659" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.209609,0.000000,0.000000,0.826714,0.212737,5.649845)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31661" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.209609,0.000000,0.000000,0.826714,0.470271,-4.393963)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31663" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.209609,0.000000,0.000000,0.826714,3.818207,-13.15010)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31665" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.209609,0.000000,0.000000,0.826714,-2.362598,-8.772034)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31667" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.209609,0.000000,0.000000,0.826714,2.273006,10.80052)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31669" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.209609,0.000000,0.000000,0.826714,13.86202,4.362178)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31671" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.209609,0.000000,0.000000,0.826714,10.51408,-5.681631)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31673" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.209609,0.000000,0.000000,0.826714,9.483946,-20.61858)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31675" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.165816,-0.322530,0.220435,0.796784,-79.17957,158.6984)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31677" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.106319,-0.489092,0.334273,0.756120,-101.1416,259.2760)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31679" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.086990,-0.530666,0.362687,0.742909,-97.84456,279.0446)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31681" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.209609,0.000000,0.000000,0.826714,19.27022,-23.96651)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31683" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.209609,0.000000,0.000000,0.826714,25.96609,-34.26786)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31685" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.209609,0.000000,0.000000,0.826714,32.14690,-44.82673)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31687" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.209609,0.000000,0.000000,0.826714,17.72502,-14.43777)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31691" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.209609,0.000000,0.000000,0.826714,17.46749,-4.393963)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31693" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.209609,0.000000,0.000000,0.826714,12.83188,11.57312)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31695" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.209609,0.000000,0.000000,0.826714,7.681211,19.81419)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31697" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.155385,-0.358105,0.244749,0.789654,-65.34849,152.4549)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31699" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.126128,-0.441576,0.301798,0.769659,-73.70026,200.3496)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient31701" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.209609,0.000000,0.000000,0.826714,37.55510,-54.09794)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient32560" - gradientTransform="scale(1.040271,0.961288)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient32562" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.151955,6.641592e-2,-6.348944e-2,1.050832,-55.76705,-72.55543)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient32564" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.037713,7.290470e-2,-6.736938e-2,0.958924,27.83212,-39.51157)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient32566" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.736493,0.734671,-0.678891,0.680574,411.7452,-302.0044)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient32568" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.760880,0.709384,-0.655523,0.703110,392.2087,-298.3966)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient32570" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.579637,0.718025,-0.510932,0.695579,458.4489,-287.7201)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient32574" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.096088,0.173147,-0.158543,1.003640,20.15197,-118.5459)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient32576" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.103483,0.183541,-0.163918,1.055082,13.52824,-132.0046)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient32578" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.103483,0.183541,-0.163918,1.055082,10.21400,-121.9192)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient32580" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.103483,0.183541,-0.163918,1.055082,9.183869,-116.5110)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient32582" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.103483,0.183541,-0.163918,1.055082,7.896201,-110.8452)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient32584" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.103483,0.183541,-0.163918,1.055082,5.835933,-104.6644)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient32586" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.076966,0.302499,-0.277727,1.030987,62.26978,-174.7270)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient32588" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.075455,0.307829,-0.282829,1.029599,61.54302,-169.6520)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient32590" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.067558,0.334189,-0.308069,1.022331,74.27139,-176.6682)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient32592" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.866614,0.491835,-0.396058,0.963964,247.6981,-259.7047)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient32594" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.698720,0.621119,-0.438090,0.894314,376.2831,-317.1018)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient32596" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.535772,0.827273,-0.556347,0.727119,527.9138,-395.5688)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient33239" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.165816,-0.322530,0.220435,0.796784,-102.1224,200.1346)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient33241" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.165816,-0.322530,0.220435,0.796784,-108.3032,197.3017)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient33243" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.165816,-0.322530,0.220435,0.796784,-99.28952,209.9209)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient33245" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.165816,-0.322530,0.220435,0.796784,-90.53337,208.3757)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient33247" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.165816,-0.322530,0.220435,0.796784,-87.95804,216.6167)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient24703" - id="linearGradient34091" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(0.722156,1.384742)" - x1="851.38702" - y1="329.09396" - x2="911.94794" - y2="265.80905" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient34092" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.040271,7.911964e-17,1.809314e-16,0.961288,-1.281484,0.497022)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient34093" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.926831,-0.167631,-0.230108,0.835203,162.6202,168.4452)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient34094" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.037713,7.290470e-2,-6.736938e-2,0.958924,27.83212,-39.51157)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient34095" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.736493,0.734671,-0.678891,0.680574,411.7452,-302.0044)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient34096" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.760880,0.709384,-0.655523,0.703110,392.2087,-298.3966)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient34097" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.579637,0.718025,-0.510932,0.695579,458.4489,-287.7201)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient34098" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.430658,0.729845,-0.325078,0.682599,500.6209,-283.1892)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient34099" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.096088,0.173147,-0.158543,1.003640,20.15197,-118.5459)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient34100" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.103483,0.183541,-0.163918,1.055082,13.52824,-132.0046)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient34101" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.103483,0.183541,-0.163918,1.055082,10.21400,-121.9192)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient34102" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.103483,0.183541,-0.163918,1.055082,9.183869,-116.5110)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient34103" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.103483,0.183541,-0.163918,1.055082,7.896201,-110.8452)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient34104" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.103483,0.183541,-0.163918,1.055082,5.835933,-104.6644)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient34105" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.076966,0.302499,-0.277727,1.030987,62.26978,-174.7270)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient34106" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.075455,0.307829,-0.282829,1.029599,61.54302,-169.6520)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient34107" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.067558,0.334189,-0.308069,1.022331,74.27139,-176.6682)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient34108" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.866614,0.491835,-0.396058,0.963964,247.6981,-259.7047)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient34109" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.698720,0.621119,-0.438090,0.894314,376.2831,-317.1018)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient34110" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.535772,0.827273,-0.556347,0.727119,527.9138,-395.5688)" - x1="738.24438" - y1="359.04068" - x2="647.64850" - y2="320.38120" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient34111" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.295010,-0.932235,0.586346,0.219093,148.0222,793.0125)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient34112" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.295010,-0.932235,0.586346,0.219093,138.1218,782.1221)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient34113" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.295010,-0.932235,0.586346,0.219093,135.8943,773.9543)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient34114" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.295010,-0.932235,0.586346,0.219093,140.7517,791.5754)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient34115" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.295010,-0.932235,0.586346,0.219093,139.3594,774.2018)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient34116" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.295010,-0.932235,0.586346,0.219093,145.2996,783.6071)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient34117" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.295010,-0.932235,0.586346,0.219093,135.3992,766.0340)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient31654" - id="linearGradient34118" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.295010,-0.932235,0.586346,0.219093,150.0023,796.7251)" - x1="540.32678" - y1="526.11975" - x2="530.11053" - y2="529.01123" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient32557" - id="linearGradient35362" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.590873,1.001364,-0.446015,0.936542,0.000000,0.000000)" - x1="863.26630" - y1="-404.22238" - x2="842.65424" - y2="-416.36603" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2610" - id="linearGradient2613" - gradientTransform="matrix(1.724864,0.000000,0.000000,0.579756,13.46278,356.2460)" - x1="419.98212" - y1="900.96655" - x2="152.85609" - y2="70.039268" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3236" - id="linearGradient3239" - gradientTransform="matrix(2.010612,0.000000,0.000000,0.497361,17.60518,365.5664)" - x1="223.00340" - y1="-113.55350" - x2="733.91034" - y2="1418.3474" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3867" - id="linearGradient3245" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.724864,0.000000,0.000000,0.579756,-15.53398,409.0615)" - x1="-0.70458949" - y1="458.81543" - x2="739.60657" - y2="451.16016" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4493" - id="linearGradient4496" - gradientTransform="scale(0.999428,1.000572)" - x1="522.64154" - y1="522.35547" - x2="522.27380" - y2="599.56842" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5124" - id="linearGradient4502" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.999428,0.000000,0.000000,1.000572,-1.496982,0.224547)" - x1="525.23193" - y1="523.95349" - x2="523.71497" - y2="599.02582" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient6992" - id="radialGradient6995" - gradientTransform="scale(0.517306,1.933091)" - cx="1051.1016" - cy="290.64341" - fx="1051.1016" - fy="290.64341" - r="9.6218940" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient7625" - id="radialGradient7628" - gradientTransform="scale(3.370999,0.296648)" - cx="296.57391" - cy="1382.4457" - fx="296.57391" - fy="1382.4457" - r="9.2981535" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient7625" - id="radialGradient7630" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(3.370999,0.296648)" - cx="296.57391" - cy="1382.4457" - fx="296.57391" - fy="1382.4457" - r="9.2981535" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient7625" - id="radialGradient7632" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(3.370999,0.296648)" - cx="296.57391" - cy="1382.4457" - fx="296.57391" - fy="1382.4457" - r="9.2981535" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient7625" - id="radialGradient7634" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(3.370999,0.296648)" - cx="296.57391" - cy="1382.4457" - fx="296.57391" - fy="1382.4457" - r="9.2981535" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient7625" - id="radialGradient7636" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(3.370999,0.296648)" - cx="296.57391" - cy="1382.4457" - fx="296.57391" - fy="1382.4457" - r="9.2981535" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient7625" - id="radialGradient7638" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(3.370999,0.296648)" - cx="296.57391" - cy="1382.4457" - fx="296.57391" - fy="1382.4457" - r="9.2981535" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient7625" - id="radialGradient7640" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(3.370999,0.296648)" - cx="296.57391" - cy="1382.4457" - fx="296.57391" - fy="1382.4457" - r="9.2981535" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient7625" - id="radialGradient7642" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(3.370999,0.296648)" - cx="296.57391" - cy="1382.4457" - fx="296.57391" - fy="1382.4457" - r="9.2981535" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient7645" - id="linearGradient7648" - gradientTransform="scale(0.587795,1.701274)" - x1="1794.5216" - y1="133.68471" - x2="1794.5216" - y2="328.50177" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9528" - id="linearGradient9547" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.381130,0.000000,0.000000,0.724045,15.53398,-1.035599)" - x1="20.132007" - y1="272.79824" - x2="542.98260" - y2="272.79824" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient10191" - id="linearGradient9551" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.381130,0.724045)" - x1="247.66397" - y1="426.46765" - x2="371.05960" - y2="61.155201" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient10815" - id="linearGradient9559" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.381130,9.707052e-17,3.558063e-17,0.724045,15.53398,-1.035599)" - x1="20.132008" - y1="272.79825" - x2="542.98260" - y2="272.79825" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient13927" - id="radialGradient13930" - gradientTransform="scale(1.069850,0.934711)" - cx="560.18524" - cy="479.57709" - fx="560.60718" - fy="479.09290" - r="49.800396" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient14553" - id="radialGradient14558" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.540400,0.000000,0.000000,0.649182,-5.916122,-4.022963)" - cx="423.37262" - cy="842.77686" - fx="423.37262" - fy="842.77686" - r="62.536392" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient15803" - id="linearGradient15806" - gradientTransform="scale(1.234394,0.810114)" - x1="303.45883" - y1="196.89500" - x2="732.64819" - y2="795.76660" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2582" - id="linearGradient1956" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.381130,1.122787e-16,8.625309e-17,0.724045,15.53398,-1.035599)" - x1="20.132008" - y1="272.79825" - x2="542.98260" - y2="272.79825" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2582" - id="linearGradient2588" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.381130,2.068785e-16,1.105491e-16,0.724045,15.53398,-1.035599)" - x1="20.132008" - y1="272.79825" - x2="542.98260" - y2="272.79825" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2582" - id="linearGradient2592" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.381130,1.214036e-16,1.326668e-16,0.724045,15.53398,-1.035599)" - x1="20.132008" - y1="272.79825" - x2="542.98260" - y2="272.79825" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient2596" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.810800,0.525597,1.337014,1.672556,-1026.028,-565.4414)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient2598" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.810800,0.525597,1.337014,1.672556,-1040.135,-559.3741)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient2600" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.810800,0.525597,1.337014,1.672556,-1021.781,-572.1156)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient2602" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.810800,0.525597,1.337014,1.672556,-1012.225,-572.1156)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient2604" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.810800,0.525597,1.337014,1.672556,-1052.724,-558.1606)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient2606" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.810800,0.525597,1.337014,1.672556,-1021.477,-566.9583)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient2719" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,1.766951,42.53737)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient2721" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,9.502860,46.02611)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient29210" - id="linearGradient2723" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,22.54773,46.93622)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient2725" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,30.73869,52.85191)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3351" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,16.63203,49.21148)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3353" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,34.53080,56.79570)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3355" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,41.50829,59.52603)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3357" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,43.32850,54.21707)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3359" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,35.74428,47.54295)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3361" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,51.06441,58.61592)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3363" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,56.37337,67.26193)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3365" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,45.75546,62.86308)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3367" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,24.51963,51.18338)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3369" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,51.97452,49.21148)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3371" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,70.78340,48.14969)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3373" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,80.79458,46.48116)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3375" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,95.81134,47.54295)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3377" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,60.46885,47.08790)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3379" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,65.62613,57.40244)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3381" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,60.16548,54.52044)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3383" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,53.18800,60.58782)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3385" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,47.12062,54.21707)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3387" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,44.84535,49.36316)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3389" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,73.05867,64.53161)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3391" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,96.26639,71.66079)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3393" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,109.3113,62.71140)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3395" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,83.82827,61.34624)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3397" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,84.58669,38.44188)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3399" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,70.02498,37.22840)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3401" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,95.50797,39.80704)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3403" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,105.5191,45.11600)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3405" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,53.03631,38.13851)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3407" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,27.70500,41.47557)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3409" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,13.75003,40.11041)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3411" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,64.86770,68.02036)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3413" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,78.97436,73.17763)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3415" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,68.96318,21.30153)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3417" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,40.59818,6.284765)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3347" - id="linearGradient3419" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,64.10928,2.189284)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4134" - id="radialGradient4143" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(0.987734,1.012418)" - cx="651.55780" - cy="477.82614" - fx="651.55780" - fy="477.82614" - r="195.36795" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6847" - id="linearGradient6858" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.381402,0.723902)" - x1="31.486246" - y1="271.42126" - x2="554.00787" - y2="271.42126" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient6864" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.012317,-0.268694,0.615328,0.970025,-318.7249,148.5209)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient8737" - id="radialGradient8740" - gradientTransform="scale(2.154316,0.464185)" - cx="347.72696" - cy="1018.0652" - fx="347.72696" - fy="1018.0652" - r="80.600567" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient9363" - id="radialGradient9366" - gradientTransform="scale(1.470760,0.679921)" - cx="393.44842" - cy="729.92766" - fx="393.44842" - fy="729.92766" - r="97.868379" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient8737" - id="radialGradient11231" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.154316,-1.020908,0.000000,0.464185,-359.4387,434.7816)" - cx="347.72696" - cy="1018.0652" - fx="347.72696" - fy="1018.0652" - r="80.600567" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient8737" - id="radialGradient11233" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.154316,-1.020908,0.000000,0.464185,-630.8869,578.0072)" - cx="347.72696" - cy="1018.0652" - fx="347.72696" - fy="1018.0652" - r="80.600567" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient8737" - id="radialGradient11235" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.154316,0.000000,0.000000,0.464185,228.3615,58.97665)" - cx="347.72696" - cy="1018.0652" - fx="347.72696" - fy="1018.0652" - r="80.600567" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient11858" - id="radialGradient11861" - gradientTransform="scale(1.431356,0.698638)" - cx="640.29669" - cy="715.48064" - fx="640.29669" - fy="715.48064" - r="27.752797" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient12484" - id="linearGradient12491" - gradientTransform="scale(1.149762,0.869745)" - x1="875.55115" - y1="493.48654" - x2="807.70654" - y2="428.66379" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient12484" - id="linearGradient12493" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.011473,0.546695,-0.413551,0.765135,0.000000,0.000000)" - x1="1023.0687" - y1="-241.42816" - x2="999.95947" - y2="-327.93689" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient16306" - id="linearGradient16309" - gradientTransform="scale(1.165421,0.858059)" - x1="945.26428" - y1="601.43610" - x2="955.62598" - y2="610.90717" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient16311" - id="radialGradient16314" - gradientTransform="scale(0.807042,1.239092)" - cx="1427.3757" - cy="391.50178" - fx="1427.3757" - fy="391.50178" - r="36.047479" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient16323" - id="radialGradient16326" - gradientTransform="scale(0.952880,1.049450)" - cx="1145.5621" - cy="483.00604" - fx="1145.5621" - fy="483.00604" - r="26.520229" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient16328" - id="linearGradient16331" - gradientTransform="scale(0.591090,1.691790)" - x1="1882.3138" - y1="295.38058" - x2="1882.3138" - y2="265.39999" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient16328" - id="linearGradient16336" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.591090,0.000000,0.000000,1.691790,-13.69300,10.69440)" - x1="1882.3138" - y1="295.38058" - x2="1882.3138" - y2="265.39999" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4134" - id="radialGradient17593" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987734,0.000000,0.000000,1.012418,11.44915,17.40954)" - cx="651.55780" - cy="477.82614" - fx="651.55780" - fy="477.82614" - r="195.36795" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4134" - id="radialGradient17603" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987734,0.000000,0.000000,1.012418,9.558439,35.31861)" - cx="651.55780" - cy="477.82614" - fx="651.55780" - fy="477.82614" - r="195.36795" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4134" - id="radialGradient17605" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987734,0.000000,0.000000,1.012418,3.917300,54.12240)" - cx="651.55780" - cy="477.82614" - fx="651.55780" - fy="477.82614" - r="195.36795" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient18861" - id="radialGradient17607" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987734,0.000000,0.000000,1.012418,12.36990,12.27472)" - cx="659.99554" - cy="413.55933" - fx="659.99554" - fy="413.55933" - r="103.70863" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient18861" - id="radialGradient17609" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987734,0.000000,0.000000,1.012418,15.26705,31.50123)" - cx="659.99554" - cy="413.55933" - fx="659.99554" - fy="413.55933" - r="103.70863" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient18861" - id="radialGradient17610" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987734,0.000000,0.000000,1.012418,-1.580261,-0.263377)" - cx="659.99554" - cy="413.55933" - fx="659.99554" - fy="413.55933" - r="103.70863" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient18234" - id="radialGradient18237" - gradientTransform="scale(0.593526,1.684847)" - cx="1118.4713" - cy="205.08790" - fx="1118.4713" - fy="205.08790" - r="20.634364" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient18234" - id="radialGradient18239" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(0.593526,1.684847)" - cx="1118.4713" - cy="205.08790" - fx="1118.4713" - fy="205.08790" - r="20.634364" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient20109" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.752220,-0.640391,0.656181,0.770768,-124.5753,439.8346)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient20113" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.752220,-0.640391,0.656181,0.770768,-135.3115,437.5400)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient20115" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.973413,-0.168531,0.172686,0.997415,-59.56658,51.19465)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient20117" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.752220,-0.640391,0.656181,0.770768,-141.3692,433.5893)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient20119" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.752220,-0.640391,0.656181,0.770768,-133.2045,435.1695)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient20121" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.752220,-0.640391,0.656181,0.770768,-131.0974,445.1778)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient20127" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.752220,-0.640391,0.656181,0.770768,-115.8216,446.2313)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient27896" - id="linearGradient20129" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.752220,-0.640391,0.656181,0.770768,-106.0766,454.1326)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4818" - id="linearGradient20139" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987437,-3.005222e-2,3.079281e-2,1.011785,-12.99311,29.54724)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4818" - id="linearGradient20766" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987437,-3.005222e-2,3.079281e-2,1.011785,-15.51716,22.97124)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4818" - id="linearGradient20770" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987437,-3.005222e-2,3.079281e-2,1.011785,-22.62834,15.06993)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4818" - id="linearGradient20772" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987437,-3.005222e-2,3.079281e-2,1.011785,-19.46781,20.07409)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4818" - id="linearGradient20774" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987437,-3.005222e-2,3.079281e-2,1.011785,-28.94938,6.115120)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4818" - id="linearGradient20776" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.840119,-0.519744,0.532560,0.860835,-180.9311,344.6393)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4818" - id="linearGradient20779" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987437,-3.005222e-2,3.079281e-2,1.011785,-36.32393,-4.156579)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4818" - id="linearGradient20781" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987437,-3.005222e-2,3.079281e-2,1.011785,-10.77638,8.222131)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4818" - id="linearGradient20783" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987437,-3.005222e-2,3.079281e-2,1.011785,10.29378,7.432000)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4818" - id="linearGradient20785" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987437,-3.005222e-2,3.079281e-2,1.011785,-10.24962,32.97956)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4818" - id="linearGradient20787" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987437,-3.005222e-2,3.079281e-2,1.011785,1.075584,14.80655)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4818" - id="linearGradient20789" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987437,-3.005222e-2,3.079281e-2,1.011785,13.19092,27.71202)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4818" - id="linearGradient20791" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987437,-3.005222e-2,3.079281e-2,1.011785,-23.41847,5.324989)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4818" - id="linearGradient20793" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987437,-3.005222e-2,3.079281e-2,1.011785,-2.348316,25.86839)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4818" - id="linearGradient20795" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987437,-3.005222e-2,3.079281e-2,1.011785,24.77950,16.38681)" - x1="584.57037" - y1="453.69092" - x2="580.25800" - y2="445.05798" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient20817" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-3.414257,37.30035)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21443" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-11.84231,30.71593)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21445" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-18.69011,25.71177)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21447" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-34.49273,3.324736)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21449" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,-31.06883,7.802143)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21451" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,60.32295,64.16480)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21453" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,49.26112,61.26765)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21455" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,42.67670,57.31700)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21457" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,45.31047,50.20582)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21459" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,56.89905,54.41985)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21461" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,61.63984,43.09465)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21463" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,74.80868,72.32948)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21465" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,69.80452,70.22246)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21467" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,62.69335,65.48168)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21469" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,87.18740,77.07026)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21471" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,105.3604,75.22662)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21473" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,107.9942,58.63388)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21475" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,97.45909,55.73674)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21477" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,82.97337,59.95077)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21479" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,87.18740,51.52271)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21481" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,97.98585,77.59702)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21483" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,110.8913,77.59702)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21485" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,116.4222,74.43649)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21487" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,124.8503,64.95493)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21489" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,123.7968,60.47752)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21491" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,115.3687,56.52687)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21493" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,113.2617,69.16896)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21495" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,102.1999,53.89310)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21497" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,119.5828,69.95909)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21499" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,100.0929,83.91806)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21501" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,83.23674,76.54351)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21503" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,50.84139,65.21830)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21505" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,59.26945,64.69155)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21507" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,25.29383,53.10297)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21509" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,15.81226,49.41569)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21511" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,6.857446,45.72841)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21513" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,0.799778,42.83127)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21515" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,12.38836,34.40321)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21517" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,21.34317,35.98347)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21519" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,40.83306,39.67075)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21521" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,61.90321,38.35386)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21523" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,75.33544,43.35802)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21525" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,76.91570,54.68323)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21527" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,90.08454,47.83543)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21529" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,95.87883,51.52271)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21531" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,82.44661,11.48942)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21533" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,100.6196,28.60892)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21535" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,16.07564,-12.21450)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21539" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,110.1012,54.94660)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21541" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,93.50844,81.02092)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21543" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,101.4097,84.97157)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21545" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,75.59881,73.64636)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient21439" - id="linearGradient21547" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.987575,0.000000,0.000000,1.012581,19.23616,50.46920)" - x1="629.39368" - y1="471.64603" - x2="624.75055" - y2="465.35226" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient12484" - id="linearGradient21629" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.796302,-0.829371,0.627383,-0.602368,0.000000,0.000000)" - x1="-691.15564" - y1="30.686178" - x2="-754.20099" - y2="2.5523021" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#afafaf" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.078431373" - inkscape:pageshadow="2" - inkscape:zoom="11.240968" - inkscape:cx="447.05866" - inkscape:cy="294.43435" - inkscape:current-layer="layer2" - inkscape:window-width="1333" - inkscape:window-height="1112" - inkscape:window-x="0" - inkscape:window-y="31" /> - <metadata - id="metadata4"> - <rdf:RDF - id="RDF5"> - <cc:Work - rdf:about="" - id="Work6"> - <dc:format - id="format7">image/svg+xml</dc:format> - <dc:type - id="type9" - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title - id="title1820">Gearflowers</dc:title> - <dc:date - id="date1822">January 8, 2004</dc:date> - <dc:creator - id="creator1824"> - <cc:Agent - id="Agent1825"> - <dc:title - id="title1826">Alexandre Rostovtsev</dc:title> - </cc:Agent> - </dc:creator> - <dc:description - id="description1828">Wallpaper design for the KDE SVG contest. Also, hummingbirds are cool.</dc:description> - <cc:license - id="license1830" - rdf:resource="http://creativecommons.org/licenses/LGPL/2.1/" /> - <dc:subject - id="subject1838"> - <rdf:Bag - id="Bag1839"> - <rdf:li - id="li1974">gear</rdf:li> - <rdf:li - id="li1976">flower</rdf:li> - <rdf:li - id="li1978">hummingbird</rdf:li> - </rdf:Bag> - </dc:subject> - <dc:rights - id="rights4497"> - <cc:Agent - id="Agent4498"> - <dc:title - id="title4499">Alexandre Rostovtsev</dc:title> - </cc:Agent> - </dc:rights> - </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/LGPL/2.1/" - id="License21621"> - <cc:permits - rdf:resource="http://web.resource.org/cc/Reproduction" - id="permits21622" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/Distribution" - id="permits21623" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Notice" - id="requires21624" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/DerivativeWorks" - id="permits21625" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/ShareAlike" - id="requires21626" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/SourceCode" - id="requires21627" /> - </cc:License> - </rdf:RDF> - </metadata> - <g - inkscape:groupmode="layer" - id="layer5" - inkscape:label="Background"> - <path - style="fill:url(#linearGradient15806);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M -6.2135922,331.39159 C 462.91262,273.39806 657.60518,-4.1423948 657.60518,-4.1423948 L 1286.2136,-5.1779935 C 1286.2136,-5.1779935 1285.1780,312.75081 1287.2492,457.73463 C 1168.1553,501.22977 1142.2654,764.27184 1034.5631,824.33657 C 926.86084,884.40129 668.99676,796.37540 532.29773,773.59223 C 395.59871,750.80906 -8.2847896,816.05178 -8.2847896,816.05178 L -6.2135922,331.39159 z " - id="path15180" - sodipodi:nodetypes="cccccccc" /> - <g - id="Leaf" - transform="translate(501.6423,196.3455)"> - <path - style="fill:url(#linearGradient9547);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 43.495157,164.66019 C 276.50486,388.34951 338.64079,376.95793 423.55988,385.24272 C 508.47898,393.52751 694.88669,258.89967 724.91909,252.68608 C 754.95149,246.47249 752.88029,251.65048 765.30749,256.82848 C 748.73789,210.22653 666.92559,97.346281 611.00319,62.135921 C 555.08089,26.925563 404.91910,-13.462777 280.64726,19.676373 C 198.83496,38.317153 115.98706,135.66343 43.495157,164.66019 z " - id="path8898" - sodipodi:nodetypes="ccccccc" /> - <path - style="fill:#080762;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 449.21875,12.343750 C 372.55367,131.34626 351.03163,190.15459 345.31250,234.71875 C 296.43407,228.74167 250.88253,220.20102 210.06250,211.18750 C 210.18144,159.47011 307.03125,15.562500 307.03125,15.562500 C 231.73758,132.43627 211.35292,167.53740 205.28125,210.12500 C 111.44954,189.10115 46.625000,165.87500 46.625000,165.87500 C 95.278072,186.13432 149.62093,202.52998 204.53125,215.34375 C 205.73417,244.61892 210.49875,254.89076 234.81250,324.93750 C 212.11540,236.98624 209.34258,255.80079 209.75000,216.50000 C 255.62272,227.00430 301.69759,235.02520 345.12500,240.43750 C 346.64554,269.96362 353.89092,311.29960 377.53125,379.40625 C 355.00622,292.12181 351.03030,281.31222 351.31250,241.25000 C 399.42652,247.01704 443.95673,249.65958 480.81250,249.21875 C 482.09933,277.29978 486.10250,295.38014 509.81250,363.68750 C 486.91509,274.96003 484.85720,289.97427 485.34375,249.09375 C 521.11851,248.40068 549.34122,244.76072 565.71875,238.12500 C 576.82659,233.17150 593.20091,230.91691 611.78125,230.34375 C 609.02322,239.26769 604.15131,267.42325 620.50000,307.75000 C 605.49195,257.72323 612.64130,247.27739 614.87500,230.31250 C 668.07068,229.21004 737.88540,241.30570 757.40625,245.12500 C 735.98732,234.66460 664.92792,227.25580 615.21875,228.21875 C 615.22870,228.11904 615.24045,228.03777 615.25000,227.93750 C 616.41525,215.70752 675.84375,123.06250 675.84375,123.06250 C 614.59722,216.66570 616.91444,216.32105 612.43750,228.21875 C 605.01927,228.41116 598.05690,228.77061 591.93750,229.37500 C 561.08150,232.42251 544.14471,244.86783 485.50000,246.00000 C 481.12067,196.29050 582.62500,47.906250 582.62500,47.906250 C 504.83281,168.65828 486.07119,201.47841 480.75000,246.09375 C 450.57954,246.34478 409.84371,243.69470 351.53125,235.56250 C 347.17084,177.77103 449.21875,12.343750 449.21875,12.343750 z " - id="path9535" - sodipodi:nodetypes="cccccccccccccccccccccccccccccc" /> - </g> - <g - id="g9552" - transform="matrix(0.463805,0.606522,-0.472462,0.595409,611.4504,236.7744)" - style="fill-opacity:1.0;fill:url(#linearGradient6858);"> - <path - style="fill:url(#linearGradient6858);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M 43.495157,164.66019 C 276.50486,388.34951 338.64079,376.95793 423.55988,385.24272 C 508.47898,393.52751 694.88669,258.89967 724.91909,252.68608 C 754.95149,246.47249 752.88029,251.65048 765.30749,256.82848 C 748.73789,210.22653 666.92559,97.346281 611.00319,62.135921 C 555.08089,26.925563 404.91910,-13.462777 280.64726,19.676373 C 198.83496,38.317153 115.98706,135.66343 43.495157,164.66019 z " - id="path9553" - sodipodi:nodetypes="ccccccc" /> - <path - style="fill:url(#linearGradient6858);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M 449.21875,12.343750 C 372.55367,131.34626 351.03163,190.15459 345.31250,234.71875 C 296.43407,228.74167 250.88253,220.20102 210.06250,211.18750 C 210.18144,159.47011 307.03125,15.562500 307.03125,15.562500 C 231.73758,132.43627 211.35292,167.53740 205.28125,210.12500 C 111.44954,189.10115 46.625000,165.87500 46.625000,165.87500 C 95.278072,186.13432 149.62093,202.52998 204.53125,215.34375 C 205.73417,244.61892 210.49875,254.89076 234.81250,324.93750 C 212.11540,236.98624 209.34258,255.80079 209.75000,216.50000 C 255.62272,227.00430 301.69759,235.02520 345.12500,240.43750 C 346.64554,269.96362 353.89092,311.29960 377.53125,379.40625 C 355.00622,292.12181 351.03030,281.31222 351.31250,241.25000 C 399.42652,247.01704 443.95673,249.65958 480.81250,249.21875 C 482.09933,277.29978 486.10250,295.38014 509.81250,363.68750 C 486.91509,274.96003 484.85720,289.97427 485.34375,249.09375 C 521.11851,248.40068 549.34122,244.76072 565.71875,238.12500 C 576.82659,233.17150 593.20091,230.91691 611.78125,230.34375 C 609.02322,239.26769 604.15131,267.42325 620.50000,307.75000 C 605.49195,257.72323 612.64130,247.27739 614.87500,230.31250 C 668.07068,229.21004 737.88540,241.30570 757.40625,245.12500 C 735.98732,234.66460 664.92792,227.25580 615.21875,228.21875 C 615.22870,228.11904 615.24045,228.03777 615.25000,227.93750 C 616.41525,215.70752 675.84375,123.06250 675.84375,123.06250 C 614.59722,216.66570 616.91444,216.32105 612.43750,228.21875 C 605.01927,228.41116 598.05690,228.77061 591.93750,229.37500 C 561.08150,232.42251 544.14471,244.86783 485.50000,246.00000 C 481.12067,196.29050 582.62500,47.906250 582.62500,47.906250 C 504.83281,168.65828 486.07119,201.47841 480.75000,246.09375 C 450.57954,246.34478 409.84371,243.69470 351.53125,235.56250 C 347.17084,177.77103 449.21875,12.343750 449.21875,12.343750 z " - id="path9554" - sodipodi:nodetypes="cccccccccccccccccccccccccccccc" /> - </g> - <g - id="g9556" - transform="matrix(-0.431666,-0.749539,0.761496,-0.424888,183.0256,690.0901)"> - <path - style="fill:url(#linearGradient9559);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M 43.495157,164.66019 C 276.50486,388.34951 338.64079,376.95793 423.55988,385.24272 C 508.47898,393.52751 694.88669,258.89967 724.91909,252.68608 C 754.95149,246.47249 752.88029,251.65048 765.30749,256.82848 C 748.73789,210.22653 666.92559,97.346281 611.00319,62.135921 C 555.08089,26.925563 404.91910,-13.462777 280.64726,19.676373 C 198.83496,38.317153 115.98706,135.66343 43.495157,164.66019 z " - id="path9557" - sodipodi:nodetypes="ccccccc" /> - <path - style="fill:#080762;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 449.21875,12.343750 C 372.55367,131.34626 351.03163,190.15459 345.31250,234.71875 C 296.43407,228.74167 250.88253,220.20102 210.06250,211.18750 C 210.18144,159.47011 307.03125,15.562500 307.03125,15.562500 C 231.73758,132.43627 211.35292,167.53740 205.28125,210.12500 C 111.44954,189.10115 46.625000,165.87500 46.625000,165.87500 C 95.278072,186.13432 149.62093,202.52998 204.53125,215.34375 C 205.73417,244.61892 210.49875,254.89076 234.81250,324.93750 C 212.11540,236.98624 209.34258,255.80079 209.75000,216.50000 C 255.62272,227.00430 301.69759,235.02520 345.12500,240.43750 C 346.64554,269.96362 353.89092,311.29960 377.53125,379.40625 C 355.00622,292.12181 351.03030,281.31222 351.31250,241.25000 C 399.42652,247.01704 443.95673,249.65958 480.81250,249.21875 C 482.09933,277.29978 486.10250,295.38014 509.81250,363.68750 C 486.91509,274.96003 484.85720,289.97427 485.34375,249.09375 C 521.11851,248.40068 549.34122,244.76072 565.71875,238.12500 C 576.82659,233.17150 593.20091,230.91691 611.78125,230.34375 C 609.02322,239.26769 604.15131,267.42325 620.50000,307.75000 C 605.49195,257.72323 612.64130,247.27739 614.87500,230.31250 C 668.07068,229.21004 737.88540,241.30570 757.40625,245.12500 C 735.98732,234.66460 664.92792,227.25580 615.21875,228.21875 C 615.22870,228.11904 615.24045,228.03777 615.25000,227.93750 C 616.41525,215.70752 675.84375,123.06250 675.84375,123.06250 C 614.59722,216.66570 616.91444,216.32105 612.43750,228.21875 C 605.01927,228.41116 598.05690,228.77061 591.93750,229.37500 C 561.08150,232.42251 544.14471,244.86783 485.50000,246.00000 C 481.12067,196.29050 582.62500,47.906250 582.62500,47.906250 C 504.83281,168.65828 486.07119,201.47841 480.75000,246.09375 C 450.57954,246.34478 409.84371,243.69470 351.53125,235.56250 C 347.17084,177.77103 449.21875,12.343750 449.21875,12.343750 z " - id="path9558" - sodipodi:nodetypes="cccccccccccccccccccccccccccccc" /> - </g> - <g - id="g1953" - transform="matrix(1.384075,0.161467,-0.304992,1.435028,-105.9261,-263.9710)"> - <path - style="fill:url(#linearGradient1956);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 43.495157,164.66019 C 276.50486,388.34951 338.64079,376.95793 423.55988,385.24272 C 508.47898,393.52751 694.88669,258.89967 724.91909,252.68608 C 754.95149,246.47249 752.88029,251.65048 765.30749,256.82848 C 748.73789,210.22653 666.92559,97.346281 611.00319,62.135921 C 555.08089,26.925563 404.91910,-13.462777 280.64726,19.676373 C 198.83496,38.317153 115.98706,135.66343 43.495157,164.66019 z " - id="path1954" - sodipodi:nodetypes="ccccccc" /> - <path - style="fill:#080762;fill-opacity:0.053475920;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 449.21875,12.343750 C 372.55367,131.34626 351.03163,190.15459 345.31250,234.71875 C 296.43407,228.74167 250.88253,220.20102 210.06250,211.18750 C 210.18144,159.47011 307.03125,15.562500 307.03125,15.562500 C 231.73758,132.43627 211.35292,167.53740 205.28125,210.12500 C 111.44954,189.10115 46.625000,165.87500 46.625000,165.87500 C 95.278072,186.13432 149.62093,202.52998 204.53125,215.34375 C 205.73417,244.61892 210.49875,254.89076 234.81250,324.93750 C 212.11540,236.98624 209.34258,255.80079 209.75000,216.50000 C 255.62272,227.00430 301.69759,235.02520 345.12500,240.43750 C 346.64554,269.96362 353.89092,311.29960 377.53125,379.40625 C 355.00622,292.12181 351.03030,281.31222 351.31250,241.25000 C 399.42652,247.01704 443.95673,249.65958 480.81250,249.21875 C 482.09933,277.29978 486.10250,295.38014 509.81250,363.68750 C 486.91509,274.96003 484.85720,289.97427 485.34375,249.09375 C 521.11851,248.40068 549.34122,244.76072 565.71875,238.12500 C 576.82659,233.17150 593.20091,230.91691 611.78125,230.34375 C 609.02322,239.26769 604.15131,267.42325 620.50000,307.75000 C 605.49195,257.72323 612.64130,247.27739 614.87500,230.31250 C 668.07068,229.21004 737.88540,241.30570 757.40625,245.12500 C 735.98732,234.66460 664.92792,227.25580 615.21875,228.21875 C 615.22870,228.11904 615.24045,228.03777 615.25000,227.93750 C 616.41525,215.70752 675.84375,123.06250 675.84375,123.06250 C 614.59722,216.66570 616.91444,216.32105 612.43750,228.21875 C 605.01927,228.41116 598.05690,228.77061 591.93750,229.37500 C 561.08150,232.42251 544.14471,244.86783 485.50000,246.00000 C 481.12067,196.29050 582.62500,47.906250 582.62500,47.906250 C 504.83281,168.65828 486.07119,201.47841 480.75000,246.09375 C 450.57954,246.34478 409.84371,243.69470 351.53125,235.56250 C 347.17084,177.77103 449.21875,12.343750 449.21875,12.343750 z " - id="path1955" - sodipodi:nodetypes="cccccccccccccccccccccccccccccc" /> - </g> - <g - id="g2589" - transform="matrix(1.707376,0.139808,-0.376234,1.242534,219.8921,550.6217)"> - <path - style="fill:url(#linearGradient2592);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 43.495157,164.66019 C 276.50486,388.34951 338.64079,376.95793 423.55988,385.24272 C 508.47898,393.52751 694.88669,258.89967 724.91909,252.68608 C 754.95149,246.47249 752.88029,251.65048 765.30749,256.82848 C 748.73789,210.22653 666.92559,97.346281 611.00319,62.135921 C 555.08089,26.925563 404.91910,-13.462777 280.64726,19.676373 C 198.83496,38.317153 115.98706,135.66343 43.495157,164.66019 z " - id="path2590" - sodipodi:nodetypes="ccccccc" /> - <path - style="fill:#080762;fill-opacity:0.053475920;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 449.21875,12.343750 C 372.55367,131.34626 351.03163,190.15459 345.31250,234.71875 C 296.43407,228.74167 250.88253,220.20102 210.06250,211.18750 C 210.18144,159.47011 307.03125,15.562500 307.03125,15.562500 C 231.73758,132.43627 211.35292,167.53740 205.28125,210.12500 C 111.44954,189.10115 46.625000,165.87500 46.625000,165.87500 C 95.278072,186.13432 149.62093,202.52998 204.53125,215.34375 C 205.73417,244.61892 210.49875,254.89076 234.81250,324.93750 C 212.11540,236.98624 209.34258,255.80079 209.75000,216.50000 C 255.62272,227.00430 301.69759,235.02520 345.12500,240.43750 C 346.64554,269.96362 353.89092,311.29960 377.53125,379.40625 C 355.00622,292.12181 351.03030,281.31222 351.31250,241.25000 C 399.42652,247.01704 443.95673,249.65958 480.81250,249.21875 C 482.09933,277.29978 486.10250,295.38014 509.81250,363.68750 C 486.91509,274.96003 484.85720,289.97427 485.34375,249.09375 C 521.11851,248.40068 549.34122,244.76072 565.71875,238.12500 C 576.82659,233.17150 593.20091,230.91691 611.78125,230.34375 C 609.02322,239.26769 604.15131,267.42325 620.50000,307.75000 C 605.49195,257.72323 612.64130,247.27739 614.87500,230.31250 C 668.07068,229.21004 737.88540,241.30570 757.40625,245.12500 C 735.98732,234.66460 664.92792,227.25580 615.21875,228.21875 C 615.22870,228.11904 615.24045,228.03777 615.25000,227.93750 C 616.41525,215.70752 675.84375,123.06250 675.84375,123.06250 C 614.59722,216.66570 616.91444,216.32105 612.43750,228.21875 C 605.01927,228.41116 598.05690,228.77061 591.93750,229.37500 C 561.08150,232.42251 544.14471,244.86783 485.50000,246.00000 C 481.12067,196.29050 582.62500,47.906250 582.62500,47.906250 C 504.83281,168.65828 486.07119,201.47841 480.75000,246.09375 C 450.57954,246.34478 409.84371,243.69470 351.53125,235.56250 C 347.17084,177.77103 449.21875,12.343750 449.21875,12.343750 z " - id="path2591" - sodipodi:nodetypes="cccccccccccccccccccccccccccccc" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="layer4" - inkscape:label="Branch"> - <path - style="fill:#6caed9;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M -10.355987,713.52750 C 268.22006,565.43690 466.01942,431.84467 603.75405,417.34628 C 733.23203,403.71702 911.06817,486.79900 1017.9935,514.69256 C 1208.5437,564.40130 1286.2136,507.44337 1286.2136,507.44337 L 1286.2136,541.61812 C 1286.2136,541.61812 1199.2233,577.86408 1106.0194,578.89968 C 1012.8155,579.93528 794.30421,486.73139 707.31392,488.80259 C 620.32362,490.87379 360.69725,629.64955 309.64401,660.71197 C 269.55650,685.10250 -15.533981,899.93527 -15.533981,899.93527 L -10.355987,713.52750 z " - id="MainBranch" - sodipodi:nodetypes="cssccccscc" /> - <path - style="fill:#6cafd9;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 972.54425,392.72534 C 988.71695,445.48313 1153.5444,401.24832 1090.3101,562.13159 L 1021.0052,534.84027 C 1078.9987,512.05710 1095.4210,499.30642 1088.6859,472.56863 C 1077.7358,429.09776 979.53780,447.34492 962.77102,404.08200 L 972.54425,392.72534 z " - id="Flower2-3Stem" - sodipodi:nodetypes="cccscc" /> - <path - style="fill:#6caed9;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 1149.9236,336.82506 C 1154.5681,377.97680 1241.0747,437.84689 1112.6604,542.44236 L 1066.9994,540.30374 C 1066.9994,540.30374 1155.4506,506.87686 1169.1226,433.08916 C 1176.2705,394.51228 1130.9803,362.12588 1133.7504,324.14329 L 1149.9236,336.82506 z " - id="Flower2-2Stem" - sodipodi:nodetypes="cccscc" /> - <path - style="fill:#6cafd9;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 1031.8664,215.90582 C 1048.0391,268.66361 1169.3714,387.01780 1106.1371,547.90107 L 1036.8322,520.60975 C 1101.0393,518.53855 1133.7070,483.99653 1086.9077,353.74264 C 1048.3186,246.33980 1004.6852,259.13382 1003.4524,208.62171 L 1031.8664,215.90582 z " - id="Flower2-1Stem" - sodipodi:nodetypes="cccscc" /> - <path - style="fill:url(#linearGradient4496);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M 535.40453,600.64725 C 544.72492,518.83495 481.55340,540.58252 481.55340,540.58252 L 513.65696,520.90615 C 513.65696,520.90615 553.00970,517.79935 556.11650,547.83172 C 559.22330,577.86408 549.90291,591.32686 561.29450,592.36246 L 535.40453,600.64725 z " - id="Flower1-3Stem" - sodipodi:nodetypes="cccccc" /> - <path - style="fill:url(#linearGradient2613);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M -20.194184,776.41276 C 258.38187,628.32216 502.09256,496.44749 571.13269,468.83995 C 636.16971,442.83316 928.38774,489.19085 1033.0097,530.97587 C 1083.7997,551.26093 1180.0647,559.97265 1283.6246,524.76229 L 1283.6246,542.36745 C 1283.6246,542.36745 1196.6343,578.61341 1103.4304,579.64901 C 1010.2265,580.68461 791.71521,487.48073 704.72492,489.55193 C 617.73462,491.62313 358.10825,630.39888 307.05501,661.46130 C 266.96750,685.85183 -18.122983,900.68460 -18.122983,900.68460 L -20.194184,776.41276 z " - id="path1980" - sodipodi:nodetypes="cssccccscc" /> - <path - style="fill:url(#linearGradient3239);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M -8.8025931,708.06325 C 269.77345,559.97264 467.57282,426.38041 605.30745,411.88203 C 734.78543,398.25277 912.40411,482.18208 1019.5469,509.22830 C 1129.3711,536.95139 1088.4409,454.88378 1075.4994,447.53824 C 1070.7806,444.85986 1107.5122,466.94531 1095.7249,508.19631 C 1094.4398,510.53735 1106.0820,507.05651 1119.7859,470.54563 C 1121.1410,466.93525 1087.2648,579.10026 1165.1536,454.07742 C 1173.6069,440.50866 1111.6130,528.29066 1119.1060,529.59980 C 1149.0781,534.83637 1213.0428,533.82469 1286.2625,505.48965 L 1287.7670,518.54868 C 1287.7670,518.54868 1208.0259,550.65225 1114.8220,551.68785 C 1021.6181,552.72345 832.10357,463.66196 706.79613,453.30598 C 575.27508,420.16682 386.06941,591.04614 335.01617,622.10856 C 294.92866,646.49909 -24.336570,828.19270 -24.336570,828.19270 L -8.8025931,708.06325 z " - id="path2614" - sodipodi:nodetypes="cssscsssccccscc" /> - <path - style="fill:url(#linearGradient3245);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M -18.122983,854.51236 C 251.13268,673.28261 537.69465,506.45517 622.91262,485.83924 C 755.18263,453.84049 918.03175,506.19014 1022.6537,547.97515 C 1073.4437,568.26021 1180.0647,562.47355 1283.6246,527.26319 L 1282.5890,538.65476 C 1282.5890,538.65476 1195.5987,574.90072 1102.3948,575.93632 C 1009.1909,576.97192 790.67961,483.76805 703.68932,485.83925 C 616.69902,487.91045 357.07265,626.68619 306.01941,657.74861 C 265.93190,682.13914 -19.158579,896.97196 -19.158579,896.97196 L -18.122983,854.51236 z " - id="path3244" - sodipodi:nodetypes="cssccccscc" /> - <path - style="fill:url(#linearGradient4502);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 536.49655,602.47084 C 545.81694,520.65854 487.87480,545.30177 487.87480,545.30177 L 525.10497,533.08573 C 543.74574,542.40612 540.63893,529.97893 543.74573,560.01130 C 546.85253,590.04366 538.56775,595.22165 549.95934,596.25725 L 536.49655,602.47084 z " - id="path4501" - sodipodi:nodetypes="cccccc" /> - <path - sodipodi:type="arc" - style="fill:url(#radialGradient6995);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - id="path6370" - sodipodi:cx="543.74127" - sodipodi:cy="561.84027" - sodipodi:rx="4.9774647" - sodipodi:ry="18.600000" - d="M 548.71874 561.84027 A 4.9774647 18.600000 0 1 1 538.76381,561.84027 A 4.9774647 18.600000 0 1 1 548.71874 561.84027 z" - transform="matrix(1.000000,0.000000,0.000000,1.289738,5.987927,-162.2627)" /> - <path - sodipodi:type="arc" - style="fill:url(#radialGradient7628);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - id="path6996" - sodipodi:cx="999.75043" - sodipodi:cy="410.09967" - sodipodi:rx="31.344069" - sodipodi:ry="2.7582781" - d="M 1031.0945 410.09967 A 31.344069 2.7582781 0 1 1 968.40636,410.09967 A 31.344069 2.7582781 0 1 1 1031.0945 410.09967 z" - transform="matrix(0.955049,0.296449,-0.296449,0.955049,196.6039,-258.3817)" /> - <path - sodipodi:type="arc" - style="fill:url(#radialGradient7630);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - id="path7629" - sodipodi:cx="999.75043" - sodipodi:cy="410.09967" - sodipodi:rx="31.344069" - sodipodi:ry="2.7582781" - d="M 1031.0945 410.09967 A 31.344069 2.7582781 0 1 1 968.40636,410.09967 A 31.344069 2.7582781 0 1 1 1031.0945 410.09967 z" - transform="matrix(0.491225,0.196413,-0.152477,0.632771,634.1177,-14.67026)" /> - <path - sodipodi:type="arc" - style="fill:url(#radialGradient7632);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - id="path7631" - sodipodi:cx="999.75043" - sodipodi:cy="410.09967" - sodipodi:rx="31.344069" - sodipodi:ry="2.7582781" - d="M 1031.0945 410.09967 A 31.344069 2.7582781 0 1 1 968.40636,410.09967 A 31.344069 2.7582781 0 1 1 1031.0945 410.09967 z" - transform="matrix(0.560824,0.992678,-1.087564,0.511894,935.2258,-944.2154)" /> - <path - sodipodi:type="arc" - style="fill:url(#radialGradient7634);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - id="path7633" - sodipodi:cx="999.75043" - sodipodi:cy="410.09967" - sodipodi:rx="31.344069" - sodipodi:ry="2.7582781" - d="M 1031.0945 410.09967 A 31.344069 2.7582781 0 1 1 968.40636,410.09967 A 31.344069 2.7582781 0 1 1 1031.0945 410.09967 z" - transform="matrix(0.560824,0.992678,-1.087564,0.511894,958.5466,-903.3415)" /> - <path - sodipodi:type="arc" - style="fill:url(#radialGradient7636);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - id="path7635" - sodipodi:cx="999.75043" - sodipodi:cy="410.09967" - sodipodi:rx="31.344069" - sodipodi:ry="2.7582781" - d="M 1031.0945 410.09967 A 31.344069 2.7582781 0 1 1 968.40636,410.09967 A 31.344069 2.7582781 0 1 1 1031.0945 410.09967 z" - transform="matrix(0.432680,1.054856,-1.142901,0.372301,1129.914,-868.1367)" /> - <path - sodipodi:type="arc" - style="fill:url(#radialGradient7638);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - id="path7637" - sodipodi:cx="999.75043" - sodipodi:cy="410.09967" - sodipodi:rx="31.344069" - sodipodi:ry="2.7582781" - d="M 1031.0945 410.09967 A 31.344069 2.7582781 0 1 1 968.40636,410.09967 A 31.344069 2.7582781 0 1 1 1031.0945 410.09967 z" - transform="matrix(0.458086,1.044074,-1.133555,0.399856,1171.103,-831.5445)" /> - <path - sodipodi:type="arc" - style="fill:url(#radialGradient7640);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - id="path7639" - sodipodi:cx="999.75043" - sodipodi:cy="410.09967" - sodipodi:rx="31.344069" - sodipodi:ry="2.7582781" - d="M 1031.0945 410.09967 A 31.344069 2.7582781 0 1 1 968.40636,410.09967 A 31.344069 2.7582781 0 1 1 1031.0945 410.09967 z" - transform="matrix(-0.414864,0.760461,-0.801062,-0.467697,1900.498,-97.93763)" /> - <path - sodipodi:type="arc" - style="fill:url(#radialGradient7642);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - id="path7641" - sodipodi:cx="999.75043" - sodipodi:cy="410.09967" - sodipodi:rx="31.344069" - sodipodi:ry="2.7582781" - d="M 1031.0945 410.09967 A 31.344069 2.7582781 0 1 1 968.40636,410.09967 A 31.344069 2.7582781 0 1 1 1031.0945 410.09967 z" - transform="matrix(-0.791385,0.820758,-0.800937,-0.896287,2251.789,49.29901)" /> - <path - style="fill:#45a1d9;fill-opacity:0.49197862;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 967.40045,403.38057 C 1006.6424,445.60675 1152.9831,436.86406 1076.1391,514.11073 L 1058.9908,518.41423 C 1081.6952,506.48041 1094.0557,500.30305 1088.0556,473.19376 C 1078.3681,429.42423 978.90755,447.97005 962.14077,404.70713 L 967.40045,403.38057 z " - id="path7643" - sodipodi:nodetypes="cccscc" /> - <path - style="fill:url(#linearGradient7648);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M 1012.6486,211.88647 C 1043.8664,237.56299 1184.2559,484.80399 1074.3816,529.33808 L 1035.1671,530.63255 C 1099.3742,528.56135 1134.5494,483.48772 1087.7501,353.23383 C 1049.1610,245.83099 1005.5276,258.62501 1004.2948,208.11290 L 1012.6486,211.88647 z " - id="path7644" - sodipodi:nodetypes="cccscc" /> - <path - style="fill:url(#linearGradient16309);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M 1114.8458,502.62735 C 1107.8247,517.17099 1094.7857,530.71164 1083.7525,536.22819 C 1111.8368,532.71765 1128.3864,507.64240 1129.3894,504.63337 C 1120.3623,512.15594 1112.3383,514.66347 1114.8458,502.62735 z " - id="path7649" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#radialGradient16314);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M 1181.0445,440.44071 C 1174.5249,486.57918 1124.3744,529.70862 1124.3744,529.70862 C 1124.3744,529.70862 1118.8579,531.21313 1128.8880,519.67852 C 1138.9181,508.14390 1153.4617,506.63938 1181.0445,440.44071 z " - id="path7650" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#radialGradient8740);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M 752.86699,478.58128 C 775.70673,479.67673 871.09360,512.63054 904.19704,506.00985 C 937.30049,499.38916 949.59606,506.95566 911.76355,478.58128 C 873.93104,450.20689 832.31527,457.77340 783.13300,440.74877 C 733.95074,423.72414 680.98522,450.20690 628.01970,458.71921 C 575.05419,467.23153 562.75862,521.14286 588.29557,507.90148 C 613.83251,494.66010 633.56963,486.94063 665.85222,479.52709 C 678.88870,476.53332 715.82257,476.80454 752.86699,478.58128 z " - id="path8108" - sodipodi:nodetypes="ccccccss" /> - <path - style="fill:url(#radialGradient9366);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M 651.66503,472.90641 C 672.47291,464.39409 766.10838,470.06897 778.40394,445.47784 C 790.69951,420.88670 713.14286,424.66995 650.71921,431.29064 C 588.29557,437.91133 568.43350,471.01478 531.54680,487.09360 C 494.66010,503.17241 418.04926,540.05911 443.58621,559.92118 C 469.12315,579.78325 630.85714,481.41872 651.66503,472.90641 z " - id="path8741" - sodipodi:nodetypes="cccccc" /> - <path - style="fill:url(#radialGradient11231);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 399.10314,570.77430 C 419.20996,572.13485 511.65487,534.61003 544.75831,512.30197 C 577.86176,489.99390 563.67457,507.12100 525.84206,496.67505 C 488.00955,486.22909 472.87654,498.12953 423.69427,504.41186 C 374.51201,510.69418 321.54649,562.27674 268.58097,595.88885 C 215.61546,629.50097 203.31989,689.23904 228.85684,663.89597 C 254.39378,638.55290 259.94370,668.76718 292.22629,646.05526 C 305.26277,636.88364 369.62522,568.77965 399.10314,570.77430 z " - id="path11230" - sodipodi:nodetypes="ccccccss" /> - <path - style="fill:url(#radialGradient11233);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 323.43811,609.63467 C 290.07969,591.06105 243.98984,625.27634 194.80757,631.55867 C 145.62531,637.84099 45.369152,689.42355 -7.5963711,723.03566 C -60.561881,756.64778 -68.128387,832.46467 -42.591437,807.12160 C -17.054497,781.77853 10.249118,853.60857 42.531711,830.89665 C 55.568191,821.72503 358.17821,628.97759 323.43811,609.63467 z " - id="path11232" - sodipodi:nodetypes="ccccss" /> - <path - style="fill:url(#radialGradient11235);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 922.58815,526.20817 C 1026.7677,569.86520 1215.1277,574.40743 1209.1693,562.14906 C 1188.6040,519.83949 1099.4551,554.58256 926.37138,506.34610 C 876.23638,492.37405 822.06583,469.45940 770.31227,449.59733 C 723.51240,431.63640 706.52555,451.56844 723.02164,475.13428 C 736.26301,494.05054 788.33604,487.05233 817.60292,502.56285 C 831.58521,509.97302 888.38309,511.87435 922.58815,526.20817 z " - id="path11234" - sodipodi:nodetypes="cssssss" /> - <path - sodipodi:type="arc" - style="fill:url(#radialGradient11861);fill-opacity:1.0000000;stroke:none;stroke-width:1.7500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - id="path11236" - sodipodi:cx="916.49261" - sodipodi:cy="499.86206" - sodipodi:rx="39.724136" - sodipodi:ry="19.389162" - d="M 956.21675 499.86206 A 39.724136 19.389162 0 1 1 876.76848,499.86206 A 39.724136 19.389162 0 1 1 956.21675 499.86206 z" - transform="matrix(2.761905,0.514238,0.000000,1.799832,-1559.916,-842.7268)" /> - <path - style="fill:url(#radialGradient16326);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M 1118.1741,480.19244 C 1116.9031,486.86526 1117.5385,498.93989 1112.7722,505.61271 C 1108.0059,512.28553 1096.5668,528.80870 1086.0809,532.30399 C 1075.5951,535.79928 1061.9317,534.84602 1067.3335,531.03298 C 1072.7353,527.21994 1087.6697,522.77141 1094.9781,517.05183 C 1101.7158,511.77885 1109.2770,492.26705 1111.1835,486.54751 C 1114.1096,477.76920 1119.4451,473.51962 1118.1741,480.19244 z " - id="path16318" - sodipodi:nodetypes="ccccssc" /> - <path - style="fill:url(#linearGradient16331);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M 1110.2302,440.47328 C 1110.2302,470.02434 1101.3331,499.57540 1096.5668,506.56597 C 1117.5386,495.76235 1113.0900,497.66887 1114.0432,508.15473 C 1118.4918,501.79967 1121.3516,491.94932 1121.6694,482.73447 C 1123.8936,472.56636 1121.9871,454.13667 1120.3983,450.64138 C 1118.8095,447.14609 1113.4077,435.07147 1110.2302,440.47328 z " - id="path16327" - sodipodi:nodetypes="cccccc" /> - <path - style="fill:url(#linearGradient16336);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 1068.8927,449.89667 C 1108.2941,482.62526 1081.6028,507.09227 1063.8086,515.98936 C 1092.4065,519.16688 1096.8550,479.76547 1100.0324,499.14842 C 1103.2100,488.02706 1102.5745,483.26077 1099.7148,474.04592 C 1092.0887,455.61622 1079.6963,449.89666 1078.1075,446.40137 C 1076.5187,442.90608 1072.0702,444.49486 1068.8927,449.89667 z " - id="path16335" - sodipodi:nodetypes="cccccc" /> - </g> - <g - inkscape:groupmode="layer" - id="layer2" - inkscape:label="Flower1"> - <g - id="Flower1-3Inner" - transform="matrix(-0.328665,1.215295,-1.019160,-0.492154,1176.196,381.5868)"> - <path - style="fill:url(#linearGradient22753);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 372.48492,498.90673 C 414.14732,411.61407 356.13246,406.42348 386.55263,384.60031 C 416.97280,362.77715 431.37033,356.03636 447.24172,370.58514 C 463.11311,385.13391 484.73879,403.17864 484.73879,410.45303 C 484.73879,417.72741 376.68472,495.04283 372.48492,498.90673 z " - id="path18790" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:url(#linearGradient22754);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 373.29953,498.91998 C 422.89763,399.72377 391.31920,406.68287 433.64292,413.95726 C 475.96663,421.23164 490.31841,408.26740 493.62495,438.02626 C 496.93149,467.78512 517.45929,484.83995 481.74866,494.09826 C 446.03802,503.35658 377.94616,497.96705 373.29953,498.91998 z " - id="path18791" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:url(#linearGradient22755);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 372.31642,498.40699 C 428.52760,380.03286 430.30761,368.00419 393.27436,363.37504 C 356.24111,358.74588 330.64235,389.11395 340.56197,423.50196 C 350.48159,457.88998 355.78372,438.88927 361.73549,460.05113 C 367.68727,481.21299 369.74255,491.59934 372.31642,498.40699 z " - id="path18792" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:url(#radialGradient22756);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 375.62296,499.06830 C 502.59410,475.26121 536.65615,491.32284 494.99374,518.43647 C 453.33133,545.55010 453.65731,567.84434 430.51153,548.00510 C 407.36575,528.16586 406.04313,514.27839 394.80089,506.34269 C 383.55866,498.40699 375.62296,499.06830 375.62296,499.06830 z " - id="path18793" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:url(#radialGradient22757);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 378.92950,499.72961 C 423.89845,534.11763 447.04423,547.34379 443.73769,522.21408 C 440.43115,497.08438 442.41507,450.13151 411.33360,471.29337 C 380.25212,492.45522 378.92950,499.72961 378.92950,499.72961 z " - id="path18794" /> - </g> - <path - style="fill:url(#linearGradient21629);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M 602.07725,593.83555 C 595.55770,597.74694 582.39489,594.48477 556.15280,589.17838 C 555.27950,581.79199 556.30239,569.82763 556.50995,560.36116 C 552.65598,552.01160 540.46145,548.74405 537.25583,552.47910 C 534.05023,556.21414 534.93501,563.48533 535.84318,573.78688 C 536.75135,584.08841 536.09819,597.05546 535.36420,600.17016 C 529.68781,606.27733 519.95225,614.55252 513.34856,619.81909 C 492.32731,642.19307 504.87551,642.59078 518.75757,652.48559 C 532.63962,662.38040 655.58777,622.57080 602.07725,593.83555 z " - id="path21628" - sodipodi:nodetypes="ccccccccc" /> - <g - id="Flower1-1Inner"> - <path - style="fill:url(#linearGradient16178);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 363.71942,503.69746 C 405.38182,416.40480 363.71942,390.61379 394.13959,368.79062 C 424.55976,346.96746 444.39900,338.37045 460.27039,352.91923 C 476.14178,367.46800 484.73879,403.17864 484.73879,410.45303 C 484.73879,417.72741 363.71942,503.69746 363.71942,503.69746 z " - id="path11816" /> - <path - style="fill:url(#linearGradient16173);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 367.02596,501.05223 C 416.62406,401.85602 441.75376,386.64594 484.07748,393.92033 C 526.40119,401.19471 537.64343,389.29117 540.94997,419.05003 C 544.25651,448.80889 543.59520,482.53560 507.88457,491.79391 C 472.17393,501.05223 367.02596,501.05223 367.02596,501.05223 z " - id="path11817" /> - <path - style="fill:url(#linearGradient16182);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 372.31642,498.40699 C 428.52760,380.03286 430.51153,350.93530 393.47828,346.30615 C 356.44503,341.67699 324.04094,380.03286 333.96056,414.42087 C 343.88018,448.80889 355.78372,438.88927 361.73549,460.05113 C 367.68727,481.21299 372.31642,498.40699 372.31642,498.40699 z " - id="path11818" /> - <path - style="fill:url(#radialGradient16191);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 375.62296,499.06830 C 502.59410,475.26121 558.80529,495.10045 517.14288,522.21408 C 475.48047,549.32771 453.65731,567.84434 430.51153,548.00510 C 407.36575,528.16586 406.04313,514.27839 394.80089,506.34269 C 383.55866,498.40699 375.62296,499.06830 375.62296,499.06830 z " - id="path11819" /> - <path - style="fill:url(#radialGradient16186);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 378.92950,499.72961 C 423.89845,534.11763 447.04423,547.34379 443.73769,522.21408 C 440.43115,497.08438 442.41507,450.13151 411.33360,471.29337 C 380.25212,492.45522 378.92950,499.72961 378.92950,499.72961 z " - id="path11821" /> - <path - style="fill:#29e569;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none;" - d="M 355.12241,442.19581 C 388.84912,436.24404 421.25322,467.32552 411.33360,481.87429 C 401.41397,496.42307 377.60689,524.19801 372.31642,502.37484 C 367.02596,480.55168 355.12241,442.19581 355.12241,442.19581 z " - id="path11820" /> - </g> - <g - id="Flower1-1Petals"> - <path - style="fill:#5047dd;fill-opacity:0.84491980;stroke:#000000;stroke-width:1.7207220;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 370.56250,305.90625 C 355.90456,305.38356 341.55481,308.54187 333.40625,315.62500 C 327.97388,320.34708 347.33067,340.30951 329.62500,358.15625 C 312.69793,375.21818 287.66656,347.56368 283.21875,354.84375 C 273.25755,371.14806 265.37524,399.59673 267.90625,419.25000 C 269.17176,429.07664 308.54541,414.73263 315.68750,440.15625 C 323.48351,467.90766 284.89523,475.15541 290.03125,485.43750 C 300.30331,506.00168 311.03251,519.94295 326.87500,536.84375 C 334.79624,545.29416 351.90911,508.22838 377.75000,529.43750 C 401.05114,548.56211 370.17897,574.05542 379.65625,579.75000 C 398.61081,591.13920 418.51671,599.28318 438.12500,603.31250 C 447.92915,605.32715 439.41058,564.23371 467.18750,561.43750 C 489.51695,559.18965 496.47318,597.74565 505.37500,595.15625 C 523.21009,589.96826 540.88473,571.83246 552.37500,559.75000 C 558.12014,553.70878 523.50061,541.31380 533.00000,519.28125 C 543.82177,494.18176 562.07926,511.83883 564.31250,503.56250 C 567.67279,491.10942 567.09229,482.38503 565.46875,464.25000 C 564.65698,455.18248 540.01389,464.92575 532.25000,442.96875 C 522.65141,415.82302 549.39077,413.22085 545.21875,404.56250 C 538.82970,391.27821 534.77490,386.96586 519.84375,371.59375 C 512.37815,363.90770 500.37158,387.44121 480.50000,372.06250 C 459.85357,356.08416 479.40003,342.40562 470.31250,336.03125 C 459.54164,328.47614 449.37353,322.48497 439.65625,321.37500 C 429.76884,320.24559 433.66906,341.25860 409.21875,337.34375 C 385.30054,333.51408 394.77072,309.66850 385.12500,307.65625 C 380.38656,306.66773 375.44848,306.08048 370.56250,305.90625 z M 404.37500,362.59375 C 442.37861,362.88532 485.68016,390.09716 503.87500,422.56250 C 524.74616,459.80323 517.44770,509.29724 480.65625,524.43750 C 443.92960,539.55112 390.71795,510.29037 365.28125,466.06250 C 339.84455,421.83464 347.42926,373.16413 388.50000,364.18750 C 393.62397,363.06758 398.94591,362.55210 404.37500,362.59375 z " - id="Flower1Bottom" /> - <path - sodipodi:type="inkscape:offset" - inkscape:radius="0.0000000" - inkscape:original="M 370.56250 305.90625 C 355.90456 305.38356 341.55481 308.54187 333.40625 315.62500 C 327.97388 320.34708 347.33067 340.30951 329.62500 358.15625 C 312.69793 375.21818 287.66656 347.56368 283.21875 354.84375 C 273.25755 371.14806 265.37524 399.59673 267.90625 419.25000 C 269.17176 429.07664 308.54541 414.73263 315.68750 440.15625 C 323.48351 467.90766 284.89523 475.15541 290.03125 485.43750 C 300.30331 506.00168 311.03251 519.94295 326.87500 536.84375 C 334.79624 545.29416 351.90911 508.22838 377.75000 529.43750 C 401.05114 548.56211 370.17897 574.05542 379.65625 579.75000 C 398.61081 591.13920 418.51671 599.28318 438.12500 603.31250 C 447.92915 605.32715 439.41058 564.23371 467.18750 561.43750 C 489.51695 559.18965 496.47318 597.74565 505.37500 595.15625 C 523.21009 589.96826 540.88473 571.83246 552.37500 559.75000 C 558.12014 553.70878 523.50061 541.31380 533.00000 519.28125 C 543.82177 494.18176 562.07926 511.83883 564.31250 503.56250 C 567.67279 491.10942 567.09229 482.38503 565.46875 464.25000 C 564.65698 455.18248 540.01389 464.92575 532.25000 442.96875 C 522.65141 415.82302 549.39077 413.22085 545.21875 404.56250 C 538.82970 391.27821 534.77490 386.96586 519.84375 371.59375 C 512.37815 363.90770 500.37158 387.44121 480.50000 372.06250 C 459.85357 356.08416 479.40003 342.40562 470.31250 336.03125 C 459.54164 328.47614 449.37353 322.48497 439.65625 321.37500 C 429.76884 320.24559 433.66906 341.25860 409.21875 337.34375 C 385.30054 333.51408 394.77072 309.66850 385.12500 307.65625 C 380.38656 306.66773 375.44848 306.08048 370.56250 305.90625 z M 404.37500 362.59375 C 442.37861 362.88532 485.68016 390.09716 503.87500 422.56250 C 524.74616 459.80323 517.44770 509.29724 480.65625 524.43750 C 443.92960 539.55112 390.71795 510.29037 365.28125 466.06250 C 339.84455 421.83464 347.42926 373.16413 388.50000 364.18750 C 393.62397 363.06758 398.94591 362.55210 404.37500 362.59375 z " - xlink:href="#path4825" - style="fill:#564ce2;fill-opacity:0.72192514;stroke:#000000;stroke-width:1.7207220;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - id="path7333" - inkscape:href="#path4825" - d="M 370.56250,305.90625 C 355.90456,305.38356 341.55481,308.54187 333.40625,315.62500 C 327.97388,320.34708 347.33067,340.30951 329.62500,358.15625 C 312.69793,375.21818 287.66656,347.56368 283.21875,354.84375 C 273.25755,371.14806 265.37524,399.59673 267.90625,419.25000 C 269.17176,429.07664 308.54541,414.73263 315.68750,440.15625 C 323.48351,467.90766 284.89523,475.15541 290.03125,485.43750 C 300.30331,506.00168 311.03251,519.94295 326.87500,536.84375 C 334.79624,545.29416 351.90911,508.22838 377.75000,529.43750 C 401.05114,548.56211 370.17897,574.05542 379.65625,579.75000 C 398.61081,591.13920 418.51671,599.28318 438.12500,603.31250 C 447.92915,605.32715 439.41058,564.23371 467.18750,561.43750 C 489.51695,559.18965 496.47318,597.74565 505.37500,595.15625 C 523.21009,589.96826 540.88473,571.83246 552.37500,559.75000 C 558.12014,553.70878 523.50061,541.31380 533.00000,519.28125 C 543.82177,494.18176 562.07926,511.83883 564.31250,503.56250 C 567.67279,491.10942 567.09229,482.38503 565.46875,464.25000 C 564.65698,455.18248 540.01389,464.92575 532.25000,442.96875 C 522.65141,415.82302 549.39077,413.22085 545.21875,404.56250 C 538.82970,391.27821 534.77490,386.96586 519.84375,371.59375 C 512.37815,363.90770 500.37158,387.44121 480.50000,372.06250 C 459.85357,356.08416 479.40003,342.40562 470.31250,336.03125 C 459.54164,328.47614 449.37353,322.48497 439.65625,321.37500 C 429.76884,320.24559 433.66906,341.25860 409.21875,337.34375 C 385.30054,333.51408 394.77072,309.66850 385.12500,307.65625 C 380.38656,306.66773 375.44848,306.08048 370.56250,305.90625 z M 404.37500,362.59375 C 442.37861,362.88532 485.68016,390.09716 503.87500,422.56250 C 524.74616,459.80323 517.44770,509.29724 480.65625,524.43750 C 443.92960,539.55112 390.71795,510.29037 365.28125,466.06250 C 339.84455,421.83464 347.42926,373.16413 388.50000,364.18750 C 393.62397,363.06758 398.94591,362.55210 404.37500,362.59375 z " /> - <path - style="fill:url(#radialGradient11086);fill-opacity:1.0000000;stroke:#000000;stroke-width:1.7138077;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 380.12958,297.43595 C 365.86249,296.90326 351.89541,300.12208 343.96414,307.34090 C 338.67664,312.15342 357.51725,332.49828 340.28372,350.68690 C 323.80802,368.07567 299.44415,339.89140 295.11493,347.31096 C 285.41937,363.92759 277.74725,392.92123 280.21077,412.95101 C 281.44254,422.96589 319.76626,408.34710 326.71788,434.25775 C 334.30601,462.54078 296.74672,469.92735 301.74578,480.40644 C 311.74392,501.36456 322.18703,515.57289 337.60706,532.79745 C 345.31706,541.40974 361.97361,503.63391 387.12541,525.24932 C 409.80520,544.74031 379.75628,570.72197 388.98084,576.52564 C 407.42996,588.13303 426.80503,596.43301 445.89044,600.53952 C 455.43316,602.59276 447.14175,560.71211 474.17796,557.86234 C 495.91199,555.57142 502.68271,594.86602 511.34716,592.22703 C 528.70666,586.93964 545.90998,568.45644 557.09385,556.14252 C 562.68579,549.98555 528.98942,537.35313 538.23552,514.89853 C 548.76870,489.31821 566.53935,507.31354 568.71302,498.87865 C 571.98372,486.18700 571.41869,477.29549 569.83844,458.81305 C 569.04832,449.57183 545.06237,459.50174 537.50550,437.12411 C 528.16288,409.45836 554.18920,406.80636 550.12843,397.98214 C 543.90974,384.44336 539.96307,380.04841 525.43007,364.38181 C 518.16357,356.54852 506.47716,380.53287 487.13549,364.85955 C 467.03960,348.57510 486.06484,334.63454 477.21964,328.13807 C 466.73600,320.43822 456.83902,314.33228 447.38086,313.20105 C 437.75712,312.05000 441.55333,333.46555 417.75501,329.47570 C 394.47461,325.57267 403.69226,301.27029 394.30375,299.21948 C 389.69169,298.21202 384.88527,297.61353 380.12958,297.43595 z M 413.04042,355.20943 C 450.03063,355.50656 492.17750,383.23969 509.88715,416.32696 C 530.20177,454.28108 523.09793,504.72324 487.28757,520.15355 C 451.54027,535.55668 399.74756,505.73540 374.98916,460.66029 C 350.23075,415.58516 357.61321,365.98228 397.58875,356.83369 C 402.57609,355.69231 407.75611,355.16696 413.04042,355.20943 z " - id="Flower1Top" /> - <path - style="fill:#638ae3;fill-opacity:0.53475934;fill-rule:evenodd;stroke:#000000;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 378.47470,577.81411 C 378.41896,575.30523 385.62077,574.05338 386.68118,574.84545 C 392.70466,579.95068 411.33467,593.50542 447.38730,601.10327 C 443.61727,602.55639 444.73008,602.27386 440.53021,603.54017 C 435.26683,603.21121 387.98723,587.44481 378.47470,577.81411 z " - id="path11135" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#5492d5;fill-opacity:0.33155081;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 448.70315,329.05232 C 414.82014,343.52661 440.80808,340.23700 445.08458,347.80311 C 449.36107,355.36922 485.87577,370.17247 493.44188,381.68612 C 501.00799,393.19976 515.81124,405.70029 519.75878,420.50355 C 523.70631,435.30680 522.71943,465.90020 531.60138,459.97890 C 540.48334,454.05759 519.10086,423.13524 523.04839,401.75275 C 526.99593,380.37027 513.50852,380.04131 495.41565,372.47520 C 477.32278,364.90909 451.99276,352.73753 453.30861,343.52661 C 454.62445,334.31570 448.70315,329.05232 448.70315,329.05232 z " - id="path11115" /> - <path - style="fill:url(#radialGradient11114);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 539.43027,532.41062 C 539.43027,539.40171 544.55840,574.25612 534.48034,574.25612 C 524.40229,574.25612 475.43149,576.39300 475.43149,569.40191 C 475.43149,562.41083 493.88434,522.82888 503.96239,522.82888 C 514.04045,522.82888 539.43027,525.41954 539.43027,532.41062 z " - id="path11088" - sodipodi:nodetypes="ccccc" - transform="matrix(0.624661,0.780896,-0.780896,0.624661,623.2822,-194.2138)" /> - <path - style="fill:url(#radialGradient11102);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 466.62375,572.09687 C 466.62375,583.75974 447.16650,585.70506 438.72273,585.70506 C 430.27895,585.70506 413.31825,581.76117 413.31825,570.09830 C 389.07901,512.80764 422.08743,519.04264 443.58671,522.23015 C 466.15531,533.76777 473.08623,541.59775 466.62375,572.09687 z " - id="path11087" - sodipodi:nodetypes="ccccc" - transform="matrix(0.943927,0.330155,-0.357257,1.021414,211.1143,-156.7594)" /> - <path - style="fill:#85c8ef;fill-opacity:0.14973260;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 317.44761,367.86974 C 306.92085,392.21288 316.46073,375.43585 330.93502,419.84562 C 345.40932,464.25539 329.61918,472.47942 364.81803,490.57229 C 400.01688,508.66516 393.76662,527.74491 425.01794,529.38972 C 456.26926,531.03453 452.32172,552.41701 489.16538,535.63998 C 526.00904,518.86296 555.28660,489.58540 552.98387,468.53188 C 551.01010,445.17564 536.20685,486.95372 518.44293,505.37555 C 491.79707,525.44218 455.94030,534.65310 426.33378,523.13946 C 396.72727,511.62581 379.62129,494.51983 369.75245,468.20293 C 359.88361,441.88603 345.40932,410.96367 352.97542,395.17353 C 360.54153,379.38339 362.51530,363.59325 384.88467,350.76376 C 407.25403,337.93427 404.62234,323.78894 385.21362,317.86763 C 365.80491,311.94633 372.05518,319.18348 355.93608,344.51350 C 339.81697,369.84351 325.34268,350.76375 317.44761,367.86974 z " - id="path10461" - sodipodi:nodetypes="cccccccccccccc" /> - <path - style="fill:#2d84e6;fill-opacity:0.54901963;fill-rule:evenodd;stroke:#000000;stroke-width:2.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none;" - d="M 331.84343,317.12090 C 338.32897,332.25383 340.76105,348.73791 330.76251,355.22345 C 355.62374,348.46767 345.62521,323.87668 342.11221,308.47352 C 331.84343,311.44606 331.84343,318.47205 331.84343,317.12090 z " - id="path9836" - sodipodi:nodetypes="cccc" /> - <path - style="fill:#5d9ee5;fill-opacity:0.52406418;fill-rule:evenodd;stroke:#000000;stroke-width:2.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;stroke-dasharray:none;" - d="M 283.74235,353.60207 C 288.60651,349.54860 289.08108,347.82170 296.10708,346.74078 C 289.08108,355.65839 275.09497,401.43291 281.04004,416.29561 C 294.82181,422.78115 314.81889,411.16122 326.43882,432.77969 C 330.49228,463.58600 308.60359,464.93716 301.30736,477.36777 C 302.92874,491.14954 322.11512,518.71309 339.40990,534.92693 C 331.84343,540.87202 331.03274,536.27809 328.60066,537.35902 C 316.44028,525.73909 295.09205,498.71601 290.22789,482.77239 C 296.17296,468.72039 317.25097,469.53108 317.25097,443.04846 C 311.84635,416.56584 287.25535,425.75368 269.96058,421.97046 C 262.93457,407.37799 276.44612,368.19453 283.74235,353.60207 z " - id="Flower1Side1" - sodipodi:nodetypes="ccccccccccc" /> - </g> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:2.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 561.48153,506.06814 C 566.60051,504.01792 566.31252,502.40826 568.14677,499.86067" - id="path14425" - sodipodi:nodetypes="cc" /> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:2.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;stroke-dasharray:none;" - d="M 433.39029,324.56271 C 438.81244,317.35852 437.00858,319.38696 444.90632,313.20127" - id="path14424" - sodipodi:nodetypes="cc" /> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:2.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 269.82763,421.63403 C 275.24978,421.09968 278.90306,418.27733 280.73731,415.72974" - id="path14426" - sodipodi:nodetypes="cc" /> - <g - id="Flower1-1Pestils"> - <path - style="fill:#78bb0b;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - id="path16204" - d="M 395.87615,451.17702 C 402.94657,440.96346 403.10204,439.16578 407.83307,427.71470 C 413.62102,413.31065 418.11041,398.39296 421.31969,383.20749 C 422.27088,377.95644 423.54733,372.67183 423.48198,367.30475 C 423.47465,365.48261 424.20625,363.76225 424.60471,362.00104 C 424.72564,361.44833 424.80699,360.88841 424.90812,360.33209 L 433.49172,356.12720 C 433.40895,356.68512 433.33460,357.24429 433.24341,357.80095 C 432.95248,359.51019 432.42794,361.15542 432.16854,362.85892 C 432.07120,368.42576 430.40858,373.86257 429.41556,379.30073 C 425.94270,394.51893 421.51224,409.53306 415.76414,424.05417 C 411.16334,435.41613 407.55944,444.77969 400.84871,455.06865 C 399.48236,454.76498 395.67745,451.25404 395.87615,451.17702 z " - sodipodi:nodetypes="ccccccccccccc" /> - <path - style="fill:#6a961f;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - id="path16207" - d="M 413.05377,473.85434 C 424.05948,476.53937 430.17384,477.80057 441.18665,480.45644 C 452.67249,483.36392 464.43167,485.01220 476.28740,484.64621 C 486.90765,484.28304 497.02967,480.87902 506.58227,476.43214 C 508.12492,475.70792 509.63402,474.91663 511.14030,474.12062 L 503.85239,479.96854 C 502.36791,480.72539 500.88081,481.47770 499.36291,482.16624 C 489.74758,486.48999 479.59335,489.77005 468.96091,489.99771 C 457.07136,490.23505 445.29421,488.50954 433.78405,485.57076 C 422.71192,482.88327 422.96458,483.66872 411.84052,481.19840 C 413.12114,478.06319 413.18395,476.48007 413.05377,473.85434 z " - sodipodi:nodetypes="ccccccccccc" /> - <path - style="fill:#789744;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - id="path16205" - d="M 405.62917,459.17185 C 412.33225,454.41079 416.23635,451.48178 421.91223,445.57544 C 436.19796,430.44730 450.17285,415.02890 464.43804,399.88160 C 471.45366,391.96609 479.55942,385.05837 486.50024,377.08010 C 487.67395,375.82822 488.12803,374.85508 487.87723,373.26505 L 496.35996,368.52763 C 496.97328,370.45533 496.70314,371.78079 495.28480,373.35699 C 488.10977,381.56676 479.54058,388.47571 472.27621,396.61091 C 457.95901,411.58196 444.06746,426.95177 430.03261,442.18589 C 424.59302,448.01854 419.14837,453.96812 412.68316,458.69214 C 410.42654,460.33054 410.16941,461.03900 407.88268,462.57553 C 407.15463,460.99807 406.30728,460.73847 405.62917,459.17185 z " - sodipodi:nodetypes="cccccccccccc" /> - </g> - <g - id="Flower1-2Inner"> - <path - style="fill:url(#linearGradient22654);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 209.97044,727.33005 C 249.69458,536.27586 230.77833,522.08867 275.23153,536.27586 C 319.68473,550.46305 371.70443,592.07882 357.51724,628.96552 C 343.33005,665.85222 296.98522,654.50246 259.15271,679.09360 C 221.32020,703.68473 209.97044,727.33005 209.97044,727.33005 z " - id="path18882" /> - <path - style="fill:url(#linearGradient19520);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.93750000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 206.18719,726.38424 C 251.58621,643.15271 307.38916,593.97044 341.43842,610.04926 C 375.48768,626.12808 432.23645,641.26108 430.34483,671.52709 C 428.45320,701.79310 409.53695,762.32512 366.97537,758.54187 C 324.41379,754.75862 206.18719,726.38424 206.18719,726.38424 z " - id="path18883" /> - <path - style="fill:url(#radialGradient22029);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 219.42857,727.33005 C 253.47783,561.81281 293.20197,533.43842 240.23645,536.27586 C 187.27094,539.11330 114.44335,556.13793 129.57635,587.34975 C 144.70936,618.56158 220.37438,722.60099 220.37438,722.60099" - id="path18885" /> - <path - style="fill:url(#linearGradient21403);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 222.26601,725.43842 C 193.89163,638.42365 151.33005,593.97044 120.11823,588.29557 C 88.906404,582.62069 48.236453,654.50246 69.044335,672.47291 C 89.852217,690.44335 97.418719,742.46305 111.60591,733.00493 C 125.79310,723.54680 213.75369,720.70936 213.75369,720.70936" - id="path18886" /> - <path - style="fill:url(#linearGradient20778);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.93750000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 219.42857,717.87192 C 124.84729,697.06404 63.369458,713.14286 74.719212,749.08374 C 86.068966,785.02463 104.98522,832.31527 145.65517,821.91133 C 186.32512,811.50739 219.42857,717.87192 219.42857,717.87192 z " - id="path18887" /> - <path - style="fill:url(#linearGradient20153);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.93750000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 233.61576,704.63054 C 101.20197,814.34483 107.82266,806.77833 135.25123,841.77340 C 162.67980,876.76847 174.02956,879.60591 219.42857,879.60591 C 264.82759,879.60591 296.03941,907.03448 280.90640,831.36946 C 265.77340,755.70443 233.61576,704.63054 233.61576,704.63054 z " - id="path18888" /> - <path - style="fill:url(#linearGradient19524);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.93750000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 223.21182,718.81773 C 369.81281,718.81773 434.12808,735.84236 403.86207,781.24138 C 373.59606,826.64039 393.45813,877.71429 358.46305,880.55172 C 323.46798,883.38916 247.80296,850.28571 239.29064,825.69458 C 230.77833,801.10345 223.21182,718.81773 223.21182,718.81773 z " - id="path18884" /> - </g> - <g - id="Flower1-3Petals" - transform="matrix(-0.282158,0.541211,-0.750396,-7.402685e-2,1045.228,511.3649)"> - <path - style="fill:#5047dd;fill-opacity:0.84491980;stroke:#000000;stroke-width:1.7207220;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 370.56250,305.90625 C 355.90456,305.38356 341.55481,308.54187 333.40625,315.62500 C 327.97388,320.34708 347.33067,340.30951 329.62500,358.15625 C 312.69793,375.21818 287.66656,347.56368 283.21875,354.84375 C 273.25755,371.14806 265.37524,399.59673 267.90625,419.25000 C 269.17176,429.07664 308.54541,414.73263 315.68750,440.15625 C 323.48351,467.90766 284.89523,475.15541 290.03125,485.43750 C 300.30331,506.00168 311.03251,519.94295 326.87500,536.84375 C 334.79624,545.29416 351.90911,508.22838 377.75000,529.43750 C 401.05114,548.56211 370.17897,574.05542 379.65625,579.75000 C 398.61081,591.13920 418.51671,599.28318 438.12500,603.31250 C 447.92915,605.32715 439.41058,564.23371 467.18750,561.43750 C 489.51695,559.18965 496.47318,597.74565 505.37500,595.15625 C 523.21009,589.96826 540.88473,571.83246 552.37500,559.75000 C 558.12014,553.70878 523.50061,541.31380 533.00000,519.28125 C 543.82177,494.18176 562.07926,511.83883 564.31250,503.56250 C 567.67279,491.10942 567.09229,482.38503 565.46875,464.25000 C 564.65698,455.18248 540.01389,464.92575 532.25000,442.96875 C 522.65141,415.82302 549.39077,413.22085 545.21875,404.56250 C 538.82970,391.27821 534.77490,386.96586 519.84375,371.59375 C 512.37815,363.90770 500.37158,387.44121 480.50000,372.06250 C 459.85357,356.08416 479.40003,342.40562 470.31250,336.03125 C 459.54164,328.47614 449.37353,322.48497 439.65625,321.37500 C 429.76884,320.24559 433.66906,341.25860 409.21875,337.34375 C 385.30054,333.51408 394.77072,309.66850 385.12500,307.65625 C 380.38656,306.66773 375.44848,306.08048 370.56250,305.90625 z M 404.37500,362.59375 C 442.37861,362.88532 485.68016,390.09716 503.87500,422.56250 C 524.74616,459.80323 517.44770,509.29724 480.65625,524.43750 C 443.92960,539.55112 390.71795,510.29037 365.28125,466.06250 C 339.84455,421.83464 347.42926,373.16413 388.50000,364.18750 C 393.62397,363.06758 398.94591,362.55210 404.37500,362.59375 z " - id="path18819" /> - <path - sodipodi:type="inkscape:offset" - inkscape:radius="0.0000000" - inkscape:original="M 370.56250 305.90625 C 355.90456 305.38356 341.55481 308.54187 333.40625 315.62500 C 327.97388 320.34708 347.33067 340.30951 329.62500 358.15625 C 312.69793 375.21818 287.66656 347.56368 283.21875 354.84375 C 273.25755 371.14806 265.37524 399.59673 267.90625 419.25000 C 269.17176 429.07664 308.54541 414.73263 315.68750 440.15625 C 323.48351 467.90766 284.89523 475.15541 290.03125 485.43750 C 300.30331 506.00168 311.03251 519.94295 326.87500 536.84375 C 334.79624 545.29416 351.90911 508.22838 377.75000 529.43750 C 401.05114 548.56211 370.17897 574.05542 379.65625 579.75000 C 398.61081 591.13920 418.51671 599.28318 438.12500 603.31250 C 447.92915 605.32715 439.41058 564.23371 467.18750 561.43750 C 489.51695 559.18965 496.47318 597.74565 505.37500 595.15625 C 523.21009 589.96826 540.88473 571.83246 552.37500 559.75000 C 558.12014 553.70878 523.50061 541.31380 533.00000 519.28125 C 543.82177 494.18176 562.07926 511.83883 564.31250 503.56250 C 567.67279 491.10942 567.09229 482.38503 565.46875 464.25000 C 564.65698 455.18248 540.01389 464.92575 532.25000 442.96875 C 522.65141 415.82302 549.39077 413.22085 545.21875 404.56250 C 538.82970 391.27821 534.77490 386.96586 519.84375 371.59375 C 512.37815 363.90770 500.37158 387.44121 480.50000 372.06250 C 459.85357 356.08416 479.40003 342.40562 470.31250 336.03125 C 459.54164 328.47614 449.37353 322.48497 439.65625 321.37500 C 429.76884 320.24559 433.66906 341.25860 409.21875 337.34375 C 385.30054 333.51408 394.77072 309.66850 385.12500 307.65625 C 380.38656 306.66773 375.44848 306.08048 370.56250 305.90625 z M 404.37500 362.59375 C 442.37861 362.88532 485.68016 390.09716 503.87500 422.56250 C 524.74616 459.80323 517.44770 509.29724 480.65625 524.43750 C 443.92960 539.55112 390.71795 510.29037 365.28125 466.06250 C 339.84455 421.83464 347.42926 373.16413 388.50000 364.18750 C 393.62397 363.06758 398.94591 362.55210 404.37500 362.59375 z " - xlink:href="#path4825" - style="fill:#564ce2;fill-opacity:0.72192514;stroke:#000000;stroke-width:1.7207220;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - id="path18820" - inkscape:href="#path4825" - d="M 370.56250,305.90625 C 355.90456,305.38356 341.55481,308.54187 333.40625,315.62500 C 327.97388,320.34708 347.33067,340.30951 329.62500,358.15625 C 312.69793,375.21818 287.66656,347.56368 283.21875,354.84375 C 273.25755,371.14806 265.37524,399.59673 267.90625,419.25000 C 269.17176,429.07664 308.54541,414.73263 315.68750,440.15625 C 323.48351,467.90766 284.89523,475.15541 290.03125,485.43750 C 300.30331,506.00168 311.03251,519.94295 326.87500,536.84375 C 334.79624,545.29416 351.90911,508.22838 377.75000,529.43750 C 401.05114,548.56211 370.17897,574.05542 379.65625,579.75000 C 398.61081,591.13920 418.51671,599.28318 438.12500,603.31250 C 447.92915,605.32715 439.41058,564.23371 467.18750,561.43750 C 489.51695,559.18965 496.47318,597.74565 505.37500,595.15625 C 523.21009,589.96826 540.88473,571.83246 552.37500,559.75000 C 558.12014,553.70878 523.50061,541.31380 533.00000,519.28125 C 543.82177,494.18176 562.07926,511.83883 564.31250,503.56250 C 567.67279,491.10942 567.09229,482.38503 565.46875,464.25000 C 564.65698,455.18248 540.01389,464.92575 532.25000,442.96875 C 522.65141,415.82302 549.39077,413.22085 545.21875,404.56250 C 538.82970,391.27821 534.77490,386.96586 519.84375,371.59375 C 512.37815,363.90770 500.37158,387.44121 480.50000,372.06250 C 459.85357,356.08416 479.40003,342.40562 470.31250,336.03125 C 459.54164,328.47614 449.37353,322.48497 439.65625,321.37500 C 429.76884,320.24559 433.66906,341.25860 409.21875,337.34375 C 385.30054,333.51408 394.77072,309.66850 385.12500,307.65625 C 380.38656,306.66773 375.44848,306.08048 370.56250,305.90625 z M 404.37500,362.59375 C 442.37861,362.88532 485.68016,390.09716 503.87500,422.56250 C 524.74616,459.80323 517.44770,509.29724 480.65625,524.43750 C 443.92960,539.55112 390.71795,510.29037 365.28125,466.06250 C 339.84455,421.83464 347.42926,373.16413 388.50000,364.18750 C 393.62397,363.06758 398.94591,362.55210 404.37500,362.59375 z " /> - <path - style="fill:url(#radialGradient18829);fill-opacity:1.0000000;stroke:#000000;stroke-width:1.7138077;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 380.12958,297.43595 C 365.86249,296.90326 351.89541,300.12208 343.96414,307.34090 C 338.67664,312.15342 357.51725,332.49828 340.28372,350.68690 C 323.80802,368.07567 299.44415,339.89140 295.11493,347.31096 C 285.41937,363.92759 277.74725,392.92123 280.21077,412.95101 C 281.44254,422.96589 319.76626,408.34710 326.71788,434.25775 C 334.30601,462.54078 296.74672,469.92735 301.74578,480.40644 C 311.74392,501.36456 322.18703,515.57289 337.60706,532.79745 C 345.31706,541.40974 361.97361,503.63391 387.12541,525.24932 C 409.80520,544.74031 379.75628,570.72197 388.98084,576.52564 C 407.42996,588.13303 426.80503,596.43301 445.89044,600.53952 C 455.43316,602.59276 447.14175,560.71211 474.17796,557.86234 C 495.91199,555.57142 502.68271,594.86602 511.34716,592.22703 C 528.70666,586.93964 545.90998,568.45644 557.09385,556.14252 C 562.68579,549.98555 528.98942,537.35313 538.23552,514.89853 C 548.76870,489.31821 566.53935,507.31354 568.71302,498.87865 C 571.98372,486.18700 571.41869,477.29549 569.83844,458.81305 C 569.04832,449.57183 545.06237,459.50174 537.50550,437.12411 C 528.16288,409.45836 554.18920,406.80636 550.12843,397.98214 C 543.90974,384.44336 539.96307,380.04841 525.43007,364.38181 C 518.16357,356.54852 506.47716,380.53287 487.13549,364.85955 C 467.03960,348.57510 486.06484,334.63454 477.21964,328.13807 C 466.73600,320.43822 456.83902,314.33228 447.38086,313.20105 C 437.75712,312.05000 441.55333,333.46555 417.75501,329.47570 C 394.47461,325.57267 403.69226,301.27029 394.30375,299.21948 C 389.69169,298.21202 384.88527,297.61353 380.12958,297.43595 z M 413.04042,355.20943 C 450.03063,355.50656 492.17750,383.23969 509.88715,416.32696 C 530.20177,454.28108 523.09793,504.72324 487.28757,520.15355 C 451.54027,535.55668 399.74756,505.73540 374.98916,460.66029 C 350.23075,415.58516 357.61321,365.98228 397.58875,356.83369 C 402.57609,355.69231 407.75611,355.16696 413.04042,355.20943 z " - id="path18821" /> - <path - style="fill:#638ae3;fill-opacity:0.53475934;fill-rule:evenodd;stroke:#000000;stroke-width:1.4538000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none;" - d="M 378.47470,577.81411 C 378.41896,575.30523 385.62077,574.05338 386.68118,574.84545 C 392.70466,579.95068 411.33467,593.50542 447.38730,601.10327 C 443.61727,602.55639 444.73008,602.27386 440.53021,603.54017 C 435.26683,603.21121 387.98723,587.44481 378.47470,577.81411 z " - id="path18822" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#5492d5;fill-opacity:0.33155081;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 448.70315,329.05232 C 414.82014,343.52661 440.80808,340.23700 445.08458,347.80311 C 449.36107,355.36922 485.87577,370.17247 493.44188,381.68612 C 501.00799,393.19976 515.81124,405.70029 519.75878,420.50355 C 523.70631,435.30680 522.71943,465.90020 531.60138,459.97890 C 540.48334,454.05759 519.10086,423.13524 523.04839,401.75275 C 526.99593,380.37027 513.50852,380.04131 495.41565,372.47520 C 477.32278,364.90909 451.99276,352.73753 453.30861,343.52661 C 454.62445,334.31570 448.70315,329.05232 448.70315,329.05232 z " - id="path18823" /> - <path - style="fill:url(#radialGradient18830);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 539.43027,532.41062 C 539.43027,539.40171 544.55840,574.25612 534.48034,574.25612 C 524.40229,574.25612 475.43149,576.39300 475.43149,569.40191 C 475.43149,562.41083 493.88434,522.82888 503.96239,522.82888 C 514.04045,522.82888 539.43027,525.41954 539.43027,532.41062 z " - id="path18824" - sodipodi:nodetypes="ccccc" - transform="matrix(0.624661,0.780896,-0.780896,0.624661,623.2822,-194.2138)" /> - <path - style="fill:url(#radialGradient18831);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 466.62375,572.09687 C 466.62375,583.75974 447.16650,585.70506 438.72273,585.70506 C 430.27895,585.70506 413.31825,581.76117 413.31825,570.09830 C 389.07901,512.80764 422.08743,519.04264 443.58671,522.23015 C 466.15531,533.76777 473.08623,541.59775 466.62375,572.09687 z " - id="path18825" - sodipodi:nodetypes="ccccc" - transform="matrix(0.943927,0.330155,-0.357257,1.021414,211.1143,-156.7594)" /> - <path - style="fill:#85c8ef;fill-opacity:0.14973260;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 317.44761,367.86974 C 306.92085,392.21288 316.46073,375.43585 330.93502,419.84562 C 345.40932,464.25539 329.61918,472.47942 364.81803,490.57229 C 400.01688,508.66516 393.76662,527.74491 425.01794,529.38972 C 456.26926,531.03453 452.32172,552.41701 489.16538,535.63998 C 526.00904,518.86296 555.28660,489.58540 552.98387,468.53188 C 551.01010,445.17564 536.20685,486.95372 518.44293,505.37555 C 491.79707,525.44218 455.94030,534.65310 426.33378,523.13946 C 396.72727,511.62581 379.62129,494.51983 369.75245,468.20293 C 359.88361,441.88603 345.40932,410.96367 352.97542,395.17353 C 360.54153,379.38339 362.51530,363.59325 384.88467,350.76376 C 407.25403,337.93427 404.62234,323.78894 385.21362,317.86763 C 365.80491,311.94633 372.05518,319.18348 355.93608,344.51350 C 339.81697,369.84351 325.34268,350.76375 317.44761,367.86974 z " - id="path18826" - sodipodi:nodetypes="cccccccccccccc" /> - <path - style="fill:#2d84e6;fill-opacity:0.54901963;fill-rule:evenodd;stroke:#000000;stroke-width:1.5303158;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none;" - d="M 331.84343,317.12090 C 338.32897,332.25383 340.76105,348.73791 330.76251,355.22345 C 355.62374,348.46767 345.62521,323.87668 342.11221,308.47352 C 331.84343,311.44606 331.84343,318.47205 331.84343,317.12090 z " - id="path18827" - sodipodi:nodetypes="cccc" /> - <path - style="fill:#5d9ee5;fill-opacity:0.52406418;fill-rule:evenodd;stroke:#000000;stroke-width:1.6259605;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;stroke-dasharray:none;" - d="M 283.74235,353.60207 C 288.60651,349.54860 288.54298,347.43906 295.56898,346.35814 C 288.54298,355.27575 275.09497,401.43291 281.04004,416.29561 C 294.82181,422.78115 314.81889,411.16122 326.43882,432.77969 C 330.49228,463.58600 308.60359,464.93716 301.30736,477.36777 C 302.92874,491.14954 322.11512,518.71309 339.40990,534.92693 C 331.84343,540.87202 329.51836,537.08182 327.08628,538.16275 C 314.92590,526.54282 295.09205,498.71601 290.22789,482.77239 C 296.17296,468.72039 317.25097,469.53108 317.25097,443.04846 C 311.84635,416.56584 287.25535,425.75368 269.96058,421.97046 C 262.93457,407.37799 276.44612,368.19453 283.74235,353.60207 z " - id="path18828" - sodipodi:nodetypes="ccccccccccc" /> - </g> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;stroke-dasharray:none;" - d="M 601.82447,638.74165 C 604.78515,633.28436 601.75731,634.85749 601.48173,632.48572" - id="path14427" - sodipodi:nodetypes="cc" /> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 653.57402,632.76380 C 650.55685,628.18560 651.39703,629.58291 652.52800,626.15623" - id="path14428" - sodipodi:nodetypes="cc" /> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 684.69400,728.40941 C 681.32519,721.19393 680.05554,724.52525 679.77996,722.15348" - id="path14429" - sodipodi:nodetypes="cc" /> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 509.57814,781.15516 C 507.26424,780.26917 507.75279,779.73247 506.94975,778.41561" - id="path14430" - sodipodi:nodetypes="cc" /> - <g - id="Flower1-2Petals" - transform="matrix(1.665396,0.955877,-1.165744,1.230002,25.78933,-246.9053)"> - <path - style="fill:#5047dd;fill-opacity:0.84491980;stroke:#000000;stroke-width:1.7207220;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 370.56250,305.90625 C 355.90456,305.38356 341.55481,308.54187 333.40625,315.62500 C 327.97388,320.34708 347.33067,340.30951 329.62500,358.15625 C 312.69793,375.21818 287.66656,347.56368 283.21875,354.84375 C 273.25755,371.14806 265.37524,399.59673 267.90625,419.25000 C 269.17176,429.07664 308.54541,414.73263 315.68750,440.15625 C 323.48351,467.90766 284.89523,475.15541 290.03125,485.43750 C 300.30331,506.00168 311.03251,519.94295 326.87500,536.84375 C 334.79624,545.29416 351.90911,508.22838 377.75000,529.43750 C 401.05114,548.56211 370.17897,574.05542 379.65625,579.75000 C 398.61081,591.13920 418.51671,599.28318 438.12500,603.31250 C 447.92915,605.32715 439.41058,564.23371 467.18750,561.43750 C 489.51695,559.18965 496.47318,597.74565 505.37500,595.15625 C 523.21009,589.96826 540.88473,571.83246 552.37500,559.75000 C 558.12014,553.70878 523.50061,541.31380 533.00000,519.28125 C 543.82177,494.18176 562.07926,511.83883 564.31250,503.56250 C 567.67279,491.10942 567.09229,482.38503 565.46875,464.25000 C 564.65698,455.18248 540.01389,464.92575 532.25000,442.96875 C 522.65141,415.82302 549.39077,413.22085 545.21875,404.56250 C 538.82970,391.27821 534.77490,386.96586 519.84375,371.59375 C 512.37815,363.90770 500.37158,387.44121 480.50000,372.06250 C 459.85357,356.08416 479.40003,342.40562 470.31250,336.03125 C 459.54164,328.47614 449.37353,322.48497 439.65625,321.37500 C 429.76884,320.24559 433.66906,341.25860 409.21875,337.34375 C 385.30054,333.51408 394.77072,309.66850 385.12500,307.65625 C 380.38656,306.66773 375.44848,306.08048 370.56250,305.90625 z M 404.37500,362.59375 C 442.37861,362.88532 485.68016,390.09716 503.87500,422.56250 C 524.74616,459.80323 517.44770,509.29724 480.65625,524.43750 C 443.92960,539.55112 390.71795,510.29037 365.28125,466.06250 C 339.84455,421.83464 347.42926,373.16413 388.50000,364.18750 C 393.62397,363.06758 398.94591,362.55210 404.37500,362.59375 z " - id="path18797" /> - <path - sodipodi:type="inkscape:offset" - inkscape:radius="0.0000000" - inkscape:original="M 370.56250 305.90625 C 355.90456 305.38356 341.55481 308.54187 333.40625 315.62500 C 327.97388 320.34708 347.33067 340.30951 329.62500 358.15625 C 312.69793 375.21818 287.66656 347.56368 283.21875 354.84375 C 273.25755 371.14806 265.37524 399.59673 267.90625 419.25000 C 269.17176 429.07664 308.54541 414.73263 315.68750 440.15625 C 323.48351 467.90766 284.89523 475.15541 290.03125 485.43750 C 300.30331 506.00168 311.03251 519.94295 326.87500 536.84375 C 334.79624 545.29416 351.90911 508.22838 377.75000 529.43750 C 401.05114 548.56211 370.17897 574.05542 379.65625 579.75000 C 398.61081 591.13920 418.51671 599.28318 438.12500 603.31250 C 447.92915 605.32715 439.41058 564.23371 467.18750 561.43750 C 489.51695 559.18965 496.47318 597.74565 505.37500 595.15625 C 523.21009 589.96826 540.88473 571.83246 552.37500 559.75000 C 558.12014 553.70878 523.50061 541.31380 533.00000 519.28125 C 543.82177 494.18176 562.07926 511.83883 564.31250 503.56250 C 567.67279 491.10942 567.09229 482.38503 565.46875 464.25000 C 564.65698 455.18248 540.01389 464.92575 532.25000 442.96875 C 522.65141 415.82302 549.39077 413.22085 545.21875 404.56250 C 538.82970 391.27821 534.77490 386.96586 519.84375 371.59375 C 512.37815 363.90770 500.37158 387.44121 480.50000 372.06250 C 459.85357 356.08416 479.40003 342.40562 470.31250 336.03125 C 459.54164 328.47614 449.37353 322.48497 439.65625 321.37500 C 429.76884 320.24559 433.66906 341.25860 409.21875 337.34375 C 385.30054 333.51408 394.77072 309.66850 385.12500 307.65625 C 380.38656 306.66773 375.44848 306.08048 370.56250 305.90625 z M 404.37500 362.59375 C 442.37861 362.88532 485.68016 390.09716 503.87500 422.56250 C 524.74616 459.80323 517.44770 509.29724 480.65625 524.43750 C 443.92960 539.55112 390.71795 510.29037 365.28125 466.06250 C 339.84455 421.83464 347.42926 373.16413 388.50000 364.18750 C 393.62397 363.06758 398.94591 362.55210 404.37500 362.59375 z " - xlink:href="#path4825" - style="fill:#564ce2;fill-opacity:0.72192514;stroke:#000000;stroke-width:1.7207220;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - id="path18798" - inkscape:href="#path4825" - d="M 370.56250,305.90625 C 355.90456,305.38356 341.55481,308.54187 333.40625,315.62500 C 327.97388,320.34708 347.33067,340.30951 329.62500,358.15625 C 312.69793,375.21818 287.66656,347.56368 283.21875,354.84375 C 273.25755,371.14806 265.37524,399.59673 267.90625,419.25000 C 269.17176,429.07664 308.54541,414.73263 315.68750,440.15625 C 323.48351,467.90766 284.89523,475.15541 290.03125,485.43750 C 300.30331,506.00168 311.03251,519.94295 326.87500,536.84375 C 334.79624,545.29416 351.90911,508.22838 377.75000,529.43750 C 401.05114,548.56211 370.17897,574.05542 379.65625,579.75000 C 398.61081,591.13920 418.51671,599.28318 438.12500,603.31250 C 447.92915,605.32715 439.41058,564.23371 467.18750,561.43750 C 489.51695,559.18965 496.47318,597.74565 505.37500,595.15625 C 523.21009,589.96826 540.88473,571.83246 552.37500,559.75000 C 558.12014,553.70878 523.50061,541.31380 533.00000,519.28125 C 543.82177,494.18176 562.07926,511.83883 564.31250,503.56250 C 567.67279,491.10942 567.09229,482.38503 565.46875,464.25000 C 564.65698,455.18248 540.01389,464.92575 532.25000,442.96875 C 522.65141,415.82302 549.39077,413.22085 545.21875,404.56250 C 538.82970,391.27821 534.77490,386.96586 519.84375,371.59375 C 512.37815,363.90770 500.37158,387.44121 480.50000,372.06250 C 459.85357,356.08416 479.40003,342.40562 470.31250,336.03125 C 459.54164,328.47614 449.37353,322.48497 439.65625,321.37500 C 429.76884,320.24559 433.66906,341.25860 409.21875,337.34375 C 385.30054,333.51408 394.77072,309.66850 385.12500,307.65625 C 380.38656,306.66773 375.44848,306.08048 370.56250,305.90625 z M 404.37500,362.59375 C 442.37861,362.88532 485.68016,390.09716 503.87500,422.56250 C 524.74616,459.80323 517.44770,509.29724 480.65625,524.43750 C 443.92960,539.55112 390.71795,510.29037 365.28125,466.06250 C 339.84455,421.83464 347.42926,373.16413 388.50000,364.18750 C 393.62397,363.06758 398.94591,362.55210 404.37500,362.59375 z " /> - <path - style="fill:url(#radialGradient18810);fill-opacity:1.0000000;stroke:#000000;stroke-width:1.7138077;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 380.12958,297.43595 C 365.86249,296.90326 351.89541,300.12208 343.96414,307.34090 C 338.67664,312.15342 357.51725,332.49828 340.28372,350.68690 C 323.80802,368.07567 299.44415,339.89140 295.11493,347.31096 C 285.41937,363.92759 277.74725,392.92123 280.21077,412.95101 C 281.44254,422.96589 319.76626,408.34710 326.71788,434.25775 C 334.30601,462.54078 296.74672,469.92735 301.74578,480.40644 C 311.74392,501.36456 322.18703,515.57289 337.60706,532.79745 C 345.31706,541.40974 361.97361,503.63391 387.12541,525.24932 C 409.80520,544.74031 379.75628,570.72197 388.98084,576.52564 C 407.42996,588.13303 426.80503,596.43301 445.89044,600.53952 C 455.43316,602.59276 447.14175,560.71211 474.17796,557.86234 C 495.91199,555.57142 502.68271,594.86602 511.34716,592.22703 C 528.70666,586.93964 545.90998,568.45644 557.09385,556.14252 C 562.68579,549.98555 528.98942,537.35313 538.23552,514.89853 C 548.76870,489.31821 566.53935,507.31354 568.71302,498.87865 C 571.98372,486.18700 571.41869,477.29549 569.83844,458.81305 C 569.04832,449.57183 545.06237,459.50174 537.50550,437.12411 C 528.16288,409.45836 554.18920,406.80636 550.12843,397.98214 C 543.90974,384.44336 539.96307,380.04841 525.43007,364.38181 C 518.16357,356.54852 506.47716,380.53287 487.13549,364.85955 C 467.03960,348.57510 486.06484,334.63454 477.21964,328.13807 C 466.73600,320.43822 456.83902,314.33228 447.38086,313.20105 C 437.75712,312.05000 441.55333,333.46555 417.75501,329.47570 C 394.47461,325.57267 403.69226,301.27029 394.30375,299.21948 C 389.69169,298.21202 384.88527,297.61353 380.12958,297.43595 z M 413.04042,355.20943 C 450.03063,355.50656 492.17750,383.23969 509.88715,416.32696 C 530.20177,454.28108 523.09793,504.72324 487.28757,520.15355 C 451.54027,535.55668 399.74756,505.73540 374.98916,460.66029 C 350.23075,415.58516 357.61321,365.98228 397.58875,356.83369 C 402.57609,355.69231 407.75611,355.16696 413.04042,355.20943 z " - id="path18799" /> - <path - style="fill:#638ae3;fill-opacity:0.53475934;fill-rule:evenodd;stroke:#000000;stroke-width:1.7150134;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none;" - d="M 378.47470,577.81411 C 378.41896,575.30523 385.62077,574.05338 386.68118,574.84545 C 392.70466,579.95068 413.90520,592.34120 446.41145,601.02821 C 442.64142,602.48133 444.73008,602.27386 440.53021,603.54017 C 435.26683,603.21121 387.98723,587.44481 378.47470,577.81411 z " - id="path18800" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#5492d5;fill-opacity:0.33155081;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 448.70315,329.05232 C 414.82014,343.52661 440.80808,340.23700 445.08458,347.80311 C 449.36107,355.36922 485.87577,370.17247 493.44188,381.68612 C 501.00799,393.19976 515.81124,405.70029 519.75878,420.50355 C 523.70631,435.30680 522.71943,465.90020 531.60138,459.97890 C 540.48334,454.05759 519.10086,423.13524 523.04839,401.75275 C 526.99593,380.37027 513.50852,380.04131 495.41565,372.47520 C 477.32278,364.90909 451.99276,352.73753 453.30861,343.52661 C 454.62445,334.31570 448.70315,329.05232 448.70315,329.05232 z " - id="path18801" /> - <path - style="fill:url(#radialGradient18811);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 539.43027,532.41062 C 539.43027,539.40171 544.55840,574.25612 534.48034,574.25612 C 524.40229,574.25612 475.43149,576.39300 475.43149,569.40191 C 475.43149,562.41083 493.88434,522.82888 503.96239,522.82888 C 514.04045,522.82888 539.43027,525.41954 539.43027,532.41062 z " - id="path18802" - sodipodi:nodetypes="ccccc" - transform="matrix(0.624661,0.780896,-0.780896,0.624661,623.2822,-194.2138)" /> - <path - style="fill:url(#radialGradient18812);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 466.62375,572.09687 C 466.62375,583.75974 447.16650,585.70506 438.72273,585.70506 C 430.27895,585.70506 413.31825,581.76117 413.31825,570.09830 C 389.07901,512.80764 422.08743,519.04264 443.58671,522.23015 C 466.15531,533.76777 473.08623,541.59775 466.62375,572.09687 z " - id="path18803" - sodipodi:nodetypes="ccccc" - transform="matrix(0.943927,0.330155,-0.357257,1.021414,211.1143,-156.7594)" /> - <path - style="fill:#85c8ef;fill-opacity:0.14973260;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 317.44761,367.86974 C 306.92085,392.21288 316.46073,375.43585 330.93502,419.84562 C 345.40932,464.25539 329.61918,472.47942 364.81803,490.57229 C 400.01688,508.66516 393.76662,527.74491 425.01794,529.38972 C 456.26926,531.03453 452.32172,552.41701 489.16538,535.63998 C 526.00904,518.86296 555.28660,489.58540 552.98387,468.53188 C 551.01010,445.17564 536.20685,486.95372 518.44293,505.37555 C 491.79707,525.44218 455.94030,534.65310 426.33378,523.13946 C 396.72727,511.62581 379.62129,494.51983 369.75245,468.20293 C 359.88361,441.88603 345.40932,410.96367 352.97542,395.17353 C 360.54153,379.38339 362.51530,363.59325 384.88467,350.76376 C 407.25403,337.93427 404.62234,323.78894 385.21362,317.86763 C 365.80491,311.94633 372.05518,319.18348 355.93608,344.51350 C 339.81697,369.84351 325.34268,350.76375 317.44761,367.86974 z " - id="path18804" - sodipodi:nodetypes="cccccccccccccc" /> - <path - style="fill:#2d84e6;fill-opacity:0.54901963;fill-rule:evenodd;stroke:#000000;stroke-width:1.7150134;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none;" - d="M 331.84343,317.12090 C 338.32897,332.25383 340.76105,348.73791 330.76251,355.22345 C 355.62374,348.46767 345.62521,323.87668 342.11221,308.47352 C 331.84343,311.44606 331.84343,318.47205 331.84343,317.12090 z " - id="path18805" - sodipodi:nodetypes="cccc" /> - <path - style="fill:#5d9ee5;fill-opacity:0.52406418;fill-rule:evenodd;stroke:#000000;stroke-width:2.0242781;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;stroke-dasharray:none;" - d="M 283.74235,353.60207 C 288.60651,349.54860 288.47059,348.08490 295.49659,347.00398 C 288.47059,355.92159 275.09497,401.43291 281.04004,416.29561 C 294.82181,422.78115 314.81889,411.16122 326.43882,432.77969 C 330.49228,463.58600 308.60359,464.93716 301.30736,477.36777 C 302.92874,491.14954 322.11512,518.71309 339.40990,534.92693 C 331.84343,540.87202 331.03274,536.27809 328.60066,537.35902 C 316.44028,525.73909 295.09205,498.71601 290.22789,482.77239 C 296.17296,468.72039 317.25097,469.53108 317.25097,443.04846 C 311.84635,416.56584 287.25535,425.75368 269.96058,421.97046 C 262.93457,407.37799 276.44612,368.19453 283.74235,353.60207 z " - id="path18806" - sodipodi:nodetypes="ccccccccccc" /> - </g> - <path - style="fill:#000000;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:2.8125000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none;" - d="M 372.11638,913.35731 C 383.39263,913.86987 387.49308,910.79453 387.49308,910.79453" - id="path14398" - sodipodi:nodetypes="cc" /> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:2.8125000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;" - d="M -56.381265,623.47752 C -44.592458,621.42730 -36.391552,621.93986 -28.190640,627.57798" - id="path14419" - sodipodi:nodetypes="cc" /> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:2.8125000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M -18.195768,528.97789 C -7.4320755,533.59091 -1.7939544,536.15369 9.4823000,533.59090" - id="path14420" - sodipodi:nodetypes="cc" /> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:2.8125000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 369.29732,565.88199 C 381.08613,563.83177 391.33726,558.19365 399.53817,563.83177" - id="path14423" - sodipodi:nodetypes="cc" /> - <g - id="Flower1-3Pestils" - transform="translate(1.891626,11.34975)"> - <path - style="fill:#78bb0b;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - id="path18807" - d="M 603.27927,666.47628 C 609.66972,677.12850 609.84624,674.89557 618.32858,683.92662 C 629.06556,695.13796 640.80583,705.37798 653.31781,714.56213 C 657.70974,717.59349 661.99817,720.93503 666.91489,723.08809 C 668.57801,723.83260 669.84377,725.20836 671.28408,726.29745 C 671.73779,726.63548 672.21438,726.94043 672.67953,727.26191 L 672.97185,736.81564 C 672.49767,736.51023 672.01888,736.21197 671.54932,735.89940 C 670.11202,734.92971 668.82935,733.77356 667.38428,732.83496 C 662.35263,730.45132 658.08474,726.69521 653.53958,723.54860 C 641.10645,714.11082 629.25402,703.88474 618.39396,692.66144 C 609.93913,683.78578 602.58476,678.57341 595.97733,668.21781 C 598.65124,667.77125 599.47798,667.05216 603.27927,666.47628 z " - sodipodi:nodetypes="ccccccccccccc" /> - <path - style="fill:#6a961f;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - id="path18808" - d="M 540.75331,765.89447 C 542.06714,763.06677 543.47163,760.26779 544.83577,757.45996 C 549.67833,747.21863 554.66382,737.04505 559.47924,726.79091 C 564.63623,716.12397 568.61466,704.93616 570.63934,693.24886 L 571.27240,674.80580 C 571.71540,676.41212 572.75043,674.58080 573.99547,674.35749 C 576.29811,684.64569 576.32315,691.04037 574.40886,701.50154 C 572.25135,713.19611 568.19365,724.38600 563.00112,735.07047 C 558.14280,745.37636 553.12855,755.60955 548.47253,766.00997 C 547.15796,768.89228 545.62901,771.79636 544.81786,774.85325 L 540.75331,765.89447 z " - sodipodi:nodetypes="ccccccccccc" /> - <path - style="fill:#789744;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - id="path18809" - d="M 566.21596,792.75252 C 567.07225,790.00841 568.23459,787.28724 569.25163,784.57374 C 572.16951,776.88707 573.60538,768.74718 575.03237,760.68095 C 578.47796,740.16094 581.50373,719.57285 584.92158,699.04836 C 586.34302,688.56725 591.45622,670.58068 590.36271,669.39944 C 592.98671,668.87464 595.21861,668.31694 598.32324,667.49699 C 596.93319,678.31130 591.11786,681.16577 589.61208,691.96786 C 586.05291,712.37489 583.06932,732.87622 579.89115,753.34460 C 578.61942,761.21808 577.40858,769.19151 574.66768,776.71499 C 573.70516,779.33229 572.71275,782.01875 571.66851,784.56819 L 566.21596,792.75252 z " - sodipodi:nodetypes="ccccccccccc" /> - </g> - <g - id="g9548" - transform="matrix(0.978021,0.208507,-0.208507,0.978021,-163.9946,644.1626)"> - <path - style="fill:url(#linearGradient9551);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M 43.495157,164.66019 C 276.50486,388.34951 338.64079,376.95793 423.55988,385.24272 C 508.47898,393.52751 694.88669,258.89967 724.91909,252.68608 C 754.95149,246.47249 752.88029,251.65048 765.30749,256.82848 C 748.73789,210.22653 666.92559,97.346281 611.00319,62.135921 C 555.08089,26.925563 404.91910,-13.462777 280.64726,19.676373 C 198.83496,38.317153 115.98706,135.66343 43.495157,164.66019 z " - id="path9549" - sodipodi:nodetypes="ccccccc" /> - <path - style="fill:#1a15c0;fill-opacity:0.058823530;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M 449.21875,12.343750 C 372.55367,131.34626 351.03163,190.15459 345.31250,234.71875 C 296.43407,228.74167 250.88253,220.20102 210.06250,211.18750 C 210.18144,159.47011 307.03125,15.562500 307.03125,15.562500 C 231.73758,132.43627 211.35292,167.53740 205.28125,210.12500 C 111.44954,189.10115 46.625000,165.87500 46.625000,165.87500 C 95.278072,186.13432 149.62093,202.52998 204.53125,215.34375 C 205.73417,244.61892 210.49875,254.89076 234.81250,324.93750 C 212.11540,236.98624 209.34258,255.80079 209.75000,216.50000 C 255.62272,227.00430 301.69759,235.02520 345.12500,240.43750 C 346.64554,269.96362 353.89092,311.29960 377.53125,379.40625 C 355.00622,292.12181 351.03030,281.31222 351.31250,241.25000 C 399.42652,247.01704 443.95673,249.65958 480.81250,249.21875 C 482.09933,277.29978 486.10250,295.38014 509.81250,363.68750 C 486.91509,274.96003 484.85720,289.97427 485.34375,249.09375 C 521.11851,248.40068 549.34122,244.76072 565.71875,238.12500 C 576.82659,233.17150 593.20091,230.91691 611.78125,230.34375 C 609.02322,239.26769 604.15131,267.42325 620.50000,307.75000 C 605.49195,257.72323 612.64130,247.27739 614.87500,230.31250 C 668.07068,229.21004 737.88540,241.30570 757.40625,245.12500 C 735.98732,234.66460 664.92792,227.25580 615.21875,228.21875 C 615.22870,228.11904 615.24045,228.03777 615.25000,227.93750 C 616.41525,215.70752 675.84375,123.06250 675.84375,123.06250 C 614.59722,216.66570 616.91444,216.32105 612.43750,228.21875 C 605.01927,228.41116 598.05690,228.77061 591.93750,229.37500 C 561.08150,232.42251 544.14471,244.86783 485.50000,246.00000 C 481.12067,196.29050 582.62500,47.906250 582.62500,47.906250 C 504.83281,168.65828 486.07119,201.47841 480.75000,246.09375 C 450.57954,246.34478 409.84371,243.69470 351.53125,235.56250 C 347.17084,177.77103 449.21875,12.343750 449.21875,12.343750 z " - id="path9550" - sodipodi:nodetypes="cccccccccccccccccccccccccccccc" /> - </g> - <g - id="g13115" - transform="matrix(2.038847,0.000000,0.000000,1.923867,-602.1040,-176.4593)"> - <path - style="fill:#78bb0b;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - id="path13116" - d="M 394.10576,452.65823 C 399.01928,447.68858 401.87654,446.98435 407.73687,436.13585 C 415.10216,422.50139 422.71500,395.32603 424.81725,386.39695 C 432.59894,353.34510 433.66820,323.26018 433.76933,322.70386 L 436.86582,346.10363 C 436.78305,346.66155 431.47654,380.00971 415.76414,424.05417 C 411.63846,435.61913 405.50952,449.12456 398.79879,459.41352 C 397.33926,458.31987 395.32750,454.93255 394.10576,452.65823 z " - sodipodi:nodetypes="cssccscc" /> - <path - style="fill:#6a961f;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - id="path13117" - d="M 406.15858,472.17564 C 417.16429,474.86067 430.18789,477.73672 441.18665,480.45644 C 452.68654,483.30007 472.55231,485.56865 488.72130,479.40230 C 498.71939,475.58933 522.32168,464.29434 536.51561,456.90982 L 523.55784,470.94729 C 516.62703,471.11409 482.89229,486.01332 472.25970,486.23285 C 460.37030,486.47832 457.26549,487.57828 444.51517,485.28507 C 433.17761,483.24596 423.60892,478.34693 406.89416,481.20895 C 406.40439,477.18501 406.28876,474.80137 406.15858,472.17564 z " - sodipodi:nodetypes="cssccsscc" /> - <path - style="fill:#789744;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - id="path13118" - d="M 411.04798,444.80297 C 418.78840,442.38627 461.51519,431.25353 479.40434,421.32526 C 488.33384,415.99783 490.41674,415.55663 499.29259,410.14559 C 500.76605,409.32339 510.29122,401.84518 510.50096,400.24850 L 519.93277,398.41882 C 519.97357,400.45269 508.64877,410.70313 506.85031,411.75720 C 497.68560,417.31484 498.25071,412.11766 489.02182,417.57580 C 471.13283,427.31940 453.53736,437.57850 435.84347,447.66267 C 429.00599,451.50260 408.63164,457.08887 406.01578,457.82964 C 407.76101,448.37975 406.36461,451.04408 411.04798,444.80297 z " - sodipodi:nodetypes="cccccccccc" /> - </g> - </g> - <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="Flower2"> - <g - id="Flower2-3Inner" - transform="matrix(-7.845077e-2,-1.074062,0.734145,4.891352e-2,630.8127,781.1565)"> - <path - style="fill:url(#linearGradient22768);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 363.71942,503.69746 C 405.38182,416.40480 356.13246,406.42348 386.55263,384.60031 C 416.97280,362.77715 422.17091,378.87475 438.04230,393.42353 C 453.91369,407.97230 475.29202,424.27152 475.29202,431.54591 C 475.29202,438.82029 363.71942,503.69746 363.71942,503.69746 z " - id="path22763" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:url(#linearGradient22769);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 367.02596,501.05223 C 416.62406,401.85602 391.31920,406.68287 433.64292,413.95726 C 475.96663,421.23164 474.65290,429.18691 485.58403,453.12983 C 488.89057,482.88869 517.45929,484.83995 481.74866,494.09826 C 446.03802,503.35658 367.02596,501.05223 367.02596,501.05223 z " - id="path22764" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:url(#linearGradient22770);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 372.31642,498.40699 C 428.52760,380.03286 430.30761,368.00419 393.27436,363.37504 C 356.24111,358.74588 364.06386,389.49281 373.98348,423.88082 C 383.90310,458.26884 400.91057,482.51346 406.86234,503.67532 C 412.81412,524.83718 372.31642,498.40699 372.31642,498.40699 z " - id="path22765" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:url(#radialGradient22771);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 375.62296,499.06830 C 502.59410,475.26121 536.65615,491.32284 494.99374,518.43647 C 453.33133,545.55010 458.86406,564.22584 430.51153,548.00510 C 407.36575,528.16586 406.04313,514.27839 394.80089,506.34269 C 383.55866,498.40699 375.62296,499.06830 375.62296,499.06830 z " - id="path22766" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:url(#radialGradient22772);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 367.24532,504.86617 C 412.21427,539.25419 477.37338,542.48056 474.06684,517.35085 C 470.76030,492.22115 440.17838,408.38916 409.09691,429.55102 C 378.01543,450.71287 376.55763,466.07702 367.24532,504.86617 z " - id="path22767" - sodipodi:nodetypes="cccc" /> - </g> - <g - id="Flower2-3Petals" - transform="matrix(5.603515e-2,-0.403873,0.459878,-0.321866,687.9418,640.9019)"> - <path - style="fill:#5047dd;fill-opacity:0.84491980;stroke:#000000;stroke-width:1.7207220;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 370.56250,305.90625 C 355.90456,305.38356 341.55481,308.54187 333.40625,315.62500 C 327.97388,320.34708 347.33067,340.30951 329.62500,358.15625 C 312.69793,375.21818 287.66656,347.56368 283.21875,354.84375 C 273.25755,371.14806 265.37524,399.59673 267.90625,419.25000 C 269.17176,429.07664 308.54541,414.73263 315.68750,440.15625 C 323.48351,467.90766 284.89523,475.15541 290.03125,485.43750 C 300.30331,506.00168 311.03251,519.94295 326.87500,536.84375 C 334.79624,545.29416 351.90911,508.22838 377.75000,529.43750 C 401.05114,548.56211 370.17897,574.05542 379.65625,579.75000 C 398.61081,591.13920 418.51671,599.28318 438.12500,603.31250 C 447.92915,605.32715 439.41058,564.23371 467.18750,561.43750 C 489.51695,559.18965 496.47318,597.74565 505.37500,595.15625 C 523.21009,589.96826 540.88473,571.83246 552.37500,559.75000 C 558.12014,553.70878 523.50061,541.31380 533.00000,519.28125 C 543.82177,494.18176 562.07926,511.83883 564.31250,503.56250 C 567.67279,491.10942 567.09229,482.38503 565.46875,464.25000 C 564.65698,455.18248 540.01389,464.92575 532.25000,442.96875 C 522.65141,415.82302 549.39077,413.22085 545.21875,404.56250 C 538.82970,391.27821 534.77490,386.96586 519.84375,371.59375 C 512.37815,363.90770 500.37158,387.44121 480.50000,372.06250 C 459.85357,356.08416 479.40003,342.40562 470.31250,336.03125 C 459.54164,328.47614 449.37353,322.48497 439.65625,321.37500 C 429.76884,320.24559 433.66906,341.25860 409.21875,337.34375 C 385.30054,333.51408 394.77072,309.66850 385.12500,307.65625 C 380.38656,306.66773 375.44848,306.08048 370.56250,305.90625 z M 404.37500,362.59375 C 442.37861,362.88532 485.68016,390.09716 503.87500,422.56250 C 524.74616,459.80323 517.44770,509.29724 480.65625,524.43750 C 443.92960,539.55112 390.71795,510.29037 365.28125,466.06250 C 339.84455,421.83464 347.42926,373.16413 388.50000,364.18750 C 393.62397,363.06758 398.94591,362.55210 404.37500,362.59375 z " - id="path18862" /> - <path - sodipodi:type="inkscape:offset" - inkscape:radius="0.0000000" - inkscape:original="M 370.56250 305.90625 C 355.90456 305.38356 341.55481 308.54187 333.40625 315.62500 C 327.97388 320.34708 347.33067 340.30951 329.62500 358.15625 C 312.69793 375.21818 287.66656 347.56368 283.21875 354.84375 C 273.25755 371.14806 265.37524 399.59673 267.90625 419.25000 C 269.17176 429.07664 308.54541 414.73263 315.68750 440.15625 C 323.48351 467.90766 284.89523 475.15541 290.03125 485.43750 C 300.30331 506.00168 311.03251 519.94295 326.87500 536.84375 C 334.79624 545.29416 351.90911 508.22838 377.75000 529.43750 C 401.05114 548.56211 370.17897 574.05542 379.65625 579.75000 C 398.61081 591.13920 418.51671 599.28318 438.12500 603.31250 C 447.92915 605.32715 439.41058 564.23371 467.18750 561.43750 C 489.51695 559.18965 496.47318 597.74565 505.37500 595.15625 C 523.21009 589.96826 540.88473 571.83246 552.37500 559.75000 C 558.12014 553.70878 523.50061 541.31380 533.00000 519.28125 C 543.82177 494.18176 562.07926 511.83883 564.31250 503.56250 C 567.67279 491.10942 567.09229 482.38503 565.46875 464.25000 C 564.65698 455.18248 540.01389 464.92575 532.25000 442.96875 C 522.65141 415.82302 549.39077 413.22085 545.21875 404.56250 C 538.82970 391.27821 534.77490 386.96586 519.84375 371.59375 C 512.37815 363.90770 500.37158 387.44121 480.50000 372.06250 C 459.85357 356.08416 479.40003 342.40562 470.31250 336.03125 C 459.54164 328.47614 449.37353 322.48497 439.65625 321.37500 C 429.76884 320.24559 433.66906 341.25860 409.21875 337.34375 C 385.30054 333.51408 394.77072 309.66850 385.12500 307.65625 C 380.38656 306.66773 375.44848 306.08048 370.56250 305.90625 z M 404.37500 362.59375 C 442.37861 362.88532 485.68016 390.09716 503.87500 422.56250 C 524.74616 459.80323 517.44770 509.29724 480.65625 524.43750 C 443.92960 539.55112 390.71795 510.29037 365.28125 466.06250 C 339.84455 421.83464 347.42926 373.16413 388.50000 364.18750 C 393.62397 363.06758 398.94591 362.55210 404.37500 362.59375 z " - xlink:href="#path4825" - style="fill:#564ce2;fill-opacity:0.72192514;stroke:#000000;stroke-width:1.7207220;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - id="path18863" - inkscape:href="#path4825" - d="M 370.56250,305.90625 C 355.90456,305.38356 341.55481,308.54187 333.40625,315.62500 C 327.97388,320.34708 347.33067,340.30951 329.62500,358.15625 C 312.69793,375.21818 287.66656,347.56368 283.21875,354.84375 C 273.25755,371.14806 265.37524,399.59673 267.90625,419.25000 C 269.17176,429.07664 308.54541,414.73263 315.68750,440.15625 C 323.48351,467.90766 284.89523,475.15541 290.03125,485.43750 C 300.30331,506.00168 311.03251,519.94295 326.87500,536.84375 C 334.79624,545.29416 351.90911,508.22838 377.75000,529.43750 C 401.05114,548.56211 370.17897,574.05542 379.65625,579.75000 C 398.61081,591.13920 418.51671,599.28318 438.12500,603.31250 C 447.92915,605.32715 439.41058,564.23371 467.18750,561.43750 C 489.51695,559.18965 496.47318,597.74565 505.37500,595.15625 C 523.21009,589.96826 540.88473,571.83246 552.37500,559.75000 C 558.12014,553.70878 523.50061,541.31380 533.00000,519.28125 C 543.82177,494.18176 562.07926,511.83883 564.31250,503.56250 C 567.67279,491.10942 567.09229,482.38503 565.46875,464.25000 C 564.65698,455.18248 540.01389,464.92575 532.25000,442.96875 C 522.65141,415.82302 549.39077,413.22085 545.21875,404.56250 C 538.82970,391.27821 534.77490,386.96586 519.84375,371.59375 C 512.37815,363.90770 500.37158,387.44121 480.50000,372.06250 C 459.85357,356.08416 479.40003,342.40562 470.31250,336.03125 C 459.54164,328.47614 449.37353,322.48497 439.65625,321.37500 C 429.76884,320.24559 433.66906,341.25860 409.21875,337.34375 C 385.30054,333.51408 394.77072,309.66850 385.12500,307.65625 C 380.38656,306.66773 375.44848,306.08048 370.56250,305.90625 z M 404.37500,362.59375 C 442.37861,362.88532 485.68016,390.09716 503.87500,422.56250 C 524.74616,459.80323 517.44770,509.29724 480.65625,524.43750 C 443.92960,539.55112 390.71795,510.29037 365.28125,466.06250 C 339.84455,421.83464 347.42926,373.16413 388.50000,364.18750 C 393.62397,363.06758 398.94591,362.55210 404.37500,362.59375 z " /> - <path - style="fill:url(#radialGradient18872);fill-opacity:1.0000000;stroke:#000000;stroke-width:1.7138077;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 380.12958,297.43595 C 365.86249,296.90326 351.89541,300.12208 343.96414,307.34090 C 338.67664,312.15342 357.51725,332.49828 340.28372,350.68690 C 323.80802,368.07567 299.44415,339.89140 295.11493,347.31096 C 285.41937,363.92759 277.74725,392.92123 280.21077,412.95101 C 281.44254,422.96589 319.76626,408.34710 326.71788,434.25775 C 334.30601,462.54078 296.74672,469.92735 301.74578,480.40644 C 311.74392,501.36456 322.18703,515.57289 337.60706,532.79745 C 345.31706,541.40974 361.97361,503.63391 387.12541,525.24932 C 409.80520,544.74031 379.75628,570.72197 388.98084,576.52564 C 407.42996,588.13303 426.80503,596.43301 445.89044,600.53952 C 455.43316,602.59276 447.14175,560.71211 474.17796,557.86234 C 495.91199,555.57142 502.68271,594.86602 511.34716,592.22703 C 528.70666,586.93964 545.90998,568.45644 557.09385,556.14252 C 562.68579,549.98555 528.98942,537.35313 538.23552,514.89853 C 548.76870,489.31821 566.53935,507.31354 568.71302,498.87865 C 571.98372,486.18700 571.41869,477.29549 569.83844,458.81305 C 569.04832,449.57183 545.06237,459.50174 537.50550,437.12411 C 528.16288,409.45836 554.18920,406.80636 550.12843,397.98214 C 543.90974,384.44336 539.96307,380.04841 525.43007,364.38181 C 518.16357,356.54852 506.47716,380.53287 487.13549,364.85955 C 467.03960,348.57510 486.06484,334.63454 477.21964,328.13807 C 466.73600,320.43822 456.83902,314.33228 447.38086,313.20105 C 437.75712,312.05000 441.55333,333.46555 417.75501,329.47570 C 394.47461,325.57267 403.69226,301.27029 394.30375,299.21948 C 389.69169,298.21202 384.88527,297.61353 380.12958,297.43595 z M 413.04042,355.20943 C 450.03063,355.50656 492.17750,383.23969 509.88715,416.32696 C 530.20177,454.28108 523.09793,504.72324 487.28757,520.15355 C 451.54027,535.55668 399.74756,505.73540 374.98916,460.66029 C 350.23075,415.58516 357.61321,365.98228 397.58875,356.83369 C 402.57609,355.69231 407.75611,355.16696 413.04042,355.20943 z " - id="path18864" /> - <path - style="fill:#638ae3;fill-opacity:0.53475934;fill-rule:evenodd;stroke:#000000;stroke-width:1.8314677;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none;" - d="M 378.47470,577.81411 C 378.41896,575.30523 385.62077,574.05338 386.68118,574.84545 C 392.70466,579.95068 411.33467,593.50542 447.38730,601.10327 C 443.61727,602.55639 444.73008,602.27386 440.53021,603.54017 C 435.26683,603.21121 387.98723,587.44481 378.47470,577.81411 z " - id="path18865" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#5492d5;fill-opacity:0.33155081;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 448.70315,329.05232 C 414.82014,343.52661 440.80808,340.23700 445.08458,347.80311 C 449.36107,355.36922 485.87577,370.17247 493.44188,381.68612 C 501.00799,393.19976 515.81124,405.70029 519.75878,420.50355 C 523.70631,435.30680 522.71943,465.90020 531.60138,459.97890 C 540.48334,454.05759 519.10086,423.13524 523.04839,401.75275 C 526.99593,380.37027 513.50852,380.04131 495.41565,372.47520 C 477.32278,364.90909 451.99276,352.73753 453.30861,343.52661 C 454.62445,334.31570 448.70315,329.05232 448.70315,329.05232 z " - id="path18866" /> - <path - style="fill:url(#radialGradient18873);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 539.43027,532.41062 C 539.43027,539.40171 544.55840,574.25612 534.48034,574.25612 C 524.40229,574.25612 475.43149,576.39300 475.43149,569.40191 C 475.43149,562.41083 493.88434,522.82888 503.96239,522.82888 C 514.04045,522.82888 539.43027,525.41954 539.43027,532.41062 z " - id="path18867" - sodipodi:nodetypes="ccccc" - transform="matrix(0.624661,0.780896,-0.780896,0.624661,623.2822,-194.2138)" /> - <path - style="fill:url(#radialGradient18874);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 466.62375,572.09687 C 466.62375,583.75974 447.16650,585.70506 438.72273,585.70506 C 430.27895,585.70506 413.31825,581.76117 413.31825,570.09830 C 389.07901,512.80764 422.08743,519.04264 443.58671,522.23015 C 466.15531,533.76777 473.08623,541.59775 466.62375,572.09687 z " - id="path18868" - sodipodi:nodetypes="ccccc" - transform="matrix(0.943927,0.330155,-0.357257,1.021414,211.1143,-156.7594)" /> - <path - style="fill:#85c8ef;fill-opacity:0.14973260;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 317.44761,367.86974 C 306.92085,392.21288 316.46073,375.43585 330.93502,419.84562 C 345.40932,464.25539 329.61918,472.47942 364.81803,490.57229 C 400.01688,508.66516 393.76662,527.74491 425.01794,529.38972 C 456.26926,531.03453 452.32172,552.41701 489.16538,535.63998 C 526.00904,518.86296 555.28660,489.58540 552.98387,468.53188 C 551.01010,445.17564 536.20685,486.95372 518.44293,505.37555 C 491.79707,525.44218 455.94030,534.65310 426.33378,523.13946 C 396.72727,511.62581 379.62129,494.51983 369.75245,468.20293 C 359.88361,441.88603 345.40932,410.96367 352.97542,395.17353 C 360.54153,379.38339 362.51530,363.59325 384.88467,350.76376 C 407.25403,337.93427 404.62234,323.78894 385.21362,317.86763 C 365.80491,311.94633 372.05518,319.18348 355.93608,344.51350 C 339.81697,369.84351 325.34268,350.76375 317.44761,367.86974 z " - id="path18869" - sodipodi:nodetypes="cccccccccccccc" /> - <path - style="fill:#2d84e6;fill-opacity:0.54901963;fill-rule:evenodd;stroke:#000000;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 331.84343,317.12090 C 338.32897,332.25383 340.76105,348.73791 330.76251,355.22345 C 355.62374,348.46767 345.62521,323.87668 342.11221,308.47352 C 331.84343,311.44606 331.84343,318.47205 331.84343,317.12090 z " - id="path18870" - sodipodi:nodetypes="cccc" /> - <path - style="fill:#5d9ee5;fill-opacity:0.52406418;fill-rule:evenodd;stroke:#000000;stroke-width:1.5567476;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;stroke-dasharray:none;" - d="M 283.74235,353.60207 C 288.60651,349.54860 288.02148,348.39624 295.04748,347.31532 C 288.02148,356.23293 275.09497,401.43291 281.04004,416.29561 C 294.82181,422.78115 314.81889,411.16122 326.43882,432.77969 C 330.49228,463.58600 308.60359,464.93716 301.30736,477.36777 C 302.92874,491.14954 322.11512,518.71309 339.40990,534.92693 C 331.84343,540.87202 330.36636,537.11425 327.93428,538.19518 C 315.77390,526.57525 295.09205,498.71601 290.22789,482.77239 C 296.17296,468.72039 317.25097,469.53108 317.25097,443.04846 C 311.84635,416.56584 287.25535,425.75368 269.96058,421.97046 C 262.93457,407.37799 276.44612,368.19453 283.74235,353.60207 z " - id="path18871" - sodipodi:nodetypes="ccccccccccc" /> - </g> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.75000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 925.02801,368.79454 C 923.46238,367.90933 923.69100,368.31474 923.28200,365.54276" - id="path15683" - sodipodi:nodetypes="cc" /> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.75000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 896.21103,397.09074 C 897.94373,395.16396 895.74200,394.70139 895.33300,393.14458" - id="path15682" - sodipodi:nodetypes="cc" /> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.75000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 861.49177,361.15630 C 859.57895,360.79189 859.80757,361.19730 857.31541,360.33488" - id="path15684" - sodipodi:nodetypes="cc" /> - <g - id="Flower2-3Pestils"> - <path - style="fill:#53c107;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - id="path13130" - d="M 926.18004,320.66940 C 919.79126,315.80464 916.18049,306.49503 911.86960,299.53113 C 882.73157,258.01740 857.30139,213.99246 835.42987,168.23589 C 832.79102,162.55482 830.29495,156.80994 827.82222,151.05534 L 834.62840,148.27110 C 836.18682,154.27839 837.89529,160.24225 839.99372,166.08851 C 857.97962,213.62925 884.26383,257.46764 918.31791,295.26795 C 921.12694,298.85739 935.34792,316.10638 932.99866,315.53021 L 926.18004,320.66940 z " - sodipodi:nodetypes="ccccccccc" /> - <path - style="fill:#4e941e;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - id="path13131" - d="M 916.11430,331.81855 C 898.60767,321.80647 882.06441,307.50232 866.32291,294.85305 C 850.00966,282.39429 835.72638,267.75439 821.68975,252.86147 L 828.26599,247.79974 C 840.74190,263.62625 855.83906,277.11859 871.14993,290.11935 C 885.14831,301.84976 906.79970,318.32598 923.94753,323.29732 L 916.11430,331.81855 z " - sodipodi:nodetypes="ccccccc" /> - <path - style="fill:#76901e;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - id="path13132" - d="M 910.78342,347.08336 C 893.87611,342.41730 870.67395,342.02975 853.20725,340.96630 C 842.95336,340.93180 832.93428,339.33123 822.86290,337.70906 L 826.89475,329.43490 C 836.37420,331.92581 845.98974,333.51916 855.77550,334.28819 C 873.28519,335.87776 896.06862,337.20688 913.54359,337.88572 L 910.78342,347.08336 z " - sodipodi:nodetypes="ccccccc" /> - </g> - <path - style="fill:url(#linearGradient12491);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 927.83758,392.64573 C 956.91646,400.54760 948.06636,400.54760 969.08534,414.61293 C 974.45861,419.82816 982.51852,425.04340 991.21057,428.04611 C 999.90263,431.04882 1007.9625,430.89078 1007.4884,425.99162 C 1007.0143,421.09247 997.53207,418.56387 989.47216,412.08433 C 981.41226,405.60480 979.51581,405.13069 977.77740,402.44405 C 979.83188,394.85825 985.04711,381.58312 984.09889,373.20714 C 982.51852,342.54787 972.08805,346.97292 955.33608,350.13367 C 938.58412,353.29442 927.83758,392.64573 927.83758,392.64573 z " - id="Flower2-3Transition" - sodipodi:nodetypes="ccccccccc" /> - <g - id="Flower2-2Inner" - transform="matrix(0.824589,-0.750320,0.579669,0.798557,551.4131,222.5662)"> - <path - style="fill:url(#linearGradient22813);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 367.02596,501.05223 C 416.62406,401.85602 391.31920,406.68287 433.64292,413.95726 C 475.96663,421.23164 498.93877,433.47998 502.24531,463.23884 C 505.55185,492.99770 517.45929,484.83995 481.74866,494.09826 C 446.03802,503.35658 367.02596,501.05223 367.02596,501.05223 z " - id="path22808" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:url(#linearGradient22812);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 363.71942,503.69746 C 405.38182,416.40480 356.13246,406.42348 386.55263,384.60031 C 416.97280,362.77715 433.42693,377.09495 449.29832,391.64373 C 465.16971,406.19250 475.53456,429.76291 475.53456,437.03730 C 475.53456,444.31168 363.71942,503.69746 363.71942,503.69746 z " - id="path22807" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:url(#linearGradient22814);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 372.31642,498.40699 C 428.52760,380.03286 420.31562,335.76821 393.29291,357.35261 C 357.08951,386.27011 368.64007,381.53075 378.55969,415.91876 C 388.47931,450.30678 371.21340,457.41349 377.16517,478.57535 C 383.11695,499.73721 372.31642,498.40699 372.31642,498.40699 z " - id="path22809" - sodipodi:nodetypes="csccc" /> - <path - style="fill:url(#radialGradient22815);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 375.62296,499.06830 C 502.59410,475.26121 528.60545,487.78502 486.94304,514.89865 C 445.28063,542.01228 460.36951,523.81892 437.22373,503.97968 C 414.07795,484.14044 406.04313,514.27839 394.80089,506.34269 C 383.55866,498.40699 375.62296,499.06830 375.62296,499.06830 z " - id="path22810" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:url(#radialGradient22816);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.9743026;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 369.43275,500.81091 C 449.68566,524.22020 466.94604,529.70841 452.10192,493.78550 C 388.30049,442.06185 409.39950,357.95957 371.70918,409.77082 C 368.70439,496.18570 369.43275,500.81091 369.43275,500.81091 z " - id="path22811" - sodipodi:nodetypes="cccc" /> - </g> - <g - id="Flower2-2Petals" - transform="matrix(0.461513,-0.218468,0.507505,0.388027,757.7875,160.0813)"> - <path - style="fill:#5047dd;fill-opacity:0.84491980;stroke:#000000;stroke-width:1.7207220;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 370.56250,305.90625 C 355.90456,305.38356 341.55481,308.54187 333.40625,315.62500 C 327.97388,320.34708 347.33067,340.30951 329.62500,358.15625 C 312.69793,375.21818 287.66656,347.56368 283.21875,354.84375 C 273.25755,371.14806 265.37524,399.59673 267.90625,419.25000 C 269.17176,429.07664 308.54541,414.73263 315.68750,440.15625 C 323.48351,467.90766 284.89523,475.15541 290.03125,485.43750 C 300.30331,506.00168 311.03251,519.94295 326.87500,536.84375 C 334.79624,545.29416 351.90911,508.22838 377.75000,529.43750 C 401.05114,548.56211 370.17897,574.05542 379.65625,579.75000 C 398.61081,591.13920 418.51671,599.28318 438.12500,603.31250 C 447.92915,605.32715 439.41058,564.23371 467.18750,561.43750 C 489.51695,559.18965 496.47318,597.74565 505.37500,595.15625 C 523.21009,589.96826 540.88473,571.83246 552.37500,559.75000 C 558.12014,553.70878 523.50061,541.31380 533.00000,519.28125 C 543.82177,494.18176 562.07926,511.83883 564.31250,503.56250 C 567.67279,491.10942 567.09229,482.38503 565.46875,464.25000 C 564.65698,455.18248 540.01389,464.92575 532.25000,442.96875 C 522.65141,415.82302 549.39077,413.22085 545.21875,404.56250 C 538.82970,391.27821 534.77490,386.96586 519.84375,371.59375 C 512.37815,363.90770 500.37158,387.44121 480.50000,372.06250 C 459.85357,356.08416 479.40003,342.40562 470.31250,336.03125 C 459.54164,328.47614 449.37353,322.48497 439.65625,321.37500 C 429.76884,320.24559 433.66906,341.25860 409.21875,337.34375 C 385.30054,333.51408 394.77072,309.66850 385.12500,307.65625 C 380.38656,306.66773 375.44848,306.08048 370.56250,305.90625 z M 404.37500,362.59375 C 442.37861,362.88532 485.68016,390.09716 503.87500,422.56250 C 524.74616,459.80323 517.44770,509.29724 480.65625,524.43750 C 443.92960,539.55112 390.71795,510.29037 365.28125,466.06250 C 339.84455,421.83464 347.42926,373.16413 388.50000,364.18750 C 393.62397,363.06758 398.94591,362.55210 404.37500,362.59375 z " - id="path18848" /> - <path - sodipodi:type="inkscape:offset" - inkscape:radius="0.0000000" - inkscape:original="M 370.56250 305.90625 C 355.90456 305.38356 341.55481 308.54187 333.40625 315.62500 C 327.97388 320.34708 347.33067 340.30951 329.62500 358.15625 C 312.69793 375.21818 287.66656 347.56368 283.21875 354.84375 C 273.25755 371.14806 265.37524 399.59673 267.90625 419.25000 C 269.17176 429.07664 308.54541 414.73263 315.68750 440.15625 C 323.48351 467.90766 284.89523 475.15541 290.03125 485.43750 C 300.30331 506.00168 311.03251 519.94295 326.87500 536.84375 C 334.79624 545.29416 351.90911 508.22838 377.75000 529.43750 C 401.05114 548.56211 370.17897 574.05542 379.65625 579.75000 C 398.61081 591.13920 418.51671 599.28318 438.12500 603.31250 C 447.92915 605.32715 439.41058 564.23371 467.18750 561.43750 C 489.51695 559.18965 496.47318 597.74565 505.37500 595.15625 C 523.21009 589.96826 540.88473 571.83246 552.37500 559.75000 C 558.12014 553.70878 523.50061 541.31380 533.00000 519.28125 C 543.82177 494.18176 562.07926 511.83883 564.31250 503.56250 C 567.67279 491.10942 567.09229 482.38503 565.46875 464.25000 C 564.65698 455.18248 540.01389 464.92575 532.25000 442.96875 C 522.65141 415.82302 549.39077 413.22085 545.21875 404.56250 C 538.82970 391.27821 534.77490 386.96586 519.84375 371.59375 C 512.37815 363.90770 500.37158 387.44121 480.50000 372.06250 C 459.85357 356.08416 479.40003 342.40562 470.31250 336.03125 C 459.54164 328.47614 449.37353 322.48497 439.65625 321.37500 C 429.76884 320.24559 433.66906 341.25860 409.21875 337.34375 C 385.30054 333.51408 394.77072 309.66850 385.12500 307.65625 C 380.38656 306.66773 375.44848 306.08048 370.56250 305.90625 z M 404.37500 362.59375 C 442.37861 362.88532 485.68016 390.09716 503.87500 422.56250 C 524.74616 459.80323 517.44770 509.29724 480.65625 524.43750 C 443.92960 539.55112 390.71795 510.29037 365.28125 466.06250 C 339.84455 421.83464 347.42926 373.16413 388.50000 364.18750 C 393.62397 363.06758 398.94591 362.55210 404.37500 362.59375 z " - xlink:href="#path4825" - style="fill:#564ce2;fill-opacity:0.72192514;stroke:#000000;stroke-width:1.7207220;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - id="path18849" - inkscape:href="#path4825" - d="M 370.56250,305.90625 C 355.90456,305.38356 341.55481,308.54187 333.40625,315.62500 C 327.97388,320.34708 347.33067,340.30951 329.62500,358.15625 C 312.69793,375.21818 287.66656,347.56368 283.21875,354.84375 C 273.25755,371.14806 265.37524,399.59673 267.90625,419.25000 C 269.17176,429.07664 308.54541,414.73263 315.68750,440.15625 C 323.48351,467.90766 284.89523,475.15541 290.03125,485.43750 C 300.30331,506.00168 311.03251,519.94295 326.87500,536.84375 C 334.79624,545.29416 351.90911,508.22838 377.75000,529.43750 C 401.05114,548.56211 370.17897,574.05542 379.65625,579.75000 C 398.61081,591.13920 418.51671,599.28318 438.12500,603.31250 C 447.92915,605.32715 439.41058,564.23371 467.18750,561.43750 C 489.51695,559.18965 496.47318,597.74565 505.37500,595.15625 C 523.21009,589.96826 540.88473,571.83246 552.37500,559.75000 C 558.12014,553.70878 523.50061,541.31380 533.00000,519.28125 C 543.82177,494.18176 562.07926,511.83883 564.31250,503.56250 C 567.67279,491.10942 567.09229,482.38503 565.46875,464.25000 C 564.65698,455.18248 540.01389,464.92575 532.25000,442.96875 C 522.65141,415.82302 549.39077,413.22085 545.21875,404.56250 C 538.82970,391.27821 534.77490,386.96586 519.84375,371.59375 C 512.37815,363.90770 500.37158,387.44121 480.50000,372.06250 C 459.85357,356.08416 479.40003,342.40562 470.31250,336.03125 C 459.54164,328.47614 449.37353,322.48497 439.65625,321.37500 C 429.76884,320.24559 433.66906,341.25860 409.21875,337.34375 C 385.30054,333.51408 394.77072,309.66850 385.12500,307.65625 C 380.38656,306.66773 375.44848,306.08048 370.56250,305.90625 z M 404.37500,362.59375 C 442.37861,362.88532 485.68016,390.09716 503.87500,422.56250 C 524.74616,459.80323 517.44770,509.29724 480.65625,524.43750 C 443.92960,539.55112 390.71795,510.29037 365.28125,466.06250 C 339.84455,421.83464 347.42926,373.16413 388.50000,364.18750 C 393.62397,363.06758 398.94591,362.55210 404.37500,362.59375 z " /> - <path - style="fill:url(#radialGradient18858);fill-opacity:1.0000000;stroke:#000000;stroke-width:1.7138077;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 380.12958,297.43595 C 365.86249,296.90326 351.89541,300.12208 343.96414,307.34090 C 338.67664,312.15342 357.51725,332.49828 340.28372,350.68690 C 323.80802,368.07567 299.44415,339.89140 295.11493,347.31096 C 285.41937,363.92759 277.74725,392.92123 280.21077,412.95101 C 281.44254,422.96589 319.76626,408.34710 326.71788,434.25775 C 334.30601,462.54078 296.74672,469.92735 301.74578,480.40644 C 311.74392,501.36456 322.18703,515.57289 337.60706,532.79745 C 345.31706,541.40974 361.97361,503.63391 387.12541,525.24932 C 409.80520,544.74031 379.75628,570.72197 388.98084,576.52564 C 407.42996,588.13303 426.80503,596.43301 445.89044,600.53952 C 455.43316,602.59276 447.14175,560.71211 474.17796,557.86234 C 495.91199,555.57142 502.68271,594.86602 511.34716,592.22703 C 528.70666,586.93964 545.90998,568.45644 557.09385,556.14252 C 562.68579,549.98555 528.98942,537.35313 538.23552,514.89853 C 548.76870,489.31821 566.53935,507.31354 568.71302,498.87865 C 571.98372,486.18700 571.41869,477.29549 569.83844,458.81305 C 569.04832,449.57183 545.06237,459.50174 537.50550,437.12411 C 528.16288,409.45836 554.18920,406.80636 550.12843,397.98214 C 543.90974,384.44336 539.96307,380.04841 525.43007,364.38181 C 518.16357,356.54852 506.47716,380.53287 487.13549,364.85955 C 467.03960,348.57510 486.06484,334.63454 477.21964,328.13807 C 466.73600,320.43822 456.83902,314.33228 447.38086,313.20105 C 437.75712,312.05000 441.55333,333.46555 417.75501,329.47570 C 394.47461,325.57267 403.69226,301.27029 394.30375,299.21948 C 389.69169,298.21202 384.88527,297.61353 380.12958,297.43595 z M 413.04042,355.20943 C 450.03063,355.50656 492.17750,383.23969 509.88715,416.32696 C 530.20177,454.28108 523.09793,504.72324 487.28757,520.15355 C 451.54027,535.55668 399.74756,505.73540 374.98916,460.66029 C 350.23075,415.58516 357.61321,365.98228 397.58875,356.83369 C 402.57609,355.69231 407.75611,355.16696 413.04042,355.20943 z " - id="path18850" /> - <path - style="fill:#638ae3;fill-opacity:0.53475934;fill-rule:evenodd;stroke:#000000;stroke-width:1.4624690;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none;" - d="M 378.47470,577.81411 C 378.41896,575.30523 385.62077,574.05338 386.68118,574.84545 C 392.70466,579.95068 411.44551,591.58986 446.56562,600.64064 C 442.79559,602.09376 444.73008,602.27386 440.53021,603.54017 C 428.20303,603.58564 387.98723,587.44481 378.47470,577.81411 z " - id="path18851" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#5492d5;fill-opacity:0.33155081;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 448.70315,329.05232 C 414.82014,343.52661 440.80808,340.23700 445.08458,347.80311 C 449.36107,355.36922 485.87577,370.17247 493.44188,381.68612 C 501.00799,393.19976 515.81124,405.70029 519.75878,420.50355 C 523.70631,435.30680 522.71943,465.90020 531.60138,459.97890 C 540.48334,454.05759 519.10086,423.13524 523.04839,401.75275 C 526.99593,380.37027 513.50852,380.04131 495.41565,372.47520 C 477.32278,364.90909 451.99276,352.73753 453.30861,343.52661 C 454.62445,334.31570 448.70315,329.05232 448.70315,329.05232 z " - id="path18852" /> - <path - style="fill:url(#radialGradient18859);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 539.43027,532.41062 C 539.43027,539.40171 544.55840,574.25612 534.48034,574.25612 C 524.40229,574.25612 475.43149,576.39300 475.43149,569.40191 C 475.43149,562.41083 493.88434,522.82888 503.96239,522.82888 C 514.04045,522.82888 539.43027,525.41954 539.43027,532.41062 z " - id="path18853" - sodipodi:nodetypes="ccccc" - transform="matrix(0.624661,0.780896,-0.780896,0.624661,623.2822,-194.2138)" /> - <path - style="fill:url(#radialGradient18860);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 466.62375,572.09687 C 466.62375,583.75974 447.16650,585.70506 438.72273,585.70506 C 430.27895,585.70506 413.31825,581.76117 413.31825,570.09830 C 389.07901,512.80764 422.08743,519.04264 443.58671,522.23015 C 466.15531,533.76777 473.08623,541.59775 466.62375,572.09687 z " - id="path18854" - sodipodi:nodetypes="ccccc" - transform="matrix(0.943927,0.330155,-0.357257,1.021414,211.1143,-156.7594)" /> - <path - style="fill:#85c8ef;fill-opacity:0.14973260;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 317.44761,367.86974 C 306.92085,392.21288 316.46073,375.43585 330.93502,419.84562 C 345.40932,464.25539 329.61918,472.47942 364.81803,490.57229 C 400.01688,508.66516 393.76662,527.74491 425.01794,529.38972 C 456.26926,531.03453 452.32172,552.41701 489.16538,535.63998 C 526.00904,518.86296 555.28660,489.58540 552.98387,468.53188 C 551.01010,445.17564 536.20685,486.95372 518.44293,505.37555 C 491.79707,525.44218 455.94030,534.65310 426.33378,523.13946 C 396.72727,511.62581 379.62129,494.51983 369.75245,468.20293 C 359.88361,441.88603 345.40932,410.96367 352.97542,395.17353 C 360.54153,379.38339 362.51530,363.59325 384.88467,350.76376 C 407.25403,337.93427 404.62234,323.78894 385.21362,317.86763 C 365.80491,311.94633 372.05518,319.18348 355.93608,344.51350 C 339.81697,369.84351 325.34268,350.76375 317.44761,367.86974 z " - id="path18855" - sodipodi:nodetypes="cccccccccccccc" /> - <path - style="fill:#2d84e6;fill-opacity:0.54901963;fill-rule:evenodd;stroke:#000000;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 331.84343,317.12090 C 338.32897,332.25383 340.76105,348.73791 330.76251,355.22345 C 355.62374,348.46767 345.62521,323.87668 342.11221,308.47352 C 331.84343,311.44606 331.84343,318.47205 331.84343,317.12090 z " - id="path18856" - sodipodi:nodetypes="cccc" /> - <path - style="fill:#5d9ee5;fill-opacity:0.52406418;fill-rule:evenodd;stroke:#000000;stroke-width:1.4856828;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;stroke-dasharray:none;" - d="M 283.74235,353.60207 C 288.60651,349.54860 289.97177,347.25710 296.99777,346.17618 C 286.11578,356.48311 275.09497,401.43291 281.04004,416.29561 C 297.09769,420.10660 314.81889,411.16122 326.43882,432.77969 C 330.49228,463.58600 308.60359,464.93716 301.30736,477.36777 C 302.92874,491.14954 322.11512,518.71309 339.40990,534.92693 C 331.84343,540.87202 331.03274,536.27809 328.60066,537.35902 C 316.44028,525.73909 295.09205,498.71601 290.22789,482.77239 C 296.17296,468.72039 317.25097,469.53108 317.25097,443.04846 C 311.84635,416.56584 287.25535,425.75368 269.96058,421.97046 C 262.93457,407.37799 276.44612,368.19453 283.74235,353.60207 z " - id="path18857" - sodipodi:nodetypes="ccccccccccc" /> - </g> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.75000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;stroke-dasharray:none;" - d="M 1096.1335,265.00825 C 1097.8662,263.08147 1099.1364,262.96609 1098.5538,259.67332" - id="path15678" - sodipodi:nodetypes="cc" /> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.75000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 1136.7700,284.65630 C 1137.4282,281.96202 1136.3959,280.92564 1139.1903,279.32137" - id="path15679" - sodipodi:nodetypes="cc" /> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.75000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 1273.0783,233.38717 C 1274.1970,231.46039 1274.2392,232.11251 1273.9636,230.20124" - id="path15680" - sodipodi:nodetypes="cc" /> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.75000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 1216.7437,199.61709 C 1216.4809,197.38330 1215.6021,197.11442 1215.4800,195.20316" - id="path15681" - sodipodi:nodetypes="cc" /> - <g - id="Flower2-2Pestils"> - <path - style="fill:#69bd2c;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - id="path13133" - d="M 1154.4277,252.78674 C 1162.8993,243.88809 1172.2735,228.77012 1178.0553,217.63868 C 1189.9362,194.40642 1190.0200,165.76692 1191.2441,140.17049 C 1191.7851,121.40427 1193.9977,102.91415 1193.2265,84.129869 L 1199.0920,82.754503 C 1199.1619,101.78871 1196.6113,120.73486 1195.8456,139.73994 C 1194.4414,165.88091 1194.9026,193.69601 1183.9552,217.96036 C 1178.2546,229.84365 1169.0161,244.54165 1162.2949,255.74981 L 1154.4277,252.78674 z " - sodipodi:nodetypes="ccccccccc" /> - <path - style="fill:#479e35;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - id="path13134" - d="M 1177.5335,260.88068 C 1183.2699,245.61539 1196.1282,217.54204 1201.5671,202.16328 C 1210.2572,179.25574 1216.1572,155.59101 1219.2041,131.30987 C 1219.3416,129.99117 1219.4791,128.67247 1219.6166,127.35377 L 1227.4380,126.86311 C 1227.2147,128.20234 1226.9915,129.54157 1226.7682,130.88080 C 1222.7949,155.20619 1216.5626,178.98478 1209.7507,202.66228 C 1205.2636,218.00649 1188.1060,246.46598 1186.4680,262.59187 L 1177.5335,260.88068 z " - sodipodi:nodetypes="ccccccccc" /> - <path - style="fill:#82a335;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - id="path13135" - d="M 1198.5919,264.88318 C 1208.2251,250.58402 1220.8793,218.06577 1229.5456,203.23101 C 1236.8545,193.62761 1244.7962,184.40425 1253.1819,175.71051 L 1260.4413,178.57275 C 1252.4554,187.07176 1245.4445,196.36443 1238.1475,205.44239 C 1228.3107,218.94669 1214.9223,250.25842 1208.8057,265.76135 L 1198.5919,264.88318 z " - sodipodi:nodetypes="ccccccc" /> - </g> - <path - style="fill:url(#linearGradient12493);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 1109.8468,293.73441 C 1131.6710,314.51247 1127.9231,320.74742 1137.4688,347.56312 C 1139.9727,354.59723 1146.5927,367.65837 1152.8116,374.43289 C 1159.0305,381.20737 1161.5022,380.20681 1163.4146,375.67148 C 1165.3270,371.13615 1162.0722,370.55364 1158.0626,361.02107 C 1154.0531,351.48851 1152.4482,348.06551 1151.8727,344.06613 C 1161.1716,339.34076 1194.0844,322.85845 1197.2329,315.03905 C 1210.4206,287.31591 1174.3763,292.88537 1158.1363,287.70067 C 1141.8963,282.51592 1109.8468,293.73441 1109.8468,293.73441 z " - id="Flower2-2Transition" - sodipodi:nodetypes="csccccccc" /> - <g - id="Flower2-1Inner" - transform="matrix(0.812206,0.000000,0.000000,0.638130,755.1049,257.7198)"> - <path - style="fill:url(#linearGradient22796);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.20535541pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 274.61097,-66.937326 C 266.07083,-215.05391 246.78491,-219.47999 287.85388,-222.73005 C 328.92287,-225.98009 382.53679,-211.95450 378.62605,-181.39859 C 374.71529,-150.84269 332.66280,-145.00164 305.85227,-116.10201 C 279.04172,-87.202396 274.61097,-66.937326 274.61097,-66.937326 z " - id="path22789" /> - <path - style="fill:url(#linearGradient22797);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.77008289;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 271.17382,-66.474256 C 291.41712,-139.44487 328.09585,-191.27380 360.71030,-190.04826 C 393.32478,-188.82271 445.09192,-195.09454 450.19914,-172.95350 C 455.30633,-150.81247 452.61230,-101.98160 415.46714,-91.884636 C 378.32196,-81.787656 271.17382,-66.474256 271.17382,-66.474256 z " - id="path22790" /> - <path - style="fill:url(#linearGradient22798);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.77008289;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 269.07621,-86.463326 C 375.35919,-169.24437 429.08827,-195.24788 426.08390,-150.65540 C 423.07950,-106.06290 449.46829,-101.16004 425.28112,-79.680508 C 390.61348,-81.915599 325.44237,-38.493324 309.01305,-48.583714 C 292.58376,-58.674104 269.07621,-86.463326 269.07621,-86.463326 z " - id="path22791" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:url(#radialGradient22799);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.20535541pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 282.67875,-69.780336 C 274.96861,-197.98938 302.55261,-230.15415 258.00305,-212.21092 C 213.45349,-194.26768 155.11191,-160.24206 174.95117,-142.54429 C 194.79044,-124.84652 282.43542,-73.435316 282.43542,-73.435316" - id="path22792" /> - <path - style="fill:url(#linearGradient22800);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.20535541pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 284.67905,-71.981506 C 241.15347,-125.47323 194.97727,-144.36424 167.09341,-139.02714 C 139.20954,-133.69006 120.47986,-70.230626 142.21946,-63.676596 C 163.95907,-57.122576 181.96462,-22.319366 191.96607,-33.325246 C 201.96752,-44.331136 276.36792,-72.793496 276.36792,-72.793496" - id="path22793" /> - <path - style="fill:url(#linearGradient22801);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.86946380;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 318.63642,-42.271896 C 254.38296,-109.22740 167.74096,-107.00535 155.08504,-77.850036 C 142.42910,-48.694726 200.20530,-34.325536 239.61867,-17.755486 C 279.03202,-1.1854357 318.63642,-42.271896 318.63642,-42.271896 z " - id="path22794" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient22802);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.64277321;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 301.48024,-27.789386 C 411.03764,-112.56941 390.10354,-97.059886 364.25520,-109.85202 C 338.40681,-122.64414 326.34871,-114.07596 286.73054,-104.78959 C 247.11238,-95.503206 218.37600,-103.54253 235.71695,-66.848486 C 253.05788,-30.154446 301.48024,-27.789386 301.48024,-27.789386 z " - id="path22795" - sodipodi:nodetypes="ccccc" /> - </g> - <g - id="Flower2-1Petals" - transform="matrix(0.427857,-0.598088,0.893641,0.167574,403.5946,361.8838)"> - <path - style="fill:#5047dd;fill-opacity:0.84491980;stroke:#000000;stroke-width:1.7207220;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 370.56250,305.90625 C 355.90456,305.38356 341.55481,308.54187 333.40625,315.62500 C 327.97388,320.34708 347.33067,340.30951 329.62500,358.15625 C 312.69793,375.21818 287.66656,347.56368 283.21875,354.84375 C 273.25755,371.14806 265.37524,399.59673 267.90625,419.25000 C 269.17176,429.07664 308.54541,414.73263 315.68750,440.15625 C 323.48351,467.90766 284.89523,475.15541 290.03125,485.43750 C 300.30331,506.00168 311.03251,519.94295 326.87500,536.84375 C 334.79624,545.29416 351.90911,508.22838 377.75000,529.43750 C 401.05114,548.56211 370.17897,574.05542 379.65625,579.75000 C 398.61081,591.13920 418.51671,599.28318 438.12500,603.31250 C 447.92915,605.32715 439.41058,564.23371 467.18750,561.43750 C 489.51695,559.18965 496.47318,597.74565 505.37500,595.15625 C 523.21009,589.96826 540.88473,571.83246 552.37500,559.75000 C 558.12014,553.70878 523.50061,541.31380 533.00000,519.28125 C 543.82177,494.18176 562.07926,511.83883 564.31250,503.56250 C 567.67279,491.10942 567.09229,482.38503 565.46875,464.25000 C 564.65698,455.18248 540.01389,464.92575 532.25000,442.96875 C 522.65141,415.82302 549.39077,413.22085 545.21875,404.56250 C 538.82970,391.27821 534.77490,386.96586 519.84375,371.59375 C 512.37815,363.90770 500.37158,387.44121 480.50000,372.06250 C 459.85357,356.08416 479.40003,342.40562 470.31250,336.03125 C 459.54164,328.47614 449.37353,322.48497 439.65625,321.37500 C 429.76884,320.24559 433.66906,341.25860 409.21875,337.34375 C 385.30054,333.51408 394.77072,309.66850 385.12500,307.65625 C 380.38656,306.66773 375.44848,306.08048 370.56250,305.90625 z M 404.37500,362.59375 C 442.37861,362.88532 485.68016,390.09716 503.87500,422.56250 C 524.74616,459.80323 517.44770,509.29724 480.65625,524.43750 C 443.92960,539.55112 390.71795,510.29037 365.28125,466.06250 C 339.84455,421.83464 347.42926,373.16413 388.50000,364.18750 C 393.62397,363.06758 398.94591,362.55210 404.37500,362.59375 z " - id="path18834" /> - <path - sodipodi:type="inkscape:offset" - inkscape:radius="0.0000000" - inkscape:original="M 370.56250 305.90625 C 355.90456 305.38356 341.55481 308.54187 333.40625 315.62500 C 327.97388 320.34708 347.33067 340.30951 329.62500 358.15625 C 312.69793 375.21818 287.66656 347.56368 283.21875 354.84375 C 273.25755 371.14806 265.37524 399.59673 267.90625 419.25000 C 269.17176 429.07664 308.54541 414.73263 315.68750 440.15625 C 323.48351 467.90766 284.89523 475.15541 290.03125 485.43750 C 300.30331 506.00168 311.03251 519.94295 326.87500 536.84375 C 334.79624 545.29416 351.90911 508.22838 377.75000 529.43750 C 401.05114 548.56211 370.17897 574.05542 379.65625 579.75000 C 398.61081 591.13920 418.51671 599.28318 438.12500 603.31250 C 447.92915 605.32715 439.41058 564.23371 467.18750 561.43750 C 489.51695 559.18965 496.47318 597.74565 505.37500 595.15625 C 523.21009 589.96826 540.88473 571.83246 552.37500 559.75000 C 558.12014 553.70878 523.50061 541.31380 533.00000 519.28125 C 543.82177 494.18176 562.07926 511.83883 564.31250 503.56250 C 567.67279 491.10942 567.09229 482.38503 565.46875 464.25000 C 564.65698 455.18248 540.01389 464.92575 532.25000 442.96875 C 522.65141 415.82302 549.39077 413.22085 545.21875 404.56250 C 538.82970 391.27821 534.77490 386.96586 519.84375 371.59375 C 512.37815 363.90770 500.37158 387.44121 480.50000 372.06250 C 459.85357 356.08416 479.40003 342.40562 470.31250 336.03125 C 459.54164 328.47614 449.37353 322.48497 439.65625 321.37500 C 429.76884 320.24559 433.66906 341.25860 409.21875 337.34375 C 385.30054 333.51408 394.77072 309.66850 385.12500 307.65625 C 380.38656 306.66773 375.44848 306.08048 370.56250 305.90625 z M 404.37500 362.59375 C 442.37861 362.88532 485.68016 390.09716 503.87500 422.56250 C 524.74616 459.80323 517.44770 509.29724 480.65625 524.43750 C 443.92960 539.55112 390.71795 510.29037 365.28125 466.06250 C 339.84455 421.83464 347.42926 373.16413 388.50000 364.18750 C 393.62397 363.06758 398.94591 362.55210 404.37500 362.59375 z " - xlink:href="#path4825" - style="fill:#564ce2;fill-opacity:0.72192514;stroke:#000000;stroke-width:1.7207220;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - id="path18835" - inkscape:href="#path4825" - d="M 370.56250,305.90625 C 355.90456,305.38356 341.55481,308.54187 333.40625,315.62500 C 327.97388,320.34708 347.33067,340.30951 329.62500,358.15625 C 312.69793,375.21818 287.66656,347.56368 283.21875,354.84375 C 273.25755,371.14806 265.37524,399.59673 267.90625,419.25000 C 269.17176,429.07664 308.54541,414.73263 315.68750,440.15625 C 323.48351,467.90766 284.89523,475.15541 290.03125,485.43750 C 300.30331,506.00168 311.03251,519.94295 326.87500,536.84375 C 334.79624,545.29416 351.90911,508.22838 377.75000,529.43750 C 401.05114,548.56211 370.17897,574.05542 379.65625,579.75000 C 398.61081,591.13920 418.51671,599.28318 438.12500,603.31250 C 447.92915,605.32715 439.41058,564.23371 467.18750,561.43750 C 489.51695,559.18965 496.47318,597.74565 505.37500,595.15625 C 523.21009,589.96826 540.88473,571.83246 552.37500,559.75000 C 558.12014,553.70878 523.50061,541.31380 533.00000,519.28125 C 543.82177,494.18176 562.07926,511.83883 564.31250,503.56250 C 567.67279,491.10942 567.09229,482.38503 565.46875,464.25000 C 564.65698,455.18248 540.01389,464.92575 532.25000,442.96875 C 522.65141,415.82302 549.39077,413.22085 545.21875,404.56250 C 538.82970,391.27821 534.77490,386.96586 519.84375,371.59375 C 512.37815,363.90770 500.37158,387.44121 480.50000,372.06250 C 459.85357,356.08416 479.40003,342.40562 470.31250,336.03125 C 459.54164,328.47614 449.37353,322.48497 439.65625,321.37500 C 429.76884,320.24559 433.66906,341.25860 409.21875,337.34375 C 385.30054,333.51408 394.77072,309.66850 385.12500,307.65625 C 380.38656,306.66773 375.44848,306.08048 370.56250,305.90625 z M 404.37500,362.59375 C 442.37861,362.88532 485.68016,390.09716 503.87500,422.56250 C 524.74616,459.80323 517.44770,509.29724 480.65625,524.43750 C 443.92960,539.55112 390.71795,510.29037 365.28125,466.06250 C 339.84455,421.83464 347.42926,373.16413 388.50000,364.18750 C 393.62397,363.06758 398.94591,362.55210 404.37500,362.59375 z " /> - <path - style="fill:url(#radialGradient18844);fill-opacity:1.0000000;stroke:#000000;stroke-width:1.7138077;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 380.12958,297.43595 C 365.86249,296.90326 351.89541,300.12208 343.96414,307.34090 C 338.67664,312.15342 357.51725,332.49828 340.28372,350.68690 C 323.80802,368.07567 299.44415,339.89140 295.11493,347.31096 C 285.41937,363.92759 277.74725,392.92123 280.21077,412.95101 C 281.44254,422.96589 319.76626,408.34710 326.71788,434.25775 C 334.30601,462.54078 296.74672,469.92735 301.74578,480.40644 C 311.74392,501.36456 322.18703,515.57289 337.60706,532.79745 C 345.31706,541.40974 361.97361,503.63391 387.12541,525.24932 C 409.80520,544.74031 379.75628,570.72197 388.98084,576.52564 C 407.42996,588.13303 426.80503,596.43301 445.89044,600.53952 C 455.43316,602.59276 447.14175,560.71211 474.17796,557.86234 C 495.91199,555.57142 502.68271,594.86602 511.34716,592.22703 C 528.70666,586.93964 545.90998,568.45644 557.09385,556.14252 C 562.68579,549.98555 528.98942,537.35313 538.23552,514.89853 C 548.76870,489.31821 566.53935,507.31354 568.71302,498.87865 C 571.98372,486.18700 571.41869,477.29549 569.83844,458.81305 C 569.04832,449.57183 545.06237,459.50174 537.50550,437.12411 C 528.16288,409.45836 554.18920,406.80636 550.12843,397.98214 C 543.90974,384.44336 539.96307,380.04841 525.43007,364.38181 C 518.16357,356.54852 506.47716,380.53287 487.13549,364.85955 C 467.03960,348.57510 486.06484,334.63454 477.21964,328.13807 C 466.73600,320.43822 456.83902,314.33228 447.38086,313.20105 C 437.75712,312.05000 441.55333,333.46555 417.75501,329.47570 C 394.47461,325.57267 403.69226,301.27029 394.30375,299.21948 C 389.69169,298.21202 384.88527,297.61353 380.12958,297.43595 z M 413.04042,355.20943 C 450.03063,355.50656 492.17750,383.23969 509.88715,416.32696 C 530.20177,454.28108 523.09793,504.72324 487.28757,520.15355 C 451.54027,535.55668 399.74756,505.73540 374.98916,460.66029 C 350.23075,415.58516 357.61321,365.98228 397.58875,356.83369 C 402.57609,355.69231 407.75611,355.16696 413.04042,355.20943 z " - id="path18836" /> - <path - style="fill:#638ae3;fill-opacity:0.53475934;fill-rule:evenodd;stroke:#000000;stroke-width:1.7499997;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none;" - d="M 378.47470,577.81411 C 381.62759,574.99441 385.62077,574.05338 386.68118,574.84545 C 392.70466,579.95068 412.14182,591.15833 445.79306,600.64115 C 442.02303,602.09427 442.93405,602.39852 438.73418,603.66483 C 433.47080,603.33587 387.98723,587.44481 378.47470,577.81411 z " - id="path18837" - sodipodi:nodetypes="ccccc" /> - <path - style="fill:#5492d5;fill-opacity:0.33155081;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 448.70315,329.05232 C 414.82014,343.52661 440.80808,340.23700 445.08458,347.80311 C 449.36107,355.36922 485.87577,370.17247 493.44188,381.68612 C 501.00799,393.19976 515.81124,405.70029 519.75878,420.50355 C 523.70631,435.30680 522.71943,465.90020 531.60138,459.97890 C 540.48334,454.05759 519.10086,423.13524 523.04839,401.75275 C 526.99593,380.37027 513.50852,380.04131 495.41565,372.47520 C 477.32278,364.90909 451.99276,352.73753 453.30861,343.52661 C 454.62445,334.31570 448.70315,329.05232 448.70315,329.05232 z " - id="path18838" /> - <path - style="fill:url(#radialGradient18845);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 539.43027,532.41062 C 539.43027,539.40171 544.55840,574.25612 534.48034,574.25612 C 524.40229,574.25612 475.43149,576.39300 475.43149,569.40191 C 475.43149,562.41083 493.88434,522.82888 503.96239,522.82888 C 514.04045,522.82888 539.43027,525.41954 539.43027,532.41062 z " - id="path18839" - sodipodi:nodetypes="ccccc" - transform="matrix(0.624661,0.780896,-0.780896,0.624661,623.2822,-194.2138)" /> - <path - style="fill:url(#radialGradient18846);fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 466.62375,572.09687 C 466.62375,583.75974 447.16650,585.70506 438.72273,585.70506 C 430.27895,585.70506 413.31825,581.76117 413.31825,570.09830 C 389.07901,512.80764 422.08743,519.04264 443.58671,522.23015 C 466.15531,533.76777 473.08623,541.59775 466.62375,572.09687 z " - id="path18840" - sodipodi:nodetypes="ccccc" - transform="matrix(0.943927,0.330155,-0.357257,1.021414,211.1143,-156.7594)" /> - <path - style="fill:#85c8ef;fill-opacity:0.14973260;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 317.44761,367.86974 C 306.92085,392.21288 316.46073,375.43585 330.93502,419.84562 C 345.40932,464.25539 329.61918,472.47942 364.81803,490.57229 C 400.01688,508.66516 393.76662,527.74491 425.01794,529.38972 C 456.26926,531.03453 452.32172,552.41701 489.16538,535.63998 C 526.00904,518.86296 555.28660,489.58540 552.98387,468.53188 C 551.01010,445.17564 536.20685,486.95372 518.44293,505.37555 C 491.79707,525.44218 455.94030,534.65310 426.33378,523.13946 C 396.72727,511.62581 379.62129,494.51983 369.75245,468.20293 C 359.88361,441.88603 345.40932,410.96367 352.97542,395.17353 C 360.54153,379.38339 362.51530,363.59325 384.88467,350.76376 C 407.25403,337.93427 404.62234,323.78894 385.21362,317.86763 C 365.80491,311.94633 372.05518,319.18348 355.93608,344.51350 C 339.81697,369.84351 325.34268,350.76375 317.44761,367.86974 z " - id="path18841" - sodipodi:nodetypes="cccccccccccccc" /> - <path - style="fill:#5d9ee5;fill-opacity:0.52406418;fill-rule:evenodd;stroke:#000000;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 283.74235,353.60207 C 288.60651,349.54860 289.72783,347.75698 296.75383,346.67606 C 286.68068,357.78782 275.09497,401.43291 281.04004,416.29561 C 294.82181,422.78115 314.81889,411.16122 326.43882,432.77969 C 330.49228,463.58600 308.60359,464.93716 301.30736,477.36777 C 302.92874,491.14954 322.11512,518.71309 339.40990,534.92693 C 331.84343,540.87202 331.39601,537.57465 328.96393,538.65558 C 316.80355,527.03565 295.09205,498.71601 290.22789,482.77239 C 296.17296,468.72039 317.25097,469.53108 317.25097,443.04846 C 311.84635,416.56584 287.25535,425.75368 269.96058,421.97046 C 262.93457,407.37799 271.84513,371.37772 283.74235,353.60207 z " - id="path18843" - sodipodi:nodetypes="ccccccccccc" /> - <path - style="fill:#2d84e6;fill-opacity:0.54901963;fill-rule:evenodd;stroke:#000000;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 331.84343,317.12090 C 338.32897,332.25383 340.76105,348.73791 330.76251,355.22345 C 355.62374,348.46767 345.62521,323.87668 342.11221,308.47352 C 331.84343,311.44606 331.84343,318.47205 331.84343,317.12090 z " - id="path18842" - sodipodi:nodetypes="cccc" /> - </g> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 895.07703,271.69924 C 898.03771,266.24195 896.32396,265.62493 896.04838,263.25316" - id="path15052" - sodipodi:nodetypes="cc" /> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 958.81024,269.50910 C 956.51458,264.92787 956.11491,263.43479 958.24849,260.84401" - id="path15053" - sodipodi:nodetypes="cc" /> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 1095.9133,109.84753 C 1095.5888,107.01842 1094.5321,108.37254 1094.2565,105.78175" - id="path15054" - sodipodi:nodetypes="cc" /> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 878.21292,156.49762 C 875.91725,152.79245 875.51759,152.83248 874.36595,149.14662" - id="path15055" - sodipodi:nodetypes="cc" /> - <path - style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 1002.3941,104.59119 C 998.12734,100.22897 1000.1369,102.67816 997.67113,99.868360" - id="path15056" - sodipodi:nodetypes="cc" /> - <g - id="Flower2-1Pestils"> - <path - style="fill:#45a703;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - id="path13122" - d="M 966.32939,193.47933 C 961.88588,173.35541 949.51470,154.50453 936.90393,137.61148 C 894.07552,88.478864 832.35796,56.737044 771.47244,35.692005 C 757.72544,31.498420 764.29610,33.349915 751.78324,30.057299 L 754.36486,25.748627 C 766.09294,30.553600 759.90793,27.991607 772.91277,33.451786 C 832.63859,58.885218 895.94836,86.699309 940.96999,134.72662 C 955.35925,152.79024 967.10055,171.00323 976.23252,192.24903 L 966.32939,193.47933 z " - sodipodi:nodetypes="ccccccccc" /> - <path - style="fill:#4c7229;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - id="path13123" - d="M 983.87462,191.09304 C 970.55670,173.78792 966.04080,145.04909 959.06360,123.49216 C 954.42897,100.15042 945.11151,77.049864 942.53257,53.319990 C 942.25253,49.639130 941.88082,45.988996 941.26701,42.351753 L 950.07750,40.063494 C 950.41409,43.809578 950.61381,47.564267 951.01580,51.304385 C 953.37274,74.980102 957.77282,98.569093 964.28262,121.44051 C 970.23301,140.12463 975.52790,166.67601 983.25276,179.86618 L 983.87462,191.09304 z " - sodipodi:nodetypes="ccccccccc" /> - <path - style="fill:#7cb806;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - id="path13128" - d="M 1000.0165,188.24982 C 997.67401,178.73766 997.80935,177.98518 995.91916,170.47693 C 994.44301,165.16183 991.37111,161.27505 987.18215,157.93360 C 968.55381,147.16517 947.68275,140.89125 927.33656,134.21834 C 888.45059,122.68301 850.63783,108.01804 812.43318,94.482803 C 810.27076,93.743550 808.10833,93.004297 805.94590,92.265044 L 809.29214,86.969255 C 811.39799,87.818265 813.50384,88.667275 815.60968,89.516285 C 853.05304,104.82207 891.32040,118.22519 930.23796,129.25688 C 951.48169,135.76796 973.47131,141.11613 993.40940,151.08743 C 999.16424,155.12223 1002.6528,160.71077 1004.4693,167.52816 C 1005.4455,171.37985 1008.1787,175.19838 1010.5553,186.49266 L 1000.0165,188.24982 z " - sodipodi:nodetypes="ccccccccccccc" /> - </g> - </g> - <g - id="layer1" - inkscape:label="Bird" - inkscape:groupmode="layer"> - <g - id="BackWing" - transform="matrix(0.958504,0.285077,-0.285077,0.958504,152.9519,-164.5305)"> - <path - style="fill:url(#linearGradient34091);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 616.40876,442.60376 C 585.14165,326.22063 611.19757,323.98726 616.65691,326.71693 C 633.72571,335.25133 666.28724,382.30290 670.00952,395.95125 C 673.73179,409.59959 664.30203,460.71883 664.30203,460.71883 L 616.40876,442.60376 z " - id="BackWingBase" - sodipodi:nodetypes="csccc" /> - <g - id="BackWingLongFeathers" - transform="matrix(0.642675,-0.578389,0.661057,0.500660,-82.45126,598.6676)"> - <path - style="fill:url(#linearGradient34092);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 677.75360,380.92767 C 722.37586,333.02415 744.86146,313.84053 750.53980,313.16678 C 756.21814,312.49303 716.19937,362.27979 708.40722,366.00757 C 700.61506,369.73535 677.75360,380.92767 677.75360,380.92767 z " - id="path33875" /> - <path - style="fill:url(#linearGradient34093);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 676.54161,389.55630 C 727.76478,340.74543 752.39042,320.45462 757.61082,318.95423 C 762.83123,317.45382 715.25875,367.15910 707.42399,371.65358 C 699.58922,376.14805 676.54161,389.55630 676.54161,389.55630 z " - id="path33876" /> - <path - style="fill:url(#linearGradient34094);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 678.53611,387.57209 C 726.40585,342.91359 750.18059,325.35299 755.89219,325.07885 C 761.60378,324.80470 718.19424,371.66444 710.15999,374.83696 C 702.12574,378.00948 678.53611,387.57209 678.53611,387.57209 z " - id="path33877" /> - <path - style="fill:url(#linearGradient34095);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 623.81780,446.88904 C 689.24049,444.48784 718.70794,446.78621 723.20393,450.31942 C 727.69991,453.85264 664.20641,460.83827 656.05704,457.97441 C 647.90766,455.11055 623.81780,446.88904 623.81780,446.88904 z " - id="path33878" /> - <path - style="fill:url(#linearGradient34096);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 629.44759,442.90897 C 694.75190,438.30008 724.28016,439.60213 728.89288,442.98153 C 733.50560,446.36091 670.28419,455.48648 662.04276,452.89944 C 653.80132,450.31238 629.44759,442.90897 629.44759,442.90897 z " - id="path33879" /> - <path - style="fill:url(#linearGradient34097);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 634.60405,456.24577 C 684.92857,452.38278 707.65374,454.02190 711.17581,457.45374 C 714.69786,460.88557 665.93745,469.28871 659.61433,466.60773 C 653.29121,463.92675 634.60405,456.24577 634.60405,456.24577 z " - id="path33880" /> - <path - style="fill:url(#linearGradient34098);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 653.08248,463.35514 C 687.75506,460.64601 703.55114,462.79967 706.12974,466.30511 C 708.70834,469.81056 675.30470,477.08671 670.81822,474.26686 C 666.33174,471.44700 653.08248,463.35514 653.08248,463.35514 z " - id="path33881" /> - <path - style="fill:url(#linearGradient34099);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 672.87844,391.66688 C 727.79561,349.07999 754.65164,332.79378 760.74578,333.03548 C 766.83992,333.27717 716.46264,378.59651 707.63757,381.19156 C 698.81250,383.78662 672.87844,391.66688 672.87844,391.66688 z " - id="path33882" /> - <path - style="fill:url(#linearGradient34100);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 668.95417,405.35129 C 724.45635,360.64669 751.57945,343.55855 757.71772,343.82092 C 763.85599,344.08330 712.91591,391.66711 704.01461,394.38381 C 695.11331,397.10050 668.95417,405.35129 668.95417,405.35129 z " - id="path33883" /> - <path - style="fill:url(#linearGradient34101);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 665.63994,415.43670 C 721.14212,370.73210 748.26522,353.64396 754.40349,353.90633 C 760.54176,354.16871 709.60168,401.75252 700.70038,404.46922 C 691.79908,407.18591 665.63994,415.43670 665.63994,415.43670 z " - id="path33884" /> - <path - style="fill:url(#linearGradient34102);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 664.60980,420.84491 C 720.11198,376.14031 747.23508,359.05217 753.37335,359.31454 C 759.51162,359.57692 708.57154,407.16073 699.67024,409.87743 C 690.76894,412.59412 664.60980,420.84491 664.60980,420.84491 z " - id="path33885" /> - <path - style="fill:url(#linearGradient34103);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 663.32213,426.51065 C 718.82431,381.80605 745.94741,364.71791 752.08568,364.98028 C 758.22395,365.24266 707.28387,412.82647 698.38257,415.54317 C 689.48127,418.25986 663.32213,426.51065 663.32213,426.51065 z " - id="path33886" /> - <path - style="fill:url(#linearGradient34104);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 661.26186,432.69145 C 716.76404,387.98685 743.88714,370.89871 750.02541,371.16108 C 756.16368,371.42346 705.22360,419.00727 696.32230,421.72397 C 687.42100,424.44066 661.26186,432.69145 661.26186,432.69145 z " - id="path33887" /> - <path - style="fill:url(#linearGradient34105);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 655.34683,430.74313 C 715.38299,392.34193 744.20412,378.30592 750.27742,379.23452 C 756.35071,380.16312 700.53634,421.92275 691.39232,423.65496 C 682.24831,425.38716 655.34683,430.74313 655.34683,430.74313 z " - id="path33888" /> - <path - style="fill:url(#linearGradient34106);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 651.61454,438.74758 C 711.84013,400.64414 740.73041,386.75103 746.79903,387.70969 C 752.86765,388.66835 696.84718,430.15109 687.69469,431.83799 C 678.54221,433.52488 651.61454,438.74758 651.61454,438.74758 z " - id="path33889" /> - <path - style="fill:url(#linearGradient34107);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 649.19925,446.06157 C 710.34387,409.45106 739.56715,396.27278 745.61035,397.38042 C 751.65356,398.48807 694.62966,438.58029 685.43845,440.04155 C 676.24724,441.50281 649.19925,446.06157 649.19925,446.06157 z " - id="path33890" /> - <path - style="fill:url(#linearGradient34108);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 656.63887,442.82942 C 713.54874,415.88969 740.18450,407.28373 745.19253,409.29279 C 750.20054,411.30186 696.34978,442.30658 688.32253,442.36066 C 680.29529,442.41472 656.63887,442.82942 656.63887,442.82942 z " - id="path33891" /> - <path - style="fill:url(#linearGradient34109);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 658.99673,442.25801 C 710.79935,424.33474 734.64485,419.91322 738.76587,422.67680 C 742.88689,425.44039 693.31806,447.86431 686.38542,446.67989 C 679.45280,445.49546 658.99673,442.25801 658.99673,442.25801 z " - id="path33892" /> - <path - style="fill:url(#linearGradient34110);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 657.46297,432.19015 C 708.16904,431.44160 730.85237,434.81269 734.16682,438.81875 C 737.48127,442.82482 688.05621,448.65877 681.88555,445.28178 C 675.71490,441.90479 657.46297,432.19015 657.46297,432.19015 z " - id="path33893" /> - </g> - <g - id="BackWingShortFeathers"> - <path - style="fill:url(#linearGradient34111);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 616.50953,416.08173 C 612.06946,406.87642 613.32566,402.90684 615.95141,403.00018 C 618.57716,403.09353 623.16087,402.80873 622.40138,405.85417 C 621.64189,408.89961 616.50953,416.08173 616.50953,416.08173 z " - id="path33917" /> - <path - style="fill:url(#linearGradient34112);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 606.60917,405.19134 C 602.16910,395.98603 603.42530,392.01645 606.05105,392.10979 C 608.67680,392.20314 613.26051,391.91834 612.50102,394.96378 C 611.74153,398.00922 606.60917,405.19134 606.60917,405.19134 z " - id="path33919" /> - <path - style="fill:url(#linearGradient34113);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 604.38159,397.02355 C 599.94152,387.81824 601.19772,383.84866 603.82347,383.94200 C 606.44922,384.03535 611.03293,383.75055 610.27344,386.79599 C 609.51395,389.84143 604.38159,397.02355 604.38159,397.02355 z " - id="path33921" /> - <path - style="fill:url(#linearGradient34114);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 609.23904,414.64465 C 604.79897,405.43934 606.05517,401.46976 608.68092,401.56310 C 611.30667,401.65645 615.89038,401.37165 615.13089,404.41709 C 614.37140,407.46253 609.23904,414.64465 609.23904,414.64465 z " - id="path33913" /> - <path - style="fill:url(#linearGradient34115);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 607.84672,397.27105 C 603.40665,388.06574 604.66285,384.09616 607.28860,384.18950 C 609.91435,384.28285 614.49806,383.99805 613.73857,387.04349 C 612.97908,390.08893 607.84672,397.27105 607.84672,397.27105 z " - id="path33923" /> - <path - style="fill:url(#linearGradient34116);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 613.78693,406.67639 C 609.34686,397.47108 610.60306,393.50150 613.22881,393.59484 C 615.85456,393.68819 620.43827,393.40339 619.67878,396.44883 C 618.91929,399.49427 613.78693,406.67639 613.78693,406.67639 z " - id="path33925" /> - <path - style="fill:url(#linearGradient34117);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 603.88657,389.10326 C 599.44650,379.89795 600.70270,375.92837 603.32845,376.02171 C 605.95420,376.11506 610.53791,375.83026 609.77842,378.87570 C 609.01893,381.92114 603.88657,389.10326 603.88657,389.10326 z " - id="path33927" /> - <path - style="fill:url(#linearGradient34118);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 618.48960,419.79437 C 614.04953,410.58906 615.30573,406.61948 617.93148,406.71282 C 620.55723,406.80617 625.14094,406.52137 624.38145,409.56681 C 623.62196,412.61225 618.48960,419.79437 618.48960,419.79437 z " - id="path33929" /> - </g> - </g> - <path - style="fill:url(#radialGradient17610);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M 580.83968,395.97047 C 643.19962,312.61302 659.94642,299.14582 659.94642,299.14582 L 620.38528,421.64384 L 580.83968,395.97047 z " - id="path3512" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#radialGradient17607);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M 604.27141,399.29038 C 666.63135,315.93293 671.52619,313.26419 673.10645,313.00081 L 634.33544,434.18194 L 604.27141,399.29038 z " - id="path17606" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#radialGradient17609);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M 601.11089,431.42236 C 663.47083,348.06491 682.85140,333.28083 682.85140,333.28083 L 637.23259,453.40845 L 601.11089,431.42236 z " - id="path17608" - sodipodi:nodetypes="cccc" /> - <path - sodipodi:type="arc" - style="fill:url(#radialGradient18237);fill-opacity:1.0000000;stroke:none;stroke-width:1.8314677;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - id="BackWingHalo" - sodipodi:cx="663.84143" - sodipodi:cy="345.54175" - sodipodi:rx="12.247025" - sodipodi:ry="34.765747" - d="M 676.08846 345.54175 A 12.247025 34.765747 0 1 1 651.59441,345.54175 A 12.247025 34.765747 0 1 1 676.08846 345.54175 z" - transform="matrix(2.145401,-0.357956,0.671830,1.490337,-990.9290,63.71587)" /> - <path - sodipodi:type="arc" - style="fill:url(#radialGradient13930);fill-opacity:1.0000000;stroke:none;stroke-width:1.7500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:0.053475920" - id="HeadHalo" - sodipodi:cx="599.53973" - sodipodi:cy="448.49213" - sodipodi:rx="56.203156" - sodipodi:ry="49.103809" - d="M 655.74289 448.49213 A 56.203156 49.103809 0 1 1 543.33658,448.49213 A 56.203156 49.103809 0 1 1 655.74289 448.49213 z" - transform="matrix(1.223158,0.000000,0.000000,1.122892,-155.8000,-82.68502)" /> - <g - id="Birdie"> - <path - style="fill:#fffffa;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000058;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:0.053475935;stroke-miterlimit:4.0000000;stroke-dasharray:none;" - d="M 458.04332,450.93245 C 457.11280,449.75570 522.73441,425.23650 539.48624,420.36763 C 548.77715,409.20630 551.85467,402.90231 573.33202,396.55508 C 600.98541,391.35156 720.34010,482.39140 734.31938,508.36094 C 748.29866,534.33048 725.23285,559.53621 713.35046,557.24478 C 701.46807,554.95334 617.12218,521.03538 600.34705,506.52299 C 583.57191,492.01060 548.39498,425.86946 540.70637,429.68851 C 519.43019,425.30660 467.66168,451.33268 458.04332,450.93245 z " - id="bird_outline" - sodipodi:nodetypes="cccccccc" /> - <path - style="fill:#6c665e;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 680.50435,524.43517 C 690.31594,541.60546 697.67464,548.26333 708.18707,548.26333 C 718.69949,548.26333 723.60529,543.70795 719.04991,537.05008 C 714.49452,530.39221 706.78541,530.04180 708.53748,533.19552 C 710.28955,536.34925 715.54576,539.15256 711.69121,540.55422 C 707.83665,541.95588 698.37547,541.25505 696.62340,539.85339 C 694.87133,538.45174 689.26470,525.48641 686.81180,520.58061 C 684.35890,515.67481 680.50435,524.43517 680.50435,524.43517 z " - id="BirdFoot" /> - <path - style="fill:url(#linearGradient3567);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M 575.97381,396.37829 C 592.09877,396.47202 627.47152,418.31792 640.43902,428.60278 C 639.52405,436.38003 645.93825,483.25429 584.63524,487.14291 C 573.19469,471.12923 547.83846,424.28489 536.40133,429.54597 C 535.25762,422.68370 538.00254,427.25854 538.68876,421.76872 C 542.80613,414.44896 558.58937,397.06451 575.97381,396.37829 z " - id="head_base" - sodipodi:nodetypes="cccccc" /> - <path - style="fill:url(#linearGradient1698);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 538.87716,420.66535 C 504.44737,432.14539 487.71845,437.90912 457.83107,450.82288 C 462.50029,452.69317 521.25627,425.48052 540.61484,429.59789 C 541.30106,426.85298 541.98360,419.62956 538.87716,420.66535 z " - id="beak" - sodipodi:nodetypes="cccs" /> - <path - style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 541.15636,426.40968 C 497.42096,434.99068 496.59054,437.02059 490.13173,439.05050 C 477.58317,444.49436 458.66807,450.95317 458.66807,450.95317" - id="Lips" - sodipodi:nodetypes="ccc" /> - <path - style="fill:url(#linearGradient4193);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 637.96561,427.71688 C 633.84824,447.61748 621.27168,448.08438 626.08468,464.30800 C 630.89768,481.89894 620.70773,502.90478 635.57599,509.53832 C 650.44426,516.17185 694.96099,501.59903 708.21096,507.55488 C 718.72627,513.05496 724.88522,525.84659 731.51876,528.13402 C 738.15229,530.42144 737.69738,516.23855 733.35127,507.77507 C 730.60550,498.16703 691.26091,466.83015 683.71241,459.96787 C 674.56869,453.56137 640.25303,425.88694 637.96561,427.71688 z " - id="BackBase" - sodipodi:nodetypes="cccccccc" /> - <path - style="fill:url(#linearGradient4821);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 545.10678,429.15093 C 567.77430,416.54734 573.67730,432.85787 594.45586,443.23729 C 615.23441,453.61673 614.76216,437.55332 624.67921,438.29471 C 634.59624,439.03609 628.22099,445.95572 626.09592,454.11098 C 623.97084,462.26625 591.15017,479.07104 579.34417,477.09400 C 572.02445,470.17438 553.37099,441.26026 553.37099,441.26026" - id="ThroatBase" - sodipodi:nodetypes="cccccc" /> - <path - style="fill:url(#linearGradient18130);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 573.63547,411.66502 C 585.45813,405.99015 592.78818,408.35468 593.49754,410.00985 C 594.20690,411.66502 587.58621,417.57635 585.45813,418.75862 C 583.33005,419.94089 577.65517,421.12315 575.52709,418.75862 C 573.39902,416.39409 573.63547,411.66502 573.63547,411.66502 z " - id="EyeBase" /> - <path - sodipodi:type="arc" - style="fill:#000000;fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - id="EyeBall" - sodipodi:cx="573.63550" - sodipodi:cy="413.32019" - sodipodi:rx="4.0197043" - sodipodi:ry="3.5467980" - d="M 577.65520 413.32019 A 4.0197043 3.5467980 0 1 1 569.61579,413.32019 A 4.0197043 3.5467980 0 1 1 577.65520 413.32019 z" - transform="translate(4.256158,0.709360)" /> - <path - sodipodi:type="arc" - style="fill:#efefef;fill-opacity:1.0000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - id="EyeHighlight" - sodipodi:cx="579.19214" - sodipodi:cy="413.55664" - sodipodi:rx="1.3004926" - sodipodi:ry="0.94581282" - d="M 580.49263 413.55664 A 1.3004926 0.94581282 0 1 1 577.89165,413.55664 A 1.3004926 0.94581282 0 1 1 580.49263 413.55664 z" /> - <path - style="fill:url(#radialGradient14558);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 602.02453,503.98535 C 627.10889,527.64984 683.43037,547.76465 695.26261,548.00130 C 707.09485,548.23794 725.07986,552.26090 720.58361,543.97833 C 716.08736,535.69576 713.24762,528.35977 683.43037,515.81759 C 653.61312,503.27542 638.94113,521.26043 626.39896,514.16108 C 613.85678,507.06173 610.78039,495.70278 603.68105,498.77916 C 596.58170,501.85555 602.02453,503.98535 602.02453,503.98535 z " - id="BellyShadows" /> - <g - id="HeadFeathers"> - <path - style="fill:url(#linearGradient20129);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 619.06928,426.21244 C 624.93688,434.25311 627.38557,434.44975 630.19177,432.38664 C 632.99795,430.32353 633.28654,424.53756 630.81744,422.40292 C 628.34834,420.26826 619.06928,426.21244 619.06928,426.21244 z " - id="path20128" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20127);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 609.32433,418.31113 C 615.19193,426.35180 617.64062,426.54844 620.44682,424.48533 C 623.25300,422.42222 623.54159,416.63625 621.07249,414.50161 C 618.60339,412.36695 609.32433,418.31113 609.32433,418.31113 z " - id="path20126" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20121);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 594.04847,417.25762 C 599.91607,425.29829 602.36476,425.49493 605.17096,423.43182 C 607.97714,421.36871 608.26573,415.58274 605.79663,413.44810 C 603.32753,411.31344 594.04847,417.25762 594.04847,417.25762 z " - id="path20120" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20119);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 591.94145,407.24930 C 597.80905,415.28997 600.25774,415.48661 603.06394,413.42350 C 605.87012,411.36039 606.15871,405.57442 603.68961,403.43978 C 601.22051,401.30512 591.94145,407.24930 591.94145,407.24930 z " - id="path20118" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20117);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 583.77678,405.66904 C 589.64438,413.70971 592.09307,413.90635 594.89927,411.84324 C 597.70545,409.78013 597.99404,403.99416 595.52494,401.85952 C 593.05584,399.72486 583.77678,405.66904 583.77678,405.66904 z " - id="path20116" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20115);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 578.89127,396.14067 C 579.85107,406.04824 581.85900,407.46351 585.32454,407.11535 C 588.79006,406.76719 591.98262,401.93311 590.94325,398.83910 C 589.90389,395.74508 578.89127,396.14067 578.89127,396.14067 z " - id="path20114" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20113);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 589.83445,409.61969 C 595.70205,417.66036 598.15074,417.85700 600.95694,415.79389 C 603.76312,413.73078 604.05171,407.94481 601.58261,405.81017 C 599.11351,403.67551 589.83445,409.61969 589.83445,409.61969 z " - id="path20112" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20109);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 600.57062,411.91439 C 606.43822,419.95506 608.88691,420.15170 611.69311,418.08859 C 614.49929,416.02548 614.78788,410.23951 612.31878,408.10487 C 609.84968,405.97021 600.57062,411.91439 600.57062,411.91439 z " - id="path20108" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27960);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 575.40066,413.05206 C 583.27804,420.33590 586.12819,420.23921 589.07770,417.85627 C 592.02719,415.47335 591.55899,409.69423 588.41703,407.86916 C 585.27509,406.04408 575.40066,413.05206 575.40066,413.05206 z " - id="path27959" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27958);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 602.06821,445.72338 C 610.69260,450.69339 613.01062,449.88003 614.73894,446.85611 C 616.46725,443.83220 614.38445,438.42640 611.26179,437.47658 C 608.13913,436.52674 602.06821,445.72338 602.06821,445.72338 z " - id="path27957" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27956);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 604.64225,431.21588 C 609.91325,440.93036 612.74918,442.12250 616.46004,441.41538 C 620.17089,440.70826 621.67510,435.58577 619.20552,432.62938 C 616.73595,429.67296 604.64225,431.21588 604.64225,431.21588 z " - id="path27955" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27952);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 606.19966,426.80387 C 613.10419,434.36636 616.16890,434.64818 619.81382,432.88895 C 623.45873,431.12972 624.15695,425.87740 621.17905,423.83140 C 618.20115,421.78539 606.19966,426.80387 606.19966,426.80387 z " - id="path27951" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27950);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 605.21579,413.22219 C 610.41440,421.71074 612.83919,422.10463 615.80294,420.27504 C 618.76667,418.44546 619.52190,412.70174 617.23338,410.37454 C 614.94487,408.04733 605.21579,413.22219 605.21579,413.22219 z " - id="path27949" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27948);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 601.15198,423.90805 C 609.77637,428.87806 612.09439,428.06470 613.82271,425.04078 C 615.55102,422.01687 613.46822,416.61107 610.34556,415.66125 C 607.22290,414.71141 601.15198,423.90805 601.15198,423.90805 z " - id="path27947" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27944);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 599.58670,439.51959 C 608.21109,444.48960 610.52911,443.67624 612.25743,440.65232 C 613.98574,437.62841 611.90294,432.22261 608.78028,431.27279 C 605.65762,430.32295 599.58670,439.51959 599.58670,439.51959 z " - id="path27943" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27920);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 578.24566,405.02651 C 586.87005,409.99652 589.18807,409.18316 590.91639,406.15924 C 592.64470,403.13533 590.56190,397.72953 587.43924,396.77971 C 584.31658,395.82987 578.24566,405.02651 578.24566,405.02651 z " - id="path27919" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27942);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 593.63106,444.97892 C 602.25545,449.94893 604.57347,449.13557 606.30179,446.11165 C 608.03010,443.08774 605.94730,437.68194 602.82464,436.73212 C 599.70198,435.78228 593.63106,444.97892 593.63106,444.97892 z " - id="path27941" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27940);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 585.44205,439.76774 C 594.06644,444.73775 596.38446,443.92439 598.11278,440.90047 C 599.84109,437.87656 597.75829,432.47076 594.63563,431.52094 C 591.51297,430.57110 585.44205,439.76774 585.44205,439.76774 z " - id="path27939" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27938);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 591.95039,428.68065 C 596.95598,438.27479 599.61628,438.91292 603.07887,437.20592 C 606.54144,435.49892 607.90564,429.38465 605.57338,426.67808 C 603.24114,423.97147 591.95039,428.68065 591.95039,428.68065 z " - id="path27937" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27932);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 585.93835,408.00433 C 594.56274,412.97434 596.88076,412.16098 598.60908,409.13706 C 600.33739,406.11315 598.25459,400.70735 595.13193,399.75753 C 592.00927,398.80769 585.93835,408.00433 585.93835,408.00433 z " - id="path27931" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27930);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 588.91617,413.46366 C 597.54056,418.43367 599.85858,417.62031 601.58690,414.59639 C 603.31521,411.57248 601.23241,406.16668 598.10975,405.21686 C 594.98709,404.26702 588.91617,413.46366 588.91617,413.46366 z " - id="path27929" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27928);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 584.94575,422.14897 C 593.57014,427.11898 595.88816,426.30562 597.61648,423.28170 C 599.34479,420.25779 597.26199,414.85199 594.13933,413.90217 C 591.01667,412.95233 584.94575,422.14897 584.94575,422.14897 z " - id="path27927" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27926);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 583.20869,428.84907 C 591.83308,433.81908 594.15110,433.00572 595.87942,429.98180 C 597.60773,426.95789 595.52493,421.55209 592.40227,420.60227 C 589.27961,419.65243 583.20869,428.84907 583.20869,428.84907 z " - id="path27925" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27922);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 575.01968,426.11940 C 583.64407,431.08941 585.96209,430.27605 587.69041,427.25213 C 589.41872,424.22822 587.33592,418.82242 584.21326,417.87260 C 581.09060,416.92276 575.01968,426.11940 575.01968,426.11940 z " - id="path27921" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27924);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 579.73456,435.54916 C 588.35895,440.51917 590.67697,439.70581 592.40529,436.68189 C 594.13360,433.65798 592.05080,428.25218 588.92814,427.30236 C 585.80548,426.35252 579.73456,435.54916 579.73456,435.54916 z " - id="path27923" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27918);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 572.75291,424.44253 C 576.40857,433.70089 578.72900,434.50734 581.96403,433.21669 C 585.19904,431.92603 586.93419,426.39883 585.08163,423.71160 C 583.22909,421.02435 572.75291,424.44253 572.75291,424.44253 z " - id="path27917" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27916);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 564.44388,422.38247 C 571.28725,429.61084 573.74106,429.49419 576.26181,427.09065 C 578.78255,424.68712 578.33229,418.91148 575.61155,417.10850 C 572.89082,415.30550 564.44388,422.38247 564.44388,422.38247 z " - id="path27915" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27914);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 570.87014,404.61391 C 579.49453,409.58392 581.81255,408.77056 583.54087,405.74664 C 585.26918,402.72273 583.18638,397.31693 580.06372,396.36711 C 576.94106,395.41727 570.87014,404.61391 570.87014,404.61391 z " - id="path27913" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27912);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 563.60470,406.72531 C 573.96922,412.71065 576.75494,411.73113 578.83199,408.08945 C 580.90901,404.44778 578.40597,397.93763 574.65326,396.79377 C 570.90054,395.64989 563.60470,406.72531 563.60470,406.72531 z " - id="path27911" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27906);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 558.14537,424.38234 C 566.76976,429.35235 569.08778,428.53899 570.81610,425.51507 C 572.54441,422.49116 570.46161,417.08536 567.33895,416.13554 C 564.21629,415.18570 558.14537,424.38234 558.14537,424.38234 z " - id="path27905" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27908);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 560.35672,416.37979 C 568.98111,421.34980 571.29913,420.53644 573.02745,417.51252 C 574.75576,414.48861 572.67296,409.08281 569.55030,408.13299 C 566.42764,407.18315 560.35672,416.37979 560.35672,416.37979 z " - id="path27907" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27904);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 547.72300,424.38234 C 556.34739,429.35235 558.66541,428.53899 560.39373,425.51507 C 562.12204,422.49116 560.03924,417.08536 556.91658,416.13554 C 553.79392,415.18570 547.72300,424.38234 547.72300,424.38234 z " - id="path27903" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27902);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 551.44527,421.40452 C 560.06966,426.37453 562.38768,425.56117 564.11600,422.53725 C 565.84431,419.51334 563.76151,414.10754 560.63885,413.15772 C 557.51619,412.20788 551.44527,421.40452 551.44527,421.40452 z " - id="path27901" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27900);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 546.48224,415.20072 C 555.10663,420.17073 557.42465,419.35737 559.15297,416.33345 C 560.88128,413.30954 558.79848,407.90374 555.67582,406.95392 C 552.55316,406.00408 546.48224,415.20072 546.48224,415.20072 z " - id="path27899" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27274);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 539.10925,422.27894 C 547.73364,427.24895 550.05166,426.43559 551.77998,423.41167 C 553.50829,420.38776 551.42549,414.98196 548.30283,414.03214 C 545.18017,413.08230 539.10925,422.27894 539.10925,422.27894 z " - id="path27273" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27910);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 555.66385,410.73399 C 564.28824,415.70400 566.60626,414.89064 568.33458,411.86672 C 570.06289,408.84281 567.98009,403.43701 564.85743,402.48719 C 561.73477,401.53735 555.66385,410.73399 555.66385,410.73399 z " - id="path27909" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27934);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 596.51591,409.10108 C 601.83252,417.51623 604.26258,417.87623 607.20049,416.00544 C 610.13839,414.13466 610.81336,408.38095 608.49258,406.08594 C 606.17180,403.79090 596.51591,409.10108 596.51591,409.10108 z " - id="path27933" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27936);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 592.67727,416.77620 C 596.88740,427.85112 599.54918,428.81144 603.25504,427.25936 C 606.96088,425.70728 608.93844,419.08704 606.80910,415.87429 C 604.67977,412.66151 592.67727,416.77620 592.67727,416.77620 z " - id="path27935" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27946);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 600.96254,430.15152 C 609.58693,435.12153 611.90495,434.30817 613.63327,431.28425 C 615.36158,428.26034 613.27878,422.85454 610.15612,421.90472 C 607.03346,420.95488 600.96254,430.15152 600.96254,430.15152 z " - id="path27945" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27954);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 607.16920,418.74594 C 617.26123,426.12996 620.97418,426.06984 624.86792,423.72497 C 628.76166,421.38012 628.28213,415.59564 624.23255,413.73050 C 620.18296,411.86533 607.16920,418.74594 607.16920,418.74594 z " - id="path27953" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29221);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 616.09287,427.85620 C 615.34841,437.78227 617.08547,439.51933 620.55960,439.76748 C 624.03372,440.01563 628.00415,435.79705 627.50784,432.57108 C 627.01154,429.34511 616.09287,427.85620 616.09287,427.85620 z " - id="path29220" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient6864);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 538.44681,423.50496 C 543.71781,433.21944 546.55374,434.41158 550.26460,433.70446 C 553.97545,432.99734 555.47966,427.87485 553.01008,424.91846 C 550.54051,421.96204 538.44681,423.50496 538.44681,423.50496 z " - id="path6863" - sodipodi:nodetypes="cccc" /> - </g> - <g - id="NeckFeathers"> - <path - style="fill:url(#linearGradient20795);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 608.42083,447.63959 C 607.97867,457.58372 609.76777,459.26714 613.24784,459.40949 C 616.72790,459.55184 620.56816,455.21443 619.97395,452.00506 C 619.37974,448.79567 608.42083,447.63959 608.42083,447.63959 z " - id="path20794" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20793);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 581.29301,457.12117 C 580.85085,467.06530 582.63995,468.74872 586.12002,468.89107 C 589.60008,469.03342 593.44034,464.69601 592.84613,461.48664 C 592.25192,458.27725 581.29301,457.12117 581.29301,457.12117 z " - id="path20792" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20791);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 560.22286,436.57777 C 559.78070,446.52190 561.56980,448.20532 565.04987,448.34767 C 568.52993,448.49002 572.37019,444.15261 571.77598,440.94324 C 571.18177,437.73385 560.22286,436.57777 560.22286,436.57777 z " - id="path20790" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20789);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 596.83225,458.96480 C 596.39009,468.90893 598.17919,470.59235 601.65926,470.73470 C 605.13932,470.87705 608.97958,466.53964 608.38537,463.33027 C 607.79116,460.12088 596.83225,458.96480 596.83225,458.96480 z " - id="path20788" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20787);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 584.71691,446.05933 C 584.27475,456.00346 586.06385,457.68688 589.54392,457.82923 C 593.02398,457.97158 596.86424,453.63417 596.27003,450.42480 C 595.67582,447.21541 584.71691,446.05933 584.71691,446.05933 z " - id="path20786" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20785);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 573.39171,464.23234 C 572.94955,474.17647 574.73865,475.85989 578.21872,476.00224 C 581.69878,476.14459 585.53904,471.80718 584.94483,468.59781 C 584.35062,465.38842 573.39171,464.23234 573.39171,464.23234 z " - id="path20784" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20783);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 593.93511,438.68478 C 593.49295,448.62891 595.28205,450.31233 598.76212,450.45468 C 602.24218,450.59703 606.08244,446.25962 605.48823,443.05025 C 604.89402,439.84086 593.93511,438.68478 593.93511,438.68478 z " - id="path20782" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20781);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 572.86495,439.47491 C 572.42279,449.41904 574.21189,451.10246 577.69196,451.24481 C 581.17202,451.38716 585.01228,447.04975 584.41807,443.84038 C 583.82386,440.63099 572.86495,439.47491 572.86495,439.47491 z " - id="path20780" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20779);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 547.31740,427.09620 C 546.87524,437.04033 548.66434,438.72375 552.14441,438.86610 C 555.62447,439.00845 559.46473,434.67104 558.87052,431.46167 C 558.27631,428.25228 547.31740,427.09620 547.31740,427.09620 z " - id="path20777" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20776);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 540.14349,426.29449 C 544.73263,435.12744 547.12375,435.69078 550.20875,434.07402 C 553.29375,432.45727 554.45080,426.78083 552.33152,424.29854 C 550.21222,421.81623 540.14349,426.29449 540.14349,426.29449 z " - id="path20775" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20774);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 554.69195,437.36790 C 554.24979,447.31203 556.03889,448.99545 559.51896,449.13780 C 562.99902,449.28015 566.83928,444.94274 566.24507,441.73337 C 565.65086,438.52398 554.69195,437.36790 554.69195,437.36790 z " - id="path20773" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20772);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 564.17352,451.32687 C 563.73136,461.27100 565.52046,462.95442 569.00053,463.09677 C 572.48059,463.23912 576.32085,458.90171 575.72664,455.69234 C 575.13243,452.48295 564.17352,451.32687 564.17352,451.32687 z " - id="path20771" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20770);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 561.01299,446.32271 C 560.57083,456.26684 562.35993,457.95026 565.84000,458.09261 C 569.32006,458.23496 573.16032,453.89755 572.56611,450.68818 C 571.97190,447.47879 561.01299,446.32271 561.01299,446.32271 z " - id="path20769" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20766);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 568.12417,454.22402 C 567.68201,464.16815 569.47111,465.85157 572.95118,465.99392 C 576.43124,466.13627 580.27150,461.79886 579.67729,458.58949 C 579.08308,455.38010 568.12417,454.22402 568.12417,454.22402 z " - id="path20765" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20139);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 570.64822,460.80002 C 570.20606,470.74415 571.99516,472.42757 575.47523,472.56992 C 578.95529,472.71227 582.79555,468.37486 582.20134,465.16549 C 581.60713,461.95610 570.64822,460.80002 570.64822,460.80002 z " - id="path20138" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27208);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 555.92368,423.73900 C 555.17922,433.66507 556.91628,435.40213 560.39041,435.65028 C 563.86453,435.89843 567.83496,431.67985 567.33865,428.45388 C 566.84235,425.22791 555.92368,423.73900 555.92368,423.73900 z " - id="path27207" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27214);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 566.84235,425.22791 C 566.09789,435.15398 567.83495,436.89104 571.30908,437.13919 C 574.78320,437.38734 578.75363,433.16876 578.25732,429.94279 C 577.76102,426.71682 566.84235,425.22791 566.84235,425.22791 z " - id="path27213" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27224);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 573.54245,428.45389 C 572.79799,438.37996 574.53505,440.11702 578.00918,440.36517 C 581.48330,440.61332 585.45373,436.39474 584.95742,433.16877 C 584.46112,429.94280 573.54245,428.45389 573.54245,428.45389 z " - id="path27223" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27228);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 570.81278,441.35777 C 570.06832,451.28384 571.80538,453.02090 575.27951,453.26905 C 578.75363,453.51720 582.72406,449.29862 582.22775,446.07265 C 581.73145,442.84668 570.81278,441.35777 570.81278,441.35777 z " - id="path27227" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27234);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 573.54245,448.80232 C 572.79799,458.72839 574.53505,460.46545 578.00918,460.71360 C 581.48330,460.96175 585.45373,456.74317 584.95742,453.51720 C 584.46112,450.29123 573.54245,448.80232 573.54245,448.80232 z " - id="path27233" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27240);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 589.67231,440.36517 C 588.92785,450.29124 590.66491,452.02830 594.13904,452.27645 C 597.61316,452.52460 601.58359,448.30602 601.08728,445.08005 C 600.59098,441.85408 589.67231,440.36517 589.67231,440.36517 z " - id="path27239" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27254);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 585.95003,450.78754 C 585.20557,460.71361 586.94263,462.45067 590.41676,462.69882 C 593.89088,462.94697 597.86131,458.72839 597.36500,455.50242 C 596.86870,452.27645 585.95003,450.78754 585.95003,450.78754 z " - id="path27253" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27258);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 600.34283,442.84668 C 599.59837,452.77275 601.33543,454.50981 604.80956,454.75796 C 608.28368,455.00611 612.25411,450.78753 611.75780,447.56156 C 611.26150,444.33559 600.34283,442.84668 600.34283,442.84668 z " - id="path27257" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27206);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 549.47173,426.46867 C 548.72727,436.39474 550.46433,438.13180 553.93846,438.37995 C 557.41258,438.62810 561.38301,434.40952 560.88670,431.18355 C 560.39040,427.95758 549.47173,426.46867 549.47173,426.46867 z " - id="Feather" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27210);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 552.69771,433.41692 C 551.95325,443.34299 553.69031,445.08005 557.16444,445.32820 C 560.63856,445.57635 564.60899,441.35777 564.11268,438.13180 C 563.61638,434.90583 552.69771,433.41692 552.69771,433.41692 z " - id="path27209" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27212);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 561.13486,430.68725 C 560.39040,440.61332 562.12746,442.35038 565.60159,442.59853 C 569.07571,442.84668 573.04614,438.62810 572.54983,435.40213 C 572.05353,432.17616 561.13486,430.68725 561.13486,430.68725 z " - id="path27211" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27216);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 569.82017,433.91322 C 569.07571,443.83929 570.81277,445.57635 574.28690,445.82450 C 577.76102,446.07265 581.73145,441.85407 581.23514,438.62810 C 580.73884,435.40213 569.82017,433.91322 569.82017,433.91322 z " - id="path27215" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27218);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 561.63117,438.13180 C 560.88671,448.05787 562.62377,449.79493 566.09790,450.04308 C 569.57202,450.29123 573.54245,446.07265 573.04614,442.84668 C 572.54984,439.62071 561.63117,438.13180 561.63117,438.13180 z " - id="path27217" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27222);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 557.66074,442.59853 C 556.91628,452.52460 558.65334,454.26166 562.12747,454.50981 C 565.60159,454.75796 569.57202,450.53938 569.07571,447.31341 C 568.57941,444.08744 557.66074,442.59853 557.66074,442.59853 z " - id="path27221" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27226);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 575.52766,435.15398 C 574.78320,445.08005 576.52026,446.81711 579.99439,447.06526 C 583.46851,447.31341 587.43894,443.09483 586.94263,439.86886 C 586.44633,436.64289 575.52766,435.15398 575.52766,435.15398 z " - id="path27225" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27230);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 564.85714,445.57635 C 564.11268,455.50242 565.84974,457.23948 569.32387,457.48763 C 572.79799,457.73578 576.76842,453.51720 576.27211,450.29123 C 575.77581,447.06526 564.85714,445.57635 564.85714,445.57635 z " - id="path27229" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27232);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 567.09050,451.53199 C 566.34604,461.45806 568.08310,463.19512 571.55723,463.44327 C 575.03135,463.69142 579.00178,459.47284 578.50547,456.24687 C 578.00917,453.02090 567.09050,451.53199 567.09050,451.53199 z " - id="path27231" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27236);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 576.76842,443.83929 C 576.02396,453.76536 577.76102,455.50242 581.23515,455.75057 C 584.70927,455.99872 588.67970,451.78014 588.18339,448.55417 C 587.68709,445.32820 576.76842,443.83929 576.76842,443.83929 z " - id="path27235" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27238);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 582.22776,437.63550 C 581.48330,447.56157 583.22036,449.29863 586.69449,449.54678 C 590.16861,449.79493 594.13904,445.57635 593.64273,442.35038 C 593.14643,439.12441 582.22776,437.63550 582.22776,437.63550 z " - id="path27237" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27242);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 585.70188,444.58374 C 584.95742,454.50981 586.69448,456.24687 590.16861,456.49502 C 593.64273,456.74317 597.61316,452.52459 597.11685,449.29862 C 596.62055,446.07265 585.70188,444.58374 585.70188,444.58374 z " - id="path27241" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27244);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 577.51287,449.79493 C 576.76841,459.72100 578.50547,461.45806 581.97960,461.70621 C 585.45372,461.95436 589.42415,457.73578 588.92784,454.50981 C 588.43154,451.28384 577.51287,449.79493 577.51287,449.79493 z " - id="path27243" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27246);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 571.80539,455.99872 C 571.06093,465.92479 572.79799,467.66185 576.27212,467.91000 C 579.74624,468.15815 583.71667,463.93957 583.22036,460.71360 C 582.72406,457.48763 571.80539,455.99872 571.80539,455.99872 z " - id="path27245" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27248);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 575.77581,462.45066 C 575.03135,472.37673 576.76841,474.11379 580.24254,474.36194 C 583.71666,474.61009 587.68709,470.39151 587.19078,467.16554 C 586.69448,463.93957 575.77581,462.45066 575.77581,462.45066 z " - id="path27247" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27252);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 581.97960,456.74318 C 581.23514,466.66925 582.97220,468.40631 586.44633,468.65446 C 589.92045,468.90261 593.89088,464.68403 593.39457,461.45806 C 592.89827,458.23209 581.97960,456.74318 581.97960,456.74318 z " - id="path27251" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27256);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 591.65752,446.56896 C 590.91306,456.49503 592.65012,458.23209 596.12425,458.48024 C 599.59837,458.72839 603.56880,454.50981 603.07249,451.28384 C 602.57619,448.05787 591.65752,446.56896 591.65752,446.56896 z " - id="path27255" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27260);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 606.79477,442.59853 C 606.05031,452.52460 607.78737,454.26166 611.26150,454.50981 C 614.73562,454.75796 618.70605,450.53938 618.20974,447.31341 C 617.71344,444.08744 606.79477,442.59853 606.79477,442.59853 z " - id="path27259" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27262);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 595.08761,449.33831 C 594.34315,459.26438 596.08021,461.00144 599.55434,461.24959 C 603.02846,461.49774 606.99889,457.27916 606.50258,454.05319 C 606.00628,450.82722 595.08761,449.33831 595.08761,449.33831 z " - id="path27261" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27264);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 588.43889,457.45094 C 587.69443,467.37701 589.43149,469.11407 592.90562,469.36222 C 596.37974,469.61037 600.35017,465.39179 599.85386,462.16582 C 599.35756,458.93985 588.43889,457.45094 588.43889,457.45094 z " - id="path27263" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27266);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 587.17313,468.56341 C 586.42867,478.48948 588.16573,480.22654 591.63986,480.47469 C 595.11398,480.72284 599.08441,476.50426 598.58810,473.27829 C 598.09180,470.05232 587.17313,468.56341 587.17313,468.56341 z " - id="path27265" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27268);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 577.05326,468.12146 C 576.30880,478.04753 578.04586,479.78459 581.51999,480.03274 C 584.99411,480.28089 588.96454,476.06231 588.46823,472.83634 C 587.97193,469.61037 577.05326,468.12146 577.05326,468.12146 z " - id="path27267" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient27272);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 609.30853,437.08621 C 611.73957,446.73873 613.93661,447.83771 617.31107,446.97507 C 620.68553,446.11243 623.11905,440.85518 621.62855,437.95146 C 620.13806,435.04773 609.30853,437.08621 609.30853,437.08621 z " - id="path27271" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29213);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 582.49585,474.99422 C 581.75139,484.92029 583.48845,486.65735 586.96258,486.90550 C 590.43670,487.15365 594.40713,482.93507 593.91082,479.70910 C 593.41452,476.48313 582.49585,474.99422 582.49585,474.99422 z " - id="path28584" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29217);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 593.09871,463.62488 C 592.35425,473.55095 594.09131,475.28801 597.56544,475.53616 C 601.03956,475.78431 605.00999,471.56573 604.51368,468.33976 C 604.01738,465.11379 593.09871,463.62488 593.09871,463.62488 z " - id="path29216" - sodipodi:nodetypes="cccc" /> - </g> - <g - id="BellyFeathers"> - <path - style="fill:url(#linearGradient21547);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 632.51863,519.20390 C 631.77417,529.12997 633.51123,530.86703 636.98536,531.11518 C 640.45948,531.36333 644.42991,527.14475 643.93360,523.91878 C 643.43730,520.69281 632.51863,519.20390 632.51863,519.20390 z " - id="path21546" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21545);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 688.88128,542.38106 C 688.13682,552.30713 689.87388,554.04419 693.34801,554.29234 C 696.82213,554.54049 700.79256,550.32191 700.29625,547.09594 C 699.79995,543.86997 688.88128,542.38106 688.88128,542.38106 z " - id="path21544" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21543);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 714.69221,553.70627 C 713.94775,563.63234 715.68481,565.36940 719.15894,565.61755 C 722.63306,565.86570 726.60349,561.64712 726.10718,558.42115 C 725.61088,555.19518 714.69221,553.70627 714.69221,553.70627 z " - id="path21542" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21541);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 706.79091,549.75562 C 706.04645,559.68169 707.78351,561.41875 711.25764,561.66690 C 714.73176,561.91505 718.70219,557.69647 718.20588,554.47050 C 717.70958,551.24453 706.79091,549.75562 706.79091,549.75562 z " - id="path21540" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21539);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 723.38365,523.68130 C 722.63919,533.60737 724.37625,535.34443 727.85038,535.59258 C 731.32450,535.84073 735.29493,531.62215 734.79862,528.39618 C 734.30232,525.17021 723.38365,523.68130 723.38365,523.68130 z " - id="path21538" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21535);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 629.35810,456.52020 C 628.61364,466.44627 630.35070,468.18333 633.82483,468.43148 C 637.29895,468.67963 641.26938,464.46105 640.77307,461.23508 C 640.27677,458.00911 629.35810,456.52020 629.35810,456.52020 z " - id="path21534" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21533);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 713.90208,497.34362 C 713.15762,507.26969 714.89468,509.00675 718.36881,509.25490 C 721.84293,509.50305 725.81336,505.28447 725.31705,502.05850 C 724.82075,498.83253 713.90208,497.34362 713.90208,497.34362 z " - id="path21532" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21531);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 695.72908,480.22412 C 694.98462,490.15019 696.72168,491.88725 700.19581,492.13540 C 703.66993,492.38355 707.64036,488.16497 707.14405,484.93900 C 706.64775,481.71303 695.72908,480.22412 695.72908,480.22412 z " - id="path21530" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21529);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 709.16130,520.25741 C 708.41684,530.18348 710.15390,531.92054 713.62803,532.16869 C 717.10215,532.41684 721.07258,528.19826 720.57627,524.97229 C 720.07997,521.74632 709.16130,520.25741 709.16130,520.25741 z " - id="path21528" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21527);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 703.36701,516.57013 C 702.62255,526.49620 704.35961,528.23326 707.83374,528.48141 C 711.30786,528.72956 715.27829,524.51098 714.78198,521.28501 C 714.28568,518.05904 703.36701,516.57013 703.36701,516.57013 z " - id="path21526" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21525);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 690.19816,523.41793 C 689.45370,533.34400 691.19076,535.08106 694.66489,535.32921 C 698.13901,535.57736 702.10944,531.35878 701.61313,528.13281 C 701.11683,524.90684 690.19816,523.41793 690.19816,523.41793 z " - id="path21524" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21523);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 688.61790,512.09272 C 687.87344,522.01879 689.61050,523.75585 693.08463,524.00400 C 696.55875,524.25215 700.52918,520.03357 700.03287,516.80760 C 699.53657,513.58163 688.61790,512.09272 688.61790,512.09272 z " - id="path21522" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21521);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 675.18568,507.08856 C 674.44122,517.01463 676.17828,518.75169 679.65241,518.99984 C 683.12653,519.24799 687.09696,515.02941 686.60065,511.80344 C 686.10435,508.57747 675.18568,507.08856 675.18568,507.08856 z " - id="path21520" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21519);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 654.11553,508.40545 C 653.37107,518.33152 655.10813,520.06858 658.58226,520.31673 C 662.05638,520.56488 666.02681,516.34630 665.53050,513.12033 C 665.03420,509.89436 654.11553,508.40545 654.11553,508.40545 z " - id="path21518" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21517);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 634.62564,504.71817 C 633.88118,514.64424 635.61824,516.38130 639.09237,516.62945 C 642.56649,516.87760 646.53692,512.65902 646.04061,509.43305 C 645.54431,506.20708 634.62564,504.71817 634.62564,504.71817 z " - id="path21516" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21515);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 625.67083,503.13791 C 624.92637,513.06398 626.66343,514.80104 630.13756,515.04919 C 633.61168,515.29734 637.58211,511.07876 637.08580,507.85279 C 636.58950,504.62682 625.67083,503.13791 625.67083,503.13791 z " - id="path21514" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21513);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 614.08225,511.56597 C 613.33779,521.49204 615.07485,523.22910 618.54898,523.47725 C 622.02310,523.72540 625.99353,519.50682 625.49722,516.28085 C 625.00092,513.05488 614.08225,511.56597 614.08225,511.56597 z " - id="path21512" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21511);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 620.13991,514.46311 C 619.39545,524.38918 621.13251,526.12624 624.60664,526.37439 C 628.08076,526.62254 632.05119,522.40396 631.55488,519.17799 C 631.05858,515.95202 620.13991,514.46311 620.13991,514.46311 z " - id="path21510" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21509);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 629.09473,518.15039 C 628.35027,528.07646 630.08733,529.81352 633.56146,530.06167 C 637.03558,530.30982 641.00601,526.09124 640.50970,522.86527 C 640.01340,519.63930 629.09473,518.15039 629.09473,518.15039 z " - id="path21508" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21507);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 638.57630,521.83767 C 637.83184,531.76374 639.56890,533.50080 643.04303,533.74895 C 646.51715,533.99710 650.48758,529.77852 649.99127,526.55255 C 649.49497,523.32658 638.57630,521.83767 638.57630,521.83767 z " - id="path21506" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21505);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 672.55191,533.42625 C 671.80745,543.35232 673.54451,545.08938 677.01864,545.33753 C 680.49276,545.58568 684.46319,541.36710 683.96688,538.14113 C 683.47058,534.91516 672.55191,533.42625 672.55191,533.42625 z " - id="path21504" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21503);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 664.12385,533.95300 C 663.37939,543.87907 665.11645,545.61613 668.59058,545.86428 C 672.06470,546.11243 676.03513,541.89385 675.53882,538.66788 C 675.04252,535.44191 664.12385,533.95300 664.12385,533.95300 z " - id="path21502" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21501);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 696.51921,545.27821 C 695.77475,555.20428 697.51181,556.94134 700.98594,557.18949 C 704.46006,557.43764 708.43049,553.21906 707.93418,549.99309 C 707.43788,546.76712 696.51921,545.27821 696.51921,545.27821 z " - id="path21500" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21499);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 713.37533,552.65276 C 712.63087,562.57883 714.36793,564.31589 717.84206,564.56404 C 721.31618,564.81219 725.28661,560.59361 724.79030,557.36764 C 724.29400,554.14167 713.37533,552.65276 713.37533,552.65276 z " - id="path21498" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21497);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 732.86522,538.69379 C 732.12076,548.61986 733.85782,550.35692 737.33195,550.60507 C 740.80607,550.85322 744.77650,546.63464 744.28019,543.40867 C 743.78389,540.18270 732.86522,538.69379 732.86522,538.69379 z " - id="path21496" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21495);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 715.48234,522.62780 C 714.73788,532.55387 716.47494,534.29093 719.94907,534.53908 C 723.42319,534.78723 727.39362,530.56865 726.89731,527.34268 C 726.40101,524.11671 715.48234,522.62780 715.48234,522.62780 z " - id="path21494" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21493);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 726.54417,537.90366 C 725.79971,547.82973 727.53677,549.56679 731.01090,549.81494 C 734.48502,550.06309 738.45545,545.84451 737.95914,542.61854 C 737.46284,539.39257 726.54417,537.90366 726.54417,537.90366 z " - id="path21492" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21491);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 728.65119,525.26157 C 727.90673,535.18764 729.64379,536.92470 733.11792,537.17285 C 736.59204,537.42100 740.56247,533.20242 740.06616,529.97645 C 739.56986,526.75048 728.65119,525.26157 728.65119,525.26157 z " - id="path21490" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21489);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 737.07925,529.21222 C 736.33479,539.13829 738.07185,540.87535 741.54598,541.12350 C 745.02010,541.37165 748.99053,537.15307 748.49422,533.92710 C 747.99792,530.70113 737.07925,529.21222 737.07925,529.21222 z " - id="path21488" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21487);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 738.13276,533.68963 C 737.38830,543.61570 739.12536,545.35276 742.59949,545.60091 C 746.07361,545.84906 750.04404,541.63048 749.54773,538.40451 C 749.05143,535.17854 738.13276,533.68963 738.13276,533.68963 z " - id="path21486" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21485);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 729.70470,543.17119 C 728.96024,553.09726 730.69730,554.83432 734.17143,555.08247 C 737.64555,555.33062 741.61598,551.11204 741.11967,547.88607 C 740.62337,544.66010 729.70470,543.17119 729.70470,543.17119 z " - id="path21484" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21483);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 724.17378,546.33172 C 723.42932,556.25779 725.16638,557.99485 728.64051,558.24300 C 732.11463,558.49115 736.08506,554.27257 735.58875,551.04660 C 735.09245,547.82063 724.17378,546.33172 724.17378,546.33172 z " - id="path21482" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21481);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 711.26831,546.33172 C 710.52385,556.25779 712.26091,557.99485 715.73504,558.24300 C 719.20916,558.49115 723.17959,554.27257 722.68328,551.04660 C 722.18698,547.82063 711.26831,546.33172 711.26831,546.33172 z " - id="path21480" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21479);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 700.46986,520.25741 C 699.72540,530.18348 701.46246,531.92054 704.93659,532.16869 C 708.41071,532.41684 712.38114,528.19826 711.88483,524.97229 C 711.38853,521.74632 700.46986,520.25741 700.46986,520.25741 z " - id="path21478" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21477);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 696.25583,528.68547 C 695.51137,538.61154 697.24843,540.34860 700.72256,540.59675 C 704.19668,540.84490 708.16711,536.62632 707.67080,533.40035 C 707.17450,530.17438 696.25583,528.68547 696.25583,528.68547 z " - id="path21476" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21475);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 710.74156,524.47144 C 709.99710,534.39751 711.73416,536.13457 715.20829,536.38272 C 718.68241,536.63087 722.65284,532.41229 722.15653,529.18632 C 721.66023,525.96035 710.74156,524.47144 710.74156,524.47144 z " - id="path21474" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21473);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 721.27664,527.36858 C 720.53218,537.29465 722.26924,539.03171 725.74337,539.27986 C 729.21749,539.52801 733.18792,535.30943 732.69161,532.08346 C 732.19531,528.85749 721.27664,527.36858 721.27664,527.36858 z " - id="path21472" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21471);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 718.64287,543.96132 C 717.89841,553.88739 719.63547,555.62445 723.10960,555.87260 C 726.58372,556.12075 730.55415,551.90217 730.05784,548.67620 C 729.56154,545.45023 718.64287,543.96132 718.64287,543.96132 z " - id="path21470" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21469);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 700.46986,545.80496 C 699.72540,555.73103 701.46246,557.46809 704.93659,557.71624 C 708.41071,557.96439 712.38114,553.74581 711.88483,550.51984 C 711.38853,547.29387 700.46986,545.80496 700.46986,545.80496 z " - id="path21468" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21467);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 675.97581,534.21638 C 675.23135,544.14245 676.96841,545.87951 680.44254,546.12766 C 683.91666,546.37581 687.88709,542.15723 687.39078,538.93126 C 686.89448,535.70529 675.97581,534.21638 675.97581,534.21638 z " - id="path21466" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21465);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 683.08699,538.95716 C 682.34253,548.88323 684.07959,550.62029 687.55372,550.86844 C 691.02784,551.11659 694.99827,546.89801 694.50196,543.67204 C 694.00566,540.44607 683.08699,538.95716 683.08699,538.95716 z " - id="path21464" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21463);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 688.09115,541.06418 C 687.34669,550.99025 689.08375,552.72731 692.55788,552.97546 C 696.03200,553.22361 700.00243,549.00503 699.50612,545.77906 C 699.00982,542.55309 688.09115,541.06418 688.09115,541.06418 z " - id="path21462" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21461);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 674.92230,511.82935 C 674.17784,521.75542 675.91490,523.49248 679.38903,523.74063 C 682.86315,523.98878 686.83358,519.77020 686.33727,516.54423 C 685.84097,513.31826 674.92230,511.82935 674.92230,511.82935 z " - id="path21460" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21459);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 670.18152,523.15455 C 669.43706,533.08062 671.17412,534.81768 674.64825,535.06583 C 678.12237,535.31398 682.09280,531.09540 681.59649,527.86943 C 681.10019,524.64346 670.18152,523.15455 670.18152,523.15455 z " - id="path21458" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21457);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 658.59294,518.94052 C 657.84848,528.86659 659.58554,530.60365 663.05967,530.85180 C 666.53379,531.09995 670.50422,526.88137 670.00791,523.65540 C 669.51161,520.42943 658.59294,518.94052 658.59294,518.94052 z " - id="path21456" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21455);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 655.95917,526.05170 C 655.21471,535.97777 656.95177,537.71483 660.42590,537.96298 C 663.90002,538.21113 667.87045,533.99255 667.37414,530.76658 C 666.87784,527.54061 655.95917,526.05170 655.95917,526.05170 z " - id="path21454" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21453);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 662.54359,530.00235 C 661.79913,539.92842 663.53619,541.66548 667.01032,541.91363 C 670.48444,542.16178 674.45487,537.94320 673.95856,534.71723 C 673.46226,531.49126 662.54359,530.00235 662.54359,530.00235 z " - id="path21452" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21451);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 673.60542,532.89950 C 672.86096,542.82557 674.59802,544.56263 678.07215,544.81078 C 681.54627,545.05893 685.51670,540.84035 685.02039,537.61438 C 684.52409,534.38841 673.60542,532.89950 673.60542,532.89950 z " - id="path21450" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21449);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 582.21364,476.53684 C 581.46918,486.46291 583.20624,488.19997 586.68037,488.44812 C 590.15449,488.69627 594.12492,484.47769 593.62861,481.25172 C 593.13231,478.02575 582.21364,476.53684 582.21364,476.53684 z " - id="path21448" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21447);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 578.78974,472.05944 C 578.04528,481.98551 579.78234,483.72257 583.25647,483.97072 C 586.73059,484.21887 590.70102,480.00029 590.20471,476.77432 C 589.70841,473.54835 578.78974,472.05944 578.78974,472.05944 z " - id="path21446" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21445);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 594.59235,494.44647 C 593.84789,504.37254 595.58495,506.10960 599.05908,506.35775 C 602.53320,506.60590 606.50363,502.38732 606.00732,499.16135 C 605.51102,495.93538 594.59235,494.44647 594.59235,494.44647 z " - id="path21444" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient21443);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 601.44016,499.45063 C 600.69570,509.37670 602.43276,511.11376 605.90689,511.36191 C 609.38101,511.61006 613.35144,507.39148 612.85513,504.16551 C 612.35883,500.93954 601.44016,499.45063 601.44016,499.45063 z " - id="path21442" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient20817);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 609.86821,506.03505 C 609.12375,515.96112 610.86081,517.69818 614.33494,517.94633 C 617.80906,518.19448 621.77949,513.97590 621.28318,510.74993 C 620.78688,507.52396 609.86821,506.03505 609.86821,506.03505 z " - id="path20816" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29225);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 626.05700,429.26140 C 625.31254,439.18747 627.04960,440.92453 630.52373,441.17268 C 633.99785,441.42083 637.96828,437.20225 637.47197,433.97628 C 636.97567,430.75031 626.05700,429.26140 626.05700,429.26140 z " - id="path29224" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29223);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 621.20268,419.29726 C 620.45822,429.22333 622.19528,430.96039 625.66941,431.20854 C 629.14353,431.45669 633.11396,427.23811 632.61765,424.01214 C 632.12135,420.78617 621.20268,419.29726 621.20268,419.29726 z " - id="path29222" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29227);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 628.99514,423.89609 C 628.25068,433.82216 629.98774,435.55922 633.46187,435.80737 C 636.93599,436.05552 640.90642,431.83694 640.41011,428.61097 C 639.91381,425.38500 628.99514,423.89609 628.99514,423.89609 z " - id="path29226" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29229);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 619.41424,438.33131 C 618.66978,448.25738 620.40684,449.99444 623.88097,450.24259 C 627.35509,450.49074 631.32552,446.27216 630.82921,443.04619 C 630.33291,439.82022 619.41424,438.33131 619.41424,438.33131 z " - id="path29228" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29233);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 602.29637,450.33937 C 601.55191,460.26544 603.28897,462.00250 606.76310,462.25065 C 610.23722,462.49880 614.20765,458.28022 613.71134,455.05425 C 613.21504,451.82828 602.29637,450.33937 602.29637,450.33937 z " - id="path29232" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29235);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 584.02879,482.78668 C 583.28433,492.71275 585.02139,494.44981 588.49552,494.69796 C 591.96964,494.94611 595.94007,490.72753 595.44376,487.50156 C 594.94746,484.27559 584.02879,482.78668 584.02879,482.78668 z " - id="path29234" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29239);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 592.45998,482.91443 C 591.71552,492.84050 593.45258,494.57756 596.92671,494.82571 C 600.40083,495.07386 604.37126,490.85528 603.87495,487.62931 C 603.37865,484.40334 592.45998,482.91443 592.45998,482.91443 z " - id="path29238" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29241);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 591.18253,478.18785 C 590.43807,488.11392 592.17513,489.85098 595.64926,490.09913 C 599.12338,490.34728 603.09381,486.12870 602.59750,482.90273 C 602.10120,479.67676 591.18253,478.18785 591.18253,478.18785 z " - id="path29240" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29243);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 596.03685,492.36758 C 595.29239,502.29365 597.02945,504.03071 600.50358,504.27886 C 603.97770,504.52701 607.94813,500.30843 607.45182,497.08246 C 606.95552,493.85649 596.03685,492.36758 596.03685,492.36758 z " - id="path29242" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29245);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 601.01892,488.53522 C 600.27446,498.46129 602.01152,500.19835 605.48565,500.44650 C 608.95977,500.69465 612.93020,496.47607 612.43389,493.25010 C 611.93759,490.02413 601.01892,488.53522 601.01892,488.53522 z " - id="path29244" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29247);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 589.77733,473.46127 C 589.03287,483.38734 590.76993,485.12440 594.24406,485.37255 C 597.71818,485.62070 601.68861,481.40212 601.19230,478.17615 C 600.69600,474.95018 589.77733,473.46127 589.77733,473.46127 z " - id="path29246" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29251);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 605.61775,503.22593 C 604.87329,513.15200 606.61035,514.88906 610.08448,515.13721 C 613.55860,515.38536 617.52903,511.16678 617.03272,507.94081 C 616.53642,504.71484 605.61775,503.22593 605.61775,503.22593 z " - id="path29250" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29253);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 606.25648,494.53925 C 605.51202,504.46532 607.24908,506.20238 610.72321,506.45053 C 614.19733,506.69868 618.16776,502.48010 617.67145,499.25413 C 617.17515,496.02816 606.25648,494.53925 606.25648,494.53925 z " - id="path29252" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29257);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 612.64374,499.26583 C 611.89928,509.19190 613.63634,510.92896 617.11047,511.17711 C 620.58459,511.42526 624.55502,507.20668 624.05871,503.98071 C 623.56241,500.75474 612.64374,499.26583 612.64374,499.26583 z " - id="path29256" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29259);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 595.78136,470.39539 C 595.03690,480.32146 596.77396,482.05852 600.24809,482.30667 C 603.72221,482.55482 607.69264,478.33624 607.19633,475.11027 C 606.70003,471.88430 595.78136,470.39539 595.78136,470.39539 z " - id="path29258" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29261);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 600.63568,463.75263 C 599.89122,473.67870 601.62828,475.41576 605.10241,475.66391 C 608.57653,475.91206 612.54696,471.69348 612.05065,468.46751 C 611.55435,465.24154 600.63568,463.75263 600.63568,463.75263 z " - id="path29260" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29265);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 622.86337,426.96198 C 622.11891,436.88805 623.85597,438.62511 627.33010,438.87326 C 630.80422,439.12141 634.77465,434.90283 634.27834,431.67686 C 633.78204,428.45089 622.86337,426.96198 622.86337,426.96198 z " - id="path29264" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29263);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 607.15069,455.57693 C 606.40623,465.50300 608.14329,467.24006 611.61742,467.48821 C 615.09154,467.73636 619.06197,463.51778 618.56566,460.29181 C 618.06936,457.06584 607.15069,455.57693 607.15069,455.57693 z " - id="path29262" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29267);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 620.81944,447.65672 C 620.07498,457.58279 621.81204,459.31985 625.28617,459.56800 C 628.76029,459.81615 632.73072,455.59757 632.23441,452.37160 C 631.73811,449.14563 620.81944,447.65672 620.81944,447.65672 z " - id="path29266" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29269);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 620.56395,457.36536 C 619.81949,467.29143 621.55655,469.02849 625.03068,469.27664 C 628.50480,469.52479 632.47523,465.30621 631.97892,462.08024 C 631.48262,458.85427 620.56395,457.36536 620.56395,457.36536 z " - id="path29268" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29219);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 597.95303,455.57693 C 597.20857,465.50300 598.94563,467.24006 602.41976,467.48821 C 605.89388,467.73636 609.86431,463.51778 609.36800,460.29181 C 608.87170,457.06584 597.95303,455.57693 597.95303,455.57693 z " - id="path29218" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29296);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 692.00661,539.69571 C 705.09653,554.61199 710.88469,557.91423 717.75370,559.58130 C 724.62272,561.24840 725.90336,556.26291 720.26641,551.14157 C 714.62947,546.02022 692.00661,539.69571 692.00661,539.69571 z " - id="path29270" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29275);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 706.00056,540.30987 C 719.96650,554.40930 725.94333,557.35634 732.90040,558.60599 C 739.85748,559.85566 740.83502,554.80200 734.89939,550.03005 C 728.96376,545.25809 706.00056,540.30987 706.00056,540.30987 z " - id="path29274" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29279);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 704.97859,529.57926 C 718.94453,543.67869 724.92136,546.62573 731.87843,547.87538 C 738.83551,549.12505 739.81305,544.07139 733.87742,539.29944 C 727.94179,534.52748 704.97859,529.57926 704.97859,529.57926 z " - id="path29278" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29291);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 707.79329,509.12898 C 719.53468,525.12839 725.01332,528.92208 731.71108,531.18094 C 738.40885,533.43981 740.11872,528.58478 734.94913,522.99206 C 729.77953,517.39933 707.79329,509.12898 707.79329,509.12898 z " - id="path29290" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29231);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 611.23854,446.37927 C 610.49408,456.30534 612.23114,458.04240 615.70527,458.29055 C 619.17939,458.53870 623.14982,454.32012 622.65351,451.09415 C 622.15721,447.86818 611.23854,446.37927 611.23854,446.37927 z " - id="path29230" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29237);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 589.77733,488.66297 C 589.03287,498.58904 590.76993,500.32610 594.24406,500.57425 C 597.71818,500.82240 601.68861,496.60382 601.19230,493.37785 C 600.69600,490.15188 589.77733,488.66297 589.77733,488.66297 z " - id="path29236" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29249);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 597.56980,497.98837 C 596.82534,507.91444 598.56240,509.65150 602.03653,509.89965 C 605.51065,510.14780 609.48108,505.92922 608.98477,502.70325 C 608.48847,499.47728 597.56980,497.98837 597.56980,497.98837 z " - id="path29248" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29255);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 613.28247,505.39760 C 612.53801,515.32367 614.27507,517.06073 617.74920,517.30888 C 621.22332,517.55703 625.19375,513.33845 624.69744,510.11248 C 624.20114,506.88651 613.28247,505.39760 613.28247,505.39760 z " - id="path29254" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29277);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 699.61329,533.53936 C 713.57923,547.63879 719.55606,550.58583 726.51313,551.83548 C 733.47021,553.08515 734.44775,548.03149 728.51212,543.25954 C 722.57649,538.48758 699.61329,533.53936 699.61329,533.53936 z " - id="path29276" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29281);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 713.16227,520.87603 C 725.43418,536.47223 731.03709,540.07985 737.80692,542.11257 C 744.57675,544.14531 746.12266,539.23561 740.76822,533.81960 C 735.41378,528.40358 713.16227,520.87603 713.16227,520.87603 z " - id="path29280" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29283);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 718.96262,513.49785 C 731.52364,528.86217 737.19294,532.36453 743.99954,534.27048 C 750.80615,536.17644 752.26011,531.23873 746.80546,525.92365 C 741.35081,520.60857 718.96262,513.49785 718.96262,513.49785 z " - id="path29282" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29285);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 711.58789,503.73989 C 724.09972,519.14429 729.75780,522.66476 736.55827,524.59245 C 743.35875,526.52017 744.82849,521.58712 739.39086,516.25464 C 733.95324,510.92214 711.58789,503.73989 711.58789,503.73989 z " - id="path29284" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29287);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 705.48957,518.33767 C 719.45551,532.43710 725.43234,535.38414 732.38941,536.63379 C 739.34649,537.88346 740.32403,532.82980 734.38840,528.05785 C 728.45277,523.28589 705.48957,518.33767 705.48957,518.33767 z " - id="path29286" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29289);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 692.45955,521.02032 C 706.42549,535.11975 712.40232,538.06679 719.35939,539.31644 C 726.31647,540.56611 727.29401,535.51245 721.35838,530.74050 C 715.42275,525.96854 692.45955,521.02032 692.45955,521.02032 z " - id="path29288" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29293);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 685.68905,526.13014 C 699.65499,540.22957 705.63182,543.17661 712.58889,544.42626 C 719.54597,545.67593 720.52351,540.62227 714.58788,535.85032 C 708.65225,531.07836 685.68905,526.13014 685.68905,526.13014 z " - id="path29292" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29295);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 678.02433,535.32780 C 691.99027,549.42723 697.96710,552.37427 704.92417,553.62392 C 711.88125,554.87359 712.85879,549.81993 706.92316,545.04798 C 700.98753,540.27602 678.02433,535.32780 678.02433,535.32780 z " - id="path29294" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient2596);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 717.39526,535.19875 C 729.13665,551.19816 734.61529,554.99185 741.31305,557.25071 C 748.01082,559.50958 749.72069,554.65455 744.55110,549.06183 C 739.38150,543.46910 717.39526,535.19875 717.39526,535.19875 z " - id="path2595" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient2598);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 703.28860,541.26613 C 715.02999,557.26554 720.50863,561.05923 727.20639,563.31809 C 733.90416,565.57696 735.61403,560.72193 730.44444,555.12921 C 725.27484,549.53648 703.28860,541.26613 703.28860,541.26613 z " - id="path2597" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient2602);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 731.19855,528.52463 C 742.93994,544.52404 748.41858,548.31773 755.11634,550.57659 C 761.81411,552.83546 763.52398,547.98043 758.35439,542.38771 C 753.18479,536.79498 731.19855,528.52463 731.19855,528.52463 z " - id="path2601" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient2600);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 721.64243,528.52463 C 733.38382,544.52404 738.86246,548.31773 745.56022,550.57659 C 752.25799,552.83546 753.96786,547.98043 748.79827,542.38771 C 743.62867,536.79498 721.64243,528.52463 721.64243,528.52463 z " - id="path2599" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient2604);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 690.69879,542.47960 C 702.44018,558.47901 707.91882,562.27270 714.61658,564.53156 C 721.31435,566.79043 723.02422,561.93540 717.85463,556.34268 C 712.68503,550.74995 690.69879,542.47960 690.69879,542.47960 z " - id="path2603" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient2606);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 721.94580,533.68190 C 733.68719,549.68131 739.16583,553.47500 745.86359,555.73386 C 752.56136,557.99273 754.27123,553.13770 749.10164,547.54498 C 743.93204,541.95225 721.94580,533.68190 721.94580,533.68190 z " - id="path2605" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient2719);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 615.04942,511.27207 C 614.30496,521.19814 616.04202,522.93520 619.51615,523.18335 C 622.99027,523.43150 626.96070,519.21292 626.46439,515.98695 C 625.96809,512.76098 615.04942,511.27207 615.04942,511.27207 z " - id="path2718" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient2721);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 622.78533,514.76081 C 622.04087,524.68688 623.77793,526.42394 627.25206,526.67209 C 630.72618,526.92024 634.69661,522.70166 634.20030,519.47569 C 633.70400,516.24972 622.78533,514.76081 622.78533,514.76081 z " - id="path2720" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient2723);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 635.83020,515.67092 C 635.08574,525.59699 636.82280,527.33405 640.29693,527.58220 C 643.77105,527.83035 647.74148,523.61177 647.24517,520.38580 C 646.74887,517.15983 635.83020,515.67092 635.83020,515.67092 z " - id="path2722" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient2725);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M 644.02116,521.58662 C 643.27670,531.51269 645.01376,533.24975 648.48789,533.49790 C 651.96201,533.74605 655.93244,529.52747 655.43613,526.30150 C 654.93983,523.07553 644.02116,521.58662 644.02116,521.58662 z " - id="path2724" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3351);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 629.91450,517.94619 C 629.17004,527.87226 630.90710,529.60932 634.38123,529.85747 C 637.85535,530.10562 641.82578,525.88704 641.32947,522.66107 C 640.83317,519.43510 629.91450,517.94619 629.91450,517.94619 z " - id="path3350" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3353);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 647.81327,525.53041 C 647.06881,535.45648 648.80587,537.19354 652.28000,537.44169 C 655.75412,537.68984 659.72455,533.47126 659.22824,530.24529 C 658.73194,527.01932 647.81327,525.53041 647.81327,525.53041 z " - id="path3352" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3355);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 654.79076,528.26074 C 654.04630,538.18681 655.78336,539.92387 659.25749,540.17202 C 662.73161,540.42017 666.70204,536.20159 666.20573,532.97562 C 665.70943,529.74965 654.79076,528.26074 654.79076,528.26074 z " - id="path3354" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3357);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 656.61097,522.95178 C 655.86651,532.87785 657.60357,534.61491 661.07770,534.86306 C 664.55182,535.11121 668.52225,530.89263 668.02594,527.66666 C 667.52964,524.44069 656.61097,522.95178 656.61097,522.95178 z " - id="path3356" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3361);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 664.34688,527.35063 C 663.60242,537.27670 665.33948,539.01376 668.81361,539.26191 C 672.28773,539.51006 676.25816,535.29148 675.76185,532.06551 C 675.26555,528.83954 664.34688,527.35063 664.34688,527.35063 z " - id="path3360" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3363);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 669.65584,535.99664 C 668.91138,545.92271 670.64844,547.65977 674.12257,547.90792 C 677.59669,548.15607 681.56712,543.93749 681.07081,540.71152 C 680.57451,537.48555 669.65584,535.99664 669.65584,535.99664 z " - id="path3362" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3359);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 649.02675,516.27766 C 648.28229,526.20373 650.01935,527.94079 653.49348,528.18894 C 656.96760,528.43709 660.93803,524.21851 660.44172,520.99254 C 659.94542,517.76657 649.02675,516.27766 649.02675,516.27766 z " - id="path3358" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3419);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 677.39175,470.92399 C 676.64729,480.85006 678.38435,482.58712 681.85848,482.83527 C 685.33260,483.08342 689.30303,478.86484 688.80672,475.63887 C 688.31042,472.41290 677.39175,470.92399 677.39175,470.92399 z " - id="path3418" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3417);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 653.88065,475.01948 C 653.13619,484.94555 654.87325,486.68261 658.34738,486.93076 C 661.82150,487.17891 665.79193,482.96033 665.29562,479.73436 C 664.79932,476.50839 653.88065,475.01948 653.88065,475.01948 z " - id="path3416" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3415);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 682.24565,490.03624 C 681.50119,499.96231 683.23825,501.69937 686.71238,501.94752 C 690.18650,502.19567 694.15693,497.97709 693.66062,494.75112 C 693.16432,491.52515 682.24565,490.03624 682.24565,490.03624 z " - id="path3414" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3413);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 692.25683,541.91234 C 691.51237,551.83841 693.24943,553.57547 696.72356,553.82362 C 700.19768,554.07177 704.16811,549.85319 703.67180,546.62722 C 703.17550,543.40125 692.25683,541.91234 692.25683,541.91234 z " - id="path3412" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3411);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 678.15017,536.75507 C 677.40571,546.68114 679.14277,548.41820 682.61690,548.66635 C 686.09102,548.91450 690.06145,544.69592 689.56514,541.46995 C 689.06884,538.24398 678.15017,536.75507 678.15017,536.75507 z " - id="path3410" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3409);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 627.03250,508.84512 C 626.28804,518.77119 628.02510,520.50825 631.49923,520.75640 C 634.97335,521.00455 638.94378,516.78597 638.44747,513.56000 C 637.95117,510.33403 627.03250,508.84512 627.03250,508.84512 z " - id="path3408" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3407);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 640.98747,510.21028 C 640.24301,520.13635 641.98007,521.87341 645.45420,522.12156 C 648.92832,522.36971 652.89875,518.15113 652.40244,514.92516 C 651.90614,511.69919 640.98747,510.21028 640.98747,510.21028 z " - id="path3406" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3405);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 666.31878,506.87322 C 665.57432,516.79929 667.31138,518.53635 670.78551,518.78450 C 674.25963,519.03265 678.23006,514.81407 677.73375,511.58810 C 677.23745,508.36213 666.31878,506.87322 666.31878,506.87322 z " - id="path3404" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3403);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 718.80162,513.85071 C 718.05716,523.77678 719.79422,525.51384 723.26835,525.76199 C 726.74247,526.01014 730.71290,521.79156 730.21659,518.56559 C 729.72029,515.33962 718.80162,513.85071 718.80162,513.85071 z " - id="path3402" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3401);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 708.79044,508.54175 C 708.04598,518.46782 709.78304,520.20488 713.25717,520.45303 C 716.73129,520.70118 720.70172,516.48260 720.20541,513.25663 C 719.70911,510.03066 708.79044,508.54175 708.79044,508.54175 z " - id="path3400" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3399);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 683.30745,505.96311 C 682.56299,515.88918 684.30005,517.62624 687.77418,517.87439 C 691.24830,518.12254 695.21873,513.90396 694.72242,510.67799 C 694.22612,507.45202 683.30745,505.96311 683.30745,505.96311 z " - id="path3398" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3397);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 697.86916,507.17659 C 697.12470,517.10266 698.86176,518.83972 702.33589,519.08787 C 705.81001,519.33602 709.78044,515.11744 709.28413,511.89147 C 708.78783,508.66550 697.86916,507.17659 697.86916,507.17659 z " - id="path3396" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3395);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 697.11074,530.08095 C 696.36628,540.00702 698.10334,541.74408 701.57747,541.99223 C 705.05159,542.24038 709.02202,538.02180 708.52571,534.79583 C 708.02941,531.56986 697.11074,530.08095 697.11074,530.08095 z " - id="path3394" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3393);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 722.59373,531.44611 C 721.84927,541.37218 723.58633,543.10924 727.06046,543.35739 C 730.53458,543.60554 734.50501,539.38696 734.00870,536.16099 C 733.51240,532.93502 722.59373,531.44611 722.59373,531.44611 z " - id="path3392" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3391);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 709.54886,540.39550 C 708.80440,550.32157 710.54146,552.05863 714.01559,552.30678 C 717.48971,552.55493 721.46014,548.33635 720.96383,545.11038 C 720.46753,541.88441 709.54886,540.39550 709.54886,540.39550 z " - id="path3390" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3389);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 686.34114,533.26632 C 685.59668,543.19239 687.33374,544.92945 690.80787,545.17760 C 694.28199,545.42575 698.25242,541.20717 697.75611,537.98120 C 697.25981,534.75523 686.34114,533.26632 686.34114,533.26632 z " - id="path3388" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3387);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 658.12782,518.09787 C 657.38336,528.02394 659.12042,529.76100 662.59455,530.00915 C 666.06867,530.25730 670.03910,526.03872 669.54279,522.81275 C 669.04649,519.58678 658.12782,518.09787 658.12782,518.09787 z " - id="path3386" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3385);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 660.40309,522.95178 C 659.65863,532.87785 661.39569,534.61491 664.86982,534.86306 C 668.34394,535.11121 672.31437,530.89263 671.81806,527.66666 C 671.32176,524.44069 660.40309,522.95178 660.40309,522.95178 z " - id="path3384" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3383);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 666.47047,529.32253 C 665.72601,539.24860 667.46307,540.98566 670.93720,541.23381 C 674.41132,541.48196 678.38175,537.26338 677.88544,534.03741 C 677.38914,530.81144 666.47047,529.32253 666.47047,529.32253 z " - id="path3382" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3381);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 673.44795,523.25515 C 672.70349,533.18122 674.44055,534.91828 677.91468,535.16643 C 681.38880,535.41458 685.35923,531.19600 684.86292,527.97003 C 684.36662,524.74406 673.44795,523.25515 673.44795,523.25515 z " - id="path3380" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3379);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 678.90860,526.13715 C 678.16414,536.06322 679.90120,537.80028 683.37533,538.04843 C 686.84945,538.29658 690.81988,534.07800 690.32357,530.85203 C 689.82727,527.62606 678.90860,526.13715 678.90860,526.13715 z " - id="path3378" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3377);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 673.75132,515.82261 C 673.00686,525.74868 674.74392,527.48574 678.21805,527.73389 C 681.69217,527.98204 685.66260,523.76346 685.16629,520.53749 C 684.66999,517.31152 673.75132,515.82261 673.75132,515.82261 z " - id="path3376" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3375);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 709.09381,516.27766 C 708.34935,526.20373 710.08641,527.94079 713.56054,528.18894 C 717.03466,528.43709 721.00509,524.21851 720.50878,520.99254 C 720.01248,517.76657 709.09381,516.27766 709.09381,516.27766 z " - id="path3374" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3373);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 694.07705,515.21587 C 693.33259,525.14194 695.06965,526.87900 698.54378,527.12715 C 702.01790,527.37530 705.98833,523.15672 705.49202,519.93075 C 704.99572,516.70478 694.07705,515.21587 694.07705,515.21587 z " - id="path3372" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3371);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 684.06587,516.88440 C 683.32141,526.81047 685.05847,528.54753 688.53260,528.79568 C 692.00672,529.04383 695.97715,524.82525 695.48084,521.59928 C 694.98454,518.37331 684.06587,516.88440 684.06587,516.88440 z " - id="path3370" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3369);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 665.25699,517.94619 C 664.51253,527.87226 666.24959,529.60932 669.72372,529.85747 C 673.19784,530.10562 677.16827,525.88704 676.67196,522.66107 C 676.17566,519.43510 665.25699,517.94619 665.25699,517.94619 z " - id="path3368" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3367);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 637.80210,519.91809 C 637.05764,529.84416 638.79470,531.58122 642.26883,531.82937 C 645.74295,532.07752 649.71338,527.85894 649.21707,524.63297 C 648.72077,521.40700 637.80210,519.91809 637.80210,519.91809 z " - id="path3366" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient3365);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 659.03793,531.59779 C 658.29347,541.52386 660.03053,543.26092 663.50466,543.50907 C 666.97878,543.75722 670.94921,539.53864 670.45290,536.31267 C 669.95660,533.08670 659.03793,531.59779 659.03793,531.59779 z " - id="path3364" - sodipodi:nodetypes="cccc" /> - <g - id="BackFeathers"> - <path - style="fill:url(#linearGradient29925);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 627.37393,464.98290 C 626.62947,474.90897 628.36653,476.64603 631.84066,476.89418 C 635.31478,477.14233 639.28521,472.92375 638.78890,469.69778 C 638.29260,466.47181 627.37393,464.98290 627.37393,464.98290 z " - id="path29924" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29923);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 641.28074,483.78285 C 640.53628,493.70892 642.27334,495.44598 645.74747,495.69413 C 649.22159,495.94228 653.19202,491.72370 652.69571,488.49773 C 652.19941,485.27176 641.28074,483.78285 641.28074,483.78285 z " - id="path29297" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29927);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 625.31366,451.59116 C 624.56920,461.51723 626.30626,463.25429 629.78039,463.50244 C 633.25451,463.75059 637.22494,459.53201 636.72863,456.30604 C 636.23233,453.08007 625.31366,451.59116 625.31366,451.59116 z " - id="path29926" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29929);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 624.54106,446.95556 C 623.79660,456.88163 625.53366,458.61869 629.00779,458.86684 C 632.48191,459.11499 636.45234,454.89641 635.95603,451.67044 C 635.45973,448.44447 624.54106,446.95556 624.54106,446.95556 z " - id="path29928" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29933);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 645.91634,450.81856 C 645.17188,460.74463 646.90894,462.48169 650.38307,462.72984 C 653.85719,462.97799 657.82762,458.75941 657.33131,455.53344 C 656.83501,452.30747 645.91634,450.81856 645.91634,450.81856 z " - id="path29932" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29937);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 667.80670,459.83223 C 667.06224,469.75830 668.79930,471.49536 672.27343,471.74351 C 675.74755,471.99166 679.71798,467.77308 679.22167,464.54711 C 678.72537,461.32114 667.80670,459.83223 667.80670,459.83223 z " - id="path29936" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29943);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 635.61500,468.58837 C 634.87054,478.51444 636.60760,480.25150 640.08173,480.49965 C 643.55585,480.74780 647.52628,476.52922 647.02997,473.30325 C 646.53367,470.07728 635.61500,468.58837 635.61500,468.58837 z " - id="path29942" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29945);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 638.70540,457.51443 C 637.96094,467.44050 639.69800,469.17756 643.17213,469.42571 C 646.64625,469.67386 650.61668,465.45528 650.12037,462.22931 C 649.62407,459.00334 638.70540,457.51443 638.70540,457.51443 z " - id="path29944" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29951);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 684.54638,470.90618 C 683.80192,480.83225 685.53898,482.56931 689.01311,482.81746 C 692.48723,483.06561 696.45766,478.84703 695.96135,475.62106 C 695.46505,472.39509 684.54638,470.90618 684.54638,470.90618 z " - id="path29950" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29947);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 626.60133,491.25133 C 625.85687,501.17740 627.59393,502.91446 631.06806,503.16261 C 634.54218,503.41076 638.51261,499.19218 638.01630,495.96621 C 637.52000,492.74024 626.60133,491.25133 626.60133,491.25133 z " - id="path29946" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29953);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 699.48332,485.58559 C 698.73886,495.51166 700.47592,497.24872 703.95005,497.49687 C 707.42417,497.74502 711.39460,493.52644 710.89829,490.30047 C 710.40199,487.07450 699.48332,485.58559 699.48332,485.58559 z " - id="path29952" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29975);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 650.29441,489.44859 C 649.54995,499.37466 651.28701,501.11172 654.76114,501.35987 C 658.23526,501.60802 662.20569,497.38944 661.70938,494.16347 C 661.21308,490.93750 650.29441,489.44859 650.29441,489.44859 z " - id="path29974" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29955);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 681.19844,493.31160 C 680.45398,503.23767 682.19104,504.97473 685.66517,505.22288 C 689.13929,505.47103 693.10972,501.25245 692.61341,498.02648 C 692.11711,494.80051 681.19844,493.31160 681.19844,493.31160 z " - id="path29954" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29973);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 653.89988,498.97733 C 653.15542,508.90340 654.89248,510.64046 658.36661,510.88861 C 661.84073,511.13676 665.81116,506.91818 665.31485,503.69221 C 664.81855,500.46624 653.89988,498.97733 653.89988,498.97733 z " - id="path29972" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29967);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 704.63399,502.84034 C 703.88953,512.76641 705.62659,514.50347 709.10072,514.75162 C 712.57484,514.99977 716.54527,510.78119 716.04896,507.55522 C 715.55266,504.32925 704.63399,502.84034 704.63399,502.84034 z " - id="path29966" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29959);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 649.00675,503.35540 C 648.26229,513.28147 649.99935,515.01853 653.47348,515.26668 C 656.94760,515.51483 660.91803,511.29625 660.42172,508.07028 C 659.92542,504.84431 649.00675,503.35540 649.00675,503.35540 z " - id="path29958" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29961);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 663.68616,503.35540 C 662.94170,513.28147 664.67876,515.01853 668.15289,515.26668 C 671.62701,515.51483 675.59744,511.29625 675.10113,508.07028 C 674.60483,504.84431 663.68616,503.35540 663.68616,503.35540 z " - id="path29960" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29965);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 697.68059,500.52254 C 696.93613,510.44861 698.67319,512.18567 702.14732,512.43382 C 705.62144,512.68197 709.59187,508.46339 709.09556,505.23742 C 708.59926,502.01145 697.68059,500.52254 697.68059,500.52254 z " - id="path29964" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29963);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 679.39571,500.26500 C 678.65125,510.19107 680.38831,511.92813 683.86244,512.17628 C 687.33656,512.42443 691.30699,508.20585 690.81068,504.97988 C 690.31438,501.75391 679.39571,500.26500 679.39571,500.26500 z " - id="path29962" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29977);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 648.49168,473.22398 C 647.74722,483.15005 649.48428,484.88711 652.95841,485.13526 C 656.43253,485.38341 660.40296,481.16483 659.90665,477.93886 C 659.41035,474.71289 648.49168,473.22398 648.49168,473.22398 z " - id="path29976" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29979);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 673.47243,487.13079 C 672.72797,497.05686 674.46503,498.79392 677.93916,499.04207 C 681.41328,499.29022 685.38371,495.07164 684.88740,491.84567 C 684.39110,488.61970 673.47243,487.13079 673.47243,487.13079 z " - id="path29978" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29989);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 671.15463,493.05406 C 670.41017,502.98013 672.14723,504.71719 675.62136,504.96534 C 679.09548,505.21349 683.06591,500.99491 682.56960,497.76894 C 682.07330,494.54297 671.15463,493.05406 671.15463,493.05406 z " - id="path29988" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29991);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 694.33265,496.14446 C 693.58819,506.07053 695.32525,507.80759 698.79938,508.05574 C 702.27350,508.30389 706.24393,504.08531 705.74762,500.85934 C 705.25132,497.63337 694.33265,496.14446 694.33265,496.14446 z " - id="path29990" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29993);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 685.06144,495.88693 C 684.31698,505.81300 686.05404,507.55006 689.52817,507.79821 C 693.00229,508.04636 696.97272,503.82778 696.47641,500.60181 C 695.98011,497.37584 685.06144,495.88693 685.06144,495.88693 z " - id="path29992" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29995);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 668.83683,500.26500 C 668.09237,510.19107 669.82943,511.92813 673.30356,512.17628 C 676.77768,512.42443 680.74811,508.20585 680.25180,504.97988 C 679.75550,501.75391 668.83683,500.26500 668.83683,500.26500 z " - id="path29994" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29997);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 720.34354,497.68967 C 719.59908,507.61574 721.33614,509.35280 724.81027,509.60095 C 728.28439,509.84910 732.25482,505.63052 731.75851,502.40455 C 731.26221,499.17858 720.34354,497.68967 720.34354,497.68967 z " - id="path29996" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29999);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 683.00117,464.98290 C 682.25671,474.90897 683.99377,476.64603 687.46790,476.89418 C 690.94202,477.14233 694.91245,472.92375 694.41614,469.69778 C 693.91984,466.47181 683.00117,464.98290 683.00117,464.98290 z " - id="path29998" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient30005);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 620.93559,475.28425 C 620.19113,485.21032 621.92819,486.94738 625.40232,487.19553 C 628.87644,487.44368 632.84687,483.22510 632.35056,479.99913 C 631.85426,476.77316 620.93559,475.28425 620.93559,475.28425 z " - id="path30004" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient30003);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 626.85886,476.31438 C 626.11440,486.24045 627.85146,487.97751 631.32559,488.22566 C 634.79971,488.47381 638.77014,484.25523 638.27383,481.02926 C 637.77753,477.80329 626.85886,476.31438 626.85886,476.31438 z " - id="path30002" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient30009);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 622.73832,488.93352 C 621.99386,498.85959 623.73092,500.59665 627.20505,500.84480 C 630.67917,501.09295 634.64960,496.87437 634.15329,493.64840 C 633.65699,490.42243 622.73832,488.93352 622.73832,488.93352 z " - id="path30008" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient30011);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 651.58208,498.71980 C 650.83762,508.64587 652.57468,510.38293 656.04881,510.63108 C 659.52293,510.87923 663.49336,506.66065 662.99705,503.43468 C 662.50075,500.20871 651.58208,498.71980 651.58208,498.71980 z " - id="path30010" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient30015);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 687.63678,500.00747 C 686.89232,509.93354 688.62938,511.67060 692.10351,511.91875 C 695.57763,512.16690 699.54806,507.94832 699.05175,504.72235 C 698.55545,501.49638 687.63678,500.00747 687.63678,500.00747 z " - id="path30014" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient30025);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 621.19312,462.66510 C 620.44866,472.59117 622.18572,474.32823 625.65985,474.57638 C 629.13397,474.82453 633.10440,470.60595 632.60809,467.37998 C 632.11179,464.15401 621.19312,462.66510 621.19312,462.66510 z " - id="path30024" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient30023);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 623.76846,439.74462 C 623.02400,449.67069 624.76106,451.40775 628.23519,451.65590 C 631.70931,451.90405 635.67974,447.68547 635.18343,444.45950 C 634.68713,441.23353 623.76846,439.74462 623.76846,439.74462 z " - id="path30022" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient30021);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 629.94926,431.24601 C 629.20480,441.17208 630.94186,442.90914 634.41599,443.15729 C 637.89011,443.40544 641.86054,439.18686 641.36423,435.96089 C 640.86793,432.73492 629.94926,431.24601 629.94926,431.24601 z " - id="path30020" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient30019);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 621.19312,483.26779 C 620.44866,493.19386 622.18572,494.93092 625.65985,495.17907 C 629.13397,495.42722 633.10440,491.20864 632.60809,487.98267 C 632.11179,484.75670 621.19312,483.26779 621.19312,483.26779 z " - id="path30018" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29931);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 636.64513,444.12269 C 635.90067,454.04876 637.63773,455.78582 641.11186,456.03397 C 644.58598,456.28212 648.55641,452.06354 648.06010,448.83757 C 647.56380,445.61160 636.64513,444.12269 636.64513,444.12269 z " - id="path29930" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29935);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 657.76289,456.74183 C 657.01843,466.66790 658.75549,468.40496 662.22962,468.65311 C 665.70374,468.90126 669.67417,464.68268 669.17786,461.45671 C 668.68156,458.23074 657.76289,456.74183 657.76289,456.74183 z " - id="path29934" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29939);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 678.10804,466.27057 C 677.36358,476.19664 679.10064,477.93370 682.57477,478.18185 C 686.04889,478.43000 690.01932,474.21142 689.52301,470.98545 C 689.02671,467.75948 678.10804,466.27057 678.10804,466.27057 z " - id="path29938" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29941);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 630.20680,480.43492 C 629.46234,490.36099 631.19940,492.09805 634.67353,492.34620 C 638.14765,492.59435 642.11808,488.37577 641.62177,485.14980 C 641.12547,481.92383 630.20680,480.43492 630.20680,480.43492 z " - id="path29940" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29949);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 634.84240,500.00747 C 634.09794,509.93354 635.83500,511.67060 639.30913,511.91875 C 642.78325,512.16690 646.75368,507.94832 646.25737,504.72235 C 645.76107,501.49638 634.84240,500.00747 634.84240,500.00747 z " - id="path29948" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29957);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 658.02042,479.91985 C 657.27596,489.84592 659.01302,491.58298 662.48715,491.83113 C 665.96127,492.07928 669.93170,487.86070 669.43539,484.63473 C 668.93909,481.40876 658.02042,479.91985 658.02042,479.91985 z " - id="path29956" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29969);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 643.08347,504.38554 C 642.33901,514.31161 644.07607,516.04867 647.55020,516.29682 C 651.02432,516.54497 654.99475,512.32639 654.49844,509.10042 C 654.00214,505.87445 643.08347,504.38554 643.08347,504.38554 z " - id="path29968" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29971);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 627.88899,498.46227 C 627.14453,508.38834 628.88159,510.12540 632.35572,510.37355 C 635.82984,510.62170 639.80027,506.40312 639.30396,503.17715 C 638.80766,499.95118 627.88899,498.46227 627.88899,498.46227 z " - id="path29970" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29981);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 659.82315,489.44859 C 659.07869,499.37466 660.81575,501.11172 664.28988,501.35987 C 667.76400,501.60802 671.73443,497.38944 671.23812,494.16347 C 670.74182,490.93750 659.82315,489.44859 659.82315,489.44859 z " - id="path29980" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29983);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 640.50814,491.25133 C 639.76368,501.17740 641.50074,502.91446 644.97487,503.16261 C 648.44899,503.41076 652.41942,499.19218 651.92311,495.96621 C 651.42681,492.74024 640.50814,491.25133 640.50814,491.25133 z " - id="path29982" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29985);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 644.37114,478.11712 C 643.62668,488.04319 645.36374,489.78025 648.83787,490.02840 C 652.31199,490.27655 656.28242,486.05797 655.78611,482.83200 C 655.28981,479.60603 644.37114,478.11712 644.37114,478.11712 z " - id="path29984" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient29987);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 646.17388,467.81577 C 645.42942,477.74184 647.16648,479.47890 650.64061,479.72705 C 654.11473,479.97520 658.08516,475.75662 657.58885,472.53065 C 657.09255,469.30468 646.17388,467.81577 646.17388,467.81577 z " - id="path29986" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient30001);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 657.50535,451.59116 C 656.76089,461.51723 658.49795,463.25429 661.97208,463.50244 C 665.44620,463.75059 669.41663,459.53201 668.92032,456.30604 C 668.42402,453.08007 657.50535,451.59116 657.50535,451.59116 z " - id="path30000" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient30007);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 621.19312,466.78564 C 620.44866,476.71171 622.18572,478.44877 625.65985,478.69692 C 629.13397,478.94507 633.10440,474.72649 632.60809,471.50052 C 632.11179,468.27455 621.19312,466.78564 621.19312,466.78564 z " - id="path30006" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient30013);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 660.08069,504.64307 C 659.33623,514.56914 661.07329,516.30620 664.54742,516.55435 C 668.02154,516.80250 671.99197,512.58392 671.49566,509.35795 C 670.99936,506.13198 660.08069,504.64307 660.08069,504.64307 z " - id="path30012" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#linearGradient30017);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 640.25060,476.82945 C 639.50614,486.75552 641.24320,488.49258 644.71733,488.74073 C 648.19145,488.98888 652.16188,484.77030 651.66557,481.54433 C 651.16927,478.31836 640.25060,476.82945 640.25060,476.82945 z " - id="path30016" - sodipodi:nodetypes="cccc" /> - </g> - </g> - </g> - <path - sodipodi:type="arc" - style="fill:url(#radialGradient18239);fill-opacity:1.0000000;stroke:none;stroke-width:1.8314677;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - id="FrontWingHalo" - sodipodi:cx="663.84143" - sodipodi:cy="345.54175" - sodipodi:rx="12.247025" - sodipodi:ry="34.765747" - d="M 676.08846 345.54175 A 12.247025 34.765747 0 1 1 651.59441,345.54175 A 12.247025 34.765747 0 1 1 676.08846 345.54175 z" - transform="matrix(2.338303,-0.399655,0.732237,1.663950,-1061.241,38.78233)" /> - <g - id="FrontWing"> - <path - style="fill:url(#linearGradient24706);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" - d="M 631.80296,445.47783 C 698.00985,349.95074 729.48401,326.06151 745.56283,321.33245 C 761.64164,316.60339 741.53143,420.02030 731.12748,430.42424 C 718.49017,439.33927 686.55658,474.87744 686.55658,474.87744 L 631.80296,445.47783 z " - id="FrontWingBase" - sodipodi:nodetypes="ccccc" /> - <g - id="FrontWingLongFeathers"> - <path - style="fill:url(#linearGradient32560);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 679.03509,380.43065 C 723.65735,332.52713 746.14295,313.34351 751.82129,312.66976 C 757.49963,311.99601 717.48086,361.78277 709.68871,365.51055 C 701.89655,369.23833 679.03509,380.43065 679.03509,380.43065 z " - id="path31935" /> - <path - style="fill:url(#linearGradient32562);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 671.04316,386.66475 C 723.61996,337.14797 749.78662,317.61301 756.11909,317.23904 C 762.45156,316.86505 714.84811,368.73440 705.97319,372.31194 C 697.09825,375.88946 671.04316,386.66475 671.04316,386.66475 z " - id="path32561" /> - <path - style="fill:url(#linearGradient32564);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 678.53611,387.57209 C 726.40585,342.91359 750.18059,325.35299 755.89219,325.07885 C 761.60378,324.80470 718.19424,371.66444 710.15999,374.83696 C 702.12574,378.00948 678.53611,387.57209 678.53611,387.57209 z " - id="path32563" /> - <path - style="fill:url(#linearGradient32566);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 623.81780,446.88904 C 689.24049,444.48784 718.70794,446.78621 723.20393,450.31942 C 727.69991,453.85264 664.20641,460.83827 656.05704,457.97441 C 647.90766,455.11055 623.81780,446.88904 623.81780,446.88904 z " - id="path32565" /> - <path - style="fill:url(#linearGradient32568);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 629.44759,442.90897 C 694.75190,438.30008 724.28016,439.60213 728.89288,442.98153 C 733.50560,446.36091 670.28419,455.48648 662.04276,452.89944 C 653.80132,450.31238 629.44759,442.90897 629.44759,442.90897 z " - id="path32567" /> - <path - style="fill:url(#linearGradient32570);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 634.60405,456.24577 C 684.92857,452.38278 707.65374,454.02190 711.17581,457.45374 C 714.69786,460.88557 665.93745,469.28871 659.61433,466.60773 C 653.29121,463.92675 634.60405,456.24577 634.60405,456.24577 z " - id="path32569" /> - <path - style="fill:url(#linearGradient35362);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;" - d="M 653.08248,463.35514 C 687.75506,460.64601 703.55114,462.79967 706.12974,466.30511 C 708.70834,469.81056 675.30470,477.08671 670.81822,474.26686 C 666.33174,471.44700 653.08248,463.35514 653.08248,463.35514 z " - id="path32571" /> - <path - style="fill:url(#linearGradient32574);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 672.87844,391.66688 C 727.79561,349.07999 754.65164,332.79378 760.74578,333.03548 C 766.83992,333.27717 716.46264,378.59651 707.63757,381.19156 C 698.81250,383.78662 672.87844,391.66688 672.87844,391.66688 z " - id="path32573" /> - <path - style="fill:url(#linearGradient32576);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 668.95417,405.35129 C 724.45635,360.64669 751.57945,343.55855 757.71772,343.82092 C 763.85599,344.08330 712.91591,391.66711 704.01461,394.38381 C 695.11331,397.10050 668.95417,405.35129 668.95417,405.35129 z " - id="path32575" /> - <path - style="fill:url(#linearGradient32578);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 665.63994,415.43670 C 721.14212,370.73210 748.26522,353.64396 754.40349,353.90633 C 760.54176,354.16871 709.60168,401.75252 700.70038,404.46922 C 691.79908,407.18591 665.63994,415.43670 665.63994,415.43670 z " - id="path32577" /> - <path - style="fill:url(#linearGradient32580);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 664.60980,420.84491 C 720.11198,376.14031 747.23508,359.05217 753.37335,359.31454 C 759.51162,359.57692 708.57154,407.16073 699.67024,409.87743 C 690.76894,412.59412 664.60980,420.84491 664.60980,420.84491 z " - id="path32579" /> - <path - style="fill:url(#linearGradient32582);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 663.32213,426.51065 C 718.82431,381.80605 745.94741,364.71791 752.08568,364.98028 C 758.22395,365.24266 707.28387,412.82647 698.38257,415.54317 C 689.48127,418.25986 663.32213,426.51065 663.32213,426.51065 z " - id="path32581" /> - <path - style="fill:url(#linearGradient32584);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 661.26186,432.69145 C 716.76404,387.98685 743.88714,370.89871 750.02541,371.16108 C 756.16368,371.42346 705.22360,419.00727 696.32230,421.72397 C 687.42100,424.44066 661.26186,432.69145 661.26186,432.69145 z " - id="path32583" /> - <path - style="fill:url(#linearGradient32586);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 655.34683,430.74313 C 715.38299,392.34193 744.20412,378.30592 750.27742,379.23452 C 756.35071,380.16312 700.53634,421.92275 691.39232,423.65496 C 682.24831,425.38716 655.34683,430.74313 655.34683,430.74313 z " - id="path32585" /> - <path - style="fill:url(#linearGradient32588);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 651.61454,438.74758 C 711.84013,400.64414 740.73041,386.75103 746.79903,387.70969 C 752.86765,388.66835 696.84718,430.15109 687.69469,431.83799 C 678.54221,433.52488 651.61454,438.74758 651.61454,438.74758 z " - id="path32587" /> - <path - style="fill:url(#linearGradient32590);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 649.19925,446.06157 C 710.34387,409.45106 739.56715,396.27278 745.61035,397.38042 C 751.65356,398.48807 694.62966,438.58029 685.43845,440.04155 C 676.24724,441.50281 649.19925,446.06157 649.19925,446.06157 z " - id="path32589" /> - <path - style="fill:url(#linearGradient32592);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 656.63887,442.82942 C 713.54874,415.88969 740.18450,407.28373 745.19253,409.29279 C 750.20054,411.30186 696.34978,442.30658 688.32253,442.36066 C 680.29529,442.41472 656.63887,442.82942 656.63887,442.82942 z " - id="path32591" /> - <path - style="fill:url(#linearGradient32594);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 658.99673,442.25801 C 710.79935,424.33474 734.64485,419.91322 738.76587,422.67680 C 742.88689,425.44039 693.31806,447.86431 686.38542,446.67989 C 679.45280,445.49546 658.99673,442.25801 658.99673,442.25801 z " - id="path32593" /> - <path - style="fill:url(#linearGradient32596);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 657.46297,432.19015 C 708.16904,431.44160 730.85237,434.81269 734.16682,438.81875 C 737.48127,442.82482 688.05621,448.65877 681.88555,445.28178 C 675.71490,441.90479 657.46297,432.19015 657.46297,432.19015 z " - id="path32595" /> - </g> - <g - id="FrontWingShortFeathers"> - <path - style="fill:url(#linearGradient31675);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 655.51927,412.27597 C 661.48633,401.00567 666.45053,399.63230 668.33606,402.58435 C 670.22159,405.53640 673.96619,410.37900 670.31172,411.65725 C 666.65723,412.93549 655.51927,412.27597 655.51927,412.27597 z " - id="path31674" /> - <path - style="fill:url(#linearGradient31673);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 649.96991,419.67871 C 658.72605,410.40750 663.87672,410.40750 664.90685,413.75544 C 665.93699,417.10337 668.25479,422.76911 664.39179,423.02665 C 660.52878,423.28418 649.96991,419.67871 649.96991,419.67871 z " - id="path31672" /> - <path - style="fill:url(#linearGradient31671);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 651.00004,434.61565 C 659.75618,425.34444 664.90685,425.34444 665.93698,428.69238 C 666.96712,432.04031 669.28492,437.70605 665.42192,437.96359 C 661.55891,438.22112 651.00004,434.61565 651.00004,434.61565 z " - id="path31670" /> - <path - style="fill:url(#linearGradient31667);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 642.75897,451.09780 C 651.51511,441.82659 656.66578,441.82659 657.69591,445.17453 C 658.72605,448.52246 661.04385,454.18820 657.18085,454.44574 C 653.31784,454.70327 642.75897,451.09780 642.75897,451.09780 z " - id="path31666" /> - <path - style="fill:url(#linearGradient31663);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 644.30417,427.14718 C 653.06031,417.87597 658.21098,417.87597 659.24111,421.22391 C 660.27125,424.57184 662.58905,430.23758 658.72605,430.49512 C 654.86304,430.75265 644.30417,427.14718 644.30417,427.14718 z " - id="path31662" /> - <path - style="fill:url(#linearGradient31659);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 640.69870,445.94713 C 649.45484,436.67592 654.60551,436.67592 655.63564,440.02386 C 656.66578,443.37179 658.98358,449.03753 655.12058,449.29507 C 651.25757,449.55260 640.69870,445.94713 640.69870,445.94713 z " - id="path31658" /> - <path - style="fill:url(#linearGradient31657);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 630.18462,439.26715 C 638.94076,429.99594 644.09143,429.99594 645.12156,433.34388 C 646.15170,436.69181 648.46950,442.35755 644.60650,442.61509 C 640.74349,442.87262 630.18462,439.26715 630.18462,439.26715 z " - id="path30411" /> - <path - style="fill:url(#linearGradient31691);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 657.95345,435.90332 C 666.70959,426.63211 671.86026,426.63211 672.89039,429.98005 C 673.92053,433.32798 676.23833,438.99372 672.37533,439.25126 C 668.51232,439.50879 657.95345,435.90332 657.95345,435.90332 z " - id="path31690" /> - <path - style="fill:url(#linearGradient31693);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 653.31784,451.87040 C 662.07398,442.59919 667.22465,442.59919 668.25478,445.94713 C 669.28492,449.29506 671.60272,454.96080 667.73972,455.21834 C 663.87671,455.47587 653.31784,451.87040 653.31784,451.87040 z " - id="path31692" /> - <path - style="fill:url(#linearGradient31695);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 648.16717,460.11148 C 656.92331,450.84027 662.07398,450.84027 663.10411,454.18821 C 664.13425,457.53614 666.45205,463.20188 662.58905,463.45942 C 658.72604,463.71695 648.16717,460.11148 648.16717,460.11148 z " - id="path31694" /> - <path - style="fill:url(#linearGradient31697);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 676.77618,383.39852 C 682.39505,371.95065 687.31483,370.42579 689.28994,373.31868 C 691.26506,376.21156 695.15630,380.93713 691.54272,382.32677 C 687.92912,383.71640 676.77618,383.39852 676.77618,383.39852 z " - id="path31696" /> - <path - style="fill:url(#linearGradient31661);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 640.95623,435.90332 C 649.71237,426.63211 654.86304,426.63211 655.89317,429.98005 C 656.92331,433.32798 659.24111,438.99372 655.37811,439.25126 C 651.51510,439.50879 640.95623,435.90332 640.95623,435.90332 z " - id="path31660" /> - <path - style="fill:url(#linearGradient31665);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 638.12336,431.52525 C 646.87950,422.25404 652.03017,422.25404 653.06030,425.60198 C 654.09044,428.94991 656.40824,434.61565 652.54524,434.87319 C 648.68223,435.13072 638.12336,431.52525 638.12336,431.52525 z " - id="path31664" /> - <path - style="fill:url(#linearGradient31669);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 654.34798,444.65946 C 663.10412,435.38825 668.25479,435.38825 669.28492,438.73619 C 670.31506,442.08412 672.63286,447.74986 668.76986,448.00740 C 664.90685,448.26493 654.34798,444.65946 654.34798,444.65946 z " - id="path31668" /> - <path - style="fill:url(#linearGradient31677);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 662.68214,403.00236 C 666.94187,390.98237 671.65272,388.89976 673.94859,391.54529 C 676.24447,394.19081 680.65523,398.43557 677.22623,400.23308 C 673.79721,402.03059 662.68214,403.00236 662.68214,403.00236 z " - id="path31676" /> - <path - style="fill:url(#linearGradient31679);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 670.87721,393.72162 C 674.67836,381.54884 679.30691,379.28920 681.70138,381.84582 C 684.09586,384.40244 688.66432,388.47700 685.30590,390.40317 C 681.94747,392.32933 670.87721,393.72162 670.87721,393.72162 z " - id="path31678" /> - <path - style="fill:url(#linearGradient31681);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 659.75618,416.33077 C 668.51232,407.05956 673.66299,407.05956 674.69312,410.40750 C 675.72326,413.75543 678.04106,419.42117 674.17806,419.67871 C 670.31505,419.93624 659.75618,416.33077 659.75618,416.33077 z " - id="path31680" /> - <path - style="fill:url(#linearGradient31683);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 666.45205,406.02943 C 675.20819,396.75822 680.35886,396.75822 681.38899,400.10616 C 682.41913,403.45409 684.73693,409.11983 680.87393,409.37737 C 677.01092,409.63490 666.45205,406.02943 666.45205,406.02943 z " - id="path31682" /> - <path - style="fill:url(#linearGradient31685);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 672.63286,395.47055 C 681.38900,386.19934 686.53967,386.19934 687.56980,389.54728 C 688.59994,392.89521 690.91774,398.56095 687.05474,398.81849 C 683.19173,399.07602 672.63286,395.47055 672.63286,395.47055 z " - id="path31684" /> - <path - style="fill:url(#linearGradient31687);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 658.21098,425.85951 C 666.96712,416.58830 672.11779,416.58830 673.14792,419.93624 C 674.17806,423.28417 676.49586,428.94991 672.63286,429.20745 C 668.76985,429.46498 658.21098,425.85951 658.21098,425.85951 z " - id="path31686" /> - <path - style="fill:url(#linearGradient31699);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 683.31625,376.44614 C 688.08356,364.61829 692.87876,362.73800 695.05999,365.47883 C 697.24122,368.21964 701.46737,372.64823 697.96499,374.29821 C 694.46260,375.94819 683.31625,376.44614 683.31625,376.44614 z " - id="path31698" /> - <path - style="fill:url(#linearGradient31701);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 678.04106,386.19934 C 686.79720,376.92813 691.94787,376.92813 692.97800,380.27607 C 694.00814,383.62400 696.32594,389.28974 692.46294,389.54728 C 688.59993,389.80481 678.04106,386.19934 678.04106,386.19934 z " - id="path31700" /> - <path - style="fill:url(#linearGradient33239);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 632.57646,453.71217 C 638.54352,442.44187 643.50772,441.06850 645.39325,444.02055 C 647.27878,446.97260 651.02338,451.81520 647.36891,453.09345 C 643.71442,454.37169 632.57646,453.71217 632.57646,453.71217 z " - id="path33238" /> - <path - style="fill:url(#linearGradient33241);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 626.39565,450.87930 C 632.36271,439.60900 637.32691,438.23563 639.21244,441.18768 C 641.09797,444.13973 644.84257,448.98233 641.18810,450.26058 C 637.53361,451.53882 626.39565,450.87930 626.39565,450.87930 z " - id="path33240" /> - <path - style="fill:url(#linearGradient33243);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 635.40932,463.49844 C 641.37638,452.22814 646.34058,450.85477 648.22611,453.80682 C 650.11164,456.75887 653.85624,461.60147 650.20177,462.87972 C 646.54728,464.15796 635.40932,463.49844 635.40932,463.49844 z " - id="path33242" /> - <path - style="fill:url(#linearGradient33245);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 644.16547,461.95324 C 650.13253,450.68294 655.09673,449.30957 656.98226,452.26162 C 658.86779,455.21367 662.61239,460.05627 658.95792,461.33452 C 655.30343,462.61276 644.16547,461.95324 644.16547,461.95324 z " - id="path33244" /> - <path - style="fill:url(#linearGradient33247);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 646.74080,470.19432 C 652.70786,458.92402 657.67206,457.55065 659.55759,460.50270 C 661.44312,463.45475 665.18772,468.29735 661.53325,469.57560 C 657.87876,470.85384 646.74080,470.19432 646.74080,470.19432 z " - id="path33246" /> - </g> - </g> - <g - id="FrontWingSwoosh"> - <path - style="fill:url(#radialGradient4143);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 733.10739,293.85120 C 808.88563,341.05589 740.93444,476.67846 631.50566,498.52647 L 642.79758,429.45469 L 733.10739,293.85120 z " - id="path4142" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#radialGradient17593);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 745.08329,311.52412 C 809.02101,371.89671 767.70669,481.93255 645.37244,486.92444 L 654.24673,446.86423 L 745.08329,311.52412 z " - id="path17592" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#radialGradient17603);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 739.50530,339.44151 C 797.13436,374.89303 753.98501,466.59934 644.55623,488.44735 L 652.35602,464.77330 L 739.50530,339.44151 z " - id="path17602" - sodipodi:nodetypes="cccc" /> - <path - style="fill:url(#radialGradient17605);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 726.20618,379.26109 C 762.97691,414.39148 764.99866,475.19535 655.56988,497.04336 L 657.45991,462.35566 L 726.20618,379.26109 z " - id="path17604" - sodipodi:nodetypes="cccc" /> - </g> - </g> - <g - id="g2585" - transform="matrix(0.984584,-0.803347,0.691693,1.069070,524.7468,788.9838)"> - <path - style="fill:url(#linearGradient2588);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 43.495157,164.66019 C 276.50486,388.34951 338.64079,376.95793 423.55988,385.24272 C 508.47898,393.52751 694.88669,258.89967 724.91909,252.68608 C 754.95149,246.47249 752.88029,251.65048 765.30749,256.82848 C 748.73789,210.22653 666.92559,97.346281 611.00319,62.135921 C 555.08089,26.925563 404.91910,-13.462777 280.64726,19.676373 C 198.83496,38.317153 115.98706,135.66343 43.495157,164.66019 z " - id="path2586" - sodipodi:nodetypes="ccccccc" /> - <path - style="fill:#080762;fill-opacity:0.053475920;fill-rule:evenodd;stroke:none;stroke-width:0.25000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" - d="M 449.21875,12.343750 C 372.55367,131.34626 351.03163,190.15459 345.31250,234.71875 C 296.43407,228.74167 250.88253,220.20102 210.06250,211.18750 C 210.18144,159.47011 307.03125,15.562500 307.03125,15.562500 C 231.73758,132.43627 211.35292,167.53740 205.28125,210.12500 C 111.44954,189.10115 46.625000,165.87500 46.625000,165.87500 C 95.278072,186.13432 149.62093,202.52998 204.53125,215.34375 C 205.73417,244.61892 210.49875,254.89076 234.81250,324.93750 C 212.11540,236.98624 209.34258,255.80079 209.75000,216.50000 C 255.62272,227.00430 301.69759,235.02520 345.12500,240.43750 C 346.64554,269.96362 353.89092,311.29960 377.53125,379.40625 C 355.00622,292.12181 351.03030,281.31222 351.31250,241.25000 C 399.42652,247.01704 443.95673,249.65958 480.81250,249.21875 C 482.09933,277.29978 486.10250,295.38014 509.81250,363.68750 C 486.91509,274.96003 484.85720,289.97427 485.34375,249.09375 C 521.11851,248.40068 549.34122,244.76072 565.71875,238.12500 C 576.82659,233.17150 593.20091,230.91691 611.78125,230.34375 C 609.02322,239.26769 604.15131,267.42325 620.50000,307.75000 C 605.49195,257.72323 612.64130,247.27739 614.87500,230.31250 C 668.07068,229.21004 737.88540,241.30570 757.40625,245.12500 C 735.98732,234.66460 664.92792,227.25580 615.21875,228.21875 C 615.22870,228.11904 615.24045,228.03777 615.25000,227.93750 C 616.41525,215.70752 675.84375,123.06250 675.84375,123.06250 C 614.59722,216.66570 616.91444,216.32105 612.43750,228.21875 C 605.01927,228.41116 598.05690,228.77061 591.93750,229.37500 C 561.08150,232.42251 544.14471,244.86783 485.50000,246.00000 C 481.12067,196.29050 582.62500,47.906250 582.62500,47.906250 C 504.83281,168.65828 486.07119,201.47841 480.75000,246.09375 C 450.57954,246.34478 409.84371,243.69470 351.53125,235.56250 C 347.17084,177.77103 449.21875,12.343750 449.21875,12.343750 z " - id="path2587" - sodipodi:nodetypes="cccccccccccccccccccccccccccccc" /> - </g> -</svg> diff --git a/tests/auto/qdatastream/qdatastream.pro b/tests/auto/qdatastream/qdatastream.pro index 39bd09ef86..5e503aea78 100644 --- a/tests/auto/qdatastream/qdatastream.pro +++ b/tests/auto/qdatastream/qdatastream.pro @@ -1,23 +1,14 @@ load(qttest_p4) SOURCES += tst_qdatastream.cpp -!symbian: { -cross_compile: DEFINES += SVGFILE=\\\"tests2.svg\\\" -else: DEFINES += SVGFILE=\\\"gearflowers.svg\\\" -} - -# for qpaintdevicemetrics.h -QT += svg - - wince*: { - addFiles.files = datastream.q42 tests2.svg + addFiles.files = datastream.q42 addFiles.path = . DEPLOYMENT += addFiles DEFINES += SRCDIR=\\\"\\\" } else:symbian { - # SRCDIR and SVGFILE defined in code in symbian - addFiles.files = datastream.q42 tests2.svg + # SRCDIR defined in code in symbian + addFiles.files = datastream.q42 addFiles.path = . DEPLOYMENT += addFiles TARGET.EPOCHEAPSIZE = 1000000 10000000 diff --git a/tests/auto/qdatastream/tests2.svg b/tests/auto/qdatastream/tests2.svg deleted file mode 100644 index e7942c7e19..0000000000 --- a/tests/auto/qdatastream/tests2.svg +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > -<!-- SVG content generated using Symbology Configuration Management System (SCMS) --> -<!-- Systematic Software Engineering Ltd. - www.systematic.co.uk - do not remove --> -<svg id="SUZP-----------" width="400px" height="400px" viewBox="0 0 400 400"> -<g > -<svg viewBox="0 0 400 400" id="_0.SUZ------------" width="400px" height="400px"><path d="M115 285 C115 400 285 400 285 285 C400 285 400 115 285 115 C285 0 115 0 115 115 C0 115 0 285 115 285 z" style="fill:rgb(255,255,128);stroke:rgb(0,0,0);stroke-width:10"></path> -<text x="130px" y="180px" style="font-size:100;font-family:Arial;fill:rgb(0,0,0)">U</text> -</svg> - -</g> -</svg> diff --git a/tests/auto/qdatastream/tst_qdatastream.cpp b/tests/auto/qdatastream/tst_qdatastream.cpp index 70d37e9749..d05b664b42 100644 --- a/tests/auto/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/qdatastream/tst_qdatastream.cpp @@ -42,16 +42,11 @@ #include <QtTest/QtTest> #include <QtGui/QtGui> -#ifdef QT3_SUPPORT -#include <Qt3Support/Qt3Support> -#endif -#include <QtSvg/QtSvg> #if defined(Q_OS_SYMBIAN) # define STRINGIFY(x) #x # define TOSTRING(x) STRINGIFY(x) # define SRCDIR "C:/Private/" TOSTRING(SYMBIAN_SRCDIR_UID) "/" -#define SVGFILE "tests2.svg" #endif Q_DECLARE_METATYPE(QBitArray) @@ -114,12 +109,6 @@ private slots: void stream_QImage_data(); void stream_QImage(); - void stream_QPalette_data(); - void stream_QPalette(); - - void stream_QColorGroup_data(); - void stream_QColorGroup(); - void stream_QPen_data(); void stream_QPen(); @@ -156,9 +145,6 @@ private slots: void stream_qint64_data(); void stream_qint64(); - void stream_QWMatrix_data(); - void stream_QWMatrix(); - void stream_QIcon_data(); void stream_QIcon(); @@ -211,10 +197,6 @@ private slots: void floatingPointPrecision(); -#ifdef QT3_SUPPORT - void task_224283(); -#endif - void compatibility_Qt3(); void compatibility_Qt2(); @@ -232,8 +214,6 @@ private: void writeQDateTime(QDataStream *s); void writeQFont(QDataStream *s); void writeQImage(QDataStream *s); - void writeQPalette(QDataStream *s); - void writeQColorGroup(QDataStream *s); void writeQPen(QDataStream *s); void writeQPixmap(QDataStream *s); void writeQPoint(QDataStream *s); @@ -246,7 +226,6 @@ private: void writeMap(QDataStream* dev); void writeHash(QDataStream* dev); void writeqint64(QDataStream *s); - void writeQWMatrix(QDataStream *s); void writeQIcon(QDataStream *s); void writeQEasingCurve(QDataStream *s); @@ -262,8 +241,6 @@ private: void readQDateTime(QDataStream *s); void readQFont(QDataStream *s); void readQImage(QDataStream *s); - void readQPalette(QDataStream *s); - void readQColorGroup(QDataStream *s); void readQPen(QDataStream *s); void readQPixmap(QDataStream *s); void readQPoint(QDataStream *s); @@ -276,12 +253,8 @@ private: void readMap(QDataStream *s); void readHash(QDataStream *s); void readqint64(QDataStream *s); - void readQWMatrix(QDataStream *s); void readQIcon(QDataStream *s); void readQEasingCurve(QDataStream *s); - -private: - QString svgFile; }; static int NColorRoles[] = { @@ -327,7 +300,6 @@ void tst_QDataStream::getSetCheck() tst_QDataStream::tst_QDataStream() { - svgFile = QLatin1String(SRCDIR SVGFILE); } tst_QDataStream::~tst_QDataStream() @@ -347,12 +319,12 @@ static int dataIndex(const QString &tag) { int pos = tag.lastIndexOf("_"); if (pos >= 0) { - int ret = 0; - QString count = tag.mid(pos + 1); - bool ok; - ret = count.toInt(&ok); - if (ok) - return ret; + int ret = 0; + QString count = tag.mid(pos + 1); + bool ok; + ret = count.toInt(&ok); + if (ok) + return ret; } return -1; } @@ -378,15 +350,15 @@ void tst_QDataStream::stream_data(int noOfElements) QTest::addColumn<QString>("byteOrder"); for (int d=0; devices[d] != 0; d++) { - QString device = devices[d]; - for (int b=0; b<2; b++) { - QString byte_order = b == 0 ? "BigEndian" : "LittleEndian"; - - QString tag = device + "_" + byte_order; - for (int e=0; e<noOfElements; e++) { - QTest::newRow(qPrintable(tag + QString("_%1").arg(e))) << device << QString(byte_order); - } - } + QString device = devices[d]; + for (int b=0; b<2; b++) { + QString byte_order = b == 0 ? "BigEndian" : "LittleEndian"; + + QString tag = device + "_" + byte_order; + for (int e=0; e<noOfElements; e++) { + QTest::newRow(qPrintable(tag + QString("_%1").arg(e))) << device << QString(byte_order); + } + } } } @@ -415,50 +387,49 @@ static const char* open_xpm[]={ #define STREAM_IMPL(TYPE) \ QFETCH(QString, device); \ if (device == "bytearray") { \ - QByteArray ba; \ - QDataStream sout(&ba, QIODevice::WriteOnly); \ - write##TYPE(&sout); \ - QDataStream sin(&ba, QIODevice::ReadOnly); \ - read##TYPE(&sin); \ + QByteArray ba; \ + QDataStream sout(&ba, QIODevice::WriteOnly); \ + write##TYPE(&sout); \ + QDataStream sin(&ba, QIODevice::ReadOnly); \ + read##TYPE(&sin); \ } else if (device == "file") { \ - QString fileName = "qdatastream.out"; \ - QFile fOut(fileName); \ - QVERIFY(fOut.open(QIODevice::WriteOnly)); \ - QDataStream sout(&fOut); \ - write##TYPE(&sout); \ - fOut.close(); \ - QFile fIn(fileName); \ - QVERIFY(fIn.open(QIODevice::ReadOnly)); \ - QDataStream sin(&fIn); \ - read##TYPE(&sin); \ - fIn.close(); \ + QString fileName = "qdatastream.out"; \ + QFile fOut(fileName); \ + QVERIFY(fOut.open(QIODevice::WriteOnly)); \ + QDataStream sout(&fOut); \ + write##TYPE(&sout); \ + fOut.close(); \ + QFile fIn(fileName); \ + QVERIFY(fIn.open(QIODevice::ReadOnly)); \ + QDataStream sin(&fIn); \ + read##TYPE(&sin); \ + fIn.close(); \ } else if (device == "buffer") { \ - QByteArray ba(10000, '\0'); \ - QBuffer bOut(&ba); \ - bOut.open(QIODevice::WriteOnly); \ - QDataStream sout(&bOut); \ - write##TYPE(&sout); \ - bOut.close(); \ - QBuffer bIn(&ba); \ - bIn.open(QIODevice::ReadOnly); \ - QDataStream sin(&bIn); \ - read##TYPE(&sin); \ - bIn.close(); \ + QByteArray ba(10000, '\0'); \ + QBuffer bOut(&ba); \ + bOut.open(QIODevice::WriteOnly); \ + QDataStream sout(&bOut); \ + write##TYPE(&sout); \ + bOut.close(); \ + QBuffer bIn(&ba); \ + bIn.open(QIODevice::ReadOnly); \ + QDataStream sin(&bIn); \ + read##TYPE(&sin); \ + bIn.close(); \ } // ************************************ static QString QStringData(int index) { - switch (index) - { - case 0: return QString(); - case 1: return QString(""); - case 2: return QString("A"); - case 3: return QString("ABCDE FGHI"); - case 4: return QString("This is a long string"); - case 5: return QString("And again a string with a \nCRLF"); - case 6: return QString("abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRESTUVWXYZ 1234567890 ~`!@#$%^&*()_-+={[}]|\\:;\"'<,>.?/"); + switch (index) { + case 0: return QString(); + case 1: return QString(""); + case 2: return QString("A"); + case 3: return QString("ABCDE FGHI"); + case 4: return QString("This is a long string"); + case 5: return QString("And again a string with a \nCRLF"); + case 6: return QString("abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRESTUVWXYZ 1234567890 ~`!@#$%^&*()_-+={[}]|\\:;\"'<,>.?/"); } return QString("foo"); } @@ -517,15 +488,15 @@ void tst_QDataStream::readQString(QDataStream *s) static QRegExp QRegExpData(int index) { - switch (index) - { - case 0: return QRegExp(); - case 1: return QRegExp(""); - case 2: return QRegExp("A", Qt::CaseInsensitive); - case 3: return QRegExp("ABCDE FGHI", Qt::CaseSensitive, QRegExp::Wildcard); - case 4: return QRegExp("This is a long string", Qt::CaseInsensitive, QRegExp::FixedString); - case 5: return QRegExp("And again a string with a \nCRLF", Qt::CaseInsensitive, QRegExp::RegExp); - case 6: { + switch (index) { + case 0: return QRegExp(); + case 1: return QRegExp(""); + case 2: return QRegExp("A", Qt::CaseInsensitive); + case 3: return QRegExp("ABCDE FGHI", Qt::CaseSensitive, QRegExp::Wildcard); + case 4: return QRegExp("This is a long string", Qt::CaseInsensitive, QRegExp::FixedString); + case 5: return QRegExp("And again a string with a \nCRLF", Qt::CaseInsensitive, QRegExp::RegExp); + case 6: + { QRegExp rx("abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRESTUVWXYZ 1234567890 ~`!@#$%^&*()_-+={[}]|\\:;\"'<,>.?/"); rx.setMinimal(true); return rx; @@ -586,22 +557,21 @@ static Map MapData(int index) { Map map; - switch (index) - { - case 0: - default: - break; - case 1: - map.insert(1, "a"); - map.insert(2, "bbb"); - map.insert(3, "cccccc"); - break; - case 2: - map.insert(1, "a"); - map.insert(2, "one"); - map.insertMulti(2, "two"); - map.insertMulti(2, "three"); - map.insert(3, "cccccc"); + switch (index) { + case 0: + default: + break; + case 1: + map.insert(1, "a"); + map.insert(2, "bbb"); + map.insert(3, "cccccc"); + break; + case 2: + map.insert(1, "a"); + map.insert(2, "one"); + map.insertMulti(2, "two"); + map.insertMulti(2, "three"); + map.insert(3, "cccccc"); } return map; } @@ -643,22 +613,21 @@ static Hash HashData(int index) { Hash map; - switch (index) - { - case 0: - default: - break; - case 1: - map.insert(1, "a"); - map.insert(2, "bbb"); - map.insert(3, "cccccc"); - break; - case 2: - map.insert(1, "a"); - map.insert(2, "one"); - map.insertMulti(2, "two"); - map.insertMulti(2, "three"); - map.insert(3, "cccccc"); + switch (index) { + case 0: + default: + break; + case 1: + map.insert(1, "a"); + map.insert(2, "bbb"); + map.insert(3, "cccccc"); + break; + case 2: + map.insert(1, "a"); + map.insert(2, "one"); + map.insertMulti(2, "two"); + map.insertMulti(2, "three"); + map.insert(3, "cccccc"); } return map; } @@ -700,32 +669,32 @@ static QEasingCurve QEasingCurveData(int index) switch (index) { case 0: - default: - break; + default: + break; case 1: - easing.setType(QEasingCurve::Linear); - break; + easing.setType(QEasingCurve::Linear); + break; case 2: - easing.setType(QEasingCurve::OutCubic); - break; + easing.setType(QEasingCurve::OutCubic); + break; case 3: - easing.setType(QEasingCurve::InOutSine); - break; + easing.setType(QEasingCurve::InOutSine); + break; case 4: - easing.setType(QEasingCurve::InOutElastic); - easing.setPeriod(1.5); - easing.setAmplitude(2.0); - break; + easing.setType(QEasingCurve::InOutElastic); + easing.setPeriod(1.5); + easing.setAmplitude(2.0); + break; case 5: - easing.setType(QEasingCurve::OutInBack); - break; + easing.setType(QEasingCurve::OutInBack); + break; case 6: - easing.setType(QEasingCurve::OutCurve); - break; + easing.setType(QEasingCurve::OutCurve); + break; case 7: - easing.setType(QEasingCurve::InOutBack); - easing.setOvershoot(0.5); - break; + easing.setType(QEasingCurve::InOutBack); + easing.setOvershoot(0.5); + break; } return easing; } @@ -811,13 +780,12 @@ void tst_QDataStream::readqint64(QDataStream *s) static bool boolData(int index) { - switch (index) - { - case 0: return true; - case 1: return false; - case 2: return bool(2); - case 3: return bool(-1); - case 4: return bool(127); + switch (index) { + case 0: return true; + case 1: return false; + case 2: return bool(2); + case 3: return bool(-1); + case 4: return bool(127); } return false; @@ -852,13 +820,12 @@ void tst_QDataStream::readbool(QDataStream *s) static QBool QBoolData(int index) { - switch (index) - { - case 0: return QBool(true); - case 1: return QBool(false); - case 2: return QBool(bool(2)); - case 3: return QBool(bool(-1)); - case 4: return QBool(bool(127)); + switch (index) { + case 0: return QBool(true); + case 1: return QBool(false); + case 2: return QBool(bool(2)); + case 3: return QBool(bool(-1)); + case 4: return QBool(bool(127)); } return QBool(false); @@ -905,35 +872,34 @@ void tst_QDataStream::stream_QBool_in_4_0() static void QBitArrayData(QBitArray *b, int index) { QString filler = ""; - switch (index) - { - case 0: filler = ""; break; - case 1: filler = ""; break; - case 2: filler = "0"; break; - case 3: filler = "1"; break; - case 4: filler = "0000"; break; - case 5: filler = "0001"; break; - case 6: filler = "0010"; break; - case 7: filler = "0100"; break; - case 8: filler = "1000"; break; - case 9: filler = "1111"; break; - case 10: filler = "00000000"; break; - case 11: filler = "00000001"; break; - case 12: filler = "11111111"; break; - case 13: filler = "000000001"; break; - case 14: filler = "000000000001"; break; - case 15: filler = "0000000000000001"; break; - case 16: filler = "0101010101010101010101010101010101010101010101010101010101010101"; break; - case 17: filler = "1010101010101010101010101010101010101010101010101010101010101010"; break; - case 18: filler = "1111111111111111111111111111111111111111111111111111111111111111"; break; + switch (index) { + case 0: filler = ""; break; + case 1: filler = ""; break; + case 2: filler = "0"; break; + case 3: filler = "1"; break; + case 4: filler = "0000"; break; + case 5: filler = "0001"; break; + case 6: filler = "0010"; break; + case 7: filler = "0100"; break; + case 8: filler = "1000"; break; + case 9: filler = "1111"; break; + case 10: filler = "00000000"; break; + case 11: filler = "00000001"; break; + case 12: filler = "11111111"; break; + case 13: filler = "000000001"; break; + case 14: filler = "000000000001"; break; + case 15: filler = "0000000000000001"; break; + case 16: filler = "0101010101010101010101010101010101010101010101010101010101010101"; break; + case 17: filler = "1010101010101010101010101010101010101010101010101010101010101010"; break; + case 18: filler = "1111111111111111111111111111111111111111111111111111111111111111"; break; } b->resize(filler.length()); b->fill(0); // reset all bits to zero for (int i = 0; i < filler.length(); ++i) { - if (filler.at(i) == '1') - b->setBit(i, TRUE); + if (filler.at(i) == '1') + b->setBit(i, TRUE); } } @@ -968,19 +934,19 @@ void tst_QDataStream::readQBitArray(QDataStream *s) static QBrush qBrushData(int index) { - switch (index) - { - case 0: return QBrush(Qt::NoBrush); - case 1: return QBrush(Qt::SolidPattern); - case 2: return QBrush(Qt::Dense7Pattern); - case 3: return QBrush(Qt::red, Qt::NoBrush); - case 4: return QBrush(Qt::green, Qt::SolidPattern); - case 5: return QBrush(Qt::blue, Qt::Dense7Pattern); - case 6: { - QPixmap pm(open_xpm); - QBrush custom(Qt::black, pm); - return custom; - } + switch (index) { + case 0: return QBrush(Qt::NoBrush); + case 1: return QBrush(Qt::SolidPattern); + case 2: return QBrush(Qt::Dense7Pattern); + case 3: return QBrush(Qt::red, Qt::NoBrush); + case 4: return QBrush(Qt::green, Qt::SolidPattern); + case 5: return QBrush(Qt::blue, Qt::Dense7Pattern); + case 6: + { + QPixmap pm(open_xpm); + QBrush custom(Qt::black, pm); + return custom; + } case 7: QLinearGradient gradient(QPoint(2.718, 3.142), QPoint(3.1337, 42)); gradient.setCoordinateMode(QGradient::ObjectBoundingMode); @@ -1003,7 +969,7 @@ void tst_QDataStream::stream_QBrush_data() void tst_QDataStream::stream_QBrush() { if (QString(QTest::currentDataTag()).endsWith("6")) - QSKIP("Custom brushes don't seem to be supported with QDataStream", SkipSingle); + QSKIP("Custom brushes don't seem to be supported with QDataStream", SkipSingle); STREAM_IMPL(QBrush); } @@ -1027,16 +993,15 @@ void tst_QDataStream::readQBrush(QDataStream *s) static QColor QColorData(int index) { - switch (index) - { - case 0: return QColor(0,0,0); - case 1: return QColor(0,0,0); - case 2: return QColor(0,0,0); - case 3: return QColor(0,0,0); - case 4: return QColor(0,0,0); - case 5: return QColor(0,0,0); - case 6: return QColor(0,0,0); - case 7: return QColor(0,0,0); + switch (index) { + case 0: return QColor(0,0,0); + case 1: return QColor(0,0,0); + case 2: return QColor(0,0,0); + case 3: return QColor(0,0,0); + case 4: return QColor(0,0,0); + case 5: return QColor(0,0,0); + case 6: return QColor(0,0,0); + case 7: return QColor(0,0,0); } return QColor(0,0,0); @@ -1071,16 +1036,15 @@ void tst_QDataStream::readQColor(QDataStream *s) static QByteArray qByteArrayData(int index) { - switch (index) - { - case 0: return QByteArray(); - case 1: return QByteArray(""); - case 2: return QByteArray("foo"); - case 3: return QByteArray("foo bar"); - case 4: return QByteArray("two\nlines"); - case 5: return QByteArray("ABCDEFG"); - case 6: return QByteArray("baec zxv 123"); // kept for nostalgic reasons - case 7: return QByteArray("jbc;UBC;jd clhdbcahd vcbd vgdv dhvb laifv kadf jkhfbvljd khd lhvjh "); + switch (index) { + case 0: return QByteArray(); + case 1: return QByteArray(""); + case 2: return QByteArray("foo"); + case 3: return QByteArray("foo bar"); + case 4: return QByteArray("two\nlines"); + case 5: return QByteArray("ABCDEFG"); + case 6: return QByteArray("baec zxv 123"); // kept for nostalgic reasons + case 7: return QByteArray("jbc;UBC;jd clhdbcahd vcbd vgdv dhvb laifv kadf jkhfbvljd khd lhvjh "); } return QByteArray("foo"); @@ -1114,22 +1078,16 @@ void tst_QDataStream::readQByteArray(QDataStream *s) #ifndef QT_NO_CURSOR static QCursor qCursorData(int index) { - switch (index) - { -#ifdef QT3_SUPPORT - case 0: return QCursor(Qt::arrowCursor); - case 1: return QCursor(Qt::waitCursor); -#else + switch (index) { case 0: return QCursor(Qt::ArrowCursor); case 1: return QCursor(Qt::WaitCursor); -#endif - case 2: return QCursor(Qt::BitmapCursor); - case 3: return QCursor(Qt::BlankCursor); - case 4: return QCursor(Qt::BlankCursor); - case 5: return QCursor(QPixmap(open_xpm), 1, 1); - case 6: { QPixmap pm(open_xpm); return QCursor(QBitmap(pm), pm.mask(), 3, 4); } - case 7: return QCursor(QPixmap(open_xpm), -1, 5); - case 8: return QCursor(QPixmap(open_xpm), 5, -1); + case 2: return QCursor(Qt::BitmapCursor); + case 3: return QCursor(Qt::BlankCursor); + case 4: return QCursor(Qt::BlankCursor); + case 5: return QCursor(QPixmap(open_xpm), 1, 1); + case 6: { QPixmap pm(open_xpm); return QCursor(QBitmap(pm), pm.mask(), 3, 4); } + case 7: return QCursor(QPixmap(open_xpm), -1, 5); + case 8: return QCursor(QPixmap(open_xpm), 5, -1); } return QCursor(); @@ -1169,10 +1127,10 @@ void tst_QDataStream::readQCursor(QDataStream *s) QVERIFY(d5.hotSpot() == test.hotSpot()); QVERIFY((d5.bitmap() != 0 && test.bitmap() != 0) || (d5.bitmap() == 0 && test.bitmap() == 0)); if (d5.bitmap() != 0) - QVERIFY(pixmapsAreEqual(d5.bitmap(), test.bitmap())); + QVERIFY(pixmapsAreEqual(d5.bitmap(), test.bitmap())); QVERIFY((d5.mask() != 0 && test.mask() != 0) || (d5.mask() == 0 && test.mask() == 0)); if (d5.mask() != 0) - QVERIFY(pixmapsAreEqual(d5.mask(), test.mask())); + QVERIFY(pixmapsAreEqual(d5.mask(), test.mask())); #endif } @@ -1180,24 +1138,23 @@ void tst_QDataStream::readQCursor(QDataStream *s) static QDate qDateData(int index) { - switch (index) - { - case 0: return QDate(1752, 9, 14); // the first valid date - case 1: return QDate(1900, 1, 1); - case 2: return QDate(1976, 4, 5); - case 3: return QDate(1960, 5, 27); - case 4: return QDate(1999, 12, 31); // w2k effects? - case 5: return QDate(2000, 1, 1); - case 6: return QDate(2050, 1, 1);// test some values far in the future too - case 7: return QDate(3001, 12, 31); - case 8: return QDate(4002, 1, 1); - case 9: return QDate(4003, 12, 31); - case 10: return QDate(5004, 1, 1); - case 11: return QDate(5005, 12, 31); - case 12: return QDate(6006, 1, 1); - case 13: return QDate(6007, 12, 31); - case 14: return QDate(7008, 1, 1); - case 15: return QDate(7009, 12, 31); + switch (index) { + case 0: return QDate(1752, 9, 14); // the first valid date + case 1: return QDate(1900, 1, 1); + case 2: return QDate(1976, 4, 5); + case 3: return QDate(1960, 5, 27); + case 4: return QDate(1999, 12, 31); // w2k effects? + case 5: return QDate(2000, 1, 1); + case 6: return QDate(2050, 1, 1);// test some values far in the future too + case 7: return QDate(3001, 12, 31); + case 8: return QDate(4002, 1, 1); + case 9: return QDate(4003, 12, 31); + case 10: return QDate(5004, 1, 1); + case 11: return QDate(5005, 12, 31); + case 12: return QDate(6006, 1, 1); + case 13: return QDate(6007, 12, 31); + case 14: return QDate(7008, 1, 1); + case 15: return QDate(7009, 12, 31); } return QDate(); } @@ -1231,8 +1188,7 @@ void tst_QDataStream::readQDate(QDataStream *s) static QTime qTimeData(int index) { - switch (index) - { + switch (index) { case 0 : return QTime(0, 0, 0, 0); case 1 : return QTime(0, 0, 0, 1); case 2 : return QTime(0, 0, 0, 99); @@ -1326,24 +1282,23 @@ void tst_QDataStream::readQTime(QDataStream *s) static QDateTime qDateTimeData(int index) { - switch (index) - { - case 0: return QDateTime(QDate(1900, 1, 1), QTime(0,0,0,0)); - case 1: return QDateTime(QDate(1900, 1, 2), QTime(1,1,1,1)); - case 2: return QDateTime(QDate(1900, 1, 3), QTime(12,0,0,0)); - case 3: return QDateTime(QDate(1900, 1, 4), QTime(23,59,59,999)); - case 4: return QDateTime(QDate(1999, 1, 1), QTime(0,0,0,0)); - case 5: return QDateTime(QDate(1999, 1, 2), QTime(1,1,1,1)); - case 6: return QDateTime(QDate(1999, 1, 3), QTime(12,0,0,0)); - case 7: return QDateTime(QDate(1999, 1, 4), QTime(23,59,59,999)); - case 8: return QDateTime(QDate(2000, 1, 1), QTime(0,0,0,0)); - case 9: return QDateTime(QDate(2000, 1, 2), QTime(1,1,1,1)); - case 10: return QDateTime(QDate(2000, 1, 3), QTime(12,0,0,0)); - case 11: return QDateTime(QDate(2000, 1, 4), QTime(23,59,59,999)); - case 12: return QDateTime(QDate(2000, 12, 31), QTime(0,0,0,0)); - case 13: return QDateTime(QDate(2000, 12, 31), QTime(1,1,1,1)); - case 14: return QDateTime(QDate(2000, 12, 31), QTime(12,0,0,0)); - case 15: return QDateTime(QDate(2000, 12, 31), QTime(23,59,59,999)); + switch (index) { + case 0: return QDateTime(QDate(1900, 1, 1), QTime(0,0,0,0)); + case 1: return QDateTime(QDate(1900, 1, 2), QTime(1,1,1,1)); + case 2: return QDateTime(QDate(1900, 1, 3), QTime(12,0,0,0)); + case 3: return QDateTime(QDate(1900, 1, 4), QTime(23,59,59,999)); + case 4: return QDateTime(QDate(1999, 1, 1), QTime(0,0,0,0)); + case 5: return QDateTime(QDate(1999, 1, 2), QTime(1,1,1,1)); + case 6: return QDateTime(QDate(1999, 1, 3), QTime(12,0,0,0)); + case 7: return QDateTime(QDate(1999, 1, 4), QTime(23,59,59,999)); + case 8: return QDateTime(QDate(2000, 1, 1), QTime(0,0,0,0)); + case 9: return QDateTime(QDate(2000, 1, 2), QTime(1,1,1,1)); + case 10: return QDateTime(QDate(2000, 1, 3), QTime(12,0,0,0)); + case 11: return QDateTime(QDate(2000, 1, 4), QTime(23,59,59,999)); + case 12: return QDateTime(QDate(2000, 12, 31), QTime(0,0,0,0)); + case 13: return QDateTime(QDate(2000, 12, 31), QTime(1,1,1,1)); + case 14: return QDateTime(QDate(2000, 12, 31), QTime(12,0,0,0)); + case 15: return QDateTime(QDate(2000, 12, 31), QTime(23,59,59,999)); } return QDateTime(QDate(1900, 1, 1), QTime(0,0,0)); } @@ -1377,83 +1332,82 @@ void tst_QDataStream::readQDateTime(QDataStream *s) static QFont qFontData(int index) { - switch (index) - { - case 0: return QFont("Courier", 20, QFont::Bold, TRUE); - case 1: return QFont("Courier", 18, QFont::Bold, FALSE); - case 2: return QFont("Courier", 16, QFont::Light, TRUE); - case 3: return QFont("Courier", 14, QFont::Normal, FALSE); - case 4: return QFont("Courier", 12, QFont::DemiBold, TRUE); - case 5: return QFont("Courier", 10, QFont::Black, FALSE); - case 6: - { - QFont f("Helvetica", 10, QFont::Normal, FALSE); - f.setPixelSize(2); - f.setUnderline(FALSE); - f.setStrikeOut(FALSE); - f.setFixedPitch(FALSE); - return f; - } - case 7: - { - QFont f("Helvetica", 10, QFont::Bold, FALSE); - f.setPixelSize(4); - f.setUnderline(TRUE); - f.setStrikeOut(FALSE); - f.setFixedPitch(FALSE); - return f; - } - case 8: - { - QFont f("Helvetica", 10, QFont::Light, FALSE); - f.setPixelSize(6); - f.setUnderline(FALSE); - f.setStrikeOut(TRUE); - f.setFixedPitch(FALSE); - return f; - } - case 9: - { - QFont f("Helvetica", 10, QFont::DemiBold, FALSE); - f.setPixelSize(8); - f.setUnderline(FALSE); - f.setStrikeOut(FALSE); - f.setFixedPitch(TRUE); - return f; - } - case 10: - { - QFont f("Helvetica", 10, QFont::Black, FALSE); - f.setPixelSize(10); - f.setUnderline(TRUE); - f.setStrikeOut(TRUE); - f.setFixedPitch(FALSE); - return f; - } - case 11: - { - QFont f("Helvetica", 10, QFont::Normal, TRUE); - f.setPixelSize(12); - f.setUnderline(FALSE); - f.setStrikeOut(TRUE); - f.setFixedPitch(TRUE); - return f; - } - case 12: - { - QFont f("Helvetica", 10, QFont::Bold, TRUE); - f.setPixelSize(14); - f.setUnderline(TRUE); - f.setStrikeOut(TRUE); - f.setFixedPitch(TRUE); - return f; - } - case 13: - { - QFont f("Helvetica", 10, QFont::Bold, TRUE); - f.setStretch(200); - return f; - } + switch (index) { + case 0: return QFont("Courier", 20, QFont::Bold, TRUE); + case 1: return QFont("Courier", 18, QFont::Bold, FALSE); + case 2: return QFont("Courier", 16, QFont::Light, TRUE); + case 3: return QFont("Courier", 14, QFont::Normal, FALSE); + case 4: return QFont("Courier", 12, QFont::DemiBold, TRUE); + case 5: return QFont("Courier", 10, QFont::Black, FALSE); + case 6: + { + QFont f("Helvetica", 10, QFont::Normal, FALSE); + f.setPixelSize(2); + f.setUnderline(FALSE); + f.setStrikeOut(FALSE); + f.setFixedPitch(FALSE); + return f; + } + case 7: + { + QFont f("Helvetica", 10, QFont::Bold, FALSE); + f.setPixelSize(4); + f.setUnderline(TRUE); + f.setStrikeOut(FALSE); + f.setFixedPitch(FALSE); + return f; + } + case 8: + { + QFont f("Helvetica", 10, QFont::Light, FALSE); + f.setPixelSize(6); + f.setUnderline(FALSE); + f.setStrikeOut(TRUE); + f.setFixedPitch(FALSE); + return f; + } + case 9: + { + QFont f("Helvetica", 10, QFont::DemiBold, FALSE); + f.setPixelSize(8); + f.setUnderline(FALSE); + f.setStrikeOut(FALSE); + f.setFixedPitch(TRUE); + return f; + } + case 10: + { + QFont f("Helvetica", 10, QFont::Black, FALSE); + f.setPixelSize(10); + f.setUnderline(TRUE); + f.setStrikeOut(TRUE); + f.setFixedPitch(FALSE); + return f; + } + case 11: + { + QFont f("Helvetica", 10, QFont::Normal, TRUE); + f.setPixelSize(12); + f.setUnderline(FALSE); + f.setStrikeOut(TRUE); + f.setFixedPitch(TRUE); + return f; + } + case 12: + { + QFont f("Helvetica", 10, QFont::Bold, TRUE); + f.setPixelSize(14); + f.setUnderline(TRUE); + f.setStrikeOut(TRUE); + f.setFixedPitch(TRUE); + return f; + } + case 13: + { + QFont f("Helvetica", 10, QFont::Bold, TRUE); + f.setStretch(200); + return f; + } } return QFont("Courier", 18, QFont::Bold, TRUE); } @@ -1513,7 +1467,6 @@ void tst_QDataStream::stream_QImage() void tst_QDataStream::writeQImage(QDataStream *s) { QImage d12(open_xpm); - //debug("Orig alpha: %i", (int)d12.hasAlphaBuffer()); *s << d12; } @@ -1532,239 +1485,79 @@ void tst_QDataStream::readQImage(QDataStream *s) QVERIFY(d12.height() == ref.height()); QVERIFY(d12.depth() == ref.depth()); QVERIFY(d12.colorCount() == ref.colorCount()); -#ifdef QT3_SUPPORT - QVERIFY(d12.hasAlphaBuffer() == ref.hasAlphaBuffer()); -#else QVERIFY(d12.hasAlphaChannel() == ref.hasAlphaChannel()); -#endif -// qDebug("Alpha: %i %i", (int)d12.hasAlphaBuffer(), ref.hasAlphaBuffer()); -// qDebug("Feil %i %i: %x != %x", 3, 0, d12.pixel(3, 0), ref.pixel(3, 0)); -// // ################ Bug : ref and orig has ff in alpha; readback has 0 // ### (Was like this in 1.44 as well) // // for(int i = 0; i < d12.height(); i++) -// for(int j = 0; j < d12.width(); j++) -// if (d12.pixel(j, i) != ref.pixel(j, i)) -// qDebug("Feil %i %i", j, i); +// for(int j = 0; j < d12.width(); j++) +// if (d12.pixel(j, i) != ref.pixel(j, i)) +// qDebug("Feil %i %i", j, i); // } // ************************************ -#ifdef QT3_SUPPORT -static QPalette qPaletteData(int index) -{ - QColorGroup g1( - QBrush(Qt::red, Qt::SolidPattern), - QBrush(Qt::blue, Qt::Dense1Pattern), - QBrush(Qt::green, Qt::Dense2Pattern), - QBrush(Qt::blue, Qt::Dense3Pattern), - QBrush(Qt::cyan, Qt::Dense4Pattern), - QBrush(Qt::magenta, Qt::Dense5Pattern), - QBrush(Qt::black, Qt::Dense6Pattern), - QBrush(Qt::darkGray, Qt::Dense7Pattern), - QBrush(Qt::gray, Qt::CrossPattern)); - QColorGroup g2( - QBrush(Qt::cyan, Qt::Dense3Pattern), - QBrush(Qt::blue, Qt::Dense4Pattern), - QBrush(Qt::magenta, Qt::Dense5Pattern), - QBrush(Qt::black, Qt::Dense6Pattern), - QBrush(Qt::darkGray, Qt::Dense7Pattern), - QBrush(Qt::gray, Qt::CrossPattern), - QBrush(Qt::green, Qt::SolidPattern), - QBrush(Qt::blue, Qt::Dense1Pattern), - QBrush(Qt::red, Qt::Dense2Pattern)); - QColorGroup g3( - QBrush(Qt::black, Qt::Dense6Pattern), - QBrush(Qt::darkGray, Qt::Dense7Pattern), - QBrush(Qt::red, Qt::CrossPattern), - QBrush(Qt::gray, Qt::SolidPattern), - QBrush(Qt::blue, Qt::Dense1Pattern), - QBrush(Qt::cyan, Qt::Dense2Pattern), - QBrush(Qt::magenta, Qt::Dense3Pattern), - QBrush(Qt::blue, Qt::Dense4Pattern), - QBrush(Qt::magenta, Qt::Dense5Pattern)); - - switch (index) - { - case 0: return QPalette(Qt::green); - case 1: return QPalette(Qt::cyan, Qt::blue); - case 2: return QPalette(Qt::red, Qt::yellow); - case 3: return QPalette(g1, g2, g3); - case 4: return QPalette(g2, g3, g1); - case 5: return QPalette(g3, g1, g2); - case 6: return QPalette(g3, g2, g1); - } - return QPalette(Qt::black); -} -#endif -#define MAX_QPALETTE_DATA 7 - -void tst_QDataStream::stream_QPalette_data() -{ - stream_data(MAX_QPALETTE_DATA); -} - -void tst_QDataStream::stream_QPalette() -{ - STREAM_IMPL(QPalette); -} - -void tst_QDataStream::writeQPalette(QDataStream *s) -{ -#ifdef QT3_SUPPORT - QPalette d13(qPaletteData(dataIndex(QTest::currentDataTag()))); - *s << d13; -#else - QSKIP("No Qt3 Support", SkipAll); -#endif -} - -void tst_QDataStream::readQPalette(QDataStream *s) -{ -#ifdef QT3_SUPPORT - QPalette test(qPaletteData(dataIndex(QTest::currentDataTag()))); - QPalette d13; - *s >> d13; - QVERIFY(d13 == test); - QVERIFY(d13.active() == test.active()); - QVERIFY(d13.inactive() == test.inactive()); - QVERIFY(d13.disabled() == test.disabled()); -#else - QSKIP("No Qt3 Support", SkipAll); -#endif -} - -// ************************************ -#ifdef QT3_SUPPORT -static QColorGroup QColorGroupData(int index) -{ - switch (index) - { - case 0: return QColorGroup( - QBrush(Qt::red, Qt::SolidPattern), - QBrush(Qt::blue, Qt::Dense1Pattern), - QBrush(Qt::green, Qt::Dense2Pattern), - QBrush(Qt::blue, Qt::Dense3Pattern), - QBrush(Qt::cyan, Qt::Dense4Pattern), - QBrush(Qt::magenta, Qt::Dense5Pattern), - QBrush(Qt::black, Qt::Dense6Pattern), - QBrush(Qt::darkGray, Qt::Dense7Pattern), - QBrush(Qt::gray, Qt::CrossPattern)); - case 1: return QColorGroup( - QBrush(Qt::cyan, Qt::Dense3Pattern), - QBrush(Qt::blue, Qt::Dense4Pattern), - QBrush(Qt::magenta, Qt::Dense5Pattern), - QBrush(Qt::black, Qt::Dense6Pattern), - QBrush(Qt::darkGray, Qt::Dense7Pattern), - QBrush(Qt::gray, Qt::CrossPattern), - QBrush(Qt::green, Qt::SolidPattern), - QBrush(Qt::blue, Qt::Dense1Pattern), - QBrush(Qt::red, Qt::Dense2Pattern)); - case 2: return QColorGroup( - QBrush(Qt::black, Qt::Dense6Pattern), - QBrush(Qt::darkGray, Qt::Dense7Pattern), - QBrush(Qt::red, Qt::CrossPattern), - QBrush(Qt::gray, Qt::SolidPattern), - QBrush(Qt::blue, Qt::Dense1Pattern), - QBrush(Qt::cyan, Qt::Dense2Pattern), - QBrush(Qt::magenta, Qt::Dense3Pattern), - QBrush(Qt::blue, Qt::Dense4Pattern), - QBrush(Qt::magenta, Qt::Dense5Pattern)); - } - return QColorGroup(); -} -#endif - -#define MAX_QCOLORGROUP_DATA 3 - -void tst_QDataStream::stream_QColorGroup_data() -{ - stream_data(MAX_QCOLORGROUP_DATA); -} - -void tst_QDataStream::stream_QColorGroup() -{ - STREAM_IMPL(QColorGroup); -} - -void tst_QDataStream::writeQColorGroup(QDataStream *s) -{ -#ifdef QT3_SUPPORT - QColorGroup d13(QColorGroupData(dataIndex(QTest::currentDataTag()))); - *s << d13; -#else - QSKIP("No Qt3 Support", SkipAll); -#endif -} - -void tst_QDataStream::readQColorGroup(QDataStream *s) -{ -#ifdef QT3_SUPPORT - QColorGroup test(QColorGroupData(dataIndex(QTest::currentDataTag()))); - QColorGroup d14; - *s >> d14; - QVERIFY(d14 == test); -#else - QSKIP("No Qt3 Support", SkipAll); -#endif -} - -// ************************************ static QPen qPenData(int index) { - switch (index) - { - case 0: { - QPen p(Qt::blue, 0, Qt::NoPen); - p.setCapStyle(Qt::FlatCap); - p.setJoinStyle(Qt::MiterJoin); - return p; - } - case 1: { - QPen p(Qt::red, 1, Qt::SolidLine); - p.setCapStyle(Qt::SquareCap); - p.setJoinStyle(Qt::BevelJoin); - return p; - } - case 2: { - QPen p(Qt::red, 4, Qt::DashDotDotLine); - p.setCapStyle(Qt::RoundCap); - p.setJoinStyle(Qt::RoundJoin); - return p; - } - case 3: { - QPen p(Qt::blue, 12, Qt::NoPen); - p.setCapStyle(Qt::FlatCap); - p.setJoinStyle(Qt::RoundJoin); - return p; - } - case 4: { - QPen p(Qt::red, 99, Qt::SolidLine); - p.setCapStyle(Qt::SquareCap); - p.setJoinStyle(Qt::MiterJoin); - return p; - } - case 5: { - QPen p(Qt::red, 255, Qt::DashDotLine); - p.setCapStyle(Qt::RoundCap); - p.setJoinStyle(Qt::BevelJoin); - return p; - } - case 6: { - QPen p(Qt::red, 256, Qt::DashDotLine); - p.setCapStyle(Qt::RoundCap); - p.setJoinStyle(Qt::BevelJoin); - return p; - } - case 7: { - QPen p(Qt::red, 0.25, Qt::DashDotLine); - p.setCapStyle(Qt::RoundCap); - p.setJoinStyle(Qt::BevelJoin); - return p; - } + switch (index) { + case 0: + { + QPen p(Qt::blue, 0, Qt::NoPen); + p.setCapStyle(Qt::FlatCap); + p.setJoinStyle(Qt::MiterJoin); + return p; + } + case 1: + { + QPen p(Qt::red, 1, Qt::SolidLine); + p.setCapStyle(Qt::SquareCap); + p.setJoinStyle(Qt::BevelJoin); + return p; + } + case 2: + { + QPen p(Qt::red, 4, Qt::DashDotDotLine); + p.setCapStyle(Qt::RoundCap); + p.setJoinStyle(Qt::RoundJoin); + return p; + } + case 3: + { + QPen p(Qt::blue, 12, Qt::NoPen); + p.setCapStyle(Qt::FlatCap); + p.setJoinStyle(Qt::RoundJoin); + return p; + } + case 4: + { + QPen p(Qt::red, 99, Qt::SolidLine); + p.setCapStyle(Qt::SquareCap); + p.setJoinStyle(Qt::MiterJoin); + return p; + } + case 5: + { + QPen p(Qt::red, 255, Qt::DashDotLine); + p.setCapStyle(Qt::RoundCap); + p.setJoinStyle(Qt::BevelJoin); + return p; + } + case 6: + { + QPen p(Qt::red, 256, Qt::DashDotLine); + p.setCapStyle(Qt::RoundCap); + p.setJoinStyle(Qt::BevelJoin); + return p; + } + case 7: + { + QPen p(Qt::red, 0.25, Qt::DashDotLine); + p.setCapStyle(Qt::RoundCap); + p.setJoinStyle(Qt::BevelJoin); + return p; + } } return QPen(); @@ -1857,12 +1650,6 @@ void tst_QDataStream::readQPixmap(QDataStream *s) QVERIFY(d16.size() == pm.size()); QVERIFY(d16.rect() == pm.rect()); QVERIFY(d16.depth() == pm.depth()); - // bit depth must be 24 or above for pixmap comparison -#ifdef QT3_SUPPORT - if (Q3PaintDeviceMetrics(&pm).depth() < 24) - QSKIP("Don't do pixmap comparison when depth < 24", SkipAll); - QCOMPARE(d16, QPixmap(pm)); -#endif } void tst_QDataStream::writeQIcon(QDataStream *s) @@ -1870,9 +1657,6 @@ void tst_QDataStream::writeQIcon(QDataStream *s) QPixmap pm(open_xpm); QIcon d16(pm); *s << d16; - - QIcon svg(svgFile); - *s << svg; } void tst_QDataStream::readQIcon(QDataStream *s) @@ -1883,43 +1667,24 @@ void tst_QDataStream::readQIcon(QDataStream *s) *s >> d16; QVERIFY(!d16.isNull() && !icon.isNull()); QCOMPARE(d16.pixmap(100), pm); - - QIcon svg; - *s >> svg; - QVERIFY(!svg.isNull()); - - QImage image(200, 200, QImage::Format_ARGB32_Premultiplied); - image.fill(0); - QPainter p(&image); - p.drawPixmap(0, 0, svg.pixmap(200, 200)); - p.end(); - - QIcon svg2(svgFile); - QImage image2(200, 200, QImage::Format_ARGB32_Premultiplied); - image2.fill(0); - p.begin(&image2); - p.drawPixmap(0, 0, svg2.pixmap(200, 200)); - p.end(); - QCOMPARE(image, image2); } // ************************************ QPoint qPointData(int index) { - switch (index) - { - case 0: return QPoint(0, 0); - case 1: return QPoint(-1, 0); - case 2: return QPoint(0, -1); - case 3: return QPoint(1, 0); - case 4: return QPoint(0, 1); - case 5: return QPoint(-1, -1); - case 6: return QPoint(1, 1); - case 7: return QPoint(255, 255); - case 8: return QPoint(256, 256); - case 9: return QPoint(-254, -254); - case 10: return QPoint(-255, -255); + switch (index) { + case 0: return QPoint(0, 0); + case 1: return QPoint(-1, 0); + case 2: return QPoint(0, -1); + case 3: return QPoint(1, 0); + case 4: return QPoint(0, 1); + case 5: return QPoint(-1, -1); + case 6: return QPoint(1, 1); + case 7: return QPoint(255, 255); + case 8: return QPoint(256, 256); + case 9: return QPoint(-254, -254); + case 10: return QPoint(-255, -255); } return QPoint(); @@ -1962,19 +1727,18 @@ void tst_QDataStream::readQPoint(QDataStream *s) static QRect qRectData(int index) { - switch (index) - { - case 0: return QRect(0, 0, 0, 0); - case 1: return QRect(1, 1, 1, 1); - case 2: return QRect(1, 2, 3, 4); - case 3: return QRect(-1, -1, -1, -1); - case 4: return QRect(-1, -2, -3, -4); - case 5: return QRect(255, -5, 256, -6); - case 6: return QRect(-7, 255, -8, 256); - case 7: return QRect(9, -255, 10, -255); - case 8: return QRect(-255, 11, -255, 12); - case 9: return QRect(256, 512, 1024, 2048); - case 10: return QRect(-256, -512, -1024, -2048); + switch (index) { + case 0: return QRect(0, 0, 0, 0); + case 1: return QRect(1, 1, 1, 1); + case 2: return QRect(1, 2, 3, 4); + case 3: return QRect(-1, -1, -1, -1); + case 4: return QRect(-1, -2, -3, -4); + case 5: return QRect(255, -5, 256, -6); + case 6: return QRect(-7, 255, -8, 256); + case 7: return QRect(9, -255, 10, -255); + case 8: return QRect(-255, 11, -255, 12); + case 9: return QRect(256, 512, 1024, 2048); + case 10: return QRect(-256, -512, -1024, -2048); } return QRect(); } @@ -2031,57 +1795,63 @@ static QPolygon qPolygonData(int index) QPoint p13(-99998, -34567); QPoint p14(45678, -99999); - switch (index) - { - case 0: return QPolygon(0); - case 1: { - QPolygon p(1); - p.setPoint(0, p0); - return p; - } - case 2: { - QPolygon p(1); - p.setPoint(0, p5); - return p; - } - case 3: { - QPolygon p(1); - p.setPoint(0, p12); - return p; - } - case 4: { - QPolygon p(3); - p.setPoint(0, p1); - p.setPoint(1, p10); - p.setPoint(2, p13); - return p; - } - case 5: { - QPolygon p(6); - p.setPoint(0, p2); - p.setPoint(1, p11); - p.setPoint(2, p14); - return p; - } - case 6: { - QPolygon p(15); - p.setPoint(0, p0); - p.setPoint(1, p1); - p.setPoint(2, p2); - p.setPoint(3, p3); - p.setPoint(4, p4); - p.setPoint(5, p5); - p.setPoint(6, p6); - p.setPoint(7, p7); - p.setPoint(8, p8); - p.setPoint(9, p9); - p.setPoint(10, p10); - p.setPoint(11, p11); - p.setPoint(12, p12); - p.setPoint(13, p13); - p.setPoint(14, p14); - return p; - } + switch (index) { + case 0: + return QPolygon(0); + case 1: + { + QPolygon p(1); + p.setPoint(0, p0); + return p; + } + case 2: + { + QPolygon p(1); + p.setPoint(0, p5); + return p; + } + case 3: + { + QPolygon p(1); + p.setPoint(0, p12); + return p; + } + case 4: + { + QPolygon p(3); + p.setPoint(0, p1); + p.setPoint(1, p10); + p.setPoint(2, p13); + return p; + } + case 5: + { + QPolygon p(6); + p.setPoint(0, p2); + p.setPoint(1, p11); + p.setPoint(2, p14); + return p; + } + case 6: + { + QPolygon p(15); + p.setPoint(0, p0); + p.setPoint(1, p1); + p.setPoint(2, p2); + p.setPoint(3, p3); + p.setPoint(4, p4); + p.setPoint(5, p5); + p.setPoint(6, p6); + p.setPoint(7, p7); + p.setPoint(8, p8); + p.setPoint(9, p9); + p.setPoint(10, p10); + p.setPoint(11, p11); + p.setPoint(12, p12); + p.setPoint(13, p13); + p.setPoint(14, p14); + return p; + } } return QRect(); } @@ -2122,32 +1892,32 @@ void tst_QDataStream::readQPolygon(QDataStream *s) static QRegion qRegionData(int index) { - switch (index) - { - case 0: return QRegion(0, 0, 0, 0, QRegion::Rectangle); - case 1: { - QRegion r(1, 2, 300, 400, QRegion::Rectangle); - if (r != QRegion(1, 2, 300, 400, QRegion::Rectangle)) - qDebug("Error creating a region"); - return r; - } - case 2: return QRegion(100, 100, 1024, 768, QRegion::Rectangle); - case 3: return QRegion(-100, -100, 1024, 1024, QRegion::Rectangle); - case 4: return QRegion(100, -100, 2048, 4096, QRegion::Rectangle); - case 5: return QRegion(-100, 100, 4096, 2048, QRegion::Rectangle); - case 6: return QRegion(0, 0, 0, 0, QRegion::Ellipse); + switch (index) { + case 0: return QRegion(0, 0, 0, 0, QRegion::Rectangle); + case 1: + { + QRegion r(1, 2, 300, 400, QRegion::Rectangle); + if (r != QRegion(1, 2, 300, 400, QRegion::Rectangle)) + qDebug("Error creating a region"); + return r; + } + case 2: return QRegion(100, 100, 1024, 768, QRegion::Rectangle); + case 3: return QRegion(-100, -100, 1024, 1024, QRegion::Rectangle); + case 4: return QRegion(100, -100, 2048, 4096, QRegion::Rectangle); + case 5: return QRegion(-100, 100, 4096, 2048, QRegion::Rectangle); + case 6: return QRegion(0, 0, 0, 0, QRegion::Ellipse); #if defined(Q_OS_SYMBIAN) || (!defined(Q_OS_UNIX) && !defined(Q_OS_WINCE)) // all our Unix platforms use X regions. - case 7: return QRegion(1, 2, 300, 400, QRegion::Ellipse); - case 8: return QRegion(100, 100, 1024, 768, QRegion::Ellipse); - case 9: return QRegion(-100, -100, 1024, 1024, QRegion::Ellipse); - case 10: return QRegion(100, -100, 2048, 4096, QRegion::Ellipse); - case 11: return QRegion(-100, 100, 4096, 2048, QRegion::Ellipse); - // simplest X11 case that fails: - case 12: return QRegion(0, 0, 3, 3, QRegion::Ellipse); + case 7: return QRegion(1, 2, 300, 400, QRegion::Ellipse); + case 8: return QRegion(100, 100, 1024, 768, QRegion::Ellipse); + case 9: return QRegion(-100, -100, 1024, 1024, QRegion::Ellipse); + case 10: return QRegion(100, -100, 2048, 4096, QRegion::Ellipse); + case 11: return QRegion(-100, 100, 4096, 2048, QRegion::Ellipse); + // simplest X11 case that fails: + case 12: return QRegion(0, 0, 3, 3, QRegion::Ellipse); #else - case 7: - qWarning("Skipping streaming of elliptical regions on embedded, Mac OS X, and X11;" - " our pointarray stuff is not that great at approximating."); + case 7: + qWarning("Skipping streaming of elliptical regions on embedded, Mac OS X, and X11;" + " our pointarray stuff is not that great at approximating."); #endif } return QRegion(); @@ -2182,19 +1952,18 @@ void tst_QDataStream::readQRegion(QDataStream *s) static QSize qSizeData(int index) { - switch (index) - { - case 0: return QSize(0, 0); - case 1: return QSize(-1, 0); - case 2: return QSize(0, -1); - case 3: return QSize(1, 0); - case 4: return QSize(0, 1); - case 5: return QSize(-1, -1); - case 6: return QSize(1, 1); - case 7: return QSize(255, 255); - case 8: return QSize(256, 256); - case 9: return QSize(-254, -254); - case 10: return QSize(-255, -255); + switch (index) { + case 0: return QSize(0, 0); + case 1: return QSize(-1, 0); + case 2: return QSize(0, -1); + case 3: return QSize(1, 0); + case 4: return QSize(0, 1); + case 5: return QSize(-1, -1); + case 6: return QSize(1, 1); + case 7: return QSize(255, 255); + case 8: return QSize(256, 256); + case 9: return QSize(-254, -254); + case 10: return QSize(-255, -255); } return QSize(); } @@ -2231,50 +2000,6 @@ void tst_QDataStream::readQSize(QDataStream *s) QVERIFY(d21f == QSizeF(ref)); } -// ************************************ - -void tst_QDataStream::stream_QWMatrix_data() -{ - stream_data(1); -} - -void tst_QDataStream::stream_QWMatrix() -{ - STREAM_IMPL(QWMatrix); -} - -void tst_QDataStream::writeQWMatrix(QDataStream *s) -{ -#ifdef QT3_SUPPORT - // QStringList: Qt 2.0 specific - QWMatrix d23(1.2, 2.3, 3.4, 4.5, 5.6, 6.7); - *s << d23; -#else - QSKIP("No Qt3 Support", SkipAll); -#endif -} - -void tst_QDataStream::readQWMatrix(QDataStream *s) -{ -#ifdef QT3_SUPPORT - // QStringList: Qt 2.0 specific - - QWMatrix d23; - *s >> d23; - // QVERIFY(d23 == QWMatrix(1.2, 2.3, 3.4, 4.5, 5.6, 6.7)); - QWMatrix m(1.2, 2.3, 3.4, 4.5, 5.6, 6.7); - // Because of double vs. float rounding differences: - QVERIFY(QABS(d23.m11() - m.m11()) < 1e-6); - QVERIFY(QABS(d23.m12() - m.m12()) < 1e-6); - QVERIFY(QABS(d23.m21() - m.m21()) < 1e-6); - QVERIFY(QABS(d23.m22() - m.m22()) < 1e-6); - QVERIFY(QABS(d23.dx() - m.dx()) < 1e-6); - QVERIFY(QABS(d23.dy() - m.dy()) < 1e-6); -#else - QSKIP("No Qt3 Support", SkipAll); -#endif -} - // *********************** atEnd ****************************** void tst_QDataStream::stream_atEnd_data() @@ -2286,64 +2011,60 @@ void tst_QDataStream::stream_atEnd() { QFETCH(QString, device); if (device == "bytearray") { - QByteArray ba; - QDataStream sout(&ba, QIODevice::WriteOnly); - writeQString(&sout); + QByteArray ba; + QDataStream sout(&ba, QIODevice::WriteOnly); + writeQString(&sout); - QDataStream sin(&ba, QIODevice::ReadOnly); - readQString(&sin); - QVERIFY(sin.atEnd()); + QDataStream sin(&ba, QIODevice::ReadOnly); + readQString(&sin); + QVERIFY(sin.atEnd()); } else if (device == "file") { - QString fileName = "qdatastream.out"; - QFile fOut(fileName); - QVERIFY(fOut.open(QIODevice::WriteOnly)); - QDataStream sout(&fOut); - writeQString(&sout); - fOut.close(); - - QFile fIn(fileName); - QVERIFY(fIn.open(QIODevice::ReadOnly)); - QDataStream sin(&fIn); - readQString(&sin); - QVERIFY(sin.atEnd()); - fIn.close(); + QString fileName = "qdatastream.out"; + QFile fOut(fileName); + QVERIFY(fOut.open(QIODevice::WriteOnly)); + QDataStream sout(&fOut); + writeQString(&sout); + fOut.close(); + + QFile fIn(fileName); + QVERIFY(fIn.open(QIODevice::ReadOnly)); + QDataStream sin(&fIn); + readQString(&sin); + QVERIFY(sin.atEnd()); + fIn.close(); } else if (device == "buffer") { - { - QByteArray ba(0); - QBuffer bOut(&ba); - bOut.open(QIODevice::WriteOnly); - QDataStream sout(&bOut); - writeQString(&sout); - bOut.close(); - - QBuffer bIn(&ba); - bIn.open(QIODevice::ReadOnly); - QDataStream sin(&bIn); - readQString(&sin); - QVERIFY(sin.atEnd()); - bIn.close(); - } - - // Do the same test again, but this time with an initial size for the bytearray. - { -#ifdef QT3_SUPPORT - QByteArray ba(10000); -#else - QByteArray ba(10000, '\0'); -#endif - QBuffer bOut(&ba); - bOut.open(QIODevice::WriteOnly | QIODevice::Truncate); - QDataStream sout(&bOut); - writeQString(&sout); - bOut.close(); - - QBuffer bIn(&ba); - bIn.open(QIODevice::ReadOnly); - QDataStream sin(&bIn); - readQString(&sin); - QVERIFY(sin.atEnd()); - bIn.close(); - } + { + QByteArray ba(0); + QBuffer bOut(&ba); + bOut.open(QIODevice::WriteOnly); + QDataStream sout(&bOut); + writeQString(&sout); + bOut.close(); + + QBuffer bIn(&ba); + bIn.open(QIODevice::ReadOnly); + QDataStream sin(&bIn); + readQString(&sin); + QVERIFY(sin.atEnd()); + bIn.close(); + } + + // Do the same test again, but this time with an initial size for the bytearray. + { + QByteArray ba(10000, '\0'); + QBuffer bOut(&ba); + bOut.open(QIODevice::WriteOnly | QIODevice::Truncate); + QDataStream sout(&bOut); + writeQString(&sout); + bOut.close(); + + QBuffer bIn(&ba); + bIn.open(QIODevice::ReadOnly); + QDataStream sin(&bIn); + readQString(&sin); + QVERIFY(sin.atEnd()); + bIn.close(); + } } } @@ -2429,8 +2150,6 @@ void tst_QDataStream::setVersion_data() for (int vers = 1; vers <= latest.version(); ++vers) QTest::newRow(qPrintable(QString("v_%1").arg(vers))) << vers; - - } void tst_QDataStream::setVersion() @@ -2438,8 +2157,8 @@ void tst_QDataStream::setVersion() QDataStream latest; QFETCH(int, vers); - /* - Test QKeySequence. + /* + Test QKeySequence. */ QByteArray ba1; { @@ -2463,12 +2182,11 @@ void tst_QDataStream::setVersion() QVERIFY(deadbeef == 0xDEADBEEF); } - /* - Test QPalette. + /* + Test QPalette. */ - - // revise the test if new color roles or color groups are added + // revise the test if new color roles or color groups are added QVERIFY(QPalette::NColorRoles == QPalette::ToolTipText + 1); QVERIFY(QPalette::NColorGroups == 3); @@ -2476,7 +2194,7 @@ void tst_QDataStream::setVersion() QPalette pal1, pal2; for (int grp = 0; grp < (int)QPalette::NColorGroups; ++grp) { for (int role = 0; role < (int)QPalette::NColorRoles; ++role) { - // random stuff + // random stuff pal1.setColor((QPalette::ColorGroup)grp, (QPalette::ColorRole)role, QColor(grp * 13, 255 - grp, role)); pal2.setColor((QPalette::ColorGroup)grp, (QPalette::ColorRole)role, @@ -2841,11 +2559,7 @@ void tst_QDataStream::status_charptr_QByteArray_data() QTest::addColumn<QByteArray>("expectedString"); #if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) -#ifdef QT3_SUPPORT - QByteArray oneMbMinus1(1024 * 1024 - 1); -#else QByteArray oneMbMinus1(1024 * 1024 - 1, '\0'); -#endif for (int i = 0; i < oneMbMinus1.size(); ++i) oneMbMinus1[i] = 0x1 | (8 * ((uchar)i / 9)); QByteArray threeMbMinus1 = oneMbMinus1 + 'j' + oneMbMinus1 + 'k' + oneMbMinus1; @@ -2933,11 +2647,7 @@ void tst_QDataStream::status_charptr_QByteArray() static QByteArray qstring2qbytearray(const QString &str) { -#ifdef QT3_SUPPORT - QByteArray ba(str.size() * 2); -#else QByteArray ba(str.size() * 2 , '\0'); -#endif for (int i = 0; i < str.size(); ++i) { // BigEndian ba[2 * i] = str[i].row(); @@ -3219,13 +2929,13 @@ void tst_QDataStream::streamToAndFromQByteArray() void tst_QDataStream::streamRealDataTypes() { - // Generate QPicture from SVG. - QSvgRenderer renderer(svgFile); - QVERIFY(renderer.isValid()); + // Generate QPicture from pixmap. + QPixmap pm(open_xpm); + QVERIFY(!pm.isNull()); QPicture picture; - picture.setBoundingRect(QRect(QPoint(0, 0), renderer.defaultSize())); + picture.setBoundingRect(QRect(QPoint(0, 0), pm.size())); QPainter painter(&picture); - renderer.render(&painter); + painter.drawPixmap(0, 0, pm); painter.end(); // Generate path @@ -3366,32 +3076,6 @@ void tst_QDataStream::streamRealDataTypes() } } -#ifdef QT3_SUPPORT -void tst_QDataStream::task_224283() -{ - static const char sdata[] = "\0\0\0\12" "123456789"; - QByteArray expected = QByteArray::fromRawData(sdata, sizeof sdata); // includes the NUL - Q3CString original = "123456789"; - - QByteArray data; - { - QDataStream out(&data, QIODevice::WriteOnly); - out.setVersion(QDataStream::Qt_3_3); - out << original; - } - QCOMPARE(data, expected); - - { - QDataStream in(data); - in.setVersion(QDataStream::Qt_3_3); - Q3CString s; - in >> s; - QVERIFY(s.length() == 9); - QCOMPARE(s, original); - } -} -#endif - void tst_QDataStream::compatibility_Qt3() { QByteArray ba("hello"); diff --git a/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp index 9d0c5f7d22..f5dbea49d3 100644 --- a/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp +++ b/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp @@ -2701,17 +2701,10 @@ void tst_QDateTimeEdit::task98554() QCOMPARE(testWidget->time(), QTime(0, 0, 10, 0)); } -static QList<int> makeList(int val1, int val2 = -1, int val3 = -1, int val4 = -1, int val5 = -1, int val6 = -1, int val7 = -1) +static QList<int> makeList(int val1, int val2, int val3) { QList<int> ret; - Q_ASSERT(val1 >= 0); - ret << val1; - if (val2 < 0) {return ret;} else {ret << val2;} - if (val3 < 0) {return ret;} else {ret << val3;} - if (val4 < 0) {return ret;} else {ret << val4;} - if (val5 < 0) {return ret;} else {ret << val5;} - if (val6 < 0) {return ret;} else {ret << val6;} - if (val7 >= 0) {ret << val2;} + ret << val1 << val2 << val3; return ret; } @@ -2753,7 +2746,7 @@ void tst_QDateTimeEdit::setCurrentSection() QFETCH(QList<int>, setCurrentSections); QFETCH(QList<int>, expectedCursorPositions); - Q_ASSERT(setCurrentSections.size() == expectedCursorPositions.size()); + QCOMPARE(setCurrentSections.size(), expectedCursorPositions.size()); testWidget->setDisplayFormat(format); testWidget->setDateTime(dateTime); #ifdef Q_WS_MAC diff --git a/tests/auto/qdbusmarshall/test/test.pro b/tests/auto/qdbusmarshall/test/test.pro index 71fc6563c1..ba4d99b57d 100644 --- a/tests/auto/qdbusmarshall/test/test.pro +++ b/tests/auto/qdbusmarshall/test/test.pro @@ -3,7 +3,7 @@ SOURCES += ../tst_qdbusmarshall.cpp TARGET = ../tst_qdbusmarshall QT = core -QT += dbus +QT += core-private dbus-private LIBS += $$QT_LIBS_DBUS QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS diff --git a/tests/auto/qdbusthreading/tst_qdbusthreading.cpp b/tests/auto/qdbusthreading/tst_qdbusthreading.cpp index bfb806b33a..142b6c22be 100644 --- a/tests/auto/qdbusthreading/tst_qdbusthreading.cpp +++ b/tests/auto/qdbusthreading/tst_qdbusthreading.cpp @@ -592,7 +592,7 @@ void tst_QDBusThreading::callbackInAnotherAuxThread() // wait for the event loop sem1.release(); sem2.acquire(); - Q_ASSERT(loop); + QVERIFY(loop); // create the second thread new Thread; diff --git a/tests/auto/qdbustype/tst_qdbustype.cpp b/tests/auto/qdbustype/tst_qdbustype.cpp index 676a9040be..2a10fe1886 100644 --- a/tests/auto/qdbustype/tst_qdbustype.cpp +++ b/tests/auto/qdbustype/tst_qdbustype.cpp @@ -185,8 +185,8 @@ void tst_QDBusType::isValidFixedType() QFETCH(QString, data); QFETCH(bool, result); QFETCH(bool, isValid); - Q_ASSERT_X(data.length() == 1, "tst_QDBusType", "Test is malformed, this function must test only one-letter types"); - Q_ASSERT(isValid || (!isValid && !result)); + QVERIFY2(data.length() == 1, "Test is malformed, this function must test only one-letter types"); + QVERIFY(isValid || (!isValid && !result)); int type = data.at(0).unicode(); if (isValid) @@ -207,8 +207,8 @@ void tst_QDBusType::isValidBasicType() QFETCH(QString, data); QFETCH(bool, result); QFETCH(bool, isValid); - Q_ASSERT_X(data.length() == 1, "tst_QDBusType", "Test is malformed, this function must test only one-letter types"); - Q_ASSERT(isValid || (!isValid && !result)); + QVERIFY2(data.length() == 1, "Test is malformed, this function must test only one-letter types"); + QVERIFY(isValid || (!isValid && !result)); int type = data.at(0).unicode(); if (isValid) diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp index 8112814e35..0843633bdc 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(',')); @@ -993,6 +974,7 @@ void tst_QDir::cd() QDir d = startDir; bool notUsed = d.exists(); // make sure we cache this before so we can see if 'cd' fails to flush this + Q_UNUSED(notUsed); QCOMPARE(d.cd(cdDir), successExpected); if (successExpected) QCOMPARE(d.absolutePath(), newDir); @@ -1346,26 +1328,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 +1852,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"); diff --git a/tests/auto/qdirmodel/tst_qdirmodel.cpp b/tests/auto/qdirmodel/tst_qdirmodel.cpp index 38a6b8acdb..a6985a49ff 100644 --- a/tests/auto/qdirmodel/tst_qdirmodel.cpp +++ b/tests/auto/qdirmodel/tst_qdirmodel.cpp @@ -641,10 +641,10 @@ void tst_QDirModel::filter() QDirModel model; model.setNameFilters(QStringList() << "*.nada"); QModelIndex index = model.index(SRCDIR "test"); - Q_ASSERT(model.rowCount(index) == 0); + QCOMPARE(model.rowCount(index), 0); QModelIndex index2 = model.index(SRCDIR "test/file01.tst"); - Q_ASSERT(!index2.isValid()); - Q_ASSERT(model.rowCount(index) == 0); + QVERIFY(!index2.isValid()); + QCOMPARE(model.rowCount(index), 0); } void tst_QDirModel::task244669_remove() diff --git a/tests/auto/qdom/tst_qdom.cpp b/tests/auto/qdom/tst_qdom.cpp index 18aa84a844..f3b3e00263 100644 --- a/tests/auto/qdom/tst_qdom.cpp +++ b/tests/auto/qdom/tst_qdom.cpp @@ -137,7 +137,6 @@ private slots: private: static QDomDocument generateRequest(); - static QDomDocument doc(const QString &title, const QByteArray &ba); static int hasAttributesHelper( const QDomNode& node ); static bool compareDocuments( const QDomDocument &doc1, const QDomDocument &doc2 ); static bool compareNodes( const QDomNode &node1, const QDomNode &node2, bool deep ); @@ -1591,14 +1590,6 @@ void tst_QDom::reportDuplicateAttributes() const QVERIFY2(!isSuccess, "Duplicate attributes are well-formedness errors, and should be reported as such."); } -QDomDocument tst_QDom::doc(const QString &title, const QByteArray &ba) -{ - QDomDocument doc(title); - const bool ret = doc.setContent(ba, true); - Q_ASSERT(ret); - return doc; -} - void tst_QDom::namespacedAttributes() const { static const char *const xml = @@ -1611,8 +1602,13 @@ void tst_QDom::namespacedAttributes() const " <Title displayLabel='Title' >>>> SIMPLE BASIC OP - SEND - DUT AS SINK</Title>\n" "</xan:td>\n"; - QDomDocument one = doc("document", xml); - QDomDocument two = doc("document2", one.toByteArray(2)); + QDomDocument one("document"); + QString error; + bool docParsed = one.setContent(QByteArray(xml), true, &error); + QVERIFY2(docParsed, qPrintable(error)); + QDomDocument two("document2"); + docParsed = two.setContent(one.toByteArray(2), true, &error); + QVERIFY2(docParsed, qPrintable(error)); QVERIFY(isDeepEqual(one, two)); } diff --git a/tests/auto/qfile/largefile/tst_largefile.cpp b/tests/auto/qfile/largefile/tst_largefile.cpp index a9ad017e14..8070ad27df 100644 --- a/tests/auto/qfile/largefile/tst_largefile.cpp +++ b/tests/auto/qfile/largefile/tst_largefile.cpp @@ -160,13 +160,10 @@ static inline void appendRaw(QByteArray &array, T data) */ static inline void topUpWith(QByteArray &array, QByteArray filler, int size) { - Q_ASSERT(filler.size() > 0); - for (int i = (size - array.size()) / filler.size(); i > 0; --i) array.append(filler); if (array.size() < size) { - Q_ASSERT(size - array.size() < filler.size()); array.append(filler.left(size - array.size())); } } @@ -206,15 +203,12 @@ static inline QByteArray generateDataBlock(int blockSize, QString text, qint64 u QByteArray filler("0123456789"); block.append(filler.right(10 - block.size() % 10)); - topUpWith(block, filler, blockSize - 2 * sizeof(qint64)); + topUpWith(block, filler, blockSize - 3 * sizeof(qint64)); appendRaw(block, counter); appendRaw(block, userBits); appendRaw(block, randomBits); - Q_ASSERT( block.size() >= blockSize ); - block.resize(blockSize); - ++counter; return block; } diff --git a/tests/auto/qfile/tst_qfile.cpp b/tests/auto/qfile/tst_qfile.cpp index 688a92d04b..a0db699c42 100644 --- a/tests/auto/qfile/tst_qfile.cpp +++ b/tests/auto/qfile/tst_qfile.cpp @@ -333,6 +333,8 @@ private: case OpenRFile: return openRFile(file, mode, handleFlags); #endif + case NumberOfFileTypes: + break; } return false; diff --git a/tests/auto/qfiledialog/qfiledialog.pro b/tests/auto/qfiledialog/qfiledialog.pro index 68f2e3c146..57828b1bd4 100644 --- a/tests/auto/qfiledialog/qfiledialog.pro +++ b/tests/auto/qfiledialog/qfiledialog.pro @@ -4,6 +4,7 @@ load(qttest_p4) +QT += core-private gui-private SOURCES += tst_qfiledialog.cpp wince*|symbian { diff --git a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp index 5e9f1306c4..dc3ca5285d 100644 --- a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp @@ -812,7 +812,7 @@ void tst_QFileDialog2::task239706_editableFilterCombo() break; } } - Q_ASSERT(filterCombo); + QVERIFY(filterCombo); filterCombo->setEditable(true); QTest::mouseClick(filterCombo, Qt::LeftButton); QTest::keyPress(filterCombo, Qt::Key_X); diff --git a/tests/auto/qfileinfo/qfileinfo.pro b/tests/auto/qfileinfo/qfileinfo.pro index 6f01f6705f..2fd626a57e 100644 --- a/tests/auto/qfileinfo/qfileinfo.pro +++ b/tests/auto/qfileinfo/qfileinfo.pro @@ -1,7 +1,7 @@ load(qttest_p4) SOURCES += tst_qfileinfo.cpp -QT = core +QT = core-private RESOURCES += qfileinfo.qrc diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp index 7d628f50a0..1d0afccbd0 100644 --- a/tests/auto/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp @@ -42,7 +42,6 @@ #include <QtTest/QtTest> - #include <qfile.h> #include <qdir.h> #include <qcoreapplication.h> @@ -726,15 +725,9 @@ void tst_QFileInfo::dir() if (absPath) { QCOMPARE(fi.absolutePath(), expected); QCOMPARE(fi.absoluteDir().path(), expected); -#ifdef QT3_SUPPORT - QCOMPARE(fi.dir(true).path(), expected); -#endif } else { QCOMPARE(fi.path(), expected); QCOMPARE(fi.dir().path(), expected); -#ifdef QT3_SUPPORT - QCOMPARE(fi.dir(false).path(), expected); -#endif } } diff --git a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro index 04cea4805c..ab121306e3 100644 --- a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro +++ b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro @@ -1,6 +1,6 @@ CONFIG += qttest_p4 -QT = core gui +QT = core-private gui SOURCES += tst_qfilesystemmodel.cpp TARGET = tst_qfilesystemmodel diff --git a/tests/auto/qfocusevent/tst_qfocusevent.cpp b/tests/auto/qfocusevent/tst_qfocusevent.cpp index 401f4a7075..e79153412a 100644 --- a/tests/auto/qfocusevent/tst_qfocusevent.cpp +++ b/tests/auto/qfocusevent/tst_qfocusevent.cpp @@ -43,13 +43,7 @@ #include <QtTest/QtTest> #include <qapplication.h> #include <qlineedit.h> - -#if defined (QT3_SUPPORT) -#include <q3popupmenu.h> -#else #include <qmenu.h> -#endif - #include <qlabel.h> #include <qdialog.h> #include <qevent.h> @@ -264,32 +258,6 @@ void tst_QFocusEvent::checkReason_Popup() initWidget(); // Now test the popup reason -#if defined (QT3_SUPPORT) - Q3PopupMenu* popupMenu = new Q3PopupMenu( testFocusWidget ); - popupMenu->insertItem( "Test" ); - popupMenu->popup( QPoint(0,0) ); - QTest::qWait(50); - - QTRY_VERIFY(childFocusWidgetOne->focusOutEventLostFocus); - - QVERIFY( childFocusWidgetOne->hasFocus() ); - QVERIFY( !childFocusWidgetOne->focusInEventRecieved ); - QVERIFY( childFocusWidgetOne->focusOutEventRecieved ); - QVERIFY( !childFocusWidgetTwo->focusInEventRecieved ); - QVERIFY( !childFocusWidgetTwo->focusOutEventRecieved ); - QCOMPARE( childFocusWidgetOne->focusOutEventReason, int(Qt::PopupFocusReason)); - - popupMenu->hide(); - - QVERIFY(childFocusWidgetOne->focusInEventRecieved); - QVERIFY(childFocusWidgetOne->focusInEventGotFocus); - - QVERIFY( childFocusWidgetOne->hasFocus() ); - QVERIFY( childFocusWidgetOne->focusInEventRecieved ); - QVERIFY( childFocusWidgetOne->focusOutEventRecieved ); - QVERIFY( !childFocusWidgetTwo->focusInEventRecieved ); - QVERIFY( !childFocusWidgetTwo->focusOutEventRecieved ); -#else QMenu* popupMenu = new QMenu( testFocusWidget ); popupMenu->addMenu( "Test" ); popupMenu->popup( QPoint(0,0) ); @@ -314,7 +282,6 @@ void tst_QFocusEvent::checkReason_Popup() QVERIFY( childFocusWidgetOne->focusOutEventRecieved ); QVERIFY( !childFocusWidgetTwo->focusInEventRecieved ); QVERIFY( !childFocusWidgetTwo->focusOutEventRecieved ); -#endif } #ifdef Q_WS_MAC diff --git a/tests/auto/qfuture/tst_qfuture.cpp b/tests/auto/qfuture/tst_qfuture.cpp index 8afdf48fc3..26d96f0f81 100644 --- a/tests/auto/qfuture/tst_qfuture.cpp +++ b/tests/auto/qfuture/tst_qfuture.cpp @@ -1453,6 +1453,7 @@ void tst_QFuture::exceptions_QTBUG18149() try { MyClass m; + Q_UNUSED(m); throw 0; } catch (int) {} diff --git a/tests/auto/qgl/qgl.pro b/tests/auto/qgl/qgl.pro index 20f8018f4c..74d9803d2f 100644 --- a/tests/auto/qgl/qgl.pro +++ b/tests/auto/qgl/qgl.pro @@ -4,7 +4,7 @@ load(qttest_p4) requires(contains(QT_CONFIG,opengl)) -QT += opengl +QT += opengl-private gui-private core-private contains(QT_CONFIG,egl):DEFINES += QGL_EGL win32:!wince*: DEFINES += QT_NO_EGL diff --git a/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro b/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro index 87684258ed..e1829b0b6b 100644 --- a/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro +++ b/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro @@ -1,3 +1,4 @@ load(qttest_p4) +QT += core-private gui-private SOURCES += tst_qgraphicsanchorlayout.cpp CONFIG += parallel_test diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp index 447385a7d8..55d6fc97cd 100644 --- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp +++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp @@ -132,33 +132,32 @@ static void setAnchor(QGraphicsAnchorLayout *l, anchor->setSpacing(spacing); } -static bool checkReverseDirection(QGraphicsWidget *w) +static bool checkReverseDirection(QGraphicsWidget *widget) { - QGraphicsLayout *l = w->layout(); - Q_ASSERT(l); + QGraphicsLayout *layout = widget->layout(); qreal left, top, right, bottom; - l->getContentsMargins(&left, &top, &right, &bottom); - w->setLayoutDirection(Qt::LeftToRight); + layout->getContentsMargins(&left, &top, &right, &bottom); + widget->setLayoutDirection(Qt::LeftToRight); QApplication::processEvents(); - const QRectF lg = l->geometry(); + const QRectF layoutGeometry = layout->geometry(); QMap<QGraphicsLayoutItem *, QRectF> geometries; - for (int i = 0; i < l->count(); ++i) { - QGraphicsLayoutItem *w = l->itemAt(i); - geometries.insert(w, w->geometry()); + for (int i = 0; i < layout->count(); ++i) { + QGraphicsLayoutItem *item = layout->itemAt(i); + geometries.insert(item, item->geometry()); } - w->setLayoutDirection(Qt::RightToLeft); + widget->setLayoutDirection(Qt::RightToLeft); QApplication::processEvents(); - lg.adjusted(+right, +top, -left, -bottom); - for (int i = 0; i < l->count(); ++i) { - QGraphicsLayoutItem *w = l->itemAt(i); - const QRectF rtlGeom = w->geometry(); - const QRectF ltrGeom = geometries.value(w); - QRectF expectedGeom = ltrGeom; - expectedGeom.moveRight(lg.right() - (0 + ltrGeom.left())); - if (expectedGeom != rtlGeom) { - qDebug() << "layout->geometry():" << lg - << "expected:" << expectedGeom - << "actual:" << rtlGeom; + layoutGeometry.adjusted(+right, +top, -left, -bottom); + for (int i = 0; i < layout->count(); ++i) { + QGraphicsLayoutItem *item = layout->itemAt(i); + const QRectF rightToLeftGeometry = item->geometry(); + const QRectF leftToRightGeometry = geometries.value(item); + QRectF expectedGeometry = leftToRightGeometry; + expectedGeometry.moveRight(layoutGeometry.right() - leftToRightGeometry.left()); + if (expectedGeometry != rightToLeftGeometry) { + qDebug() << "layout->geometry():" << layoutGeometry + << "expected:" << expectedGeometry + << "actual:" << rightToLeftGeometry; return false; } } @@ -345,6 +344,7 @@ void tst_QGraphicsAnchorLayout::layoutDirection() p->show(); view->show(); + QVERIFY(p->layout()); QCOMPARE(checkReverseDirection(p), true); if (hasSimplification) { @@ -445,6 +445,7 @@ void tst_QGraphicsAnchorLayout::diagonal() QVERIFY(!usedSimplex(l, Qt::Vertical)); } + QVERIFY(p.layout()); QCOMPARE(checkReverseDirection(&p), true); c->setMinimumWidth(300); @@ -735,6 +736,7 @@ void tst_QGraphicsAnchorLayout::snakeOppositeDirections() QCOMPARE(c->geometry(), QRectF(90.0, 200.0, 100.0, 100.0)); QCOMPARE(p.size(), layoutMaximumSize); + QVERIFY(p.layout()); QCOMPARE(checkReverseDirection(&p), true); } diff --git a/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro b/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro index 90b78783d9..535de0c07e 100644 --- a/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro +++ b/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro @@ -1,3 +1,4 @@ load(qttest_p4) +QT += core-private gui-private SOURCES += tst_qgraphicsanchorlayout1.cpp CONFIG += parallel_test diff --git a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp index a03f7bca6d..ee25291160 100644 --- a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp +++ b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp @@ -2585,15 +2585,11 @@ void tst_QGraphicsAnchorLayout1::testSizeDistribution_data() sizeHints1.insert( Qt::MinimumSize, 30 ); sizeHints1.insert( Qt::PreferredSize, 35 ); sizeHints1.insert( Qt::MaximumSize, 40 ); - Q_ASSERT( sizeHints1.value( Qt::MinimumSize ) <= sizeHints1.value( Qt::PreferredSize ) ); - Q_ASSERT( sizeHints1.value( Qt::PreferredSize ) <= sizeHints1.value( Qt::MaximumSize ) ); SizeHintArray sizeHints2; sizeHints2.insert( Qt::MinimumSize, 5 ); sizeHints2.insert( Qt::PreferredSize, 35 ); sizeHints2.insert( Qt::MaximumSize, 300 ); - Q_ASSERT( sizeHints2.value( Qt::MinimumSize ) <= sizeHints2.value( Qt::PreferredSize ) ); - Q_ASSERT( sizeHints2.value( Qt::PreferredSize ) <= sizeHints2.value( Qt::MaximumSize ) ); const qreal width1 = 35; const qreal width2 = 100-10-10-10-width1; @@ -2605,15 +2601,11 @@ void tst_QGraphicsAnchorLayout1::testSizeDistribution_data() sizeHints1.insert( Qt::MinimumSize, 0 ); sizeHints1.insert( Qt::PreferredSize, 20 ); sizeHints1.insert( Qt::MaximumSize, 100 ); - Q_ASSERT( sizeHints1.value( Qt::MinimumSize ) <= sizeHints1.value( Qt::PreferredSize ) ); - Q_ASSERT( sizeHints1.value( Qt::PreferredSize ) <= sizeHints1.value( Qt::MaximumSize ) ); SizeHintArray sizeHints2; sizeHints2.insert( Qt::MinimumSize, 0 ); sizeHints2.insert( Qt::PreferredSize, 50 ); sizeHints2.insert( Qt::MaximumSize, 100 ); - Q_ASSERT( sizeHints2.value( Qt::MinimumSize ) <= sizeHints2.value( Qt::PreferredSize ) ); - Q_ASSERT( sizeHints2.value( Qt::PreferredSize ) <= sizeHints2.value( Qt::MaximumSize ) ); const qreal width1 = 20; const qreal width2 = 100-10-10-10-width1; @@ -2625,15 +2617,11 @@ void tst_QGraphicsAnchorLayout1::testSizeDistribution_data() sizeHints1.insert( Qt::MinimumSize, 0 ); sizeHints1.insert( Qt::PreferredSize, 40 ); sizeHints1.insert( Qt::MaximumSize, 100 ); - Q_ASSERT( sizeHints1.value( Qt::MinimumSize ) <= sizeHints1.value( Qt::PreferredSize ) ); - Q_ASSERT( sizeHints1.value( Qt::PreferredSize ) <= sizeHints1.value( Qt::MaximumSize ) ); SizeHintArray sizeHints2; sizeHints2.insert( Qt::MinimumSize, 0 ); sizeHints2.insert( Qt::PreferredSize, 60 ); sizeHints2.insert( Qt::MaximumSize, 100 ); - Q_ASSERT( sizeHints2.value( Qt::MinimumSize ) <= sizeHints2.value( Qt::PreferredSize ) ); - Q_ASSERT( sizeHints2.value( Qt::PreferredSize ) <= sizeHints2.value( Qt::MaximumSize ) ); const qreal width1 = 28; // got from manual calculation const qreal width2 = 100-10-10-10-width1; @@ -2645,15 +2633,11 @@ void tst_QGraphicsAnchorLayout1::testSizeDistribution_data() sizeHints1.insert( Qt::MinimumSize, 0 ); sizeHints1.insert( Qt::PreferredSize, 10 ); sizeHints1.insert( Qt::MaximumSize, 100 ); - Q_ASSERT( sizeHints1.value( Qt::MinimumSize ) <= sizeHints1.value( Qt::PreferredSize ) ); - Q_ASSERT( sizeHints1.value( Qt::PreferredSize ) <= sizeHints1.value( Qt::MaximumSize ) ); SizeHintArray sizeHints2; sizeHints2.insert( Qt::MinimumSize, 0 ); sizeHints2.insert( Qt::PreferredSize, 40 ); sizeHints2.insert( Qt::MaximumSize, 100 ); - Q_ASSERT( sizeHints2.value( Qt::MinimumSize ) <= sizeHints2.value( Qt::PreferredSize ) ); - Q_ASSERT( sizeHints2.value( Qt::PreferredSize ) <= sizeHints2.value( Qt::MaximumSize ) ); const qreal width1 = 22; // got from manual calculation const qreal width2 = 100-10-10-10-width1; @@ -2669,6 +2653,12 @@ void tst_QGraphicsAnchorLayout1::testSizeDistribution() QFETCH(qreal, width1); QFETCH(qreal, width2); + // sanity-check the test data - MinimumSize <= PreferredSize <= MaximumSize + QVERIFY( sizeHints1.value( Qt::MinimumSize ) <= sizeHints1.value( Qt::PreferredSize ) ); + QVERIFY( sizeHints1.value( Qt::PreferredSize ) <= sizeHints1.value( Qt::MaximumSize ) ); + QVERIFY( sizeHints2.value( Qt::MinimumSize ) <= sizeHints2.value( Qt::PreferredSize ) ); + QVERIFY( sizeHints2.value( Qt::PreferredSize ) <= sizeHints2.value( Qt::MaximumSize ) ); + // create objects QGraphicsWidget widget; TheAnchorLayout *layout = new TheAnchorLayout; diff --git a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp index 837df783a3..78010e6071 100644 --- a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp +++ b/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp @@ -3018,39 +3018,6 @@ static QSizeF wfh(Qt::SizeHint /*which*/, const QSizeF &constraint) return result; } -static qreal growthFactorBelowPreferredSize(qreal desired, qreal sumAvailable, qreal sumDesired) -{ - Q_ASSERT(sumDesired != 0.0); - return desired * qPow(sumAvailable / sumDesired, desired / sumDesired); -} - -static void expectedWidth(qreal minSize1, qreal prefSize1, - qreal minSize2, qreal prefSize2, - qreal targetSize, qreal *width1, qreal *width2) -{ - qreal sumAvail,factor1,factor2; - // stretch behaviour is different below and above preferred size... - if (targetSize < prefSize1 + prefSize2) { - sumAvail = targetSize - minSize1 - minSize2; - const qreal desired1 = prefSize1 - minSize1; - const qreal desired2 = prefSize2 - minSize2; - const qreal sumDesired = desired1 + desired2; - factor1 = growthFactorBelowPreferredSize(desired1, sumAvail, sumDesired); - factor2 = growthFactorBelowPreferredSize(desired2, sumAvail, sumDesired); - const qreal sumFactors = factor1 + factor2; - *width1 = sumAvail*factor1/sumFactors + minSize1; - *width2 = sumAvail*factor2/sumFactors + minSize2; - } else { - sumAvail = targetSize - prefSize1 - prefSize2; - factor1 = prefSize1; - factor2 = prefSize2; - const qreal sumFactors = factor1 + factor2; - *width1 = sumAvail*factor1/sumFactors + prefSize1; - *width2 = sumAvail*factor2/sumFactors + prefSize2; - } -} - - bool qFuzzyCompare(const QSizeF &a, const QSizeF &b) { return qFuzzyCompare(a.width(), b.width()) && qFuzzyCompare(a.height(), b.height()); diff --git a/tests/auto/qgraphicsitem/qgraphicsitem.pro b/tests/auto/qgraphicsitem/qgraphicsitem.pro index 20acf35b33..ed30cae759 100644 --- a/tests/auto/qgraphicsitem/qgraphicsitem.pro +++ b/tests/auto/qgraphicsitem/qgraphicsitem.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += core-private gui-private SOURCES += tst_qgraphicsitem.cpp DEFINES += QT_NO_CAST_TO_ASCII diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index 73e5656b15..b55130965a 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -110,7 +110,7 @@ static void sendMousePress(QGraphicsScene *scene, const QPointF &point, Qt::Mous } static void sendMouseMove(QGraphicsScene *scene, const QPointF &point, - Qt::MouseButton button = Qt::NoButton, Qt::MouseButtons buttons = 0) + Qt::MouseButton button = Qt::NoButton, Qt::MouseButtons /* buttons */ = 0) { QGraphicsSceneMouseEvent event(QEvent::GraphicsSceneMouseMove); event.setScenePos(point); @@ -794,6 +794,7 @@ void tst_QGraphicsItem::deleteChildItem() QGraphicsItem *child1 = new QGraphicsRectItem(rect); QGraphicsItem *child2 = new QGraphicsRectItem(rect); QGraphicsItem *child3 = new QGraphicsRectItem(rect); + Q_UNUSED(child3); delete child1; child2->setParentItem(0); delete child2; @@ -10732,7 +10733,7 @@ void tst_QGraphicsItem::deviceCoordinateCache_simpleRotations() QTRY_VERIFY(view.repaints > 0); QGraphicsItemCache *itemCache = QGraphicsItemPrivate::get(item)->extraItemCache(); - Q_ASSERT(itemCache); + QVERIFY(itemCache); QPixmapCache::Key currentKey = itemCache->deviceData.value(view.viewport()).key; // Trigger an update and verify that the cache is unchanged. diff --git a/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp index 29ea07460e..6f08a5dad1 100644 --- a/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp +++ b/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp @@ -644,7 +644,7 @@ void AnimatedLayoutItem::setGeometry(const QRectF &geom) QGraphicsLayoutItem::setGeometry(geom); } -QSizeF AnimatedLayoutItem::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const +QSizeF AnimatedLayoutItem::sizeHint(Qt::SizeHint which, const QSizeF & /* constraint */) const { switch (which) { case Qt::MinimumSize: @@ -760,7 +760,7 @@ private: QSet<QGraphicsLayoutItem*> *m_destructedSet; }; -QSizeF CustomLayoutItem::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const +QSizeF CustomLayoutItem::sizeHint(Qt::SizeHint which, const QSizeF & /* constraint */) const { switch (which) { case Qt::MinimumSize: @@ -800,7 +800,7 @@ private: QSet<QGraphicsLayoutItem*> *m_destructedSet; }; -QSizeF CustomGraphicsWidget::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const +QSizeF CustomGraphicsWidget::sizeHint(Qt::SizeHint which, const QSizeF & /* constraint */) const { switch (which) { case Qt::MinimumSize: @@ -889,7 +889,7 @@ void updateParentWidget(QGraphicsWidget *item) } } -QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const +QSizeF sizeHint(Qt::SizeHint /* which */, const QSizeF & /* constraint */) const { return QSizeF(50,50); } diff --git a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp index 8f8ac67d09..b3e4a88edf 100644 --- a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp +++ b/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp @@ -299,7 +299,7 @@ void tst_QGraphicsLinearLayout::alignment() int i; bool addWidget = true; - for (i = 0; i < sizeof(alignmentsToTest)/sizeof(Qt::Alignment); ++i) { + for (size_t i = 0; i < sizeof(alignmentsToTest)/sizeof(Qt::Alignment); ++i) { QGraphicsLayoutItem *loutItem; Qt::Alignment align = alignmentsToTest[i]; if (!align && i > 0) @@ -1139,6 +1139,7 @@ void tst_QGraphicsLinearLayout::testStretch() { QGraphicsScene scene; QGraphicsView *view = new QGraphicsView(&scene); + Q_UNUSED(view); QGraphicsWidget *form = new QGraphicsWidget(0, Qt::Window); scene.addItem(form); diff --git a/tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp b/tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp index 5619766a71..93af2e0443 100644 --- a/tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp +++ b/tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp @@ -284,6 +284,7 @@ void tst_QGraphicsObject::deleted() bool item2_wasDeleted = false; DeleteTester *item1 = new DeleteTester(&item1_wasDeleted, &item1_parentWasDeleted); DeleteTester *item2 = new DeleteTester(&item2_wasDeleted, &item2_parentWasDeleted, item1); + Q_UNUSED(item2); delete item1; QVERIFY(!item1_wasDeleted); // destructor not called yet diff --git a/tests/auto/qgraphicsscene/qgraphicsscene.pro b/tests/auto/qgraphicsscene/qgraphicsscene.pro index 82fa423e66..635fb9b4e6 100644 --- a/tests/auto/qgraphicsscene/qgraphicsscene.pro +++ b/tests/auto/qgraphicsscene/qgraphicsscene.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += core-private gui-private SOURCES += tst_qgraphicsscene.cpp RESOURCES += images.qrc win32:!wince*: LIBS += -lUser32 diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp index 9ff086c425..09275774ce 100644 --- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp +++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp @@ -3594,7 +3594,7 @@ void tst_QGraphicsScene::task160653_selectionChanged() item->flags() | QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable); item->setSelected(true); } - Q_ASSERT(scene.items().size() > 1); + QVERIFY(scene.items().size() > 1); QCOMPARE(scene.items().size(), scene.selectedItems().size()); QSignalSpy spy(&scene, SIGNAL(selectionChanged())); diff --git a/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro b/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro index 1fdd176b3b..0d0fd0db1a 100644 --- a/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro +++ b/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro @@ -1,4 +1,5 @@ load(qttest_p4) requires(contains(QT_CONFIG,private_tests)) +QT += core-private gui-private SOURCES += tst_qgraphicssceneindex.cpp CONFIG += parallel_test diff --git a/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp b/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp index 80629c54cf..fe949742cd 100644 --- a/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp +++ b/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp @@ -290,7 +290,7 @@ public: { } - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) + void paint(QPainter *painter, const QStyleOptionGraphicsItem * /* option */, QWidget * /* widget */) { painter->setBrush(brush); painter->drawRect(boundingRect()); @@ -348,7 +348,7 @@ void tst_QGraphicsSceneIndex::clear() int numPaints; protected: QRectF boundingRect() const { return QRectF(0, 0, 10, 10); } - void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) + void paint(QPainter * /* painter */, const QStyleOptionGraphicsItem *, QWidget *) { ++numPaints; } }; diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp index ca6b4d285e..2d02ec052f 100644 --- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp @@ -4009,7 +4009,7 @@ public: m_viewHasIMEnabledInFocusInEvent = false; } - void focusInEvent(QFocusEvent *event) + void focusInEvent(QFocusEvent * /* event */) { QGraphicsView *view = scene()->views().first(); m_viewHasIMEnabledInFocusInEvent = view->testAttribute(Qt::WA_InputMethodEnabled); @@ -4403,7 +4403,7 @@ void tst_QGraphicsView::QTBUG_5859_exposedRect() { public: CustomScene(const QRectF &rect) : QGraphicsScene(rect) { } - void drawBackground(QPainter *painter, const QRectF &rect) + void drawBackground(QPainter * /* painter */, const QRectF &rect) { lastBackgroundExposedRect = rect; } QRectF lastBackgroundExposedRect; }; @@ -4413,7 +4413,7 @@ void tst_QGraphicsView::QTBUG_5859_exposedRect() public: CustomRectItem(const QRectF &rect) : QGraphicsRectItem(rect) { setFlag(QGraphicsItem::ItemUsesExtendedStyleOption); } - void paint(QPainter * painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) + void paint(QPainter * /* painter */, const QStyleOptionGraphicsItem *option, QWidget * /* widget */ = 0) { lastExposedRect = option->exposedRect; } QRectF lastExposedRect; }; @@ -4528,7 +4528,7 @@ public: setFlag(QGraphicsItem::ItemAcceptsInputMethod, true); } - QVariant inputMethodQuery(Qt::InputMethodQuery query) const + QVariant inputMethodQuery(Qt::InputMethodQuery) const { return mf; } diff --git a/tests/auto/qheaderview/tst_qheaderview.cpp b/tests/auto/qheaderview/tst_qheaderview.cpp index 9a25fb6bbc..d877d2f16e 100644 --- a/tests/auto/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/qheaderview/tst_qheaderview.cpp @@ -1106,7 +1106,7 @@ void tst_QHeaderView::moveAndInsertSection() void tst_QHeaderView::resizeMode() { - // Q_ASSERT's when resizeMode is called with an invalid index + // resizeMode must not be called with an invalid index int last = view->count() - 1; view->setResizeMode(QHeaderView::Interactive); QCOMPARE(view->resizeMode(last), QHeaderView::Interactive); diff --git a/tests/auto/qhostaddress/tst_qhostaddress.cpp b/tests/auto/qhostaddress/tst_qhostaddress.cpp index bd020aa015..e2043a5012 100644 --- a/tests/auto/qhostaddress/tst_qhostaddress.cpp +++ b/tests/auto/qhostaddress/tst_qhostaddress.cpp @@ -164,21 +164,27 @@ void tst_QHostAddress::setAddress_QString_data() QTest::newRow("ip4_04") << QString("255.3.2.1\r ") << (bool)TRUE << QString("255.3.2.1") << 4; QTest::newRow("ip4_05") << QString("0.0.0.0") << (bool)TRUE << QString("0.0.0.0") << 4; - // for the format of IPv6 addresses see also RFC 1884 + // for the format of IPv6 addresses see also RFC 5952 QTest::newRow("ip6_00") << QString("FEDC:BA98:7654:3210:FEDC:BA98:7654:3210") << (bool)TRUE << QString("FEDC:BA98:7654:3210:FEDC:BA98:7654:3210") << 6; - QTest::newRow("ip6_01") << QString("1080:0000:0000:0000:0008:0800:200C:417A") << (bool)TRUE << QString("1080:0:0:0:8:800:200C:417A") << 6; - QTest::newRow("ip6_02") << QString("1080:0:0:0:8:800:200C:417A") << (bool)TRUE << QString("1080:0:0:0:8:800:200C:417A") << 6; - QTest::newRow("ip6_03") << QString("1080::8:800:200C:417A") << (bool)TRUE << QString("1080:0:0:0:8:800:200C:417A") << 6; - QTest::newRow("ip6_04") << QString("FF01::43") << (bool)TRUE << QString("FF01:0:0:0:0:0:0:43") << 6; - QTest::newRow("ip6_05") << QString("::1") << (bool)TRUE << QString("0:0:0:0:0:0:0:1") << 6; - QTest::newRow("ip6_06") << QString("1::") << (bool)TRUE << QString("1:0:0:0:0:0:0:0") << 6; - QTest::newRow("ip6_07") << QString("::") << (bool)TRUE << QString("0:0:0:0:0:0:0:0") << 6; - QTest::newRow("ip6_08") << QString("0:0:0:0:0:0:13.1.68.3") << (bool)TRUE << QString("0:0:0:0:0:0:D01:4403") << 6; - QTest::newRow("ip6_09") << QString("::13.1.68.3") << (bool)TRUE << QString("0:0:0:0:0:0:D01:4403") << 6; - QTest::newRow("ip6_10") << QString("0:0:0:0:0:FFFF:129.144.52.38") << (bool)TRUE << QString("0:0:0:0:0:FFFF:8190:3426") << 6; - QTest::newRow("ip6_11") << QString("::FFFF:129.144.52.38") << (bool)TRUE << QString("0:0:0:0:0:FFFF:8190:3426") << 6; - QTest::newRow("ip6_12") << QString("1::FFFF:129.144.52.38") << (bool)TRUE << QString("1:0:0:0:0:FFFF:8190:3426") << 6; - QTest::newRow("ip6_13") << QString("A:B::D:E") << (bool)TRUE << QString("A:B:0:0:0:0:D:E") << 6; + QTest::newRow("ip6_01") << QString("1080:0000:0000:0000:0008:0800:200C:417A") << (bool)TRUE << QString("1080::8:800:200C:417A") << 6; + QTest::newRow("ip6_02") << QString("1080:0:0:0:8:800:200C:417A") << (bool)TRUE << QString("1080::8:800:200C:417A") << 6; + QTest::newRow("ip6_03") << QString("1080::8:800:200C:417A") << (bool)TRUE << QString("1080::8:800:200C:417A") << 6; + QTest::newRow("ip6_04") << QString("FF01::43") << (bool)TRUE << QString("FF01::43") << 6; + QTest::newRow("ip6_05") << QString("::1") << (bool)TRUE << QString("::1") << 6; + QTest::newRow("ip6_06") << QString("1::") << (bool)TRUE << QString("1::") << 6; + QTest::newRow("ip6_07") << QString("::") << (bool)TRUE << QString("::") << 6; + QTest::newRow("ip6_08") << QString("0:0:0:0:0:0:13.1.68.3") << (bool)TRUE << QString("::D01:4403") << 6; + QTest::newRow("ip6_09") << QString("::13.1.68.3") << (bool)TRUE << QString("::D01:4403") << 6; + QTest::newRow("ip6_10") << QString("0:0:0:0:0:FFFF:129.144.52.38") << (bool)TRUE << QString("::FFFF:8190:3426") << 6; + QTest::newRow("ip6_11") << QString("::FFFF:129.144.52.38") << (bool)TRUE << QString("::FFFF:8190:3426") << 6; + QTest::newRow("ip6_12") << QString("1::FFFF:129.144.52.38") << (bool)TRUE << QString("1::FFFF:8190:3426") << 6; + QTest::newRow("ip6_13") << QString("A:B::D:E") << (bool)TRUE << QString("A:B::D:E") << 6; + QTest::newRow("ip6_14") << QString("1080:0:1:0:8:800:200C:417A") << (bool)TRUE << QString("1080:0:1:0:8:800:200C:417A") << 6; + QTest::newRow("ip6_15") << QString("1080:0:1:0:8:800:200C:0") << (bool)TRUE << QString("1080:0:1:0:8:800:200C:0") << 6; + QTest::newRow("ip6_16") << QString("1080:0:1:0:8:800:0:0") << (bool)TRUE << QString("1080:0:1:0:8:800::") << 6; + QTest::newRow("ip6_17") << QString("1080:0:0:0:8:800:0:0") << (bool)TRUE << QString("1080::8:800:0:0") << 6; + QTest::newRow("ip6_18") << QString("0:1:1:1:8:800:0:0") << (bool)TRUE << QString("0:1:1:1:8:800::") << 6; + QTest::newRow("ip6_19") << QString("0:1:1:1:8:800:0:1") << (bool)TRUE << QString("0:1:1:1:8:800:0:1") << 6; QTest::newRow("error_00") << QString("foobarcom") << (bool)FALSE << QString() << 0; QTest::newRow("error_01") << QString("foo.bar.com") << (bool)FALSE << QString() << 0; @@ -329,16 +335,16 @@ void tst_QHostAddress::scopeId() { QHostAddress address("fe80::2e0:4cff:fefb:662a%eth0"); QCOMPARE(address.scopeId(), QString("eth0")); - QCOMPARE(address.toString().toLower(), QString("fe80:0:0:0:2e0:4cff:fefb:662a%eth0")); + QCOMPARE(address.toString().toLower(), QString("fe80::2e0:4cff:fefb:662a%eth0")); QHostAddress address2("fe80::2e0:4cff:fefb:662a"); QCOMPARE(address2.scopeId(), QString()); address2.setScopeId(QString("en0")); - QCOMPARE(address2.toString().toLower(), QString("fe80:0:0:0:2e0:4cff:fefb:662a%en0")); + QCOMPARE(address2.toString().toLower(), QString("fe80::2e0:4cff:fefb:662a%en0")); address2 = address; QCOMPARE(address2.scopeId(), QString("eth0")); - QCOMPARE(address2.toString().toLower(), QString("fe80:0:0:0:2e0:4cff:fefb:662a%eth0")); + QCOMPARE(address2.toString().toLower(), QString("fe80::2e0:4cff:fefb:662a%eth0")); } void tst_QHostAddress::hashKey() diff --git a/tests/auto/qhostinfo/qhostinfo.pro b/tests/auto/qhostinfo/qhostinfo.pro index 97197a9b95..77ce1867d1 100644 --- a/tests/auto/qhostinfo/qhostinfo.pro +++ b/tests/auto/qhostinfo/qhostinfo.pro @@ -2,7 +2,7 @@ load(qttest_p4) SOURCES += tst_qhostinfo.cpp -QT = core network +QT = core-private network-private wince*: { LIBS += ws2.lib diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp index af0631e1f5..7657035a37 100644 --- a/tests/auto/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/qhostinfo/tst_qhostinfo.cpp @@ -213,6 +213,13 @@ void tst_QHostInfo::initTestCase() #else ipv6Available = false; ipv6LookupsAvailable = false; + + QTcpServer server; + if (server.listen(QHostAddress("::1"))) { + // We have IPv6 support + ipv6Available = true; + } + #if !defined(QT_NO_GETADDRINFO) // check if the system getaddrinfo can do IPv6 lookups struct addrinfo hint, *result = 0; @@ -235,13 +242,6 @@ void tst_QHostInfo::initTestCase() #endif #endif - QTcpServer server; - if (server.listen(QHostAddress("::1"))) { - // We have IPv6 support - ipv6Available = true; - } - - // run each testcase with and without test enabled QTest::addColumn<bool>("cache"); QTest::newRow("WithCache") << true; diff --git a/tests/auto/qhttp/tst_qhttp.cpp b/tests/auto/qhttp/tst_qhttp.cpp index 61123c297f..96346cc91a 100644 --- a/tests/auto/qhttp/tst_qhttp.cpp +++ b/tests/auto/qhttp/tst_qhttp.cpp @@ -772,6 +772,7 @@ void tst_QHttp::authorization() http.setUser(user, pass); http.setHost(host); int id = http.get(path); + Q_UNUSED(id); QTimer::singleShot(5000, &loop, SLOT(quit())); loop.exec(); diff --git a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro index 223c4e1c96..98511ac86e 100644 --- a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro +++ b/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro @@ -3,7 +3,7 @@ SOURCES += tst_qhttpnetworkconnection.cpp INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib requires(contains(QT_CONFIG,private_tests)) -QT = core network +QT = core-private network-private symbian: TARGET.CAPABILITY = NetworkServices symbian: { diff --git a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp index ba1f8c8cca..ea4fddcc5e 100644 --- a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp +++ b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp @@ -1000,6 +1000,7 @@ public: public Q_SLOTS: void finishedSlot() { QHttpNetworkReply *reply = (QHttpNetworkReply*) sender(); + Q_UNUSED(reply); receivedCount++; if (receivedCount == requestCount) @@ -1046,6 +1047,7 @@ public: public Q_SLOTS: void finishedSlot() { QHttpNetworkReply *reply = (QHttpNetworkReply*) sender(); + Q_UNUSED(reply); receivedCount++; if (receivedCount == requestCount) diff --git a/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro b/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro index 36d56c6f20..8ce9f6f760 100644 --- a/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro +++ b/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro @@ -3,5 +3,5 @@ SOURCES += tst_qhttpnetworkreply.cpp INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib requires(contains(QT_CONFIG,private_tests)) -QT = core network +QT = core-private network-private symbian: TARGET.CAPABILITY = NetworkServices diff --git a/tests/auto/qhttpsocketengine/qhttpsocketengine.pro b/tests/auto/qhttpsocketengine/qhttpsocketengine.pro index 6df619200b..f26abbe8d9 100644 --- a/tests/auto/qhttpsocketengine/qhttpsocketengine.pro +++ b/tests/auto/qhttpsocketengine/qhttpsocketengine.pro @@ -6,7 +6,7 @@ include(../platformsocketengine/platformsocketengine.pri) MOC_DIR=tmp -QT = core network +QT = core-private network-private symbian: TARGET.CAPABILITY = NetworkServices diff --git a/tests/auto/qimage/tst_qimage.cpp b/tests/auto/qimage/tst_qimage.cpp index ad85bf5cce..49acb98a6a 100644 --- a/tests/auto/qimage/tst_qimage.cpp +++ b/tests/auto/qimage/tst_qimage.cpp @@ -73,7 +73,6 @@ private slots: void create(); void createInvalidXPM(); void createFromUChar(); - void convertBitOrder(); void formatHandlersInput_data(); void formatHandlersInput(); @@ -265,32 +264,6 @@ void tst_QImage::createFromUChar() QCOMPARE(i4.pixel(0,0), 6U); } -void tst_QImage::convertBitOrder() -{ -#if !defined(QT3_SUPPORT) - QSKIP("Qt compiled without Qt3Support", SkipAll); -#else - QImage i(9,5,1,2,QImage::LittleEndian); - qMemSet(i.bits(), 0, i.byteCount()); - - i.setDotsPerMeterX(9); - i.setDotsPerMeterY(5); - i.fill(0x12345678); - QVERIFY(!i.isNull()); - - QImage ni = i.convertBitOrder(QImage::BigEndian); - QVERIFY(!ni.isNull()); - QVERIFY(ni.bitOrder() == QImage::BigEndian); - - // A bunch of verifies to make sure that nothing was lost - QVERIFY(i.dotsPerMeterX() == ni.dotsPerMeterX()); - QVERIFY(i.dotsPerMeterY() == ni.dotsPerMeterY()); - QVERIFY(i.depth() == ni.depth()); - QVERIFY(i.size() == ni.size()); - QVERIFY(i.colorCount() == ni.colorCount()); -#endif -} - void tst_QImage::formatHandlersInput_data() { QTest::addColumn<QString>("testFormat"); diff --git a/tests/auto/qinputdialog/tst_qinputdialog.cpp b/tests/auto/qinputdialog/tst_qinputdialog.cpp index 1d13eb6292..e0317df382 100644 --- a/tests/auto/qinputdialog/tst_qinputdialog.cpp +++ b/tests/auto/qinputdialog/tst_qinputdialog.cpp @@ -193,12 +193,12 @@ void testGetNumeric(QInputDialog *dialog, SpinBoxType * = 0, ValueType * = 0) void testGetText(QInputDialog *dialog) { QLineEdit *ledit = qFindChild<QLineEdit *>(dialog); - Q_ASSERT(ledit); + QVERIFY(ledit); QDialogButtonBox *bbox = qFindChild<QDialogButtonBox *>(dialog); - Q_ASSERT(bbox); + QVERIFY(bbox); QPushButton *okButton = bbox->button(QDialogButtonBox::Ok); - Q_ASSERT(okButton); + QVERIFY(okButton); QVERIFY(ledit->hasAcceptableInput()); QCOMPARE(ledit->selectedText(), ledit->text()); @@ -211,12 +211,12 @@ void testGetText(QInputDialog *dialog) void testGetItem(QInputDialog *dialog) { QComboBox *cbox = qFindChild<QComboBox *>(dialog); - Q_ASSERT(cbox); + QVERIFY(cbox); QDialogButtonBox *bbox = qFindChild<QDialogButtonBox *>(dialog); - Q_ASSERT(bbox); + QVERIFY(bbox); QPushButton *okButton = bbox->button(QDialogButtonBox::Ok); - Q_ASSERT(okButton); + QVERIFY(okButton); QVERIFY(okButton->isEnabled()); const int origIndex = cbox->currentIndex(); @@ -249,7 +249,7 @@ void tst_QInputDialog::timerEvent(QTimerEvent *event) { killTimer(event->timerId()); QInputDialog *dialog = qFindChild<QInputDialog *>(parent); - Q_ASSERT(dialog); + QVERIFY(dialog); if (testFunc) testFunc(dialog); dialog->done(doneCode); // cause static function call to return @@ -270,7 +270,7 @@ void tst_QInputDialog::getInteger() { QFETCH(int, min); QFETCH(int, max); - Q_ASSERT(min < max); + QVERIFY(min < max); parent = new QWidget; doneCode = QDialog::Accepted; testFunc = &tst_QInputDialog::testFuncGetInteger; @@ -310,7 +310,7 @@ void tst_QInputDialog::getDouble() QFETCH(double, min); QFETCH(double, max); QFETCH(int, decimals); - Q_ASSERT(min < max && decimals >= 0 && decimals <= 13); + QVERIFY(min < max && decimals >= 0 && decimals <= 13); parent = new QWidget; doneCode = QDialog::Accepted; testFunc = &tst_QInputDialog::testFuncGetDouble; diff --git a/tests/auto/qiodevice/tst_qiodevice.cpp b/tests/auto/qiodevice/tst_qiodevice.cpp index 50abffe1f0..804d0502f4 100644 --- a/tests/auto/qiodevice/tst_qiodevice.cpp +++ b/tests/auto/qiodevice/tst_qiodevice.cpp @@ -73,8 +73,6 @@ private slots: void unget(); void peek(); void peekAndRead(); - void getch(); - void putch(); void readLine_data(); void readLine(); @@ -382,47 +380,6 @@ void tst_QIODevice::peekAndRead() QFile::remove("peektestfile"); } -void tst_QIODevice::getch() -{ -#ifdef QT3_SUPPORT - QBuffer buffer; - buffer.open(QBuffer::ReadWrite); - buffer.write("\xff\x7f\x80\x00", 4); - buffer.reset(); - QCOMPARE(buffer.getch(), 0xff); - QCOMPARE(buffer.getch(), 0x7f); - QCOMPARE(buffer.getch(), 0x80); - QCOMPARE(buffer.getch(), 0x00); - - buffer.ungetch(0x00); - buffer.ungetch(0x80); - buffer.ungetch(0x7f); - buffer.ungetch(0xff); - - QCOMPARE(buffer.getch(), 0xff); - QCOMPARE(buffer.getch(), 0x7f); - QCOMPARE(buffer.getch(), 0x80); - QCOMPARE(buffer.getch(), 0x00); -#endif -} - -void tst_QIODevice::putch() -{ -#ifdef QT3_SUPPORT - QBuffer buffer; - buffer.open(QBuffer::ReadWrite); - buffer.putch(0xff); - buffer.putch(0x7f); - buffer.putch(0x80); - buffer.putch(0x00); - buffer.reset(); - QCOMPARE(buffer.getch(), 0xff); - QCOMPARE(buffer.getch(), 0x7f); - QCOMPARE(buffer.getch(), 0x80); - QCOMPARE(buffer.getch(), 0x00); -#endif -} - void tst_QIODevice::readLine_data() { QTest::addColumn<QByteArray>("data"); @@ -613,7 +570,7 @@ public: } return maxlen; } - qint64 writeData(const char *data, qint64 maxlen) { + qint64 writeData(const char * /* data */, qint64 /* maxlen */) { return -1; } diff --git a/tests/auto/qitemmodel/modelstotest.cpp b/tests/auto/qitemmodel/modelstotest.cpp index c4c2cbb521..df06c95254 100644 --- a/tests/auto/qitemmodel/modelstotest.cpp +++ b/tests/auto/qitemmodel/modelstotest.cpp @@ -227,7 +227,6 @@ QAbstractItemModel *ModelsToTest::createModel(const QString &modelType) return widget->model(); } - Q_ASSERT(false); return 0; } @@ -309,15 +308,23 @@ QModelIndex ModelsToTest::populateTestArea(QAbstractItemModel *model) */ } QModelIndex returnIndex = model->index(0,0); - Q_ASSERT(returnIndex.isValid()); + if (!returnIndex.isValid()) + qFatal("%s: model index to be returned is invalid", Q_FUNC_INFO); return returnIndex; } if (QDirModel *dirModel = qobject_cast<QDirModel *>(model)) { - // Don't risk somthing bad happening, assert if this fails - Q_ASSERT(QDir(QDir::currentPath()).mkdir("test")); - for (int i = 0; i < 26; ++i) - Q_ASSERT(QDir(QDir::currentPath()).mkdir(QString("test/foo_%1").arg(i))); + if (!QDir::current().mkdir("test")) + qFatal("%s: cannot create directory %s", + Q_FUNC_INFO, + qPrintable(QDir::toNativeSeparators(QDir::currentPath()+"/test"))); + for (int i = 0; i < 26; ++i) { + QString subdir = QString("test/foo_%1").arg(i); + if (!QDir::current().mkdir(subdir)) + qFatal("%s: cannot create directory %s", + Q_FUNC_INFO, + qPrintable(QDir::toNativeSeparators(QDir::currentPath()+"/"+subdir))); + } return dirModel->index(QDir::currentPath()+"/test"); } @@ -373,7 +380,7 @@ QModelIndex ModelsToTest::populateTestArea(QAbstractItemModel *model) return QModelIndex(); } - Q_ASSERT(false); + qFatal("%s: unknown type of model", Q_FUNC_INFO); return QModelIndex(); } @@ -387,9 +394,17 @@ void ModelsToTest::cleanupTestArea(QAbstractItemModel *model) { if (QDir(QDir::currentPath()+"/test").exists()) { - for (int i = 0; i < 26; ++i) - QDir::current().rmdir(QString("test/foo_%1").arg(i)); - Q_ASSERT(QDir::current().rmdir("test")); + for (int i = 0; i < 26; ++i) { + QString subdir(QString("test/foo_%1").arg(i)); + if (!QDir::current().rmdir(subdir)) + qFatal("%s: cannot remove directory %s", + Q_FUNC_INFO, + qPrintable(QDir::toNativeSeparators(QDir::currentPath()+"/"+subdir))); + } + if (!QDir::current().rmdir("test")) + qFatal("%s: cannot remove directory %s", + Q_FUNC_INFO, + qPrintable(QDir::toNativeSeparators(QDir::currentPath()+"/test"))); } } else if (qobject_cast<QSqlQueryModel *>(model)) { QSqlQuery q("DROP TABLE test"); diff --git a/tests/auto/qitemmodel/tst_qitemmodel.cpp b/tests/auto/qitemmodel/tst_qitemmodel.cpp index 7e177bae9b..948285386f 100644 --- a/tests/auto/qitemmodel/tst_qitemmodel.cpp +++ b/tests/auto/qitemmodel/tst_qitemmodel.cpp @@ -199,6 +199,7 @@ void tst_QItemModel::nonDestructiveBasicTest() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); QCOMPARE(currentModel->buddy(QModelIndex()), QModelIndex()); currentModel->canFetchMore(QModelIndex()); @@ -244,6 +245,7 @@ void tst_QItemModel::rowCount() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); QFETCH(bool, isEmpty); if (isEmpty) { @@ -291,6 +293,7 @@ void tst_QItemModel::columnCount() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); QFETCH(bool, isEmpty); if (isEmpty) { @@ -325,6 +328,7 @@ void tst_QItemModel::hasIndex() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); // Make sure that invalid values returns an invalid index QCOMPARE(currentModel->hasIndex(-2, -2), false); @@ -359,6 +363,7 @@ void tst_QItemModel::index() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); // Make sure that invalid values returns an invalid index QCOMPARE(currentModel->index(-2, -2), QModelIndex()); @@ -489,6 +494,7 @@ void tst_QItemModel::parent() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); // Make sure the model wont crash and will return an invalid QModelIndex // when asked for the parent of an invalid index. @@ -538,6 +544,7 @@ void tst_QItemModel::data() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); // Invalid index should return an invalid qvariant QVERIFY(!currentModel->data(QModelIndex()).isValid()); @@ -618,6 +625,7 @@ void tst_QItemModel::setData() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); qRegisterMetaType<QModelIndex>("QModelIndex"); QSignalSpy spy(currentModel, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &))); QCOMPARE(currentModel->setData(QModelIndex(), QVariant()), false); @@ -660,6 +668,7 @@ void tst_QItemModel::setHeaderData() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); QCOMPARE(currentModel->setHeaderData(-1, Qt::Horizontal, QVariant()), false); QCOMPARE(currentModel->setHeaderData(-1, Qt::Vertical, QVariant()), false); @@ -708,6 +717,7 @@ void tst_QItemModel::sort() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); QFETCH(bool, isEmpty); if (isEmpty) @@ -819,6 +829,7 @@ void tst_QItemModel::remove() QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); QFETCH(bool, readOnly); if (readOnly) @@ -1160,6 +1171,7 @@ void tst_QItemModel::insert() { QFETCH(QString, modelType); currentModel = testModels->createModel(modelType); + QVERIFY(currentModel); QFETCH(bool, readOnly); if (readOnly) diff --git a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp index d91b068c5f..36c89a03fe 100644 --- a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp +++ b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp @@ -2289,7 +2289,7 @@ void tst_QItemSelectionModel::QTBUG5671_layoutChangedWithAllSelected() struct MyFilterModel : public QSortFilterProxyModel { // Override sort filter proxy to remove even numbered rows. bool filtering; - virtual bool filterAcceptsRow( int source_row, const QModelIndex& source_parent ) const + virtual bool filterAcceptsRow( int source_row, const QModelIndex& /* source_parent */) const { return !filtering || !( source_row & 1 ); } @@ -2373,7 +2373,7 @@ public: } public slots: - void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) + void selectionChanged(const QItemSelection & /* selected */, const QItemSelection &deselected) { foreach(const QModelIndex &index, deselected.indexes()) { QVERIFY(!m_itemSelectionModel->selection().contains(index)); diff --git a/tests/auto/qitemview/tst_qitemview.cpp b/tests/auto/qitemview/tst_qitemview.cpp index 220a174c9a..fa8367e145 100644 --- a/tests/auto/qitemview/tst_qitemview.cpp +++ b/tests/auto/qitemview/tst_qitemview.cpp @@ -148,12 +148,18 @@ public: CheckerModel() : QStandardItemModel() {}; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole ) const { - Q_ASSERT(index.isValid()); + if (!index.isValid()) { + qWarning("%s: index is not valid", Q_FUNC_INFO); + return QVariant(); + } return QStandardItemModel::data(index, role); }; Qt::ItemFlags flags(const QModelIndex & index) const { - Q_ASSERT(index.isValid()); + if (!index.isValid()) { + qWarning("%s: index is not valid", Q_FUNC_INFO); + return Qt::ItemFlags(); + } if (index.row() == 2 || index.row() == rowCount() - 3 || index.column() == 2 || index.column() == columnCount() - 3) { Qt::ItemFlags f = QStandardItemModel::flags(index); @@ -164,14 +170,26 @@ public: }; QModelIndex parent ( const QModelIndex & child ) const { - Q_ASSERT(child.isValid()); + if (!child.isValid()) { + qWarning("%s: child index is not valid", Q_FUNC_INFO); + return QModelIndex(); + } return QStandardItemModel::parent(child); }; QVariant headerData ( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const { - Q_ASSERT(section >= 0); - if (orientation == Qt::Horizontal) { Q_ASSERT(section <= columnCount());}; - if (orientation == Qt::Vertical) { Q_ASSERT(section <= rowCount());}; + if (orientation == Qt::Horizontal + && (section < 0 || section > columnCount())) { + qWarning("%s: invalid section %d, must be in range 0..%d", + Q_FUNC_INFO, section, columnCount()); + return QVariant(); + } + if (orientation == Qt::Vertical + && (section < 0 || section > rowCount())) { + qWarning("%s: invalid section %d, must be in range 0..%d", + Q_FUNC_INFO, section, rowCount()); + return QVariant(); + } return QStandardItemModel::headerData(section, orientation, role); } @@ -180,23 +198,46 @@ public: }; bool setData ( const QModelIndex & index, const QVariant & value, int role = Qt::EditRole ) { - Q_ASSERT(index.isValid()); + if (!index.isValid()) { + qWarning("%s: index is not valid", Q_FUNC_INFO); + return false; + } return QStandardItemModel::setData(index, value, role); } void sort( int column, Qt::SortOrder order = Qt::AscendingOrder ) { - Q_ASSERT(column >= 0 && column <= columnCount()); - QStandardItemModel::sort(column, order); + if (column < 0 || column > columnCount()) + qWarning("%s: invalid column %d, must be in range 0..%d", + Q_FUNC_INFO, column, columnCount()); + else + QStandardItemModel::sort(column, order); }; QModelIndexList match ( const QModelIndex & start, int role, const QVariant & value, int hits = 1, Qt::MatchFlags flags = Qt::MatchFlags( Qt::MatchStartsWith | Qt::MatchWrap ) ) const { - Q_ASSERT(hits > 0); - Q_ASSERT(value.isValid()); + if (hits <= 0) { + qWarning("%s: hits must be greater than zero", Q_FUNC_INFO); + return QModelIndexList(); + } + if (!value.isValid()) { + qWarning("%s: value is not valid", Q_FUNC_INFO); + return QModelIndexList(); + } return QAbstractItemModel::match(start, role, value, hits, flags); }; bool setHeaderData ( int section, Qt::Orientation orientation, const QVariant & value, int role = Qt::EditRole ) { - Q_ASSERT(section >= 0); + if (orientation == Qt::Horizontal + && (section < 0 || section > columnCount())) { + qWarning("%s: invalid section %d, must be in range 0..%d", + Q_FUNC_INFO, section, columnCount()); + return false; + } + if (orientation == Qt::Vertical + && (section < 0 || section > rowCount())) { + qWarning("%s: invalid section %d, must be in range 0..%d", + Q_FUNC_INFO, section, rowCount()); + return false; + } return QAbstractItemModel::setHeaderData(section, orientation, value, role); }; }; @@ -297,9 +338,11 @@ void tst_QItemView::nonDestructiveBasicTest() #endif QFETCH(QString, viewType); - view = testViews->createView(viewType); QFETCH(int, vscroll); QFETCH(int, hscroll); + + view = testViews->createView(viewType); + QVERIFY(view); view->setVerticalScrollMode((QAbstractItemView::ScrollMode)vscroll); view->setHorizontalScrollMode((QAbstractItemView::ScrollMode)hscroll); @@ -454,9 +497,11 @@ void tst_QItemView::spider() QSKIP("This test takes too long to execute on IRIX", SkipAll); #endif QFETCH(QString, viewType); - view = testViews->createView(viewType); QFETCH(int, vscroll); QFETCH(int, hscroll); + + view = testViews->createView(viewType); + QVERIFY(view); view->setVerticalScrollMode((QAbstractItemView::ScrollMode)vscroll); view->setHorizontalScrollMode((QAbstractItemView::ScrollMode)hscroll); view->setModel(treeModel); @@ -489,9 +534,11 @@ void tst_QItemView::resize() // This test needs to be re-thought out, it takes too long and // doesn't really catch theproblem. QFETCH(QString, viewType); - view = testViews->createView(viewType); QFETCH(int, vscroll); QFETCH(int, hscroll); + + view = testViews->createView(viewType); + QVERIFY(view); view->setVerticalScrollMode((QAbstractItemView::ScrollMode)vscroll); view->setHorizontalScrollMode((QAbstractItemView::ScrollMode)hscroll); view->setModel(treeModel); @@ -517,9 +564,11 @@ void tst_QItemView::visualRect() QSKIP("This test takes too long to execute on IRIX", SkipAll); #endif QFETCH(QString, viewType); - view = testViews->createView(viewType); QFETCH(int, vscroll); QFETCH(int, hscroll); + + view = testViews->createView(viewType); + QVERIFY(view); view->setVerticalScrollMode((QAbstractItemView::ScrollMode)vscroll); view->setHorizontalScrollMode((QAbstractItemView::ScrollMode)hscroll); QCOMPARE(view->visualRect(QModelIndex()), QRect()); @@ -651,9 +700,11 @@ void tst_QItemView::indexAt() QSKIP("This test takes too long to execute on IRIX", SkipAll); #endif QFETCH(QString, viewType); - view = testViews->createView(viewType); QFETCH(int, vscroll); QFETCH(int, hscroll); + + view = testViews->createView(viewType); + QVERIFY(view); view->setVerticalScrollMode((QAbstractItemView::ScrollMode)vscroll); view->setHorizontalScrollMode((QAbstractItemView::ScrollMode)hscroll); view->show(); @@ -685,9 +736,11 @@ void tst_QItemView::scrollTo() QSKIP("This test takes too long to execute on IRIX", SkipAll); #endif QFETCH(QString, viewType); - view = testViews->createView(viewType); QFETCH(int, vscroll); QFETCH(int, hscroll); + + view = testViews->createView(viewType); + QVERIFY(view); view->setVerticalScrollMode((QAbstractItemView::ScrollMode)vscroll); view->setHorizontalScrollMode((QAbstractItemView::ScrollMode)hscroll); view->setModel(treeModel); @@ -735,6 +788,7 @@ void tst_QItemView::moveCursor() #endif QFETCH(QString, viewType); view = testViews->createView(viewType); + QVERIFY(view); if (view->objectName() == "QHeaderView") return; diff --git a/tests/auto/qitemview/viewstotest.cpp b/tests/auto/qitemview/viewstotest.cpp index 3aa355d3a1..5e21daffeb 100644 --- a/tests/auto/qitemview/viewstotest.cpp +++ b/tests/auto/qitemview/viewstotest.cpp @@ -141,7 +141,6 @@ QAbstractItemView *ViewsToTest::createView(const QString &viewType) view->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel); view->setSelectionBehavior(QAbstractItemView::SelectItems); } - Q_ASSERT(view); return view; } diff --git a/tests/auto/qlayout/tst_qlayout.cpp b/tests/auto/qlayout/tst_qlayout.cpp index 3090ebb684..f69a99c312 100644 --- a/tests/auto/qlayout/tst_qlayout.cpp +++ b/tests/auto/qlayout/tst_qlayout.cpp @@ -76,9 +76,6 @@ private slots: void geometry(); void smartMaxSize(); void setLayoutBugs(); -#ifdef QT3_SUPPORT - void task193350_sizeGrip(); -#endif void setContentsMargins(); void layoutItemRect(); void warnIfWrongParent(); @@ -185,16 +182,16 @@ void tst_QLayout::smartMaxSize() int expectedIndex = 0; int regressionCount = 0; - for (int p = 0; p < sizeof(policies)/sizeof(QSizePolicy::Policy); ++p) { + for (size_t p = 0; p < sizeof(policies)/sizeof(QSizePolicy::Policy); ++p) { QSizePolicy sizePolicy; sizePolicy.setHorizontalPolicy(policies[p]); - for (int min = 0; min < sizeof(sizeCombinations)/sizeof(int); ++min) { + for (size_t min = 0; min < sizeof(sizeCombinations)/sizeof(int); ++min) { int minSize = sizeCombinations[min]; - for (int max = 0; max < sizeof(sizeCombinations)/sizeof(int); ++max) { + for (size_t max = 0; max < sizeof(sizeCombinations)/sizeof(int); ++max) { int maxSize = sizeCombinations[max]; - for (int sh = 0; sh < sizeof(sizeCombinations)/sizeof(int); ++sh) { + for (size_t sh = 0; sh < sizeof(sizeCombinations)/sizeof(int); ++sh) { int sizeHint = sizeCombinations[sh]; - for (int a = 0; a < sizeof(alignments)/sizeof(int); ++a) { + for (size_t a = 0; a < sizeof(alignments)/sizeof(int); ++a) { Qt::Alignment align = alignments[a]; QSize sz = qSmartMaxSize(QSize(sizeHint, 1), QSize(minSize, 1), QSize(maxSize, 1), sizePolicy, align); int width = sz.width(); @@ -235,21 +232,6 @@ void tst_QLayout::setLayoutBugs() QVERIFY(containerWidget.layout() == hBoxLayout); } -#ifdef QT3_SUPPORT -void tst_QLayout::task193350_sizeGrip() -{ - QDialog dialog; - dialog.setSizeGripEnabled(true); - - QVBoxLayout* layout = new QVBoxLayout(&dialog); - layout->setAutoAdd(true); - new QLabel("Label", &dialog); - - dialog.show(); - QCOMPARE(layout->indexOf(qFindChild<QSizeGrip *>(&dialog)),-1); -} -#endif - class MyLayout : public QLayout { public: diff --git a/tests/auto/qlibrary/tst_qlibrary.cpp b/tests/auto/qlibrary/tst_qlibrary.cpp index c79332d276..a8c60c93c2 100644 --- a/tests/auto/qlibrary/tst_qlibrary.cpp +++ b/tests/auto/qlibrary/tst_qlibrary.cpp @@ -468,7 +468,7 @@ void tst_QLibrary::errorString() } break;} default: - Q_ASSERT(0); + QFAIL(qPrintable(QString("Unknown operation: %1").arg(operation))); break; } QRegExp re(errorString); diff --git a/tests/auto/qlineedit/tst_qlineedit.cpp b/tests/auto/qlineedit/tst_qlineedit.cpp index d5d9029b12..a7a5bd7b4b 100644 --- a/tests/auto/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/qlineedit/tst_qlineedit.cpp @@ -277,11 +277,6 @@ private slots: void QTBUG697_paletteCurrentColorGroup(); void QTBUG13520_textNotVisible(); -#ifdef QT3_SUPPORT - void validateAndSet_data(); - void validateAndSet(); -#endif - void bidiVisualMovement_data(); void bidiVisualMovement(); @@ -289,9 +284,6 @@ private slots: void bidiLogicalMovement(); protected slots: -#ifdef QT3_SUPPORT - void lostFocus(); -#endif void editingFinished(); void onTextChanged( const QString &newString ); @@ -360,9 +352,6 @@ void tst_QLineEdit::initTestCase() connect(testWidget, SIGNAL(returnPressed()), this, SLOT(onReturnPressed())); connect(testWidget, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); connect(testWidget, SIGNAL(editingFinished()), this, SLOT(editingFinished())); -#ifdef QT3_SUPPORT - connect(testWidget, SIGNAL(lostFocus()), this, SLOT(lostFocus())); -#endif testWidget->resize(200,50); testWidget->show(); @@ -1498,40 +1487,6 @@ void tst_QLineEdit::clear() QCOMPARE(testWidget->text(), QString("I am Legend")); } -#ifdef QT3_SUPPORT -void tst_QLineEdit::lostFocus() -{ - editingFinished(); -} - -void tst_QLineEdit::validateAndSet_data() -{ - QTest::addColumn<QString>("newText"); - QTest::addColumn<int>("newPos"); - QTest::addColumn<int>("newMarkAnchor"); - QTest::addColumn<int>("newMarkDrag"); - - QTest::newRow("1") << QString("Hello World") << 3 << 3 << 5; - QTest::newRow("2") << QString("Hello World") << 5 << 3 << 5; -} - -void tst_QLineEdit::validateAndSet() -{ - QFETCH(QString, newText); - QFETCH(int, newPos); - QFETCH(int, newMarkAnchor); - QFETCH(int, newMarkDrag); - - QLineEdit e; - e.validateAndSet(newText, newPos, newMarkAnchor, newMarkDrag); - QCOMPARE(e.text(), newText); - QCOMPARE(e.cursorPosition(), newPos); - QCOMPARE(e.selectedText(), newText.mid(newMarkAnchor, newMarkDrag-newMarkAnchor)); -} - - - -#endif void tst_QLineEdit::editingFinished() { if (testWidget->hasAcceptableInput()) @@ -2660,16 +2615,6 @@ void tst_QLineEdit::setAlignment() #endif QVERIFY(testWidget->alignment() == Qt::AlignLeft); -#ifdef QT3_SUPPORT - testWidget->setText("auto"); - testWidget->setAlignment(Qt::AlignAuto); -#ifndef NO_PIXMAP_TESTS -#if defined Q_WS_WIN - QTEST(testWidget, "auto"); -#endif -#endif -#endif - testWidget->setText("hcenter"); testWidget->setAlignment(Qt::AlignHCenter); #ifndef NO_PIXMAP_TESTS @@ -2679,16 +2624,6 @@ void tst_QLineEdit::setAlignment() #endif QVERIFY(testWidget->alignment() == Qt::AlignHCenter); -#ifdef QT3_SUPPORT - testWidget->setText("auto"); - testWidget->setAlignment(Qt::AlignAuto); -#ifndef NO_PIXMAP_TESTS -#if defined Q_WS_WIN - QTEST(testWidget, "auto"); -#endif -#endif -#endif - testWidget->setText("right"); testWidget->setAlignment(Qt::AlignRight); #ifndef NO_PIXMAP_TESTS @@ -2698,17 +2633,6 @@ void tst_QLineEdit::setAlignment() #endif QVERIFY(testWidget->alignment() == Qt::AlignRight); -#ifdef QT3_SUPPORT - testWidget->setText("auto"); - testWidget->setAlignment(Qt::AlignAuto); -#ifndef NO_PIXMAP_TESTS -#if defined Q_WS_WIN - QTEST(testWidget, "auto"); -#endif -#endif - QVERIFY(testWidget->alignment() == Qt::AlignAuto); -#endif - testWidget->setAlignment(Qt::AlignTop); QVERIFY(testWidget->alignment() == Qt::AlignTop); diff --git a/tests/auto/qlistwidget/qlistwidget.pro b/tests/auto/qlistwidget/qlistwidget.pro index faf970d027..eb4c335b5b 100644 --- a/tests/auto/qlistwidget/qlistwidget.pro +++ b/tests/auto/qlistwidget/qlistwidget.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += core-private gui-private SOURCES += tst_qlistwidget.cpp diff --git a/tests/auto/qlocale/tst_qlocale.cpp b/tests/auto/qlocale/tst_qlocale.cpp index 2b7eaaefbc..2ffc9e923b 100644 --- a/tests/auto/qlocale/tst_qlocale.cpp +++ b/tests/auto/qlocale/tst_qlocale.cpp @@ -326,7 +326,7 @@ void tst_QLocale::ctor() TEST_CTOR("en-GB", English, UnitedKingdom) TEST_CTOR("en-GB@bla", English, UnitedKingdom) - Q_ASSERT(QLocale::Norwegian == QLocale::NorwegianBokmal); + QVERIFY(QLocale::Norwegian == QLocale::NorwegianBokmal); TEST_CTOR("no", Norwegian, Norway) TEST_CTOR("nb", Norwegian, Norway) TEST_CTOR("nn", NorwegianNynorsk, Norway) @@ -431,7 +431,7 @@ void tst_QLocale::emptyCtor() TEST_CTOR("en_GB@bla", "en_GB") TEST_CTOR("de", "de_DE") - Q_ASSERT(QLocale::Norwegian == QLocale::NorwegianBokmal); + QVERIFY(QLocale::Norwegian == QLocale::NorwegianBokmal); TEST_CTOR("no", "nb_NO") TEST_CTOR("nb", "nb_NO") TEST_CTOR("nn", "nn_NO") diff --git a/tests/auto/qmainwindow/qmainwindow.pro b/tests/auto/qmainwindow/qmainwindow.pro index e015f95ec1..0f6d71c6ec 100644 --- a/tests/auto/qmainwindow/qmainwindow.pro +++ b/tests/auto/qmainwindow/qmainwindow.pro @@ -1,6 +1,6 @@ load(qttest_p4) SOURCES += tst_qmainwindow.cpp - +QT += gui-private # Symbian toolchain does not support correct include semantics symbian:INCPATH+=..\\..\\..\\include\\QtGui\\private diff --git a/tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/simple/main.cpp b/tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/simple/main.cpp index 3c850d486b..a023aa6354 100644 --- a/tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/simple/main.cpp +++ b/tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/simple/main.cpp @@ -1,3 +1,45 @@ +/**************************************************************************** +** +** 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 test suite 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$ +** +****************************************************************************/ + + int main(int,char**) { } diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp index 1367e1f37d..4845077cde 100644 --- a/tests/auto/qmenu/tst_qmenu.cpp +++ b/tests/auto/qmenu/tst_qmenu.cpp @@ -90,10 +90,6 @@ private slots: void tearOff(); void layoutDirection(); -#if defined(QT3_SUPPORT) - void indexBasedInsertion_data(); - void indexBasedInsertion(); -#endif void task208001_stylesheet(); void activeSubMenuPosition(); void task242454_sizeHint(); @@ -641,49 +637,6 @@ void tst_QMenu::layoutDirection() QCOMPARE(menu.layoutDirection(), Qt::RightToLeft); } - - -#if defined(QT3_SUPPORT) -void tst_QMenu::indexBasedInsertion_data() -{ - QTest::addColumn<int>("indexForInsertion"); - QTest::addColumn<int>("expectedIndex"); - - QTest::newRow("negative-index-appends") << -1 << 1; - QTest::newRow("prepend") << 0 << 0; - QTest::newRow("append") << 1 << 1; -} - -void tst_QMenu::indexBasedInsertion() -{ - // test the compat'ed index based insertion - - QFETCH(int, indexForInsertion); - QFETCH(int, expectedIndex); - - { - QMenu menu; - menu.addAction("Regular Item"); - - menu.insertItem("New Item", -1 /*id*/, indexForInsertion); - - QAction *act = menu.actions().value(expectedIndex); - QVERIFY(act); - QCOMPARE(act->text(), QString("New Item")); - } - { - QMenu menu; - menu.addAction("Regular Item"); - - menu.insertSeparator(indexForInsertion); - - QAction *act = menu.actions().value(expectedIndex); - QVERIFY(act); - QVERIFY(act->isSeparator()); - } -} -#endif - void tst_QMenu::task208001_stylesheet() { //test if it crash @@ -789,7 +742,7 @@ void tst_QMenu::task250673_activeMultiColumnSubMenuPosition() while (main.columnCount() < 2) { main.addAction(QString("Item %1").arg(i)); ++i; - Q_ASSERT(i<1000); + QVERIFY(i<1000); } main.setActiveAction(menuAction); sub.setActiveAction(subAction); diff --git a/tests/auto/qmenubar/tst_qmenubar.cpp b/tests/auto/qmenubar/tst_qmenubar.cpp index 6e12d7b7dc..9b5bc4ccf8 100644 --- a/tests/auto/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/qmenubar/tst_qmenubar.cpp @@ -44,9 +44,6 @@ #include <qapplication.h> #include <qmainwindow.h> #include <qmenubar.h> -#ifdef QT3_SUPPORT -#include <q3popupmenu.h> -#endif #include <qstyle.h> #include <qwindowsstyle.h> #include <qdesktopwidget.h> @@ -105,15 +102,8 @@ public: tst_QMenuBar(); virtual ~tst_QMenuBar(); -#ifdef QT3_SUPPORT void initSimpleMenubar(); -#endif - void initSimpleMenubar_noQt3(); - -#ifdef QT3_SUPPORT void initComplexMenubar(); -#endif - void initComplexMenubar_noQt3(); public slots: void initTestCase(); @@ -122,27 +112,16 @@ public slots: private slots: void getSetCheck(); - void clear_noQt3(); - void removeItemAt_noQt3(); - void removeItemAt_noQt3_data(); - void removeItem_noQt3_data(); - void removeItem_noQt3(); - void count_noQt3(); - void insertItem_QString_QObject_noQt3(); - void accel_noQt3(); - void activatedCount_noQt3(); - void allowActiveAndDisabled(); -#ifdef QT3_SUPPORT void clear(); - void removeItemAt_data(); void removeItemAt(); + void removeItemAt_data(); void removeItem_data(); void removeItem(); void count(); void insertItem_QString_QObject(); void accel(); void activatedCount(); -#endif + void allowActiveAndDisabled(); void check_accelKeys(); void check_cursorKeys1(); @@ -151,10 +130,7 @@ private slots: void check_homeKey(); void check_endKey(); -#ifdef QT3_SUPPORT void check_escKey(); -#endif - void check_escKey_noQt3(); // void check_mouse1_data(); // void check_mouse1(); @@ -170,21 +146,10 @@ private slots: void taskQTBUG4965_escapeEaten(); void taskQTBUG11823_crashwithInvisibleActions(); -#if defined(QT3_SUPPORT) - void indexBasedInsertion_data(); - void indexBasedInsertion(); -#endif - protected slots: -#ifdef QT3_SUPPORT - void onActivated( int ); -#endif - void onActivated_noQt3( QAction*); + void onActivated( QAction*); private: - - void initTestCase_noQt3(); - QtTestSlot *menu1; QtTestSlot *menu2; QtTestSlot *menu3; @@ -204,26 +169,15 @@ private: void reset() { resetSlots(); resetCount(); }; -#ifdef QT3_SUPPORT - int last_accel_id; -#endif - QAction* last_accel_id_Qt4; + QAction* last_accel_id; int activated_count; -#ifdef QT3_SUPPORT - int idAccel; - int idAccel1; -#endif QAction *action; QAction *action1; QMainWindow *mw; QMenuBar *mb; -#ifdef QT3_SUPPORT - Q3PopupMenu *pm1; - Q3PopupMenu *pm2; -#endif - QMenu *pm1_Qt4; - QMenu *pm2_Qt4; + QMenu *pm1; + QMenu *pm2; }; // Testing get/set functions @@ -240,10 +194,6 @@ void tst_QMenuBar::getSetCheck() delete var1; } -//// - - - #include <qcursor.h> const int RESET = 0; @@ -278,14 +228,9 @@ tst_QMenuBar::tst_QMenuBar() activated_count = 0; mb = 0; -#ifdef QT3_SUPPORT pm1 = 0; pm2 = 0; - last_accel_id = RESET; -#endif - pm1_Qt4 = 0; - pm2_Qt4 = 0; - last_accel_id_Qt4 = 0; + last_accel_id = 0; } tst_QMenuBar::~tst_QMenuBar() @@ -296,47 +241,14 @@ tst_QMenuBar::~tst_QMenuBar() void tst_QMenuBar::initTestCase() { -#ifdef QT3_SUPPORT - // create a default mainwindow - // If you run a widget test, this will be replaced in the testcase by the - // widget under test - mw = new QMainWindow(0, Qt::X11BypassWindowManagerHint); - mb = new QMenuBar( mw, "menubar" ); - connect( mb, SIGNAL(activated(int)), this, SLOT(onActivated(int)) ); - - initSimpleMenubar(); - - qApp->setMainWidget( mw ); - mw->show(); - qApp->setActiveWindow(mw); - - menu1 = new QtTestSlot( mw ); - menu2 = new QtTestSlot( mw ); - menu3 = new QtTestSlot( mw ); - menu4 = new QtTestSlot( mw ); - item1_A = new QtTestSlot( mw ); - item1_B = new QtTestSlot( mw ); - item2_C = new QtTestSlot( mw ); - item2_D = new QtTestSlot( mw ); - item2_E = new QtTestSlot( mw ); - item2_F = new QtTestSlot( mw ); - item2_G = new QtTestSlot( mw ); - item2_H = new QtTestSlot( mw ); -#else - initTestCase_noQt3(); -#endif -} - -void tst_QMenuBar::initTestCase_noQt3() -{ // create a default mainwindow // If you run a widget test, this will be replaced in the testcase by the // widget under test mw = new QMainWindow(0, Qt::X11BypassWindowManagerHint); mb = new QMenuBar( mw ); - connect( mb, SIGNAL(triggered(QAction *)), this, SLOT(onActivated_noQt3(QAction *)) ); + connect( mb, SIGNAL(triggered(QAction *)), this, SLOT(onActivated(QAction *)) ); - initSimpleMenubar_noQt3(); + initSimpleMenubar(); mw->show(); QTest::qWaitForWindowShown(mw); mw->activateWindow(); @@ -361,53 +273,25 @@ void tst_QMenuBar::cleanupTestCase() delete mw; } -#if defined(QT3_SUPPORT) void tst_QMenuBar::initSimpleMenubar() { mb->hide(); mb->clear(); delete pm1; - pm1 = new Q3PopupMenu( mb ); - idAccel = pm1->insertItem( "menu1", 123 ); -// pm->setAccel( ALT + Key_A, idAccel ); - pm1->setAccel( Qt::CTRL + Qt::Key_A, idAccel ); - mb->insertItem( "&accel", pm1 ); - connect( pm1, SIGNAL(activated(int)), this, SLOT(onActivated(int))); - - delete pm2; - pm2 = new Q3PopupMenu( mb ); -// idAccel1 = pm2->insertItem( "&Open...", this, SLOT(onActivated(int)), Qt::Key_O, 456 ); - idAccel1 = pm2->insertItem( "&Open...", 0, 0, Qt::Key_O, 456 ); - connect(pm2, SIGNAL(activated(int)), this, SLOT(onActivated(int))); - mb->insertItem( "accel1", pm2 ); - - mb->show(); - qApp->syncX(); - qApp->processEvents(); -} -#endif - -void tst_QMenuBar::initSimpleMenubar_noQt3() -{ - mb->hide(); - mb->clear(); - - delete pm1_Qt4; - pm1_Qt4 = mb->addMenu("&accel"); - action = pm1_Qt4->addAction( "menu1" ); - action->setShortcut(QKeySequence("ALT+A")); - action->setShortcut(QKeySequence("CTRL+A")); + pm1 = mb->addMenu("&accel"); + action = pm1->addAction( "menu1" ); + action->setShortcut(QKeySequence("ALT+A")); + action->setShortcut(QKeySequence("CTRL+A")); + connect( pm1, SIGNAL(triggered(QAction*)), this, SLOT(onActivated(QAction*))); - connect( pm1_Qt4, SIGNAL(triggered(QAction*)), this, SLOT(onActivated_noQt3(QAction*))); - - delete pm2_Qt4; - pm2_Qt4 = mb->addMenu("accel1"); + delete pm2; + pm2 = mb->addMenu("accel1"); - action1 = pm2_Qt4->addAction( "&Open..." ); + action1 = pm2->addAction( "&Open..." ); action1->setShortcut(Qt::Key_O); - connect(pm2_Qt4, SIGNAL(triggered(QAction*)), this, SLOT(onActivated_noQt3(QAction*))); + connect(pm2, SIGNAL(triggered(QAction*)), this, SLOT(onActivated(QAction*))); mb->show(); qApp->syncX(); @@ -438,47 +322,19 @@ void tst_QMenuBar::resetSlots() void tst_QMenuBar::resetCount() { -#ifdef QT3_SUPPORT - last_accel_id = RESET; -#endif - last_accel_id_Qt4 = 0; + last_accel_id = 0; activated_count = 0; } -#ifdef QT3_SUPPORT -void tst_QMenuBar::onActivated( int i ) -{ - last_accel_id = i; - activated_count++; -// printf( QString("acceleratorId: %1, count: %1\n").arg( i ).arg(activated_count) ); -} -#endif - -void tst_QMenuBar::onActivated_noQt3( QAction* action ) +void tst_QMenuBar::onActivated( QAction* action ) { - last_accel_id_Qt4 = action; + last_accel_id = action; activated_count++; // printf( QString("acceleratorId: %1, count: %1\n").arg( i ).arg(activated_count) ); } -#ifdef QT3_SUPPORT void tst_QMenuBar::accel() { -#ifdef Q_WS_MAC - QSKIP("On Mac, native key events are needed to test menu action activation", SkipAll); -#endif - // create a popup menu with menu items set the accelerators later... - initSimpleMenubar(); -// QTest::keyClick( 0, Qt::Key_A, AltKey ); - QTest::keyClick( 0, Qt::Key_A, Qt::ControlModifier ); - QTest::qWait(300); - - QCOMPARE( last_accel_id, idAccel ); -} -#endif //QT3_SUPPORT - -void tst_QMenuBar::accel_noQt3() -{ #if defined(Q_WS_MAC) || defined(Q_OS_WINCE_WM) QSKIP("On Mac/WinCE, native key events are needed to test menu action activation", SkipAll); #endif @@ -487,43 +343,28 @@ void tst_QMenuBar::accel_noQt3() #endif // create a popup menu with menu items set the accelerators later... - initSimpleMenubar_noQt3(); + initSimpleMenubar(); // QTest::keyClick( 0, Qt::Key_A, AltKey ); QTest::keyClick( 0, Qt::Key_A, Qt::ControlModifier ); QTest::qWait(300); - QCOMPARE( last_accel_id_Qt4, action ); + QCOMPARE( last_accel_id, action ); } -#ifdef QT3_SUPPORT void tst_QMenuBar::activatedCount() { -#ifdef Q_WS_MAC - QSKIP("On Mac, native key events are needed to test menu action activation", SkipAll); -#endif - // create a popup menu with menu items set the accelerators later... - initSimpleMenubar(); - - QTest::keyClick( 0, Qt::Key_A, Qt::ControlModifier ); -//wait(5000); - QCOMPARE( activated_count, 2 ); //1 from the popupmenu and 1 from the menubar -} -#endif //QT3_SUPPORT - -void tst_QMenuBar::activatedCount_noQt3() -{ #if defined(Q_WS_MAC) || defined(Q_OS_WINCE_WM) QSKIP("On Mac/WinCE, native key events are needed to test menu action activation", SkipAll); #endif // create a popup menu with menu items set the accelerators later... - initSimpleMenubar_noQt3(); + initSimpleMenubar(); QTest::keyClick( 0, Qt::Key_A, Qt::ControlModifier ); //wait(5000); QCOMPARE( activated_count, 2 ); //1 from the popupmenu and 1 from the menubar } -void tst_QMenuBar::clear_noQt3() +void tst_QMenuBar::clear() { mb->clear(); QVERIFY( (uint) mb->actions().size() == 0 ); @@ -541,7 +382,7 @@ void tst_QMenuBar::clear_noQt3() QVERIFY( (uint) mb->actions().size() == 0 ); } -void tst_QMenuBar::count_noQt3() +void tst_QMenuBar::count() { mb->clear(); QVERIFY( mb->actions().size() == 0 ); @@ -552,7 +393,7 @@ void tst_QMenuBar::count_noQt3() } } -void tst_QMenuBar::removeItem_noQt3_data() +void tst_QMenuBar::removeItem_data() { QTest::addColumn<int>("removeIndex"); QTest::newRow( "first" ) << 0; @@ -561,7 +402,7 @@ void tst_QMenuBar::removeItem_noQt3_data() } // Basically the same test as removeItemAt, except that we remember and remove id's. -void tst_QMenuBar::removeItem_noQt3() +void tst_QMenuBar::removeItem() { mb->clear(); @@ -623,7 +464,7 @@ void tst_QMenuBar::removeItem_noQt3() QVERIFY( menuBarActions2.size() == 2 ); } -void tst_QMenuBar::removeItemAt_noQt3_data() +void tst_QMenuBar::removeItemAt_data() { QTest::addColumn<int>("removeIndex"); QTest::newRow( "first" ) << 0; @@ -631,7 +472,7 @@ void tst_QMenuBar::removeItemAt_noQt3_data() QTest::newRow( "last" ) << 2; } -void tst_QMenuBar::removeItemAt_noQt3() +void tst_QMenuBar::removeItemAt() { mb->clear(); @@ -680,202 +521,25 @@ void tst_QMenuBar::removeItemAt_noQt3() QVERIFY( menuBarActions2.size() == 2 ); } -#ifdef QT3_SUPPORT -void tst_QMenuBar::clear() -{ - mb->clear(); - QVERIFY( mb->count() == 0 ); - - mb->clear(); - for (uint i=0; i<10; i++) { - Q3PopupMenu *pm = new Q3PopupMenu( mb ); - for (uint k=0; k<i; k++) - pm->insertItem( QString("Item %1").arg(i*10 + k) ); - mb->insertItem( QString("Menu %1").arg(i), pm ); - QCOMPARE( mb->count(), (uint)i+1 ); - } - QCOMPARE( mb->count(), 10u ); - - mb->clear(); - QVERIFY( mb->count() == 0 ); -} - -void tst_QMenuBar::count() -{ - mb->clear(); - QVERIFY( mb->count() == 0 ); - - for (uint i=0; i<10; i++) { - Q3PopupMenu *pm = new Q3PopupMenu( mb ); - mb->insertItem( QString("Menu %1").arg(i), pm ); - QCOMPARE( mb->count(), i+1 ); - } -} - -void tst_QMenuBar::removeItemAt_data() -{ - QTest::addColumn<int>("removeIndex"); - QTest::newRow( "first" ) << 0; - QTest::newRow( "middle" ) << 1; - QTest::newRow( "last" ) << 2; -} - -void tst_QMenuBar::removeItemAt() -{ - mb->clear(); - - Q3PopupMenu *pm; - pm = new Q3PopupMenu( mb ); - pm->insertItem( QString("Item 10") ); - mb->insertItem( QString("Menu 1"), pm ); - - pm = new Q3PopupMenu( mb ); - pm->insertItem( QString("Item 20") ); - pm->insertItem( QString("Item 21") ); - mb->insertItem( QString("Menu 2"), pm ); - - pm = new Q3PopupMenu( mb ); - pm->insertItem( QString("Item 30") ); - pm->insertItem( QString("Item 31") ); - pm->insertItem( QString("Item 32") ); - mb->insertItem( QString("Menu 3"), pm ); - - QCOMPARE( mb->text( mb->idAt(0) ), QString("Menu 1") ); - QCOMPARE( mb->text( mb->idAt(1) ), QString("Menu 2") ); - QCOMPARE( mb->text( mb->idAt(2) ), QString("Menu 3") ); - - // Ok, now that we know we have created the menu we expect, lets remove an item... - QFETCH( int, removeIndex ); - mb->removeItemAt( removeIndex ); - switch (removeIndex ) - { - case 0: - QCOMPARE( mb->text( mb->idAt(0) ), QString("Menu 2") ); - QCOMPARE( mb->text( mb->idAt(1) ), QString("Menu 3") ); - break; - case 1: - QCOMPARE( mb->text( mb->idAt(0) ), QString("Menu 1") ); - QCOMPARE( mb->text( mb->idAt(1) ), QString("Menu 3") ); - break; - case 2: - QCOMPARE( mb->text( mb->idAt(0) ), QString("Menu 1") ); - QCOMPARE( mb->text( mb->idAt(1) ), QString("Menu 2") ); - break; - } - - QVERIFY( mb->count() == 2 ); -} - -void tst_QMenuBar::removeItem_data() -{ - QTest::addColumn<int>("removeIndex"); - QTest::newRow( "first" ) << 0; - QTest::newRow( "middle" ) << 1; - QTest::newRow( "last" ) << 2; -} - -// Basically the same test as removeItemAt, except that we remember and remove id's. -void tst_QMenuBar::removeItem() -{ - mb->clear(); - - Q3PopupMenu *pm; - pm = new Q3PopupMenu( mb ); - pm->insertItem( QString("Item 10") ); - int id1 = mb->insertItem( QString("Menu 1"), pm ); - - pm = new Q3PopupMenu( mb ); - pm->insertItem( QString("Item 20") ); - pm->insertItem( QString("Item 21") ); - int id2 = mb->insertItem( QString("Menu 2"), pm ); - - pm = new Q3PopupMenu( mb ); - pm->insertItem( QString("Item 30") ); - pm->insertItem( QString("Item 31") ); - pm->insertItem( QString("Item 32") ); - int id3 = mb->insertItem( QString("Menu 3"), pm ); - - QCOMPARE( mb->text( id1 ), QString("Menu 1") ); - QCOMPARE( mb->text( id2 ), QString("Menu 2") ); - QCOMPARE( mb->text( id3 ), QString("Menu 3") ); - - QVERIFY( mb->idAt(0) == id1 ); - QVERIFY( mb->idAt(1) == id2 ); - QVERIFY( mb->idAt(2) == id3 ); - - // Ok, now that we know we have created the menu we expect, lets remove an item... - QFETCH( int, removeIndex ); - switch (removeIndex ) - { - case 0: - mb->removeItem( id1 ); - QCOMPARE( mb->text( mb->idAt(0) ), QString("Menu 2") ); - QCOMPARE( mb->text( mb->idAt(1) ), QString("Menu 3") ); - break; - case 1: - mb->removeItem( id2 ); - QCOMPARE( mb->text( mb->idAt(0) ), QString("Menu 1") ); - QCOMPARE( mb->text( mb->idAt(1) ), QString("Menu 3") ); - break; - case 2: - mb->removeItem( id3 ); - QCOMPARE( mb->text( mb->idAt(0) ), QString("Menu 1") ); - QCOMPARE( mb->text( mb->idAt(1) ), QString("Menu 2") ); - break; - } - - QVERIFY( mb->count() == 2 ); -} - void tst_QMenuBar::initComplexMenubar() // well, complex.... { mb->hide(); mb->clear(); delete pm1; - pm1 = new Q3PopupMenu( mb, "popup1" ); - pm1->insertItem( QString("Item A"), item1_A, SLOT(selected()), Qt::CTRL+Qt::Key_A ); - pm1->insertItem( QString("Item B"), item1_B, SLOT(selected()), Qt::CTRL+Qt::Key_B ); - // use the form insertItem( QString, Q3PopupMenu ) - mb->insertItem( "Menu &1", pm1 ); + pm1 = mb->addMenu("Menu &1"); + pm1->addAction( QString("Item A"), item1_A, SLOT(selected()), Qt::CTRL+Qt::Key_A ); + pm1->addAction( QString("Item B"), item1_B, SLOT(selected()), Qt::CTRL+Qt::Key_B ); delete pm2; - pm2 = new Q3PopupMenu( mb, "popup2" ); - pm2->insertItem( QString("Item C"), item2_C, SLOT(selected()), Qt::CTRL+Qt::Key_C ); - pm2->insertItem( QString("Item D"), item2_D, SLOT(selected()), Qt::CTRL+Qt::Key_D ); - pm2->insertItem( QString("Item E"), item2_E, SLOT(selected()), Qt::CTRL+Qt::Key_E ); - pm2->insertItem( QString("Item F"), item2_F, SLOT(selected()), Qt::CTRL+Qt::Key_F ); - pm2->insertSeparator(); - pm2->insertItem( QString("Item G"), item2_G, SLOT(selected()), Qt::CTRL+Qt::Key_G ); - pm2->insertItem( QString("Item H"), item2_H, SLOT(selected()), Qt::CTRL+Qt::Key_H ); - // use the form insertItem( QString, Q3PopupMenu ) - mb->insertItem( "Menu &2", pm2 ); - - // use the form insertItem( QString, QObject, slot, keysequence ) - mb->insertItem( QString("M&enu 3"), menu3, SLOT(selected()), Qt::ALT+Qt::Key_J ); - mb->show(); -} -#endif - -void tst_QMenuBar::initComplexMenubar_noQt3() // well, complex.... -{ - mb->hide(); - mb->clear(); - - delete pm1_Qt4; - pm1_Qt4 = mb->addMenu("Menu &1"); - pm1_Qt4->addAction( QString("Item A"), item1_A, SLOT(selected()), Qt::CTRL+Qt::Key_A ); - pm1_Qt4->addAction( QString("Item B"), item1_B, SLOT(selected()), Qt::CTRL+Qt::Key_B ); - - delete pm2_Qt4; - pm2_Qt4 = mb->addMenu("Menu &2"); - pm2_Qt4->addAction( QString("Item C"), item2_C, SLOT(selected()), Qt::CTRL+Qt::Key_C ); - pm2_Qt4->addAction( QString("Item D"), item2_D, SLOT(selected()), Qt::CTRL+Qt::Key_D ); - pm2_Qt4->addAction( QString("Item E"), item2_E, SLOT(selected()), Qt::CTRL+Qt::Key_E ); - pm2_Qt4->addAction( QString("Item F"), item2_F, SLOT(selected()), Qt::CTRL+Qt::Key_F ); - pm2_Qt4->addSeparator(); - pm2_Qt4->addAction( QString("Item G"), item2_G, SLOT(selected()), Qt::CTRL+Qt::Key_G ); - pm2_Qt4->addAction( QString("Item H"), item2_H, SLOT(selected()), Qt::CTRL+Qt::Key_H ); + pm2 = mb->addMenu("Menu &2"); + pm2->addAction( QString("Item C"), item2_C, SLOT(selected()), Qt::CTRL+Qt::Key_C ); + pm2->addAction( QString("Item D"), item2_D, SLOT(selected()), Qt::CTRL+Qt::Key_D ); + pm2->addAction( QString("Item E"), item2_E, SLOT(selected()), Qt::CTRL+Qt::Key_E ); + pm2->addAction( QString("Item F"), item2_F, SLOT(selected()), Qt::CTRL+Qt::Key_F ); + pm2->addSeparator(); + pm2->addAction( QString("Item G"), item2_G, SLOT(selected()), Qt::CTRL+Qt::Key_G ); + pm2->addAction( QString("Item H"), item2_H, SLOT(selected()), Qt::CTRL+Qt::Key_H ); QAction *ac = mb->addAction( QString("M&enu 3"), menu3, SLOT(selected())); ac->setShortcut(Qt::ALT+Qt::Key_J); @@ -889,20 +553,9 @@ void tst_QMenuBar::initComplexMenubar_noQt3() // well, complex.... used less frequently. */ -#ifdef QT3_SUPPORT void tst_QMenuBar::insertItem_QString_QObject() { initComplexMenubar(); - QCOMPARE( mb->text( mb->idAt( 0 ) ), QString("Menu &1") ); - QCOMPARE( mb->text( mb->idAt( 1 ) ), QString("Menu &2") ); - QCOMPARE( mb->text( mb->idAt( 2 ) ), QString("M&enu 3") ); - QCOMPARE( mb->text( mb->idAt( 3 ) ), QString() ); // there is no menu 4! -} -#endif - -void tst_QMenuBar::insertItem_QString_QObject_noQt3() -{ - initComplexMenubar_noQt3(); QList<QAction *> actions = mb->actions(); @@ -917,11 +570,7 @@ void tst_QMenuBar::check_accelKeys() #if defined(Q_WS_MAC) || defined(Q_OS_WINCE_WM) QSKIP("On Mac/WinCE, native key events are needed to test menu action activation", SkipAll); #endif -#ifdef QT3_SUPPORT initComplexMenubar(); -#else - initComplexMenubar_noQt3(); -#endif // start with a bogus key that shouldn't trigger anything QTest::keyClick(0, Qt::Key_I, Qt::ControlModifier); @@ -991,11 +640,7 @@ void tst_QMenuBar::check_cursorKeys1() QSKIP("Qt/Mac,WinCE does not use the native popups/menubar", SkipAll); #endif -#ifdef QT3_SUPPORT initComplexMenubar(); -#else - initComplexMenubar_noQt3(); -#endif // start with a ALT + 1 that activates the first popupmenu QTest::keyClick( 0, Qt::Key_1, Qt::AltModifier ); @@ -1026,11 +671,7 @@ void tst_QMenuBar::check_cursorKeys2() QSKIP("Qt/Mac,WinCE does not use the native popups/menubar", SkipAll); #endif -#ifdef QT3_SUPPORT initComplexMenubar(); -#else - initComplexMenubar_noQt3(); -#endif // select popupmenu2 QTest::keyClick( 0, Qt::Key_2, Qt::AltModifier ); @@ -1060,11 +701,7 @@ void tst_QMenuBar::check_cursorKeys3() QSKIP("Qt/Mac,WinCE does not use the native popups/menubar", SkipAll); #endif -#ifdef QT3_SUPPORT initComplexMenubar(); -#else - initComplexMenubar_noQt3(); -#endif // select Popupmenu 2 QTest::keyClick( 0, Qt::Key_2, Qt::AltModifier ); @@ -1095,11 +732,7 @@ void tst_QMenuBar::check_homeKey() QEXPECT_FAIL( "0", "Popupmenu should respond to a Home key", Abort ); -#ifdef QT3_SUPPORT initComplexMenubar(); -#else - initComplexMenubar_noQt3(); -#endif // select Popupmenu 2 QTest::keyClick( 0, Qt::Key_2, Qt::AltModifier ); @@ -1137,11 +770,7 @@ void tst_QMenuBar::check_endKey() QEXPECT_FAIL( "0", "Popupmenu should respond to an End key", Abort ); -#ifdef QT3_SUPPORT initComplexMenubar(); -#else - initComplexMenubar_noQt3(); -#endif // select Popupmenu 2 QTest::keyClick( 0, Qt::Key_2, Qt::AltModifier ); @@ -1170,11 +799,10 @@ void tst_QMenuBar::check_endKey() If Down is pressed next the popup is activated again. */ -#ifdef QT3_SUPPORT void tst_QMenuBar::check_escKey() { -#ifdef Q_WS_MAC - QSKIP("Qt/Mac does not use the native popups/menubar", SkipAll); +#if defined(Q_WS_MAC) || defined(Q_OS_WINCE_WM) + QSKIP("Qt/Mac,WinCE does not use the native popups/menubar", SkipAll); #endif initComplexMenubar(); @@ -1195,9 +823,6 @@ void tst_QMenuBar::check_escKey() if (!QApplication::style()->inherits("QWindowsStyle")) return; - // but the menubar item should stay selected - QVERIFY( mb->isItemActive(mb->idAt(1)) ); - // If we press Down the popupmenu should be active again QTest::keyClick( 0, Qt::Key_Down ); QVERIFY( !pm1->isActiveWindow() ); @@ -1208,42 +833,6 @@ void tst_QMenuBar::check_escKey() // Let's see if the correct slot is called... QVERIFY2( item2_C->selCount() == 1, "Expected item 2C to be selected" ); } -#endif - -void tst_QMenuBar::check_escKey_noQt3() -{ -#if defined(Q_WS_MAC) || defined(Q_OS_WINCE_WM) - QSKIP("Qt/Mac,WinCE does not use the native popups/menubar", SkipAll); -#endif - - initComplexMenubar_noQt3(); - - QVERIFY( !pm1_Qt4->isActiveWindow() ); - QVERIFY( !pm2_Qt4->isActiveWindow() ); - - // select Popupmenu 2 - QTest::keyClick( 0, Qt::Key_2, Qt::AltModifier ); - QVERIFY( !pm1_Qt4->isActiveWindow() ); - QVERIFY( pm2_Qt4->isActiveWindow() ); - - // If we press ESC, the popup should disappear - QTest::keyClick( 0, Qt::Key_Escape ); - QVERIFY( !pm1_Qt4->isActiveWindow() ); - QVERIFY( !pm2_Qt4->isActiveWindow() ); - - if (!QApplication::style()->inherits("QWindowsStyle")) - return; - - // If we press Down the popupmenu should be active again - QTest::keyClick( 0, Qt::Key_Down ); - QVERIFY( !pm1_Qt4->isActiveWindow() ); - QVERIFY( pm2_Qt4->isActiveWindow() ); - - // and press ENTER - QTest::keyClick( pm2_Qt4, Qt::Key_Enter ); - // Let's see if the correct slot is called... - QVERIFY2( item2_C->selCount() == 1, "Expected item 2C to be selected" ); -} // void tst_QMenuBar::check_mouse1_data() @@ -1403,11 +992,7 @@ void tst_QMenuBar::check_altPress() arg( qApp->style()->objectName() ).toAscii(), SkipAll ); } -#ifdef QT3_SUPPORT initSimpleMenubar(); -#else - initSimpleMenubar_noQt3(); -#endif qApp->setActiveWindow(mw); mw->setFocus(); @@ -1423,11 +1008,7 @@ void tst_QMenuBar::check_shortcutPress() QSKIP("Qt/Mac,WinCE does not use the native popups/menubar", SkipAll); #endif -#ifdef QT3_SUPPORT initComplexMenubar(); -#else - initComplexMenubar_noQt3(); -#endif qApp->setActiveWindow(mw); QCOMPARE(menu3->selCount(), 0u); @@ -1437,17 +1018,9 @@ void tst_QMenuBar::check_shortcutPress() QVERIFY(!mb->activeAction()); QTest::keyClick(mw, Qt::Key_1, Qt::AltModifier ); -#ifdef QT3_SUPPORT QVERIFY(pm1->isActiveWindow()); -#else - QVERIFY(pm1_Qt4->isActiveWindow()); -#endif QTest::keyClick(mb, Qt::Key_2); -#ifdef QT3_SUPPORT - QVERIFY(pm1->isActiveWindow()); // Should still be the active window -#else - QVERIFY(pm1_Qt4->isActiveWindow()); -#endif + QVERIFY(pm1->isActiveWindow()); } void tst_QMenuBar::check_menuPosition() @@ -1459,11 +1032,7 @@ void tst_QMenuBar::check_menuPosition() QSKIP("Qt/CE uses native menubar", SkipAll); #endif Menu menu; -#ifdef QT3_SUPPORT initComplexMenubar(); -#else - initComplexMenubar_noQt3(); -#endif menu.setTitle("&menu"); QRect availRect = QApplication::desktop()->availableGeometry(mw); QRect screenRect = QApplication::desktop()->screenGeometry(mw); @@ -1720,47 +1289,5 @@ void tst_QMenuBar::taskQTBUG11823_crashwithInvisibleActions() QCOMPARE(menubar.activeAction(), m); //the active action shouldn't have changed } - -#if defined(QT3_SUPPORT) -void tst_QMenuBar::indexBasedInsertion_data() -{ - QTest::addColumn<int>("indexForInsertion"); - QTest::addColumn<int>("expectedIndex"); - - QTest::newRow("negative-index-appends") << -1 << 1; - QTest::newRow("prepend") << 0 << 0; - QTest::newRow("append") << 1 << 1; -} - -void tst_QMenuBar::indexBasedInsertion() -{ - // test the compat'ed index based insertion - - QFETCH(int, indexForInsertion); - QFETCH(int, expectedIndex); - - { - QMenuBar menu; - menu.addAction("Regular Item"); - - menu.insertItem("New Item", -1 /*id*/, indexForInsertion); - - QAction *act = menu.actions().value(expectedIndex); - QVERIFY(act); - QCOMPARE(act->text(), QString("New Item")); - } - { - QMenuBar menu; - menu.addAction("Regular Item"); - - menu.insertSeparator(indexForInsertion); - - QAction *act = menu.actions().value(expectedIndex); - QVERIFY(act); - QVERIFY(act->isSeparator()); - } -} -#endif - QTEST_MAIN(tst_QMenuBar) #include "tst_qmenubar.moc" 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 diff --git a/tests/auto/qmessagebox/tst_qmessagebox.cpp b/tests/auto/qmessagebox/tst_qmessagebox.cpp index c11e76c098..23897838ab 100644 --- a/tests/auto/qmessagebox/tst_qmessagebox.cpp +++ b/tests/auto/qmessagebox/tst_qmessagebox.cpp @@ -609,48 +609,43 @@ void tst_QMessageBox::testSymbols() button = QMessageBox::FlagMask; mb1.setText("Foo"); - QString text = mb1.text(); - Q_ASSERT(text == "Foo"); + QCOMPARE(mb1.text(), "Foo"); icon = mb1.icon(); - Q_ASSERT(icon == QMessageBox::NoIcon); + QVERIFY(icon == QMessageBox::NoIcon); mb1.setIcon(QMessageBox::Question); - Q_ASSERT(mb1.icon() == QMessageBox::Question); + QVERIFY(mb1.icon() == QMessageBox::Question); QPixmap iconPixmap = mb1.iconPixmap(); mb1.setIconPixmap(iconPixmap); - Q_ASSERT(mb1.icon() == QMessageBox::NoIcon); + QVERIFY(mb1.icon() == QMessageBox::NoIcon); - QString bt0 = mb1.buttonText(QMessageBox::Ok); - QString bt1 = mb1.buttonText(QMessageBox::Cancel); - QString bt2 = mb1.buttonText(QMessageBox::Ok | QMessageBox::Default); - - Q_ASSERT(bt0 == "OK"); - Q_ASSERT(bt1.isEmpty()); - Q_ASSERT(bt2.isEmpty()); + QCOMPARE(mb1.buttonText(QMessageBox::Ok), "OK"); + QCOMPARE(mb1.buttonText(QMessageBox::Cancel), QString()); + QCOMPARE(mb1.buttonText(QMessageBox::Ok | QMessageBox::Default), QString()); mb2.setButtonText(QMessageBox::Cancel, "Foo"); mb2.setButtonText(QMessageBox::Ok, "Bar"); mb2.setButtonText(QMessageBox::Ok | QMessageBox::Default, "Baz"); - Q_ASSERT(mb2.buttonText(QMessageBox::Cancel).isEmpty()); - Q_ASSERT(mb2.buttonText(QMessageBox::Ok) == "Bar"); + QCOMPARE(mb2.buttonText(QMessageBox::Cancel), QString()); + QCOMPARE(mb2.buttonText(QMessageBox::Ok), "Bar"); - Q_ASSERT(mb3b.buttonText(QMessageBox::Yes).endsWith("Yes")); - Q_ASSERT(mb3b.buttonText(QMessageBox::YesAll).isEmpty()); - Q_ASSERT(mb3b.buttonText(QMessageBox::Ok).isEmpty()); + QVERIFY(mb3b.buttonText(QMessageBox::Yes).endsWith("Yes")); + QCOMPARE(mb3b.buttonText(QMessageBox::YesAll), QString()); + QCOMPARE(mb3b.buttonText(QMessageBox::Ok), QString()); mb3b.setButtonText(QMessageBox::Yes, "Blah"); mb3b.setButtonText(QMessageBox::YesAll, "Zoo"); mb3b.setButtonText(QMessageBox::Ok, "Zoo"); - Q_ASSERT(mb3b.buttonText(QMessageBox::Yes) == "Blah"); - Q_ASSERT(mb3b.buttonText(QMessageBox::YesAll).isEmpty()); - Q_ASSERT(mb3b.buttonText(QMessageBox::Ok).isEmpty()); + QCOMPARE(mb3b.buttonText(QMessageBox::Yes), "Blah"); + QCOMPARE(mb3b.buttonText(QMessageBox::YesAll), QString()); + QCOMPARE(mb3b.buttonText(QMessageBox::Ok), QString()); - Q_ASSERT(mb1.textFormat() == Qt::AutoText); + QCOMPARE(mb1.textFormat(), Qt::AutoText); mb1.setTextFormat(Qt::PlainText); - Q_ASSERT(mb1.textFormat() == Qt::PlainText); + QCOMPARE(mb1.textFormat(), Qt::PlainText); CONVENIENCE_FUNC_SYMS(information); CONVENIENCE_FUNC_SYMS_EXTRA(information); @@ -660,43 +655,7 @@ void tst_QMessageBox::testSymbols() CONVENIENCE_FUNC_SYMS(critical); QSize sizeHint = mb1.sizeHint(); - Q_ASSERT(sizeHint.width() > 20 && sizeHint.height() > 20); - -#ifdef QT3_SUPPORT - //test QT3_SUPPORT stuff - - QMessageBox mb4("title", "text", icon, QMessageBox::Yes, QMessageBox::No | QMessageBox::Default, - QMessageBox::Cancel, &mb1, "name", true, Qt::Dialog); - QMessageBox mb5(&mb1, "name"); - - QPixmap pm = QMessageBox::standardIcon(QMessageBox::Question, Qt::GUIStyle(1)); - QPixmap pm2 = QMessageBox::standardIcon(QMessageBox::Question); - - Q_ASSERT(pm.toImage() == iconPixmap.toImage()); - Q_ASSERT(pm2.toImage() == iconPixmap.toImage()); - - int ret1 = QMessageBox::message("title", "text"); - int ret2 = QMessageBox::message("title", "text", "OK"); - int ret3 = QMessageBox::message("title", "text", "OK", &mb1); - int ret4 = QMessageBox::message("title", "text", "OK", &mb1, "name"); - qDebug("%d %d %d %d", ret1, ret2, ret3, ret4); - - bool ret5 = QMessageBox::query("title", "text"); - bool ret6 = QMessageBox::query("title", "text", "Ja"); - bool ret7 = QMessageBox::query("title", "text", "Ja", "Nein"); - bool ret8 = QMessageBox::query("title", "text", "Ja", "Nein", &mb1); - bool ret9 = QMessageBox::query("title", "text", "Ja", "Nein", &mb1, "name"); - qDebug("%d %d %d %d %d", ret5, ret6, ret7, ret8, ret9); - - Q_UNUSED(ret1); - Q_UNUSED(ret5); - - QPixmap pm3 = QMessageBox::standardIcon(QMessageBox::NoIcon); - Q_ASSERT(pm3.isNull()); - - pm3 = QMessageBox::standardIcon(QMessageBox::Information); - Q_ASSERT(!pm3.isNull()); -#endif //QT3_SUPPORT + QVERIFY(sizeHint.width() > 20 && sizeHint.height() > 20); QMessageBox::about(&mb1, "title", "text"); QMessageBox::aboutQt(&mb1); diff --git a/tests/auto/qmetaobject/tst_qmetaobject.cpp b/tests/auto/qmetaobject/tst_qmetaobject.cpp index 13e3bcd588..f1a909a941 100644 --- a/tests/auto/qmetaobject/tst_qmetaobject.cpp +++ b/tests/auto/qmetaobject/tst_qmetaobject.cpp @@ -244,7 +244,12 @@ public: QObject *child; public slots: - void on_child1_destroyed(QObject *obj = 0) { ++invokeCount1; Q_ASSERT(obj && obj == child); } + void on_child1_destroyed(QObject *obj = 0) + { + ++invokeCount1; + if (!obj || obj != child) + qWarning() << "on_child1_destroyed invoked with wrong child object"; + } void on_child2_destroyed() { ++invokeCount2; } }; @@ -268,7 +273,12 @@ public: } private slots: - void on_child1_destroyed(QObject *obj) { ++invokeCount1; Q_ASSERT(obj && obj == child); } + void on_child1_destroyed(QObject *obj) + { + ++invokeCount1; + if (!obj || obj != child) + qWarning() << "on_child1_destroyed invoked with wrong child object"; + } void on_child1_destroyed() { ++invokeCount2; } }; diff --git a/tests/auto/qmetatype/tst_qmetatype.cpp b/tests/auto/qmetatype/tst_qmetatype.cpp index 9872682f89..1755856ece 100644 --- a/tests/auto/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/qmetatype/tst_qmetatype.cpp @@ -96,10 +96,18 @@ struct Bar Bar() { // check re-entrancy - Q_ASSERT(QMetaType::isRegistered(qRegisterMetaType<Foo>("Foo"))); + if (!QMetaType::isRegistered(qRegisterMetaType<Foo>("Foo"))) { + qWarning("%s: re-entrancy test failed", Q_FUNC_INFO); + ++failureCount; + } } + +public: + static int failureCount; }; +int Bar::failureCount = 0; + class MetaTypeTorturer: public QThread { Q_OBJECT @@ -113,17 +121,35 @@ protected: #ifdef Q_OS_LINUX pthread_yield(); #endif - Q_ASSERT(QMetaType::isRegistered(tp)); - Q_ASSERT(QMetaType::type(nm) == tp); - Q_ASSERT(QMetaType::typeName(tp) == name); + if (!QMetaType::isRegistered(tp)) { + ++failureCount; + qWarning() << name << "is not a registered metatype"; + } + if (QMetaType::type(nm) != tp) { + ++failureCount; + qWarning() << "Wrong metatype returned for" << name; + } + if (QMetaType::typeName(tp) != name) { + ++failureCount; + qWarning() << "Wrong typeName returned for" << tp; + } void *buf = QMetaType::construct(tp, 0); void *buf2 = QMetaType::construct(tp, buf); - Q_ASSERT(buf); - Q_ASSERT(buf2); + if (!buf) { + ++failureCount; + qWarning() << "Null buffer returned by QMetaType::construct(tp, 0)"; + } + if (!buf2) { + ++failureCount; + qWarning() << "Null buffer returned by QMetaType::construct(tp, buf)"; + } QMetaType::destroy(tp, buf); QMetaType::destroy(tp, buf2); } } +public: + MetaTypeTorturer() : failureCount(0) { } + int failureCount; }; void tst_QMetaType::threadSafety() @@ -139,6 +165,11 @@ void tst_QMetaType::threadSafety() QVERIFY(t1.wait()); QVERIFY(t2.wait()); QVERIFY(t3.wait()); + + QCOMPARE(t1.failureCount, 0); + QCOMPARE(t2.failureCount, 0); + QCOMPARE(t3.failureCount, 0); + QCOMPARE(Bar::failureCount, 0); } namespace TestSpace diff --git a/tests/auto/qmouseevent/tst_qmouseevent.cpp b/tests/auto/qmouseevent/tst_qmouseevent.cpp index 9d61e7d396..d86c5cc8b2 100644 --- a/tests/auto/qmouseevent/tst_qmouseevent.cpp +++ b/tests/auto/qmouseevent/tst_qmouseevent.cpp @@ -62,17 +62,9 @@ public: } bool mousePressEventRecieved; bool mouseReleaseEventRecieved; -#ifdef QT3_SUPPORT - int mousePressStateBefore; - int mousePressStateAfter; -#endif int mousePressButton; int mousePressButtons; int mousePressModifiers; -#ifdef QT3_SUPPORT - int mouseReleaseStateBefore; - int mouseReleaseStateAfter; -#endif int mouseReleaseButton; int mouseReleaseButtons; int mouseReleaseModifiers; @@ -80,10 +72,6 @@ protected: void mousePressEvent(QMouseEvent *e) { QWidget::mousePressEvent(e); -#ifdef QT3_SUPPORT - mousePressStateBefore = e->state(); - mousePressStateAfter = e->stateAfter(); -#endif mousePressButton = e->button(); mousePressButtons = e->buttons(); mousePressModifiers = e->modifiers(); @@ -93,10 +81,6 @@ protected: void mouseReleaseEvent(QMouseEvent *e) { QWidget::mouseReleaseEvent(e); -#ifdef QT3_SUPPORT - mouseReleaseStateBefore = e->state(); - mouseReleaseStateAfter = e->stateAfter(); -#endif mouseReleaseButton = e->button(); mouseReleaseButtons = e->buttons(); mouseReleaseModifiers = e->modifiers(); @@ -125,8 +109,6 @@ private slots: void checkMouseReleaseEvent_data(); void checkMouseReleaseEvent(); - void qt3supportConstructors(); - private: MouseEventWidget* testMouseWidget; }; @@ -157,12 +139,6 @@ void tst_QMouseEvent::init() { testMouseWidget->mousePressEventRecieved = FALSE; testMouseWidget->mouseReleaseEventRecieved = FALSE; -#ifdef QT3_SUPPORT - testMouseWidget->mousePressStateBefore = 0; - testMouseWidget->mousePressStateAfter = 0; - testMouseWidget->mouseReleaseStateBefore = 0; - testMouseWidget->mouseReleaseStateAfter = 0; -#endif testMouseWidget->mousePressButton = 0; testMouseWidget->mousePressButtons = 0; testMouseWidget->mousePressModifiers = 0; @@ -210,13 +186,6 @@ void tst_QMouseEvent::checkMousePressEvent() QCOMPARE(testMouseWidget->mousePressButton, button); QCOMPARE(testMouseWidget->mousePressButtons, buttons); QCOMPARE(testMouseWidget->mousePressModifiers, modifiers); -#ifdef QT3_SUPPORT - int stateAfter = buttons|modifiers; - int stateBefore = stateAfter & ~button; - - QCOMPARE(testMouseWidget->mousePressStateBefore, stateBefore); - QCOMPARE(testMouseWidget->mousePressStateAfter, stateAfter); -#endif QTest::mouseRelease(testMouseWidget, Qt::MouseButton(buttonPressed), Qt::KeyboardModifiers(keyPressed)); } @@ -256,35 +225,6 @@ void tst_QMouseEvent::checkMouseReleaseEvent() QCOMPARE(testMouseWidget->mouseReleaseButton, button); QCOMPARE(testMouseWidget->mouseReleaseButtons, buttons); QCOMPARE(testMouseWidget->mouseReleaseModifiers, modifiers); -#ifdef QT3_SUPPORT - int stateAfter = buttons|modifiers; - int stateBefore = stateAfter|button; - - QCOMPARE(testMouseWidget->mouseReleaseStateBefore, stateBefore); - QCOMPARE(testMouseWidget->mouseReleaseStateAfter, stateAfter); -#endif -} - -void tst_QMouseEvent::qt3supportConstructors() -{ -#if !defined(QT3_SUPPORT) - QSKIP( "No Qt3Support present", SkipAll); -#else - // make sure the state() and stateAfter() functions return the - // same thing they did in Qt 3 when using these constructors - - { - QMouseEvent e(QEvent::MouseButtonPress, QPoint(0, 0), Qt::LeftButton, 0); - QCOMPARE(e.state(), Qt::ButtonState(Qt::NoButton)); - QCOMPARE(e.stateAfter(), Qt::ButtonState(Qt::LeftButton)); - } - - { - QMouseEvent e(QEvent::MouseButtonPress, QPoint(0, 0), QPoint(0, 0), Qt::LeftButton, 0); - QCOMPARE(e.state(), Qt::ButtonState(Qt::NoButton)); - QCOMPARE(e.stateAfter(), Qt::ButtonState(Qt::LeftButton)); - } -#endif } QTEST_MAIN(tst_QMouseEvent) diff --git a/tests/auto/qmutex/tst_qmutex.cpp b/tests/auto/qmutex/tst_qmutex.cpp index a8c4b37715..0f2d982843 100644 --- a/tests/auto/qmutex/tst_qmutex.cpp +++ b/tests/auto/qmutex/tst_qmutex.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #include <QtTest/QtTest> #include <qatomic.h> @@ -49,8 +48,6 @@ #include <qthread.h> #include <qwaitcondition.h> - - //TESTED_CLASS= //TESTED_FILES= @@ -372,14 +369,6 @@ public: } }; -#ifdef QT3_SUPPORT -#define VERIFY_LOCKED(x) QVERIFY((x).locked()) -#define VERIFY_NLOCKED(x) QVERIFY(!(x).locked()) -#else -#define VERIFY_LOCKED(x) -#define VERIFY_NLOCKED(x) -#endif // QT3_SUPPORT - void tst_QMutex::lock_unlock_locked_tryLock() { // normal mutex @@ -391,7 +380,6 @@ void tst_QMutex::lock_unlock_locked_tryLock() for (int i = 0; i < iterations; ++i) { // normal mutex - VERIFY_NLOCKED(mutex); QVERIFY(mutex.tryLock()); mutex.unlock(); @@ -400,7 +388,6 @@ void tst_QMutex::lock_unlock_locked_tryLock() for (int j = 0; j < iterations; ++j) { QVERIFY(thread.cond.wait(&thread.mutex, 10000)); - VERIFY_LOCKED(mutex); QVERIFY(!mutex.tryLock()); thread.cond.wakeOne(); @@ -409,13 +396,11 @@ void tst_QMutex::lock_unlock_locked_tryLock() thread.mutex.unlock(); QVERIFY(thread.wait(10000)); - VERIFY_NLOCKED(mutex); QVERIFY(mutex.tryLock()); mutex.unlock(); // recursive mutex - VERIFY_NLOCKED(rmutex); QVERIFY(rmutex.tryLock()); QVERIFY(rmutex.tryLock()); QVERIFY(rmutex.tryLock()); @@ -431,7 +416,6 @@ void tst_QMutex::lock_unlock_locked_tryLock() for (int k = 0; k < iterations; ++k) { QVERIFY(rthread.cond.wait(&rthread.mutex, 10000)); - VERIFY_LOCKED(rmutex); QVERIFY(!rmutex.tryLock()); rthread.cond.wakeOne(); @@ -440,7 +424,6 @@ void tst_QMutex::lock_unlock_locked_tryLock() rthread.mutex.unlock(); QVERIFY(rthread.wait(10000)); - VERIFY_NLOCKED(rmutex); QVERIFY(rmutex.tryLock()); QVERIFY(rmutex.tryLock()); QVERIFY(rmutex.tryLock()); @@ -462,6 +445,7 @@ public: static QBasicAtomicInt lockCount; static QBasicAtomicInt sentinel; static QMutex mutex; + static int errorCount; void start() { t.start(); @@ -471,13 +455,13 @@ public: { while (t.elapsed() < one_minute) { mutex.lock(); - Q_ASSERT(!sentinel.ref()); - Q_ASSERT(sentinel.deref()); + if (sentinel.ref()) ++errorCount; + if (!sentinel.deref()) ++errorCount; lockCount.ref(); mutex.unlock(); if (mutex.tryLock()) { - Q_ASSERT(!sentinel.ref()); - Q_ASSERT(sentinel.deref()); + if (sentinel.ref()) ++errorCount; + if (!sentinel.deref()) ++errorCount; lockCount.ref(); mutex.unlock(); } @@ -487,6 +471,7 @@ public: QMutex StressTestThread::mutex; QBasicAtomicInt StressTestThread::lockCount = Q_BASIC_ATOMIC_INITIALIZER(0); QBasicAtomicInt StressTestThread::sentinel = Q_BASIC_ATOMIC_INITIALIZER(-1); +int StressTestThread::errorCount = 0; void tst_QMutex::stressTest() { @@ -496,6 +481,7 @@ void tst_QMutex::stressTest() QVERIFY(threads[0].wait(one_minute + 10000)); for (int i = 1; i < threadCount; ++i) QVERIFY(threads[i].wait(10000)); + QCOMPARE(StressTestThread::errorCount, 0); qDebug("locked %d times", int(StressTestThread::lockCount)); } @@ -534,7 +520,12 @@ void tst_QMutex::tryLockRace() TryLockRaceThread::mutex.unlock(); } +// Variable that will be protected by the mutex. Volatile so that the +// the optimiser doesn't mess with it based on the increment-then-decrement +// usage pattern. static volatile int qtbug16115_trylock_counter; +// Counter for how many times the protected variable has an incorrect value. +static int qtbug16115_failure_count = 0; void tst_QMutex::qtbug16115_trylock() { @@ -545,8 +536,10 @@ void tst_QMutex::qtbug16115_trylock() void run() { for (int i = 0; i < 1000000; ++i) { if (mut.tryLock(0)) { - Q_ASSERT((++qtbug16115_trylock_counter) == 1); - Q_ASSERT((--qtbug16115_trylock_counter) == 0); + if ((++qtbug16115_trylock_counter) != 1) + ++qtbug16115_failure_count; + if ((--qtbug16115_trylock_counter) != 0) + ++qtbug16115_failure_count; mut.unlock(); } } @@ -562,13 +555,16 @@ void tst_QMutex::qtbug16115_trylock() for (int i = 0; i < 1000000; ++i) { mut.lock(); - Q_ASSERT((++qtbug16115_trylock_counter) == 1); - Q_ASSERT((--qtbug16115_trylock_counter) == 0); + if ((++qtbug16115_trylock_counter) != 1) + ++qtbug16115_failure_count; + if ((--qtbug16115_trylock_counter) != 0) + ++qtbug16115_failure_count; mut.unlock(); } t1.wait(); t2.wait(); t3.wait(); + QCOMPARE(qtbug16115_failure_count, 0); } QTEST_MAIN(tst_QMutex) diff --git a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp index f7c5ca151d..04bc410097 100644 --- a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp +++ b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp @@ -65,9 +65,9 @@ class DownloadCheckWidget : public QWidget { Q_OBJECT public: - DownloadCheckWidget(QWidget *parent = 0) : QWidget(parent) - , progressDlg(this), netmanager(this) - , lateReadyRead(true) + DownloadCheckWidget(QWidget *parent = 0) : + QWidget(parent), lateReadyRead(true), zeroCopy(false), + progressDlg(this), netmanager(this) { progressDlg.setRange(1, 100); QMetaObject::invokeMethod(this, "go", Qt::QueuedConnection); @@ -96,12 +96,14 @@ public slots: void dataReadProgress(qint64 done, qint64 total) { QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender()); + Q_UNUSED(reply); progressDlg.setMaximum(total); progressDlg.setValue(done); } void dataReadyRead() { QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender()); + Q_UNUSED(reply); lateReadyRead = true; } void finishedFromReply() diff --git a/tests/auto/qnetworkreply/test/test.pro b/tests/auto/qnetworkreply/test/test.pro index d1f6707f6f..d415e04451 100644 --- a/tests/auto/qnetworkreply/test/test.pro +++ b/tests/auto/qnetworkreply/test/test.pro @@ -13,7 +13,7 @@ win32 { !symbian:DEFINES += SRCDIR=\\\"$$PWD/..\\\" -QT = core network +QT = core-private network-private RESOURCES += ../qnetworkreply.qrc symbian|wince*:{ diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp index d1dc62bbf4..258be2d1d7 100644 --- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp @@ -219,6 +219,8 @@ private Q_SLOTS: void putGetDeleteGetFromHttp(); void sendCustomRequestToHttp_data(); void sendCustomRequestToHttp(); + void connectToIPv6Address_data(); + void connectToIPv6Address(); void ioGetFromData_data(); void ioGetFromData(); @@ -447,14 +449,19 @@ public: QSemaphore ready; bool doClose; bool doSsl; + bool ipv6; bool multiple; int totalConnections; - MiniHttpServer(const QByteArray &data, bool ssl = false, QThread *thread = 0) - : client(0), dataToTransmit(data), doClose(true), doSsl(ssl), + MiniHttpServer(const QByteArray &data, bool ssl = false, QThread *thread = 0, bool useipv6 = false) + : client(0), dataToTransmit(data), doClose(true), doSsl(ssl), ipv6(useipv6), multiple(false), totalConnections(0) { - listen(); + if( useipv6 ){ + listen(QHostAddress::AnyIPv6); + }else{ + listen(); + } if (thread) { connect(thread, SIGNAL(started()), this, SLOT(threadStartedSlot())); moveToThread(thread); @@ -466,7 +473,7 @@ public: protected: void incomingConnection(int socketDescriptor) { - //qDebug() << "incomingConnection" << socketDescriptor; + //qDebug() << "incomingConnection" << socketDescriptor << "doSsl:" << doSsl << "ipv6:" << ipv6; if (!doSsl) { client = new QTcpSocket; client->setSocketDescriptor(socketDescriptor); @@ -622,9 +629,14 @@ public: } QIODevice *prepare(const QNetworkCacheMetaData &) - { Q_ASSERT(0 && "Should not have tried to add to the cache"); return 0; } + { + qFatal("%s: Should not have tried to add to the cache", Q_FUNC_INFO); + return 0; + } void insert(QIODevice *) - { Q_ASSERT(0 && "Should not have tried to add to the cache"); } + { + qFatal("%s: Should not have tried to add to the cache", Q_FUNC_INFO); + } void clear() { cache.clear(); } }; @@ -774,7 +786,9 @@ public: QTcpSocket* waitForNextConnectionSocket() { waitForNewConnection(-1); if (doSsl) { - Q_ASSERT(sslSocket); + if (!sslSocket) + qFatal("%s: sslSocket should not be null after calling waitForNewConnection()", + Q_FUNC_INFO); return sslSocket; } else { //qDebug() << "returning nextPendingConnection"; @@ -946,7 +960,8 @@ protected: while (dataIndex < wantedSize) { const int remainingBytes = wantedSize - measuredSentBytes; const int bytesToWrite = qMin(remainingBytes, static_cast<int>(BlockSize)); - Q_ASSERT(bytesToWrite); + if (bytesToWrite <= 0) + qFatal("%s: attempt to write %d bytes", Q_FUNC_INFO, bytesToWrite); measuredSentBytes += writeNextData(client, bytesToWrite); while (client->bytesToWrite() > 0) { @@ -1005,7 +1020,8 @@ public: // Wait for data to be readyRead bool ok = connect(&senderObj, SIGNAL(dataReady()), this, SLOT(slotDataReady())); - Q_ASSERT(ok); + if (!ok) + qFatal("%s: Cannot connect dataReady signal", Q_FUNC_INFO); } void wrapUp() @@ -1028,9 +1044,9 @@ protected: void timerEvent(QTimerEvent *) { //qDebug() << "RateControlledReader: timerEvent bytesAvailable=" << device->bytesAvailable(); - if (readBufferSize > 0) { - // This asserts passes all the time, except in the final flush. - //Q_ASSERT(device->bytesAvailable() <= readBufferSize); + if (readBufferSize > 0 && device->bytesAvailable() > readBufferSize) { + // This passes all the time, except in the final flush. + //qFatal("%s: Too many bytes available", Q_FUNC_INFO); } qint64 bytesRead = 0; @@ -1189,7 +1205,7 @@ QString tst_QNetworkReply::runSimpleRequest(QNetworkAccessManager::Operation op, break; default: - Q_ASSERT_X(false, "tst_QNetworkReply", "Invalid/unknown operation requested"); + qFatal("%s: Invalid/unknown operation requested", Q_FUNC_INFO); } reply->setParent(this); @@ -2317,6 +2333,48 @@ void tst_QNetworkReply::putGetDeleteGetFromHttp() } +void tst_QNetworkReply::connectToIPv6Address_data() +{ + QTest::addColumn<QUrl>("url"); + QTest::addColumn<QNetworkReply::NetworkError>("error"); + QTest::addColumn<QByteArray>("dataToSend"); + QTest::addColumn<QByteArray>("serverVerifyData"); + QTest::newRow("localhost") << QUrl(QByteArray("http://[::1]")) << QNetworkReply::NoError<< QByteArray("localhost") << QByteArray("\r\nHost: [::1]\r\n"); + //to add more test data here +} + +void tst_QNetworkReply::connectToIPv6Address() +{ + QFETCH(QUrl, url); + QFETCH(QNetworkReply::NetworkError, error); + QFETCH(QByteArray, dataToSend); + QFETCH(QByteArray, serverVerifyData); + + QByteArray httpResponse = QByteArray("HTTP/1.0 200 OK\r\nContent-Length: "); + httpResponse += QByteArray::number(dataToSend.size()); + httpResponse += "\r\n\r\n"; + httpResponse += dataToSend; + + MiniHttpServer server(httpResponse, false, NULL/*thread*/, true/*useipv6*/); + server.doClose = true; + + url.setPort(server.serverPort()); + QNetworkRequest request(url); + + QNetworkReplyPtr reply = manager.get(request); + connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); + QTestEventLoop::instance().enterLoop(10); + QVERIFY(!QTestEventLoop::instance().timeout()); + QByteArray content = reply->readAll(); + if( !serverVerifyData.isEmpty()){ + //qDebug() << server.receivedData; + //QVERIFY(server.receivedData.contains(serverVerifyData)); //got a bug here + } + QVERIFY(content == dataToSend); + QCOMPARE(reply->url(), request.url()); + QVERIFY(reply->error() == error); +} + void tst_QNetworkReply::sendCustomRequestToHttp_data() { QTest::addColumn<QUrl>("url"); diff --git a/tests/auto/qobject/signalbug.cpp b/tests/auto/qobject/signalbug.cpp index f9c9650ef5..55ef5b3912 100644 --- a/tests/auto/qobject/signalbug.cpp +++ b/tests/auto/qobject/signalbug.cpp @@ -69,7 +69,8 @@ void Receiver::received () ::Step++; const int stepCopy = ::Step; TRACE (stepCopy, "Receiver::received()"); - Q_ASSERT (::Step == 2 || ::Step == 4); + if (::Step != 2 && ::Step != 4) + qFatal("%s: Incorrect Step: %d (should be 2 or 4)", Q_FUNC_INFO, ::Step); if (::Step == 2) s->fire (); @@ -91,7 +92,8 @@ void Disconnector::received () ::Step++; const int stepCopy = ::Step; TRACE (stepCopy, "Disconnector::received()"); - Q_ASSERT (::Step == 5 || ::Step == 6); + if (::Step != 5 && ::Step != 6) + qFatal("%s: Incorrect Step: %d (should be 5 or 6)", Q_FUNC_INFO, ::Step); fprintf (stderr, "Disconnector<%s>::received() sender=%s\n", (const char *) objectName ().toAscii (), sender ()->metaObject()->className()); @@ -124,7 +126,8 @@ void Sender::fire () ::Step++; const int stepCopy = ::Step; TRACE (stepCopy, "Sender::fire()"); - Q_ASSERT (::Step == 1 || ::Step == 3); + if (::Step != 1 && ::Step != 3) + qFatal("%s: Incorrect Step: %d (should be 1 or 3)", Q_FUNC_INFO, ::Step); emit fired (); TRACE (stepCopy, "ends Sender::fire()"); diff --git a/tests/auto/qobject/tst_qobject.cpp b/tests/auto/qobject/tst_qobject.cpp index 4b926e450e..5e0b970f9b 100644 --- a/tests/auto/qobject/tst_qobject.cpp +++ b/tests/auto/qobject/tst_qobject.cpp @@ -40,10 +40,8 @@ ****************************************************************************/ -#define QT3_SUPPORT #include <QtTest/QtTest> - #include <qcoreapplication.h> #include <qpointer.h> @@ -403,6 +401,8 @@ public: } void reset() { + called_slot10 = 0; + called_slot9 = 0; called_slot8 = 0; called_slot7 = 0; called_slot6 = 0; @@ -421,6 +421,8 @@ public: int called_slot6; int called_slot7; int called_slot8; + int called_slot9; + int called_slot10; bool called(int slot) { switch (slot) { @@ -432,6 +434,8 @@ public: case 6: return called_slot6; case 7: return called_slot7; case 8: return called_slot8; + case 9: return called_slot9; + case 10: return called_slot10; default: return false; } } @@ -449,8 +453,8 @@ public slots: void slotLoopBack() { ++called_slot8; } protected slots: - void o() { Q_ASSERT(0); } - void on() { Q_ASSERT(0); } + void o() { ++called_slot9; } + void on() { ++called_slot10; } signals: void on_Sender_signalLoopBack(); @@ -473,6 +477,8 @@ void tst_QObject::connectByName() QCOMPARE(receiver.called(6), false); QCOMPARE(receiver.called(7), false); QCOMPARE(receiver.called(8), false); + QCOMPARE(receiver.called(9), false); + QCOMPARE(receiver.called(10), false); receiver.reset(); sender.emitSignalWithParams(0); @@ -484,6 +490,8 @@ void tst_QObject::connectByName() QCOMPARE(receiver.called(6), false); QCOMPARE(receiver.called(7), false); QCOMPARE(receiver.called(8), false); + QCOMPARE(receiver.called(9), false); + QCOMPARE(receiver.called(10), false); receiver.reset(); sender.emitSignalWithParams(0, "string"); @@ -495,6 +503,8 @@ void tst_QObject::connectByName() QCOMPARE(receiver.called(6), false); QCOMPARE(receiver.called(7), false); QCOMPARE(receiver.called(8), false); + QCOMPARE(receiver.called(9), false); + QCOMPARE(receiver.called(10), false); receiver.reset(); sender.emitSignalManyParams(1, 2, 3, "string", true); @@ -506,6 +516,8 @@ void tst_QObject::connectByName() QCOMPARE(receiver.called(6), false); QCOMPARE(receiver.called(7), false); QCOMPARE(receiver.called(8), false); + QCOMPARE(receiver.called(9), false); + QCOMPARE(receiver.called(10), false); receiver.reset(); sender.emitSignalManyParams2(1, 2, 3, "string", true); @@ -517,6 +529,8 @@ void tst_QObject::connectByName() QCOMPARE(receiver.called(6), false); QCOMPARE(receiver.called(7), true); QCOMPARE(receiver.called(8), false); + QCOMPARE(receiver.called(9), false); + QCOMPARE(receiver.called(10), false); receiver.reset(); sender.emitSignalLoopBack(); @@ -528,6 +542,8 @@ void tst_QObject::connectByName() QCOMPARE(receiver.called(6), false); QCOMPARE(receiver.called(7), false); QCOMPARE(receiver.called(8), true); + QCOMPARE(receiver.called(9), false); + QCOMPARE(receiver.called(10), false); receiver.reset(); } @@ -1312,14 +1328,16 @@ public: void customEvent(QEvent *) { - Q_ASSERT(customEventThread == 0); + if (customEventThread) + qFatal("%s: customEventThread should be null", Q_FUNC_INFO); customEventThread = QThread::currentThread(); emit theSignal(); } void timerEvent(QTimerEvent *) { - Q_ASSERT(timerEventThread == 0); + if (timerEventThread) + qFatal("%s: timerEventThread should be null", Q_FUNC_INFO); timerEventThread = QThread::currentThread(); emit theSignal(); } @@ -1327,7 +1345,8 @@ public: public slots: void theSlot() { - Q_ASSERT(slotThread == 0); + if (slotThread) + qFatal("%s: slotThread should be null", Q_FUNC_INFO); slotThread = QThread::currentThread(); emit theSignal(); } @@ -2813,11 +2832,6 @@ void tst_QObject::compatibilityChildInsertedEvents() expected = EventSpy::EventList() -#ifdef QT_HAS_QT3SUPPORT - << qMakePair(&object, QEvent::ChildInsertedRequest) - << qMakePair(&object, QEvent::ChildInserted) - << qMakePair(&object, QEvent::ChildInserted) -#endif << qMakePair(&object, QEvent::Type(QEvent::User + 1)) << qMakePair(&object, QEvent::Type(QEvent::User + 2)); QCOMPARE(spy.eventList(), expected); @@ -2851,10 +2865,6 @@ void tst_QObject::compatibilityChildInsertedEvents() expected = EventSpy::EventList() -#ifdef QT_HAS_QT3SUPPORT - << qMakePair(&object, QEvent::ChildInsertedRequest) - << qMakePair(&object, QEvent::ChildInserted) -#endif << qMakePair(&object, QEvent::Type(QEvent::User + 1)) << qMakePair(&object, QEvent::Type(QEvent::User + 2)); QCOMPARE(spy.eventList(), expected); diff --git a/tests/auto/qobject/tst_qobject.pro b/tests/auto/qobject/tst_qobject.pro index e31fed5d10..29de071328 100644 --- a/tests/auto/qobject/tst_qobject.pro +++ b/tests/auto/qobject/tst_qobject.pro @@ -7,7 +7,8 @@ SOURCES += moc_oldnormalizeobject.cpp QT = core \ network \ - gui + gui \ + core-private wince*: { addFiles.files = signalbug.exe addFiles.path = . diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp index 984443490f..25e58b41de 100644 --- a/tests/auto/qpainter/tst_qpainter.cpp +++ b/tests/auto/qpainter/tst_qpainter.cpp @@ -54,9 +54,6 @@ #if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) #include <qprinter.h> #include <math.h> -#ifdef QT3_SUPPORT -#include <q3painter.h> -#endif #endif #include <qpaintengine.h> #include <qdesktopwidget.h> @@ -1271,24 +1268,6 @@ void tst_QPainter::drawRect() QCOMPARE(painted.width(), rect.width() + increment); QCOMPARE(painted.height(), rect.height() + increment); } - -#ifdef QT3_SUPPORT - { - if (usePen && (rect.width() < 2 || rect.height() < 2)) - return; - pixmap.fill(Qt::white); - Q3Painter p(&pixmap); - p.setPen(usePen ? QPen(Qt::black) : QPen(Qt::NoPen)); - p.setBrush(Qt::black); - p.drawRect(rect); - p.end(); - - const QRect painted = getPaintedSize(pixmap, Qt::white); - - QCOMPARE(painted.width(), rect.width()); - QCOMPARE(painted.height(), rect.height()); - } -#endif } void tst_QPainter::drawRect2() @@ -1696,22 +1675,6 @@ void tst_QPainter::drawRoundRect() QCOMPARE(painted.width(), rect.width() + increment); QCOMPARE(painted.height(), rect.height() + increment); } - -#ifdef QT3_SUPPORT - { - pixmap.fill(Qt::white); - Q3Painter p(&pixmap); - p.setPen(usePen ? QPen(Qt::black) : QPen(Qt::NoPen)); - p.setBrush(Qt::black); - p.drawRoundRect(rect); - p.end(); - - const QRect painted = getPaintedSize(pixmap, Qt::white); - - QCOMPARE(painted.width(), rect.width()); - QCOMPARE(painted.height(), rect.height()); - } -#endif } Q_DECLARE_METATYPE(QImage::Format) diff --git a/tests/auto/qpathclipper/qpathclipper.pro b/tests/auto/qpathclipper/qpathclipper.pro index 590fba0e2d..2becd7dd03 100644 --- a/tests/auto/qpathclipper/qpathclipper.pro +++ b/tests/auto/qpathclipper/qpathclipper.pro @@ -2,6 +2,7 @@ load(qttest_p4) INCLUDEPATH += . HEADERS += paths.h SOURCES += tst_qpathclipper.cpp paths.cpp +QT += gui-private requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/qpicture/tst_qpicture.cpp b/tests/auto/qpicture/tst_qpicture.cpp index 10a5a83aa1..1e97502abf 100644 --- a/tests/auto/qpicture/tst_qpicture.cpp +++ b/tests/auto/qpicture/tst_qpicture.cpp @@ -81,7 +81,7 @@ void tst_QPicture::getSetCheck() // void QPictureIO::setPicture(const QPicture &) // const char * QPictureIO::format() // void QPictureIO::setFormat(const char *) - char *var2 = "PNG"; + const char var2[] = "PNG"; obj1.setFormat(var2); QCOMPARE(var2, obj1.format()); obj1.setFormat((char *)0); @@ -90,7 +90,7 @@ void tst_QPicture::getSetCheck() // const char * QPictureIO::parameters() // void QPictureIO::setParameters(const char *) - char *var3 = "Bogus data"; + const char var3[] = "Bogus data"; obj1.setParameters(var3); QCOMPARE(var3, obj1.parameters()); obj1.setParameters((char *)0); diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp index 1f1ee88b23..216ca9b7c8 100644 --- a/tests/auto/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/qpixmap/tst_qpixmap.cpp @@ -164,11 +164,6 @@ private slots: void copy(); void depthOfNullObjects(); -#ifdef QT3_SUPPORT - void resize(); - void resizePreserveMask(); -#endif - void transformed(); void transformed2(); @@ -1427,53 +1422,6 @@ void tst_QPixmap::copy() QVERIFY(pixmapsAreEqual(&trans, &transCopy)); } -#ifdef QT3_SUPPORT -void tst_QPixmap::resize() -{ - QPixmap p1(10, 10); - p1.fill(Qt::red); - - QPixmap p2 = p1; - QPixmap p3(50, 50); - p3.fill(Qt::red); - - p1.resize(p3.size()); - p1.resize(p2.size()); - p3.resize(p2.size()); - QCOMPARE(p1.toImage(), p2.toImage()); - QCOMPARE(p1.toImage(), p3.toImage()); - - QBitmap b1; - b1.resize(10, 10); - QVERIFY(b1.depth() == 1); - QPixmap p4; - p4.resize(10, 10); - QVERIFY(p4.depth() != 0); -} - -void tst_QPixmap::resizePreserveMask() -{ - QPixmap pm(100, 100); - pm.fill(Qt::transparent); - QPainter p(&pm); - p.fillRect(10, 10, 80, 80, Qt::red); - p.drawRect(0, 0, 99, 99); - p.end(); - - QBitmap mask = pm.mask(); - pm.resize(50, 50); - - QCOMPARE(pm.mask().toImage(), mask.toImage().copy(0, 0, 50, 50)); - - pm = QPixmap(100, 100); - pm.fill(Qt::red); - pm.setMask(mask); - pm.resize(50, 50); - - QCOMPARE(pm.mask().toImage(), mask.toImage().copy(0, 0, 50, 50)); -} -#endif - void tst_QPixmap::depthOfNullObjects() { QBitmap b1; @@ -1697,8 +1645,8 @@ void tst_QPixmap::fromImageReaderAnimatedGif() QImageReader referenceReader(path); QImageReader pixmapReader(path); - Q_ASSERT(referenceReader.canRead()); - Q_ASSERT(referenceReader.imageCount() > 1); + QVERIFY(referenceReader.canRead()); + QVERIFY(referenceReader.imageCount() > 1); for (int i = 0; i < referenceReader.imageCount(); ++i) { QImage refImage = referenceReader.read(); diff --git a/tests/auto/qpixmapcache/qpixmapcache.pro b/tests/auto/qpixmapcache/qpixmapcache.pro index c31f039548..1ffafd6c25 100644 --- a/tests/auto/qpixmapcache/qpixmapcache.pro +++ b/tests/auto/qpixmapcache/qpixmapcache.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += gui-private SOURCES += tst_qpixmapcache.cpp diff --git a/tests/auto/qprinter/tst_qprinter.cpp b/tests/auto/qprinter/tst_qprinter.cpp index 96765a478e..b1c4c4ee3c 100644 --- a/tests/auto/qprinter/tst_qprinter.cpp +++ b/tests/auto/qprinter/tst_qprinter.cpp @@ -39,19 +39,13 @@ ** ****************************************************************************/ - #include <QtTest/QtTest> - - #include <qprinter.h> #include <qpagesetupdialog.h> #include <qpainter.h> #include <qprintdialog.h> #include <qprinterinfo.h> -#ifdef QT3_SUPPORT -#include <q3paintdevicemetrics.h> -#endif #include <qvariant.h> #include <qpainter.h> #include <qprintengine.h> @@ -412,6 +406,8 @@ void tst_QPrinter::testMargins() QFETCH(int, width); QFETCH(int, height); QFETCH(bool, fullpage); + Q_UNUSED(width); + Q_UNUSED(height); QPrinter printer; QPainter *painter = 0; printer.setOutputFileName("silly"); @@ -421,23 +417,6 @@ void tst_QPrinter::testMargins() if (withPainter) painter = new QPainter(&printer); -#ifdef QT3_SUPPORT - Q3PaintDeviceMetrics metrics(&printer); - int pwidth = metrics.width(); - int pheight = metrics.height(); - - if (orientation == QPrinter::Portrait) { - QVERIFY(pheight >= pwidth); - } else { - QVERIFY(pwidth >= pheight); - } - - if (fullpage) { - QCOMPARE(metrics.widthMM(), width); - QCOMPARE(metrics.heightMM(), height); - } -#endif - if (painter) delete painter; } diff --git a/tests/auto/qprocess/testGuiProcess/main.cpp b/tests/auto/qprocess/testGuiProcess/main.cpp index 5550772dab..1df5dcf3e1 100644 --- a/tests/auto/qprocess/testGuiProcess/main.cpp +++ b/tests/auto/qprocess/testGuiProcess/main.cpp @@ -49,6 +49,7 @@ int main(int argc, char **argv) label.show(); int c; + Q_UNUSED(c); fgetc(stdin); // block until fed qDebug("Process is running"); diff --git a/tests/auto/qprocess/testProcessSpacesArgs/main.cpp b/tests/auto/qprocess/testProcessSpacesArgs/main.cpp index c6ea8cacd7..0652ddf0a2 100644 --- a/tests/auto/qprocess/testProcessSpacesArgs/main.cpp +++ b/tests/auto/qprocess/testProcessSpacesArgs/main.cpp @@ -62,7 +62,7 @@ int main(int argc, char ** argv) for (int i = 0; i < argc; ++i) { if (i) printf("|"); - printf(argv[i]); + printf("%s", argv[i]); } #endif return 0; diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp index 2a8874eab3..3e0c3ff412 100644 --- a/tests/auto/qprocess/tst_qprocess.cpp +++ b/tests/auto/qprocess/tst_qprocess.cpp @@ -668,7 +668,7 @@ void tst_QProcess::exitStatus() QSKIP("This test opens a crash dialog on Windows", SkipSingle); #endif - Q_ASSERT(processList.count() == exitStatus.count()); + QCOMPARE(exitStatus.count(), processList.count()); for (int i = 0; i < processList.count(); ++i) { process->start(processList.at(i)); QVERIFY(process->waitForStarted(5000)); diff --git a/tests/auto/qreadwritelock/tst_qreadwritelock.cpp b/tests/auto/qreadwritelock/tst_qreadwritelock.cpp index e0cc2fa200..0d575a13d9 100644 --- a/tests/auto/qreadwritelock/tst_qreadwritelock.cpp +++ b/tests/auto/qreadwritelock/tst_qreadwritelock.cpp @@ -362,34 +362,45 @@ void tst_QReadWriteLock::tryWriteLock() class Thread : public QThread { public: + Thread() : failureCount(0) { } void run() { testsTurn.release(); threadsTurn.acquire(); - Q_ASSERT(!readWriteLock.tryLockForWrite()); + if (readWriteLock.tryLockForWrite()) + failureCount++; testsTurn.release(); threadsTurn.acquire(); - Q_ASSERT(readWriteLock.tryLockForWrite()); - Q_ASSERT(lockCount.testAndSetRelaxed(0, 1)); - Q_ASSERT(lockCount.testAndSetRelaxed(1, 0)); + if (!readWriteLock.tryLockForWrite()) + failureCount++; + if (!lockCount.testAndSetRelaxed(0, 1)) + failureCount++; + if (!lockCount.testAndSetRelaxed(1, 0)) + failureCount++; readWriteLock.unlock(); testsTurn.release(); threadsTurn.acquire(); - Q_ASSERT(!readWriteLock.tryLockForWrite(1000)); + if (readWriteLock.tryLockForWrite(1000)) + failureCount++; testsTurn.release(); threadsTurn.acquire(); - Q_ASSERT(readWriteLock.tryLockForWrite(1000)); - Q_ASSERT(lockCount.testAndSetRelaxed(0, 1)); - Q_ASSERT(lockCount.testAndSetRelaxed(1, 0)); + if (!readWriteLock.tryLockForWrite(1000)) + failureCount++; + if (!lockCount.testAndSetRelaxed(0, 1)) + failureCount++; + if (!lockCount.testAndSetRelaxed(1, 0)) + failureCount++; readWriteLock.unlock(); testsTurn.release(); threadsTurn.acquire(); } + + int failureCount; }; Thread thread; @@ -419,6 +430,8 @@ void tst_QReadWriteLock::tryWriteLock() testsTurn.acquire(); threadsTurn.release(); thread.wait(); + + QCOMPARE(thread.failureCount, 0); } } diff --git a/tests/auto/qsettings/tst_qsettings.cpp b/tests/auto/qsettings/tst_qsettings.cpp index 8974b2576b..bd16aad8f8 100644 --- a/tests/auto/qsettings/tst_qsettings.cpp +++ b/tests/auto/qsettings/tst_qsettings.cpp @@ -101,7 +101,6 @@ private slots: void testArrays_data(); void testArrays(); void testEscapes(); - void testCompatFunctions(); void testCaseSensitivity_data(); void testCaseSensitivity(); void testErrorHandling_data(); @@ -136,52 +135,11 @@ private slots: void qtbug_13249(); #endif - /* - These tests were developed for the Qt 3 QSettings class. - */ -#ifdef QT3_SUPPORT - void oldWriteEntryIni_data(); - void oldWriteEntryIni(); - void oldReadEntryIni_data(); - void oldReadEntryIni(); - void oldBeginGroup_data(); - void oldBeginGroup(); - void oldEndGroup_data(); - void oldEndGroup(); - void oldResetGroup_data(); - void oldResetGroup(); - void oldEntryList_data(); - void oldEntryList(); - void oldWriteEntry_QString_bool_data(); - void oldWriteEntry_QString_bool(); - void oldWriteEntry_QString_double_data(); - void oldWriteEntry_QString_double(); - void oldWriteEntry_QString_int_data(); - void oldWriteEntry_QString_int(); - void oldWriteEntry_QString_QString_data(); - void oldWriteEntry_QString_QString(); - void oldWriteEntry_QString_QStringList_data(); - void oldWriteEntry_QString_QStringList(); - void oldWriteEntry_QString_QStringList_QChar_data(); - void oldWriteEntry_QString_QStringList_QChar(); - void oldReadListEntry_QString(); - void oldReadListEntry_QString_QChar(); - void oldReadEntry(); - void oldReadNumEntry(); - void oldReadDoubleEntry(); - void oldReadBoolEntry(); - void oldGlobalVersusLocal(); - void oldRemoveEntry(); -#endif - void testVariantTypes_data(); void testVariantTypes(); void rainersSyncBugOnMac_data(); void rainersSyncBugOnMac(); void recursionBug(); -#ifdef QT3_SUPPORT - void setPathBug(); -#endif void testByteArray_data(); void testByteArray(); @@ -2529,104 +2487,6 @@ void tst_QSettings::testEscapes() #endif } -void tst_QSettings::testCompatFunctions() -{ -#ifdef QT3_SUPPORT - QSettings settings1("software.org", "KillerAPP"); - - bool ok; - ok = settings1.writeEntry("/root/bool", true); - QVERIFY(ok); - ok = settings1.writeEntry("/root/double", 1.4); - QVERIFY(ok); - ok = settings1.writeEntry("/root/int", 66666); - QVERIFY(ok); - ok = settings1.writeEntry("/root/const char */1", "Hello"); - QVERIFY(ok); - ok = settings1.writeEntry("/root/const char */2", ""); - QVERIFY(ok); - ok = settings1.writeEntry("/root/const char */3", (const char *)0); - QVERIFY(ok); - ok = settings1.writeEntry("/root/QString/1", QString("Hello")); - QVERIFY(ok); - ok = settings1.writeEntry("/root/QString/2", QString("")); - QVERIFY(ok); - ok = settings1.writeEntry("/root/QString/3", QString()); - QVERIFY(ok); - ok = settings1.writeEntry("/root/QStringList/1", QStringList()); - QVERIFY(ok); - ok = settings1.writeEntry("/root/QStringList/2", QStringList() << ""); - QVERIFY(ok); - ok = settings1.writeEntry("/root/QStringList/3", QStringList() << "a" << "" << "b"); - QVERIFY(ok); - ok = settings1.writeEntry("/root/QStringList/4", QStringList() << "a" << "" << "b", ':'); - QVERIFY(ok); - - QCOMPARE(settings1.readBoolEntry("/root/bool"), true); - QCOMPARE(settings1.readDoubleEntry("/root/double"), 1.4); - QCOMPARE(settings1.readNumEntry("/root/int"), 66666); - QCOMPARE(settings1.readEntry("/root/const char */1"), QString("Hello")); - QCOMPARE(settings1.readEntry("/root/const char */2"), QString("")); - QCOMPARE(settings1.readEntry("/root/const char */3"), QString()); - QCOMPARE(settings1.readEntry("/root/QString/1"), QString("Hello")); - QCOMPARE(settings1.readEntry("/root/QString/2"), QString("")); - QCOMPARE(settings1.readEntry("/root/QString/3"), QString()); - QCOMPARE(settings1.readListEntry("/root/QStringList/1"), QStringList()); - QCOMPARE(settings1.readListEntry("/root/QStringList/2"), QStringList() << ""); - QCOMPARE(settings1.readListEntry("/root/QStringList/3"), QStringList() << "a" << "" << "b"); - QCOMPARE(settings1.readListEntry("/root/QStringList/4", ':'), QStringList() << "a" << "" << "b"); - QCOMPARE(settings1.readEntry("/root/QStringList/4"), QString("a::b")); - - QStringList actual, expectedSubKey, expectedEntry; - - settings1.clear(); - QStringList initialKeys = settings1.allKeys(); - settings1.setValue("/alpha/beta", 5); - settings1.setValue("/alpha/beta/gamma", 5); - settings1.setValue("/alpha/beta/delta", 5); - settings1.setValue("/alpha/epsilon/zeta/eta", 5); - settings1.setValue("/alpha/theta", 5); - - settings1.beginGroup("/alpha"); - QCOMPARE(settings1.group(), QString("alpha")); - - actual = settings1.entryList(""); - actual.sort(); - expectedEntry = QStringList() << "beta" << "theta"; - QCOMPARE(actual, expectedEntry); - - actual = settings1.subkeyList(""); - actual.sort(); - expectedSubKey = QStringList() << "beta" << "epsilon"; - QCOMPARE(actual, expectedSubKey); - - settings1.endGroup(); - - actual = settings1.entryList("alpha"); - actual.sort(); - QCOMPARE(actual, expectedEntry); - - actual = settings1.subkeyList("alpha"); - actual.sort(); - QCOMPARE(actual, expectedSubKey); - - actual = settings1.entryList(""); - QVERIFY(containsSubList(initialKeys, actual)); - - actual = settings1.subkeyList(""); - QVERIFY(actual.contains("alpha")); - - actual = settings1.subkeyList("foo/bar/baz"); - QVERIFY(actual.isEmpty()); - - actual = settings1.subkeyList("alpha/epsilon"); - expectedSubKey = QStringList() << "zeta"; - QCOMPARE(actual, expectedSubKey); -#else - QSKIP("Compiled without Qt3Support", SkipAll); -#endif -} - void tst_QSettings::testCaseSensitivity_data() { populateWithFormats(); @@ -2711,550 +2571,6 @@ void tst_QSettings::testCaseSensitivity() } } -#ifdef QT3_SUPPORT -void tst_QSettings::oldEntryList_data() -{ - oldWriteEntry_data(); -} - -void tst_QSettings::oldReadEntryIni_data() -{ - oldWriteEntry_data(); -} - -void tst_QSettings::oldWriteEntryIni_data() -{ - oldWriteEntry_data(); -} - -void tst_QSettings::oldReadEntry_data() -{ - oldWriteEntry_data(); -} - -void tst_QSettings::oldWriteEntry_data() -{ - // define the test elements we're going to use - QTest::addColumn<QString>("string"); - QTest::addColumn<QString>("empty"); - QTest::addColumn<QString>("unicode"); - QTest::addColumn<int>("integer"); - QTest::addColumn<bool>("boolean"); - QTest::addColumn<double>("floating"); - QTest::addColumn<QStringList>("list"); - - QStringList list0; - list0 << "elem1"; - list0 << "elem2"; - list0 << "elem3"; - list0 << "elem4"; - - QTest::newRow( "data0") << QString("blah") << QString("") << QString( QChar(0x0E12) ) << 99 << TRUE << 3.1415 << list0; - - QStringList list1; - list1 << " elem1"; - list1 << "elem2 "; - list1 << QString(); - list1 << ""; - list1 << "elem3"; - QTest::newRow( "data1") << QString("foo") << QString("") << QString( QChar(0xFEFC) ) << -150 << FALSE << 0.0 << list1; -} - -void tst_QSettings::oldWriteEntryHelper( QSettings &settings ) -{ - QFETCH( QString, string ); - QFETCH( QString, empty ); - QFETCH( QString, unicode ); - QFETCH( int, integer ); - QFETCH( bool, boolean ); - QFETCH( double, floating ); - QFETCH( QStringList, list ); - - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting", string ) ); - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting/String", string ) ); - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting/Empty", empty ) ); - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting/Unicode", unicode ) ); - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting/Integer", integer ) ); - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting/Boolean", boolean ) ); - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting/Floating", floating ) ); - QVERIFY( settings.writeEntry( "/Trolltech/QSettingsTesting/List", list ) ); -} - -void tst_QSettings::oldReadEntryHelper( QSettings &settings ) -{ - bool ok; - - QFETCH( QString, string ); - QFETCH( QString, empty ); - QFETCH( QString, unicode ); - QFETCH( int, integer ); - QFETCH( bool, boolean ); - QFETCH( double, floating ); - QFETCH( QStringList, list ); - - QCOMPARE( settings.readEntry( "/Trolltech/QSettingsTesting", QString::null, &ok ), string ); - QVERIFY( ok ); - QCOMPARE( settings.readEntry( "/Trolltech/QSettingsTesting/String", QString::null, &ok ), string ); - QVERIFY( ok ); - QCOMPARE( settings.readEntry( "/Trolltech/QSettingsTesting/Empty", QString::null, &ok ), empty ); - QVERIFY( ok ); - QCOMPARE( settings.readEntry( "/Trolltech/QSettingsTesting/Unicode", QString::null, &ok ), unicode ); - QVERIFY( ok ); - QCOMPARE( settings.readNumEntry( "/Trolltech/QSettingsTesting/Integer", 0, &ok ), integer ); - QVERIFY( ok ); - QCOMPARE( settings.readBoolEntry( "/Trolltech/QSettingsTesting/Boolean", 0, &ok ), boolean ); - QVERIFY( ok ); - QCOMPARE( settings.readDoubleEntry( "/Trolltech/QSettingsTesting/Floating", 0, &ok ), floating ); - QVERIFY( ok ); - QCOMPARE( settings.readListEntry( "/Trolltech/QSettingsTesting/List", &ok ), list ); - QVERIFY( ok ); - - settings.readListEntry( "/Trolltech/QSettingsTesting/NonExistingValue", &ok ); - QVERIFY( !ok ); -} - -void tst_QSettings::oldWriteEntryIni() -{ - QSettings settings(QSettings::IniFormat, QSettings::UserScope, "software.org", "KillerAPP"); - oldWriteEntryHelper(settings); -} - -void tst_QSettings::oldReadEntryIni() -{ - { - QSettings writeSettings(QSettings::IniFormat, QSettings::UserScope, "software.org", "KillerAPP"); - oldWriteEntryHelper( writeSettings ); - } - { - QSettings readSettings(QSettings::IniFormat, QSettings::UserScope, "software.org", "KillerAPP"); - oldReadEntryHelper( readSettings ); - } -} - - -void tst_QSettings::oldEndGroup_data() -{ - oldBeginGroup_data(); -} - -void tst_QSettings::oldResetGroup_data() -{ - oldBeginGroup_data(); -} - -void tst_QSettings::oldBeginGroup_data() -{ - // define the test elements we're going to use - QTest::addColumn<QString>("group"); - QTest::addColumn<QString>("value"); - - QTest::newRow( "data0") << QString("blah") << "value"; - QTest::newRow( "data1") << QString("") << "first/value"; - QTest::newRow( "data2") << QString("first/second") << "value"; - QTest::newRow( "data3") << QString("first/second/third") << "value"; - QTest::newRow( "data4") << QString("first/second/third") << "value"; -} - -void tst_QSettings::oldBeginGroup() -{ - bool ok; - - QFETCH( QString, group ); - QFETCH( QString, value ); - - QSettings settings("software.org", "KillerAPP"); - - QCOMPARE(settings.group(), QString()); - settings.beginGroup( group ); - QCOMPARE(settings.group(), group); - - QVERIFY( settings.writeEntry( "/" + value, value ) ); - QCOMPARE( settings.readEntry( "/" + value ), value ); - settings.endGroup(); - QCOMPARE( settings.readEntry( group + "/" + value, QString::null, &ok ), value ); - QVERIFY( ok ); -} - -void tst_QSettings::oldEndGroup() -{ - QFETCH( QString, group ); - - QSettings settings("software.org", "KillerAPP"); - QCOMPARE( settings.group(), QString() ); - - settings.beginGroup( group ); - settings.endGroup(); - QCOMPARE( settings.group(), QString() ); - - settings.beginGroup( group ); - settings.beginGroup( group ); - settings.endGroup(); - QCOMPARE( settings.group(), group ); - settings.endGroup(); - QCOMPARE( settings.group(), QString() ); - - QTest::ignoreMessage(QtWarningMsg, "QSettings::endGroup: No matching beginGroup()"); - settings.endGroup(); - QCOMPARE( settings.group(), QString() ); -} - -void tst_QSettings::oldResetGroup() -{ - QFETCH( QString, group ); - - QSettings settings("software.org", "KillerAPP"); - settings.beginGroup( group ); - - settings.resetGroup(); - QCOMPARE( settings.group(), QString() ); -} - -void tst_QSettings::oldEntryList() -{ - { - QSettings writeSettings("software.org", "KillerAPP"); - oldWriteEntryHelper( writeSettings ); - } - - QStringList entryKeys; - entryKeys << "String" << "Empty" << "Unicode" << "Integer" << "Boolean" << "Floating" << "List"; - - QSettings readSettings("software.org", "KillerAPP"); - QStringList entryList = readSettings.entryList( "/Trolltech/QSettingsTesting/" ); - entryKeys.sort(); - entryList.sort(); - QCOMPARE( entryKeys, entryList ); -} - -void tst_QSettings::oldWriteEntry_QString_bool_data() -{ - QTest::addColumn<bool>("b"); - QTest::newRow( "false" ) << bool(FALSE); - QTest::newRow( "true" ) << bool(TRUE); -} - -void tst_QSettings::oldWriteEntry_QString_bool() -{ - { - QSettings writeSettings("software.org", "KillerAPP"); - QFETCH( bool, b ); - QVERIFY( writeSettings.writeEntry( "/Trolltech/QSettingsTesting/Boolean", b ) ); - } - - { - QSettings readSettings("software.org", "KillerAPP"); - QFETCH( bool, b ); - bool ok = FALSE; - QCOMPARE( readSettings.readBoolEntry( "/Trolltech/QSettingsTesting/Boolean", 0, &ok ), b ); - QVERIFY( ok ); - } -} - -void tst_QSettings::oldWriteEntry_QString_double_data() -{ - QTest::addColumn<double>("f"); - QTest::newRow( "data0" ) << 3.1415; - QTest::newRow( "data1" ) << 0.0; - QTest::newRow( "data2" ) << 0.0000000000000000000000000001; -} - -void tst_QSettings::oldWriteEntry_QString_double() -{ - { - QSettings writeSettings("software.org", "KillerAPP"); - QFETCH( double, f ); - QVERIFY( writeSettings.writeEntry( "/Trolltech/QSettingsTesting/Floating", f ) ); - } - { - QSettings readSettings("software.org", "KillerAPP"); - QFETCH( double, f ); - bool ok = FALSE; - QCOMPARE( readSettings.readDoubleEntry( "/Trolltech/QSettingsTesting/Floating", 0, &ok ), f ); - QVERIFY( ok ); - } -} - -void tst_QSettings::oldWriteEntry_QString_int_data() -{ - QTest::addColumn<int>("i"); - QTest::newRow( "data0" ) << int(0); - QTest::newRow( "data1" ) << int(1); - QTest::newRow( "data2" ) << int(11); - QTest::newRow( "data3" ) << int(111); - QTest::newRow( "data4" ) << int(1111); - QTest::newRow( "data5" ) << int(11111); - QTest::newRow( "data6" ) << int(-1); - QTest::newRow( "data7" ) << int(-11); - QTest::newRow( "data8" ) << int(-111); - QTest::newRow( "data9" ) << int(-1111); - QTest::newRow( "data10" ) << int(-11111); -} - -void tst_QSettings::oldWriteEntry_QString_int() -{ - { - QSettings writeSettings("software.org", "KillerAPP"); - QFETCH( int, i ); - QVERIFY( writeSettings.writeEntry( "/Trolltech/QSettingsTesting/Integer", i ) ); - } - { - QSettings readSettings("software.org", "KillerAPP"); - QFETCH( int, i ); - bool ok = FALSE; - QCOMPARE( readSettings.readNumEntry( "/Trolltech/QSettingsTesting/Integer", 0, &ok ), i ); - QVERIFY( ok ); - } -} - -void tst_QSettings::oldWriteEntry_QString_QString_data() -{ - QTest::addColumn<QString>("s"); - QTest::newRow( "data0" ) << QString( "blah" ); - QTest::newRow( "data1" ) << QString( "" ); - QTest::newRow( "data2" ) << QString( QChar(0x0E12) ); // unicode - QTest::newRow( "data3" ) << QString("foo"); -// QTest::newRow( "data4" ) << QString::null; // nul string (not supported on Windows!) - QTest::newRow( "data5" ) << QString( QChar(0xFEFC) ); // more unicode - QTest::newRow( "data6" ) << QString( "This is s short string" ); - QTest::newRow( "data7" ) << QString( "This is a string with a cr\nand some text on the second line" ); - QTest::newRow( "data8" ) << QString( "\n" ); - QTest::newRow( "data9" ) << QString( "01234567890, abcdefghijklmnopqrestuvxyz, ABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^&*()_+=-[{]}\\|'\":;/?.>,<" ); -} - -void tst_QSettings::oldWriteEntry_QString_QString() -{ - { - QSettings writeSettings("software.org", "KillerAPP"); - QFETCH( QString, s ); - QVERIFY( writeSettings.writeEntry( "/Trolltech/QSettingsTesting/String", s ) ); - } - { - QSettings readSettings("software.org", "KillerAPP"); - QFETCH( QString, s ); - bool ok = FALSE; - QCOMPARE( readSettings.readEntry( "/Trolltech/QSettingsTesting/String", QString::null, &ok ), s ); - QVERIFY( ok ); - } -} - -void tst_QSettings::oldWriteEntry_QString_QStringList_data() -{ - QTest::addColumn<QStringList>("l"); - QStringList list0; - list0 << "elem1"; - list0 << "elem2"; - list0 << "elem3"; - list0 << "elem4"; - - QTest::newRow( "data0") << list0; - - QStringList list1; - list1 << " elem1"; - list1 << "elem2 "; - list1 << QString(); - list1 << ""; - list1 << "elem3"; - QTest::newRow( "data1") << list1; - - QStringList list2; - list2 << " elem1"; - list2 << "elem2 bla bla bla, yada yada, 01234567890, abcdefghijklmnopqrestuvxyz, ABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^&*()_+=-[{]}\\|'\":;/?.>,<"; - list1 << QString(); - list2 << "\n"; - list2 << "elem3\nand another line"; - QTest::newRow( "data2") << list2; -} - -void tst_QSettings::oldWriteEntry_QString_QStringList() -{ - { - QSettings writeSettings("software.org", "KillerAPP"); - QFETCH( QStringList, l ); - QVERIFY( writeSettings.writeEntry( "/Trolltech/QSettingsTesting/List", l ) ); - } - { - QSettings readSettings("software.org", "KillerAPP"); - QFETCH( QStringList, l ); - bool ok = FALSE; - QCOMPARE( readSettings.readListEntry( "/Trolltech/QSettingsTesting/List", &ok ), l ); - QVERIFY( ok ); - } -} - -void tst_QSettings::oldWriteEntry_QString_QStringList_QChar_data() -{ - QTest::addColumn<QStringList>("l"); - QTest::addColumn<QString>("sep"); - - QStringList list0; - list0 << "elem1"; - list0 << "elem2"; - list0 << "elem3"; - list0 << "elem4"; - - QTest::newRow( "data00") << list0 << "\\"; - QTest::newRow( "data01") << list0 << "/"; - QTest::newRow( "data02") << list0 << " "; - - QStringList list1; - list1 << " elem1"; - list1 << "elem2 "; - list1 << "elem3"; - QTest::newRow( "data10") << list1 << "\\"; - QTest::newRow( "data11") << list1 << "/"; - QTest::newRow( "data12") << list1 << "&"; - - QStringList list2; - list2 << " elem1"; - list2 << "elem2 bla bla bla, yada yada, 01234567890, abcdefghijklmnopqrestuvxyz, ABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^*()_+=-[{]}\\|/'\":;?.>,<"; - list2 << "\n"; - list2 << "elem3\nand another line"; - QTest::newRow( "data20") << list2 << "&"; - - // an empty stringlist should be stored as an empty string (and return an empty stringlist?) - QStringList list3; - QTest::newRow( "data30") << list3 << "/"; -} - -void tst_QSettings::oldWriteEntry_QString_QStringList_QChar() -{ - // edba: - // data10, data11, data12, data20, data21 and data22 currently fail. - // This is because the list DOES contain the separator which is a fail IMO, so i - // expect the writeEntry to return FALSE (but it doesn't). - // If my interpretation of the doc is wrong, then the separators should be deleted from - // data10 .. data22. - { - QSettings writeSettings("software.org", "KillerAPP"); - QFETCH( QStringList, l ); - QFETCH( QString, sep ); - QVERIFY( writeSettings.writeEntry( "/Trolltech/QSettingsTesting/List", l, QChar(sep[0]) ) ); - } - { - QSettings readSettings("software.org", "KillerAPP"); - QFETCH( QStringList, l ); - QFETCH( QString, sep ); - bool ok = FALSE; - QStringList actual; - actual = readSettings.readListEntry( "/Trolltech/QSettingsTesting/List", QChar(sep[0]), &ok ); - QVERIFY2( ok, "Read the stringlist from the settings" ); - QCOMPARE( actual, l ); - } -} - -void tst_QSettings::oldReadListEntry_QString() -{ - DEPENDS_ON( "writeEntry_QString_QStringList" ); -} - -void tst_QSettings::oldReadListEntry_QString_QChar() -{ - DEPENDS_ON( "writeEntry_QString_QStringList_QChar" ); -} - -void tst_QSettings::oldReadEntry() -{ - DEPENDS_ON( "writeEntry_QString_QString" ); -} - -void tst_QSettings::oldReadNumEntry() -{ - DEPENDS_ON( "writeEntry_QString_int" ); -} - -void tst_QSettings::oldReadDoubleEntry() -{ - DEPENDS_ON( "writeEntry_QString_double" ); -} - -void tst_QSettings::oldReadBoolEntry() -{ - DEPENDS_ON( "writeEntry_QString_bool" ); -} - -void tst_QSettings::oldRemoveEntry() -{ - // we'll use this one later - QSettings firstSettings("software.org", "KillerAPP"); - - // first write a key - { - QSettings writeSettings("software.org", "KillerAPP"); - writeSettings.writeEntry( "/Trolltech/QSettingsTesting/removeEntry", "foobar" ); - } - - // check that the key exists - { - QSettings readSettings("software.org", "KillerAPP"); - bool ok = FALSE; - QString foo = readSettings.readEntry( "/Trolltech/QSettingsTesting/removeEntry", QString::null, &ok ); - QVERIFY( ok ); - QVERIFY( foo == "foobar" ); - - // and remove it - QVERIFY( readSettings.removeEntry( "/Trolltech/QSettingsTesting/removeEntry") ); - - // check that it is gone - QString foo2 = readSettings.readEntry( "/Trolltech/QSettingsTesting/removeEntry", QString::null, &ok ); - QVERIFY( ok == FALSE ); - QVERIFY( foo2 == "" ); - } - - // Take another chance with a fresh instance - { - QSettings readSettings("software.org", "KillerAPP"); - bool ok = FALSE; - QString foo = readSettings.readEntry( "/Trolltech/QSettingsTesting/removeEntry", QString::null, &ok ); - QVERIFY( ok == FALSE ); - QVERIFY( foo == "" ); - } - - // and another chance with an instance that existed already - { - bool ok = FALSE; - QString foo = firstSettings.readEntry( "/Trolltech/QSettingsTesting/removeEntry", QString::null, &ok ); - QVERIFY( ok == FALSE ); - QVERIFY( foo == "" ); - } -} - -void tst_QSettings::oldGlobalVersusLocal() -{ - { //write global - QSettings settings("foo"); - settings.setPath("software.org", "KillerAPP", QSettings::Global); - settings.writeEntry("/vs/just_global/", "from Global"); - settings.writeEntry("/vs/local_and_global/", "from Global"); - } - { //write local - QSettings settings("bar"); - settings.setPath("software.org", "KillerAPP", QSettings::User); - settings.writeEntry("/vs/local_and_global/", "from User"); - } - bool ok; - { - QSettings settings("baz"); - settings.setPath("software.org", "KillerAPP", QSettings::User); - QString just_global = settings.readEntry("/vs/just_global/", "not_available", &ok); - QVERIFY(ok); - QCOMPARE(just_global, QString("from Global")); - QString local_and_global = settings.readEntry("/vs/local_and_global/", "not_available", &ok); - QVERIFY(ok); - QCOMPARE(local_and_global, QString("from User")); - } - { - QSettings settings("bat"); - settings.setPath("software.org", "KillerAPP", QSettings::Global); - QString just_global = settings.readEntry("/vs/just_global/", "not_available", &ok); - QVERIFY(ok); - QCOMPARE(just_global, QString("from Global")); - QString local_and_global = settings.readEntry("/vs/local_and_global/", "not_available", &ok); - QVERIFY(ok); - QCOMPARE(local_and_global, QString("from Global")); - } -} -#endif // QT3_SUPPORT - void tst_QSettings::fileName() { #ifdef Q_OS_MAC @@ -3792,19 +3108,6 @@ void tst_QSettings::recursionBug() } } -#ifdef QT3_SUPPORT -void tst_QSettings::setPathBug() -{ - QSettings settings("software.org", "KillerAPP", this); - settings.setPath("foo.org", "Bar", QSettings::User); - QVERIFY(settings.parent() == this); - settings.setValue("blah", "BAZ"); - settings.setPath("bar.org", "Baz", QSettings::User); - settings.setValue("blah", "BAZ"); - QVERIFY(settings.parent() == this); -} -#endif - #if defined(Q_OS_WIN) static DWORD readKeyType(HKEY handle, const QString &rSubKey) diff --git a/tests/auto/qsharedpointer/externaltests.cpp b/tests/auto/qsharedpointer/externaltests.cpp index 1ba03dced6..9999d9a9bc 100644 --- a/tests/auto/qsharedpointer/externaltests.cpp +++ b/tests/auto/qsharedpointer/externaltests.cpp @@ -50,6 +50,7 @@ #include <QtCore/QDir> #include <QtCore/QDirIterator> #include <QtCore/QDateTime> +#include <QtCore/QDebug> #ifdef Q_OS_SYMBIAN #define DEFAULT_MAKESPEC "X:/STLsupport/mkspecs/symbian-abld/" @@ -342,7 +343,8 @@ namespace QTest { void QExternalTestPrivate::removeTemporaryDirectory() { - Q_ASSERT(!temporaryDir.isEmpty()); + if (temporaryDir.isEmpty()) + qWarning() << "Temporary directory is expected to be non-empty"; removeRecursive(temporaryDir); temporaryDir.clear(); } @@ -369,8 +371,6 @@ namespace QTest { sourceCode += "#include <QtOpenGL/QtOpenGL>\n"; if (qtModules & QExternalTest::QtSql) sourceCode += "#include <QtSql/QtSql>\n"; - if (qtModules & QExternalTest::Qt3Support) - sourceCode += "#include <Qt3Support/Qt3Support>\n"; if (qtModules & QExternalTest::QtSvg) sourceCode += "#include <QtSvg/QtSvg>\n"; if (qtModules & QExternalTest::QtScript) @@ -487,7 +487,8 @@ namespace QTest { bool QExternalTestPrivate::createProjectFile() { - Q_ASSERT(!temporaryDir.isEmpty()); + if (temporaryDir.isEmpty()) + qWarning() << "Temporary directory is expected to be non-empty"; QFile projectFile(temporaryDir + QLatin1String("/project.pro")); if (!projectFile.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) { @@ -540,8 +541,6 @@ namespace QTest { projectFile.write("QT += opengl\n"); if (qtModules & QExternalTest::QtSql) projectFile.write("QT += sql\n"); - if (qtModules & QExternalTest::Qt3Support) - projectFile.write("QT += qt3support\n"); if (qtModules & QExternalTest::QtSvg) projectFile.write("QT += svg\n"); if (qtModules & QExternalTest::QtScript) @@ -599,7 +598,9 @@ namespace QTest { bool QExternalTestPrivate::runQmake() { - Q_ASSERT(!temporaryDir.isEmpty()); + if (temporaryDir.isEmpty()) + qWarning() << "Temporary directory is expected to be non-empty"; + if (!createProjectFile()) return false; @@ -633,7 +634,8 @@ namespace QTest { bool QExternalTestPrivate::runMake(Target target) { - Q_ASSERT(!temporaryDir.isEmpty()); + if (temporaryDir.isEmpty()) + qWarning() << "Temporary directory is expected to be non-empty"; QExternalProcess make; make.setWorkingDirectory(temporaryDir); diff --git a/tests/auto/qsharedpointer/externaltests.h b/tests/auto/qsharedpointer/externaltests.h index ca20cb0c30..1bf642abb6 100644 --- a/tests/auto/qsharedpointer/externaltests.h +++ b/tests/auto/qsharedpointer/externaltests.h @@ -72,13 +72,12 @@ namespace QTest { QtXmlPatterns=0x0010, QtOpenGL = 0x0020, QtSql = 0x0040, - Qt3Support = 0x0080, - QtSvg = 0x0100, - QtScript = 0x0200, - QtTest = 0x0400, - QtDBus = 0x0800, - QtWebKit = 0x1000, - Phonon = 0x2000 // odd man out + QtSvg = 0x0080, + QtScript = 0x0100, + QtTest = 0x0200, + QtDBus = 0x0400, + QtWebKit = 0x0800, + Phonon = 0x1000 // odd man out }; Q_DECLARE_FLAGS(QtModules, QtModule) diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp index bb04621b67..62502193b2 100644 --- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp +++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp @@ -139,7 +139,8 @@ public: virtual ~Data() { - Q_ASSERT_X(generation > 0, "tst_QSharedPointer", "Double deletion!"); + if (generation <= 0) + qFatal("tst_qsharedpointer: Double deletion!"); generation = 0; ++destructorCounter; } @@ -283,8 +284,8 @@ void tst_QSharedPointer::operators() QSharedPointer<char> p1; QSharedPointer<char> p2(new char); qptrdiff diff = p2.data() - p1.data(); - Q_ASSERT(p1.data() != p2.data()); - Q_ASSERT(diff != 0); + QVERIFY(p1.data() != p2.data()); + QVERIFY(diff != 0); // operator- QCOMPARE(p2 - p1.data(), diff); @@ -867,8 +868,8 @@ void tst_QSharedPointer::differentPointers() { DiffPtrDerivedData *aData = new DiffPtrDerivedData; Data *aBase = aData; - Q_ASSERT(aData == aBase); - Q_ASSERT(*reinterpret_cast<quintptr *>(&aData) != *reinterpret_cast<quintptr *>(&aBase)); + QVERIFY(aData == aBase); + QVERIFY(*reinterpret_cast<quintptr *>(&aData) != *reinterpret_cast<quintptr *>(&aBase)); QSharedPointer<Data> baseptr = QSharedPointer<Data>(aData); QSharedPointer<DiffPtrDerivedData> ptr = qSharedPointerCast<DiffPtrDerivedData>(baseptr); @@ -885,8 +886,8 @@ void tst_QSharedPointer::differentPointers() { DiffPtrDerivedData *aData = new DiffPtrDerivedData; Data *aBase = aData; - Q_ASSERT(aData == aBase); - Q_ASSERT(*reinterpret_cast<quintptr *>(&aData) != *reinterpret_cast<quintptr *>(&aBase)); + QVERIFY(aData == aBase); + QVERIFY(*reinterpret_cast<quintptr *>(&aData) != *reinterpret_cast<quintptr *>(&aBase)); QSharedPointer<DiffPtrDerivedData> ptr = QSharedPointer<DiffPtrDerivedData>(aData); QSharedPointer<Data> baseptr = ptr; @@ -908,8 +909,8 @@ void tst_QSharedPointer::virtualBaseDifferentPointers() { VirtualDerived *aData = new VirtualDerived; Data *aBase = aData; - Q_ASSERT(aData == aBase); - Q_ASSERT(*reinterpret_cast<quintptr *>(&aData) != *reinterpret_cast<quintptr *>(&aBase)); + QVERIFY(aData == aBase); + QVERIFY(*reinterpret_cast<quintptr *>(&aData) != *reinterpret_cast<quintptr *>(&aBase)); QSharedPointer<VirtualDerived> ptr = QSharedPointer<VirtualDerived>(aData); QSharedPointer<Data> baseptr = qSharedPointerCast<Data>(ptr); @@ -928,8 +929,8 @@ void tst_QSharedPointer::virtualBaseDifferentPointers() { VirtualDerived *aData = new VirtualDerived; Data *aBase = aData; - Q_ASSERT(aData == aBase); - Q_ASSERT(*reinterpret_cast<quintptr *>(&aData) != *reinterpret_cast<quintptr *>(&aBase)); + QVERIFY(aData == aBase); + QVERIFY(*reinterpret_cast<quintptr *>(&aData) != *reinterpret_cast<quintptr *>(&aBase)); QSharedPointer<VirtualDerived> ptr = QSharedPointer<VirtualDerived>(aData); QSharedPointer<Data> baseptr = ptr; @@ -1605,7 +1606,7 @@ void hashAndMapTest() QVERIFY(it != c.find(Key())); if (Ordered) { - Q_ASSERT(k0 < k1); + QVERIFY(k0 < k1); it = c.begin(); QCOMPARE(it.key(), k0); diff --git a/tests/auto/qsidebar/qsidebar.pro b/tests/auto/qsidebar/qsidebar.pro index 91a2137f2c..3ace4fe8a5 100644 --- a/tests/auto/qsidebar/qsidebar.pro +++ b/tests/auto/qsidebar/qsidebar.pro @@ -1,5 +1,6 @@ CONFIG += qttest_p4 +QT += core-private SOURCES += tst_qsidebar.cpp TARGET = tst_qsidebar diff --git a/tests/auto/qsocketnotifier/qsocketnotifier.pro b/tests/auto/qsocketnotifier/qsocketnotifier.pro index 27484c89f7..c0fdc6a9b3 100644 --- a/tests/auto/qsocketnotifier/qsocketnotifier.pro +++ b/tests/auto/qsocketnotifier/qsocketnotifier.pro @@ -1,6 +1,6 @@ load(qttest_p4) SOURCES += tst_qsocketnotifier.cpp -QT = core network +QT = core-private network-private requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp b/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp index f966e7fec0..2537a6cc26 100644 --- a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp +++ b/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp @@ -57,7 +57,7 @@ #include <private/qnet_unix_p.h> #endif #include <limits> -#include <select.h> +#include <sys/select.h> class tst_QSocketNotifier : public QObject { @@ -180,7 +180,7 @@ void tst_QSocketNotifier::unexpectedDisconnection() // we have to wait until sequence value changes // as any event can make us jump out processing QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents); - QVERIFY(timer.isActive); //escape if test would hang + QVERIFY(timer.isActive()); //escape if test would hang } while(tester.sequence <= 0); QVERIFY(readEnd1.state() == QAbstractSocket::ConnectedState); diff --git a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro index c82c62d3e8..3a144aeacf 100644 --- a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro +++ b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro @@ -7,7 +7,7 @@ include(../platformsocketengine/platformsocketengine.pri) MOC_DIR=tmp -QT = core network +QT = core-private network-private # Symbian toolchain does not support correct include semantics symbian:INCLUDEPATH+=..\\..\\..\\include\\QtNetwork\\private diff --git a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp index 8e7f39335c..3250c0e9f0 100644 --- a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp @@ -3193,7 +3193,7 @@ public: } protected: - bool filterAcceptsColumn(int column, const QModelIndex &source_parent) const + bool filterAcceptsColumn(int column, const QModelIndex & /* source_parent */) const { return column % 2 != 0; } diff --git a/tests/auto/qsplitter/tst_qsplitter.cpp b/tests/auto/qsplitter/tst_qsplitter.cpp index 0482661515..84db2c20a6 100644 --- a/tests/auto/qsplitter/tst_qsplitter.cpp +++ b/tests/auto/qsplitter/tst_qsplitter.cpp @@ -81,8 +81,6 @@ public slots: private slots: void getSetCheck(); void sizes(); // bare (as in empty) - void setSizes3(); - void setSizes3_data(); void setSizes(); void setSizes_data(); void saveAndRestoreState(); @@ -147,9 +145,6 @@ void tst_QSplitter::initTestCase() w2 = new QWidget; splitter->addWidget(w1); splitter->addWidget(w2); -#if defined(QT3_SUPPORT) - qApp->setMainWidget(splitter); -#endif } void tst_QSplitter::init() @@ -183,16 +178,13 @@ void tst_QSplitter::addThirdWidget() void tst_QSplitter::cleanupTestCase() { -#if defined(QT3_SUPPORT) - delete qApp->mainWidget(); -#endif } typedef QList<int> IntList; Q_DECLARE_METATYPE(IntList) -void tst_QSplitter::setSizes3() +void tst_QSplitter::setSizes() { QFETCH(IntList, minimumSizes); QFETCH(IntList, splitterSizes); @@ -212,7 +204,7 @@ void tst_QSplitter::setSizes3() QTEST(splitter->sizes(), "expectedSizes"); } -void tst_QSplitter::setSizes3_data() +void tst_QSplitter::setSizes_data() { QTest::addColumn<IntList>("minimumSizes"); QTest::addColumn<IntList>("splitterSizes"); @@ -255,653 +247,6 @@ void tst_QSplitter::setSizes3_data() } } -void tst_QSplitter::setSizes() -{ -#if !defined(QT3_SUPPORT) - QSKIP("No Qt3Support", SkipAll); -#else - QFETCH(int, minSize1); - QFETCH(int, minSize2); - QFETCH(int, splitterSize1); - QFETCH(int, splitterSize2); - QFETCH(bool, collapse1); - QFETCH(bool, collapse2); - QFETCH(bool, childrencollapse); - QFETCH(int, resizeMode1); - QFETCH(int, resizeMode2); - QList<int> mySizes; - mySizes << splitterSize1 << splitterSize2; - w1->setMinimumWidth(minSize1); - w2->setMinimumWidth(minSize2); - splitter->setCollapsible(w1, collapse1); - splitter->setCollapsible(w2, collapse2); - splitter->setChildrenCollapsible(childrencollapse); - splitter->setResizeMode(w1, (QSplitter::ResizeMode)resizeMode1); - splitter->setResizeMode(w2, (QSplitter::ResizeMode)resizeMode2); - splitter->setSizes(mySizes); - mySizes = splitter->sizes(); - QTEST(mySizes[0], "expected1"); - QTEST(mySizes[1], "expected2"); -#endif -} - -void tst_QSplitter::setSizes_data() -{ -#if defined(QT3_SUPPORT) - QTest::addColumn<int>("minSize1"); - QTest::addColumn<int>("minSize2"); - QTest::addColumn<int>("splitterSize1"); - QTest::addColumn<int>("splitterSize2"); - QTest::addColumn<int>("expected1"); - QTest::addColumn<int>("expected2"); - QTest::addColumn<bool>("collapse1"); - QTest::addColumn<bool>("collapse2"); - QTest::addColumn<bool>("childrencollapse"); - QTest::addColumn<int>("resizeMode1"); - QTest::addColumn<int>("resizeMode2"); - QTest::newRow("ok00") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok01") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok02") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok03") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok04") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok05") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok06") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok07") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok08") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok09") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok10") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Auto; - - QTest::newRow("ok20") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok21") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok22") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok23") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok24") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok25") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok26") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok27") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok28") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok29") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok30") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Auto; - QTest::newRow("ok40") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok41") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok42") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok43") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok44") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok45") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok46") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok47") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok48") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok49") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok50") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - - QTest::newRow("ok60") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok61") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok62") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok63") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok64") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok65") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok66") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok67") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok68") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok69") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - QTest::newRow("ok70") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Auto; - - QTest::newRow("ok80") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok81") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok82") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok83") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok84") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok85") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok86") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok87") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok88") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok89") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok90") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - - QTest::newRow("ok100") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok101") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok102") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok103") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok104") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok105") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok106") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok107") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok108") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok109") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - QTest::newRow("ok110") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::Stretch; - - QTest::newRow("ok120") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok121") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok122") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok123") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok124") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok125") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok126") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok127") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok128") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok129") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok130") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - - QTest::newRow("ok140") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok141") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok142") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok143") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok144") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok145") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok146") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok147") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok148") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok149") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok150") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Auto; - QTest::newRow("ok160") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok161") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok162") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok163") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok164") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok165") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok166") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok167") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok168") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok169") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok170") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok180") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok181") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok182") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok183") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok184") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok185") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok186") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok187") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok188") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok189") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok190") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Auto << (int)QSplitter::KeepSize; - QTest::newRow("ok200") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok201") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok202") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok203") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok204") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok205") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok206") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok207") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok208") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok209") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok210") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok220") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok221") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok222") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok223") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok224") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok225") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok226") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok227") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok228") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok229") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok230") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::Stretch; - QTest::newRow("ok240") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok241") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok242") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok243") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok244") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok245") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok246") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok247") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok248") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok249") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok250") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok260") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok261") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok262") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok263") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok264") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok265") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok266") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok267") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok268") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok269") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok270") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::Stretch << (int)QSplitter::KeepSize; - QTest::newRow("ok280") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok281") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok282") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok283") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok284") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok285") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok286") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok287") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok288") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok289") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok290") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok300") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok301") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok302") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok303") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok304") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok305") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok306") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok307") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok308") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok309") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok310") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::Stretch; - QTest::newRow("ok320") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok321") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok322") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok323") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok324") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok325") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok326") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok327") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok328") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok329") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok330") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)true - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok340") << 100 << 50 << 100 << 300 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok341") << 100 << 100 << 50 << 350 << 100 << 300 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok342") << 100 << 100 << 350 << 50 << 300 << 100 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok343") << 200 << 200 << 350 << 50 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok344") << 200 << 200 << 200 << 200 << 200 << 200 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok345") << 200 << 200 << 0 << 350 << 0 << 400 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok346") << 200 << 200 << 350 << 0 << 400 << 0 - << (bool)true << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok347") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)true << (bool)false << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok348") << 200 << 200 << 350 << 0 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok349") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)true << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; - QTest::newRow("ok350") << 200 << 200 << 0 << 350 << 200 << 200 - << (bool)false << (bool)false << (bool)false - << (int)QSplitter::KeepSize << (int)QSplitter::KeepSize; -#endif -} - void tst_QSplitter::saveAndRestoreState_data() { saveState_data(); @@ -1340,14 +685,14 @@ void tst_QSplitter::task187373_addAbstractScrollAreas() QFETCH(QString, className); QFETCH(bool, addInConstructor); QFETCH(bool, addOutsideConstructor); - Q_ASSERT(addInConstructor || addOutsideConstructor); + QVERIFY(addInConstructor || addOutsideConstructor); QSplitter *splitter = new QSplitter; splitter->show(); - Q_ASSERT(splitter->isVisible()); + QVERIFY(splitter->isVisible()); QAbstractScrollArea *w = task187373_createScrollArea(splitter, className, addInConstructor); - Q_ASSERT(w); + QVERIFY(w); if (addOutsideConstructor) splitter->addWidget(w); diff --git a/tests/auto/qsql/tst_qsql.cpp b/tests/auto/qsql/tst_qsql.cpp index c34f94cf43..7f3c63b510 100644 --- a/tests/auto/qsql/tst_qsql.cpp +++ b/tests/auto/qsql/tst_qsql.cpp @@ -45,9 +45,6 @@ #include <qsqldatabase.h> #include <qsqlerror.h> #include <qsqlquery.h> -#ifdef QT3_SUPPORT -#include <q3sqlcursor.h> -#endif #include <qsqlrecord.h> #include <qsql.h> #include <qsqlresult.h> @@ -143,53 +140,12 @@ void tst_QSql::basicDriverTest() continue; } - qDebug( qPrintable( QLatin1String( "Testing: " ) + tst_Databases::dbToString( db ) ) ); + qDebug("Testing: %s", qPrintable(tst_Databases::dbToString( db ))); QSqlRecord rInf = db.record( tableName ); QCOMPARE( rInf.count(), 2 ); QCOMPARE( rInf.fieldName( 0 ).toLower(), QString( "id" ) ); QCOMPARE( rInf.fieldName( 1 ).toLower(), QString( "name" ) ); - -#ifdef QT3_SUPPORT - QSqlRecord* rec = 0; - Q3SqlCursor cur( tableName, true, db ); - QVERIFY_SQL( cur, select() ); - QCOMPARE( cur.count(), 2 ); - QCOMPARE( cur.fieldName( 0 ).lower(), QString( "id" ) ); - QCOMPARE( cur.fieldName( 1 ).lower(), QString( "name" ) ); - - rec = cur.primeDelete(); - rec->setGenerated( 0, false ); - rec->setGenerated( 1, false ); - QVERIFY_SQL( cur, del() ); - QVERIFY_SQL( cur, select() ); - QCOMPARE( cur.at(), int( QSql::BeforeFirst ) ); - QVERIFY( !cur.next() ); - rec = cur.primeInsert(); - rec->setValue( 0, 1 ); - rec->setValue( 1, QString( "Harry" ) ); - QVERIFY_SQL( cur, insert( false ) ); - rec = cur.primeInsert(); - rec->setValue( 0, 2 ); - rec->setValue( 1, QString( "Trond" ) ); - QVERIFY_SQL( cur, insert( true ) ); - QVERIFY_SQL( cur, select( cur.index( QString( "id" ) ) ) ); - QVERIFY_SQL( cur, next() ); - QCOMPARE( cur.value( 0 ).toInt(), 1 ); - QCOMPARE( cur.value( 1 ).toString().stripWhiteSpace(), QString( "Harry" ) ); - QVERIFY_SQL( cur, next() ); - QCOMPARE( cur.value( 0 ).toInt(), 2 ); - QCOMPARE( cur.value( 1 ).toString().stripWhiteSpace(), QString( "Trond" ) ); - QVERIFY( !cur.next() ); - QVERIFY_SQL( cur, first() ); - rec = cur.primeUpdate(); - rec->setValue( 1, QString( "Vohi" ) ); - QVERIFY_SQL( cur, update( true ) ); - QVERIFY_SQL( cur, select( "id = 1" ) ); - QVERIFY_SQL( cur, next() ); - QCOMPARE( cur.value( 0 ).toInt(), 1 ); - QCOMPARE( cur.value( 1 ).toString().stripWhiteSpace(), QString( "Vohi" ) ); -#endif } dbs.close(); @@ -274,8 +230,8 @@ void tst_QSql::openErrorRecovery() // force an open error if ( db.open( "dummy130977", "doesnt_exist" ) ) { - qDebug( qPrintable(QLatin1String("Promiscuous database server without access control - test skipped for ") + - tst_Databases::dbToString( db )) ); + qDebug("Promiscuous database server without access control - test skipped for %s", + qPrintable(tst_Databases::dbToString( db )) ); QVERIFY(1); continue; } diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp index 4462659502..96ea3d95d7 100644 --- a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp +++ b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp @@ -44,11 +44,6 @@ #include <qsqldatabase.h> #include <qsqlquery.h> #include <qsqldriver.h> -#ifdef QT3_SUPPORT -#include <q3sqlcursor.h> -#include <q3sqlrecordinfo.h> -#include <q3cstring.h> -#endif #include <qsqlrecord.h> #include <qsqlfield.h> #include <qsqlindex.h> @@ -130,8 +125,6 @@ private slots: //problem specific tests void alterTable_data() { generic_data(); } void alterTable(); - void recordNonSelect_data() { generic_data(); } - void recordNonSelect(); void caseSensivity_data() { generic_data(); } void caseSensivity(); void noEscapedFieldNamesInRecord_data() { generic_data(); } @@ -211,20 +204,14 @@ private: void populateTestTables(QSqlDatabase db); void generic_data(const QString &engine=QString()); -#ifdef QT3_SUPPORT - void testRecordInfo(const FieldDef fieldDefs[], const Q3SqlRecordInfo& inf); -#endif void testRecord(const FieldDef fieldDefs[], const QSqlRecord& inf, QSqlDatabase db); void commonFieldTest(const FieldDef fieldDefs[], QSqlDatabase, const int); - void checkValues(const FieldDef fieldDefs[], QSqlDatabase db); - void checkNullValues(const FieldDef fieldDefs[], QSqlDatabase db); tst_Databases dbs; }; // number of records to be inserted per testfunction static const int ITERATION_COUNT = 2; -static int pkey = 1; //helper class for database specific tests struct FieldDef { @@ -238,11 +225,7 @@ struct FieldDef { { QString rt = typeName; rt.replace(QRegExp("\\s"), QString("_")); -#ifdef QT3_SUPPORT - int i = rt.find("("); -#else int i = rt.indexOf("("); -#endif if (i == -1) i = rt.length(); if (i > 20) @@ -482,31 +465,6 @@ void tst_QSqlDatabase::open() } } -void tst_QSqlDatabase::recordNonSelect() -{ -#ifdef QT3_SUPPORT - QFETCH(QString, dbName); - QSqlDatabase db = QSqlDatabase::database(dbName); - CHECK_DATABASE(db); - - QSqlQuery q(db); - - // nothing should happen on an empty query - QSqlRecord rec = db.record(q); - QVERIFY(rec.isEmpty()); - Q3SqlRecordInfo rInf = db.recordInfo(q); - QVERIFY(rInf.isEmpty()); - - QVERIFY_SQL(q, exec("create table " + qTableName("qtest_temp", __FILE__) + " (id int)")); - - // query without result set should return empty record - rec = db.record(q); - QVERIFY(rec.isEmpty()); - rInf = db.recordInfo(q); - QVERIFY(rInf.isEmpty()); -#endif -} - void tst_QSqlDatabase::tables() { QFETCH(QString, dbName); @@ -524,8 +482,9 @@ void tst_QSqlDatabase::tables() if (!q.exec("CREATE VIEW " + qtest_view + " as select * from " + qtest)) { - qDebug(QString("DBMS '%1' cannot handle VIEWs: %2").arg( - tst_Databases::dbToString(db)).arg(QString(tst_Databases::printError(q.lastError()))).toLatin1()); + qDebug("DBMS '%s' cannot handle VIEWs: %s", + qPrintable(tst_Databases::dbToString(db)), + qPrintable(tst_Databases::printError(q.lastError()))); views = false; } @@ -612,18 +571,10 @@ void tst_QSqlDatabase::alterTable() QVERIFY_SQL(q, exec("create table " + qtestalter + " (F1 char(20), F2 char(20), F3 char(20))")); QSqlRecord rec = db.record(qtestalter); QCOMPARE((int)rec.count(), 3); -#ifdef QT3_SUPPORT - Q3SqlRecordInfo rinf = db.recordInfo(qtestalter); - QCOMPARE((int)rinf.count(), 3); -#endif - int i; for (i = 0; i < 3; ++i) { QCOMPARE(rec.field(i).name().toUpper(), QString("F%1").arg(i + 1)); -#ifdef QT3_SUPPORT - QCOMPARE(rinf[ i ].name().upper(), QString("F%1").arg(i + 1)); -#endif } if (!q.exec("alter table " + qtestalter + " drop column F2")) { @@ -631,36 +582,13 @@ void tst_QSqlDatabase::alterTable() } rec = db.record(qtestalter); -#ifdef QT3_SUPPORT - rinf = db.recordInfo(qtestalter); -#endif QCOMPARE((int)rec.count(), 2); -#ifdef QT3_SUPPORT - QCOMPARE((int)rinf.count(), 2); -#endif QCOMPARE(rec.field(0).name().toUpper(), QString("F1")); QCOMPARE(rec.field(1).name().toUpper(), QString("F3")); -#ifdef QT3_SUPPORT - QCOMPARE(rinf[ 0 ].name().upper(), QString("F1")); - QCOMPARE(rinf[ 1 ].name().upper(), QString("F3")); -#endif q.exec("select * from " + qtestalter); - -#ifdef QT3_SUPPORT - rec = db.record(q); - rinf = db.recordInfo(q); - - QCOMPARE((int)rec.count(), 2); - QCOMPARE((int)rinf.count(), 2); - - QCOMPARE(rec.field(0).name().upper(), QString("F1")); - QCOMPARE(rec.field(1).name().upper(), QString("F3")); - QCOMPARE(rinf[ 0 ].name().upper(), QString("F1")); - QCOMPARE(rinf[ 1 ].name().upper(), QString("F3")); -#endif } #if 0 @@ -684,27 +612,7 @@ void tst_QSqlDatabase::record() const int fieldCount = createFieldTable(fieldDefs, db); QVERIFY(fieldCount > 0); -// doesn't work with oracle: checkNullValues(fieldDefs, db); commonFieldTest(fieldDefs, db, fieldCount); - for (int i = 0; i < ITERATION_COUNT; ++i) { - checkValues(fieldDefs, db); - } -} -#endif - -#ifdef QT3_SUPPORT -void tst_QSqlDatabase::testRecordInfo(const FieldDef fieldDefs[], const Q3SqlRecordInfo& inf) -{ - int i = 0; - for (i = 0; !fieldDefs[ i ].typeName.isNull(); ++i) { - QCOMPARE(inf[i+1].name().upper(), fieldDefs[ i ].fieldName().upper()); - if (inf[i+1].type() != fieldDefs[ i ].type) { - QFAIL(QString(" Expected: '%1' Received: '%2' for field %3 in testRecordInfo").arg( - QVariant::typeToName(fieldDefs[ i ].type)).arg( - QVariant::typeToName(inf[i+1].type())).arg( - fieldDefs[ i ].fieldName())); - } - } } #endif @@ -732,126 +640,12 @@ void tst_QSqlDatabase::commonFieldTest(const FieldDef fieldDefs[], QSqlDatabase { CHECK_DATABASE(db); - // check whether recordInfo returns the right types -#ifdef QT3_SUPPORT - Q3SqlRecordInfo inf = db.recordInfo(qTableName("qtestfields", __FILE__)); - QCOMPARE((int)inf.count(), fieldCount+1); - testRecordInfo(fieldDefs, inf); -#endif - QSqlRecord rec = db.record(qTableName("qtestfields", __FILE__)); QCOMPARE((int)rec.count(), fieldCount+1); testRecord(fieldDefs, rec, db); QSqlQuery q(db); QVERIFY_SQL(q, exec("select * from " + qTableName("qtestfields", __FILE__))); - -#ifdef QT3_SUPPORT - inf = db.recordInfo(q); - QCOMPARE((int)inf.count(), fieldCount+1); - testRecordInfo(fieldDefs, inf); - - rec = db.record(q); - QCOMPARE((int)rec.count(), fieldCount+1); - testRecord(fieldDefs, rec, db); -#endif -} - -// inserts testdata into the testtable, fetches and compares them -void tst_QSqlDatabase::checkValues(const FieldDef fieldDefs[], QSqlDatabase db) -{ - Q_UNUSED(fieldDefs); -#ifdef QT3_SUPPORT - CHECK_DATABASE(db); - - Q3SqlCursor cur(qTableName("qtestfields", __FILE__), true, db); - QVERIFY_SQL(cur, select()); - QSqlRecord* rec = cur.primeInsert(); - Q_ASSERT(rec); - rec->setValue("id", pkey++); - int i = 0; - for (i = 0; !fieldDefs[ i ].typeName.isNull(); ++i) { - rec->setValue(fieldDefs[ i ].fieldName(), fieldDefs[ i ].val); -// qDebug(QString("inserting %1 into %2").arg(fieldDefs[ i ].val.toString()).arg(fieldDefs[ i ].fieldName())); - } - QVERIFY_SQL(cur, insert()); - cur.setForwardOnly(true); - QVERIFY_SQL(cur, select("id = " + QString::number(pkey - 1))); - QVERIFY_SQL(cur, next()); - - for (i = 0; !fieldDefs[ i ].typeName.isNull(); ++i) { - bool ok = false; - QVariant val1 = cur.value(fieldDefs[ i ].fieldName()); - QVariant val2 = fieldDefs[ i ].val; - if (val1.type() == QVariant::String) - //TDS Workaround - val1 = val1.toString().stripWhiteSpace(); - if (fieldDefs[ i ].fieldName() == "t_real") { - // strip precision - val1 = (float)val1.toDouble(); - val2 = (float)val2.toDouble(); - } - if (val1.canCast(QVariant::Double) && val2.type() == QVariant::Double) { - // we don't care about precision here, we just want to know whether - // we can insert/fetch the right values - ok = (val1.toDouble() - val2.toDouble() < 0.00001); - } else if (val1.type() == val2.type()) { - ok = (val1 == val2); - } else { - ok = (val1.toString() == val2.toString()); - } - if (!ok) { - if (val2.type() == QVariant::DateTime || val2.type() == QVariant::Time) - qDebug("Expected Time: " + val2.toTime().toString("hh:mm:ss.zzz")); - if (val1.type() == QVariant::DateTime || val1.type() == QVariant::Time) - qDebug("Received Time: " + val1.toTime().toString("hh:mm:ss.zzz")); - QFAIL(QString(" Expected: '%1' Received: '%2' for field %3 (etype %4 rtype %5) in checkValues").arg( - val2.type() == QVariant::ByteArray ? val2.toByteArray().toHex() : val2.toString()).arg( - val1.type() == QVariant::ByteArray ? val1.toByteArray().toHex() : val1.toString()).arg( - fieldDefs[ i ].fieldName()).arg( - val2.typeName()).arg( - val1.typeName()) - ); - } - } -#endif -} - -// inserts a NULL value for each nullable field in testdata, fetches and checks whether -// we get back NULL -void tst_QSqlDatabase::checkNullValues(const FieldDef fieldDefs[], QSqlDatabase db) -{ - Q_UNUSED(fieldDefs); -#ifdef QT3_SUPPORT - CHECK_DATABASE(db); - - Q3SqlCursor cur(qTableName("qtestfields", __FILE__), true, db); - QVERIFY_SQL(cur, select()); - QSqlRecord* rec = cur.primeInsert(); - Q_ASSERT(rec); - rec->setValue("id", pkey++); - int i = 0; - for (i = 0; !fieldDefs[ i ].typeName.isNull(); ++i) { - if (fieldDefs[ i ].fieldName(), fieldDefs[ i ].nullable) - rec->setNull(fieldDefs[ i ].fieldName()); - else - rec->setValue(fieldDefs[ i ].fieldName(), fieldDefs[ i ].val); - } - QVERIFY_SQL(cur, insert()); - cur.setForwardOnly(true); - QVERIFY_SQL(cur, select("id = " + QString::number(pkey - 1))); - QVERIFY_SQL(cur, next()); - - for (i = 0; !fieldDefs[ i ].typeName.isNull(); ++i) { - if (fieldDefs[ i ].nullable == false) - continue; - // multiple inheritance sucks so much - QVERIFY2(((QSqlQuery)cur).isNull(i + 1), "Check whether '" + fieldDefs[ i ].fieldName() + "' is null in QSqlQuery"); - QVERIFY2(((QSqlRecord)cur).isNull(fieldDefs[ i ].fieldName()), "Check whether '" + fieldDefs[ i ].fieldName() + "' is null in QSqlRecord"); - if (!cur.value(fieldDefs[ i ].fieldName()).isNull()) - qDebug(QString("QVariant is not null for NULL-Value in Field '%1'").arg(fieldDefs[ i ].fieldName())); - } -#endif } void tst_QSqlDatabase::recordTDS() @@ -880,11 +674,6 @@ void tst_QSqlDatabase::recordTDS() FieldDef("nchar(20)", QVariant::String, "blah3"), FieldDef("nvarchar(20)", QVariant::String, "blah4"), FieldDef("text", QVariant::String, "blah5"), -#ifdef QT3_SUPPORT - FieldDef("binary(20)", QVariant::ByteArray, Q3CString("blah6")), - FieldDef("varbinary(20)", QVariant::ByteArray, Q3CString("blah7")), - FieldDef("image", QVariant::ByteArray, Q3CString("blah8")), -#endif FieldDef("bit", QVariant::Int, 1, false), FieldDef() @@ -894,10 +683,6 @@ void tst_QSqlDatabase::recordTDS() QVERIFY(fieldCount > 0); commonFieldTest(fieldDefs, db, fieldCount); - checkNullValues(fieldDefs, db); - for (int i = 0; i < ITERATION_COUNT; ++i) { - checkValues(fieldDefs, db); - } } void tst_QSqlDatabase::recordOCI() @@ -954,9 +739,6 @@ void tst_QSqlDatabase::recordOCI() QVERIFY(fieldCount > 0); commonFieldTest(fieldDefs, db, fieldCount); - checkNullValues(fieldDefs, db); - for (int i = 0; i < ITERATION_COUNT; ++i) - checkValues(fieldDefs, db); // some additional tests QSqlRecord rec = db.record(qTableName("qtestfields", __FILE__)); @@ -978,18 +760,11 @@ void tst_QSqlDatabase::recordPSQL() FieldDef byteadef; if (db.driver()->hasFeature(QSqlDriver::BLOB)) -#ifdef QT3_SUPPORT - byteadef = FieldDef("bytea", QVariant::ByteArray, QByteArray(Q3CString("bl\\ah"))); -#else byteadef = FieldDef("bytea", QVariant::ByteArray, QByteArray("bl\\ah")); -#endif static FieldDef fieldDefs[] = { FieldDef("bigint", QVariant::LongLong, Q_INT64_C(9223372036854775807)), FieldDef("bigserial", QVariant::LongLong, 100, false), FieldDef("bit", QVariant::String, "1"), // a bit in postgres is a bit-string -#ifdef QT3_SUPPORT - FieldDef("boolean", QVariant::Bool, QVariant(bool(true), 0)), -#endif FieldDef("box", QVariant::String, "(5,6),(1,2)"), FieldDef("char(20)", QVariant::String, "blah5678901234567890"), FieldDef("varchar(20)", QVariant::String, "blah5678901234567890"), @@ -1038,7 +813,6 @@ void tst_QSqlDatabase::recordPSQL() QVERIFY(fieldCount > 0); commonFieldTest(fieldDefs, db, fieldCount); - checkNullValues(fieldDefs, db); for (int i = 0; i < ITERATION_COUNT; ++i) { // increase serial values for (int i2 = 0; !fieldDefs[ i2 ].typeName.isNull(); ++i2) { @@ -1046,15 +820,10 @@ void tst_QSqlDatabase::recordPSQL() fieldDefs[ i2 ].typeName == "bigserial") { FieldDef def = fieldDefs[ i2 ]; -#ifdef QT3_SUPPORT - def.val = def.val.asInt() + 1; -#else def.val = def.val.toInt() + 1; -#endif fieldDefs[ i2 ] = def; } } - checkValues(fieldDefs, db); } } @@ -1076,13 +845,8 @@ void tst_QSqlDatabase::recordMySQL() with space on insert, and trailing spaces are removed on select. */ if( vernum >= ((5 << 16) + 15) ) { -#ifdef QT3_SUPPORT - bin10 = FieldDef("binary(10)", QVariant::ByteArray, QByteArray(Q3CString("123abc "))); - varbin10 = FieldDef("varbinary(10)", QVariant::ByteArray, QByteArray(Q3CString("123abcv "))); -#else bin10 = FieldDef("binary(10)", QVariant::ByteArray, QString("123abc ")); varbin10 = FieldDef("varbinary(10)", QVariant::ByteArray, QString("123abcv ")); -#endif } static QDateTime dt(QDate::currentDate(), QTime(1, 2, 3, 0)); @@ -1108,20 +872,10 @@ void tst_QSqlDatabase::recordMySQL() FieldDef("year", QVariant::Int, 2003), FieldDef("char(20)", QVariant::String, "Blah"), FieldDef("varchar(20)", QVariant::String, "BlahBlah"), -#ifdef QT3_SUPPORT - FieldDef("tinyblob", QVariant::ByteArray, QByteArray(Q3CString("blah1"))), - FieldDef("blob", QVariant::ByteArray, QByteArray(Q3CString("blah2"))), - FieldDef("mediumblob", QVariant::ByteArray,QByteArray(Q3CString("blah3"))), - FieldDef("longblob", QVariant::ByteArray, QByteArray(Q3CString("blah4"))), -#endif FieldDef("tinytext", QVariant::String, QString("blah5")), FieldDef("text", QVariant::String, QString("blah6")), FieldDef("mediumtext", QVariant::String, QString("blah7")), FieldDef("longtext", QVariant::String, QString("blah8")), -#ifdef QT3_SUPPORT - bin10, - varbin10, -#endif // SET OF? FieldDef() @@ -1131,10 +885,6 @@ void tst_QSqlDatabase::recordMySQL() QVERIFY(fieldCount > 0); commonFieldTest(fieldDefs, db, fieldCount); - checkNullValues(fieldDefs, db); - for (int i = 0; i < ITERATION_COUNT; ++i) { - checkValues(fieldDefs, db); - } QSqlQuery q(db); QVERIFY_SQL(q, exec("SELECT DATE_SUB(CURDATE(), INTERVAL 2 DAY)")); @@ -1168,11 +918,6 @@ void tst_QSqlDatabase::recordDB2() // FieldDef("graphic(20)", QVariant::String, QString("Blah4")), // FieldDef("vargraphic(20)", QVariant::String, QString("Blah5")), // FieldDef("long vargraphic", QVariant::String, QString("Blah6")), -#ifdef QT3_SUPPORT -// FieldDef("clob(20)", QVariant::CString, QString("Blah7")), -// FieldDef("dbclob(20)", QVariant::CString, QString("Blah8")), -// FieldDef("blob(20)", QVariant::ByteArray, QByteArray(Q3CString("Blah9"))), -#endif //X FieldDef("datalink", QVariant::String, QString("DLVALUE('Blah10')")), FieldDef() }; @@ -1181,10 +926,6 @@ void tst_QSqlDatabase::recordDB2() QVERIFY(fieldCount > 0); commonFieldTest(fieldDefs, db, fieldCount); - checkNullValues(fieldDefs, db); - for (int i = 0; i < ITERATION_COUNT; ++i) { - checkValues(fieldDefs, db); - } } void tst_QSqlDatabase::recordIBase() @@ -1211,10 +952,6 @@ void tst_QSqlDatabase::recordIBase() QVERIFY(fieldCount > 0); commonFieldTest(fieldDefs, db, fieldCount); - checkNullValues(fieldDefs, db); - for (int i = 0; i < ITERATION_COUNT; ++i) { - checkValues(fieldDefs, db); - } } void tst_QSqlDatabase::recordSQLite() @@ -1241,10 +978,6 @@ void tst_QSqlDatabase::recordSQLite() QVERIFY(fieldCount > 0); commonFieldTest(fieldDefs, db, fieldCount); - checkNullValues(fieldDefs, db); - for (int i = 0; i < ITERATION_COUNT; ++i) { - checkValues(fieldDefs, db); - } } void tst_QSqlDatabase::recordSQLServer() @@ -1264,9 +997,6 @@ void tst_QSqlDatabase::recordSQLServer() FieldDef("bigint", QVariant::LongLong, 12345), FieldDef("int", QVariant::Int, 123456), FieldDef("tinyint", QVariant::UInt, 255), -#ifdef QT3_SUPPORT - FieldDef("image", QVariant::ByteArray, Q3CString("Blah1")), -#endif FieldDef("float", QVariant::Double, 1.12345), FieldDef("numeric(5,2)", QVariant::Double, 123.45), FieldDef("uniqueidentifier", QVariant::String, @@ -1279,10 +1009,6 @@ void tst_QSqlDatabase::recordSQLServer() QVERIFY(fieldCount > 0); commonFieldTest(fieldDefs, db, fieldCount); - checkNullValues(fieldDefs, db); - for (int i = 0; i < ITERATION_COUNT; ++i) { - checkValues(fieldDefs, db); - } } void tst_QSqlDatabase::recordAccess() @@ -1306,9 +1032,6 @@ void tst_QSqlDatabase::recordAccess() FieldDef("single", QVariant::Double, 1.12345), FieldDef("double", QVariant::Double, 1.123456), FieldDef("byte", QVariant::UInt, 255), -#ifdef QT3_SUPPORT - FieldDef("binary(5)", QVariant::ByteArray, Q3CString("Blah2")), -#endif FieldDef("long", QVariant::Int, 2147483647), FieldDef("memo", QVariant::String, memo), FieldDef() @@ -1318,10 +1041,6 @@ void tst_QSqlDatabase::recordAccess() QVERIFY(fieldCount > 0); commonFieldTest(fieldDefs, db, fieldCount); - checkNullValues(fieldDefs, db); - for (int i = 0; i < ITERATION_COUNT; ++i) { - checkValues(fieldDefs, db); - } } void tst_QSqlDatabase::transaction() @@ -1361,7 +1080,7 @@ void tst_QSqlDatabase::transaction() q.clear(); // for SQLite which does not allow any references on rows that shall be rolled back if (!db.rollback()) { if (db.driverName().startsWith("QMYSQL")) { - qDebug("MySQL: " + tst_Databases::printError(db.lastError())); + qDebug("MySQL: %s", qPrintable(tst_Databases::printError(db.lastError()))); QSKIP("MySQL transaction failed ", SkipSingle); //non-fatal } else { QFAIL("Could not rollback transaction: " + tst_Databases::printError(db.lastError())); @@ -1462,17 +1181,6 @@ void tst_QSqlDatabase::caseSensivity() QVERIFY((int)rec.count() > 0); } -#ifdef QT3_SUPPORT - Q3SqlRecordInfo rInf = db.recordInfo(qTableName("qtest", __FILE__)); - QVERIFY((int)rInf.count() > 0); - if (!cs) { - rInf = db.recordInfo(qTableName("QTEST", __FILE__).upper()); - QVERIFY((int)rInf.count() > 0); - rInf = db.recordInfo(qTableName("qTesT", __FILE__)); - QVERIFY((int)rInf.count() > 0); - } -#endif - rec = db.primaryIndex(qTableName("qtest", __FILE__)); QVERIFY((int)rec.count() > 0); if (!cs) { @@ -1526,12 +1234,6 @@ void tst_QSqlDatabase::psql_schemas() QCOMPARE(rec.fieldName(0), QString("id")); QCOMPARE(rec.fieldName(1), QString("name")); -#ifdef QT3_SUPPORT - rec = db.record(QSqlQuery("select * from " + table, db)); - QCOMPARE(rec.count(), 2); - QCOMPARE(rec.fieldName(0), QString("id")); - QCOMPARE(rec.fieldName(1), QString("name")); -#endif QSqlIndex idx = db.primaryIndex(table); QCOMPARE(idx.count(), 1); QCOMPARE(idx.fieldName(0), QString("id")); @@ -2159,7 +1861,7 @@ void tst_QSqlDatabase::oci_serverDetach() } } if(!db.open()) - qFatal(tst_Databases::printError(db.lastError(), db)); + qFatal("%s", qPrintable(tst_Databases::printError(db.lastError(), db))); } void tst_QSqlDatabase::oci_xmltypeSupport() diff --git a/tests/auto/qsqlquery/tst_qsqlquery.cpp b/tests/auto/qsqlquery/tst_qsqlquery.cpp index be2087dfc8..eb7ae9184e 100644 --- a/tests/auto/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/qsqlquery/tst_qsqlquery.cpp @@ -1558,7 +1558,7 @@ void tst_QSqlQuery::transaction() if ( !q.exec( "rollback" ) ) { if ( db.driverName().startsWith( "QMYSQL" ) ) { - qDebug( "MySQL: " + tst_Databases::printError( q.lastError() ) ); + qDebug( "MySQL: %s", qPrintable(tst_Databases::printError( q.lastError() ) )); QSKIP( "MySQL transaction failed ", SkipSingle ); //non-fatal } else QFAIL( "Could not rollback transaction: " + tst_Databases::printError( q.lastError() ) ); @@ -1578,8 +1578,8 @@ void tst_QSqlQuery::transaction() QVERIFY_SQL( q2, exec( "select * from" + qtest + " where id = 42" ) ); if ( q2.next() ) - qDebug( QString( "DBMS '%1' doesn't support query based transactions with concurrent access" ).arg( - tst_Databases::dbToString( db ) ).toLatin1() ); + qDebug("DBMS '%s' doesn't support query based transactions with concurrent access", + qPrintable(tst_Databases::dbToString( db ))); QVERIFY_SQL( q, exec( "commit" ) ); diff --git a/tests/auto/qsqlrecord/tst_qsqlrecord.cpp b/tests/auto/qsqlrecord/tst_qsqlrecord.cpp index 431dfbf3fe..41c4e3b1cf 100644 --- a/tests/auto/qsqlrecord/tst_qsqlrecord.cpp +++ b/tests/auto/qsqlrecord/tst_qsqlrecord.cpp @@ -70,12 +70,6 @@ public slots: void cleanup(); private slots: void value(); -#ifdef QT3_SUPPORT - void toStringList_data(); - void toStringList(); - void toString_data(); - void toString(); -#endif // QT3_SUPPORT void setValue_data(); void setValue(); void setNull(); @@ -166,12 +160,6 @@ void tst_QSqlRecord::append() QCOMPARE( rec->indexOf( "int" ), 1 ); QCOMPARE( rec->indexOf( "double" ), 2 ); QCOMPARE( rec->indexOf( "bool" ), 3 ); -#ifdef QT3_SUPPORT - QCOMPARE( rec->position( "string" ), 0 ); - QCOMPARE( rec->position( "int" ), 1 ); - QCOMPARE( rec->position( "double" ), 2 ); - QCOMPARE( rec->position( "bool" ), 3 ); -#endif } void tst_QSqlRecord::clear() @@ -181,10 +169,6 @@ void tst_QSqlRecord::clear() rec->clear(); QCOMPARE( (int)rec->count(), 0 ); QVERIFY( rec->isEmpty() ); -#ifdef QT3_SUPPORT - QVERIFY( rec->fieldPtr( 0 ) == 0 ); - QVERIFY( rec->fieldPtr( "_This should give a warning!_" ) == 0 ); -#endif QVERIFY( !rec->contains( fields[0]->name() ) ); } @@ -236,12 +220,6 @@ void tst_QSqlRecord::clearValues() QCOMPARE( rec->indexOf( "int" ), 1 ); QCOMPARE( rec->indexOf( "double" ), 2 ); QCOMPARE( rec->indexOf( "bool" ), 3 ); -#ifdef QT3_SUPPORT - QCOMPARE( rec->position( "string" ), 0 ); - QCOMPARE( rec->position( "int" ), 1 ); - QCOMPARE( rec->position( "double" ), 2 ); - QCOMPARE( rec->position( "bool" ), 3 ); -#endif for ( i = 0; i < 4; ++i ) rec->setNull( i ); @@ -287,9 +265,6 @@ void tst_QSqlRecord::field() int i; for ( i = 0; i < NUM_FIELDS; ++i ) QVERIFY( rec->field( i ) == *fields[ i ] ); -#ifdef QT3_SUPPORT - QVERIFY( rec->fieldPtr( NUM_FIELDS ) == 0 ); -#endif for ( i = 0; i < NUM_FIELDS; ++i ) QVERIFY( rec->field( (fields[ i ] )->name() ) == *( fields[ i ] ) ); @@ -438,9 +413,6 @@ void tst_QSqlRecord::position() int i; for ( i = 0; i < NUM_FIELDS; ++i ) { QCOMPARE( rec->indexOf( fields[ i ]->name() ), i ); -#ifdef QT3_SUPPORT - QCOMPARE( rec->position( fields[ i ]->name() ), i ); -#endif } } @@ -499,12 +471,6 @@ void tst_QSqlRecord::setValue() QCOMPARE( rec->indexOf( "int" ), 1 ); QCOMPARE( rec->indexOf( "double" ), 2 ); QCOMPARE( rec->indexOf( "bool" ), 3 ); -#ifdef QT3_SUPPORT - QCOMPARE( rec->position( "string" ), 0 ); - QCOMPARE( rec->position( "int" ), 1 ); - QCOMPARE( rec->position( "double" ), 2 ); - QCOMPARE( rec->position( "bool" ), 3 ); -#endif QFETCH( int, ival ); QFETCH( QString, sval ); @@ -543,58 +509,6 @@ void tst_QSqlRecord::setValue() QCOMPARE( rec->value( 3 ), QVariant(bval) ); } -#ifdef QT3_SUPPORT -void tst_QSqlRecord::toString_data() -{ - clearValues_data( t ); -} - -void tst_QSqlRecord::toString() -{ - createTestRecord(); - QString result; - QFETCH( QString, prefix ); - QFETCH( QString, sep ); - rec->setGenerated( 1, false ); - for (int i = 0; i < NUM_FIELDS; ++i ) { - if ( i == 1 ) - continue; - if ( prefix.isEmpty() ) { - result += fields[ i ]->name(); - } else { - result += prefix + '.' + fields[ i ]->name(); - } - if ( i != NUM_FIELDS - 1 ) - result += sep + ' '; - } - QCOMPARE( rec->toString( prefix, sep ), result ); -} - -void tst_QSqlRecord::toStringList_data() -{ - clearValues_data( t ); -} - -void tst_QSqlRecord::toStringList() -{ - createTestRecord(); - QStringList result; - QFETCH( QString, prefix ); - rec->setGenerated( 1, false ); - for (int i = 0; i < NUM_FIELDS; ++i ) { - if ( i == 1 ) - continue; - if ( prefix.isEmpty() ) { - result << fields[ i ]->name(); - } else { - result << ( prefix + '.' + fields[ i ]->name() ); - } - } - QCOMPARE(rec->toStringList( prefix ), result); -} - -#endif // QT3_SUPPORT - void tst_QSqlRecord::value() { // this test is already covered in setValue() diff --git a/tests/auto/qsslsocket/qsslsocket.pro b/tests/auto/qsslsocket/qsslsocket.pro index 77517e05bc..76d73b7cb3 100644 --- a/tests/auto/qsslsocket/qsslsocket.pro +++ b/tests/auto/qsslsocket/qsslsocket.pro @@ -2,7 +2,7 @@ load(qttest_p4) SOURCES += tst_qsslsocket.cpp !wince*:win32:LIBS += -lws2_32 -QT += network +QT += core-private network-private QT -= gui TARGET = tst_qsslsocket diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp index b508d4795b..576f2f6f0d 100644 --- a/tests/auto/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp @@ -1561,12 +1561,13 @@ protected: #else bool ret = server.waitForNewConnection(20000); #endif + Q_UNUSED(ret); // delayed start of encryption QTest::qSleep(100); QSslSocket *socket = server.socket; - QVERIFY(socket); - QVERIFY(socket->isValid()); + if (!socket || !socket->isValid()) + return; // error socket->ignoreSslErrors(); socket->startServerEncryption(); if (!socket->waitForEncrypted(2000)) @@ -1955,7 +1956,7 @@ void tst_QSslSocket::writeBigChunk() QByteArray data; data.resize(1024*1024*10); // 10 MB // init with garbage. needed so ssl cannot compress it in an efficient way. - for (int i = 0; i < data.size() / sizeof(int); i++) { + for (size_t i = 0; i < data.size() / sizeof(int); i++) { int r = qrand(); data.data()[i*sizeof(int)] = r; } diff --git a/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro b/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro index 53020eb892..42373b0324 100644 --- a/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro +++ b/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro @@ -2,7 +2,7 @@ load(qttest_p4) SOURCES += tst_qsslsocket_onDemandCertificates_member.cpp !wince*:win32:LIBS += -lws2_32 -QT += network +QT += core-private network-private QT -= gui TARGET = tst_qsslsocket_onDemandCertificates_member diff --git a/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro b/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro index 3452a92fe2..3a06ec190c 100644 --- a/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro +++ b/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro @@ -2,7 +2,7 @@ load(qttest_p4) SOURCES += tst_qsslsocket_onDemandCertificates_static.cpp !wince*:win32:LIBS += -lws2_32 -QT += network +QT += core-private network-private QT -= gui TARGET = tst_qsslsocket_onDemandCertificates_static diff --git a/tests/auto/qstatemachine/tst_qstatemachine.cpp b/tests/auto/qstatemachine/tst_qstatemachine.cpp index 231cab03b2..56b0c9bf8a 100644 --- a/tests/auto/qstatemachine/tst_qstatemachine.cpp +++ b/tests/auto/qstatemachine/tst_qstatemachine.cpp @@ -4374,7 +4374,9 @@ void tst_QStateMachine::eventClassesExported() { // make sure this links QStateMachine::WrappedEvent *wrappedEvent = new QStateMachine::WrappedEvent(0, 0); + Q_UNUSED(wrappedEvent); QStateMachine::SignalEvent *signalEvent = new QStateMachine::SignalEvent(0, 0, QList<QVariant>()); + Q_UNUSED(signalEvent); } void tst_QStateMachine::stopInTransitionToFinalState() diff --git a/tests/auto/qstring/tst_qstring.cpp b/tests/auto/qstring/tst_qstring.cpp index 3d80e80dd2..641888613d 100644 --- a/tests/auto/qstring/tst_qstring.cpp +++ b/tests/auto/qstring/tst_qstring.cpp @@ -151,7 +151,6 @@ private slots: void indexOf3_data(); // void indexOf3(); void sprintf(); - void copy(); void fill(); void truncate(); void constructor(); @@ -904,19 +903,6 @@ void tst_QString::fill() QCOMPARE(f,(QString)"FFF"); } -void tst_QString::copy() -{ -#ifdef QT3_SUPPORT - QString e; - e = "String E"; - QString ce = e.copy(); - QCOMPARE(ce,(QString)"String E"); - e = "XXX"; - QCOMPARE(ce,(QString)"String E"); - QCOMPARE(e,(QString)"XXX"); -#endif -} - void tst_QString::sprintf() { QString a; @@ -3364,7 +3350,7 @@ void tst_QString::local8Bit_data() /* QString::local8Bit() called on a null QString returns an _empty_ - QByteArray. This is the correct behavior since Qt 3.1. + QByteArray. */ QTest::newRow("nullString") << QString() << QByteArray(""); QTest::newRow("emptyString") << QString("") << QByteArray(""); @@ -3429,9 +3415,9 @@ void tst_QString::fromLatin1Roundtrip() QFETCH(QString, unicode); // QtTest safety check: - Q_ASSERT(latin1.isNull() == unicode.isNull()); - Q_ASSERT(latin1.isEmpty() == unicode.isEmpty()); - Q_ASSERT(latin1.length() == unicode.length()); + QCOMPARE(latin1.isNull(), unicode.isNull()); + QCOMPARE(latin1.isEmpty(), unicode.isEmpty()); + QCOMPARE(latin1.length(), unicode.length()); if (!latin1.isEmpty()) while (latin1.length() < 128) { @@ -3484,12 +3470,12 @@ void tst_QString::toLatin1Roundtrip() QFETCH(QString, unicodedst); // QtTest safety check: - Q_ASSERT(latin1.isNull() == unicodesrc.isNull()); - Q_ASSERT(latin1.isEmpty() == unicodesrc.isEmpty()); - Q_ASSERT(latin1.length() == unicodesrc.length()); - Q_ASSERT(latin1.isNull() == unicodedst.isNull()); - Q_ASSERT(latin1.isEmpty() == unicodedst.isEmpty()); - Q_ASSERT(latin1.length() == unicodedst.length()); + QCOMPARE(latin1.isNull(), unicodesrc.isNull()); + QCOMPARE(latin1.isEmpty(), unicodesrc.isEmpty()); + QCOMPARE(latin1.length(), unicodesrc.length()); + QCOMPARE(latin1.isNull(), unicodedst.isNull()); + QCOMPARE(latin1.isEmpty(), unicodedst.isEmpty()); + QCOMPARE(latin1.length(), unicodedst.length()); if (!latin1.isEmpty()) while (latin1.length() < 128) { @@ -3519,12 +3505,12 @@ void tst_QString::stringRef_toLatin1Roundtrip() QFETCH(QString, unicodedst); // QtTest safety check: - Q_ASSERT(latin1.isNull() == unicodesrc.isNull()); - Q_ASSERT(latin1.isEmpty() == unicodesrc.isEmpty()); - Q_ASSERT(latin1.length() == unicodesrc.length()); - Q_ASSERT(latin1.isNull() == unicodedst.isNull()); - Q_ASSERT(latin1.isEmpty() == unicodedst.isEmpty()); - Q_ASSERT(latin1.length() == unicodedst.length()); + QCOMPARE(latin1.isNull(), unicodesrc.isNull()); + QCOMPARE(latin1.isEmpty(), unicodesrc.isEmpty()); + QCOMPARE(latin1.length(), unicodesrc.length()); + QCOMPARE(latin1.isNull(), unicodedst.isNull()); + QCOMPARE(latin1.isEmpty(), unicodedst.isEmpty()); + QCOMPARE(latin1.length(), unicodedst.length()); if (!latin1.isEmpty()) while (latin1.length() < 128) { diff --git a/tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp b/tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp index 36b6b80e51..463f200043 100644 --- a/tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp +++ b/tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp @@ -44,8 +44,7 @@ // this is the "no harm done" version. Only operator% is active, // with NO_CAST * defined #define P % -#undef QT_USE_FAST_OPERATOR_PLUS -#undef QT_USE_FAST_CONCATENATION +#undef QT_USE_QSTRINGBUILDER #define QT_NO_CAST_FROM_ASCII #define QT_NO_CAST_TO_ASCII diff --git a/tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp b/tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp index 88b1f737e4..bcf88cbd69 100644 --- a/tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp +++ b/tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp @@ -45,8 +45,7 @@ // based version // with NO_CAST * defined #define P + -#define QT_USE_FAST_OPERATOR_PLUS -#define QT_USE_FAST_CONCATENATION +#define QT_USE_QSTRINGBUILDER #define QT_NO_CAST_FROM_ASCII #define QT_NO_CAST_TO_ASCII diff --git a/tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp b/tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp index afc33339f2..338fbf400f 100644 --- a/tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp +++ b/tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp @@ -44,8 +44,7 @@ // this is the "no harm done" version. Only operator% is active, // with NO_CAST * _not_ defined #define P % -#undef QT_USE_FAST_OPERATOR_PLUS -#undef QT_USE_FAST_CONCATENATION +#undef QT_USE_QSTRINGBUILDER #undef QT_NO_CAST_FROM_ASCII #undef QT_NO_CAST_TO_ASCII diff --git a/tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp b/tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp index ae4100a078..d046e59484 100644 --- a/tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp +++ b/tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp @@ -45,8 +45,7 @@ // based version // with NO_CAST * _not_ defined #define P + -#define QT_USE_FAST_OPERATOR_PLUS -#define QT_USE_FAST_CONCATENATION +#define QT_USE_QSTRINGBUILDER #undef QT_NO_CAST_FROM_ASCII #undef QT_NO_CAST_TO_ASCII diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/qstyle/tst_qstyle.cpp index 5c319f0a9e..b844beb5a7 100644 --- a/tests/auto/qstyle/tst_qstyle.cpp +++ b/tests/auto/qstyle/tst_qstyle.cpp @@ -337,9 +337,6 @@ void tst_QStyle::testAllFunctions(QStyle *style) copt6.init(testWidget); QStyleOptionToolButton copt7; copt7.init(testWidget); - QStyleOptionQ3ListView copt8; - copt8.init(testWidget); - copt8.items << QStyleOptionQ3ListViewItem(); QStyleOptionComplex copt9; copt9.initFrom(testWidget); @@ -351,10 +348,6 @@ void tst_QStyle::testAllFunctions(QStyle *style) style->drawComplexControl(QStyle::CC_TitleBar, &copt6, &painter, 0); style->drawComplexControl(QStyle::CC_GroupBox, &copt2, &painter, 0); style->drawComplexControl(QStyle::CC_Dial, &copt4, &painter, 0); -#ifdef QT3_SUPPORT - style->drawComplexControl(QStyle::CC_Q3ListView, &copt8, &painter, 0); - style->drawComplexControl(QStyle::CC_MdiControls, &copt9, &painter, 0); -#endif } //Check standard pixmaps/icons @@ -380,6 +373,8 @@ void tst_QStyle::testScrollBarSubControls(QStyle* style) #ifdef Q_OS_WINCE_WM if (qobject_cast<QWindowsMobileStyle*>(style) && qt_wince_is_smartphone()) QSKIP("SmartPhone doesn't have scrollbar subcontrols.", SkipAll); +#else + Q_UNUSED(style); #endif QScrollBar scrollBar; diff --git a/tests/auto/qstyleoption/tst_qstyleoption.cpp b/tests/auto/qstyleoption/tst_qstyleoption.cpp index 52297248a1..70402fec5d 100644 --- a/tests/auto/qstyleoption/tst_qstyleoption.cpp +++ b/tests/auto/qstyleoption/tst_qstyleoption.cpp @@ -92,9 +92,6 @@ void tst_QStyleOption::qstyleoptioncast_data() QTest::newRow("optionHeader") << stylePtr(new QStyleOptionHeader) << false << int(QStyleOption::SO_Header); QTest::newRow("optionMenuItem") << stylePtr(new QStyleOptionMenuItem) << false << int(QStyleOption::SO_MenuItem); QTest::newRow("optionProgressBar") << stylePtr(new QStyleOptionProgressBar) << false << int(QStyleOption::SO_ProgressBar); - QTest::newRow("optionQ3DockWindow") << stylePtr(new QStyleOptionQ3DockWindow) << false << int(QStyleOption::SO_Q3DockWindow); - QTest::newRow("optionQ3ListView") << stylePtr(new QStyleOptionQ3ListView) << true << int(QStyleOption::SO_Q3ListView); - QTest::newRow("optionQ3ListViewItem") << stylePtr(new QStyleOptionQ3ListViewItem) << false << int(QStyleOption::SO_Q3ListViewItem); QTest::newRow("optionSlider") << stylePtr(new QStyleOptionSlider) << true << int(QStyleOption::SO_Slider); QTest::newRow("optionSpinBox") << stylePtr(new QStyleOptionSpinBox) << true << int(QStyleOption::SO_SpinBox); QTest::newRow("optionTab") << stylePtr(new QStyleOptionTab) << false << int(QStyleOption::SO_Tab); diff --git a/tests/auto/qstylesheetstyle/qstylesheetstyle.pro b/tests/auto/qstylesheetstyle/qstylesheetstyle.pro index eada969d96..1575616b19 100644 --- a/tests/auto/qstylesheetstyle/qstylesheetstyle.pro +++ b/tests/auto/qstylesheetstyle/qstylesheetstyle.pro @@ -1,5 +1,5 @@ load(qttest_p4) - +QT += gui-private # Input SOURCES += tst_qstylesheetstyle.cpp RESOURCES += resources.qrc diff --git a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp index 83adf49fa4..cb51c3dfdd 100644 --- a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp +++ b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp @@ -43,9 +43,6 @@ #include <QtTest/QtTest> #include <QtDebug> #include <QMetaObject> -#ifdef QT3_SUPPORT -#include <Q3ProgressBar> -#endif #include <private/qstylesheetstyle_p.h> #include "../platformquirks.h" @@ -1291,9 +1288,6 @@ void tst_QStyleSheetStyle::emptyStyleSheet() QWidget w; QHBoxLayout layout(&w); w.setLayout(&layout); -#ifdef QT3_SUPPORT - layout.addWidget(new Q3ProgressBar(&w)); //task 231137 -#endif layout.addWidget(new QPushButton("push", &w)); layout.addWidget(new QToolButton(&w)); QLabel label("toto", &w); diff --git a/tests/auto/qtableview/tst_qtableview.cpp b/tests/auto/qtableview/tst_qtableview.cpp index 380116d736..d715914796 100644 --- a/tests/auto/qtableview/tst_qtableview.cpp +++ b/tests/auto/qtableview/tst_qtableview.cpp @@ -3028,7 +3028,7 @@ void tst_QTableView::spans_data() << 1 << 2; - QTest::newRow("QTBUG-6004: No failing Q_ASSERT, then it passes.") + QTest::newRow("QTBUG-6004: No failing assertion, then it passes.") << 5 << 5 << (SpanList() << QRect(0, 0, 2, 2) << QRect(0, 0, 1, 1)) << false @@ -3036,7 +3036,7 @@ void tst_QTableView::spans_data() << 1 << 1; - QTest::newRow("QTBUG-6004 (follow-up): No failing Q_ASSERT, then it passes.") + QTest::newRow("QTBUG-6004 (follow-up): No failing assertion, then it passes.") << 10 << 10 << (SpanList() << QRect(2, 2, 1, 3) << QRect(2, 2, 1, 1)) << false diff --git a/tests/auto/qtabwidget/tst_qtabwidget.cpp b/tests/auto/qtabwidget/tst_qtabwidget.cpp index 252450cc71..c305150af4 100644 --- a/tests/auto/qtabwidget/tst_qtabwidget.cpp +++ b/tests/auto/qtabwidget/tst_qtabwidget.cpp @@ -381,9 +381,6 @@ void tst_QTabWidget::currentIndex() { // Test bad arguments QSignalSpy spy(tw, SIGNAL(currentChanged(int))); -#ifdef QT3_SUPPORT - QSignalSpy spySupport(tw, SIGNAL(currentChanged(QWidget *))); -#endif QCOMPARE(tw->currentIndex(), -1); tw->setCurrentIndex(-1); QCOMPARE(tw->currentIndex(), -1); @@ -395,10 +392,7 @@ void tst_QTabWidget::currentIndex() QCOMPARE(spy.count(), 1); QList<QVariant> arguments = spy.takeFirst(); QVERIFY(arguments.at(0).toInt() == firstIndex); -#ifdef QT3_SUPPORT - QCOMPARE(spySupport.count(), 1); -#endif - + int index = addPage(); QCOMPARE(tw->currentIndex(), firstIndex); tw->setCurrentIndex(index); @@ -406,28 +400,18 @@ void tst_QTabWidget::currentIndex() QCOMPARE(spy.count(), 1); arguments = spy.takeFirst(); QVERIFY(arguments.at(0).toInt() == index); -#ifdef QT3_SUPPORT - QCOMPARE(spySupport.count(), 2); -#endif - + removePage(index); QCOMPARE(tw->currentIndex(), firstIndex); QCOMPARE(spy.count(), 1); arguments = spy.takeFirst(); QVERIFY(arguments.at(0).toInt() == firstIndex); -#ifdef QT3_SUPPORT - QCOMPARE(spySupport.count(), 3); -#endif removePage(firstIndex); QCOMPARE(tw->currentIndex(), -1); QCOMPARE(spy.count(), 1); arguments = spy.takeFirst(); QVERIFY(arguments.at(0).toInt() == -1); -#ifdef QT3_SUPPORT - QCOMPARE(spySupport.count(), 4); -#endif - } void tst_QTabWidget::cornerWidget() diff --git a/tests/auto/qtcpsocket/stressTest/Test.cpp b/tests/auto/qtcpsocket/stressTest/Test.cpp index 80b4c398f7..4304131352 100644 --- a/tests/auto/qtcpsocket/stressTest/Test.cpp +++ b/tests/auto/qtcpsocket/stressTest/Test.cpp @@ -47,87 +47,6 @@ // Test #include "Test.h" -#ifdef QT3_SUPPORT -//------------------------------------------------------------------------------ -My3Socket::My3Socket(QObject *parent) - : Q3Socket(parent), safeShutDown(false) -{ - connect(this, SIGNAL(readyRead()), this, SLOT(read())); - connect(this, SIGNAL(delayedCloseFinished()), this, SLOT(closed())); - connect(this, SIGNAL(connectionClosed()), this, SLOT(closed())); -} - -//------------------------------------------------------------------------------ -void My3Socket::read() -{ - QDataStream in(this); - - quint32 num, reply; - - while (bytesAvailable()) { - in >> num; - if (num == 42) { - qDebug("SUCCESS"); - safeShutDown = true; - QCoreApplication::instance()->quit(); - return; - } - reply = num + 1; - if (reply == 42) - ++reply; - } - - // Reply with a bigger number - sendTest(reply); -} - -//------------------------------------------------------------------------------ -void My3Socket::closed() -{ - if (!safeShutDown) - qDebug("FAILED"); - QCoreApplication::instance()->quit(); -} - -//------------------------------------------------------------------------------ -void My3Socket::sendTest(quint32 num) -{ - QByteArray block; - QDataStream out(&block, QIODevice::WriteOnly); - out << num; - writeBlock(block, block.size()); -} - -//------------------------------------------------------------------------------ -My3Server::My3Server(QObject *parent) - : Q3ServerSocket(7700, 1, parent), m_socket(0) -{ - if (ok()) - qDebug("qt3server"); - - QTimer::singleShot(5000, this, SLOT(stopServer())); -} - -//------------------------------------------------------------------------------ -void My3Server::newConnection(int socketId) -{ - m_socket = new My3Socket(this); - m_socket->setSocket(socketId); -} - -//------------------------------------------------------------------------------ -void My3Server::stopServer() -{ - if (m_socket) { - qDebug("SUCCESS"); - m_socket->safeShutDown = true; - m_socket->sendTest(42); - } else { - QCoreApplication::instance()->quit(); - } -} -#endif - //------------------------------------------------------------------------------ My4Socket::My4Socket(QObject *parent) : QTcpSocket(parent), safeShutDown(false) @@ -210,19 +129,6 @@ void My4Server::stopServer() Test::Test(Type type) { switch (type) { -#ifdef QT3_SUPPORT - case Qt3Server: { - new My3Server(this); - break; - } - case Qt3Client: { - qDebug("qt3client"); - My3Socket *s = new My3Socket(this); - s->connectToHost("localhost", 7700); - s->sendTest(1); - break; - } -#endif case Qt4Client: { qDebug("qt4client"); My4Socket *s = new My4Socket(this); diff --git a/tests/auto/qtcpsocket/stressTest/Test.h b/tests/auto/qtcpsocket/stressTest/Test.h index f74eda3c79..1aa4d709c2 100644 --- a/tests/auto/qtcpsocket/stressTest/Test.h +++ b/tests/auto/qtcpsocket/stressTest/Test.h @@ -42,49 +42,11 @@ #define TEST_H //------------------------------------------------------------------------------ -// Qt -#ifdef QT3_SUPPORT -#include <Q3ServerSocket> -#include <Q3Socket> -#endif #include <QTcpServer> #include <QTcpSocket> //------------------------------------------------------------------------------ -#ifdef QT3_SUPPORT -class My3Socket : public Q3Socket -{ - Q_OBJECT -public: - My3Socket(QObject *parent); - - void sendTest(Q_UINT32 num); - bool safeShutDown; - -private slots: - void read(); - void closed(); -}; - -//------------------------------------------------------------------------------ -class My3Server : public Q3ServerSocket -{ - Q_OBJECT -public: - My3Server(QObject *parent = 0); - - void newConnection(int socket); - -private slots: - void stopServer(); - -private: - My3Socket *m_socket; -}; -#endif - -//------------------------------------------------------------------------------ class My4Socket : public QTcpSocket { Q_OBJECT @@ -125,10 +87,6 @@ public: enum Type { Qt4Client, Qt4Server, -#ifdef QT3_SUPPORT - Qt3Client, - Qt3Server -#endif }; Test(Type type); }; diff --git a/tests/auto/qtcpsocket/stressTest/main.cpp b/tests/auto/qtcpsocket/stressTest/main.cpp index 83d175da28..6cff356910 100644 --- a/tests/auto/qtcpsocket/stressTest/main.cpp +++ b/tests/auto/qtcpsocket/stressTest/main.cpp @@ -56,14 +56,8 @@ int main(int argc, char **argv) type = Test::Qt4Client; else if (arg == QLatin1String("qt4server")) type = Test::Qt4Server; -#ifdef QT3_SUPPORT - else if (arg == QLatin1String("qt3client")) - type = Test::Qt3Client; - else if (arg == QLatin1String("qt3server")) - type = Test::Qt3Server; -#endif else { - qDebug("usage: ./stressTest <qt3client|qt3server|qt4client|qt4server>"); + qDebug("usage: ./stressTest <qt4client|qt4server>"); return 0; } diff --git a/tests/auto/qtcpsocket/test/test.pro b/tests/auto/qtcpsocket/test/test.pro index 7bf5ba0074..e282de1a2e 100644 --- a/tests/auto/qtcpsocket/test/test.pro +++ b/tests/auto/qtcpsocket/test/test.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += core-private network-private SOURCES += ../tst_qtcpsocket.cpp win32: { wince*: { diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp index f83c4cf99c..8590ff2154 100644 --- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp @@ -430,7 +430,7 @@ void tst_QTcpSocket::socketsConstructedBeforeEventLoop() earlyConstructedSockets->endPoints[1]->close(); } -void tst_QTcpSocket::earlySocketBytesSent(qint64 bytes) +void tst_QTcpSocket::earlySocketBytesSent(qint64 /* bytes */) { earlyBytesWrittenCount++; } @@ -2167,20 +2167,12 @@ void tst_QTcpSocket::suddenRemoteDisconnect_data() QTest::addColumn<QString>("client"); QTest::addColumn<QString>("server"); -#ifdef QT3_SUPPORT - QTest::newRow("Qt3 Client <-> Qt3 Server") << QString::fromLatin1("qt3client") << QString::fromLatin1("qt3server"); - QTest::newRow("Qt3 Client <-> Qt4 Server") << QString::fromLatin1("qt3client") << QString::fromLatin1("qt4server"); - QTest::newRow("Qt4 Client <-> Qt3 Server") << QString::fromLatin1("qt4client") << QString::fromLatin1("qt3server"); -#endif - QTest::newRow("Qt4 Client <-> Qt4 Server") << QString::fromLatin1("qt4client") << QString::fromLatin1("qt4server"); } void tst_QTcpSocket::suddenRemoteDisconnect() { -#if defined(Q_OS_WINCE) || defined(Q_OS_VXWORKS) - QSKIP("stressTest subprocess needs Qt3Support", SkipAll); -#elif defined( Q_OS_SYMBIAN ) +#if defined( Q_OS_SYMBIAN ) QSKIP("Symbian: QProcess IO is not yet supported, fix when supported", SkipAll); #else QFETCH(QString, client); diff --git a/tests/auto/qtessellator/dataparser.cpp b/tests/auto/qtessellator/dataparser.cpp index bd17ee2835..d6566cb2f9 100644 --- a/tests/auto/qtessellator/dataparser.cpp +++ b/tests/auto/qtessellator/dataparser.cpp @@ -98,8 +98,12 @@ static QList<QPointF> parsePoints(const QByteArray &line) QList<qreal> nums = parseNumbersList(it); QList<qreal>::const_iterator nitr; for (nitr = nums.begin(); nitr != nums.end(); ++nitr) { - qreal x = *nitr; ++nitr; - Q_ASSERT(nitr != nums.end()); + qreal x = *nitr; + ++nitr; + if (nitr == nums.end()) { + qWarning() << "parsePoints: Even number of co-ordinates required, odd number found: skipping last point"; + break; + } qreal y = *nitr; res.append(QPointF(x, y)); } diff --git a/tests/auto/qtessellator/oldtessellator.cpp b/tests/auto/qtessellator/oldtessellator.cpp index 78f117f3e3..bc24d7e69e 100644 --- a/tests/auto/qtessellator/oldtessellator.cpp +++ b/tests/auto/qtessellator/oldtessellator.cpp @@ -80,19 +80,6 @@ struct QEdge { horizontal = p1.y == p2.y; } - inline qreal xAt(const qreal &y) const - { - Q_ASSERT(p1.y != p2.y); - XFixed yf = XDoubleToFixed(y); - - if (yf == p1.y) - return XFixedToDouble(p1.x); - else if (yf == p2.y) - return XFixedToDouble(p2.x); - - return (!vertical) ? (((y - b)*im)) : pf1.x(); - } - QPointF pf1, pf2; XPointFixed p1, p2; qreal m; @@ -218,7 +205,8 @@ void old_tesselate_polygon(QVector<XTrapezoid> *traps, const QPointF *pg, int pg qreal ymax(INT_MIN/256); //painter.begin(pg, pgSize); - Q_ASSERT(pg[0] == pg[pgSize-1]); + if (pg[0] != pg[pgSize-1]) + qWarning() << Q_FUNC_INFO << "Malformed polygon (first and last points must be identical)"; // generate edge table // qDebug() << "POINTS:"; for (int x = 0; x < pgSize-1; ++x) { @@ -383,7 +371,8 @@ void old_tesselate_polygon(QVector<XTrapezoid> *traps, const QPointF *pg, int pg isects[i].edge = edge; } - Q_ASSERT(isects.size()%2 == 1); + if (isects.size()%2 != 1) + qFatal("%s: number of intersection points must be odd", Q_FUNC_INFO); // sort intersection points qSort(&isects[0], &isects[isects.size()-1], compareIntersections); diff --git a/tests/auto/qtessellator/testtessellator.cpp b/tests/auto/qtessellator/testtessellator.cpp index 339f05ff16..d8d6f6f5af 100644 --- a/tests/auto/qtessellator/testtessellator.cpp +++ b/tests/auto/qtessellator/testtessellator.cpp @@ -42,6 +42,7 @@ #include <private/qtessellator_p.h> #include "math.h" +#include <QtCore/QDebug> class TestTessellator : public QTessellator { @@ -91,7 +92,8 @@ void test_tessellate_polygon_rect(QVector<XTrapezoid> *traps, const QPointF *poi bool winding) { // 5 points per rect - Q_ASSERT(nPoints % 5 == 0); + if (nPoints % 5 != 0) + qWarning() << Q_FUNC_INFO << "multiples of 5 points expected"; TestTessellator t; t.traps = traps; diff --git a/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp b/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp index 8003c442b7..e885942314 100644 --- a/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp +++ b/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp @@ -123,14 +123,14 @@ void tst_QTextBoundaryFinder::graphemeBoundaries() if (test.at(pos).unicode() == 0xf7) breakPositions.append(strPos); else - Q_ASSERT(test.at(pos).unicode() == 0xd7); + QVERIFY(test.at(pos).unicode() == 0xd7); ++pos; if (pos < test.length()) { - Q_ASSERT(pos < test.length() - 4); + QVERIFY(pos < test.length() - 4); QString hex = test.mid(pos, 4); bool ok = true; testString.append(QChar(hex.toInt(&ok, 16))); - Q_ASSERT(ok); + QVERIFY(ok); pos += 4; } ++strPos; @@ -176,14 +176,14 @@ void tst_QTextBoundaryFinder::wordBoundaries() if (test.at(pos).unicode() == 0xf7) breakPositions.append(strPos); else - Q_ASSERT(test.at(pos).unicode() == 0xd7); + QVERIFY(test.at(pos).unicode() == 0xd7); ++pos; if (pos < test.length()) { - Q_ASSERT(pos < test.length() - 4); + QVERIFY(pos < test.length() - 4); QString hex = test.mid(pos, 4); bool ok = true; testString.append(QChar(hex.toInt(&ok, 16))); - Q_ASSERT(ok); + QVERIFY(ok); pos += 4; } ++strPos; @@ -228,14 +228,14 @@ void tst_QTextBoundaryFinder::sentenceBoundaries() if (test.at(pos).unicode() == 0xf7) breakPositions.append(strPos); else - Q_ASSERT(test.at(pos).unicode() == 0xd7); + QVERIFY(test.at(pos).unicode() == 0xd7); ++pos; if (pos < test.length()) { - Q_ASSERT(pos < test.length() - 4); + QVERIFY(pos < test.length() - 4); QString hex = test.mid(pos, 4); bool ok = true; testString.append(QChar(hex.toInt(&ok, 16))); - Q_ASSERT(ok); + QVERIFY(ok); pos += 4; } ++strPos; diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp index 43656c8e84..34d34fa90a 100644 --- a/tests/auto/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp @@ -106,6 +106,8 @@ private slots: void moreToFromUnicode_data(); void moreToFromUnicode(); + + void shiftJis(); }; void tst_QTextCodec::toUnicode_data() @@ -428,7 +430,7 @@ void tst_QTextCodec::flagCodepointFFFF() const QString input(ch); QTextCodec *const codec = QTextCodec::codecForMib(106); // UTF-8 - Q_ASSERT(codec); + QVERIFY(codec); const QByteArray asDecoded(codec->fromUnicode(input)); QCOMPARE(asDecoded, QByteArray("?")); @@ -465,7 +467,7 @@ void tst_QTextCodec::flagF7808080() const QTextCodec *const codec = QTextCodec::codecForMib(106); // UTF-8 - Q_ASSERT(codec); + QVERIFY(codec); //QVERIFY(!codec->canEncode(QChar(0x1C0000))); @@ -482,7 +484,7 @@ void tst_QTextCodec::flagEFBFBF() const invalidInput[2] = char(0xBF); const QTextCodec *const codec = QTextCodec::codecForMib(106); // UTF-8 - Q_ASSERT(codec); + QVERIFY(codec); { //QVERIFY(!codec->canEncode(QChar(0xFFFF))); @@ -1627,7 +1629,7 @@ void tst_QTextCodec::utf8bom() QFETCH(QString, result); QTextCodec *const codec = QTextCodec::codecForMib(106); // UTF-8 - Q_ASSERT(codec); + QVERIFY(codec); QCOMPARE(codec->toUnicode(data.constData(), data.length(), 0), result); @@ -2236,6 +2238,19 @@ void tst_QTextCodec::moreToFromUnicode() QCOMPARE(testData, cStr); } +void tst_QTextCodec::shiftJis() +{ + QByteArray backslashTilde("\\~"); + QTextCodec* codec = QTextCodec::codecForName("shift_jis"); + QString string = codec->toUnicode(backslashTilde); + QCOMPARE(string.length(), 2); + QCOMPARE(string.at(0), QChar(QLatin1Char('\\'))); + QCOMPARE(string.at(1), QChar(QLatin1Char('~'))); + + QByteArray encoded = codec->fromUnicode(string); + QCOMPARE(encoded, backslashTilde); +} + struct DontCrashAtExit { ~DontCrashAtExit() { QTextCodec *c = QTextCodec::codecForName("utf8"); diff --git a/tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp b/tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp index a7a9c056d2..0757e4f2da 100644 --- a/tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp +++ b/tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp @@ -260,6 +260,7 @@ void tst_QTextDocumentLayout::floatingTablePageBreak() QTextTableFormat tableFormat; tableFormat.setPosition(QTextFrameFormat::FloatLeft); QTextTable *table = cursor.insertTable(50, 1, tableFormat); + Q_UNUSED(table); // Make height of document 2/3 of the table, fitting the table into two pages QSizeF documentSize = doc->size(); diff --git a/tests/auto/qtextedit/qtextedit.pro b/tests/auto/qtextedit/qtextedit.pro index cef2b300d7..5851763310 100644 --- a/tests/auto/qtextedit/qtextedit.pro +++ b/tests/auto/qtextedit/qtextedit.pro @@ -1,5 +1,6 @@ load(qttest_p4) +QT += gui-private INCLUDEPATH += ../ HEADERS += diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp index 992d2f2682..5c1ba114f4 100644 --- a/tests/auto/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/qtextedit/tst_qtextedit.cpp @@ -76,7 +76,6 @@ Q_DECLARE_METATYPE(QList<int>); #if defined(Q_OS_SYMBIAN) # define SRCDIR "" -#undef QT3_SUPPORT #endif @@ -134,9 +133,6 @@ private slots: void mergeCurrentBlockCharFormat(); void emptyAppend(); void appendOnEmptyDocumentShouldReuseInitialParagraph(); -#ifdef QT3_SUPPORT - void textSemantics(); -#endif void cursorPositionChanged(); void setTextCursor(); #ifndef QT_NO_CLIPBOARD @@ -317,7 +313,7 @@ void tst_QTextEdit::getSetCheck() // void QTextEdit::setFontPointSize(qreal) obj1.setFontPointSize(qreal(1.1)); QCOMPARE(qreal(1.1), obj1.fontPointSize()); - // we currently Q_ASSERT_X in QFont::setPointSizeF for that + // we currently assert in QFont::setPointSizeF for that //obj1.setFontPointSize(0.0); //QCOMPARE(1.1, obj1.fontPointSize()); // Should not accept 0.0 => keep old @@ -327,7 +323,7 @@ void tst_QTextEdit::getSetCheck() QCOMPARE(1, obj1.fontWeight()); // Range<1, 99> obj1.setFontWeight(99); QCOMPARE(99, obj1.fontWeight()); // Range<1, 99> - /* Q_ASSERT_X in qfont.cpp + /* assertion in qfont.cpp obj1.setFontWeight(INT_MIN); QCOMPARE(1, obj1.fontWeight()); // Range<1, 99> obj1.setFontWeight(INT_MAX); @@ -705,19 +701,6 @@ void tst_QTextEdit::appendOnEmptyDocumentShouldReuseInitialParagraph() QCOMPARE(blockCount(), 1); } -#ifdef QT3_SUPPORT -void tst_QTextEdit::textSemantics() -{ - ed->setTextFormat(Qt::AutoText); - - ed->setPlainText("Hello World"); - QVERIFY(!Qt::mightBeRichText(ed->text())); - - ed->setHtml("<b>Hey</b>"); - QVERIFY(Qt::mightBeRichText(ed->text())); -} -#endif - class CursorPositionChangedRecorder : public QObject { Q_OBJECT @@ -2064,7 +2047,7 @@ void tst_QTextEdit::compareWidgetAndImage(QTextEdit &widget, const QString &imag QCOMPARE(original.isNull(), false); QCOMPARE(original.size(), image.size()); - Q_ASSERT(image.depth() == 32); + QCOMPARE(image.depth(), 32); QCOMPARE(original.depth(), image.depth()); const int bytesPerLine = image.bytesPerLine(); diff --git a/tests/auto/qtextlayout/qtextlayout.pro b/tests/auto/qtextlayout/qtextlayout.pro index 381f09e5e9..2a180d7937 100644 --- a/tests/auto/qtextlayout/qtextlayout.pro +++ b/tests/auto/qtextlayout/qtextlayout.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += core-private gui-private HEADERS += SOURCES += tst_qtextlayout.cpp INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src diff --git a/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp b/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp index 997cd683c5..ffce9a21eb 100644 --- a/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp +++ b/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp @@ -114,11 +114,14 @@ QString tst_QTextOdfWriter::getContentFromXml() xmlWriter->writeEndDocument(); buffer->close(); QString stringContent = QString::fromUtf8(buffer->data()); + QString ret; int index = stringContent.indexOf("<dummy"); - Q_ASSERT(index); - index = stringContent.indexOf('>', index); - stringContent = stringContent.mid(index+1, stringContent.length() - index - 10); - return stringContent; + if (index > 0) { + index = stringContent.indexOf('>', index); + if (index > 0) + ret = stringContent.mid(index+1, stringContent.length() - index - 10); + } + return ret; } void tst_QTextOdfWriter::testWriteParagraph_data() diff --git a/tests/auto/qtextpiecetable/qtextpiecetable.pro b/tests/auto/qtextpiecetable/qtextpiecetable.pro index 0926b83ccc..edcb0a091c 100644 --- a/tests/auto/qtextpiecetable/qtextpiecetable.pro +++ b/tests/auto/qtextpiecetable/qtextpiecetable.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += core-private gui-private SOURCES += tst_qtextpiecetable.cpp HEADERS += ../qtextdocument/common.h diff --git a/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp b/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp index 6f1b092709..12f17a890b 100644 --- a/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp +++ b/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp @@ -1108,6 +1108,8 @@ void tst_QTextPieceTable::removeWithChildFrame() QTextFrame *frame = table->insertFrame(1, 6, ffmt); QTextFrame *childFrame = table->insertFrame(3, 5, ffmt); + Q_UNUSED(frame); + Q_UNUSED(childFrame); // used to give a failing assertion table->remove(2, 5); diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ -foo
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ -foo
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index 849ecb39ed..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index 8b9647f06f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index d73722e724..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index 849ecb39ed..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index 8b9647f06f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index d73722e724..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index 4d5bdc553e..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index 3cf181c23c..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index f7f74e56a0..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ -foo
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_2.data Binary files differdeleted file mode 100644 index 104e45f940..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_3.data Binary files differdeleted file mode 100644 index 3135276780..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_4.data Binary files differdeleted file mode 100644 index 993d0b9e19..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ -A
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ -B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ -Z
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_3.data deleted file mode 100644 index fa7af8bf5f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ -z
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_4.data deleted file mode 100644 index b516b2c489..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ -@
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ -A
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ -B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ -Z
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_3.data deleted file mode 100644 index fa7af8bf5f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ -z
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_4.data deleted file mode 100644 index b516b2c489..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ -@
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_0.data Binary files differdeleted file mode 100644 index 6def16c99e..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_1.data Binary files differdeleted file mode 100644 index 57302ad8e7..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index 239c14d498..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index 8fbd3327c8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index d745e1be7b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_0.data Binary files differdeleted file mode 100644 index 6def16c99e..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_1.data Binary files differdeleted file mode 100644 index 57302ad8e7..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index 239c14d498..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index 8fbd3327c8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index d745e1be7b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_0.data Binary files differdeleted file mode 100644 index e2b43e3781..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_1.data Binary files differdeleted file mode 100644 index 962fc922ad..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index 839cc09ec8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index f71ac66a63..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index 88f99805e3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ -A
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ -B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ -Z
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_3.data deleted file mode 100644 index fa7af8bf5f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ -z
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_4.data deleted file mode 100644 index b516b2c489..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ -@
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_0.data Binary files differdeleted file mode 100644 index 9ac3ad9a6b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_1.data Binary files differdeleted file mode 100644 index bb28df16b9..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_2.data Binary files differdeleted file mode 100644 index 8c0f57437b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_3.data Binary files differdeleted file mode 100644 index d494004e64..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_4.data Binary files differdeleted file mode 100644 index de421979ea..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ -foo
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ -foo
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index 849ecb39ed..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index 8b9647f06f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index d73722e724..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index 849ecb39ed..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index 8b9647f06f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index d73722e724..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index 4d5bdc553e..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index 3cf181c23c..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index f7f74e56a0..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ -foo
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_2.data Binary files differdeleted file mode 100644 index 104e45f940..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_3.data Binary files differdeleted file mode 100644 index 3135276780..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_4.data Binary files differdeleted file mode 100644 index 993d0b9e19..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ -A
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ -B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ -Z
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_3.data deleted file mode 100644 index 9280c0d31d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_4.data deleted file mode 100644 index c227083464..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ -0
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ -A
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ -B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ -Z
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_3.data deleted file mode 100644 index 9280c0d31d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_4.data deleted file mode 100644 index c227083464..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ -0
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_0.data Binary files differdeleted file mode 100644 index 6def16c99e..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_1.data Binary files differdeleted file mode 100644 index 57302ad8e7..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index 239c14d498..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index 819b31d1f2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index a6ff072af1..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_0.data Binary files differdeleted file mode 100644 index 6def16c99e..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_1.data Binary files differdeleted file mode 100644 index 57302ad8e7..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index 239c14d498..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index 819b31d1f2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index a6ff072af1..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_0.data Binary files differdeleted file mode 100644 index e2b43e3781..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_1.data Binary files differdeleted file mode 100644 index 962fc922ad..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index 839cc09ec8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index c33473a370..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index def7fcb589..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ -A
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ -B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ -Z
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_3.data deleted file mode 100644 index 9280c0d31d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_4.data deleted file mode 100644 index c227083464..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ -0
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_0.data Binary files differdeleted file mode 100644 index 9ac3ad9a6b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_1.data Binary files differdeleted file mode 100644 index bb28df16b9..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_2.data Binary files differdeleted file mode 100644 index 8c0f57437b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_3.data Binary files differdeleted file mode 100644 index 878dc8a26e..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_4.data Binary files differdeleted file mode 100644 index fd0779e0f3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_5.data deleted file mode 100644 index 80aed3622e..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_5.data +++ /dev/null @@ -1 +0,0 @@ - A 1.23456789 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_6.data deleted file mode 100644 index aec027753d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_6.data +++ /dev/null @@ -1 +0,0 @@ - A -1.23456789 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_5.data deleted file mode 100644 index 80aed3622e..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_5.data +++ /dev/null @@ -1 +0,0 @@ - A 1.23456789 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_6.data deleted file mode 100644 index aec027753d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_6.data +++ /dev/null @@ -1 +0,0 @@ - A -1.23456789 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_1.data Binary files differdeleted file mode 100644 index 67ce8d83c8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index 9662a9aaa1..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index a74511b101..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index bdc06a6ec2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_5.data Binary files differdeleted file mode 100644 index 79b15d4d8a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_6.data Binary files differdeleted file mode 100644 index 2141e65843..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_1.data Binary files differdeleted file mode 100644 index 67ce8d83c8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index 9662a9aaa1..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index a74511b101..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index bdc06a6ec2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_5.data Binary files differdeleted file mode 100644 index 79b15d4d8a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_6.data Binary files differdeleted file mode 100644 index 2141e65843..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_1.data Binary files differdeleted file mode 100644 index fb911f7352..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index efbc06bf26..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index 4d857caa13..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index b125e2084f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_5.data Binary files differdeleted file mode 100644 index f39fbde113..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_6.data Binary files differdeleted file mode 100644 index 5436b427ed..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_5.data deleted file mode 100644 index 80aed3622e..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_5.data +++ /dev/null @@ -1 +0,0 @@ - A 1.23456789 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_6.data deleted file mode 100644 index aec027753d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_6.data +++ /dev/null @@ -1 +0,0 @@ - A -1.23456789 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_0.data Binary files differdeleted file mode 100644 index 379e87b914..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_1.data Binary files differdeleted file mode 100644 index e6b94bbeb3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_2.data Binary files differdeleted file mode 100644 index fb0a550264..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_3.data Binary files differdeleted file mode 100644 index 48fe53930f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_4.data Binary files differdeleted file mode 100644 index 811e93212d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_5.data Binary files differdeleted file mode 100644 index 7041fa9b4d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_6.data Binary files differdeleted file mode 100644 index 9fd21fade0..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_1.data Binary files differdeleted file mode 100644 index 67ce8d83c8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index 9662a9aaa1..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index a74511b101..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index bdc06a6ec2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_1.data Binary files differdeleted file mode 100644 index 67ce8d83c8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index 9662a9aaa1..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index a74511b101..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index bdc06a6ec2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_1.data Binary files differdeleted file mode 100644 index fb911f7352..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index efbc06bf26..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index 4d857caa13..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index b125e2084f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_0.data Binary files differdeleted file mode 100644 index 379e87b914..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_1.data Binary files differdeleted file mode 100644 index e6b94bbeb3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_2.data Binary files differdeleted file mode 100644 index fb0a550264..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_3.data Binary files differdeleted file mode 100644 index 48fe53930f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_4.data Binary files differdeleted file mode 100644 index 811e93212d..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_8.data deleted file mode 100644 index f4aefab396..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_8.data +++ /dev/null @@ -1 +0,0 @@ - A -512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_8.data deleted file mode 100644 index f4aefab396..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_8.data +++ /dev/null @@ -1 +0,0 @@ - A -512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_1.data Binary files differdeleted file mode 100644 index 815d4fc7db..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index c933a04c07..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index 69de5ef2bd..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index c45139955a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_5.data Binary files differdeleted file mode 100644 index 396352f4d6..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_6.data Binary files differdeleted file mode 100644 index ea73fac731..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_7.data Binary files differdeleted file mode 100644 index 1f4f1a58de..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_7.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_8.data Binary files differdeleted file mode 100644 index 9469ca407f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_8.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_1.data Binary files differdeleted file mode 100644 index 815d4fc7db..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index c933a04c07..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index 69de5ef2bd..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index c45139955a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_5.data Binary files differdeleted file mode 100644 index 396352f4d6..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_6.data Binary files differdeleted file mode 100644 index ea73fac731..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_7.data Binary files differdeleted file mode 100644 index 1f4f1a58de..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_7.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_8.data Binary files differdeleted file mode 100644 index 9469ca407f..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_8.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_1.data Binary files differdeleted file mode 100644 index ee113d1cf3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index 1e07040ef4..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index cc7ab7dff8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index 450072bc4e..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_5.data Binary files differdeleted file mode 100644 index 73f5f259f8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_6.data Binary files differdeleted file mode 100644 index 9805422dfb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_7.data Binary files differdeleted file mode 100644 index 77f557a494..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_7.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_8.data Binary files differdeleted file mode 100644 index 8dd6a4b38e..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_8.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_8.data deleted file mode 100644 index f4aefab396..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_8.data +++ /dev/null @@ -1 +0,0 @@ - A -512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_0.data Binary files differdeleted file mode 100644 index 379e87b914..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_1.data Binary files differdeleted file mode 100644 index 2785156fb3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_2.data Binary files differdeleted file mode 100644 index 6dc818abc3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_3.data Binary files differdeleted file mode 100644 index d41a1f75d3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_4.data Binary files differdeleted file mode 100644 index f5a0d874d4..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_5.data Binary files differdeleted file mode 100644 index 95742ec8f2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_6.data Binary files differdeleted file mode 100644 index ebb14b2fbd..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_7.data Binary files differdeleted file mode 100644 index a9e1432ca9..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_7.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_8.data Binary files differdeleted file mode 100644 index b7e6743c28..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_8.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_8.data deleted file mode 100644 index cab2ee4938..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_8.data +++ /dev/null @@ -1 +0,0 @@ - A -65534 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_8.data deleted file mode 100644 index cab2ee4938..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_8.data +++ /dev/null @@ -1 +0,0 @@ - A -65534 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_1.data Binary files differdeleted file mode 100644 index 815d4fc7db..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index c933a04c07..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index 69de5ef2bd..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index 40269f4e0c..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_5.data Binary files differdeleted file mode 100644 index 396352f4d6..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_6.data Binary files differdeleted file mode 100644 index ea73fac731..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_7.data Binary files differdeleted file mode 100644 index 1f4f1a58de..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_7.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_8.data Binary files differdeleted file mode 100644 index e8051f8906..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_8.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_1.data Binary files differdeleted file mode 100644 index 815d4fc7db..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index c933a04c07..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index 69de5ef2bd..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index 40269f4e0c..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_5.data Binary files differdeleted file mode 100644 index 396352f4d6..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_6.data Binary files differdeleted file mode 100644 index ea73fac731..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_7.data Binary files differdeleted file mode 100644 index 1f4f1a58de..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_7.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_8.data Binary files differdeleted file mode 100644 index e8051f8906..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_8.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_1.data Binary files differdeleted file mode 100644 index ee113d1cf3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index 1e07040ef4..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index cc7ab7dff8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index beea1c3663..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_5.data Binary files differdeleted file mode 100644 index 73f5f259f8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_6.data Binary files differdeleted file mode 100644 index 9805422dfb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_7.data Binary files differdeleted file mode 100644 index 77f557a494..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_7.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_8.data Binary files differdeleted file mode 100644 index be6f22a5ea..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_8.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_8.data deleted file mode 100644 index cab2ee4938..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_8.data +++ /dev/null @@ -1 +0,0 @@ - A -65534 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_0.data Binary files differdeleted file mode 100644 index 379e87b914..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_1.data Binary files differdeleted file mode 100644 index 2785156fb3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_2.data Binary files differdeleted file mode 100644 index 6dc818abc3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_3.data Binary files differdeleted file mode 100644 index d41a1f75d3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_4.data Binary files differdeleted file mode 100644 index e20c76a82c..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_5.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_5.data Binary files differdeleted file mode 100644 index 95742ec8f2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_6.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_6.data Binary files differdeleted file mode 100644 index ebb14b2fbd..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_7.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_7.data Binary files differdeleted file mode 100644 index a9e1432ca9..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_7.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_8.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_8.data Binary files differdeleted file mode 100644 index f8ec5bc443..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_8.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_1.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_2.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_4.data deleted file mode 100644 index 02b7f3ab7b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A -254 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_1.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_2.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_4.data deleted file mode 100644 index 02b7f3ab7b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A -254 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_1.data Binary files differdeleted file mode 100644 index 396352f4d6..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index 815d4fc7db..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index 69de5ef2bd..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index 0dc83d2713..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_1.data Binary files differdeleted file mode 100644 index 396352f4d6..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index 815d4fc7db..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index 69de5ef2bd..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index 0dc83d2713..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_1.data Binary files differdeleted file mode 100644 index 73f5f259f8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index ee113d1cf3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index cc7ab7dff8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index 584b17ea18..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_1.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_2.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_4.data deleted file mode 100644 index 02b7f3ab7b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A -254 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_0.data Binary files differdeleted file mode 100644 index 379e87b914..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_1.data Binary files differdeleted file mode 100644 index 95742ec8f2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_2.data Binary files differdeleted file mode 100644 index 2785156fb3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_3.data Binary files differdeleted file mode 100644 index d41a1f75d3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_4.data Binary files differdeleted file mode 100644 index 80d3ca2ef1..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_1.data Binary files differdeleted file mode 100644 index 815d4fc7db..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index c933a04c07..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index 69de5ef2bd..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index c45139955a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_1.data Binary files differdeleted file mode 100644 index 815d4fc7db..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index c933a04c07..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index 69de5ef2bd..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index c45139955a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_1.data Binary files differdeleted file mode 100644 index ee113d1cf3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index 1e07040ef4..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index cc7ab7dff8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index 450072bc4e..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_0.data Binary files differdeleted file mode 100644 index 379e87b914..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_1.data Binary files differdeleted file mode 100644 index 2785156fb3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_2.data Binary files differdeleted file mode 100644 index 6dc818abc3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_3.data Binary files differdeleted file mode 100644 index d41a1f75d3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_4.data Binary files differdeleted file mode 100644 index f5a0d874d4..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_1.data Binary files differdeleted file mode 100644 index 815d4fc7db..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index c933a04c07..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index 69de5ef2bd..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index 40269f4e0c..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_1.data Binary files differdeleted file mode 100644 index 815d4fc7db..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index c933a04c07..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index 69de5ef2bd..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index 40269f4e0c..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_1.data Binary files differdeleted file mode 100644 index ee113d1cf3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index 1e07040ef4..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index cc7ab7dff8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index beea1c3663..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_0.data Binary files differdeleted file mode 100644 index 379e87b914..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_1.data Binary files differdeleted file mode 100644 index 2785156fb3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_2.data Binary files differdeleted file mode 100644 index 6dc818abc3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_3.data Binary files differdeleted file mode 100644 index d41a1f75d3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_4.data Binary files differdeleted file mode 100644 index e20c76a82c..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_1.data Binary files differdeleted file mode 100644 index 815d4fc7db..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index c933a04c07..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index 69de5ef2bd..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index c45139955a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_1.data Binary files differdeleted file mode 100644 index 815d4fc7db..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index c933a04c07..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index 69de5ef2bd..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index c45139955a..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_1.data Binary files differdeleted file mode 100644 index ee113d1cf3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index 1e07040ef4..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index cc7ab7dff8..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index 450072bc4e..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_0.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_0.data Binary files differdeleted file mode 100644 index 379e87b914..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_1.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_1.data Binary files differdeleted file mode 100644 index 2785156fb3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_2.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_2.data Binary files differdeleted file mode 100644 index 6dc818abc3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_3.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_3.data Binary files differdeleted file mode 100644 index d41a1f75d3..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_4.data b/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_4.data Binary files differdeleted file mode 100644 index f5a0d874d4..0000000000 --- a/tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ -foo
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ -foo
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index 4d5bdc553e..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index 3cf181c23c..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index f7f74e56a0..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index 849ecb39ed..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index 8b9647f06f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index d73722e724..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index 4d5bdc553e..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index 3cf181c23c..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index f7f74e56a0..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ -foo
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_2.data Binary files differdeleted file mode 100644 index 104e45f940..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_3.data Binary files differdeleted file mode 100644 index 3135276780..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_4.data Binary files differdeleted file mode 100644 index 993d0b9e19..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ -A
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ -B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ -Z
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_3.data deleted file mode 100644 index fa7af8bf5f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ -z
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_4.data deleted file mode 100644 index b516b2c489..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ -@
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ -A
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ -B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ -Z
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_3.data deleted file mode 100644 index fa7af8bf5f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ -z
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_4.data deleted file mode 100644 index b516b2c489..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ -@
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_0.data Binary files differdeleted file mode 100644 index e2b43e3781..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_1.data Binary files differdeleted file mode 100644 index 962fc922ad..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index 839cc09ec8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index f71ac66a63..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index 88f99805e3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_0.data Binary files differdeleted file mode 100644 index 6def16c99e..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_1.data Binary files differdeleted file mode 100644 index 57302ad8e7..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index 239c14d498..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index 8fbd3327c8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index d745e1be7b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_0.data Binary files differdeleted file mode 100644 index e2b43e3781..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_1.data Binary files differdeleted file mode 100644 index 962fc922ad..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index 839cc09ec8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index f71ac66a63..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index 88f99805e3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ -A
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ -B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ -Z
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_3.data deleted file mode 100644 index fa7af8bf5f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ -z
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_4.data deleted file mode 100644 index b516b2c489..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ -@
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_0.data Binary files differdeleted file mode 100644 index 9ac3ad9a6b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_1.data Binary files differdeleted file mode 100644 index bb28df16b9..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_2.data Binary files differdeleted file mode 100644 index 8c0f57437b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_3.data Binary files differdeleted file mode 100644 index d494004e64..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_4.data Binary files differdeleted file mode 100644 index de421979ea..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ -foo
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ -foo
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index 4d5bdc553e..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index 3cf181c23c..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index f7f74e56a0..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index 849ecb39ed..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index 8b9647f06f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index d73722e724..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index 4d5bdc553e..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index 3cf181c23c..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index f7f74e56a0..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_2.data deleted file mode 100644 index 1910281566..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ -foo
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_3.data deleted file mode 100644 index a907ec3f43..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1,2 +0,0 @@ -foo -bar
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_4.data deleted file mode 100644 index 61cd46aacc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ -cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_0.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_1.data deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_2.data Binary files differdeleted file mode 100644 index 104e45f940..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_3.data Binary files differdeleted file mode 100644 index 3135276780..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_4.data Binary files differdeleted file mode 100644 index 993d0b9e19..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ -A
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ -B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ -Z
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_3.data deleted file mode 100644 index 9280c0d31d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_4.data deleted file mode 100644 index c227083464..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ -0
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ -A
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ -B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ -Z
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_3.data deleted file mode 100644 index 9280c0d31d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_4.data deleted file mode 100644 index c227083464..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ -0
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_0.data Binary files differdeleted file mode 100644 index e2b43e3781..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_1.data Binary files differdeleted file mode 100644 index 962fc922ad..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index 839cc09ec8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index c33473a370..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index def7fcb589..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_0.data Binary files differdeleted file mode 100644 index 6def16c99e..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_1.data Binary files differdeleted file mode 100644 index 57302ad8e7..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index 239c14d498..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index 819b31d1f2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index a6ff072af1..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_0.data Binary files differdeleted file mode 100644 index e2b43e3781..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_1.data Binary files differdeleted file mode 100644 index 962fc922ad..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index 839cc09ec8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index c33473a370..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index def7fcb589..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_0.data deleted file mode 100644 index 8c7e5a667f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ -A
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_1.data deleted file mode 100644 index 7371f47a6f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ -B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_2.data deleted file mode 100644 index 0f13712411..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ -Z
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_3.data deleted file mode 100644 index 9280c0d31d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_4.data deleted file mode 100644 index c227083464..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ -0
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_0.data Binary files differdeleted file mode 100644 index 9ac3ad9a6b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_1.data Binary files differdeleted file mode 100644 index bb28df16b9..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_2.data Binary files differdeleted file mode 100644 index 8c0f57437b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_3.data Binary files differdeleted file mode 100644 index 878dc8a26e..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_4.data Binary files differdeleted file mode 100644 index fd0779e0f3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_5.data deleted file mode 100644 index 80aed3622e..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_5.data +++ /dev/null @@ -1 +0,0 @@ - A 1.23456789 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_6.data deleted file mode 100644 index aec027753d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_6.data +++ /dev/null @@ -1 +0,0 @@ - A -1.23456789 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_5.data deleted file mode 100644 index 80aed3622e..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_5.data +++ /dev/null @@ -1 +0,0 @@ - A 1.23456789 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_6.data deleted file mode 100644 index aec027753d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_6.data +++ /dev/null @@ -1 +0,0 @@ - A -1.23456789 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_1.data Binary files differdeleted file mode 100644 index fb911f7352..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index efbc06bf26..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index 4d857caa13..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index b125e2084f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_5.data Binary files differdeleted file mode 100644 index f39fbde113..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_6.data Binary files differdeleted file mode 100644 index 5436b427ed..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_1.data Binary files differdeleted file mode 100644 index 67ce8d83c8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index 9662a9aaa1..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index a74511b101..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index bdc06a6ec2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_5.data Binary files differdeleted file mode 100644 index 79b15d4d8a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_6.data Binary files differdeleted file mode 100644 index 2141e65843..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_1.data Binary files differdeleted file mode 100644 index fb911f7352..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index efbc06bf26..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index 4d857caa13..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index b125e2084f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_5.data Binary files differdeleted file mode 100644 index f39fbde113..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_6.data Binary files differdeleted file mode 100644 index 5436b427ed..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_5.data deleted file mode 100644 index 80aed3622e..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_5.data +++ /dev/null @@ -1 +0,0 @@ - A 1.23456789 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_6.data deleted file mode 100644 index aec027753d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_6.data +++ /dev/null @@ -1 +0,0 @@ - A -1.23456789 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_0.data Binary files differdeleted file mode 100644 index 379e87b914..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_1.data Binary files differdeleted file mode 100644 index e6b94bbeb3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_2.data Binary files differdeleted file mode 100644 index fb0a550264..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_3.data Binary files differdeleted file mode 100644 index 48fe53930f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_4.data Binary files differdeleted file mode 100644 index 811e93212d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_5.data Binary files differdeleted file mode 100644 index 7041fa9b4d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_6.data Binary files differdeleted file mode 100644 index 9fd21fade0..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_1.data Binary files differdeleted file mode 100644 index fb911f7352..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index efbc06bf26..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index 4d857caa13..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index b125e2084f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_1.data Binary files differdeleted file mode 100644 index 67ce8d83c8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index 9662a9aaa1..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index a74511b101..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index bdc06a6ec2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_1.data Binary files differdeleted file mode 100644 index fb911f7352..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index efbc06bf26..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index 4d857caa13..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index b125e2084f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_1.data deleted file mode 100644 index d2fa166d7d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_2.data deleted file mode 100644 index 1d0fa9e6a6..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A -0.0001 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_3.data deleted file mode 100644 index e47d45c143..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_4.data deleted file mode 100644 index 47ce07d283..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A -3.45678 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_0.data Binary files differdeleted file mode 100644 index 379e87b914..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_1.data Binary files differdeleted file mode 100644 index e6b94bbeb3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_2.data Binary files differdeleted file mode 100644 index fb0a550264..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_3.data Binary files differdeleted file mode 100644 index 48fe53930f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_4.data Binary files differdeleted file mode 100644 index 811e93212d..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_8.data deleted file mode 100644 index f4aefab396..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_8.data +++ /dev/null @@ -1 +0,0 @@ - A -512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_8.data deleted file mode 100644 index f4aefab396..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_8.data +++ /dev/null @@ -1 +0,0 @@ - A -512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_1.data Binary files differdeleted file mode 100644 index ee113d1cf3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index 1e07040ef4..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index cc7ab7dff8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index 450072bc4e..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_5.data Binary files differdeleted file mode 100644 index 73f5f259f8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_6.data Binary files differdeleted file mode 100644 index 9805422dfb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_7.data Binary files differdeleted file mode 100644 index 77f557a494..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_7.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_8.data Binary files differdeleted file mode 100644 index 8dd6a4b38e..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_8.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_1.data Binary files differdeleted file mode 100644 index 815d4fc7db..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index c933a04c07..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index 69de5ef2bd..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index c45139955a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_5.data Binary files differdeleted file mode 100644 index 396352f4d6..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_6.data Binary files differdeleted file mode 100644 index ea73fac731..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_7.data Binary files differdeleted file mode 100644 index 1f4f1a58de..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_7.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_8.data Binary files differdeleted file mode 100644 index 9469ca407f..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_8.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_1.data Binary files differdeleted file mode 100644 index ee113d1cf3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index 1e07040ef4..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index cc7ab7dff8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index 450072bc4e..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_5.data Binary files differdeleted file mode 100644 index 73f5f259f8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_6.data Binary files differdeleted file mode 100644 index 9805422dfb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_7.data Binary files differdeleted file mode 100644 index 77f557a494..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_7.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_8.data Binary files differdeleted file mode 100644 index 8dd6a4b38e..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_8.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_8.data deleted file mode 100644 index f4aefab396..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_8.data +++ /dev/null @@ -1 +0,0 @@ - A -512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_0.data Binary files differdeleted file mode 100644 index 379e87b914..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_1.data Binary files differdeleted file mode 100644 index 2785156fb3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_2.data Binary files differdeleted file mode 100644 index 6dc818abc3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_3.data Binary files differdeleted file mode 100644 index d41a1f75d3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_4.data Binary files differdeleted file mode 100644 index f5a0d874d4..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_5.data Binary files differdeleted file mode 100644 index 95742ec8f2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_6.data Binary files differdeleted file mode 100644 index ebb14b2fbd..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_7.data Binary files differdeleted file mode 100644 index a9e1432ca9..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_7.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_8.data Binary files differdeleted file mode 100644 index b7e6743c28..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_8.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_8.data deleted file mode 100644 index cab2ee4938..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_8.data +++ /dev/null @@ -1 +0,0 @@ - A -65534 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_8.data deleted file mode 100644 index cab2ee4938..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_8.data +++ /dev/null @@ -1 +0,0 @@ - A -65534 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_1.data Binary files differdeleted file mode 100644 index ee113d1cf3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index 1e07040ef4..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index cc7ab7dff8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index beea1c3663..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_5.data Binary files differdeleted file mode 100644 index 73f5f259f8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_6.data Binary files differdeleted file mode 100644 index 9805422dfb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_7.data Binary files differdeleted file mode 100644 index 77f557a494..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_7.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_8.data Binary files differdeleted file mode 100644 index be6f22a5ea..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_8.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_1.data Binary files differdeleted file mode 100644 index 815d4fc7db..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index c933a04c07..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index 69de5ef2bd..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index 40269f4e0c..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_5.data Binary files differdeleted file mode 100644 index 396352f4d6..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_6.data Binary files differdeleted file mode 100644 index ea73fac731..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_7.data Binary files differdeleted file mode 100644 index 1f4f1a58de..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_7.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_8.data Binary files differdeleted file mode 100644 index e8051f8906..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_8.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_1.data Binary files differdeleted file mode 100644 index ee113d1cf3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index 1e07040ef4..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index cc7ab7dff8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index beea1c3663..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_5.data Binary files differdeleted file mode 100644 index 73f5f259f8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_6.data Binary files differdeleted file mode 100644 index 9805422dfb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_7.data Binary files differdeleted file mode 100644 index 77f557a494..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_7.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_8.data Binary files differdeleted file mode 100644 index be6f22a5ea..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_8.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_5.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_5.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_6.data deleted file mode 100644 index f171cb6c0c..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_6.data +++ /dev/null @@ -1 +0,0 @@ - A -10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_7.data deleted file mode 100644 index de18d40ee8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_7.data +++ /dev/null @@ -1 +0,0 @@ - A -255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_8.data deleted file mode 100644 index cab2ee4938..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_8.data +++ /dev/null @@ -1 +0,0 @@ - A -65534 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_0.data Binary files differdeleted file mode 100644 index 379e87b914..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_1.data Binary files differdeleted file mode 100644 index 2785156fb3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_2.data Binary files differdeleted file mode 100644 index 6dc818abc3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_3.data Binary files differdeleted file mode 100644 index d41a1f75d3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_4.data Binary files differdeleted file mode 100644 index e20c76a82c..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_5.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_5.data Binary files differdeleted file mode 100644 index 95742ec8f2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_5.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_6.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_6.data Binary files differdeleted file mode 100644 index ebb14b2fbd..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_6.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_7.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_7.data Binary files differdeleted file mode 100644 index a9e1432ca9..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_7.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_8.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_8.data Binary files differdeleted file mode 100644 index f8ec5bc443..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_8.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_1.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_2.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_4.data deleted file mode 100644 index 02b7f3ab7b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A -254 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_1.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_2.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_4.data deleted file mode 100644 index 02b7f3ab7b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A -254 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_1.data Binary files differdeleted file mode 100644 index 73f5f259f8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index ee113d1cf3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index cc7ab7dff8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index 584b17ea18..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_1.data Binary files differdeleted file mode 100644 index 396352f4d6..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index 815d4fc7db..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index 69de5ef2bd..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index 0dc83d2713..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_1.data Binary files differdeleted file mode 100644 index 73f5f259f8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index ee113d1cf3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index cc7ab7dff8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index 584b17ea18..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_1.data deleted file mode 100644 index ef70e7dc3a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A -1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_2.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_4.data deleted file mode 100644 index 02b7f3ab7b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A -254 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_0.data Binary files differdeleted file mode 100644 index 379e87b914..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_1.data Binary files differdeleted file mode 100644 index 95742ec8f2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_2.data Binary files differdeleted file mode 100644 index 2785156fb3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_3.data Binary files differdeleted file mode 100644 index d41a1f75d3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_4.data Binary files differdeleted file mode 100644 index 80d3ca2ef1..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_1.data Binary files differdeleted file mode 100644 index ee113d1cf3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index 1e07040ef4..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index cc7ab7dff8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index 450072bc4e..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_1.data Binary files differdeleted file mode 100644 index 815d4fc7db..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index c933a04c07..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index 69de5ef2bd..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index c45139955a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_1.data Binary files differdeleted file mode 100644 index ee113d1cf3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index 1e07040ef4..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index cc7ab7dff8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index 450072bc4e..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_0.data Binary files differdeleted file mode 100644 index 379e87b914..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_1.data Binary files differdeleted file mode 100644 index 2785156fb3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_2.data Binary files differdeleted file mode 100644 index 6dc818abc3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_3.data Binary files differdeleted file mode 100644 index d41a1f75d3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_4.data Binary files differdeleted file mode 100644 index f5a0d874d4..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_1.data Binary files differdeleted file mode 100644 index ee113d1cf3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index 1e07040ef4..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index cc7ab7dff8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index beea1c3663..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_1.data Binary files differdeleted file mode 100644 index 815d4fc7db..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index c933a04c07..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index 69de5ef2bd..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index 40269f4e0c..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_1.data Binary files differdeleted file mode 100644 index ee113d1cf3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index 1e07040ef4..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index cc7ab7dff8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index beea1c3663..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_4.data deleted file mode 100644 index f667f77c45..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A 65535 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_0.data Binary files differdeleted file mode 100644 index 379e87b914..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_1.data Binary files differdeleted file mode 100644 index 2785156fb3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_2.data Binary files differdeleted file mode 100644 index 6dc818abc3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_3.data Binary files differdeleted file mode 100644 index d41a1f75d3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_4.data Binary files differdeleted file mode 100644 index e20c76a82c..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_1.data Binary files differdeleted file mode 100644 index ee113d1cf3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_2.data Binary files differdeleted file mode 100644 index 1e07040ef4..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_3.data Binary files differdeleted file mode 100644 index cc7ab7dff8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_4.data Binary files differdeleted file mode 100644 index 450072bc4e..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_0.data Binary files differdeleted file mode 100644 index feac21f921..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_1.data Binary files differdeleted file mode 100644 index 815d4fc7db..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_2.data Binary files differdeleted file mode 100644 index c933a04c07..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_3.data Binary files differdeleted file mode 100644 index 69de5ef2bd..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_4.data Binary files differdeleted file mode 100644 index c45139955a..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_0.data Binary files differdeleted file mode 100644 index 775ae0f25b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_1.data Binary files differdeleted file mode 100644 index ee113d1cf3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_2.data Binary files differdeleted file mode 100644 index 1e07040ef4..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_3.data Binary files differdeleted file mode 100644 index cc7ab7dff8..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_4.data Binary files differdeleted file mode 100644 index 450072bc4e..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_0.data deleted file mode 100644 index 35282318cb..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_0.data +++ /dev/null @@ -1 +0,0 @@ - A 0 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_1.data deleted file mode 100644 index 30c3a50213..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_1.data +++ /dev/null @@ -1 +0,0 @@ - A 1 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_2.data deleted file mode 100644 index 9d64c07ef2..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_2.data +++ /dev/null @@ -1 +0,0 @@ - A 10 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_3.data deleted file mode 100644 index 6b37eb602b..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_3.data +++ /dev/null @@ -1 +0,0 @@ - A 255 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_4.data deleted file mode 100644 index c0e22423bc..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_4.data +++ /dev/null @@ -1 +0,0 @@ - A 512 B
\ No newline at end of file diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_0.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_0.data Binary files differdeleted file mode 100644 index 379e87b914..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_0.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_1.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_1.data Binary files differdeleted file mode 100644 index 2785156fb3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_1.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_2.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_2.data Binary files differdeleted file mode 100644 index 6dc818abc3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_2.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_3.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_3.data Binary files differdeleted file mode 100644 index d41a1f75d3..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_3.data +++ /dev/null diff --git a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_4.data b/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_4.data Binary files differdeleted file mode 100644 index f5a0d874d4..0000000000 --- a/tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_4.data +++ /dev/null diff --git a/tests/auto/qtextstream/tst_qtextstream.cpp b/tests/auto/qtextstream/tst_qtextstream.cpp index 2d7c24d238..b086a213c8 100644 --- a/tests/auto/qtextstream/tst_qtextstream.cpp +++ b/tests/auto/qtextstream/tst_qtextstream.cpp @@ -243,45 +243,6 @@ private slots: void generateBOM(); void readBomSeekBackReadBomAgain(); - // old tests -#ifdef QT3_SUPPORT - void qt3_operator_shiftleft_data(); - void qt3_operator_shiftleft(); - void qt3_operator_shiftright_data(); - void qt3_operator_shiftright(); - void qt3_operator_shift_QChar_data(); - void qt3_operator_shift_QChar(); - void qt3_operator_shift_char_data(); - void qt3_operator_shift_char(); - void qt3_operator_shift_short_data(); - void qt3_operator_shift_short(); - void qt3_operator_shift_ushort_data(); - void qt3_operator_shift_ushort(); - void qt3_operator_shift_int_data(); - void qt3_operator_shift_int(); - void qt3_operator_shift_uint_data(); - void qt3_operator_shift_uint(); - void qt3_operator_shift_long_data(); - void qt3_operator_shift_long(); - void qt3_operator_shift_ulong_data(); - void qt3_operator_shift_ulong(); - void qt3_operator_shift_float_data(); - void qt3_operator_shift_float(); - void qt3_operator_shift_double_data(); - void qt3_operator_shift_double(); - void qt3_operator_shift_QString_data(); - void qt3_operator_shift_QString(); - void qt3_operator_shift_QByteArray_data(); - void qt3_operator_shift_QByteArray(); - - void qt3_writeDataToFileReadAsLines_data(); - void qt3_writeDataToFileReadAsLines(); - void qt3_writeDataToQStringReadAsLines_data(); - void qt3_writeDataToQStringReadAsLines(); - - void qt3_readLineFromString(); -#endif - // task-specific tests void task180679_alignAccountingStyle(); void task178772_setCodec(); @@ -294,54 +255,6 @@ private: void generateRealNumbersData(bool for_QString); void generateStringData(bool for_QString); void generateRealNumbersDataWrite(); - - // Qt 3 privates -#ifdef QT3_SUPPORT - void qt3_createWriteStream( QTextStream *&os ); - void qt3_closeWriteStream( QTextStream *os ); - void qt3_createReadStream( QTextStream *&is ); - void qt3_closeReadStream( QTextStream *is ); - void qt3_read_QChar( QTextStream *s ); - void qt3_write_QChar( QTextStream *s ); - void qt3_read_char( QTextStream *s ); - void qt3_write_char( QTextStream *s ); - void qt3_read_short( QTextStream *s ); - void qt3_write_short( QTextStream *s ); - void qt3_read_ushort( QTextStream *s ); - void qt3_write_ushort( QTextStream *s ); - void qt3_read_int( QTextStream *s ); - void qt3_write_int( QTextStream *s ); - void qt3_read_uint( QTextStream *s ); - void qt3_write_uint( QTextStream *s ); - void qt3_read_long( QTextStream *s ); - void qt3_write_long( QTextStream *s ); - void qt3_read_ulong( QTextStream *s ); - void qt3_write_ulong( QTextStream *s ); - void qt3_read_float( QTextStream *s ); - void qt3_write_float( QTextStream *s ); - void qt3_read_double( QTextStream *s ); - void qt3_write_double( QTextStream *s ); - void qt3_read_QString( QTextStream *s ); - void qt3_write_QString( QTextStream *s ); - void qt3_read_QByteArray( QTextStream *s ); - void qt3_write_QByteArray( QTextStream *s ); - void qt3_operatorShift_data( QIODevice::OpenMode ); - void qt3_do_shiftleft( QTextStream *ts ); - QTextStream::Encoding qt3_toEncoding( const QString& ); - QString qt3_decodeString( QByteArray array, const QString& encoding ); -#endif - - // Qt 3 data - QTextStream *os; - QTextStream *is; - QTextStream *ts; - QFile *inFile; - QFile *inResource; - QFile *outFile; - QByteArray *inArray; - QBuffer *inBuffer; - QString *inString; - bool file_is_empty; }; // Testing get/set functions @@ -465,18 +378,6 @@ void tst_QTextStream::getSetCheck() tst_QTextStream::tst_QTextStream() { - // Initialize Qt 3 data - ts = 0; - os = 0; - is = 0; - outFile = 0; - inFile = 0; - inResource = 0; - inArray = 0; - inBuffer = 0; - inString = 0; - file_is_empty = FALSE; - Q_SET_DEFAULT_IAP } @@ -486,41 +387,10 @@ tst_QTextStream::~tst_QTextStream() void tst_QTextStream::init() { - // Initialize Qt 3 data - ts = 0; - os = 0; - is = 0; - inFile = 0; - inResource = 0; - outFile = 0; - inArray = 0; - inBuffer = 0; - inString = 0; - file_is_empty = FALSE; } void tst_QTextStream::cleanup() { - // Clean up Qt 3 data - delete ts; - ts = 0; - delete os; - os = 0; - delete is; - is = 0; - delete inResource; - inResource = 0; - delete inFile; - inFile = 0; - delete outFile; - outFile = 0; - delete inArray; - inArray = 0; - delete inBuffer; - inBuffer = 0; - delete inString; - inString = 0; - QCoreApplication::instance()->processEvents(); } @@ -2710,7 +2580,7 @@ void tst_QTextStream::readBomSeekBackReadBomAgain() QFile::remove("utf8bom"); QFile file("utf8bom"); QVERIFY(file.open(QFile::ReadWrite)); - file.write("\xef\xbb\xbf""Andreas"); + file.write("\xef\xbb\xbf" "Andreas"); file.seek(0); QCOMPARE(file.pos(), qint64(0)); @@ -2725,1416 +2595,6 @@ void tst_QTextStream::readBomSeekBackReadBomAgain() } // ------------------------------------------------------------------------------ -// QT 3 tests -// ------------------------------------------------------------------------------ -#ifdef QT3_SUPPORT - -void tst_QTextStream::qt3_readLineFromString() -{ - QString data = "line 1e\nline 2e\nline 3e"; - QStringList list; - QTextStream stream(&data, QIODevice::ReadOnly); - stream.setCodec(QTextCodec::codecForName("ISO-8859-1")); - stream.setAutoDetectUnicode(true); - - while (!stream.atEnd()) { - QString line = stream.readLine(); - QCOMPARE(QChar(line[line.size()-1]), QChar('e')); - list << line; - } - QVERIFY(list.count() == 3); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shiftright_data() -{ - qt3_operatorShift_data( QIODevice::ReadOnly ); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shiftleft_data() -{ - qt3_operatorShift_data( QIODevice::WriteOnly ); -} - -static const double doubleDummy = 567.89; -static const int intDummy = 1234; -static const QString stringDummy = "ABCD"; - -struct tst_IODevice { - char *n; - QIODevice::OpenModeFlag modes; - QString name() const { return QString::fromLatin1(n); } -} devices[] = { - { "file", QIODevice::ReadWrite }, - { "bytearray", QIODevice::ReadWrite }, - { "buffer", QIODevice::ReadWrite }, - { "string", QIODevice::ReadWrite }, - { "resource", QIODevice::ReadOnly }, //See discussion (resources) below - { 0, (QIODevice::OpenModeFlag)0 } -}; - -/* Resources: - - This will test QTextStream's ability to interact with resources, - however the trouble is the resources must be created correctly and - built into the executable (but this executable also creates the - resource files). So there is a chicken and egg problem, to create - resources (if the file formats change at all): - - 1) p4 edit resources/... - - 2) Change QIODevice::ReadOnly above in the devices[] for "resource" - to QIODevice::WriteOnly - - 3) run the test - - 4) revert this file, qmake, make, and run again. - - 5) Enjoy. -*/ - -static inline QString resourceDir() -{ - QString ret = "resources/"; - if(QSysInfo::ByteOrder == QSysInfo::BigEndian) - ret += "big_endian/"; - else - ret += "little_endian/"; - return ret; -} - -static const char *const encodings[] = { - "Locale", - "Latin1", - "Unicode", - "UnicodeNetworkOrder", - "UnicodeReverse", - "RawUnicode", - "UnicodeUTF8", - 0 -}; - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operatorShift_data( QIODevice::OpenMode mode ) -{ - QTest::addColumn<QString>("device"); - QTest::addColumn<QString>("encoding"); - QTest::addColumn<QString>("type"); - QTest::addColumn<double>("doubleVal"); - QTest::addColumn<int>("intVal"); - QTest::addColumn<QString>("stringVal"); - QTest::addColumn<QByteArray>("encoded"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - if(!(device->modes & mode)) - continue; - - /* - We first test each type at least once. - */ - QTest::newRow( device->name() + "0" ) << device->name() << QString("UnicodeUTF8") << QString("QChar") - << doubleDummy << (int) 'Z' << stringDummy - << QByteArray( QByteArray("Z") ); - QTest::newRow( device->name() + "1" ) << device->name() << QString("UnicodeUTF8") << QString("char") - << doubleDummy << (int) 'Z' << stringDummy - << QByteArray( QByteArray("Z") ); - QTest::newRow( device->name() + "2" ) << device->name() << QString("UnicodeUTF8") << QString("signed short") - << doubleDummy << 12345 << stringDummy - << QByteArray( QByteArray("12345") ); - QTest::newRow( device->name() + "3" ) << device->name() << QString("UnicodeUTF8") << QString("unsigned short") - << doubleDummy << 12345 << stringDummy - << QByteArray( QByteArray("12345") ); - QTest::newRow( device->name() + "4" ) << device->name() << QString("UnicodeUTF8") << QString("signed int") - << doubleDummy << 12345 << stringDummy - << QByteArray( QByteArray("12345") ); - QTest::newRow( device->name() + "5" ) << device->name() << QString("UnicodeUTF8") << QString("unsigned int") - << doubleDummy << 12345 << stringDummy - << QByteArray( QByteArray("12345") ); - QTest::newRow( device->name() + "6" ) << device->name() << QString("UnicodeUTF8") << QString("signed long") - << doubleDummy << 12345 << stringDummy - << QByteArray( QByteArray("12345") ); - QTest::newRow( device->name() + "7" ) << device->name() << QString("UnicodeUTF8") << QString("unsigned long") - << doubleDummy << 12345 << stringDummy - << QByteArray( QByteArray("12345") ); - QTest::newRow( device->name() + "8" ) << device->name() << QString("UnicodeUTF8") << QString("float") - << (double)3.1415f << intDummy << stringDummy - << QByteArray( QByteArray("3.1415") ); - QTest::newRow( device->name() + "9" ) << device->name() << QString("UnicodeUTF8") << QString("double") - << 3.1415 << intDummy << stringDummy - << QByteArray( QByteArray("3.1415") ); - QTest::newRow( device->name() + "10" ) << device->name() << QString("UnicodeUTF8") << QString("char *") - << doubleDummy << intDummy << QString("I-am-a-string") - << QByteArray( QByteArray("I-am-a-string") ); - QTest::newRow( device->name() + "11" ) << device->name() << QString("UnicodeUTF8") << QString("QString") - << doubleDummy << intDummy << QString("I-am-a-string") - << QByteArray( QByteArray("I-am-a-string") ); - QTest::newRow( device->name() + "12" ) << device->name() << QString("UnicodeUTF8") << QString("QByteArray") - << doubleDummy << intDummy << QString("I-am-a-string") - << QByteArray( QByteArray("I-am-a-string") ); - - /* - Then we test some special cases that have caused problems in the past. - */ - QTest::newRow( device->name() + "20" ) << device->name() << QString("UnicodeUTF8") << QString("QChar") - << doubleDummy << 0xff8c << stringDummy - << QByteArray( QByteArray("\xef\xbe\x8c") ); - QTest::newRow( device->name() + "21" ) << device->name() << QString("UnicodeUTF8") << QString("QChar") - << doubleDummy << 0x8cff << stringDummy - << QByteArray( QByteArray("\xe8\xb3\xbf") ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_do_shiftleft( QTextStream *ts ) -{ - QFETCH( QString, encoding ); - QFETCH( QString, type ); - QFETCH( double, doubleVal ); - QFETCH( int, intVal ); - QFETCH( QString, stringVal ); - - ts->setEncoding( qt3_toEncoding(encoding) ); - - if ( type == "QChar" ) { - if ( intVal >= 0 && intVal <= 0xffff ) - *ts << QChar( intVal ); - } else if ( type == "char" ) { - *ts << (char) intVal; - } else if ( type == "signed short" ) { - *ts << (signed short) intVal; - } else if ( type == "unsigned short" ) { - *ts << (unsigned short) intVal; - } else if ( type == "signed int" ) { - *ts << (signed int) intVal; - } else if ( type == "unsigned int" ) { - *ts << (unsigned int) intVal; - } else if ( type == "signed long" ) { - *ts << (signed long) intVal; - } else if ( type == "unsigned long" ) { - *ts << (unsigned long) intVal; - } else if ( type == "float" ) { - *ts << (float) doubleVal; - } else if ( type == "double" ) { - *ts << (double) doubleVal; - } else if ( type == "char *" ) { - *ts << stringVal.latin1(); - } else if ( type == "QString" ) { - *ts << stringVal; - } else if ( type == "QByteArray" ) { - *ts << QByteArray( stringVal.latin1() ); - } else { - QWARN( "Unknown type: %s" + type ); - } - - ts->flush(); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shiftleft() -{ - QFETCH( QString, device ); - QFETCH( QString, encoding ); - QFETCH( QByteArray, encoded ); - - if ( device == "file" ) { - QFile outFile( "qtextstream.out" ); - QVERIFY( outFile.open( QIODevice::WriteOnly ) ); - QTextStream ts( &outFile ); - - qt3_do_shiftleft( &ts ); - outFile.close(); - - QFile inFile( "qtextstream.out" ); - QVERIFY( inFile.open( QIODevice::ReadOnly ) ); - QCOMPARE( inFile.readAll().constData(), encoded.constData() ); - } else if(device == "resource" ) { //ONLY TO CREATE THE RESOURCE!! NOT A TEST! - QFile outFile( resourceDir() + "operator_shiftright_" + QTest::currentDataTag() + ".data" ); - QVERIFY( outFile.open( QIODevice::WriteOnly ) ); - QTextStream ts( &outFile ); - qt3_do_shiftleft( &ts ); - outFile.close(); - } else if ( device == "bytearray" ) { - QByteArray outArray; - QTextStream ts(&outArray, QIODevice::WriteOnly ); - - qt3_do_shiftleft( &ts ); - - QVERIFY( outArray == encoded ); - } else if ( device == "buffer" ) { - QByteArray outArray; - QBuffer outBuffer(&outArray); - QVERIFY( outBuffer.open(QIODevice::WriteOnly) ); - QTextStream ts( &outBuffer ); - - qt3_do_shiftleft( &ts ); - - QCOMPARE( outArray, encoded ); - } else if ( device == "string" ) { - QString outString; - QTextStream ts( &outString, QIODevice::WriteOnly ); - - qt3_do_shiftleft( &ts ); - - QString decodedString = qt3_decodeString( encoded, encoding ); - QCOMPARE( outString, decodedString ); - } else { - QWARN( "Unknown device type: " + device ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shiftright() -{ - QFETCH( QString, device ); - QFETCH( QString, encoding ); - QFETCH( QString, type ); - QFETCH( double, doubleVal ); - QFETCH( int, intVal ); - QFETCH( QString, stringVal ); - QFETCH( QByteArray, encoded ); - - if ( device == "file" ) { - QFile outFile( "qtextstream.out" ); - QVERIFY( outFile.open( QIODevice::WriteOnly ) ); - QVERIFY( (int) outFile.write(encoded) == (int) encoded.size() ); - outFile.close(); - - inFile = new QFile( "qtextstream.out" ); - QVERIFY( inFile->open( QIODevice::ReadOnly ) ); - ts = new QTextStream( inFile ); - } else if(device == "resource" ) { - inResource = new QFile( ":/tst_textstream/" + resourceDir() + "operator_shiftright_" + QTest::currentDataTag() + ".data" ); - QVERIFY( inResource->open( QIODevice::ReadOnly ) ); - ts = new QTextStream( inResource ); - } else if ( device == "bytearray" ) { - ts = new QTextStream(&encoded, QIODevice::ReadOnly); - } else if ( device == "buffer" ) { - inBuffer = new QBuffer(&encoded); - QVERIFY( inBuffer->open(QIODevice::ReadOnly) ); - ts = new QTextStream( inBuffer ); - } else if ( device == "string" ) { - inString = new QString( qt3_decodeString(encoded, encoding) ); - ts = new QTextStream(inString, QIODevice::ReadOnly); - } else { - QWARN( "Unknown device type: " + device ); - } - - ts->setEncoding( qt3_toEncoding(encoding) ); - - if ( type == "QChar" ) { - QChar c; - if ( intVal >= 0 && intVal <= 0xffff ) - *ts >> c; - QCOMPARE( c.toLatin1(), QChar(intVal).toLatin1() ); - } else if ( type == "char" ) { - char c; - *ts >> c; - QCOMPARE( c, (char) intVal ); - } else if ( type == "signed short" ) { - signed short h; - *ts >> h; - QCOMPARE( h, (signed short) intVal ); - } else if ( type == "unsigned short" ) { - unsigned short h; - *ts >> h; - QCOMPARE( h, (unsigned short) intVal ); - } else if ( type == "signed int" ) { - signed int i; - *ts >> i; - QCOMPARE( i, (signed int) intVal ); - } else if ( type == "unsigned int" ) { - unsigned int i; - *ts >> i; - QCOMPARE( i, (unsigned int) intVal ); - } else if ( type == "signed long" ) { - signed long ell; - *ts >> ell; - QCOMPARE( ell, (signed long) intVal ); - } else if ( type == "unsigned long" ) { - unsigned long ell; - *ts >> ell; - QCOMPARE( ell, (unsigned long) intVal ); - } else if ( type == "float" ) { - float f; - *ts >> f; - QCOMPARE( f, (float) doubleVal ); - } else if ( type == "double" ) { - double d; - *ts >> d; - QCOMPARE( d, (double) doubleVal ); - } else if ( type == "char *" ) { - char *cp = new char[2048]; - *ts >> cp; - QVERIFY( qstrcmp(cp, stringVal.latin1()) == 0 ); - delete[] cp; - } else if ( type == "QString" ) { - QString s; - *ts >> s; - QCOMPARE( s, stringVal ); - } else if ( type == "QByteArray" ) { - QByteArray s; - *ts >> s; - QCOMPARE( QString::fromLatin1(s), stringVal ); - } else { - QWARN( "Unknown type: %s" + type ); - } -} - -// ------------------------------------------------------------------------------ -QTextStream::Encoding tst_QTextStream::qt3_toEncoding( const QString &str ) -{ - if ( str == "Locale" ) - return QTextStream::Locale; - else if ( str == "Latin1" ) - return QTextStream::Latin1; - else if ( str == "Unicode" ) - return QTextStream::Unicode; - else if ( str == "UnicodeNetworkOrder" ) - return QTextStream::UnicodeNetworkOrder; - else if ( str == "UnicodeReverse" ) - return QTextStream::UnicodeReverse; - else if ( str == "RawUnicode" ) - return QTextStream::RawUnicode; - else if ( str == "UnicodeUTF8" ) - return QTextStream::UnicodeUTF8; - - QWARN( "No such encoding " + str ); - return QTextStream::Latin1; -} - -// ------------------------------------------------------------------------------ -QString tst_QTextStream::qt3_decodeString( QByteArray array, const QString& encoding ) -{ - switch ( qt3_toEncoding(encoding) ) { - case QTextStream::Locale: - return QString::fromLocal8Bit( array.data(), array.size() ); - case QTextStream::Latin1: - return QString::fromLatin1( array.data(), array.size() ); - case QTextStream::Unicode: - case QTextStream::UnicodeNetworkOrder: - case QTextStream::UnicodeReverse: - case QTextStream::RawUnicode: - QWARN( "Unicode not implemented ###" ); - return QString(); - case QTextStream::UnicodeUTF8: - return QString::fromUtf8( array.data(), array.size() ); - default: - QWARN( "Unhandled encoding" ); - return QString(); - } -} - -// ************************************************ - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_createWriteStream( QTextStream *&os ) -{ - QFETCH( QString, device ); - - if ( device == "file" ) { - outFile = new QFile( "qtextstream.out" ); - QVERIFY( outFile->open( QIODevice::WriteOnly ) ); - os = new QTextStream( outFile ); - os->setCodec(QTextCodec::codecForName("ISO-8859-1")); - os->setAutoDetectUnicode(true); - } else if(device == "resource" ) { //ONLY TO CREATE THE RESOURCE!! NOT A TEST! - outFile = new QFile( resourceDir() + - QTest::currentTestFunction() + - "_" + QTest::currentDataTag() + ".data" ); - QVERIFY( outFile->open( QIODevice::WriteOnly ) ); - os = new QTextStream( outFile ); - os->setCodec(QTextCodec::codecForName("ISO-8859-1")); - os->setAutoDetectUnicode(true); - } else if ( device == "bytearray" ) { - inArray = new QByteArray; - os = new QTextStream(inArray, QIODevice::WriteOnly); - os->setCodec(QTextCodec::codecForName("ISO-8859-1")); - os->setAutoDetectUnicode(true); - } else if ( device == "buffer" ) { - inBuffer = new QBuffer; - QVERIFY( inBuffer->open(QIODevice::WriteOnly) ); - os = new QTextStream( inBuffer ); - os->setCodec(QTextCodec::codecForName("ISO-8859-1")); - os->setAutoDetectUnicode(true); - } else if ( device == "string" ) { - inString = new QString; - os = new QTextStream( inString, QIODevice::WriteOnly ); - os->setCodec(QTextCodec::codecForName("ISO-8859-1")); - os->setAutoDetectUnicode(true); - } else { - QWARN( "Error creating write stream: Unknown device type '" + device + "'" ); - } - - QFETCH( QString, encoding ); - os->setEncoding( qt3_toEncoding( encoding )); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_closeWriteStream( QTextStream *os ) -{ - QFETCH( QString, device ); - - os->flush(); - if ( os->device() ) - os->device()->close(); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_createReadStream( QTextStream *&is ) -{ - QFETCH( QString, device ); - - if ( device == "file" ) { - inFile = new QFile( "qtextstream.out" ); - is = new QTextStream( inFile ); - is->setCodec(QTextCodec::codecForName("ISO-8859-1")); - is->setAutoDetectUnicode(true); - QVERIFY( inFile->open( QIODevice::ReadOnly ) ); - } else if(device == "resource") { - inResource = new QFile( ":/tst_textstream/" + resourceDir() + - QTest::currentTestFunction() + - "_" + QTest::currentDataTag() + ".data" ); - is = new QTextStream( inResource ); - is->setCodec(QTextCodec::codecForName("ISO-8859-1")); - is->setAutoDetectUnicode(true); - QVERIFY( inResource->open( QIODevice::ReadOnly ) ); - } else if ( device == "bytearray" ) { - is = new QTextStream(inArray, QIODevice::ReadOnly); - is->setCodec(QTextCodec::codecForName("ISO-8859-1")); - is->setAutoDetectUnicode(true); - } else if ( device == "buffer" ) { - QVERIFY( inBuffer->open(QIODevice::ReadOnly) ); - is = new QTextStream( inBuffer ); - is->setCodec(QTextCodec::codecForName("ISO-8859-1")); - is->setAutoDetectUnicode(true); - } else if ( device == "string" ) { - is = new QTextStream( inString, QIODevice::ReadOnly ); - is->setCodec(QTextCodec::codecForName("ISO-8859-1")); - is->setAutoDetectUnicode(true); - } else { - QWARN( "Error creating read stream: Unknown device type '" + device + "'" ); - } - - QFETCH( QString, encoding ); - is->setEncoding( qt3_toEncoding( encoding )); - - if (!file_is_empty) { - QVERIFY( !is->atEnd() ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_closeReadStream( QTextStream *is ) -{ - QVERIFY( is->atEnd() ); - - if ( is->device() ) - is->device()->close(); -} - -// **************** QChar **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_QChar_data() -{ - QTest::addColumn<int>("modes"); - QTest::addColumn<QString>("device"); - QTest::addColumn<QString>("encoding"); - QTest::addColumn<ushort>("qchar"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << QChar( 'A' ).unicode(); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << QChar( 'B' ).unicode(); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << QChar( 'Z' ).unicode(); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << QChar( 'z' ).unicode(); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << QChar( '@' ).unicode(); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_QChar() -{ - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_QChar( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_QChar( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_QChar( QTextStream *s ) -{ - QFETCH( ushort, qchar ); - QChar expected( qchar ); - QChar actual; - *s >> actual; - QCOMPARE( actual, expected ); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_QChar( QTextStream *s ) -{ - QFETCH( ushort, qchar ); - QChar actual( qchar ); - *s << actual; -} - -// **************** char **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_char_data() -{ - QTest::addColumn<int>("modes"); - QTest::addColumn<QString>("device"); - QTest::addColumn<QString>("encoding"); - QTest::addColumn<int>("ch"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << int('A'); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << int('B'); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << int('Z'); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << int(14); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << int('0'); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_char() -{ - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_char( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_char( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_char( QTextStream *s ) -{ - QFETCH( int, ch ); - char c(ch); - char exp; - *s >> exp; - QCOMPARE( exp, c ); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_char( QTextStream *s ) -{ - QFETCH( int, ch ); - char c(ch); - *s << c; -} - -// **************** short **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_short_data() -{ - QTest::addColumn<int>("modes"); - QTest::addColumn<QString>("device"); - QTest::addColumn<QString>("encoding"); - QTest::addColumn<short>("ss"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << short(0); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << short(-1); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << short(1); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << short(255); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << short(-254); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_short() -{ - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_short( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_short( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_short( QTextStream *s ) -{ - QFETCH( short, ss ); - short exp; - QString A, B; - *s >> A >> exp >> B; - QCOMPARE( A, QString("A") ); - QCOMPARE( B, QString("B") ); - QCOMPARE( exp, ss ); - s->skipWhiteSpace(); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_short( QTextStream *s ) -{ - QFETCH( short, ss ); - *s << " A " << ss << " B "; -} - -// **************** ushort **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_ushort_data() -{ - QTest::addColumn<int>("modes"); - QTest::addColumn<QString>("device"); - QTest::addColumn<QString>("encoding"); - QTest::addColumn<ushort>("us"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << ushort(0); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << ushort(1); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << ushort(10); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << ushort(255); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << ushort(512); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_ushort() -{ - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_ushort( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_ushort( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_ushort( QTextStream *s ) -{ - QFETCH( ushort, us ); - ushort exp; - QString A, B; - *s >> A >> exp >> B; - QCOMPARE( A, QString("A") ); - QCOMPARE( B, QString("B") ); - QCOMPARE( exp, us ); - s->skipWhiteSpace(); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_ushort( QTextStream *s ) -{ - QFETCH( ushort, us ); - *s << " A " << us << " B "; -} - -// **************** int **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_int_data() -{ - QTest::addColumn<int>("modes"); - QTest::addColumn<QString>("device"); - QTest::addColumn<QString>("encoding"); - QTest::addColumn<int>("si"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << int(0); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << int(1); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << int(10); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << int(255); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << int(512); - QTest::newRow( tag + "5" ) << device->modes << device->name() << encoding << int(-1); - QTest::newRow( tag + "6" ) << device->modes << device->name() << encoding << int(-10); - QTest::newRow( tag + "7" ) << device->modes << device->name() << encoding << int(-255); - QTest::newRow( tag + "8" ) << device->modes << device->name() << encoding << int(-512); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_int() -{ - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_int( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_int( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_int( QTextStream *s ) -{ - QFETCH( int, si ); - int exp; - QString A, B; - *s >> A >> exp >> B; - QCOMPARE( A, QString("A") ); - QCOMPARE( B, QString("B") ); - QCOMPARE( exp, si ); - s->skipWhiteSpace(); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_int( QTextStream *s ) -{ - QFETCH( int, si ); - *s << " A " << si << " B "; -} - -// **************** uint **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_uint_data() -{ - QTest::addColumn<int>("modes"); - QTest::addColumn<QString>("device"); - QTest::addColumn<QString>("encoding"); - QTest::addColumn<uint>("ui"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << uint(0); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << uint(1); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << uint(10); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << uint(255); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << uint(512); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_uint() -{ - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_uint( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_uint( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_uint( QTextStream *s ) -{ - QFETCH( uint, ui ); - uint exp; - QString A, B; - *s >> A >> exp >> B; - QCOMPARE( A, QString("A") ); - QCOMPARE( B, QString("B") ); - QCOMPARE( exp, ui ); - s->skipWhiteSpace(); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_uint( QTextStream *s ) -{ - QFETCH( uint, ui ); - *s << " A " << ui << " B "; -} - -// **************** long **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_long_data() -{ - QTest::addColumn<int>("modes"); - QTest::addColumn<QString>("device"); - QTest::addColumn<QString>("encoding"); - QTest::addColumn<long>("sl"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << long(0); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << long(1); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << long(10); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << long(255); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << long(65535); - QTest::newRow( tag + "5" ) << device->modes << device->name() << encoding << long(-1); - QTest::newRow( tag + "6" ) << device->modes << device->name() << encoding << long(-10); - QTest::newRow( tag + "7" ) << device->modes << device->name() << encoding << long(-255); - QTest::newRow( tag + "8" ) << device->modes << device->name() << encoding << long(-65534); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_long() -{ - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_long( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_long( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_long( QTextStream *s ) -{ - QFETCH( long, sl ); - long exp; - QString A, B; - *s >> A >> exp >> B; - QCOMPARE( A, QString("A") ); - QCOMPARE( B, QString("B") ); - QCOMPARE( exp, sl ); - s->skipWhiteSpace(); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_long( QTextStream *s ) -{ - QFETCH( long, sl ); - *s << " A " << sl << " B "; -} - -// **************** long **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_ulong_data() -{ - QTest::addColumn<int>("modes"); - QTest::addColumn<QString>("device"); - QTest::addColumn<QString>("encoding"); - QTest::addColumn<ulong>("ul"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << ulong(0); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << ulong(1); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << ulong(10); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << ulong(255); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << ulong(65535); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_ulong() -{ - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_ulong( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_ulong( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_ulong( QTextStream *s ) -{ - QFETCH( ulong, ul ); - ulong exp; - QString A, B; - *s >> A >> exp >> B; - QCOMPARE( A, QString("A") ); - QCOMPARE( B, QString("B") ); - QCOMPARE( exp, ul ); - s->skipWhiteSpace(); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_ulong( QTextStream *s ) -{ - QFETCH( ulong, ul ); - *s << " A " << ul << " B "; -} - -// **************** float **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_float_data() -{ - QTest::addColumn<int>("modes"); - QTest::addColumn<QString>("device"); - QTest::addColumn<QString>("encoding"); - QTest::addColumn<float>("f"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << float(0.0); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << float(0.0001); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << float(-0.0001); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << float(3.45678); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << float(-3.45678); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_float() -{ - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_float( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_float( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_float( QTextStream *s ) -{ - QFETCH( float, f ); - float exp; - QString A, B; - *s >> A >> exp >> B; - QCOMPARE( A, QString("A") ); - QCOMPARE( B, QString("B") ); - QCOMPARE( exp, f ); - s->skipWhiteSpace(); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_float( QTextStream *s ) -{ - QFETCH( float, f ); - *s << " A " << f << " B "; -} - -// **************** double **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_double_data() -{ - QTest::addColumn<int>("modes"); - QTest::addColumn<QString>("device"); - QTest::addColumn<QString>("encoding"); - QTest::addColumn<double>("d"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << double(0.0); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << double(0.0001); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << double(-0.0001); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << double(3.45678); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << double(-3.45678); - QTest::newRow( tag + "5" ) << device->modes << device->name() << encoding << double(1.23456789); - QTest::newRow( tag + "6" ) << device->modes << device->name() << encoding << double(-1.23456789); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_double() -{ - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - os->precision( 10 ); - qt3_write_double( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - is->precision( 10 ); - qt3_read_double( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_double( QTextStream *s ) -{ - QFETCH( double, d ); - double exp; - QString A, B; - *s >> A >> exp >> B; - QCOMPARE( A, QString("A") ); - QCOMPARE( B, QString("B") ); - QCOMPARE( exp, d ); - s->skipWhiteSpace(); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_double( QTextStream *s ) -{ - QFETCH( double, d ); - *s << " A " << d << " B "; -} - -// **************** QString **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_QString_data() -{ - QTest::addColumn<int>("modes"); - QTest::addColumn<QString>("device"); - QTest::addColumn<QString>("encoding"); - QTest::addColumn<QString>("str"); - QTest::addColumn<bool>("multi_str"); - QTest::addColumn<bool>("zero_length"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << QString("") << bool(FALSE) << bool(TRUE); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << QString() << bool(FALSE) << bool(TRUE); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << QString("foo") << bool(FALSE) << bool(FALSE); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << QString("foo\nbar") << bool(TRUE) << bool(FALSE); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << QString("cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv") << bool(TRUE) << bool(FALSE); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_QString() -{ - QFETCH( bool, zero_length ); - file_is_empty = zero_length; - - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_QString( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_QString( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_QString( QTextStream *s ) -{ - QString exp; - QFETCH( QString, str ); - if (str.isNull()) - str = ""; - - QFETCH( bool, multi_str ); - if (!multi_str) { - *s >> exp; - QCOMPARE( exp, str ); - } else { - QStringList l; - l = QStringList::split( " ", str ); - if (l.count() < 2) - l = QStringList::split( "\n", str ); - for (int i=0; i<l.count(); i++) { - *s >> exp; - QCOMPARE( exp, l[i] ); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_QString( QTextStream *s ) -{ - QFETCH( QString, str ); - *s << str; -} - -// **************** QByteArray **************** - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_QByteArray_data() -{ - QTest::addColumn<int>("modes"); - QTest::addColumn<QString>("device"); - QTest::addColumn<QString>("encoding"); - QTest::addColumn<QByteArray>("cs"); - QTest::addColumn<bool>("multi_str"); - QTest::addColumn<bool>("zero_length"); - - for ( int i=0; !devices[i].name().isNull(); i++ ) { - tst_IODevice *device = devices+i; - for ( int e=0; encodings[e] != 0; e++ ) { - QString encoding = encodings[e]; - - QString tag = device->name() + "_" + encoding + "_"; - QTest::newRow( tag + "0" ) << device->modes << device->name() << encoding << QByteArray("") << bool(FALSE) << bool(TRUE); - QTest::newRow( tag + "1" ) << device->modes << device->name() << encoding << QByteArray(0) << bool(FALSE) << bool(TRUE); - QTest::newRow( tag + "2" ) << device->modes << device->name() << encoding << QByteArray("foo") << bool(FALSE) << bool(FALSE); - QTest::newRow( tag + "3" ) << device->modes << device->name() << encoding << QByteArray("foo\nbar") << bool(TRUE) << bool(FALSE); - QTest::newRow( tag + "4" ) << device->modes << device->name() << encoding << QByteArray("cjacka ckha cka ckah ckac kahckadhcbkgdk vkzdfbvajef vkahv") << bool(TRUE) << bool(FALSE); - } - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_operator_shift_QByteArray() -{ - QFETCH( bool, zero_length ); - file_is_empty = zero_length; - - QFETCH( int, modes ); - if(modes & QIODevice::WriteOnly) { - qt3_createWriteStream( os ); - qt3_write_QByteArray( os ); - qt3_closeWriteStream( os ); - } - if(modes & QIODevice::ReadOnly) { - qt3_createReadStream( is ); - qt3_read_QByteArray( is ); - qt3_closeReadStream( is ); - } -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_read_QByteArray( QTextStream *s ) -{ -/* - QFETCH( QByteArray, cs ); - QByteArray exp; - *s >> exp; - QCOMPARE( exp, cs ); -*/ - QByteArray exp; - QFETCH( QByteArray, cs ); - if (cs.isNull()) - cs = ""; - - QFETCH( bool, multi_str ); - if (!multi_str) { - *s >> exp; - QCOMPARE( exp.constData(), cs.constData() ); - } else { - QStringList l; - l = QStringList::split( " ", cs ); - if (l.count() < 2) - l = QStringList::split( "\n", cs ); - for (int i=0; i<l.count(); i++) { - *s >> exp; - QCOMPARE( exp, QByteArray(l[i].toAscii()) ); - } - } -} - -// ------------------------------------------------------------------------------ -static void qt3_generateLineData( bool for_QString ) -{ - QTest::addColumn<QByteArray>("input"); - QTest::addColumn<QStringList>("output"); - - QTest::newRow("emptyer") << QByteArray() << QStringList(); - QTest::newRow("lf") << QByteArray("\n") << (QStringList() << ""); - QTest::newRow("crlf") << QByteArray("\r\n") << (QStringList() << ""); - QTest::newRow("oneline/nothing") << QByteArray("ole") << (QStringList() << "ole"); - QTest::newRow("oneline/lf") << QByteArray("ole\n") << (QStringList() << "ole"); - QTest::newRow("oneline/crlf") << QByteArray("ole\r\n") << (QStringList() << "ole"); - QTest::newRow("twolines/lf/lf") << QByteArray("ole\ndole\n") << (QStringList() << "ole" << "dole"); - QTest::newRow("twolines/crlf/crlf") << QByteArray("ole\r\ndole\r\n") << (QStringList() << "ole" << "dole"); - QTest::newRow("twolines/lf/crlf") << QByteArray("ole\ndole\r\n") << (QStringList() << "ole" << "dole"); - QTest::newRow("twolines/lf/nothing") << QByteArray("ole\ndole") << (QStringList() << "ole" << "dole"); - QTest::newRow("twolines/crlf/nothing") << QByteArray("ole\r\ndole") << (QStringList() << "ole" << "dole"); - QTest::newRow("threelines/lf/lf/lf") << QByteArray("ole\ndole\ndoffen\n") << (QStringList() << "ole" << "dole" << "doffen"); - QTest::newRow("threelines/crlf/crlf/crlf") << QByteArray("ole\r\ndole\r\ndoffen\r\n") << (QStringList() << "ole" << "dole" << "doffen"); - QTest::newRow("threelines/crlf/crlf/nothing") << QByteArray("ole\r\ndole\r\ndoffen") << (QStringList() << "ole" << "dole" << "doffen"); - - if (!for_QString) { - QTest::newRow("unicode/nothing") << QByteArray("\xfe\xff\x00\xe5\x00\x67\x00\x65", 8) << (QStringList() << "\345ge"); - QTest::newRow("unicode-little/nothing") << QByteArray("\xff\xfe\xe5\x00\x67\x00\x65\x00", 8) << (QStringList() << "\345ge"); - QTest::newRow("unicode/lf") << QByteArray("\xfe\xff\x00\xe5\x00\x67\x00\x65\x00\x0a", 10) << (QStringList() << "\345ge"); - QTest::newRow("unicode-little/lf") << QByteArray("\xff\xfe\xe5\x00\x67\x00\x65\x00\x0a\x00", 10) << (QStringList() << "\345ge"); - - QTest::newRow("unicode/twolines") << QByteArray("\xfe\xff\x00\xe5\x00\x67\x00\x65\x00\x0a\x00\xe5\x00\x67\x00\x65\x00\x0a", 18) << (QStringList() << "\345ge" << "\345ge"); - QTest::newRow("unicode-little/twolines") << QByteArray("\xff\xfe\xe5\x00\x67\x00\x65\x00\x0a\x00\xe5\x00\x67\x00\x65\x00\x0a\x00", 18) << (QStringList() << "\345ge" << "\345ge"); - - QTest::newRow("unicode/threelines") - << QByteArray("\xfe\xff" - "\x00\xe5\x00\x67\x00\x65\x00\x0a" - "\x00\xe5\x00\x67\x00\x65\x00\x0a" - "\x00\xe5\x00\x67\x00\x65\x00\x0a", 26) - << (QStringList() << "\345ge" << "\345ge" << "\345ge"); - QTest::newRow("unicode-little/threelines") - << QByteArray("\xff\xfe" - "\xe5\x00\x67\x00\x65\x00\x0a\x00" - "\xe5\x00\x67\x00\x65\x00\x0a\x00" - "\xe5\x00\x67\x00\x65\x00\x0a\x00", 26) - << (QStringList() << "\345ge" << "\345ge" << "\345ge"); - } - - // partials - QTest::newRow("cr") << QByteArray("\r") << (QStringList() << ""); - QTest::newRow("oneline/cr") << QByteArray("ole\r") << (QStringList() << "ole"); - if (!for_QString) - QTest::newRow("unicode/cr") << QByteArray("\xfe\xff\x00\xe5\x00\x67\x00\x65\x00\x0d", 10) << (QStringList() << "\345ge"); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_writeDataToFileReadAsLines_data() -{ - qt3_generateLineData(false); -} - -// ------------------------------------------------------------------------------ -QByteArray pretty(const QString &input) -{ - QByteArray data; - - QByteArray arr = input.toLatin1(); - for (int i = 0; i < arr.size(); ++i) { - char buf[64]; - memset(buf, 0, sizeof(buf)); - char ch = arr.at(i); - sprintf(buf, "\\%2hhx", ch); - data += buf; - } - - return data; -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_writeDataToFileReadAsLines() -{ - QFETCH(QByteArray, input); - QFETCH(QStringList, output); - - QFile::remove("eoltest"); - - // Create the file - QFile writer("eoltest"); - QVERIFY2(writer.open(QFile::WriteOnly | QFile::Truncate), ("When creating a file: " + writer.errorString()).latin1()); - QCOMPARE(writer.write(input), qlonglong(input.size())); - writer.close(); - - // Read from it using QTextStream - QVERIFY2(writer.open(QFile::ReadOnly), ("When reading a file: " + writer.errorString()).latin1()); - QTextStream stream(&writer); - QStringList tmp; - - while (!stream.atEnd()) - tmp << stream.readLine(); - - QCOMPARE(tmp, output); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_writeDataToQStringReadAsLines_data() -{ - qt3_generateLineData(true); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_writeDataToQStringReadAsLines() -{ - QFETCH(QByteArray, input); - QFETCH(QStringList, output); - - QString s = input; - QTextStream stream(&s, QIODevice::ReadOnly); - - QStringList tmp; - while (!stream.atEnd()) - tmp << stream.readLine(); - - QCOMPARE(tmp, output); -} - -// ------------------------------------------------------------------------------ -void tst_QTextStream::qt3_write_QByteArray( QTextStream *s ) -{ - QFETCH( QByteArray, cs ); - *s << cs; -} -#endif - -// ------------------------------------------------------------------------------ void tst_QTextStream::status_real_read_data() { QTest::addColumn<QString>("input"); diff --git a/tests/auto/qthread/tst_qthread.cpp b/tests/auto/qthread/tst_qthread.cpp index 6ad0678745..054a9957be 100644 --- a/tests/auto/qthread/tst_qthread.cpp +++ b/tests/auto/qthread/tst_qthread.cpp @@ -209,7 +209,7 @@ public: cond.wait(&mutex, five_minutes); } setTerminationEnabled(true); - Q_ASSERT_X(false, "tst_QThread", "test case hung"); + qFatal("tst_QThread: test case hung"); } }; diff --git a/tests/auto/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/qthreadstorage/tst_qthreadstorage.cpp index 2391c81b63..d3eea0cae2 100644 --- a/tests/auto/qthreadstorage/tst_qthreadstorage.cpp +++ b/tests/auto/qthreadstorage/tst_qthreadstorage.cpp @@ -320,7 +320,7 @@ public: static QBasicAtomicInt count; inline SPointer() { count.ref(); } inline ~SPointer() { count.deref(); } - inline SPointer(const SPointer &other) { count.ref(); } + inline SPointer(const SPointer & /* other */) { count.ref(); } }; QBasicAtomicInt SPointer::count = Q_BASIC_ATOMIC_INITIALIZER(0); diff --git a/tests/auto/qtipc/lackey/lackey.pro b/tests/auto/qtipc/lackey/lackey.pro index 39123125f3..2fa364c4c9 100644 --- a/tests/auto/qtipc/lackey/lackey.pro +++ b/tests/auto/qtipc/lackey/lackey.pro @@ -1,6 +1,7 @@ include(../qsharedmemory/src/src.pri) QT = core script +QT += core-private CONFIG += qtestlib diff --git a/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro b/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro index e232443a35..e3d99bb85c 100644 --- a/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro +++ b/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro @@ -1,5 +1,5 @@ CONFIG += qttest_p4 -#QT = core +QT += gui-private include(../src/src.pri) win32: CONFIG += console diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp index 6db84dd982..647d857407 100644 --- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp +++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp @@ -207,7 +207,8 @@ bool QSystemLockPrivate::modifySemaphore(QSystemLockPrivate::Operation op, if ((lockCount == 0 && op == Lock) || (lockCount > 0 && op == Unlock)) { if (op == Unlock) { --lockCount; - Q_ASSERT(lockCount >= 0); + if (lockCount < 0) + qFatal("%s: lockCount must not be negative", Q_FUNC_INFO); if (lockCount > 0) return true; } diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp index f6803f7d01..f7e4ab22c4 100644 --- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp +++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp @@ -157,7 +157,8 @@ bool QSystemLockPrivate::modifySemaphore(QSystemLockPrivate::Operation op, if ((lockCount == 0 && op == Lock) || (lockCount > 0 && op == Unlock)) { if (op == Unlock) { --lockCount; - Q_ASSERT(lockCount >= 0); + if (lockCount < 0) + qFatal("%s: lockCount must not be negative", Q_FUNC_INFO); if (lockCount > 0) return true; } diff --git a/tests/auto/qtipc/qsharedmemory/src/src.pri b/tests/auto/qtipc/qsharedmemory/src/src.pri index 5bc9de62db..8aaf528447 100644 --- a/tests/auto/qtipc/qsharedmemory/src/src.pri +++ b/tests/auto/qtipc/qsharedmemory/src/src.pri @@ -1,5 +1,6 @@ INCLUDEPATH += $$PWD DEPENDPATH += $$PWD +QT += core-private SOURCES += $$PWD/qsystemlock.cpp diff --git a/tests/auto/qtoolbar/qtoolbar.pro b/tests/auto/qtoolbar/qtoolbar.pro index 4f2c8f1e1f..2c1176fe00 100644 --- a/tests/auto/qtoolbar/qtoolbar.pro +++ b/tests/auto/qtoolbar/qtoolbar.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += gui-private SOURCES += tst_qtoolbar.cpp diff --git a/tests/auto/qtoolbutton/tst_qtoolbutton.cpp b/tests/auto/qtoolbutton/tst_qtoolbutton.cpp index 8495a04ab1..9da319faa2 100644 --- a/tests/auto/qtoolbutton/tst_qtoolbutton.cpp +++ b/tests/auto/qtoolbutton/tst_qtoolbutton.cpp @@ -119,13 +119,6 @@ void tst_QToolButton::getSetCheck() obj1.setDefaultAction((QAction *)0); QCOMPARE((QAction *)0, obj1.defaultAction()); delete var4; - -#ifdef QT_HAS_QT3SUPPORT - //ensure that popup delay is not reset on style change - obj1.setPopupDelay(5); - obj1.setStyle(new QWindowsStyle); - QCOMPARE(obj1.popupDelay(), 5); -#endif } Q_DECLARE_METATYPE(QAction*) diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp index c07c471eb4..f03e07ab38 100644 --- a/tests/auto/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/qtreeview/tst_qtreeview.cpp @@ -277,7 +277,8 @@ public: } int rowCount(const QModelIndex& parent = QModelIndex()) const { - Q_ASSERT(fetched); + if (!fetched) + qFatal("%s: rowCount should not be called before fetching", Q_FUNC_INFO); if ((parent.column() > 0) || (level(parent) > levels)) return 0; return rows; @@ -2536,7 +2537,7 @@ void tst_QTreeView::sortByColumn() /* This is a model that every time kill() is called it will completely change - all of its nodes for new nodes. It then asserts if you later use a dead node. + all of its nodes for new nodes. It then qFatal's if you later use a dead node. */ class EvilModel: public QAbstractItemModel { @@ -2567,7 +2568,8 @@ public: } } if (parent == 0) { - Q_ASSERT(children.isEmpty()); + if (!children.isEmpty()) + qFatal("%s: children should be empty when parent is null", Q_FUNC_INFO); populate(); } else { isDead = true; @@ -2624,7 +2626,8 @@ public: Node *parentNode = root; if (parent.isValid()) { parentNode = static_cast<Node*>(parent.internalPointer()); - Q_ASSERT(!parentNode->isDead); + if (parentNode->isDead) + qFatal("%s: parentNode is dead!", Q_FUNC_INFO); } return parentNode->children.count(); } @@ -2639,9 +2642,11 @@ public: Node *grandparentNode = static_cast<Node*>(parent.internalPointer()); Node *parentNode = root; if (parent.isValid()) { - Q_ASSERT(!grandparentNode->isDead); + if (grandparentNode->isDead) + qFatal("%s: grandparentNode is dead!", Q_FUNC_INFO); parentNode = grandparentNode->children[parent.row()]; - Q_ASSERT(!parentNode->isDead); + if (parentNode->isDead) + qFatal("%s: grandparentNode is dead!", Q_FUNC_INFO); } return createIndex(row, column, parentNode); } @@ -2661,7 +2666,8 @@ public: Node *parentNode = root; if (idx.isValid()) { parentNode = static_cast<Node*>(idx.internalPointer()); - Q_ASSERT(!parentNode->isDead); + if (parentNode->isDead) + qFatal("%s: grandparentNode is dead!", Q_FUNC_INFO); } return QString("[%1,%2,%3]").arg(idx.row()).arg(idx.column()) .arg(parentNode->isDead ? "dead" : "alive"); @@ -3794,7 +3800,7 @@ class Model_11466 : public QAbstractItemModel { Q_OBJECT public: - Model_11466(QObject *parent) : + Model_11466(QObject * /* parent */) : m_block(false) { // set up the model to have two top level items and a few others @@ -3811,7 +3817,7 @@ public: return 2; // two top level items } - int columnCount(const QModelIndex &parent) const + int columnCount(const QModelIndex & /* parent */) const { return 2; } diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp index 336ee36584..053e3b35bb 100644 --- a/tests/auto/qurl/tst_qurl.cpp +++ b/tests/auto/qurl/tst_qurl.cpp @@ -198,10 +198,6 @@ private slots: void task_240612(); void taskQTBUG_6962(); void taskQTBUG_8701(); - -#ifdef QT3_SUPPORT - void dirPath(); -#endif }; // Testing get/set functions @@ -3933,13 +3929,6 @@ void tst_QUrl::task_240612() QCOMPARE(url.toEncoded().constData(), "//example.com/test.txt"); } -#ifdef QT3_SUPPORT -void tst_QUrl::dirPath() -{ - QCOMPARE(QUrl("http://www.vg.no/test/file.txt").dirPath(), QString("/test")); -} -#endif - void tst_QUrl::resolvedWithAbsoluteSchemes() const { QFETCH(QUrl, base); diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp index 9422abc5dd..9efb6c6eb3 100644 --- a/tests/auto/qvariant/tst_qvariant.cpp +++ b/tests/auto/qvariant/tst_qvariant.cpp @@ -50,9 +50,6 @@ #include <qiodevice.h> #include <qurl.h> #include <qlocale.h> -#ifdef QT3_SUPPORT -# include <q3cstring.h> -#endif #include <qkeysequence.h> #include <qbitmap.h> #include <qcursor.h> @@ -141,18 +138,12 @@ private slots: void toULongLong_data(); void toULongLong(); - void asType_data(); - void asType(); - void toByteArray_data(); void toByteArray(); void toString_data(); void toString(); - void toCString_data(); - void toCString(); - void toDate_data(); void toDate(); @@ -231,8 +222,6 @@ private slots: void podUserType(); - void nullAsType(); - void data_(); // data is virtual function in QtTestCase void constData(); @@ -243,7 +232,6 @@ private slots: void variantMap(); void variantHash(); - void invalidAsByteArray(); void convertToQUint8() const; void invalidQColor() const; void comparePointers() const; @@ -283,9 +271,6 @@ Q_DECLARE_METATYPE(QDate) Q_DECLARE_METATYPE(QTime) Q_DECLARE_METATYPE(QDateTime) Q_DECLARE_METATYPE(QVariant) -#ifdef QT3_SUPPORT -Q_DECLARE_METATYPE(Q3CString) -#endif const qlonglong intMax1 = (qlonglong)INT_MAX + 1; const qulonglong uintMax1 = (qulonglong)UINT_MAX + 1; @@ -369,9 +354,6 @@ void tst_QVariant::isNull() QVariant varLL( (qlonglong)0 ); QVERIFY( !varLL.isNull() ); QVariant var7(QString::null); -#ifdef QT3_SUPPORT - QCOMPARE(var7.asInt(), 0); -#endif QVERIFY(var7.isNull()); } @@ -393,15 +375,12 @@ void tst_QVariant::canConvert_data() QTest::addColumn<bool>("BoolCast"); QTest::addColumn<bool>("BrushCast"); QTest::addColumn<bool>("ByteArrayCast"); - QTest::addColumn<bool>("CStringCast"); QTest::addColumn<bool>("ColorCast"); - QTest::addColumn<bool>("ColorGroupCast"); QTest::addColumn<bool>("CursorCast"); QTest::addColumn<bool>("DateCast"); QTest::addColumn<bool>("DateTimeCast"); QTest::addColumn<bool>("DoubleCast"); QTest::addColumn<bool>("FontCast"); - QTest::addColumn<bool>("IconSetCast"); QTest::addColumn<bool>("ImageCast"); QTest::addColumn<bool>("IntCast"); QTest::addColumn<bool>("InvalidCast"); @@ -412,7 +391,6 @@ void tst_QVariant::canConvert_data() QTest::addColumn<bool>("PaletteCast"); QTest::addColumn<bool>("PenCast"); QTest::addColumn<bool>("PixmapCast"); - QTest::addColumn<bool>("PointArrayCast"); QTest::addColumn<bool>("PointCast"); QTest::addColumn<bool>("RectCast"); QTest::addColumn<bool>("RegionCast"); @@ -433,125 +411,110 @@ void tst_QVariant::canConvert_data() #endif #define Y true #define N false - // bita bitm bool brsh byta cstr col colg curs date dt dbl font icon img int inv kseq list ll map pal pen pix pnta pnt rect reg size sp str strl time uint ull + // bita bitm bool brsh byta col curs date dt dbl font img int inv kseq list ll map pal pen pix pnt rect reg size sp str strl time uint ull QVariant var(QBitArray(0)); QTest::newRow("BitArray") - << var << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N; + << var << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N; var = qVariantFromValue(QBitmap()); QTest::newRow("Bitmap") - << var << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N; -#ifdef QT3_SUPPORT - var = QVariant(true, 0); - QTest::newRow("Bool") - << var << N << N << Y << N << Y << Y << N << N << N << N << N << Y << N << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; -#endif + << var << N << Y << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N; var = qVariantFromValue(QBrush()); QTest::newRow("Brush") - << var << N << N << N << Y << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N; + << var << N << N << N << Y << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N; var = QVariant(QByteArray()); QTest::newRow("ByteArray") - << var << N << N << Y << N << Y << Y << Y << N << N << N << N << Y << N << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; -#ifdef QT3_SUPPORT - var = QVariant(Q3CString("cstring")); - QTest::newRow("CString") - << var << N << N << Y << N << Y << Y << Y << N << N << N << N << Y << N << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; -#endif + << var << N << N << Y << N << Y << Y << N << N << N << Y << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; var = qVariantFromValue(QColor()); QTest::newRow("Color") - << var << N << N << N << Y << Y << Y << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N; -#ifdef QT3_SUPPORT - var = qVariantFromValue(QColorGroup()); - QTest::newRow("ColorGroup") - << var << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N; -#endif + << var << N << N << N << Y << Y << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N; #ifndef QT_NO_CURSOR var = qVariantFromValue(QCursor()); QTest::newRow("Cursor") - << var << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N; + << var << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N; #endif var = QVariant(QDate()); QTest::newRow("Date") - << var << N << N << N << N << N << N << N << N << N << Y << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N; + << var << N << N << N << N << N << N << N << Y << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N; var = QVariant(QDateTime()); QTest::newRow("DateTime") - << var << N << N << N << N << N << N << N << N << N << Y << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << Y << N << N; + << var << N << N << N << N << N << N << N << Y << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << Y << N << N; var = QVariant((double)0.1); QTest::newRow("Double") - << var << N << N << Y << N << Y << Y << N << N << N << N << N << Y << N << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; + << var << N << N << Y << N << Y << N << N << N << N << Y << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; var = QVariant(0.1f); QTest::newRow("Float") - << var << N << N << Y << N << Y << Y << N << N << N << N << N << Y << N << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; + << var << N << N << Y << N << Y << N << N << N << N << Y << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; var = qVariantFromValue(QFont()); QTest::newRow("Font") - << var << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N; var = qVariantFromValue(QIcon()); QTest::newRow("Icon") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N; var = qVariantFromValue(QImage()); QTest::newRow("Image") - << var << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N; + << var << N << Y << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N; var = QVariant((int)1); QTest::newRow("Int") - << var << N << N << Y << N << Y << Y << N << N << N << N << N << Y << N << N << N << Y << N << Y << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; + << var << N << N << Y << N << Y << N << N << N << N << Y << N << N << Y << N << Y << N << Y << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; var = QVariant(); QTest::newRow("Invalid") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N; var = qVariantFromValue(QKeySequence()); QTest::newRow("KeySequence") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << Y << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N; var = QVariant(QList<QVariant>()); QTest::newRow("List") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N; var = QVariant((qlonglong)1); QTest::newRow("LongLong") - << var << N << N << Y << N << Y << Y << N << N << N << N << N << Y << N << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; + << var << N << N << Y << N << Y << N << N << N << N << Y << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; var = QVariant(QMap<QString,QVariant>()); QTest::newRow("Map") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N; var = qVariantFromValue(QPalette()); QTest::newRow("Palette") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N; var = qVariantFromValue(QPen()); QTest::newRow("Pen") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N; var = qVariantFromValue(QPixmap()); QTest::newRow("Pixmap") - << var << N << Y << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N; + << var << N << Y << N << Y << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N; var = qVariantFromValue(QPolygon()); QTest::newRow("PointArray") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N; var = QVariant(QPoint()); QTest::newRow("Point") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N; var = QVariant(QRect()); QTest::newRow("Rect") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N; var = qVariantFromValue(QRegion()); QTest::newRow("Region") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N; var = QVariant(QSize()); QTest::newRow("Size") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N; var = qVariantFromValue(QSizePolicy()); QTest::newRow("SizePolicy") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N; var = QVariant(QString()); QTest::newRow("String") - << var << N << N << Y << N << Y << Y << Y << N << N << Y << Y << Y << Y << N << N << Y << N << Y << N << Y << N << N << N << N << N << N << N << N << N << N << Y << Y << Y << Y << Y; + << var << N << N << Y << N << Y << Y << N << Y << Y << Y << Y << N << Y << N << Y << N << Y << N << N << N << N << N << N << N << N << N << Y << Y << Y << Y << Y; var = QVariant(QStringList("entry")); QTest::newRow("StringList") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << N << Y << Y << N << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << Y << Y << N << N << N; var = QVariant(QTime()); QTest::newRow("Time") - << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << Y << N << N; + << var << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << N << Y << N << Y << N << N; var = QVariant((uint)1); QTest::newRow("UInt") - << var << N << N << Y << N << Y << Y << N << N << N << N << N << Y << N << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; + << var << N << N << Y << N << Y << N << N << N << N << Y << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; var = QVariant((qulonglong)1); QTest::newRow("ULongLong") - << var << N << N << Y << N << Y << Y << N << N << N << N << N << Y << N << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; + << var << N << N << Y << N << Y << N << N << N << N << Y << N << N << Y << N << N << N << Y << N << N << N << N << N << N << N << N << N << Y << N << N << Y << Y; #undef N #undef Y @@ -565,15 +528,12 @@ void tst_QVariant::canConvert() QFETCH(bool, BoolCast); QFETCH(bool, BrushCast); QFETCH(bool, ByteArrayCast); - QFETCH(bool, CStringCast); QFETCH(bool, ColorCast); - QFETCH(bool, ColorGroupCast); QFETCH(bool, CursorCast); QFETCH(bool, DateCast); QFETCH(bool, DateTimeCast); QFETCH(bool, DoubleCast); QFETCH(bool, FontCast); - QFETCH(bool, IconSetCast); QFETCH(bool, ImageCast); QFETCH(bool, IntCast); QFETCH(bool, InvalidCast); @@ -584,7 +544,6 @@ void tst_QVariant::canConvert() QFETCH(bool, PaletteCast); QFETCH(bool, PenCast); QFETCH(bool, PixmapCast); - QFETCH(bool, PointArrayCast); QFETCH(bool, PointCast); QFETCH(bool, RectCast); QFETCH(bool, RegionCast); @@ -601,28 +560,13 @@ void tst_QVariant::canConvert() QCOMPARE(val.canConvert(QVariant::Bool), BoolCast); QCOMPARE(val.canConvert(QVariant::Brush), BrushCast); QCOMPARE(val.canConvert(QVariant::ByteArray), ByteArrayCast); -#ifdef QT3_SUPPORT - QCOMPARE(val.canConvert(QVariant::CString), CStringCast); -#else - Q_UNUSED(CStringCast); -#endif QCOMPARE(val.canConvert(QVariant::Color), ColorCast); -#ifdef QT3_SUPPORT - QCOMPARE(val.canConvert(QVariant::ColorGroup), ColorGroupCast); -#else - Q_UNUSED(ColorGroupCast); -#endif QCOMPARE(val.canConvert(QVariant::Cursor), CursorCast); QCOMPARE(val.canConvert(QVariant::Date), DateCast); QCOMPARE(val.canConvert(QVariant::DateTime), DateTimeCast); QCOMPARE(val.canConvert(QVariant::Double), DoubleCast); QCOMPARE(val.canConvert(QVariant::Type(QMetaType::Float)), DoubleCast); QCOMPARE(val.canConvert(QVariant::Font), FontCast); -#ifdef QT3_SUPPORT - QCOMPARE(val.canConvert(QVariant::IconSet), IconSetCast); -#else - Q_UNUSED(IconSetCast); -#endif QCOMPARE(val.canConvert(QVariant::Image), ImageCast); QCOMPARE(val.canConvert(QVariant::Int), IntCast); QCOMPARE(val.canConvert(QVariant::Invalid), InvalidCast); @@ -633,11 +577,6 @@ void tst_QVariant::canConvert() QCOMPARE(val.canConvert(QVariant::Palette), PaletteCast); QCOMPARE(val.canConvert(QVariant::Pen), PenCast); QCOMPARE(val.canConvert(QVariant::Pixmap), PixmapCast); -#ifdef QT3_SUPPORT - QCOMPARE(val.canConvert(QVariant::PointArray), PointArrayCast); -#else - Q_UNUSED(PointArrayCast); -#endif QCOMPARE(val.canConvert(QVariant::Point), PointCast); QCOMPARE(val.canConvert(QVariant::Rect), RectCast); QCOMPARE(val.canConvert(QVariant::Region), RegionCast); @@ -661,9 +600,6 @@ void tst_QVariant::toInt_data() QTest::newRow( "double" ) << QVariant( 3.1415927 ) << 3 << true; QTest::newRow( "float" ) << QVariant( 3.1415927f ) << 3 << true; QTest::newRow( "uint" ) << QVariant( 123u ) << 123 << true; -#ifdef QT3_SUPPORT - QTest::newRow( "bool" ) << QVariant( true, 42 ) << 1 << true; -#endif QTest::newRow( "int-string" ) << QVariant( QString("123") ) << 123 << true; QTest::newRow( "string" ) << QVariant( QString("Unicode String") ) << 0 << false; QTest::newRow( "longlong0" ) << QVariant( (qlonglong)34 ) << 34 << true; @@ -714,9 +650,6 @@ void tst_QVariant::toUInt_data() QTest::newRow( "double" ) << QVariant( 3.1415927 ) << (uint)3 << true; QTest::newRow( "float" ) << QVariant( 3.1415927f ) << (uint)3 << true; QTest::newRow( "uint" ) << QVariant( 123u ) << (uint)123 << true; -#ifdef QT3_SUPPORT - QTest::newRow( "bool" ) << QVariant( true, 42 ) << (uint)1 << true; -#endif QTest::newRow( "int-string" ) << QVariant( QString("123") ) << (uint)123 << true; QTest::newRow( "string" ) << QVariant( QString("Unicode String") ) << (uint)0 << false; QTest::newRow( "string2" ) << QVariant( QString("4") ) << (uint)4 << true; @@ -911,10 +844,6 @@ void tst_QVariant::toBool_data() QTest::newRow( "float0" ) << QVariant( 0.0f ) << false; QTest::newRow( "double1" ) << QVariant( 3.1415927 ) << true; QTest::newRow( "float1" ) << QVariant( 3.1415927f ) << true; -#ifdef QT3_SUPPORT - QTest::newRow( "bool0" ) << QVariant( false, 42 ) << false; - QTest::newRow( "bool1" ) << QVariant( true, 42 ) << true; -#endif QTest::newRow( "string0" ) << QVariant( QString("3") ) << true; QTest::newRow( "string1" ) << QVariant( QString("true") ) << true; QTest::newRow( "string2" ) << QVariant( QString("0") ) << false; @@ -1142,9 +1071,6 @@ void tst_QVariant::toLongLong_data() QTest::newRow( "double" ) << QVariant( 3.1415927 ) << (qlonglong)3 << true; QTest::newRow( "float" ) << QVariant( 3.1415927f ) << (qlonglong)3 << true; QTest::newRow( "uint" ) << QVariant( 123u ) << (qlonglong)123 << true; -#ifdef QT3_SUPPORT - QTest::newRow( "bool" ) << QVariant( true, 42 ) << (qlonglong)1 << true; -#endif QTest::newRow( "int-string" ) << QVariant( QString("123") ) << (qlonglong)123 << true; QTest::newRow( "string" ) << QVariant( QString("Unicode fun") ) << (qlonglong)0 @@ -1183,9 +1109,6 @@ void tst_QVariant::toULongLong_data() QTest::newRow( "double" ) << QVariant( 3.1415927 ) << (qulonglong)3 << true; QTest::newRow( "float" ) << QVariant( 3.1415927f ) << (qulonglong)3 << true; QTest::newRow( "uint" ) << QVariant( 123u ) << (qulonglong)123 << true; -#ifdef QT3_SUPPORT - QTest::newRow( "bool" ) << QVariant( true, 42 ) << (qulonglong)1 << true; -#endif QTest::newRow( "int-string" ) << QVariant( QString("123") ) << (qulonglong)123 << true; QTest::newRow( "string" ) << QVariant( QString("Unicode fun") ) << (qulonglong)0 @@ -1220,38 +1143,6 @@ void tst_QVariant::toULongLong() QVERIFY( ok == valueOK ); } -void tst_QVariant::asType_data() -{ - QTest::addColumn<QVariant>("value"); - - QTest::newRow( "string" ) << QVariant( QString( "1.0" ) ); -} - -void tst_QVariant::asType() -{ -#ifndef QT3_SUPPORT - QSKIP("Qt compiled without Qt3Support", SkipAll); -#else - QFETCH( QVariant, value ); - QVariant::Type type = value.type(); - - QVariant copy = value; - copy.asDouble(); - QCOMPARE( value.type(), type ); - - copy = value; - copy.asList(); - QCOMPARE( value.type(), type ); - - copy = value; - copy.asMap(); - QCOMPARE( value.type(), type ); - - copy = value; - QCOMPARE( value.type(), type ); -#endif -} - void tst_QVariant::toByteArray_data() { QTest::addColumn<QVariant>("value"); @@ -1297,11 +1188,7 @@ void tst_QVariant::toString_data() QTest::newRow( "uint" ) << QVariant( (uint)123 ) << QString( "123" ); QTest::newRow( "double" ) << QVariant( 123.456 ) << QString( "123.456" ); QTest::newRow( "float" ) << QVariant( 123.456f ) << QString( "123.456" ); -#ifdef QT3_SUPPORT - QTest::newRow( "bool" ) << QVariant( true, 0 ) << QString( "true" ); -#else QTest::newRow( "bool" ) << QVariant( true ) << QString( "true" ); -#endif QTest::newRow( "qdate" ) << QVariant( QDate( 2002, 1, 1 ) ) << QString( "2002-01-01" ); QTest::newRow( "qtime" ) << QVariant( QTime( 12, 34, 56 ) ) << QString( "12:34:56" ); QTest::newRow( "qdatetime" ) << QVariant( QDateTime( QDate( 2002, 1, 1 ), QTime( 12, 34, 56 ) ) ) << QString( "2002-01-01T12:34:56" ); @@ -1329,32 +1216,6 @@ void tst_QVariant::toString() QCOMPARE( str, result ); } -void tst_QVariant::toCString_data() -{ -#ifdef QT3_SUPPORT - QTest::addColumn<QVariant>("value"); - QTest::addColumn<Q3CString>("result"); - - QTest::newRow( "qstring" ) << QVariant( Q3CString( "Test" ) ) << Q3CString( "Test" ); - QTest::newRow( "qcstring") << QVariant( Q3CString( "Test\0" ) ) << Q3CString( "Test" ); -#endif -} - -void tst_QVariant::toCString() -{ -#ifdef QT3_SUPPORT - QFETCH( QVariant, value ); - QFETCH( Q3CString, result ); - QVERIFY( value.isValid() ); - - Q3CString str = value.toCString(); - - QCOMPARE( str, result ); -#else - QSKIP("Qt not build with Qt3Support", SkipAll); -#endif -} - void tst_QVariant::toDate_data() { QTest::addColumn<QVariant>("value"); @@ -1558,15 +1419,9 @@ void tst_QVariant::writeToReadFromDataStream_data() QTest::newRow( "bitmap_valid" ) << qVariantFromValue( bitmap ) << false; QTest::newRow( "brush_valid" ) << qVariantFromValue( QBrush( Qt::red ) ) << false; QTest::newRow( "color_valid" ) << qVariantFromValue( QColor( Qt::red ) ) << false; -#ifdef QT3_SUPPORT - QTest::newRow( "colorgroup_valid" ) << qVariantFromValue(QPalette(QColor("turquoise")).active()) << false; -#endif #ifndef QT_NO_CURSOR QTest::newRow( "cursor_valid" ) << qVariantFromValue( QCursor( Qt::PointingHandCursor ) ) << false; #endif -#ifdef QT3_SUPPORT - QTest::newRow( "bool_valid" ) << QVariant( true, 0 ) << false; -#endif QTest::newRow( "date_invalid" ) << QVariant( QDate() ) << true; QTest::newRow( "date_valid" ) << QVariant( QDate( 2002, 07, 06 ) ) << false; QTest::newRow( "datetime_invalid" ) << QVariant( QDateTime() ) << true; @@ -1578,16 +1433,8 @@ void tst_QVariant::writeToReadFromDataStream_data() QPixmap pixmap( 10, 10 ); pixmap.fill( Qt::red ); QTest::newRow( "pixmap_valid" ) << qVariantFromValue( pixmap ) << false; -#ifdef QT3_SUPPORT - QTest::newRow( "iconset_invalid" ) << qVariantFromValue( QIcon() ) << true; -#endif // QTest::newRow( "iconset_valid" ) << QVariant( QIcon( pixmap ) ) << false; QTest::newRow( "image_invalid" ) << qVariantFromValue( QImage() ) << true; -#ifdef QT3_SUPPORT - QImage image( 10, 10, 32 ); - image.fill( QColor( Qt::red ).pixel() ); - QTest::newRow( "image_valid" ) << qVariantFromValue( image ) << false; -#endif QTest::newRow( "keysequence_valid" ) << qVariantFromValue( QKeySequence( Qt::CTRL + Qt::Key_A ) ) << false; QTest::newRow( "int_valid" ) << QVariant( -123 ) << false; typedef QList<QVariant> variantsList; @@ -1616,10 +1463,6 @@ void tst_QVariant::writeToReadFromDataStream_data() QTest::newRow( "size_valid" ) << QVariant( QSize( 10, 10 ) ) << false; QTest::newRow( "string_invalid" ) << QVariant( QString() ) << true; QTest::newRow( "string_valid" ) << QVariant( QString( "Test" ) ) << false; -#ifdef QT3_SUPPORT - QTest::newRow( "cstring_invalid" ) << QVariant( Q3CString() ) << true; - QTest::newRow( "cstring_valid" ) << QVariant( Q3CString( "Test" ) ) << false; -#endif QStringList stringlist; stringlist << "One" << "Two" << "Three"; QTest::newRow( "stringlist_valid" ) << QVariant( stringlist ) << false; @@ -1674,13 +1517,8 @@ void tst_QVariant::writeToReadFromDataStream() // Since only a few won't match since the serial numbers are different // I won't bother adding another bool in the data test. QVariant::Type writeType = writeVariant.type(); -#ifdef QT3_SUPPORT - if ( writeType != QVariant::Invalid && writeType != QVariant::Bitmap && writeType != QVariant::Pixmap - && writeType != QVariant::Image && writeType != QVariant::IconSet ) { -#else if ( writeType != QVariant::Invalid && writeType != QVariant::Bitmap && writeType != QVariant::Pixmap && writeType != QVariant::Image) { -#endif switch (writeType) { default: QCOMPARE( readVariant, writeVariant ); @@ -1805,11 +1643,7 @@ void tst_QVariant::operator_eq_eq_data() QVariant mULongLongString(QByteArray("42")); QVariant mULongLongQString(QString("42")); -#ifdef QT3_SUPPORT - QVariant mBool(false, 0); -#else QVariant mBool(false); -#endif QVariant mBoolString(QByteArray("false")); QVariant mBoolQString(QString("false")); @@ -2028,45 +1862,45 @@ void tst_QVariant::typeName_data() QTest::newRow("9") << int(QVariant::Size) << QByteArray("QSize"); QTest::newRow("10") << int(QVariant::Color) << QByteArray("QColor"); QTest::newRow("11") << int(QVariant::Palette) << QByteArray("QPalette"); - QTest::newRow("14") << int(QVariant::Point) << QByteArray("QPoint"); - QTest::newRow("15") << int(QVariant::Image) << QByteArray("QImage"); - QTest::newRow("16") << int(QVariant::Int) << QByteArray("int"); - QTest::newRow("17") << int(QVariant::UInt) << QByteArray("uint"); - QTest::newRow("18") << int(QVariant::Bool) << QByteArray("bool"); - QTest::newRow("19") << int(QVariant::Double) << QByteArray("double"); - QTest::newRow("20") << int(QMetaType::Float) << QByteArray("float"); - QTest::newRow("21") << int(QVariant::Polygon) << QByteArray("QPolygon"); - QTest::newRow("22") << int(QVariant::Region) << QByteArray("QRegion"); - QTest::newRow("23") << int(QVariant::Bitmap) << QByteArray("QBitmap"); - QTest::newRow("24") << int(QVariant::Cursor) << QByteArray("QCursor"); - QTest::newRow("25") << int(QVariant::SizePolicy) << QByteArray("QSizePolicy"); - QTest::newRow("26") << int(QVariant::Date) << QByteArray("QDate"); - QTest::newRow("27") << int(QVariant::Time) << QByteArray("QTime"); - QTest::newRow("28") << int(QVariant::DateTime) << QByteArray("QDateTime"); - QTest::newRow("29") << int(QVariant::ByteArray) << QByteArray("QByteArray"); - QTest::newRow("30") << int(QVariant::BitArray) << QByteArray("QBitArray"); - QTest::newRow("31") << int(QVariant::KeySequence) << QByteArray("QKeySequence"); - QTest::newRow("32") << int(QVariant::Pen) << QByteArray("QPen"); - QTest::newRow("33") << int(QVariant::LongLong) << QByteArray("qlonglong"); - QTest::newRow("34") << int(QVariant::ULongLong) << QByteArray("qulonglong"); - QTest::newRow("35") << int(QVariant::Char) << QByteArray("QChar"); - QTest::newRow("36") << int(QVariant::Url) << QByteArray("QUrl"); - QTest::newRow("37") << int(QVariant::TextLength) << QByteArray("QTextLength"); - QTest::newRow("38") << int(QVariant::TextFormat) << QByteArray("QTextFormat"); - QTest::newRow("39") << int(QVariant::Locale) << QByteArray("QLocale"); - QTest::newRow("40") << int(QVariant::LineF) << QByteArray("QLineF"); - QTest::newRow("41") << int(QVariant::RectF) << QByteArray("QRectF"); - QTest::newRow("42") << int(QVariant::PointF) << QByteArray("QPointF"); - QTest::newRow("43") << int(QVariant::RegExp) << QByteArray("QRegExp"); - QTest::newRow("44") << int(QVariant::UserType) << QByteArray("UserType"); - QTest::newRow("45") << int(QVariant::Matrix) << QByteArray("QMatrix"); - QTest::newRow("46") << int(QVariant::Transform) << QByteArray("QTransform"); - QTest::newRow("47") << int(QVariant::Hash) << QByteArray("QVariantHash"); - QTest::newRow("48") << int(QVariant::Matrix4x4) << QByteArray("QMatrix4x4"); - QTest::newRow("49") << int(QVariant::Vector2D) << QByteArray("QVector2D"); - QTest::newRow("50") << int(QVariant::Vector3D) << QByteArray("QVector3D"); - QTest::newRow("51") << int(QVariant::Vector4D) << QByteArray("QVector4D"); - QTest::newRow("52") << int(QVariant::Quaternion) << QByteArray("QQuaternion"); + QTest::newRow("12") << int(QVariant::Point) << QByteArray("QPoint"); + QTest::newRow("13") << int(QVariant::Image) << QByteArray("QImage"); + QTest::newRow("14") << int(QVariant::Int) << QByteArray("int"); + QTest::newRow("15") << int(QVariant::UInt) << QByteArray("uint"); + QTest::newRow("16") << int(QVariant::Bool) << QByteArray("bool"); + QTest::newRow("17") << int(QVariant::Double) << QByteArray("double"); + QTest::newRow("18") << int(QMetaType::Float) << QByteArray("float"); + QTest::newRow("19") << int(QVariant::Polygon) << QByteArray("QPolygon"); + QTest::newRow("20") << int(QVariant::Region) << QByteArray("QRegion"); + QTest::newRow("21") << int(QVariant::Bitmap) << QByteArray("QBitmap"); + QTest::newRow("22") << int(QVariant::Cursor) << QByteArray("QCursor"); + QTest::newRow("23") << int(QVariant::SizePolicy) << QByteArray("QSizePolicy"); + QTest::newRow("24") << int(QVariant::Date) << QByteArray("QDate"); + QTest::newRow("25") << int(QVariant::Time) << QByteArray("QTime"); + QTest::newRow("26") << int(QVariant::DateTime) << QByteArray("QDateTime"); + QTest::newRow("27") << int(QVariant::ByteArray) << QByteArray("QByteArray"); + QTest::newRow("28") << int(QVariant::BitArray) << QByteArray("QBitArray"); + QTest::newRow("29") << int(QVariant::KeySequence) << QByteArray("QKeySequence"); + QTest::newRow("30") << int(QVariant::Pen) << QByteArray("QPen"); + QTest::newRow("31") << int(QVariant::LongLong) << QByteArray("qlonglong"); + QTest::newRow("32") << int(QVariant::ULongLong) << QByteArray("qulonglong"); + QTest::newRow("33") << int(QVariant::Char) << QByteArray("QChar"); + QTest::newRow("34") << int(QVariant::Url) << QByteArray("QUrl"); + QTest::newRow("35") << int(QVariant::TextLength) << QByteArray("QTextLength"); + QTest::newRow("36") << int(QVariant::TextFormat) << QByteArray("QTextFormat"); + QTest::newRow("37") << int(QVariant::Locale) << QByteArray("QLocale"); + QTest::newRow("38") << int(QVariant::LineF) << QByteArray("QLineF"); + QTest::newRow("39") << int(QVariant::RectF) << QByteArray("QRectF"); + QTest::newRow("40") << int(QVariant::PointF) << QByteArray("QPointF"); + QTest::newRow("41") << int(QVariant::RegExp) << QByteArray("QRegExp"); + QTest::newRow("42") << int(QVariant::UserType) << QByteArray("UserType"); + QTest::newRow("43") << int(QVariant::Matrix) << QByteArray("QMatrix"); + QTest::newRow("44") << int(QVariant::Transform) << QByteArray("QTransform"); + QTest::newRow("45") << int(QVariant::Hash) << QByteArray("QVariantHash"); + QTest::newRow("46") << int(QVariant::Matrix4x4) << QByteArray("QMatrix4x4"); + QTest::newRow("47") << int(QVariant::Vector2D) << QByteArray("QVector2D"); + QTest::newRow("48") << int(QVariant::Vector3D) << QByteArray("QVector3D"); + QTest::newRow("49") << int(QVariant::Vector4D) << QByteArray("QVector4D"); + QTest::newRow("50") << int(QVariant::Quaternion) << QByteArray("QQuaternion"); } void tst_QVariant::typeName() @@ -2101,9 +1935,6 @@ void tst_QVariant::typeToName() QVERIFY( QVariant::nameToType( "" ) == QVariant::Invalid ); QVERIFY( QVariant::nameToType( "foo" ) == QVariant::Invalid ); QCOMPARE(QVariant::nameToType("QIconSet"), QVariant::Icon); -#ifdef QT3_SUPPORT - QCOMPARE(QVariant::nameToType("Q3CString"), QVariant::ByteArray); -#endif } void tst_QVariant::streamInvalidVariant() @@ -2134,45 +1965,6 @@ void tst_QVariant::streamInvalidVariant() QVERIFY( readY == writeY ); } -void tst_QVariant::nullAsType() -{ -#ifdef QT3_SUPPORT - QVariant null; - QVERIFY(null.isNull()); - - null.asInt(); - QVERIFY(null.isNull()); - - null = QVariant(QString::null); - QVERIFY(null.isNull()); - - null.asInt(); - QVERIFY(null.isNull()); - - int type = QVariant::Invalid; - while (type < (int)QVariant::ULongLong) { - null = QVariant(); - QVERIFY(null.isNull()); - - type++; - if (type == 20) - continue; - if (type == QVariant::Size) - // QSize has its own ideas of ::isNull - continue; - - if (!null.convert((QVariant::Type)type)) - continue; - QCOMPARE((int)null.type(), type); - - QVERIFY2(null.isNull(), qPrintable(QString("'null.isNull()' failed for type: %1").arg(null.typeName()))); - } - - null = QVariant(QLatin1String(static_cast<const char *>(0))); - QVERIFY(null.isNull()); -#endif -} - static int instanceCount = 0; struct MyType @@ -2629,20 +2421,6 @@ void tst_QVariant::variantHash() QCOMPARE(qvariant_cast<QVariantHash>(v3).value("test").toInt(), 42); } -void tst_QVariant::invalidAsByteArray() -{ -#ifdef QT3_SUPPORT - QVariant v; - QByteArray &a = v.asByteArray(); - a.resize(2); - a[0] = 'a'; - a[1] = 'b'; - QCOMPARE(v, QVariant(QByteArray("ab"))); -#else - QSKIP("Qt compiled without Qt3Support",SkipAll); -#endif -} - void tst_QVariant::invalidQColor() const { QVariant va("An invalid QColor::name() value."); @@ -3235,18 +3013,24 @@ struct MyData { void *ptr; MyData() : ptr(this) {} - ~MyData() { Q_ASSERT(ptr == this); } - MyData(const MyData& o) : ptr(this) { Q_ASSERT(o.ptr == &o); } + ~MyData() + { + if (ptr != this) qWarning("%s: object has moved", Q_FUNC_INFO); + } + MyData(const MyData& o) : ptr(this) + { + if (o.ptr != &o) qWarning("%s: other object has moved", Q_FUNC_INFO); + } MyData &operator=(const MyData &o) { - Q_ASSERT(ptr == this); - Q_ASSERT(o.ptr == &o); + if (ptr != this) qWarning("%s: object has moved", Q_FUNC_INFO); + if (o.ptr != &o) qWarning("%s: other object has moved", Q_FUNC_INFO); return *this; } bool operator==(const MyData &o) const { - Q_ASSERT(ptr == this); - Q_ASSERT(o.ptr == &o); + if (ptr != this) qWarning("%s: object has moved", Q_FUNC_INFO); + if (o.ptr != &o) qWarning("%s: other object has moved", Q_FUNC_INFO); return true; } }; diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index 23e1d3186a..0b35c49bb0 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -40,10 +40,6 @@ ****************************************************************************/ -#if defined(QT3_SUPPORT) -#include <q3hbox.h> -#include <q3textedit.h> -#endif #include <qboxlayout.h> #include <qapplication.h> #include <qbitmap.h> @@ -169,7 +165,6 @@ public: tst_QWidget(); virtual ~tst_QWidget(); - public slots: void initTestCase(); void cleanupTestCase(); @@ -189,10 +184,8 @@ private slots: void isVisibleTo(); void isHidden(); void fonts(); - void mapToGlobal(); void mapFromAndTo_data(); void mapFromAndTo(); - void checkFocus(); void focusChainOnHide(); void focusChainOnReparent(); void setTabOrder(); @@ -650,9 +643,6 @@ void tst_QWidget::initTestCase() // Create the test class testWidget = new BezierViewer( 0, "testObject"); testWidget->resize(200,200); -#ifdef QT3_SUPPORT - qApp->setMainWidget(testWidget); -#endif testWidget->show(); QTest::qWaitForWindowShown(testWidget); QTest::qWait(50); @@ -1343,27 +1333,6 @@ void tst_QWidget::fonts() QVERIFY( cleanTestWidget->font() == originalFont ); } -void tst_QWidget::mapToGlobal() -{ -#if !defined(QT3_SUPPORT) - QSKIP("No Qt3 Support", SkipAll); -#else - QPoint vis = testWidget->mapToGlobal(QPoint(0,0)); - testWidget->hide(); - QCOMPARE(testWidget->mapToGlobal(QPoint(0,0)), vis); - testWidget->show(); - - // test in a layout and witha move - Q3HBox * qhb = new Q3HBox(testWidget); - QWidget * qw = new QWidget(qhb); - qw->move(6,12); - QPoint wVis = qw->mapToGlobal(QPoint(0,0)); - qw->hide(); - QCOMPARE(qw->mapToGlobal(QPoint(0,0)), wVis); - delete qhb; -#endif // QT3_SUPPORT -} - void tst_QWidget::mapFromAndTo_data() { QTest::addColumn<bool>("windowHidden"); @@ -1654,36 +1623,6 @@ void tst_QWidget::focusChainOnHide() testWidget->show(); //don't disturb later tests } -void tst_QWidget::checkFocus() -{ -#if !defined(QT3_SUPPORT) - QSKIP("No Qt3 Support", SkipAll); -#else - // This is a very specific test for a specific bug, the bug was - // that when setEnabled(FALSE) then setEnabled(TRUE) was called on - // the parent of a child widget which had focus while hidden, then - // when the widget was shown, the focus would be in the wrong place. - - Q3HBox widget; - QLineEdit *focusWidget = new QLineEdit( &widget ); - new QLineEdit( &widget ); - new QPushButton( &widget ); - focusWidget->setFocus(); - widget.setEnabled( FALSE ); - widget.setEnabled( TRUE ); - widget.show(); -#ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&widget); -#endif - QTest::qWait( 100 ); - widget.activateWindow(); - // next call is necessary since the window manager may not give the focus to the widget when - // it is shown, which causes the QVERIFY to fail - QApplication::setActiveWindow(&widget); - QVERIFY( qApp->focusWidget() == focusWidget ); -#endif // QT3_SUPPORT -} - class Container : public QWidget { public: @@ -2014,28 +1953,6 @@ void tst_QWidget::showMaximized() widget.showMaximized(); QTRY_VERIFY(widget.size().width() > 20 && widget.size().height() > 20); } - -#ifdef QT3_SUPPORT -#if !defined(Q_WS_QWS) -//embedded respects max/min sizes by design -- maybe wrong design, but that's the way it is now. - { - Q3HBox box; - QWidget widget(&box); - widget.setMinimumSize(500, 500); - box.showMaximized(); - QVERIFY(box.isMaximized()); - } - - { - Q3HBox box; - QWidget widget(&box); - widget.setMaximumSize(500, 500); - - box.showMaximized(); - QVERIFY(box.isMaximized()); - } -#endif -#endif // QT3_SUPPORT } void tst_QWidget::showFullScreen() @@ -2107,28 +2024,6 @@ void tst_QWidget::showFullScreen() widget.showFullScreen(); QVERIFY(widget.isFullScreen()); } - -#ifdef QT3_SUPPORT -#if !defined(Q_WS_QWS) -//embedded respects max/min sizes by design -- maybe wrong design, but that's the way it is now. - { - Q3HBox box; - QWidget widget(&box); - widget.setMinimumSize(500, 500); - box.showFullScreen(); - QVERIFY(box.isFullScreen()); - } - - { - Q3HBox box; - QWidget widget(&box); - widget.setMaximumSize(500, 500); - - box.showFullScreen(); - QVERIFY(box.isFullScreen()); - } -#endif -#endif // QT3_SUPPORT } class ResizeWidget : public QWidget { @@ -6374,11 +6269,6 @@ void tst_QWidget::compatibilityChildInsertedEvents() QCoreApplication::sendPostedEvents(); expected = EventRecorder::EventList() -#ifdef QT_HAS_QT3SUPPORT - << qMakePair(&widget, QEvent::ChildInsertedRequest) - << qMakePair(&widget, QEvent::ChildInserted) - << qMakePair(&widget, QEvent::ChildInserted) -#endif << qMakePair(&widget, QEvent::PolishRequest) << qMakePair(&widget, QEvent::Polish) << qMakePair(&widget, QEvent::ChildPolished) @@ -6414,10 +6304,6 @@ void tst_QWidget::compatibilityChildInsertedEvents() EventRecorder::EventList() << qMakePair(&widget, QEvent::WinIdChange) << qMakePair(&widget, QEvent::Polish) -#ifdef QT_HAS_QT3SUPPORT - << qMakePair(&widget, QEvent::ChildInserted) - << qMakePair(&widget, QEvent::ChildInserted) -#endif << qMakePair(&widget, QEvent::ChildPolished) << qMakePair(&widget, QEvent::ChildPolished) << qMakePair(&widget, QEvent::Move) @@ -6433,9 +6319,6 @@ void tst_QWidget::compatibilityChildInsertedEvents() QCoreApplication::sendPostedEvents(); expected = EventRecorder::EventList() -#ifdef QT_HAS_QT3SUPPORT - << qMakePair(&widget, QEvent::ChildInsertedRequest) -#endif << qMakePair(&widget, QEvent::PolishRequest) << qMakePair(&widget, QEvent::Type(QEvent::User + 1)) << qMakePair(&widget, QEvent::Type(QEvent::User + 2)); @@ -6476,10 +6359,6 @@ void tst_QWidget::compatibilityChildInsertedEvents() QCoreApplication::sendPostedEvents(); expected = EventRecorder::EventList() -#ifdef QT_HAS_QT3SUPPORT - << qMakePair(&widget, QEvent::ChildInsertedRequest) - << qMakePair(&widget, QEvent::ChildInserted) -#endif << qMakePair(&widget, QEvent::PolishRequest) << qMakePair(&widget, QEvent::Polish) << qMakePair(&widget, QEvent::ChildPolished) @@ -6516,9 +6395,6 @@ void tst_QWidget::compatibilityChildInsertedEvents() EventRecorder::EventList() << qMakePair(&widget, QEvent::WinIdChange) << qMakePair(&widget, QEvent::Polish) -#ifdef QT_HAS_QT3SUPPORT - << qMakePair(&widget, QEvent::ChildInserted) -#endif << qMakePair(&widget, QEvent::ChildPolished) << qMakePair(&widget, QEvent::Move) << qMakePair(&widget, QEvent::Resize) @@ -6533,9 +6409,6 @@ void tst_QWidget::compatibilityChildInsertedEvents() QCoreApplication::sendPostedEvents(); expected = EventRecorder::EventList() -#ifdef QT_HAS_QT3SUPPORT - << qMakePair(&widget, QEvent::ChildInsertedRequest) -#endif << qMakePair(&widget, QEvent::PolishRequest) << qMakePair(&widget, QEvent::Type(QEvent::User + 1)) << qMakePair(&widget, QEvent::Type(QEvent::User + 2)); @@ -6996,9 +6869,7 @@ void tst_QWidget::renderWithPainter() void tst_QWidget::render_task188133() { QMainWindow mainWindow; -#if defined(QT3_SUPPORT) - mainWindow.setCentralWidget(new Q3TextEdit); -#endif + // Make sure QWidget::render does not trigger QWidget::repaint/update // and asserts for Qt::WA_WState_Created. QPixmap pixmap = QPixmap::grabWidget(&mainWindow); @@ -7234,8 +7105,7 @@ void tst_QWidget::render_systemClip2() QFETCH(bool, usePaintEvent); QFETCH(QColor, expectedColor); - Q_ASSERT_X(expectedColor != QColor(Qt::red), Q_FUNC_INFO, - "Qt::red is the reference color for the image, pick another color"); + QVERIFY2(expectedColor != QColor(Qt::red), "Qt::red is the reference color for the image, pick another color"); class MyWidget : public QWidget { @@ -10422,7 +10292,7 @@ void tst_QWidget::taskQTBUG_7532_tabOrderWithFocusProxy() w.setFocusProxy(fp); QWidget::setTabOrder(&w, fp); - // No Q_ASSERT, then it's allright. + // In debug mode, no assertion failure means it's alright. } void tst_QWidget::movedAndResizedAttributes() diff --git a/tests/auto/qwizard/tst_qwizard.cpp b/tests/auto/qwizard/tst_qwizard.cpp index 5667d4047a..00b59a923b 100644 --- a/tests/auto/qwizard/tst_qwizard.cpp +++ b/tests/auto/qwizard/tst_qwizard.cpp @@ -854,25 +854,26 @@ struct MyPage2 : public QWizardPage public: MyPage2() : init(0), cleanup(0), validate(0) {} - void initializePage() { ++init; QWizardPage::initializePage(); checkInvariant(); } - void cleanupPage() { ++cleanup; QWizardPage::cleanupPage(); checkInvariant(); } + void initializePage() { ++init; QWizardPage::initializePage(); } + void cleanupPage() { ++cleanup; QWizardPage::cleanupPage(); } bool validatePage() { ++validate; return QWizardPage::validatePage(); } - void check(int init, int cleanup) - { Q_ASSERT(init == this->init && cleanup == this->cleanup); Q_UNUSED(init); Q_UNUSED(cleanup); } + bool check(int init, int cleanup) + { + return init == this->init + && cleanup == this->cleanup + && (this->init == this->cleanup || this->init - 1 == this->cleanup); + } int init; int cleanup; int validate; - -private: - void checkInvariant() { Q_ASSERT(init == cleanup || init - 1 == cleanup); } }; #define CHECK_PAGE_INIT(i0, c0, i1, c1, i2, c2) \ - page0->check((i0), (c0)); \ - page1->check((i1), (c1)); \ - page2->check((i2), (c2)); + QVERIFY(page0->check((i0), (c0))); \ + QVERIFY(page1->check((i1), (c1))); \ + QVERIFY(page2->check((i2), (c2))); void tst_QWizard::setOption_IndependentPages() { diff --git a/tests/auto/qworkspace/tst_qworkspace.cpp b/tests/auto/qworkspace/tst_qworkspace.cpp index ca12f3e259..191c150004 100644 --- a/tests/auto/qworkspace/tst_qworkspace.cpp +++ b/tests/auto/qworkspace/tst_qworkspace.cpp @@ -45,10 +45,6 @@ #include <qmainwindow.h> #include <qmenubar.h> #include <qworkspace.h> -#if defined(QT3_SUPPORT) -#include <q3popupmenu.h> -#include <q3accel.h> -#endif //TESTED_CLASS= //TESTED_FILES= @@ -75,7 +71,6 @@ private slots: void getSetCheck(); void windowActivated_data(); void windowActivated(); - void accelPropagation(); void windowActivatedWithMinimize(); void showWindows(); void changeWindowTitle(); @@ -314,59 +309,6 @@ void tst_QWorkspace::accelActivated() accelPressed = TRUE; } -void tst_QWorkspace::accelPropagation() -{ -#if defined (QT3_SUPPORT) - QSKIP( "Until QTest::keyPress() sends the events via the OS, this will skip", SkipAll); - // See #13987 for details of bug report related to this - - QMainWindow mw(0, Qt::X11BypassWindowManagerHint) ; - mw.menuBar(); - QWorkspace *workspace = new QWorkspace(&mw); - workspace->setObjectName("testWidget"); - mw.setCentralWidget(workspace); - connect( workspace, SIGNAL(windowActivated(QWidget*)), this, SLOT(activeChanged(QWidget*)) ); - mw.show(); - qApp->setActiveWindow(&mw); - - QMainWindow* mainWindow = new QMainWindow( workspace ); - - // The popup menu has to have no parent, this is vital in the - // original case of reproducing the bug - - Q3PopupMenu* popup = new Q3PopupMenu; - popup->insertItem("First"); - mainWindow->menuBar()->insertItem("Menu", popup); - - Q3Accel* accel = new Q3Accel(mainWindow); - accel->connectItem(accel->insertItem(Qt::Key_Escape), this, SLOT(accelActivated()) ); - - mainWindow->show(); - - QTest::keyPress( mainWindow, Qt::Key_Escape ); - QVERIFY( accelPressed ); - accelPressed = FALSE; - - QTest::mousePress( mainWindow->menuBar(), Qt::LeftButton, 0, QPoint( 5, 5 ) ); - - // Check the popup menu did appear to be sure - QVERIFY( qApp->activePopupWidget() == popup ); - - QTest::mouseClick( popup, Qt::LeftButton, 0, QPoint( 5, 25 ) ); - - // Check we did actually cause the popup menu to be closed - QVERIFY( !popup->isVisible() ); - - // Now we check that the accelarator still works - QTest::keyPress( mainWindow, Qt::Key_Escape ); - QVERIFY( accelPressed ); - delete popup; -#else - QSKIP( "No Qt3Support. Skipping.", SkipAll); -#endif - -} - void tst_QWorkspace::showWindows() { QWorkspace *ws = new QWorkspace( 0 ); diff --git a/tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp b/tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp index c0029f59bd..a2c84cfa50 100644 --- a/tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp +++ b/tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp @@ -181,9 +181,7 @@ private slots: { if(bodyLength == -1) { - Q_ASSERT_X(false, Q_FUNC_INFO, - "No length was specified in the header."); - return; + qFatal("No length was specified in the header."); } QDomDocument domDoc; diff --git a/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp b/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp index 565df30961..0e4930454a 100644 --- a/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp +++ b/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp @@ -165,7 +165,7 @@ class tst_QXmlSimpleReader : public QObject void roundtripWithNamespaces() const; private: - static QDomDocument fromByteArray(const QString &title, const QByteArray &ba); + static QDomDocument fromByteArray(const QString &title, const QByteArray &ba, bool *ok); XmlServer *server; }; @@ -730,25 +730,27 @@ void tst_QXmlSimpleReader::reportNamespace_data() const << QString("http://example.com/"); } -QDomDocument tst_QXmlSimpleReader::fromByteArray(const QString &title, const QByteArray &ba) +QDomDocument tst_QXmlSimpleReader::fromByteArray(const QString &title, const QByteArray &ba, bool *ok) { QDomDocument doc(title); - const bool ret = doc.setContent(ba, true); - Q_ASSERT(ret); + *ok = doc.setContent(ba, true); return doc; } void tst_QXmlSimpleReader::roundtripWithNamespaces() const { - QEXPECT_FAIL("", "Known problem, see 154573. The fix happens to break uic.", Abort); - const char *const expected = "<element b:attr=\"value\" xmlns:a=\"http://www.example.com/A\" xmlns:b=\"http://www.example.com/B\" />\n"; + bool ok; { const char *const xml = "<element xmlns:b=\"http://www.example.com/B\" b:attr=\"value\" xmlns:a=\"http://www.example.com/A\"/>"; - const QDomDocument one(fromByteArray("document", xml)); - const QDomDocument two(fromByteArray("document2", one.toByteArray(2))); + const QDomDocument one(fromByteArray("document", xml, &ok)); + QVERIFY(ok); + const QDomDocument two(fromByteArray("document2", one.toByteArray(2), &ok)); + QVERIFY(ok); + + QEXPECT_FAIL("", "Known problem, see 154573. The fix happens to break uic.", Abort); QCOMPARE(expected, one.toByteArray().constData()); QCOMPARE(one.toByteArray(2).constData(), two.toByteArray(2).constData()); @@ -758,8 +760,10 @@ void tst_QXmlSimpleReader::roundtripWithNamespaces() const { const char *const xml = "<element b:attr=\"value\" xmlns:b=\"http://www.example.com/B\" xmlns:a=\"http://www.example.com/A\"/>"; - const QDomDocument one(fromByteArray("document", xml)); - const QDomDocument two(fromByteArray("document2", one.toByteArray(2))); + const QDomDocument one(fromByteArray("document", xml, &ok)); + QVERIFY(ok); + const QDomDocument two(fromByteArray("document2", one.toByteArray(2), &ok)); + QVERIFY(ok); QCOMPARE(expected, one.toByteArray().constData()); QCOMPARE(one.toByteArray(2).constData(), two.toByteArray(2).constData()); diff --git a/tests/auto/qxmlstream/qc14n.h b/tests/auto/qxmlstream/qc14n.h index bf8090888d..661ddeefaa 100644 --- a/tests/auto/qxmlstream/qc14n.h +++ b/tests/auto/qxmlstream/qc14n.h @@ -47,17 +47,9 @@ QT_FORWARD_DECLARE_CLASS(QString) class QC14N { public: - enum Option - { - IgnoreProcessingInstruction, - IgnoreComments - }; - typedef QFlags<Option> Options; - static bool isEqual(QIODevice *const firstDocument, QIODevice *const secondDocument, - QString *const message = 0, - const Options options = Options()); + QString *const message = 0); private: static bool isDifferent(const QXmlStreamReader &r1, @@ -76,20 +68,17 @@ private: */ bool QC14N::isEqual(QIODevice *const firstDocument, QIODevice *const secondDocument, - QString *const message, - const Options options) + QString *const message) { qDebug() << Q_FUNC_INFO; - Q_ASSERT_X(firstDocument, Q_FUNC_INFO, - "A valid QIODevice pointer must be supplied"); - Q_ASSERT_X(secondDocument, Q_FUNC_INFO, - "A valid QIODevice pointer must be supplied"); - Q_ASSERT_X(firstDocument->isReadable(), Q_FUNC_INFO, "The device must be readable."); - Q_ASSERT_X(secondDocument->isReadable(), Q_FUNC_INFO, "The device must be readable."); - - Q_ASSERT_X(options == Options(), Q_FUNC_INFO, - "Not yet implemented."); - Q_UNUSED(options); + if (!firstDocument) + qFatal("%s: A valid firstDocument QIODevice pointer must be supplied", Q_FUNC_INFO); + if (!secondDocument) + qFatal("%s: A valid secondDocument QIODevice pointer must be supplied", Q_FUNC_INFO); + if (!firstDocument->isReadable()) + qFatal("%s: The firstDocument device must be readable.", Q_FUNC_INFO); + if (!secondDocument->isReadable()) + qFatal("%s: The secondDocument device must be readable.", Q_FUNC_INFO); QXmlStreamReader r1(firstDocument); QXmlStreamReader r2(secondDocument); @@ -202,9 +191,9 @@ bool QC14N::isDifferent(const QXmlStreamReader &r1, r2.processingInstructionData() == r2.processingInstructionData(); } + default: + qFatal("%s: Unknown tokenType: %d", Q_FUNC_INFO, static_cast<int>(r1.tokenType())); + return false; } - - Q_ASSERT_X(false, Q_FUNC_INFO, "This line should never be reached"); - return false; } diff --git a/tests/auto/qxmlstream/tst_qxmlstream.cpp b/tests/auto/qxmlstream/tst_qxmlstream.cpp index fd2f90e47f..946a19ad70 100644 --- a/tests/auto/qxmlstream/tst_qxmlstream.cpp +++ b/tests/auto/qxmlstream/tst_qxmlstream.cpp @@ -221,8 +221,7 @@ static QString documentElement(const QByteArray &document) reader.readNext(); } - Q_ASSERT_X(false, Q_FUNC_INFO, - qPrintable(QString::fromLatin1("The input %1 didn't contain an element.").arg(QString::fromUtf8(document.constData())))); + qFatal("The input %s didn't contain an element", document.constData()); return QString(); } @@ -265,7 +264,8 @@ public: expected(aExpected), output(aOutput) { - Q_ASSERT(!aId.isEmpty()); + if (aId.isEmpty()) + qFatal("%s: aId must not be an empty string", Q_FUNC_INFO); } QString id; @@ -289,7 +289,8 @@ public: TestSuiteHandler(const QUrl &baseURI) : runCount(0), skipCount(0) { - Q_ASSERT(baseURI.isValid()); + if (!baseURI.isValid()) + qFatal("%s: baseURI must be valid", Q_FUNC_INFO); m_baseURI.push(baseURI); } @@ -461,7 +462,7 @@ public: } else { - Q_ASSERT_X(false, Q_FUNC_INFO, "The input catalog is invalid."); + qFatal("The input catalog is invalid."); return false; } } @@ -481,9 +482,12 @@ public: static bool isWellformed(QIODevice *const inputFile, const ParseMode mode) { - Q_ASSERT(inputFile); - Q_ASSERT_X(inputFile->isOpen(), Q_FUNC_INFO, "The caller is responsible for opening the device."); - Q_ASSERT(mode == ParseIncrementally || mode == ParseSinglePass); + if (!inputFile) + qFatal("%s: inputFile must be a valid QIODevice pointer", Q_FUNC_INFO); + if (!inputFile->isOpen()) + qFatal("%s: inputFile must be opened by the caller", Q_FUNC_INFO); + if (mode != ParseIncrementally && mode != ParseSinglePass) + qFatal("%s: mode must be either ParseIncrementally or ParseSinglePass", Q_FUNC_INFO); if(mode == ParseIncrementally) { diff --git a/tests/auto/selftests/alive/qtestalive.cpp b/tests/auto/selftests/alive/qtestalive.cpp index ba4236744d..e743eaedce 100644 --- a/tests/auto/selftests/alive/qtestalive.cpp +++ b/tests/auto/selftests/alive/qtestalive.cpp @@ -78,7 +78,8 @@ private: QTestAlivePinger::QTestAlivePinger(QObject *receiver, QObject *parent) : QObject(parent), rec(receiver), currentSequenceId(0), lastSequenceId(0) { - Q_ASSERT(rec); + if (!rec) + qFatal("Null receiver object passed to QTestAlivePinger::QTestAlivePinger()"); timerId = startTimer(850); } @@ -147,8 +148,8 @@ bool QTestAlive::event(QEvent *e) void QTestAlive::run() { - Q_ASSERT_X(QCoreApplication::instance(), "QTestAlive::run()", - "Cannot start QTestAlive without a QCoreApplication instance."); + if (!QCoreApplication::instance()) + qFatal("QTestAlive::run(): Cannot start QTestAlive without a QCoreApplication instance."); QTestAlivePinger p(this); pinger = &p; diff --git a/tests/benchmarks/corelib/tools/qstring/main.cpp b/tests/benchmarks/corelib/tools/qstring/main.cpp index 96f2c30cf4..9d9de81d17 100644 --- a/tests/benchmarks/corelib/tools/qstring/main.cpp +++ b/tests/benchmarks/corelib/tools/qstring/main.cpp @@ -921,7 +921,7 @@ static inline int ucstrncmp_short_tail(const ushort *p1, const ushort *p2, int l return 0; } -static inline int bsf_nonzero(register long val) +static inline int bsf_nonzero(register int val) { int result; # ifdef Q_CC_GNU diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.cpp index 2b1e87ccac..3993cc9e28 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.cpp @@ -84,10 +84,8 @@ bool AbstractItemContainer::event(QEvent *e) bool AbstractItemContainer::eventFilter(QObject *obj, QEvent *event) { if (event->type()==QEvent::GraphicsSceneResize && m_itemView) { -#if (QT_VERSION >= 0x040600) const bool caching = m_itemView->listItemCaching(); m_itemView->setListItemCaching(false); -#endif QSizeF s = m_itemView->size(); s.setWidth(s.width()-m_itemView->verticalScrollBar()->size().width()); @@ -96,9 +94,7 @@ bool AbstractItemContainer::eventFilter(QObject *obj, QEvent *event) m_itemView->updateViewContent(); updateItemBuffer(); -#if (QT_VERSION >= 0x040600) m_itemView->setListItemCaching(caching); -#endif } return QGraphicsWidget::eventFilter(obj, event); @@ -373,7 +369,6 @@ void AbstractItemContainer::updateContent() m_items.at(i)->updateItemContents(); } -#if (QT_VERSION >= 0x040600) void AbstractItemContainer::setSubtreeCacheEnabled(bool enabled) { for (int i = 0; i <m_items.count(); ++i) @@ -381,7 +376,6 @@ void AbstractItemContainer::setSubtreeCacheEnabled(bool enabled) if (m_prototype) m_prototype->setSubtreeCacheEnabled(enabled); } -#endif void AbstractItemContainer::setTwoColumns(const bool enabled) { diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.h index 249f7a76ea..495ef89c0a 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.h +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.h @@ -74,10 +74,8 @@ public: virtual void setTwoColumns(const bool enabled); bool twoColumns(); -#if (QT_VERSION >= 0x040600) void setSubtreeCacheEnabled(const bool enabled); virtual void setListItemCaching(const bool enabled, const int index) = 0; -#endif protected: virtual void adjustVisibleContainerSize(const QSizeF &size) = 0; diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.cpp index 63ab2f9313..b617a44029 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.cpp @@ -415,10 +415,8 @@ void AbstractItemView::scrollContentsBy(qreal dx, qreal dy) for (int i = 0; i<itemsInContainer; ++i) { AbstractViewItem *changedItem = m_container->itemAt(i); - changedItem->setModelIndex(m_model->index(startRow+i,0)); -#if (QT_VERSION >= 0x040600) + changedItem->setModelIndex(m_model->index(startRow+i,0)); m_container->setListItemCaching(listItemCaching(), i); -#endif } qreal diff = vPos-startRow*itemH; diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.h index 2e286fb002..a94d673368 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.h +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.h @@ -76,10 +76,8 @@ public: void updateViewContent(); virtual void scrollContentsBy(qreal dx, qreal dy); -#if (QT_VERSION >= 0x040600) virtual bool listItemCaching() const = 0; virtual void setListItemCaching(bool enabled) = 0; -#endif protected: virtual bool event(QEvent *e); diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.cpp index 2787a2e178..ff782bd37f 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.cpp @@ -106,12 +106,10 @@ void AbstractViewItem::themeChange() ; // No impl yet } -#if (QT_VERSION >= 0x040600) /*virtual*/ void AbstractViewItem::setSubtreeCacheEnabled(bool enabled) { Q_UNUSED(enabled) ; // No impl } -#endif diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.h index 1eace4e501..a4a3c476e9 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.h +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.h @@ -69,9 +69,7 @@ public: virtual void updateItemContents(); virtual void themeChange(); -#if (QT_VERSION >= 0x040600) virtual void setSubtreeCacheEnabled(bool enabled); -#endif virtual QSizeF effectiveSizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp index 718c1b8a48..93c3d8acd4 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp @@ -41,10 +41,7 @@ #include <QtGui> #include <QSvgRenderer> - -#if (QT_VERSION >= 0x040600) #include <QGraphicsEffect> -#endif #include "iconitem.h" @@ -52,9 +49,7 @@ IconItem::IconItem(const QString &filename, QGraphicsItem *parent) : GvbWidget(parent) , m_filename(filename) , m_rotation(0.0) -#if (QT_VERSION >= 0x040600) , m_opacityEffect(0) -#endif , m_smoothTransformation(false) { setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); @@ -140,7 +135,6 @@ void IconItem::setFileName(const QString &filename) } } -#if (QT_VERSION >= 0x040600) void IconItem::setOpacityEffectEnabled(const bool enable) { if (!m_opacityEffect) @@ -166,4 +160,3 @@ bool IconItem::isOpacityEffectEnabled() const return false; } -#endif diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h index ea9e9a5cc1..29fafb705b 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h @@ -46,9 +46,7 @@ #include "gvbwidget.h" -#if (QT_VERSION >= 0x040600) class QGraphicsOpacityEffect; -#endif class QPainter; class IconItem : public GvbWidget @@ -64,10 +62,9 @@ public: QString fileName() const; void setFileName(const QString &filename); -#if (QT_VERSION >= 0x040600) void setOpacityEffectEnabled(const bool enable); bool isOpacityEffectEnabled() const; -#endif + void setRotation(const qreal rotation) { m_rotation = rotation; } qreal rotation() const { return m_rotation; } @@ -87,9 +84,7 @@ private: QString m_filename; QPixmap m_pixmap; qreal m_rotation; -#if (QT_VERSION >= 0x040600) QGraphicsOpacityEffect *m_opacityEffect; -#endif bool m_smoothTransformation; }; diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.cpp index 06c7b14b19..d5cd877bfb 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.cpp @@ -161,10 +161,8 @@ void ItemRecyclingList::themeChange() // Update icons item->icon(ListItem::LeftIcon)->setRotation(Theme::p()->iconRotation(ListItem::LeftIcon)); item->icon(ListItem::RightIcon)->setRotation(Theme::p()->iconRotation(ListItem::RightIcon)); -#if (QT_VERSION >= 0x040600) item->icon(ListItem::LeftIcon)->setOpacityEffectEnabled(Theme::p()->isIconOpacityEffectEnabled(ListItem::LeftIcon)); item->icon(ListItem::RightIcon)->setOpacityEffectEnabled(Theme::p()->isIconOpacityEffectEnabled(ListItem::RightIcon)); -#endif item->icon(ListItem::LeftIcon)->setSmoothTransformationEnabled(Theme::p()->isIconSmoothTransformationEnabled(ListItem::LeftIcon)); item->icon(ListItem::RightIcon)->setSmoothTransformationEnabled(Theme::p()->isIconSmoothTransformationEnabled(ListItem::RightIcon)); } @@ -208,25 +206,17 @@ void ItemRecyclingList::keyPressEvent(QKeyEvent *event) bool ItemRecyclingList::listItemCaching() const { -#if (QT_VERSION >= 0x040600) ListItemContainer *container = static_cast<ListItemContainer *>(m_container); return container->listItemCaching(); -#else - return false; -#endif } void ItemRecyclingList::setListItemCaching(bool enabled) { -#if (QT_VERSION >= 0x040600) ListItemContainer *container = static_cast<ListItemContainer *>(m_container); container->setListItemCaching(enabled); -#else - Q_UNUSED(enabled) -#endif } void ItemRecyclingList::updateListItemBackgrounds(int index) @@ -255,17 +245,13 @@ void ItemRecyclingList::setTwoColumns(const bool enabled) if (twoColumns() == enabled) return; -#if (QT_VERSION >= 0x040600) const bool caching = listItemCaching(); setListItemCaching(false); -#endif m_container->setTwoColumns(enabled); refreshContainerGeometry(); -#if (QT_VERSION >= 0x040600) setListItemCaching(caching); -#endif } bool ItemRecyclingList::twoColumns() diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglistview.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglistview.h index 9798fe5cf1..1c19d2c36b 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglistview.h +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglistview.h @@ -51,10 +51,8 @@ public: virtual ~ItemRecyclingListView(); void setCurrentRow(const int row); int rows() const; -#if (QT_VERSION >= 0x040600) virtual bool listItemCaching() const = 0; virtual void setListItemCaching(bool enabled) = 0; -#endif protected: void rowsInserted(const QModelIndex &parent, int start, int end); diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp index ad73ca98f7..25acb02fef 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp @@ -50,10 +50,8 @@ Label::Label(const QString& text, QGraphicsItem *parent) setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); setContentsMargins(0, 0, 0, 0); setText(text); -#if QT_VERSION >= 0x040600 // This flag was introduced in Qt 4.6. setFlag(QGraphicsItem::ItemHasNoContents, true); -#endif } Label::~Label() diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.cpp index e9ce6fb15d..4d8ccbf6b0 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.cpp @@ -175,18 +175,14 @@ QVariant ListItem::data(int role) const data.icons[ListItem::LeftIcon] = icon(ListItem::LeftIcon)->fileName(); data.iconRotations[ListItem::LeftIcon] = icon(ListItem::LeftIcon)->rotation(); data.iconSmoothTransformations[ListItem::LeftIcon] = icon(ListItem::LeftIcon)->isSmoothTransformationEnabled(); -#if (QT_VERSION >= 0x040600) data.iconOpacityEffets[ListItem::LeftIcon] = icon(ListItem::LeftIcon)->isOpacityEffectEnabled(); -#endif } if (icon(ListItem::RightIcon)) { data.icons[ListItem::RightIcon] = icon(ListItem::RightIcon)->fileName(); data.iconRotations[ListItem::RightIcon] = icon(ListItem::RightIcon)->rotation(); data.iconSmoothTransformations[ListItem::RightIcon] = icon(ListItem::RightIcon)->isSmoothTransformationEnabled(); -#if (QT_VERSION >= 0x040600) data.iconOpacityEffets[ListItem::RightIcon] = icon(ListItem::RightIcon)->isOpacityEffectEnabled(); -#endif } data.borderPen = m_borderPen; @@ -226,17 +222,13 @@ void ListItem::setData(const QVariant &value, int role) if (icon(ListItem::LeftIcon)) { icon(ListItem::LeftIcon)->setRotation(data.iconRotations[ListItem::LeftIcon]); icon(ListItem::LeftIcon)->setSmoothTransformationEnabled(data.iconSmoothTransformations[ListItem::LeftIcon]); -#if (QT_VERSION >= 0x040600) icon(ListItem::LeftIcon)->setOpacityEffectEnabled(data.iconOpacityEffets[ListItem::LeftIcon]); -#endif } if (icon(ListItem::RightIcon)) { icon(ListItem::RightIcon)->setRotation(data.iconRotations[ListItem::RightIcon]); icon(ListItem::RightIcon)->setSmoothTransformationEnabled(data.iconSmoothTransformations[ListItem::RightIcon]); -#if (QT_VERSION >= 0x040600) icon(ListItem::RightIcon)->setOpacityEffectEnabled(data.iconOpacityEffets[ListItem::RightIcon]); -#endif } m_borderPen = data.borderPen; diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.cpp index 6633bd10be..323814e2cb 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.cpp @@ -47,19 +47,14 @@ #include "abstractviewitem.h" #include "recycledlistitem.h" - -#if (QT_VERSION >= 0x040600) #include "listitemcache.h" #include "itemrecyclinglist.h" -#endif ListItemContainer::ListItemContainer(int bufferSize, ItemRecyclingList *view, QGraphicsWidget *parent) : AbstractItemContainer(bufferSize, parent) , m_view(view) , m_layout(new QGraphicsLinearLayout(Qt::Vertical)) -#if (QT_VERSION >= 0x040600) , m_listItemCaching(false) -#endif { setContentsMargins(0,0,0,0); m_layout->setContentsMargins(0,0,0,0); @@ -70,9 +65,7 @@ ListItemContainer::ListItemContainer(int bufferSize, ItemRecyclingList *view, QG /*virtual*/ ListItemContainer::~ListItemContainer() { -#if (QT_VERSION >= 0x040600) setListItemCaching(false); -#endif for (int i = 0; i < m_items.count(); ++i) { m_layout->removeItem(m_items.at(i)); m_items.at(i)->setParentItem(0); @@ -81,7 +74,6 @@ ListItemContainer::~ListItemContainer() m_items.clear(); } -#if (QT_VERSION >= 0x040600) bool ListItemContainer::listItemCaching() const { return m_listItemCaching; @@ -99,7 +91,6 @@ void ListItemContainer::setListItemCaching(const bool enabled) for (int i = 0; i < itemCount; ++i) setListItemCaching(enabled, i); } -#endif /*virtual*/ void ListItemContainer::adjustVisibleContainerSize(const QSizeF &size) @@ -112,9 +103,7 @@ void ListItemContainer::addItemToVisibleLayout(int index, AbstractViewItem *item { m_layout->insertItem(index,item); -#if (QT_VERSION >= 0x040600) setListItemCaching(m_listItemCaching, index); -#endif } /*virtual*/ @@ -122,7 +111,6 @@ void ListItemContainer::removeItemFromVisibleLayout(AbstractViewItem *item) { m_layout->removeItem(item); -#if (QT_VERSION >= 0x040600) RecycledListItem *recycledItem = static_cast<RecycledListItem*>(item); if (!recycledItem) @@ -131,7 +119,6 @@ void ListItemContainer::removeItemFromVisibleLayout(AbstractViewItem *item) ListItem *listItem = recycledItem->item(); setListItemCaching(false, listItem); -#endif } /*virtual*/ @@ -168,7 +155,6 @@ int ListItemContainer::maxItemCountInItemBuffer() const return count; } -#if (QT_VERSION >= 0x040600) void ListItemContainer::setListItemCaching(const bool enabled, const int index) { RecycledListItem *recycledItem = static_cast<RecycledListItem*>(m_layout->itemAt(index)); @@ -198,8 +184,6 @@ void ListItemContainer::setListItemCaching(const bool enabled, ListItem *listIte listItem->setGraphicsEffect(cache); } } -#endif - void ListItemContainer::setTwoColumns(const bool twoColumns) { diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.h index 80d6d25131..ccbb76293d 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.h +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.h @@ -63,11 +63,9 @@ public: virtual void setTwoColumns(const bool twoColumns); -#if (QT_VERSION >= 0x040600) bool listItemCaching() const; void setListItemCaching(const bool enabled); virtual void setListItemCaching(const bool enabled, const int index); -#endif protected: @@ -82,11 +80,9 @@ private: ItemRecyclingList *m_view; QGraphicsLinearLayout *m_layout; -#if (QT_VERSION >= 0x040600) + void setListItemCaching(const bool enabled, ListItem *listItem); bool m_listItemCaching; -#endif }; - #endif // LISTITEMCONTAINER_H diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.cpp index bf9369c0a1..ff46ec8e90 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.cpp @@ -109,7 +109,6 @@ ScrollBar* ListWidget::verticalScrollBar() const return 0; } -#if (QT_VERSION >= 0x040600) bool ListWidget::listItemCaching() const { return m_listView->listItemCaching(); @@ -119,7 +118,6 @@ void ListWidget::setListItemCaching(bool enable) { m_listView->setListItemCaching(enable); } -#endif void ListWidget::setTwoColumns(const bool twoColumns) { diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.h index bcc15875de..78e4faa291 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.h +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.h @@ -64,10 +64,8 @@ public: QGraphicsWidget* takeItem(int row); QGraphicsWidget* itemAt(int row); int itemCount() const; -#if (QT_VERSION >= 0x040600) bool listItemCaching() const; void setListItemCaching(bool enable); -#endif ScrollBar* verticalScrollBar() const; void setTwoColumns(const bool twoColumns); diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelist.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelist.cpp index 3e3f5bb84b..e1d6b61d1e 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelist.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelist.cpp @@ -102,20 +102,12 @@ ScrollBar* SimpleList::verticalScrollBar() const bool SimpleList::listItemCaching() const { -#if (QT_VERSION >= 0x040600) return m_list->listItemCaching(); -#else - return false; -#endif } void SimpleList::setListItemCaching(bool enable) { -#if (QT_VERSION >= 0x040600) m_list->setListItemCaching(enable); -#else - Q_UNUSED(enable) -#endif } void SimpleList::keyPressEvent(QKeyEvent *event) diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp index 3f2fb8baa8..a62f742f02 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp @@ -46,9 +46,7 @@ #include "simplelistview.h" #include "scrollbar.h" #include "listitem.h" -#if (QT_VERSION >= 0x040600) #include "listitemcache.h" -#endif #include "theme.h" class SimpleListViewPrivate @@ -62,9 +60,7 @@ public: , m_layout(0) , m_twoColumns(false) , q_ptr(button) -#if (QT_VERSION >= 0x040600) , m_listItemCaching(false) -#endif { Q_Q(SimpleListView); @@ -99,10 +95,9 @@ public: if (!m_content) return; -#if (QT_VERSION >= 0x040600) const bool caching = q->listItemCaching(); q->setListItemCaching(false); -#endif + m_content->resize(q->viewport()->size().width(), m_layout->preferredHeight()); const bool clip = @@ -112,9 +107,7 @@ public: q->viewport()->setFlag( QGraphicsItem::ItemClipsChildrenToShape, clip); -#if (QT_VERSION >= 0x040600) q->setListItemCaching(caching); -#endif } void resizeScrollBars() @@ -161,12 +154,11 @@ public: void updateListContents() { -#if (QT_VERSION >= 0x040600) Q_Q(SimpleListView); const bool caching = q->listItemCaching(); q->setListItemCaching(false); -#endif + const QString defaultIcon = Theme::p()->pixmapPath()+"contact_default_icon.svg"; const int itemCount = m_layout->count(); @@ -209,26 +201,21 @@ public: // Update icons item->icon(ListItem::LeftIcon)->setRotation(Theme::p()->iconRotation(ListItem::LeftIcon)); item->icon(ListItem::RightIcon)->setRotation(Theme::p()->iconRotation(ListItem::RightIcon)); -#if (QT_VERSION >= 0x040600) item->icon(ListItem::LeftIcon)->setOpacityEffectEnabled(Theme::p()->isIconOpacityEffectEnabled(ListItem::LeftIcon)); item->icon(ListItem::RightIcon)->setOpacityEffectEnabled(Theme::p()->isIconOpacityEffectEnabled(ListItem::RightIcon)); -#endif item->icon(ListItem::LeftIcon)->setSmoothTransformationEnabled(Theme::p()->isIconSmoothTransformationEnabled(ListItem::LeftIcon)); item->icon(ListItem::RightIcon)->setSmoothTransformationEnabled(Theme::p()->isIconSmoothTransformationEnabled(ListItem::RightIcon)); } -#if (QT_VERSION >= 0x040600) q->setListItemCaching(caching); -#endif } void updateListItemBackgrounds(int index) { -#if (QT_VERSION >= 0x040600) Q_Q(SimpleListView); const bool caching = q->listItemCaching(); q->setListItemCaching(false); -#endif + const int itemCount = m_layout->count(); for (int i=index; i<itemCount; ++i) { @@ -243,9 +230,7 @@ public: } } -#if (QT_VERSION >= 0x040600) q->setListItemCaching(caching); -#endif } void setTwoColumns(const bool twoColumns) @@ -256,10 +241,9 @@ public: Q_Q(SimpleListView); m_twoColumns = twoColumns; -#if (QT_VERSION >= 0x040600) bool cache = q->listItemCaching(); q->setListItemCaching(false); -#endif + QList<QGraphicsLayoutItem *> moveditems; if(twoColumns) { int half = m_layout->count()/2; @@ -293,9 +277,7 @@ public: resizeContents(q->size()); resizeScrollBars(); -#if (QT_VERSION >= 0x040600) q->setListItemCaching(cache); -#endif } bool twoColumns() @@ -307,9 +289,7 @@ public: QGraphicsGridLayout *m_layout; bool m_twoColumns; SimpleListView *q_ptr; -#if (QT_VERSION >= 0x040600) bool m_listItemCaching; -#endif }; SimpleListView::SimpleListView(QGraphicsWidget *parent) @@ -361,11 +341,9 @@ void SimpleListView::insertItem(int index, QGraphicsWidget *item) d->m_layout->addItem(moveditems.at(i), d->m_layout->count(), 0); } -#if (QT_VERSION >= 0x040600) ListItemCache *cache = new ListItemCache; item->setGraphicsEffect(cache); cache->setEnabled(listItemCaching()); -#endif d->resizeScrollBars(); d->updateListItemBackgrounds(index); @@ -416,7 +394,6 @@ int SimpleListView::itemCount() return d->m_layout->count(); } -#if (QT_VERSION >= 0x040600) bool SimpleListView::listItemCaching() const { Q_D(const SimpleListView); @@ -439,7 +416,6 @@ void SimpleListView::setListItemCaching(bool enabled) cache->setEnabled(enabled); } } -#endif void SimpleListView::scrollContentsBy(qreal dx, qreal dy) { diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h index e2fcfff6d0..c119309fdc 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h @@ -72,10 +72,8 @@ public: public slots: void themeChange(); -#if (QT_VERSION >= 0x040600) bool listItemCaching() const; void setListItemCaching(bool enabled); -#endif protected: diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.cpp index 06baf7729c..970bc9f9fa 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.cpp @@ -60,9 +60,7 @@ Theme::Theme(QObject *parent) , m_listItemBackgroundOpacityOdd() , m_listItemBorderPen(QPen()) , m_listItemRounding() -#if (QT_VERSION >= 0x040600) , m_iconOpacityEffectEnabled() -#endif , m_iconRotation() , m_iconSmoothTransformation() { @@ -156,10 +154,9 @@ void Theme::setBlueTheme() m_listItemBorderPen = QPen(Qt::NoPen); m_listItemRounding = QSize(0.0, 0.0); -#if (QT_VERSION >= 0x040600) m_iconOpacityEffectEnabled[ListItem::LeftIcon] = false; m_iconOpacityEffectEnabled[ListItem::RightIcon] = false; -#endif + m_iconRotation[ListItem::LeftIcon] = 0.0; m_iconRotation[ListItem::RightIcon] = 0.0; @@ -207,10 +204,9 @@ void Theme::setLimeTheme() m_listItemBorderPen = QPen(QColor(0,0,0,55), 3, Qt::SolidLine); m_listItemRounding = QSize(12.0, 12.0); -#if (QT_VERSION >= 0x040600) m_iconOpacityEffectEnabled[ListItem::LeftIcon] = true; m_iconOpacityEffectEnabled[ListItem::RightIcon] = false; -#endif + m_iconRotation[ListItem::LeftIcon] = -4.0; m_iconRotation[ListItem::RightIcon] = 0.0; diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.h index 04972b7ca2..414a741cf3 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.h +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.h @@ -93,9 +93,8 @@ public: QPen listItemBorderPen() const { return m_listItemBorderPen; } QSize listItemRounding() const { return m_listItemRounding; } -#if (QT_VERSION >= 0x040600) bool isIconOpacityEffectEnabled(const ListItem::IconItemPos iconPos) const { return m_iconOpacityEffectEnabled[iconPos]; } -#endif + qreal iconRotation(const ListItem::IconItemPos iconPos) const { return m_iconRotation[iconPos]; } bool isIconSmoothTransformationEnabled(const ListItem::IconItemPos iconPos) const { return m_iconSmoothTransformation[iconPos]; } @@ -124,9 +123,7 @@ private: QPen m_listItemBorderPen; QSize m_listItemRounding; -#if (QT_VERSION >= 0x040600) QHash<ListItem::IconItemPos, bool> m_iconOpacityEffectEnabled; -#endif QHash<ListItem::IconItemPos, qreal> m_iconRotation; QHash<ListItem::IconItemPos, bool> m_iconSmoothTransformation; }; diff --git a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp index 2d33825e5c..895d7bff63 100644 --- a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp +++ b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp @@ -924,6 +924,7 @@ void tst_QPainter::fillPrimitives_helper(QPainter *p, PrimitiveType type, Primit case Primitive_Float_RectPath: QBENCHMARK { p->drawPath(s->f_path_rect); } break; case Primitive_Float_2RectPath: QBENCHMARK { p->drawPath(s->f_path_2rects); } break; case Primitive_Float_EllipsePath: QBENCHMARK { p->drawPath(s->f_path_ellipse); } break; + case Primitive_Last_Primitive: break; } } diff --git a/tests/benchmarks/gui/painting/qtbench/benchmarktests.h b/tests/benchmarks/gui/painting/qtbench/benchmarktests.h index f5bc717cfb..c20cbfaef1 100644 --- a/tests/benchmarks/gui/painting/qtbench/benchmarktests.h +++ b/tests/benchmarks/gui/painting/qtbench/benchmarktests.h @@ -48,10 +48,7 @@ #include <QTextLayout> #include <QFontMetrics> #include <QDebug> - -#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0) -# include <QStaticText> -#endif +#include <QStaticText> class Benchmark { @@ -472,13 +469,10 @@ public: PainterQPointMode, LayoutMode, DocumentMode, - PixmapMode - -#if QT_VERSION >= 0x040700 - , StaticTextMode, + PixmapMode, + StaticTextMode, StaticTextWithMaximumSizeMode, StaticTextBackendOptimizations -#endif }; DrawText(const QString &text, Mode mode) @@ -487,12 +481,8 @@ public: } virtual void begin(QPainter *p, int iterations) { -#if QT_VERSION >= 0x040700 m_staticTexts.clear(); m_currentStaticText = 0; -#else - Q_UNUSED(iterations); -#endif m_pixmaps.clear(); m_currentPixmap = 0; QRect m_bounds = QRect(0,0,p->device()->width(), p->device()->height()); @@ -536,7 +526,6 @@ public: m_size = m_layout.boundingRect().toRect().size(); break; } -#if QT_VERSION >= 0x040700 case StaticTextWithMaximumSizeMode: { QStaticText staticText; m_size = (p->boundingRect(m_bounds, 0, m_text)).size(); @@ -570,8 +559,6 @@ public: break; } -#endif - case PainterQPointMode: { QFontMetrics fm(p->font()); m_size = QSize(fm.width(m_text, m_text.length()), fm.height()); @@ -602,8 +589,6 @@ public: case LayoutMode: m_layout.draw(p, rect.topLeft()); break; - -#if QT_VERSION >= 0x040700 case StaticTextWithMaximumSizeMode: case StaticTextMode: p->drawStaticText(rect.topLeft(), m_staticTexts.at(0)); @@ -612,7 +597,6 @@ public: p->drawStaticText(rect.topLeft(), m_staticTexts.at(m_currentStaticText)); m_currentStaticText = (m_currentStaticText + 1) % m_staticTexts.size(); break; -#endif } } @@ -628,12 +612,9 @@ public: case LayoutMode: type = "layout.draw()"; break; case DocumentMode: type = "doc.drawContents()"; break; case PixmapMode: type = "pixmap cached text"; break; - -#if QT_VERSION >= 0x040700 case StaticTextMode: type = "drawStaticText()"; break; case StaticTextWithMaximumSizeMode: type = "drawStaticText() w/ maxsize"; break; case StaticTextBackendOptimizations: type = "drawStaticText() w/ backend optimizations"; break; -#endif } return QString::fromLatin1("%3, len=%1, lines=%2") @@ -651,15 +632,10 @@ private: QList<QPixmap> m_pixmaps; int m_currentPixmap; -#if QT_VERSION >= 0x040700 int m_currentStaticText; QList<QStaticText> m_staticTexts; -#endif }; - - - class ClippedDrawRectBenchmark : public Benchmark { public: diff --git a/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp b/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp index d8082cc2e0..a61610786f 100644 --- a/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp +++ b/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp @@ -213,7 +213,6 @@ void tst_QtBench::qtBench_data() benchmarks << (new DrawText(longString, DrawText::PixmapMode)); benchmarks << (new DrawText(superLongString, DrawText::PixmapMode)); -#if QT_VERSION >= 0x040700 benchmarks << (new DrawText(shortString, DrawText::StaticTextMode)); benchmarks << (new DrawText(middleString, DrawText::StaticTextMode)); benchmarks << (new DrawText(longString, DrawText::StaticTextMode)); @@ -228,7 +227,6 @@ void tst_QtBench::qtBench_data() benchmarks << (new DrawText(middleString, DrawText::StaticTextBackendOptimizations)); benchmarks << (new DrawText(longString, DrawText::StaticTextBackendOptimizations)); benchmarks << (new DrawText(superLongString, DrawText::StaticTextBackendOptimizations)); -#endif foreach (Benchmark *benchmark, benchmarks) QTest::newRow(qPrintable(benchmark->name())) << reinterpret_cast<void *>(benchmark); diff --git a/tests/benchmarks/gui/painting/qtracebench/tst_qtracebench.cpp b/tests/benchmarks/gui/painting/qtracebench/tst_qtracebench.cpp index e71cfc6413..58566fe6a2 100644 --- a/tests/benchmarks/gui/painting/qtracebench/tst_qtracebench.cpp +++ b/tests/benchmarks/gui/painting/qtracebench/tst_qtracebench.cpp @@ -149,7 +149,7 @@ void ReplayWidget::paintEvent(QPaintEvent *) } } -void ReplayWidget::resizeEvent(QResizeEvent *event) +void ReplayWidget::resizeEvent(QResizeEvent * /* event */) { visibleUpdates.clear(); diff --git a/tests/benchmarks/gui/text/qtext/main.cpp b/tests/benchmarks/gui/text/qtext/main.cpp index 01e8c46bd8..97abc93b44 100644 --- a/tests/benchmarks/gui/text/qtext/main.cpp +++ b/tests/benchmarks/gui/text/qtext/main.cpp @@ -411,6 +411,7 @@ void tst_QText::paintLayoutToPixmap_painterFill() void tst_QText::document() { QTextDocument *doc = new QTextDocument; + Q_UNUSED(doc) QBENCHMARK { QTextDocument *doc = new QTextDocument; @@ -453,6 +454,7 @@ void tst_QText::paintDocToPixmap_painterFill() void tst_QText::control() { QTextControl *control = new QTextControl(m_shortLorem); + Q_UNUSED(control); QBENCHMARK { QTextControl *control = new QTextControl; diff --git a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp index 9a07aa4940..a96fa63b5a 100644 --- a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -501,7 +501,7 @@ void tst_qnetworkreply::echoPerformance() QByteArray data; data.resize(1024*1024*10); // 10 MB // init with garbage. needed so ssl cannot compress it in an efficient way. - for (int i = 0; i < data.size() / sizeof(int); i++) { + for (size_t i = 0; i < data.size() / sizeof(int); i++) { int r = qrand(); data.data()[i*sizeof(int)] = r; } |
