From a45ccb0d4e267e88ae39ad2f17adf7d738a39caa Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@digia.com>
Date: Thu, 14 Feb 2013 15:40:11 +0100
Subject: [PATCH] CppEditor: Replace Q_ASSERT with QTC_ASSERT/QTC_CHECK
Change-Id: I1ae059f2fcc2b667d9fe36799b15358815c8acea
Reviewed-by: hjk <hjk121@nokiamail.com>
---
src/plugins/cppeditor/cppquickfixassistant.cpp | 4 +++-
src/plugins/texteditor/refactoringchanges.cpp | 10 +++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/plugins/cppeditor/cppquickfixassistant.cpp b/src/plugins/cppeditor/cppquickfixassistant.cpp
index c6d9c3dc2f5..262b47950e7 100644
--- a/src/plugins/cppeditor/cppquickfixassistant.cpp
+++ b/src/plugins/cppeditor/cppquickfixassistant.cpp
@@ -50,6 +50,8 @@
#include <extensionsystem/pluginmanager.h>
+#include <utils/qtcassert.h>
+
#include <QFileInfo>
#include <QTextBlock>
@@ -104,7 +106,7 @@ CppQuickFixAssistInterface::CppQuickFixAssistInterface(CPPEditorWidget *editor,
, m_currentFile(CppRefactoringChanges::file(editor, m_semanticInfo.doc))
, m_context(m_semanticInfo.doc, m_snapshot)
{
- Q_ASSERT(!m_semanticInfo.doc.isNull());
+ QTC_CHECK(!m_semanticInfo.doc.isNull());
CPlusPlus::ASTPath astPath(m_semanticInfo.doc);
m_path = astPath(editor->textCursor());
}
diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp
index f6d5192232c..00054b99e77 100644
--- a/src/plugins/texteditor/refactoringchanges.cpp
+++ b/src/plugins/texteditor/refactoringchanges.cpp
@@ -253,8 +253,8 @@ QString RefactoringFile::fileName() const
int RefactoringFile::position(unsigned line, unsigned column) const
{
- Q_ASSERT(line != 0);
- Q_ASSERT(column != 0);
+ QTC_ASSERT(line != 0, return -1);
+ QTC_ASSERT(column != 0, return -1);
if (const QTextDocument *doc = document())
return doc->findBlockByNumber(line - 1).position() + column - 1;
return -1;
@@ -262,9 +262,9 @@ int RefactoringFile::position(unsigned line, unsigned column) const
void RefactoringFile::lineAndColumn(int offset, unsigned *line, unsigned *column) const
{
- Q_ASSERT(line);
- Q_ASSERT(column);
- Q_ASSERT(offset >= 0);
+ QTC_ASSERT(line, return);
+ QTC_ASSERT(column, return);
+ QTC_ASSERT(offset >= 0, return);
QTextCursor c(cursor());
c.setPosition(offset);
*line = c.blockNumber() + 1;
--
GitLab