LoweBowe
/
editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update for qt 5.15

This commit is contained in:
Zira project 2021-03-05 13:15:41 +05:00
parent de74c19dfa
commit 63e930393c
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/editor.cpp
View File

@ -6291,7 +6291,7 @@ void Editor::highlightSearchWords(QList<QTextEdit::ExtraSelection> *extraSelecti
if (!search->isVisible() || searchString.size() == 0) return;
static_cast<LineMap *>(lineMap)->clearMarks();
QTextCursor searchWordCursor(document());
QTextDocument::FindFlags findFlags = nullptr;
QTextDocument::FindFlags findFlags;
if (searchCaSe) findFlags |= QTextDocument::FindCaseSensitively;
if (searchWord) findFlags |= QTextDocument::FindWholeWords;
searchWordCursor.movePosition(QTextCursor::Start, QTextCursor::MoveAnchor);
@ -6511,7 +6511,7 @@ void Editor::searchText(QString searchTxt, bool CaSe, bool Word, bool RegE, bool
else curs.movePosition(QTextCursor::End, QTextCursor::MoveAnchor);
}
if (backwards && curs.positionInBlock() == 0) curs.movePosition(QTextCursor::PreviousCharacter, QTextCursor::MoveAnchor); // bug ?
QTextDocument::FindFlags flags = nullptr;
QTextDocument::FindFlags flags;
if (CaSe) flags |= QTextDocument::FindCaseSensitively;
if (Word) flags |= QTextDocument::FindWholeWords;
if (backwards) flags |= QTextDocument::FindBackward;
@ -6562,7 +6562,7 @@ void Editor::replaceAllText(QString searchTxt, QString replaceTxt, bool CaSe, bo
if (searchTxt.size() == 0) return;
curs.movePosition(QTextCursor::Start, QTextCursor::MoveAnchor);
curs.beginEditBlock();
QTextDocument::FindFlags flags = nullptr;
QTextDocument::FindFlags flags;
if (CaSe) flags |= QTextDocument::FindCaseSensitively;
if (Word) flags |= QTextDocument::FindWholeWords;
QTextCursor resCurs;
@ -6633,7 +6633,7 @@ void Editor::multiSelectToggle()
setTextCursor(curs);
QTextCursor searchWordCursor(document());
QTextDocument::FindFlags findFlags = nullptr;
QTextDocument::FindFlags findFlags;
findFlags |= QTextDocument::FindCaseSensitively;
searchWordCursor.movePosition(QTextCursor::Start, QTextCursor::MoveAnchor);
int co = 0;

10
src/highlight.cpp
View File

@ -673,7 +673,7 @@ QStringList Highlight::getKnownFunctions(QString clsName)
{
QStringList funcs;
if (clsName == "anonymous class") return funcs;
for (auto it : knownFunctions) {
for (const auto &it : knownFunctions) {
QString k = QString::fromStdString(it.first);
if (clsName.size() > 0 && k.indexOf(clsName+"::") != 0) continue;
funcs.append(k);
@ -3663,9 +3663,11 @@ void Highlight::rehighlight()
int percent = (block.blockNumber()+1)*100 / blocksCount;
if (percent - progressPercent > 10) {
progressPercent = percent;
doc->markContentsDirty(startPos, block.position() - startPos + block.length());
startPos = block.position() + block.length();
dirty = false;
if (Helper::isQtVersionLessThan(5, 15, 0) || highlightVarsMode) {
doc->markContentsDirty(startPos, block.position() - startPos + block.length());
startPos = block.position() + block.length();
dirty = false;
}
emit progressChanged(percent);
}
}