summaryrefslogtreecommitdiff
path: root/src/libs/cplusplus/pp-environment.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/libs/cplusplus/pp-environment.cpp
parente99d8ce3fc67925437a9bef344b66db39ca232aa (diff)
downloadqt-creator-4a552ead9ff84e77e9bbdb107b97432777a648d8.tar.gz
use QTC_ASSERT instead of Q_ASSERT
Diffstat (limited to 'src/libs/cplusplus/pp-environment.cpp')
-rw-r--r--src/libs/cplusplus/pp-environment.cpp21
1 files changed, 14 insertions, 7 deletions
diff --git a/src/libs/cplusplus/pp-environment.cpp b/src/libs/cplusplus/pp-environment.cpp
index a1ade3b189..ff2ca77e4f 100644
--- a/src/libs/cplusplus/pp-environment.cpp
+++ b/src/libs/cplusplus/pp-environment.cpp
@@ -52,11 +52,14 @@
#include "pp-environment.h"
#include "pp.h"
+
+#include <utils/qtcassert.h>
+
#include <cstring>
using namespace CPlusPlus;
-Environment::Environment ()
+Environment::Environment()
: currentLine(0),
hide_next(false),
_macros(0),
@@ -67,7 +70,7 @@ Environment::Environment ()
{
}
-Environment::~Environment ()
+Environment::~Environment()
{
if (_macros) {
qDeleteAll(firstMacro(), lastMacro());
@@ -78,15 +81,19 @@ Environment::~Environment ()
free(_hash);
}
-unsigned Environment::macroCount () const
-{ return _macro_count + 1; }
+unsigned Environment::macroCount() const
+{
+ return _macro_count + 1;
+}
-Macro *Environment::macroAt (unsigned index) const
-{ return _macros[index]; }
+Macro *Environment::macroAt(unsigned index) const
+{
+ return _macros[index];
+}
Macro *Environment::bind(const Macro &__macro)
{
- Q_ASSERT(! __macro.name.isEmpty());
+ QTC_ASSERT(! __macro.name.isEmpty(), return 0);
Macro *m = new Macro (__macro);
m->hashcode = hash_code(m->name);