diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-02 06:40:27 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-02 06:40:27 +0000 |
commit | 2595a15ebeb6fc46b7cb241d01ec0c2460ec2111 (patch) | |
tree | 18a8f0f4ac5a86dacfa74c3537551ec39bc85e75 /src/tests | |
parent | 1d90725a4001fab9d3922b2cbcceeee5e2d1686f (diff) | |
download | tellico-2595a15ebeb6fc46b7cb241d01ec0c2460ec2111.tar.gz tellico-2595a15ebeb6fc46b7cb241d01ec0c2460ec2111.zip |
TQt4 port tellico
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/tellico@1239054 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/tests')
-rw-r--r-- | src/tests/entitytest.cpp | 4 | ||||
-rw-r--r-- | src/tests/isbntest.cpp | 6 | ||||
-rw-r--r-- | src/tests/latin1test.cpp | 24 |
3 files changed, 17 insertions, 17 deletions
diff --git a/src/tests/entitytest.cpp b/src/tests/entitytest.cpp index 215c377..8163946 100644 --- a/src/tests/entitytest.cpp +++ b/src/tests/entitytest.cpp @@ -1,5 +1,5 @@ -#ifdef QT_NO_CAST_ASCII -#undef QT_NO_CAST_ASCII +#ifdef TQT_NO_CAST_ASCII +#undef TQT_NO_CAST_ASCII #endif #include "tellico_utils.h" diff --git a/src/tests/isbntest.cpp b/src/tests/isbntest.cpp index b4c5fee..675df8e 100644 --- a/src/tests/isbntest.cpp +++ b/src/tests/isbntest.cpp @@ -1,5 +1,5 @@ -#ifdef QT_NO_CAST_ASCII -#undef QT_NO_CAST_ASCII +#ifdef TQT_NO_CAST_ASCII +#undef TQT_NO_CAST_ASCII #endif #include "isbnvalidator.h" @@ -8,7 +8,7 @@ #include <stdlib.h> -bool check(QString a, QString b) { +bool check(TQString a, TQString b) { static const Tellico::ISBNValidator val(0); val.fixup(a); if(a == b) { diff --git a/src/tests/latin1test.cpp b/src/tests/latin1test.cpp index 636c33f..3550914 100644 --- a/src/tests/latin1test.cpp +++ b/src/tests/latin1test.cpp @@ -1,24 +1,24 @@ -#ifdef QT_NO_CAST_ASCII -#undef QT_NO_CAST_ASCII +#ifdef TQT_NO_CAST_ASCII +#undef TQT_NO_CAST_ASCII #endif #include "latin1literal.h" -#include <qstring.h> +#include <tqstring.h> #include <kdebug.h> #include <assert.h> int main(int, char**) { kdDebug() << "\n*****************************************************" << endl; - assert(QString::null == Latin1Literal(0)); - assert(QString::null != Latin1Literal("")); - assert(QString::fromLatin1("") == Latin1Literal("")); - assert(QString::fromLatin1("") != Latin1Literal(0)); - assert(QString::fromLatin1("x") != Latin1Literal("")); - assert(QString::fromLatin1("a") == Latin1Literal("a")); - assert(QString::fromLatin1("a") != Latin1Literal("b")); - assert(QString::fromLatin1("\xe4") == Latin1Literal("\xe4")); - assert(QString::fromUtf8("\xe2\x82\xac") != Latin1Literal("?")); + assert(TQString() == Latin1Literal(0)); + assert(TQString() != Latin1Literal("")); + assert(TQString::tqfromLatin1("") == Latin1Literal("")); + assert(TQString::tqfromLatin1("") != Latin1Literal(0)); + assert(TQString::tqfromLatin1("x") != Latin1Literal("")); + assert(TQString::tqfromLatin1("a") == Latin1Literal("a")); + assert(TQString::tqfromLatin1("a") != Latin1Literal("b")); + assert(TQString::tqfromLatin1("\xe4") == Latin1Literal("\xe4")); + assert(TQString::fromUtf8("\xe2\x82\xac") != Latin1Literal("?")); kdDebug() << "\nLatin1Literal Test OK !" << endl; kdDebug() << "\n*****************************************************" << endl; |