1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge branch 'pr625'

This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-11-04 21:45:21 +01:00
commit 866a8a147e
No known key found for this signature in database
GPG Key ID: 7E086DD661263264

View File

@ -28,7 +28,7 @@ QString MessageAction::getMessage(QString div)
QString message_ = SmileyPack::getInstance().smileyfied(toHtmlChars(message)); QString message_ = SmileyPack::getInstance().smileyfied(toHtmlChars(message));
// detect urls // detect urls
QRegExp exp("(www\\.|http[s]?:\\/\\/|ftp:\\/\\/)\\S+"); QRegExp exp("(?:\\b)(www\\.|http[s]?:\\/\\/|ftp:\\/\\/)\\S+");
int offset = 0; int offset = 0;
while ((offset = exp.indexIn(message_, offset)) != -1) while ((offset = exp.indexIn(message_, offset)) != -1)
{ {