forked from qt-creator/qt-creator
Fix missing overrides and redundant virtual
Change-Id: Id2a247b6032602c2295d928067c2462d3f9b5221 Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
@@ -102,40 +102,42 @@ public:
|
||||
|
||||
virtual ~MockClient() {}
|
||||
|
||||
virtual void macroAdded(const Macro & macro)
|
||||
void macroAdded(const Macro ¯o) override
|
||||
{
|
||||
m_definedMacros.append(macro.name());
|
||||
m_definedMacrosLine.append(macro.line());
|
||||
}
|
||||
|
||||
virtual void passedMacroDefinitionCheck(int /*bytesOffset*/,
|
||||
int /*utf16charsOffset*/,
|
||||
int line,
|
||||
const Macro ¯o)
|
||||
void passedMacroDefinitionCheck(int /*bytesOffset*/,
|
||||
int /*utf16charsOffset*/,
|
||||
int line,
|
||||
const Macro ¯o) override
|
||||
{
|
||||
m_definitionsResolvedFromLines[macro.name()].append(line);
|
||||
}
|
||||
|
||||
virtual void failedMacroDefinitionCheck(int /*offset*/,
|
||||
int /*utf16charsOffset*/,
|
||||
const ByteArrayRef &name)
|
||||
void failedMacroDefinitionCheck(int /*offset*/,
|
||||
int /*utf16charsOffset*/,
|
||||
const ByteArrayRef &name) override
|
||||
{
|
||||
m_unresolvedDefines.insert(name.toByteArray());
|
||||
}
|
||||
|
||||
virtual void notifyMacroReference(int bytesOffset, int /*utf16charsOffset*/,
|
||||
int line, const Macro ¯o)
|
||||
void notifyMacroReference(int bytesOffset,
|
||||
int /*utf16charsOffset*/,
|
||||
int line,
|
||||
const Macro ¯o) override
|
||||
{
|
||||
m_macroUsesLine[macro.name()].append(line);
|
||||
m_expandedMacrosOffset.append(bytesOffset);
|
||||
}
|
||||
|
||||
virtual void startExpandingMacro(int bytesOffset,
|
||||
int /*utf16charsOffset*/,
|
||||
int line,
|
||||
const Macro ¯o,
|
||||
const QVector<MacroArgumentReference> &actuals
|
||||
= QVector<MacroArgumentReference>())
|
||||
void startExpandingMacro(int bytesOffset,
|
||||
int /*utf16charsOffset*/,
|
||||
int line,
|
||||
const Macro ¯o,
|
||||
const QVector<MacroArgumentReference> &actuals
|
||||
= QVector<MacroArgumentReference>()) override
|
||||
{
|
||||
m_expandedMacros.append(macro.name());
|
||||
m_expandedMacrosOffset.append(bytesOffset);
|
||||
@@ -144,16 +146,16 @@ public:
|
||||
m_usedMacros.insert(macro.name(), actuals);
|
||||
}
|
||||
|
||||
virtual void stopExpandingMacro(int /*offset*/, const Macro &/*macro*/) {}
|
||||
void stopExpandingMacro(int /*offset*/, const Macro &/*macro*/) override {}
|
||||
|
||||
virtual void startSkippingBlocks(int utf16charsOffset)
|
||||
void startSkippingBlocks(int utf16charsOffset) override
|
||||
{ m_skippedBlocks.append(Block(utf16charsOffset)); }
|
||||
|
||||
virtual void stopSkippingBlocks(int utf16charsOffset)
|
||||
void stopSkippingBlocks(int utf16charsOffset) override
|
||||
{ m_skippedBlocks.last().end = utf16charsOffset; }
|
||||
|
||||
virtual void sourceNeeded(int line, const Utils::FilePath &includedFileName, IncludeType mode,
|
||||
const Utils::FilePaths &initialIncludes = {})
|
||||
void sourceNeeded(int line, const Utils::FilePath &includedFileName, IncludeType mode,
|
||||
const Utils::FilePaths &initialIncludes = {}) override
|
||||
{
|
||||
Q_UNUSED(initialIncludes)
|
||||
#if 1
|
||||
@@ -223,7 +225,7 @@ public:
|
||||
*m_output = m_pp.run(fileName, src, nolines, true);
|
||||
}
|
||||
|
||||
virtual void markAsIncludeGuard(const QByteArray ¯oName)
|
||||
void markAsIncludeGuard(const QByteArray ¯oName) override
|
||||
{ m_includeGuardMacro = macroName; }
|
||||
|
||||
QByteArray includeGuard() const
|
||||
|
||||
Reference in New Issue
Block a user