kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'cmake-gui-warning' 

82bacea cmake-gui: Rename local variable to avoid shadowing a member
This commit is contained in:
Brad King 2013-11-02 10:54:47 -04:00 committed by CMake Topic Stage
parent f61bbf1b90 82baceaa60
commit 8ada96a39f
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Source/QtDialog/CMakeSetupDialog.cxx
View File

@ -1230,7 +1230,7 @@ void CMakeSetupDialog::doOutputFindNext(bool directionForward)
QString search = this->FindHistory.front(); QString search = this->FindHistory.front();
QTextCursor cursor = this->Output->textCursor(); QTextCursor textCursor = this->Output->textCursor();
QTextDocument* document = this->Output->document(); QTextDocument* document = this->Output->document();
QTextDocument::FindFlags flags; QTextDocument::FindFlags flags;
if (!directionForward) if (!directionForward)
@ -1238,67 +1238,67 @@ void CMakeSetupDialog::doOutputFindNext(bool directionForward)
flags |= QTextDocument::FindBackward; flags |= QTextDocument::FindBackward;
} }
cursor = document->find(search, cursor, flags); textCursor = document->find(search, textCursor, flags);
if (cursor.isNull()) if (textCursor.isNull())
{ {
// first search found nothing, wrap around and search again // first search found nothing, wrap around and search again
cursor = this->Output->textCursor(); textCursor = this->Output->textCursor();
cursor.movePosition(directionForward ? QTextCursor::Start textCursor.movePosition(directionForward ? QTextCursor::Start
: QTextCursor::End); : QTextCursor::End);
cursor = document->find(search, cursor, flags); textCursor = document->find(search, textCursor, flags);
} }
if (cursor.hasSelection()) if (textCursor.hasSelection())
{ {
this->Output->setTextCursor(cursor); this->Output->setTextCursor(textCursor);
} }
} }
void CMakeSetupDialog::doOutputErrorNext() void CMakeSetupDialog::doOutputErrorNext()
{ {
QTextCursor cursor = this->Output->textCursor(); QTextCursor textCursor = this->Output->textCursor();
bool atEnd = false; bool atEnd = false;
// move cursor out of current error-block // move cursor out of current error-block
if (cursor.blockCharFormat() == this->ErrorFormat) if (textCursor.blockCharFormat() == this->ErrorFormat)
{ {
atEnd = !cursor.movePosition(QTextCursor::NextBlock); atEnd = !textCursor.movePosition(QTextCursor::NextBlock);
} }
// move cursor to next error-block // move cursor to next error-block
while (cursor.blockCharFormat() != this->ErrorFormat && !atEnd) while (textCursor.blockCharFormat() != this->ErrorFormat && !atEnd)
{ {
atEnd = !cursor.movePosition(QTextCursor::NextBlock); atEnd = !textCursor.movePosition(QTextCursor::NextBlock);
} }
if (atEnd) if (atEnd)
{ {
// first search found nothing, wrap around and search again // first search found nothing, wrap around and search again
atEnd = !cursor.movePosition(QTextCursor::Start); atEnd = !textCursor.movePosition(QTextCursor::Start);
// move cursor to next error-block // move cursor to next error-block
while (cursor.blockCharFormat() != this->ErrorFormat && !atEnd) while (textCursor.blockCharFormat() != this->ErrorFormat && !atEnd)
{ {
atEnd = !cursor.movePosition(QTextCursor::NextBlock); atEnd = !textCursor.movePosition(QTextCursor::NextBlock);
} }
} }
if (!atEnd) if (!atEnd)
{ {
cursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor); textCursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor);
QTextCharFormat selectionFormat; QTextCharFormat selectionFormat;
selectionFormat.setBackground(Qt::yellow); selectionFormat.setBackground(Qt::yellow);
QTextEdit::ExtraSelection extraSelection = {cursor, selectionFormat}; QTextEdit::ExtraSelection extraSelection = {textCursor, selectionFormat};
this->Output->setExtraSelections(QList<QTextEdit::ExtraSelection>() this->Output->setExtraSelections(QList<QTextEdit::ExtraSelection>()
<< extraSelection); << extraSelection);
// make the whole error-block visible // make the whole error-block visible
this->Output->setTextCursor(cursor); this->Output->setTextCursor(textCursor);
// remove the selection to see the extraSelection // remove the selection to see the extraSelection
cursor.setPosition(cursor.anchor()); textCursor.setPosition(textCursor.anchor());
this->Output->setTextCursor(cursor); this->Output->setTextCursor(textCursor);
} }
} }