feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++: killed old dead code.

Browse Source 
Change-Id: I480470c299f49a02d2a216d3aece81a843d73ce1
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
This commit is contained in:
Erik Verbruggen
2012-02-20 14:16:15 +01:00
parent ff92cdec43
commit 3123e8862b
1 changed files with 1 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -1101,22 +1101,6 @@ void CppModelManager::updateEditor(Document::Ptr doc)
QList<QTextEdit::ExtraSelection> selections;
#ifdef QTCREATOR_WITH_MACRO_HIGHLIGHTING
// set up the format for the macros
QTextCharFormat macroFormat;
macroFormat.setUnderlineStyle(QTextCharFormat::SingleUnderline);
QTextCursor c = ed->textCursor();
foreach (const Document::MacroUse &block, doc->macroUses()) {
QTextEdit::ExtraSelection sel;
sel.cursor = c;
sel.cursor.setPosition(block.begin());
sel.cursor.setPosition(block.end(), QTextCursor::KeepAnchor);
sel.format = macroFormat;
selections.append(sel);
}
#endif // QTCREATOR_WITH_MACRO_HIGHLIGHTING
// set up the format for the errors
QTextCharFormat errorFormat;
errorFormat.setUnderlineStyle(QTextCharFormat::WaveUnderline);
@@ -1127,52 +1111,6 @@ void CppModelManager::updateEditor(Document::Ptr doc)
warningFormat.setUnderlineStyle(QTextCharFormat::WaveUnderline);
warningFormat.setUnderlineColor(Qt::darkYellow);
#ifdef QTCREATOR_WITH_ADVANCED_HIGHLIGHTER
QSet<QPair<unsigned, unsigned> > lines;
foreach (const Document::DiagnosticMessage &m, doc->diagnosticMessages()) {
if (m.fileName() != fileName)
continue;
const QPair<unsigned, unsigned> coordinates = qMakePair(m.line(), m.column());
if (lines.contains(coordinates))
continue;
lines.insert(coordinates);
QTextEdit::ExtraSelection sel;
if (m.isWarning())
sel.format = warningFormat;
else
sel.format = errorFormat;
QTextCursor c(ed->document()->findBlockByNumber(m.line() - 1));
// ### check for generated tokens.
int column = m.column();
if (column > c.block().length()) {
column = 0;
const QString text = c.block().text();
for (int i = 0; i < text.size(); ++i) {
if (! text.at(i).isSpace()) {
++column;
break;
}
}
}
if (column != 0)
--column;
c.setPosition(c.position() + column);
c.movePosition(QTextCursor::EndOfWord, QTextCursor::KeepAnchor);
sel.cursor = c;
selections.append(sel);
}
#else
QSet<int> lines;
QList<Document::DiagnosticMessage> messages = doc->diagnosticMessages();
messages += extraDiagnostics(doc->fileName());
@@ -1203,7 +1141,7 @@ void CppModelManager::updateEditor(Document::Ptr doc)
sel.format.setToolTip(m.text());
selections.append(sel);
}
#endif
QList<Editor> todo;
foreach (const Editor &e, todo) {
if (e.textEditor != textEditor)