diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-05 14:10:47 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-05 14:10:47 (GMT) |
| commit | 1d7d5436eea09a232187836e59d2a937a752dee4 (patch) | |
| tree | 6bd9ae61abb1467aceddc5a828fc2e65d93b2534 /src/testlib/qtestxunitstreamer.h | |
| parent | 791bddfcd5cc7540219835ef5d91486acd833c4b (diff) | |
| parent | fb8bb148affec842e8fa1a70616c64c7d3066ee8 (diff) | |
| download | Qt-1d7d5436eea09a232187836e59d2a937a752dee4.zip Qt-1d7d5436eea09a232187836e59d2a937a752dee4.tar.gz Qt-1d7d5436eea09a232187836e59d2a937a752dee4.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts:
src/script/qscriptextqobject.cpp
Diffstat (limited to 'src/testlib/qtestxunitstreamer.h')
| -rw-r--r-- | src/testlib/qtestxunitstreamer.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/testlib/qtestxunitstreamer.h b/src/testlib/qtestxunitstreamer.h index 9817fd3..044307f 100644 --- a/src/testlib/qtestxunitstreamer.h +++ b/src/testlib/qtestxunitstreamer.h @@ -58,10 +58,10 @@ class QTestXunitStreamer: public QTestBasicStreamer QTestXunitStreamer(); ~QTestXunitStreamer(); - void formatStart(const QTestElement *element = 0, char *formatted = 0) const; - void formatEnd(const QTestElement *element = 0, char *formatted = 0) const; - void formatAfterAttributes(const QTestElement *element = 0, char *formatted = 0) const; - void formatAttributes(const QTestElement *element = 0, const QTestElementAttribute *attribute = 0, char *formatted = 0) const; + void formatStart(const QTestElement *element, char **formatted) const; + void formatEnd(const QTestElement *element, char **formatted) const; + void formatAfterAttributes(const QTestElement *element, char **formatted) const; + void formatAttributes(const QTestElement *element, const QTestElementAttribute *attribute, char **formatted) const; void output(QTestElement *element) const; void outputElements(QTestElement *element, bool isChildElement = false) const; |