diff options
| author |  Voker57 | 2008-10-17 08:52:13 +0000 |
|---|---|---|
| committer | Voker57 | 2008-10-17 08:52:13 +0000 |
| commit | 873351fe2bd161f34dd56c2c71480e53cbeb8803 (patch) | |
| tree | 10d7bbcae7bd9ca4f35a084491d312345e1b3d66 /src | |
| parent | some fixes (diff) | |
| download | KVIrc-873351fe2bd161f34dd56c2c71480e53cbeb8803.tar.gz KVIrc-873351fe2bd161f34dd56c2c71480e53cbeb8803.tar.bz2 KVIrc-873351fe2bd161f34dd56c2c71480e53cbeb8803.zip | |
upported r2403
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2747 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/ui/kvi_console.cpp | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp index 9928d8133..a1e8099cb 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -595,11 +595,18 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const QString &nick,co QRegExp rgxHlite; if(KVI_OPTION_BOOL(KviOption_boolAlwaysHighlightNick) && connection()) { - rgxHlite.setPattern( - QString("(?:[%1]|\\s|^)%2(?:[%1]|\\s|$)").arg( - QRegExp::escape(szPattern), QRegExp::escape(connection()->userInfo()->nickName()) - ) - ); + if(!szPattern.isEmpty()) + rgxHlite.setPattern( + QString("(?:[%1]|\\s|^)%2(?:[%1]|\\s|$)").arg( + QRegExp::escape(szPattern), QRegExp::escape(connection()->userInfo()->nickName()) + ) + ); + else + rgxHlite.setPattern( + QString("(?:\\s|^)%1(?:\\s|$)").arg( + QRegExp::escape(connection()->userInfo()->nickName()) + ) + ); rgxHlite.setCaseSensitivity(Qt::CaseInsensitive); if(szStripMsg.contains(rgxHlite)) return triggerOnHighlight(wnd,type,nick,user,host,szMsg,connection()->userInfo()->nickName()); @@ -612,11 +619,18 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const QString &nick,co { if((*it).isEmpty()) continue; - rgxHlite.setPattern( - QString("(?:[%1]|\\b|^)%2(?:[%1]|\\b|$)").arg( - QRegExp::escape(szPattern), QRegExp::escape(*it) - ) - ); + if(!szPattern.isEmpty()) + rgxHlite.setPattern( + QString("(?:[%1]|\\s|^)%2(?:[%1]|\\s|$)").arg( + QRegExp::escape(szPattern), QRegExp::escape(*it) + ) + ); + else + rgxHlite.setPattern( + QString("(?:\\s|^)%1(?:\\s|$)").arg( + QRegExp::escape(*it) + ) + ); rgxHlite.setCaseSensitivity(Qt::CaseInsensitive); if(szStripMsg.contains(rgxHlite)) { |