diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:34 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:34 -0600 |
commit | 83677e35509b4dafac63b76995652bdf3b49f209 (patch) | |
tree | 591f1dc22278addb439726c42896376b17bb42bd /kopete/libkopete/tests/kopeteemoticontest.cpp | |
parent | 808e453c56036211f57482ed847d54aca01bba68 (diff) | |
download | tdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.tar.gz tdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 808e453c56036211f57482ed847d54aca01bba68.
Diffstat (limited to 'kopete/libkopete/tests/kopeteemoticontest.cpp')
-rw-r--r-- | kopete/libkopete/tests/kopeteemoticontest.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp index 50c023d9..1f3fd436 100644 --- a/kopete/libkopete/tests/kopeteemoticontest.cpp +++ b/kopete/libkopete/tests/kopeteemoticontest.cpp @@ -62,7 +62,7 @@ void KopeteEmoticonTest::allTests() void KopeteEmoticonTest::testEmoticonParser() { Kopete::Emoticons emo("Default"); - TQString basePath = TQString::fromLatin1( SRCDIR ) + TQString::fromLatin1("/emoticon-parser-testcases"); + TQString basePath = TQString::tqfromLatin1( SRCDIR ) + TQString::tqfromLatin1("/emoticon-parser-testcases"); TQDir testCasesDir(basePath); TQStringList inputFileNames = testCasesDir.entryList("*.input"); @@ -73,8 +73,8 @@ void KopeteEmoticonTest::testEmoticonParser() TQString outputFileName = fileName; outputFileName.replace("input","output"); // open the input file - TQFile inputFile(basePath + TQString::fromLatin1("/") + fileName); - TQFile expectedFile(basePath + TQString::fromLatin1("/") + outputFileName); + TQFile inputFile(basePath + TQString::tqfromLatin1("/") + fileName); + TQFile expectedFile(basePath + TQString::tqfromLatin1("/") + outputFileName); // check if the expected output file exists // if it doesn't, skip the testcase if ( ! expectedFile.exists() ) @@ -102,11 +102,11 @@ void KopeteEmoticonTest::testEmoticonParser() // HACK to know the test case we applied, concatenate testcase name to both // input and expected string. WIll remove when I can add some sort of metadata // to a CHECK so debug its origin testcase - result = fileName + TQString::fromLatin1(": ") + result; - expectedData = fileName + TQString::fromLatin1(": ") + expectedData; + result = fileName + TQString::tqfromLatin1(": ") + result; + expectedData = fileName + TQString::tqfromLatin1(": ") + expectedData; // if the test case begins with broken, we expect it to fail, then use XFAIL // otherwise use CHECK - if ( fileName.section("-", 0, 0) == TQString::fromLatin1("broken") ) + if ( fileName.section("-", 0, 0) == TQString::tqfromLatin1("broken") ) { kdDebug() << "checking known-broken testcase: " << fileName << endl; XFAIL(result, expectedData); |