summaryrefslogtreecommitdiffstats
path: root/libemailfunctions
diff options
context:
space:
mode:
Diffstat (limited to 'libemailfunctions')
-rw-r--r--libemailfunctions/email.cpp10
-rw-r--r--libemailfunctions/tests/testemail.cpp4
2 files changed, 7 insertions, 7 deletions
diff --git a/libemailfunctions/email.cpp b/libemailfunctions/email.cpp
index f5c35c17f..78de8f8de 100644
--- a/libemailfunctions/email.cpp
+++ b/libemailfunctions/email.cpp
@@ -32,7 +32,7 @@ TQStringList KPIM::splitEmailAddrList(const TQString& aStr)
{
// Features:
// - always ignores quoted characters
- // - ignores everything (including tqparentheses and commas)
+ // - ignores everything (including parentheses and commas)
// inside quoted strings
// - supports nested comments
// - ignores everything (including double quotes and commas)
@@ -729,12 +729,12 @@ bool KPIM::getNameAndMail(const TQString& aStr, TQString& name, TQString& mail)
// and outside of quoted text behind the trailing '>'.
bInComment = false;
bInQuotesOutsideOfEmail = false;
- int tqparenthesesNesting = 0;
+ int parenthesesNesting = 0;
for( i = iAd+1; len > i; ++i ) {
c = aStr[i];
if( bInComment ){
if( ')' == c ){
- if ( --tqparenthesesNesting == 0 ) {
+ if ( --parenthesesNesting == 0 ) {
bInComment = false;
if( !name.isEmpty() )
name.append( ' ' );
@@ -745,7 +745,7 @@ bool KPIM::getNameAndMail(const TQString& aStr, TQString& name, TQString& mail)
} else {
if( '(' == c ) {
// nested "("
- ++tqparenthesesNesting;
+ ++parenthesesNesting;
}
name.append( c ); // all comment stuff is part of the name
}
@@ -772,7 +772,7 @@ bool KPIM::getNameAndMail(const TQString& aStr, TQString& name, TQString& mail)
case '(':
if( !name.isEmpty() )
name.append( ' ' );
- if ( ++tqparenthesesNesting > 0 )
+ if ( ++parenthesesNesting > 0 )
bInComment = true;
break;
default:
diff --git a/libemailfunctions/tests/testemail.cpp b/libemailfunctions/tests/testemail.cpp
index 432334e1b..90a6a862e 100644
--- a/libemailfunctions/tests/testemail.cpp
+++ b/libemailfunctions/tests/testemail.cpp
@@ -183,10 +183,10 @@ int main(int argc, char *argv[])
checkGetNameAndEmail( "(David Faure) faure@kde.org", "David Faure", "faure@kde.org", true );
checkGetNameAndEmail( "My Name (me) <me@home.net>", "My Name (me)", "me@home.net", true ); // #93513
- // Nested tqparenthesis as per https://intevation.de/roundup/kolab/issue858
+ // Nested parenthesis as per https://intevation.de/roundup/kolab/issue858
checkGetNameAndEmail( "faure@kde.org (David (The Man) Faure)", "David (The Man) Faure", "faure@kde.org", true );
- // Double-quotes inside tqparenthesis
+ // Double-quotes inside parenthesis
checkGetNameAndEmail( "faure@kde.org (David \"Crazy\" Faure)", "David \"Crazy\" Faure", "faure@kde.org", true );
checkGetNameAndEmail( "(David \"Crazy\" Faure) faure@kde.org", "David \"Crazy\" Faure", "faure@kde.org", true );