Skip to content

GitLab

Commit 1702acd3 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files
Options

Fix method name

parent 00f5f6e3
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
templateparser/templateparser.cpp
View file @ 1702acd3
......@@ -172,7 +172,7 @@ int TemplateParser::parseQuotes( const QString &prefix, const QString &str,
return len;
}
QString TemplateParser::getFName( const QString &str )
QString TemplateParser::getFirstName( const QString &str )
{
// simple logic:
// if there is ',' in name, than format is 'Last, First'
......@@ -218,7 +218,7 @@ QString TemplateParser::getFName( const QString &str )
return res;
}
QString TemplateParser::getLName( const QString &str )
QString TemplateParser::getLastName( const QString &str )
{
// simple logic:
// if there is ',' in name, than format is 'Last, First'
......@@ -597,8 +597,8 @@ void TemplateParser::processWithTemplate( const QString &tmpl )
i += strlen( "CCFNAME" );
const QString str =
MessageCore::StringUtil::stripEmailAddr( mMsg->cc()->asUnicodeString( ) );
plainBody.append( getFName( str ) );
const QString body = plainToHtml( getFName( str ) );
plainBody.append( getFirstName( str ) );
const QString body = plainToHtml( getFirstName( str ) );
htmlBody.append( body );
} else if ( cmd.startsWith( QLatin1String( "CCLNAME" ) ) ) {
......@@ -606,8 +606,8 @@ void TemplateParser::processWithTemplate( const QString &tmpl )
i += strlen( "CCLNAME" );
const QString str =
MessageCore::StringUtil::stripEmailAddr( mMsg->cc()->asUnicodeString( ) );
plainBody.append( getLName( str ) );
const QString body = plainToHtml( getLName( str ) );
plainBody.append( getLastName( str ) );
const QString body = plainToHtml( getLastName( str ) );
htmlBody.append( body );
} else if ( cmd.startsWith( QLatin1String( "TOADDR" ) ) ) {
......@@ -632,8 +632,8 @@ void TemplateParser::processWithTemplate( const QString &tmpl )
i += strlen( "TOFNAME" );
const QString str =
MessageCore::StringUtil::stripEmailAddr( mMsg->to()->asUnicodeString( ) );
plainBody.append( getFName( str ) );
const QString body = plainToHtml( getFName( str ) );
plainBody.append( getFirstName( str ) );
const QString body = plainToHtml( getFirstName( str ) );
htmlBody.append( body );
} else if ( cmd.startsWith( QLatin1String( "TOLNAME" ) ) ) {
......@@ -641,8 +641,8 @@ void TemplateParser::processWithTemplate( const QString &tmpl )
i += strlen( "TOLNAME" );
const QString str =
MessageCore::StringUtil::stripEmailAddr( mMsg->to()->asUnicodeString( ) );
plainBody.append( getLName( str ) );
const QString body = plainToHtml( getLName( str ) );
plainBody.append( getLastName( str ) );
const QString body = plainToHtml( getLastName( str ) );
htmlBody.append( body );
} else if ( cmd.startsWith( QLatin1String( "TOLIST" ) ) ) {
......@@ -675,8 +675,8 @@ void TemplateParser::processWithTemplate( const QString &tmpl )
i += strlen( "FROMFNAME" );
const QString str =
MessageCore::StringUtil::stripEmailAddr( mMsg->from()->asUnicodeString( ) );
plainBody.append( getFName( str ) );
const QString body = plainToHtml( getFName( str ) );
plainBody.append( getFirstName( str ) );
const QString body = plainToHtml( getFirstName( str ) );
htmlBody.append( body );
} else if ( cmd.startsWith( QLatin1String( "FROMLNAME" ) ) ) {
......@@ -684,8 +684,8 @@ void TemplateParser::processWithTemplate( const QString &tmpl )
i += strlen( "FROMLNAME" );
const QString str =
MessageCore::StringUtil::stripEmailAddr( mMsg->from()->asUnicodeString( ) );
plainBody.append( getLName( str ) );
const QString body = plainToHtml( getLName( str ) );
plainBody.append( getLastName( str ) );
const QString body = plainToHtml( getLastName( str ) );
htmlBody.append( body );
} else if ( cmd.startsWith( QLatin1String( "FULLSUBJECT" ) ) || cmd.startsWith( QLatin1String( "FULLSUBJ" ) ) ) {
......@@ -789,8 +789,8 @@ void TemplateParser::processWithTemplate( const QString &tmpl )
if ( mOrigMsg ) {
const QString str =
MessageCore::StringUtil::stripEmailAddr( mOrigMsg->cc()->asUnicodeString( ) );
plainBody.append( getFName( str ) );
const QString body = plainToHtml( getFName( str ) );
plainBody.append( getFirstName( str ) );
const QString body = plainToHtml( getFirstName( str ) );
htmlBody.append( body );
}
......@@ -800,8 +800,8 @@ void TemplateParser::processWithTemplate( const QString &tmpl )
if ( mOrigMsg ) {
const QString str =
MessageCore::StringUtil::stripEmailAddr( mOrigMsg->cc()->asUnicodeString( ) );
plainBody.append( getLName( str ) );
const QString body = plainToHtml( getLName( str ) );
plainBody.append( getLastName( str ) );
const QString body = plainToHtml( getLastName( str ) );
htmlBody.append( body );
}
......@@ -832,8 +832,8 @@ void TemplateParser::processWithTemplate( const QString &tmpl )
if ( mOrigMsg ) {
const QString str =
MessageCore::StringUtil::stripEmailAddr( mOrigMsg->to()->asUnicodeString( ) );
plainBody.append( getFName( str ) );
const QString body = plainToHtml( getFName( str ) );
plainBody.append( getFirstName( str ) );
const QString body = plainToHtml( getFirstName( str ) );
htmlBody.append( body );
}
......@@ -843,8 +843,8 @@ void TemplateParser::processWithTemplate( const QString &tmpl )
if ( mOrigMsg ) {
const QString str =
MessageCore::StringUtil::stripEmailAddr( mOrigMsg->to()->asUnicodeString( ) );
plainBody.append( getLName( str ) );
const QString body = plainToHtml( getLName( str ) );
plainBody.append( getLastName( str ) );
const QString body = plainToHtml( getLastName( str ) );
htmlBody.append( body );
}
......@@ -895,8 +895,8 @@ void TemplateParser::processWithTemplate( const QString &tmpl )
if ( mOrigMsg ) {
const QString str =
MessageCore::StringUtil::stripEmailAddr( mOrigMsg->from()->asUnicodeString() );
plainBody.append( getFName( str ) );
const QString body = plainToHtml( getFName( str ) );
plainBody.append( getFirstName( str ) );
const QString body = plainToHtml( getFirstName( str ) );
htmlBody.append( body );
}
......@@ -906,8 +906,8 @@ void TemplateParser::processWithTemplate( const QString &tmpl )
if ( mOrigMsg ) {
const QString str =
MessageCore::StringUtil::stripEmailAddr( mOrigMsg->from()->asUnicodeString() );
plainBody.append( getLName( str ) );
const QString body = plainToHtml( getLName( str ) );
plainBody.append( getLastName( str ) );
const QString body = plainToHtml( getLastName( str ) );
htmlBody.append( body );
}
......
templateparser/templateparser.h
View file @ 1702acd3
......@@ -230,8 +230,8 @@ public:
virtual QString pipe( const QString &cmd, const QString &buf );
virtual QString getFName( const QString &str );
virtual QString getLName( const QString &str );
virtual QString getFirstName( const QString &str );
virtual QString getLastName( const QString &str );
bool cursorPositionWasSet() const;
protected:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment