From 4a552ead9ff84e77e9bbdb107b97432777a648d8 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 9 Dec 2008 15:25:01 +0100 Subject: use QTC_ASSERT instead of Q_ASSERT --- src/libs/cplusplus/OverviewModel.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/libs/cplusplus/OverviewModel.cpp') diff --git a/src/libs/cplusplus/OverviewModel.cpp b/src/libs/cplusplus/OverviewModel.cpp index 2065877890..7f38cb8ba1 100644 --- a/src/libs/cplusplus/OverviewModel.cpp +++ b/src/libs/cplusplus/OverviewModel.cpp @@ -34,6 +34,8 @@ #include "OverviewModel.h" #include "Overview.h" +#include + #include #include #include @@ -81,13 +83,13 @@ QModelIndex OverviewModel::index(int row, int column, const QModelIndex &parent) return createIndex(row, column, symbol); } else { Symbol *parentSymbol = static_cast(parent.internalPointer()); - Q_ASSERT(parentSymbol != 0); + QTC_ASSERT(parentSymbol, return QModelIndex()); ScopedSymbol *scopedSymbol = parentSymbol->asScopedSymbol(); - Q_ASSERT(scopedSymbol != 0); + QTC_ASSERT(scopedSymbol, return QModelIndex()); Scope *scope = scopedSymbol->members(); - Q_ASSERT(scope != 0); + QTC_ASSERT(scope, return QModelIndex()); return createIndex(row, 0, scope->symbolAt(row)); } @@ -124,12 +126,12 @@ int OverviewModel::rowCount(const QModelIndex &parent) const if (!parent.parent().isValid() && parent.row() == 0) // account for no symbol item return 0; Symbol *parentSymbol = static_cast(parent.internalPointer()); - Q_ASSERT(parentSymbol != 0); + QTC_ASSERT(parentSymbol, return 0); if (ScopedSymbol *scopedSymbol = parentSymbol->asScopedSymbol()) { if (!scopedSymbol->isFunction()) { Scope *parentScope = scopedSymbol->members(); - Q_ASSERT(parentScope != 0); + QTC_ASSERT(parentScope, return 0); return parentScope->symbolCount(); } -- cgit v1.2.1