diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-07-15 14:29:07 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-07-15 14:29:07 +0200 |
| commit | e5ca4b346282d17e4c30e4ac41c46dc94fd53d76 (patch) | |
| tree | b2a4868eb1f45bc4b5a728ec15782d14e9b86457 /src/plugins/valgrind/xmlprotocol/frame.cpp | |
| parent | ab8713d7921ba915efb4e2f1f40ad0b3ce1a12f2 (diff) | |
| parent | dbc0fa091926926ff6e26d3fcae74a596512798b (diff) | |
Merge remote-tracking branch 'origin/2.3'
Conflicts:
qtcreator.pri
share/qtcreator/dumper/dumper.py
share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
src/plugins/valgrind/valgrind.pro
tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300
Diffstat (limited to 'src/plugins/valgrind/xmlprotocol/frame.cpp')
| -rw-r--r-- | src/plugins/valgrind/xmlprotocol/frame.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/valgrind/xmlprotocol/frame.cpp b/src/plugins/valgrind/xmlprotocol/frame.cpp index 9b36a4a3680..876af1bf270 100644 --- a/src/plugins/valgrind/xmlprotocol/frame.cpp +++ b/src/plugins/valgrind/xmlprotocol/frame.cpp @@ -43,9 +43,7 @@ namespace XmlProtocol { class Frame::Private : public QSharedData { public: - explicit Private() : - ip(0), line( -1 ) - {} + Private() : ip(0), line(-1) {} bool operator==(const Private &other) const { @@ -74,7 +72,7 @@ Frame::~Frame() } Frame::Frame(const Frame &other) : - d( other.d ) + d(other.d) { } |