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

C++: Remove unused SemanticInfo::diagnosticMessages.

Browse Source 
Change-Id: I06e3be876e971d191905fd9bfbeca55a762afa5c
Reviewed-on: http://codereview.qt.nokia.com/3483
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
This commit is contained in:
Christian Kamm
2011-08-24 11:52:42 +02:00
parent 142bce94fb
commit 47789fb4f9
2 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -126,31 +126,6 @@ namespace {
bool semanticHighlighterDisabled = qstrcmp(qVersion(), "4.7.0") == 0; bool semanticHighlighterDisabled = qstrcmp(qVersion(), "4.7.0") == 0;
} }
static QList<QTextEdit::ExtraSelection> createSelections(QTextDocument *document,
const QList<CPlusPlus::Document::DiagnosticMessage> &msgs,
const QTextCharFormat &format)
{
QList<QTextEdit::ExtraSelection> selections;
foreach (const Document::DiagnosticMessage &m, msgs) {
const int pos = document->findBlockByNumber(m.line() - 1).position() + m.column() - 1;
if (pos < 0)
continue;
QTextCursor cursor(document);
cursor.setPosition(pos);
cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor, m.length());
QTextEdit::ExtraSelection sel;
sel.cursor = cursor;
sel.format = format;
sel.format.setToolTip(m.text());
selections.append(sel);
}
return selections;
}
namespace { namespace {
class OverviewTreeView : public QTreeView class OverviewTreeView : public QTreeView
@@ -1844,14 +1819,6 @@ void CPPEditorWidget::updateSemanticInfo(const SemanticInfo &semanticInfo)
} }
if (m_lastSemanticInfo.forced || previousSemanticInfo.revision != semanticInfo.revision) { if (m_lastSemanticInfo.forced || previousSemanticInfo.revision != semanticInfo.revision) {
QTextCharFormat diagnosticMessageFormat;
diagnosticMessageFormat.setUnderlineColor(Qt::darkYellow); // ### hardcoded
diagnosticMessageFormat.setUnderlineStyle(QTextCharFormat::WaveUnderline); // ### hardcoded
setExtraSelections(UndefinedSymbolSelection, createSelections(document(),
semanticInfo.diagnosticMessages,
diagnosticMessageFormat));
m_highlighter.cancel(); m_highlighter.cancel();
if (! semanticHighlighterDisabled && semanticInfo.doc) { if (! semanticHighlighterDisabled && semanticInfo.doc) {
@@ -2076,7 +2043,6 @@ SemanticInfo SemanticHighlighter::semanticInfo(const Source &source)
&& m_lastSemanticInfo.doc->fileName() == source.fileName) { && m_lastSemanticInfo.doc->fileName() == source.fileName) {
semanticInfo.snapshot = m_lastSemanticInfo.snapshot; // ### TODO: use the new snapshot. semanticInfo.snapshot = m_lastSemanticInfo.snapshot; // ### TODO: use the new snapshot.
semanticInfo.doc = m_lastSemanticInfo.doc; semanticInfo.doc = m_lastSemanticInfo.doc;
semanticInfo.diagnosticMessages = m_lastSemanticInfo.diagnosticMessages;
semanticInfo.objcKeywords = m_lastSemanticInfo.objcKeywords; semanticInfo.objcKeywords = m_lastSemanticInfo.objcKeywords;
} }
m_mutex.unlock(); m_mutex.unlock();

1
src/plugins/cppeditor/cppsemanticinfo.h
View File

@@ -68,7 +68,6 @@ public:
CPlusPlus::Document::Ptr doc; CPlusPlus::Document::Ptr doc;
LocalUseMap localUses; LocalUseMap localUses;
QList<Use> objcKeywords; QList<Use> objcKeywords;
QList<CPlusPlus::Document::DiagnosticMessage> diagnosticMessages;
}; };
} // namespace Internal } // namespace Internal