forked from qt-creator/qt-creator
TextEditor: Fix compile with gcc 4.7.3
Change-Id: I59b401c4d7a75398fddc8f6e3a0671fc49f0cb47 Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
@@ -39,6 +39,7 @@ class ClangAssistProposalItem final : public TextEditor::AssistProposalItemInter
|
|||||||
{
|
{
|
||||||
friend bool operator<(const ClangAssistProposalItem &first, const ClangAssistProposalItem &second);
|
friend bool operator<(const ClangAssistProposalItem &first, const ClangAssistProposalItem &second);
|
||||||
public:
|
public:
|
||||||
|
~ClangAssistProposalItem() Q_DECL_NOEXCEPT {}
|
||||||
bool prematurelyApplies(const QChar &typedCharacter) const final;
|
bool prematurelyApplies(const QChar &typedCharacter) const final;
|
||||||
bool implicitlyApplies() const final;
|
bool implicitlyApplies() const final;
|
||||||
void apply(TextEditor::TextDocumentManipulatorInterface &manipulator, int basePosition) const final;
|
void apply(TextEditor::TextDocumentManipulatorInterface &manipulator, int basePosition) const final;
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ namespace ClangCodeModel {
|
|||||||
class ClangPreprocessorAssistProposalItem final : public TextEditor::AssistProposalItemInterface
|
class ClangPreprocessorAssistProposalItem final : public TextEditor::AssistProposalItemInterface
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
~ClangPreprocessorAssistProposalItem() Q_DECL_NOEXCEPT {}
|
||||||
bool prematurelyApplies(const QChar &typedChar) const final;
|
bool prematurelyApplies(const QChar &typedChar) const final;
|
||||||
virtual bool implicitlyApplies() const final;
|
virtual bool implicitlyApplies() const final;
|
||||||
void apply(TextEditor::TextDocumentManipulatorInterface &manipulator,
|
void apply(TextEditor::TextDocumentManipulatorInterface &manipulator,
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ class VirtualFunctionProposalItem final : public TextEditor::AssistProposalItem
|
|||||||
public:
|
public:
|
||||||
VirtualFunctionProposalItem(const TextEditor::TextEditorWidget::Link &link,
|
VirtualFunctionProposalItem(const TextEditor::TextEditorWidget::Link &link,
|
||||||
bool openInSplit = true);
|
bool openInSplit = true);
|
||||||
|
~VirtualFunctionProposalItem() Q_DECL_NOEXCEPT {}
|
||||||
void apply(TextEditor::TextEditorWidget * /* editorWidget */, int /* basePosition */) const;
|
void apply(TextEditor::TextEditorWidget * /* editorWidget */, int /* basePosition */) const;
|
||||||
TextEditor::TextEditorWidget::Link link() const { return m_link; } // Exposed for tests
|
TextEditor::TextEditorWidget::Link link() const { return m_link; } // Exposed for tests
|
||||||
|
|
||||||
|
|||||||
@@ -86,6 +86,7 @@ public:
|
|||||||
CppAssistProposalItem() :
|
CppAssistProposalItem() :
|
||||||
m_isOverloaded(false) {}
|
m_isOverloaded(false) {}
|
||||||
|
|
||||||
|
~CppAssistProposalItem() Q_DECL_NOEXCEPT {}
|
||||||
bool prematurelyApplies(const QChar &c) const override;
|
bool prematurelyApplies(const QChar &c) const override;
|
||||||
void applyContextualContent(TextDocumentManipulatorInterface &manipulator, int basePosition) const override;
|
void applyContextualContent(TextDocumentManipulatorInterface &manipulator, int basePosition) const override;
|
||||||
|
|
||||||
|
|||||||
@@ -58,6 +58,8 @@ public:
|
|||||||
setText(text);
|
setText(text);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
~ClipboardProposalItem() Q_DECL_NOEXCEPT {}
|
||||||
|
|
||||||
void apply(TextDocumentManipulatorInterface &manipulator, int /*basePosition*/) const override
|
void apply(TextDocumentManipulatorInterface &manipulator, int /*basePosition*/) const override
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ class TextEditorWidget;
|
|||||||
class TEXTEDITOR_EXPORT AssistProposalItem : public AssistProposalItemInterface
|
class TEXTEDITOR_EXPORT AssistProposalItem : public AssistProposalItemInterface
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
~AssistProposalItem() Q_DECL_NOEXCEPT {}
|
||||||
QString text() const override;
|
QString text() const override;
|
||||||
bool implicitlyApplies() const override;
|
bool implicitlyApplies() const override;
|
||||||
bool prematurelyApplies(const QChar &c) const override;
|
bool prematurelyApplies(const QChar &c) const override;
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ KeywordsAssistProposalItem::KeywordsAssistProposalItem(bool isFunction)
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
KeywordsAssistProposalItem::~KeywordsAssistProposalItem()
|
KeywordsAssistProposalItem::~KeywordsAssistProposalItem() Q_DECL_NOEXCEPT
|
||||||
{}
|
{}
|
||||||
|
|
||||||
bool KeywordsAssistProposalItem::prematurelyApplies(const QChar &c) const
|
bool KeywordsAssistProposalItem::prematurelyApplies(const QChar &c) const
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ class TEXTEDITOR_EXPORT KeywordsAssistProposalItem : public AssistProposalItem
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
KeywordsAssistProposalItem(bool isFunction);
|
KeywordsAssistProposalItem(bool isFunction);
|
||||||
~KeywordsAssistProposalItem();
|
~KeywordsAssistProposalItem() Q_DECL_NOEXCEPT;
|
||||||
|
|
||||||
bool prematurelyApplies(const QChar &c) const override;
|
bool prematurelyApplies(const QChar &c) const override;
|
||||||
void applyContextualContent(TextDocumentManipulatorInterface &manipulator, int basePosition) const override;
|
void applyContextualContent(TextDocumentManipulatorInterface &manipulator, int basePosition) const override;
|
||||||
|
|||||||
Reference in New Issue
Block a user