- _highlightNick = (NotificationSettings::HighlightNickType)variant.toInt();
- _cacheNickConfigInvalid = true;
-}
-
-
-void QtUiMessageProcessor::determineNickExpressions(const QString ¤tNick,
- const QStringList identityNicks) const
-{
- // Don't do anything for no nicknames
- if (_highlightNick == HighlightNickType::NoNick) {
- return;
- }
-
- // Only update if needed (check nickname config, current nick, identity nicks for change)
- if (!_cacheNickConfigInvalid
- && _cachedNickCurrent == currentNick
- && _cachedIdentityNicks == identityNicks) {
- return;
- }
-
- // Add all nicknames
- QStringList nickList;
- if (_highlightNick == HighlightNickType::CurrentNick) {
- nickList << currentNick;
- }
- else if (_highlightNick == HighlightNickType::AllNicks) {
- nickList = identityNicks;
- if (!nickList.contains(currentNick))
- nickList.prepend(currentNick);
- }
-
- // Set up phrase matcher, joining with newlines
- _cachedNickMatcher = ExpressionMatch(nickList.join("\n"),
- ExpressionMatch::MatchMode::MatchMultiPhrase,
- _nicksCaseSensitive);
-
- _cacheNickConfigInvalid = false;
- _cachedNickCurrent = currentNick;
- _cachedIdentityNicks = identityNicks;
+ _highlightNick = (HighlightNickType)variant.toInt();
+ // Convert from QtUiMessageProcessor::HighlightNickType (which is from NotificationSettings) to
+ // NickHighlightMatcher::HighlightNickType
+ _nickMatcher.setHighlightMode(
+ static_cast<NickHighlightMatcher::HighlightNickType>(_highlightNick));