diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-18 06:40:15 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-18 06:40:15 (GMT) |
| commit | 0add74a9339a9d7dda302aa4f31cbb50bdb69908 (patch) | |
| tree | 9d2c767bee200cb79f81aed24551bcb1989eefb7 /src/corelib/statemachine/qabstractstate.cpp | |
| parent | c22504ae79b45268d603c2b2bc66bd2a59c331c7 (diff) | |
| parent | 3769beacd9126b567f6a42e6c357a7eda004a602 (diff) | |
| download | Qt-0add74a9339a9d7dda302aa4f31cbb50bdb69908.zip Qt-0add74a9339a9d7dda302aa4f31cbb50bdb69908.tar.gz Qt-0add74a9339a9d7dda302aa4f31cbb50bdb69908.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/corelib/statemachine/qabstractstate.cpp')
| -rw-r--r-- | src/corelib/statemachine/qabstractstate.cpp | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/src/corelib/statemachine/qabstractstate.cpp b/src/corelib/statemachine/qabstractstate.cpp index 3f84314..7e59a7d 100644 --- a/src/corelib/statemachine/qabstractstate.cpp +++ b/src/corelib/statemachine/qabstractstate.cpp @@ -129,36 +129,16 @@ void QAbstractStatePrivate::emitExited() Constructs a new state with the given \a parent state. */ QAbstractState::QAbstractState(QState *parent) - : QObject( -#ifndef QT_STATEMACHINE_SOLUTION - *new QAbstractStatePrivate, -#endif - parent) -#ifdef QT_STATEMACHINE_SOLUTION - , d_ptr(new QAbstractStatePrivate) -#endif + : QObject(*new QAbstractStatePrivate, parent) { -#ifdef QT_STATEMACHINE_SOLUTION - d_ptr->q_ptr = this; -#endif } /*! \internal */ QAbstractState::QAbstractState(QAbstractStatePrivate &dd, QState *parent) - : QObject( -#ifndef QT_STATEMACHINE_SOLUTION - dd, -#endif - parent) -#ifdef QT_STATEMACHINE_SOLUTION - , d_ptr(&dd) -#endif + : QObject(dd, parent) { -#ifdef QT_STATEMACHINE_SOLUTION - d_ptr->q_ptr = this; -#endif } /*! @@ -166,9 +146,6 @@ QAbstractState::QAbstractState(QAbstractStatePrivate &dd, QState *parent) */ QAbstractState::~QAbstractState() { -#ifdef QT_STATEMACHINE_SOLUTION - delete d_ptr; -#endif } /*! |