diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
commit | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch) | |
tree | 5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /libemailfunctions/tests | |
parent | 2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff) | |
download | tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip |
Initial conversion of kdepim to TQt
This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK. Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libemailfunctions/tests')
-rw-r--r-- | libemailfunctions/tests/testemail.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libemailfunctions/tests/testemail.cpp b/libemailfunctions/tests/testemail.cpp index 319151c43..432334e1b 100644 --- a/libemailfunctions/tests/testemail.cpp +++ b/libemailfunctions/tests/testemail.cpp @@ -166,10 +166,10 @@ int main(int argc, char *argv[]) KApplication app( false, false ); // Empty input - checkGetNameAndEmail( TQString::null, TQString::null, TQString::null, false ); + checkGetNameAndEmail( TQString(), TQString(), TQString(), false ); // Email only - checkGetNameAndEmail( "[email protected]", TQString::null, "[email protected]", false ); + checkGetNameAndEmail( "[email protected]", TQString(), "[email protected]", false ); // Normal case checkGetNameAndEmail( "David Faure <[email protected]>", "David Faure", "[email protected]", true ); @@ -183,10 +183,10 @@ int main(int argc, char *argv[]) checkGetNameAndEmail( "(David Faure) [email protected]", "David Faure", "[email protected]", true ); checkGetNameAndEmail( "My Name (me) <[email protected]>", "My Name (me)", "[email protected]", true ); // #93513 - // Nested parenthesis as per https://intevation.de/roundup/kolab/issue858 + // Nested tqparenthesis as per https://intevation.de/roundup/kolab/issue858 checkGetNameAndEmail( "[email protected] (David (The Man) Faure)", "David (The Man) Faure", "[email protected]", true ); - // Double-quotes inside parenthesis + // Double-quotes inside tqparenthesis checkGetNameAndEmail( "[email protected] (David \"Crazy\" Faure)", "David \"Crazy\" Faure", "[email protected]", true ); checkGetNameAndEmail( "(David \"Crazy\" Faure) [email protected]", "David \"Crazy\" Faure", "[email protected]", true ); @@ -203,8 +203,8 @@ int main(int argc, char *argv[]) //checkGetNameAndEmail( "\"a@b\" <[email protected]>", "a@b", "[email protected]", true ); // While typing, when there's no '@' yet - checkGetNameAndEmail( "foo", "foo", TQString::null, false ); - checkGetNameAndEmail( "foo <", "foo", TQString::null, false ); + checkGetNameAndEmail( "foo", "foo", TQString(), false ); + checkGetNameAndEmail( "foo <", "foo", TQString(), false ); checkGetNameAndEmail( "foo <b", "foo", "b", true ); // If multiple emails are there, only return the first one @@ -226,7 +226,7 @@ int main(int argc, char *argv[]) checkIsValidEmailAddress( "mattfruitsalad.org", "TooFewAts" ); // An empty string - checkIsValidEmailAddress( TQString::null , "AddressEmpty" ); + checkIsValidEmailAddress( TQString() , "AddressEmpty" ); // email address starting with a @ checkIsValidEmailAddress( "@mattfruitsalad.org", "MissingLocalPart" ); @@ -433,7 +433,7 @@ int main(int argc, char *argv[]) checkIsValidSimpleEmailAddress( "[email protected]]", "false" ); checkIsValidSimpleEmailAddress( "\"[email protected]", "false" ); checkIsValidSimpleEmailAddress( "matt\"@fruitsalad.org", "false" ); - checkIsValidSimpleEmailAddress( TQString::null, "false" ); + checkIsValidSimpleEmailAddress( TQString(), "false" ); // and here some insane but still valid cases checkIsValidSimpleEmailAddress( "\"m@tt\"@fruitsalad.org", "true" ); |