diff options
Diffstat (limited to 'kexi/plugins/macros/tests/xmlhandlertests2.cpp')
| -rw-r--r-- | kexi/plugins/macros/tests/xmlhandlertests2.cpp | 232 |
1 files changed, 116 insertions, 116 deletions
diff --git a/kexi/plugins/macros/tests/xmlhandlertests2.cpp b/kexi/plugins/macros/tests/xmlhandlertests2.cpp index 2234eaae1..ac176f890 100644 --- a/kexi/plugins/macros/tests/xmlhandlertests2.cpp +++ b/kexi/plugins/macros/tests/xmlhandlertests2.cpp @@ -29,7 +29,7 @@ #include <ostream> #include <cfloat> -#include <qdom.h> +#include <tqdom.h> #include <kdebug.h> #include <kunittest/runner.h> @@ -65,7 +65,7 @@ namespace KoMacroTest { /** * An @a TestObject instance used internaly to test - * handling and communication with from QObject + * handling and communication with from TQObject * inheritated instances. */ KSharedPtr<KoMacro::Action> testaction; @@ -76,11 +76,11 @@ namespace KoMacroTest { KSharedPtr<KoMacro::Action> action3_2; // action of the parsen macro3, for test12 /** - * Represents a @a QValuList of @a MacroItem which are parsen in the + * Represents a @a TQValuList of @a MacroItem which are parsen in the * correspondig @a Macro . */ - QValueList<KSharedPtr<KoMacro::MacroItem > > macroitems2; // items of macro2 - QValueList<KSharedPtr<KoMacro::MacroItem > > macroitems3; // items of macro3 + TQValueList<KSharedPtr<KoMacro::MacroItem > > macroitems2; // items of macro2 + TQValueList<KSharedPtr<KoMacro::MacroItem > > macroitems3; // items of macro3 /** * @a MacroItem instances which ist fillen manually from the given XML @@ -186,7 +186,7 @@ void XMLHandlerTests2::testCorrectDomElement() // Part 1: From XML to a Macro. // Test-XML-document with normal allocated variables. - const QString xml = QString("<!DOCTYPE macros>" + const TQString xml = TQString("<!DOCTYPE macros>" "<macro xmlversion=\"1\">" "<item action=\"testaction\" >" "<variable name=\"teststring\" >test_string</variable>" @@ -196,9 +196,9 @@ void XMLHandlerTests2::testCorrectDomElement() "</item>" "</macro>"); // Set the XML-document with the above string. - QDomDocument doomdocument; + TQDomDocument doomdocument; doomdocument.setContent(xml); - const QDomElement elem = doomdocument.documentElement(); + const TQDomElement elem = doomdocument.documentElement(); // Create a MacroItem with the TestAction for macro2 and add it to macro. d->macroitem = new KoMacro::MacroItem(); @@ -207,10 +207,10 @@ void XMLHandlerTests2::testCorrectDomElement() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",QVariant("test_string")); - KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",QVariant(0)); - KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",QVariant(true)); - KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",QVariant(0.6)); + KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0)); + KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); @@ -241,8 +241,8 @@ void XMLHandlerTests2::testCorrectDomElement() varint->setVariant(117); d->macroitem2->variable("testint")->setVariant(117); - // Now convert the parsen macro2 back to a QDomElement and again into macro3 for a better comparison. - const QDomElement elem2 = d->macro2->toXML(); + // Now convert the parsen macro2 back to a TQDomElement and again into macro3 for a better comparison. + const TQDomElement elem2 = d->macro2->toXML(); KOMACROTEST_ASSERT(d->macro3->parseXML(elem2),true); // Go down to the MacroItem of macro2. @@ -279,7 +279,7 @@ void XMLHandlerTests2::testBadRoot() // Part 1: From XML to a Macro. // Test-XML-document with normal allocated variables. - const QString xml = QString("<!DOCTYPE macros>" + const TQString xml = TQString("<!DOCTYPE macros>" "<maro xmlversion=\"1\">" "<item action=\"testaction\" >" "<variable name=\"teststring\" >test_string</variable>" @@ -289,9 +289,9 @@ void XMLHandlerTests2::testBadRoot() "</item>" "</maro>"); // Set the XML-document with the above string. - QDomDocument doomdocument; + TQDomDocument doomdocument; doomdocument.setContent(xml); - const QDomElement elem = doomdocument.documentElement(); + const TQDomElement elem = doomdocument.documentElement(); // Create a MacroItem with the TestAction for macro2 and add it to macro. d->macroitem = new KoMacro::MacroItem(); @@ -300,10 +300,10 @@ void XMLHandlerTests2::testBadRoot() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",QVariant("test_string")); - KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",QVariant(0)); - KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",QVariant(true)); - KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",QVariant(0.6)); + KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0)); + KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_XASSERT(d->macro2->parseXML(elem),true); @@ -319,7 +319,7 @@ void XMLHandlerTests2::testMissingVariable() // Part 1: From XML to a Macro. // Test-XML-document with normal allocated variables. - const QString xml = QString("<!DOCTYPE macros>" + const TQString xml = TQString("<!DOCTYPE macros>" "<macro xmlversion=\"1\">" "<item action=\"testaction\" >" "<variable name=\"teststring\" >test_string</variable>" @@ -328,9 +328,9 @@ void XMLHandlerTests2::testMissingVariable() "</item>" "</macro>"); // Set the XML-document with the above string. - QDomDocument doomdocument; + TQDomDocument doomdocument; doomdocument.setContent(xml); - const QDomElement elem = doomdocument.documentElement(); + const TQDomElement elem = doomdocument.documentElement(); // Create a MacroItem with the TestAction for macro2 and add it to macro. d->macroitem = new KoMacro::MacroItem(); @@ -339,9 +339,9 @@ void XMLHandlerTests2::testMissingVariable() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",QVariant("test_string")); - KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",QVariant(0)); - KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",QVariant(0.6)); + KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0)); + KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); @@ -367,8 +367,8 @@ void XMLHandlerTests2::testMissingVariable() } } - // Now convert the parsen macro2 back to a QDomElement and again into macro3 for a better comparison. - const QDomElement elem2 = d->macro2->toXML(); + // Now convert the parsen macro2 back to a TQDomElement and again into macro3 for a better comparison. + const TQDomElement elem2 = d->macro2->toXML(); KOMACROTEST_ASSERT(d->macro3->parseXML(elem2),true); // Go down to the MacroItem of macro2. @@ -403,7 +403,7 @@ void XMLHandlerTests2::testMoreVariables() // Part 1: From XML to a Macro. // Test-XML-document with normal allocated variables. - const QString xml = QString("<!DOCTYPE macros>" + const TQString xml = TQString("<!DOCTYPE macros>" "<macro xmlversion=\"1\">" "<item action=\"testaction\" >" "<variable name=\"teststring\" >test_string</variable>" @@ -414,9 +414,9 @@ void XMLHandlerTests2::testMoreVariables() "</item>" "</macro>"); // Set the XML-document with the above string. - QDomDocument doomdocument; + TQDomDocument doomdocument; doomdocument.setContent(xml); - const QDomElement elem = doomdocument.documentElement(); + const TQDomElement elem = doomdocument.documentElement(); // Create a MacroItem with the TestAction for macro2 and add it to macro. d->macroitem = new KoMacro::MacroItem(); @@ -425,10 +425,10 @@ void XMLHandlerTests2::testMoreVariables() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",QVariant("test_string")); - KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",QVariant(0)); - KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",QVariant(true)); - KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",QVariant(0.6)); + KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0)); + KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); KSharedPtr<KoMacro::Variable> varbla = d->macroitem->addVariable("testbla","somethingwrong"); // Is our XML parseable into a 2. Macro by calling parseXML()? @@ -457,8 +457,8 @@ void XMLHandlerTests2::testMoreVariables() } } - // Now convert the parsen macro2 back to a QDomElement and again into macro3 for a better comparison. - const QDomElement elem2 = d->macro2->toXML(); + // Now convert the parsen macro2 back to a TQDomElement and again into macro3 for a better comparison. + const TQDomElement elem2 = d->macro2->toXML(); KOMACROTEST_ASSERT(d->macro3->parseXML(elem2),true); // Go down to the MacroItem of macro2. @@ -496,7 +496,7 @@ void XMLHandlerTests2::testWrongVersion() // Part 1: From XML to a Macro. // Test-XML-document with normal allocated variables. - const QString xml = QString("<!DOCTYPE macros>" + const TQString xml = TQString("<!DOCTYPE macros>" "<maro xmlversion=\"2\">" "<item action=\"testaction\" >" "<variable name=\"teststring\" >test_string</variable>" @@ -506,9 +506,9 @@ void XMLHandlerTests2::testWrongVersion() "</item>" "</maro>"); // Set the XML-document with the above string. - QDomDocument doomdocument; + TQDomDocument doomdocument; doomdocument.setContent(xml); - const QDomElement elem = doomdocument.documentElement(); + const TQDomElement elem = doomdocument.documentElement(); // Create a MacroItem with the TestAction for macro2 and add it to macro. d->macroitem = new KoMacro::MacroItem(); @@ -517,10 +517,10 @@ void XMLHandlerTests2::testWrongVersion() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",QVariant("test_string")); - KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",QVariant(0)); - KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",QVariant(true)); - KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",QVariant(0.6)); + KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0)); + KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_XASSERT(d->macro2->parseXML(elem),true); @@ -538,7 +538,7 @@ void XMLHandlerTests2::testWrongXMLStruct() // Part 1: From XML to a Macro. // Test-XML-document with normal allocated variables. - const QString xml = QString("<!DOCTYPE macros>" + const TQString xml = TQString("<!DOCTYPE macros>" "maro xmlversion=\"1\">" "<item action=\"testaction\" >" "<variable name=\"teststring\" >test_string</variable>" @@ -548,9 +548,9 @@ void XMLHandlerTests2::testWrongXMLStruct() "</item>" "</maro>"); // Set the XML-document with the above string. - QDomDocument doomdocument; + TQDomDocument doomdocument; doomdocument.setContent(xml); - const QDomElement elem = doomdocument.documentElement(); + const TQDomElement elem = doomdocument.documentElement(); // Create a MacroItem with the TestAction for macro2 and add it to macro. d->macroitem = new KoMacro::MacroItem(); @@ -559,10 +559,10 @@ void XMLHandlerTests2::testWrongXMLStruct() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",QVariant("test_string")); - KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",QVariant(0)); - KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",QVariant(true)); - KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",QVariant(0.6)); + KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0)); + KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_XASSERT(d->macro2->parseXML(elem),true); @@ -578,7 +578,7 @@ void XMLHandlerTests2::testMaxNum() // Part 1: From XML to a Macro. // Test-XML-document with normal allocated variables. - const QString xml = QString("<!DOCTYPE macros>" + const TQString xml = TQString("<!DOCTYPE macros>" "<macro xmlversion=\"1\">" "<item action=\"testaction\" >" "<variable name=\"teststring\" >test_string</variable>" @@ -586,11 +586,11 @@ void XMLHandlerTests2::testMaxNum() "<variable name=\"testbool\" >true</variable>" "<variable name=\"testdouble\" > %2 </variable>" "</item>" - "</macro>").arg(INT_MAX).arg(DBL_MAX); + "</macro>").tqarg(INT_MAX).tqarg(DBL_MAX); // Set the XML-document with the above string. - QDomDocument doomdocument; + TQDomDocument doomdocument; doomdocument.setContent(xml); - const QDomElement elem = doomdocument.documentElement(); + const TQDomElement elem = doomdocument.documentElement(); // Create a MacroItem with the TestAction for macro2 and add it to macro. d->macroitem = new KoMacro::MacroItem(); @@ -599,10 +599,10 @@ void XMLHandlerTests2::testMaxNum() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",QVariant("test_string")); - KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",QVariant(INT_MAX)); - KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",QVariant(true)); - KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",QVariant(DBL_MAX)); + KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(INT_MAX)); + KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(DBL_MAX)); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); @@ -629,8 +629,8 @@ void XMLHandlerTests2::testMaxNum() } } - // Now convert the parsen macro2 back to a QDomElement and again into macro3 for a better comparison. - const QDomElement elem2 = d->macro2->toXML(); + // Now convert the parsen macro2 back to a TQDomElement and again into macro3 for a better comparison. + const TQDomElement elem2 = d->macro2->toXML(); KOMACROTEST_ASSERT(d->macro3->parseXML(elem2),true); // Go down to the MacroItem of macro2. @@ -666,7 +666,7 @@ void XMLHandlerTests2::testMaxNum2() // Part 1: From XML to a Macro. // Test-XML-document with normal allocated variables. - const QString xml = QString("<!DOCTYPE macros>" + const TQString xml = TQString("<!DOCTYPE macros>" "<macro xmlversion=\"1\">" "<item action=\"testaction\" >" "<variable name=\"teststring\" >test_string</variable>" @@ -674,11 +674,11 @@ void XMLHandlerTests2::testMaxNum2() "<variable name=\"testbool\" >true</variable>" "<variable name=\"testdouble\" > %2 </variable>" "</item>" - "</macro>").arg(INT_MAX+1).arg(DBL_MAX+1); + "</macro>").tqarg(INT_MAX+1).tqarg(DBL_MAX+1); // Set the XML-document with the above string. - QDomDocument doomdocument; + TQDomDocument doomdocument; doomdocument.setContent(xml); - const QDomElement elem = doomdocument.documentElement(); + const TQDomElement elem = doomdocument.documentElement(); // Create a MacroItem with the TestAction for macro2 and add it to macro. d->macroitem = new KoMacro::MacroItem(); @@ -687,10 +687,10 @@ void XMLHandlerTests2::testMaxNum2() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",QVariant("test_string")); - KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",QVariant(INT_MAX+1)); - KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",QVariant(true)); - KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",QVariant(DBL_MAX+1)); + KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(INT_MAX+1)); + KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(DBL_MAX+1)); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); @@ -717,8 +717,8 @@ void XMLHandlerTests2::testMaxNum2() } } - // Now convert the parsen macro2 back to a QDomElement and again into macro3 for a better comparison. - const QDomElement elem2 = d->macro2->toXML(); + // Now convert the parsen macro2 back to a TQDomElement and again into macro3 for a better comparison. + const TQDomElement elem2 = d->macro2->toXML(); KOMACROTEST_ASSERT(d->macro3->parseXML(elem2),true); // Go down to the MacroItem of macro2. @@ -754,7 +754,7 @@ void XMLHandlerTests2::testMinNum() // Part 1: From XML to a Macro. // Test-XML-document with normal allocated variables. - const QString xml = QString("<!DOCTYPE macros>" + const TQString xml = TQString("<!DOCTYPE macros>" "<macro xmlversion=\"1\">" "<item action=\"testaction\" >" "<variable name=\"teststring\" >test_string</variable>" @@ -762,11 +762,11 @@ void XMLHandlerTests2::testMinNum() "<variable name=\"testbool\" >true</variable>" "<variable name=\"testdouble\" > %2 </variable>" "</item>" - "</macro>").arg(INT_MIN).arg(DBL_MIN); + "</macro>").tqarg(INT_MIN).tqarg(DBL_MIN); // Set the XML-document with the above string. - QDomDocument doomdocument; + TQDomDocument doomdocument; doomdocument.setContent(xml); - const QDomElement elem = doomdocument.documentElement(); + const TQDomElement elem = doomdocument.documentElement(); // Create a MacroItem with the TestAction for macro2 and add it to macro. d->macroitem = new KoMacro::MacroItem(); @@ -775,10 +775,10 @@ void XMLHandlerTests2::testMinNum() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",QVariant("test_string")); - KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",QVariant(INT_MIN)); - KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",QVariant(true)); - KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",QVariant(DBL_MIN)); + KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(INT_MIN)); + KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(DBL_MIN)); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); @@ -805,8 +805,8 @@ void XMLHandlerTests2::testMinNum() } } - // Now convert the parsen macro2 back to a QDomElement and again into macro3 for a better comparison. - const QDomElement elem2 = d->macro2->toXML(); + // Now convert the parsen macro2 back to a TQDomElement and again into macro3 for a better comparison. + const TQDomElement elem2 = d->macro2->toXML(); KOMACROTEST_ASSERT(d->macro3->parseXML(elem2),true); // Go down to the MacroItem of macro2. @@ -842,7 +842,7 @@ void XMLHandlerTests2::testMinNum2() // Part 1: From XML to a Macro. // Test-XML-document with normal allocated variables. - const QString xml = QString("<!DOCTYPE macros>" + const TQString xml = TQString("<!DOCTYPE macros>" "<macro xmlversion=\"1\">" "<item action=\"testaction\" >" "<variable name=\"teststring\" >test_string</variable>" @@ -850,11 +850,11 @@ void XMLHandlerTests2::testMinNum2() "<variable name=\"testbool\" >true</variable>" "<variable name=\"testdouble\" > %2 </variable>" "</item>" - "</macro>").arg(INT_MIN-1).arg(DBL_MIN-1); + "</macro>").tqarg(INT_MIN-1).tqarg(DBL_MIN-1); // Set the XML-document with the above string. - QDomDocument doomdocument; + TQDomDocument doomdocument; doomdocument.setContent(xml); - const QDomElement elem = doomdocument.documentElement(); + const TQDomElement elem = doomdocument.documentElement(); // Create a MacroItem with the TestAction for macro2 and add it to macro. d->macroitem = new KoMacro::MacroItem(); @@ -863,10 +863,10 @@ void XMLHandlerTests2::testMinNum2() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",QVariant("test_string")); - KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",QVariant(INT_MIN-1)); - KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",QVariant(true)); - KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",QVariant(DBL_MIN-1)); + KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(INT_MIN-1)); + KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(DBL_MIN-1)); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); @@ -893,8 +893,8 @@ void XMLHandlerTests2::testMinNum2() } } - // Now convert the parsen macro2 back to a QDomElement and again into macro3 for a better comparison. - const QDomElement elem2 = d->macro2->toXML(); + // Now convert the parsen macro2 back to a TQDomElement and again into macro3 for a better comparison. + const TQDomElement elem2 = d->macro2->toXML(); KOMACROTEST_ASSERT(d->macro3->parseXML(elem2),true); // Go down to the MacroItem of macro2. @@ -930,7 +930,7 @@ void XMLHandlerTests2::testBigNumber() // Part 1: From XML to a Macro. // Test-XML-document with normal allocated variables. - const QString xml = QString("<!DOCTYPE macros>" + const TQString xml = TQString("<!DOCTYPE macros>" "<macro xmlversion=\"1\">" "<item action=\"testaction\" >" "<variable name=\"teststring\" >test_string</variable>" @@ -940,9 +940,9 @@ void XMLHandlerTests2::testBigNumber() "</item>" "</macro>"); // Set the XML-document with the above string. - QDomDocument doomdocument; + TQDomDocument doomdocument; doomdocument.setContent(xml); - const QDomElement elem = doomdocument.documentElement(); + const TQDomElement elem = doomdocument.documentElement(); // Create a MacroItem with the TestAction for macro2 and add it to macro. d->macroitem = new KoMacro::MacroItem(); @@ -951,10 +951,10 @@ void XMLHandlerTests2::testBigNumber() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",QVariant("test_string")); - //TODO //KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",QVariant(0123456789012345678901234567890123456789)); - KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",QVariant(true)); - KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",QVariant(0.6)); + KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + //TODO //KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0123456789012345678901234567890123456789)); + KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); @@ -981,8 +981,8 @@ void XMLHandlerTests2::testBigNumber() } } - // Now convert the parsen macro2 back to a QDomElement and again into macro3 for a better comparison. - const QDomElement elem2 = d->macro2->toXML(); + // Now convert the parsen macro2 back to a TQDomElement and again into macro3 for a better comparison. + const TQDomElement elem2 = d->macro2->toXML(); KOMACROTEST_ASSERT(d->macro3->parseXML(elem2),true); // Go down to the MacroItem of macro2. @@ -1018,7 +1018,7 @@ void XMLHandlerTests2::testTwoMacroItems() // Part 1: From XML to a Macro. // Test-XML-document with normal allocated variables. - const QString xml = QString("<!DOCTYPE macros>" + const TQString xml = TQString("<!DOCTYPE macros>" "<macro xmlversion=\"1\">" "<item action=\"testaction\" >" "<variable name=\"teststring\" >test_string</variable>" @@ -1036,9 +1036,9 @@ void XMLHandlerTests2::testTwoMacroItems() "</item>" "</macro>"); // Set the XML-document with the above string. - QDomDocument doomdocument; + TQDomDocument doomdocument; doomdocument.setContent(xml); - const QDomElement elem = doomdocument.documentElement(); + const TQDomElement elem = doomdocument.documentElement(); // Create a MacroItem with the TestAction for macro2 and add it to macro. d->macroitem = new KoMacro::MacroItem(); @@ -1050,17 +1050,17 @@ void XMLHandlerTests2::testTwoMacroItems() d->macroitem_2->setAction(d->testaction_2); // Push the Variables into the macroitem. - KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",QVariant("test_string")); - KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",QVariant(0)); - KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",QVariant(true)); - KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",QVariant(0.6)); + KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0)); + KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); KSharedPtr<KoMacro::Variable> varbla = d->macroitem->addVariable("testbla","somethingwrong"); // Push the Variables into the macroitem4. - KSharedPtr<KoMacro::Variable> varstring_2 = d->macroitem_2->addVariable("teststring",QVariant("testString2")); - KSharedPtr<KoMacro::Variable> varint_2 = d->macroitem_2->addVariable("testint",QVariant(4)); - KSharedPtr<KoMacro::Variable> varbool_2 = d->macroitem_2->addVariable("testbool",QVariant(false)); - KSharedPtr<KoMacro::Variable> vardouble_2 = d->macroitem_2->addVariable("testdouble",QVariant(0.7)); + KSharedPtr<KoMacro::Variable> varstring_2 = d->macroitem_2->addVariable("teststring",TQVariant("testString2")); + KSharedPtr<KoMacro::Variable> varint_2 = d->macroitem_2->addVariable("testint",TQVariant(4)); + KSharedPtr<KoMacro::Variable> varbool_2 = d->macroitem_2->addVariable("testbool",TQVariant(false)); + KSharedPtr<KoMacro::Variable> vardouble_2 = d->macroitem_2->addVariable("testdouble",TQVariant(0.7)); KSharedPtr<KoMacro::Variable> varbla_2 = d->macroitem_2->addVariable("testbla","somethingwrong2"); // Is our XML parseable into a 2. Macro by calling parseXML()? @@ -1072,7 +1072,7 @@ void XMLHandlerTests2::testTwoMacroItems() KOMACROTEST_ASSERT(d->macroitems2.size(),(sizetypelist)2); { - QValueList<KSharedPtr<KoMacro::MacroItem > >::ConstIterator mit2(d->macroitems2.constBegin()); + TQValueList<KSharedPtr<KoMacro::MacroItem > >::ConstIterator mit2(d->macroitems2.constBegin()); // 2a.comparison - Test if the Action is correct? d->macroitem2 = *mit2; mit2++; @@ -1101,8 +1101,8 @@ void XMLHandlerTests2::testTwoMacroItems() } } - // Now convert the parsen macro2 back to a QDomElement and again into macro3 for a better comparison. - const QDomElement elem2 = d->macro2->toXML(); + // Now convert the parsen macro2 back to a TQDomElement and again into macro3 for a better comparison. + const TQDomElement elem2 = d->macro2->toXML(); KOMACROTEST_ASSERT(d->macro3->parseXML(elem2),true); // Go down to the MacroItem of macro2. @@ -1111,7 +1111,7 @@ void XMLHandlerTests2::testTwoMacroItems() KOMACROTEST_ASSERT(d->macroitems3.size(),(sizetypelist)2); { - QValueList<KSharedPtr<KoMacro::MacroItem > >::ConstIterator mit3(d->macroitems3.constBegin()); + TQValueList<KSharedPtr<KoMacro::MacroItem > >::ConstIterator mit3(d->macroitems3.constBegin()); // 2b.comparison - Test if the Action is correct? d->macroitem3 = *mit3; mit3++; |