From 3123e8862bc7432fdfe974c63d710dd507f2d07e Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Mon, 20 Feb 2012 14:16:15 +0100
Subject: [PATCH] C++: killed old dead code.
Change-Id: I480470c299f49a02d2a216d3aece81a843d73ce1
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
---
src/plugins/cpptools/cppmodelmanager.cpp | 64 +-----------------------
1 file changed, 1 insertion(+), 63 deletions(-)
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index ed8c716ae59..57baad8f88d 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -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)
--
GitLab