summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppcodecompletion.cpp
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2008-12-09 15:25:01 +0100
committerhjk <qtc-committer@nokia.com>2008-12-09 15:25:01 +0100
commit4a552ead9ff84e77e9bbdb107b97432777a648d8 (patch)
tree15d3aece30ba664df96ee1ad7a905bfdf781f621 /src/plugins/cpptools/cppcodecompletion.cpp
parente99d8ce3fc67925437a9bef344b66db39ca232aa (diff)
downloadqt-creator-4a552ead9ff84e77e9bbdb107b97432777a648d8.tar.gz
use QTC_ASSERT instead of Q_ASSERT
Diffstat (limited to 'src/plugins/cpptools/cppcodecompletion.cpp')
-rw-r--r--src/plugins/cpptools/cppcodecompletion.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index d24f5a5f81..35206c2633 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -32,6 +32,7 @@
***************************************************************************/
#include "cppcodecompletion.h"
+
#include "cppmodelmanager.h"
#include <Control.h>
@@ -45,6 +46,7 @@
#include <SymbolVisitor.h>
#include <Scope.h>
#include <TranslationUnit.h>
+
#include <cplusplus/ResolveExpression.h>
#include <cplusplus/LookupContext.h>
#include <cplusplus/Overview.h>
@@ -55,6 +57,7 @@
#include <coreplugin/editormanager/editormanager.h>
#include <texteditor/itexteditor.h>
#include <texteditor/itexteditable.h>
+#include <utils/qtcassert.h>
#include <texteditor/basetexteditor.h>
#include <QtCore/QDebug>
@@ -540,7 +543,7 @@ bool CppCodeCompletion::completeMember(FullySpecifiedType,
const QList<TypeOfExpression::Result> &results,
const LookupContext &context)
{
- Q_ASSERT(! results.isEmpty());
+ QTC_ASSERT(!results.isEmpty(), return false);
QList<Symbol *> classObjectCandidates;
@@ -938,7 +941,7 @@ void CppCodeCompletion::complete(const TextEditor::CompletionItem &item)
if (m_completionOperator == T_LPAREN) {
if (symbol) {
Function *function = symbol->type()->asFunction();
- Q_ASSERT(function != 0);
+ QTC_ASSERT(function, return);
m_functionArgumentWidget = new FunctionArgumentWidget(m_core);
m_functionArgumentWidget->showFunctionHint(function);