X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchatviewsearchcontroller.cpp;h=243817e13e6412ab70ba8259cd776a40d5f0fe16;hb=518cd2bc478ab3675a60ec46d3ef183cace0cae7;hp=3877f9a2f5bf36b5ec3863de3ca581d3f978cd97;hpb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;p=quassel.git diff --git a/src/qtui/chatviewsearchcontroller.cpp b/src/qtui/chatviewsearchcontroller.cpp index 3877f9a2..243817e1 100644 --- a/src/qtui/chatviewsearchcontroller.cpp +++ b/src/qtui/chatviewsearchcontroller.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2018 by the Quassel Project * + * Copyright (C) 2005-2020 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,6 +20,8 @@ #include "chatviewsearchcontroller.h" +#include + #include #include @@ -116,7 +118,7 @@ void ChatViewSearchController::updateHighlights(bool reuse) if (line) chatLines << line; } - foreach (ChatLine* line, QList(chatLines.toList())) { + foreach (ChatLine* line, chatLines) { updateHighlights(line); } } @@ -300,8 +302,7 @@ void ChatViewSearchController::repositionHighlights() if (line) chatLines << line; } - QList chatLineList(chatLines.toList()); - foreach (ChatLine* line, chatLineList) { + foreach (ChatLine* line, chatLines) { repositionHighlights(line); } } @@ -330,7 +331,7 @@ void ChatViewSearchController::repositionHighlights(ChatLine* line) } } - qSort(searchHighlights.begin(), searchHighlights.end(), SearchHighlightItem::firstInLine); + std::sort(searchHighlights.begin(), searchHighlights.end(), SearchHighlightItem::firstInLine); Q_ASSERT(wordPos.count() == searchHighlights.count()); for (int i = 0; i < searchHighlights.count(); i++) {