TextEditor: Move constructor has now noexcept

Otherwise the copy constructor will be used too and we get an error
because it is private.

Change-Id: Ibfe70939ebe34fa9a524b9844a20d962eb09bd97
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Marco Bubke
2015-09-01 10:10:20 +02:00
committed by David Schulz
parent 1c06cb1e8a
commit 610ff191af
4 changed files with 12 additions and 2 deletions

View File

@@ -78,5 +78,10 @@ ClangTextMark::ClangTextMark(const QString &fileName, int lineNumber, ClangBackE
setIcon(iconForSeverity(severity));
}
ClangTextMark::ClangTextMark(ClangTextMark &&other) Q_DECL_NOEXCEPT
: TextMark(std::move(other))
{
}
} // namespace ClangCodeModel

View File

@@ -41,6 +41,11 @@ class ClangTextMark : public TextEditor::TextMark
{
public:
ClangTextMark(const QString &fileName, int lineNumber, ClangBackEnd::DiagnosticSeverity severity);
ClangTextMark(ClangTextMark &&other) Q_DECL_NOEXCEPT;
ClangTextMark(ClangTextMark &other) = delete;
ClangTextMark &operator=(ClangTextMark &other) = delete;
};
} // namespace ClangCodeModel

View File

@@ -65,7 +65,7 @@ TextMark::~TextMark()
m_baseTextDocument = 0;
}
TextMark::TextMark(TextMark &&other)
TextMark::TextMark(TextMark &&other) Q_DECL_NOEXCEPT
: m_baseTextDocument(std::move(other.m_baseTextDocument)),
m_fileName(std::move(other.m_fileName)),
m_lineNumber(std::move(other.m_lineNumber)),

View File

@@ -57,7 +57,7 @@ public:
TextMark(const QString &fileName, int lineNumber, Core::Id category);
virtual ~TextMark();
TextMark(TextMark &&other);
TextMark(TextMark &&other) Q_DECL_NOEXCEPT;
// determine order on markers on the same line.
enum Priority