summaryrefslogtreecommitdiffstats
path: root/kopete/libkopete/kopetemessage.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/libkopete/kopetemessage.cpp')
-rw-r--r--kopete/libkopete/kopetemessage.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/kopete/libkopete/kopetemessage.cpp b/kopete/libkopete/kopetemessage.cpp
index 2070dd56..c094ba72 100644
--- a/kopete/libkopete/kopetemessage.cpp
+++ b/kopete/libkopete/kopetemessage.cpp
@@ -374,8 +374,8 @@ TQString Message::parsedBody() const
static TQString makeRegExp( const char *pattern )
{
const TQString urlChar = TQString::fromLatin1( "\\+\\-\\w\\./#@&;:=\\?~%_,\\!\\$\\*\\(\\)" );
- const TQString boundaryStart = TQString::fromLatin1( "(^|[^%1])(" ).tqarg( urlChar );
- const TQString boundaryEnd = TQString::fromLatin1( ")([^%1]|$)" ).tqarg( urlChar );
+ const TQString boundaryStart = TQString::fromLatin1( "(^|[^%1])(" ).arg( urlChar );
+ const TQString boundaryEnd = TQString::fromLatin1( ")([^%1]|$)" ).arg( urlChar );
return boundaryStart + TQString::fromLatin1(pattern) + boundaryEnd;
}
@@ -418,26 +418,26 @@ TQString Message::parseLinks( const TQString &message, MessageFormat format )
// common subpatterns - may not contain matching parens!
const TQString name = TQString::fromLatin1( "[\\w\\+\\-=_\\.]+" );
- const TQString userAndPassword = TQString::fromLatin1( "(?:%1(?::%1)?\\@)" ).tqarg( name );
+ const TQString userAndPassword = TQString::fromLatin1( "(?:%1(?::%1)?\\@)" ).arg( name );
const TQString urlChar = TQString::fromLatin1( "\\+\\-\\w\\./#@&;:=\\?~%_,\\!\\$\\*\\(\\)" );
- const TQString urlSection = TQString::fromLatin1( "[%1]+" ).tqarg( urlChar );
+ const TQString urlSection = TQString::fromLatin1( "[%1]+" ).arg( urlChar );
const TQString domain = TQString::fromLatin1( "[\\-\\w_]+(?:\\.[\\-\\w_]+)+" );
//Replace http/https/ftp links:
// Replace (stuff)://[user:password@](linkstuff) with a link
result.replace(
- TQRegExp( makeRegExp("\\w+://%1?\\w%2").tqarg( userAndPassword, urlSection ) ),
+ TQRegExp( makeRegExp("\\w+://%1?\\w%2").arg( userAndPassword, urlSection ) ),
TQString::fromLatin1("\\1<a href=\"\\2\" title=\"\\2\">\\2</a>\\3" ) );
// Replace www.X.Y(linkstuff) with a http: link
result.replace(
- TQRegExp( makeRegExp("%1?www\\.%2%3").tqarg( userAndPassword, domain, urlSection ) ),
+ TQRegExp( makeRegExp("%1?www\\.%2%3").arg( userAndPassword, domain, urlSection ) ),
TQString::fromLatin1("\\1<a href=\"http://\\2\" title=\"http://\\2\">\\2</a>\\3" ) );
//Replace Email Links
// Replace user@domain with a mailto: link
result.replace(
- TQRegExp( makeRegExp("%1@%2").tqarg( name, domain ) ),
+ TQRegExp( makeRegExp("%1@%2").arg( name, domain ) ),
TQString::fromLatin1("\\1<a href=\"mailto:\\2\" title=\"mailto:\\2\">\\2</a>\\3") );
//Workaround for Bug 85061: Highlighted URLs adds a ' ' after the URL itself
@@ -531,11 +531,11 @@ TQString Message::getHtmlStyleAttribute() const
// Affect foreground(color) and background color to message.
if( !d->fgOverride && d->fgColor.isValid() )
{
- styleAttribute += TQString::fromUtf8("color: %1; ").tqarg(d->fgColor.name());
+ styleAttribute += TQString::fromUtf8("color: %1; ").arg(d->fgColor.name());
}
if( !d->bgOverride && d->bgColor.isValid() )
{
- styleAttribute += TQString::fromUtf8("background-color: %1; ").tqarg(d->bgColor.name());
+ styleAttribute += TQString::fromUtf8("background-color: %1; ").arg(d->bgColor.name());
}
// Affect font parameters.