kill the QT_STATEMACHINE_SOLUTION define

We won't release another Qt Solution, so the define is no longer needed.

19 files changed, 16 insertions, 233 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
 }
 
 /*!
diff --git a/src/corelib/statemachine/qabstractstate.h b/src/corelib/statemachine/qabstractstate.h
index f6b4b21..d0ebb52 100644
--- a/src/corelib/statemachine/qabstractstate.h
+++ b/src/corelib/statemachine/qabstractstate.h
@@ -76,9 +76,6 @@ protected:
     bool event(QEvent *e);
 
 protected:
-#ifdef QT_STATEMACHINE_SOLUTION
-     QAbstractStatePrivate *d_ptr;
-#endif
     QAbstractState(QAbstractStatePrivate &dd, QState *parent);
 
 private:
diff --git a/src/corelib/statemachine/qabstractstate_p.h b/src/corelib/statemachine/qabstractstate_p.h
index 6c09696..1a99d6c 100644
--- a/src/corelib/statemachine/qabstractstate_p.h
+++ b/src/corelib/statemachine/qabstractstate_p.h
@@ -53,9 +53,7 @@
 // We mean it.
 //
 
-#ifndef QT_STATEMACHINE_SOLUTION
 #include <private/qobject_p.h>
-#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -63,9 +61,7 @@ class QStateMachine;
 
 class QAbstractState;
 class Q_CORE_EXPORT QAbstractStatePrivate
-#ifndef QT_STATEMACHINE_SOLUTION
     : public QObjectPrivate
-#endif
 {
     Q_DECLARE_PUBLIC(QAbstractState)
 
@@ -82,10 +78,6 @@ public:
 
     void emitEntered();
     void emitExited();
-
-#ifdef QT_STATEMACHINE_SOLUTION
-    QAbstractState *q_ptr;
-#endif
 };
 
 QT_END_NAMESPACE
diff --git a/src/corelib/statemachine/qabstracttransition.cpp b/src/corelib/statemachine/qabstracttransition.cpp
index 6ddb416..f7a7d34 100644
--- a/src/corelib/statemachine/qabstracttransition.cpp
+++ b/src/corelib/statemachine/qabstracttransition.cpp
@@ -147,18 +147,8 @@ QState *QAbstractTransitionPrivate::sourceState() const
   Constructs a new QAbstractTransition object with the given \a sourceState.
 */
 QAbstractTransition::QAbstractTransition(QState *sourceState)
-    : QObject(
-#ifndef QT_STATEMACHINE_SOLUTION
-        *new QAbstractTransitionPrivate,
-#endif
-        sourceState)
-#ifdef QT_STATEMACHINE_SOLUTION
-    , d_ptr(new QAbstractTransitionPrivate)
-#endif
+    : QObject(*new QAbstractTransitionPrivate, sourceState)
 {
-#ifdef QT_STATEMACHINE_SOLUTION
-    d_ptr->q_ptr = this;
-#endif
 }
 
 /*!
@@ -167,18 +157,8 @@ QAbstractTransition::QAbstractTransition(QState *sourceState)
 */
 QAbstractTransition::QAbstractTransition(const QList<QAbstractState*> &targets,
                                          QState *sourceState)
-    : QObject(
-#ifndef QT_STATEMACHINE_SOLUTION
-        *new QAbstractTransitionPrivate,
-#endif
-        sourceState)
-#ifdef QT_STATEMACHINE_SOLUTION
-    , d_ptr(new QAbstractTransitionPrivate)
-#endif
+    : QObject(*new QAbstractTransitionPrivate, sourceState)
 {
-#ifdef QT_STATEMACHINE_SOLUTION
-    d_ptr->q_ptr = this;
-#endif
     setTargetStates(targets);
 }
 
@@ -187,18 +167,8 @@ QAbstractTransition::QAbstractTransition(const QList<QAbstractState*> &targets,
 */
 QAbstractTransition::QAbstractTransition(QAbstractTransitionPrivate &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
 }
 
 /*!
@@ -207,18 +177,8 @@ QAbstractTransition::QAbstractTransition(QAbstractTransitionPrivate &dd,
 QAbstractTransition::QAbstractTransition(QAbstractTransitionPrivate &dd,
                                          const QList<QAbstractState*> &targets,
                                          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
     setTargetStates(targets);
 }
 
@@ -227,9 +187,6 @@ QAbstractTransition::QAbstractTransition(QAbstractTransitionPrivate &dd,
 */
 QAbstractTransition::~QAbstractTransition()
 {
-#ifdef QT_STATEMACHINE_SOLUTION
-    delete d_ptr;
-#endif
 }
 
 /*!
diff --git a/src/corelib/statemachine/qabstracttransition.h b/src/corelib/statemachine/qabstracttransition.h
index e207944..8f0cefa 100644
--- a/src/corelib/statemachine/qabstracttransition.h
+++ b/src/corelib/statemachine/qabstracttransition.h
@@ -95,9 +95,6 @@ protected:
     bool event(QEvent *e);
 
 protected:
-#ifdef QT_STATEMACHINE_SOLUTION
-    QAbstractTransitionPrivate *d_ptr;
-#endif
     QAbstractTransition(QAbstractTransitionPrivate &dd, QState *parent);
     QAbstractTransition(QAbstractTransitionPrivate &dd,
                         const QList<QAbstractState*> &targets, QState *parent);
diff --git a/src/corelib/statemachine/qabstracttransition_p.h b/src/corelib/statemachine/qabstracttransition_p.h
index eb0ec21..156e70e 100644
--- a/src/corelib/statemachine/qabstracttransition_p.h
+++ b/src/corelib/statemachine/qabstracttransition_p.h
@@ -53,9 +53,7 @@
 // We mean it.
 //
 
-#ifndef QT_STATEMACHINE_SOLUTION
 #include <private/qobject_p.h>
-#endif
 
 #include <QtCore/qlist.h>
 #include <QtCore/qpointer.h>
@@ -68,9 +66,7 @@ class QStateMachine;
 
 class QAbstractTransition;
 class Q_CORE_EXPORT QAbstractTransitionPrivate
-#ifndef QT_STATEMACHINE_SOLUTION
     : public QObjectPrivate
-#endif
 {
     Q_DECLARE_PUBLIC(QAbstractTransition)
 public:
@@ -89,10 +85,6 @@ public:
 #ifndef QT_NO_ANIMATION
     QList<QAbstractAnimation*> animations;
 #endif
-
-#ifdef QT_STATEMACHINE_SOLUTION
-    QAbstractTransition *q_ptr;
-#endif
 };
 
 QT_END_NAMESPACE
diff --git a/src/corelib/statemachine/qeventtransition.cpp b/src/corelib/statemachine/qeventtransition.cpp
index 86259e4..3ae3ed9 100644
--- a/src/corelib/statemachine/qeventtransition.cpp
+++ b/src/corelib/statemachine/qeventtransition.cpp
@@ -255,11 +255,7 @@ void QEventTransition::setEventObject(QObject *object)
 bool QEventTransition::eventTest(QEvent *event) const
 {
     Q_D(const QEventTransition);
-#ifdef QT_STATEMACHINE_SOLUTION
-    if (event->type() == QEvent::Type(QEvent::User-3)) {
-#else
     if (event->type() == QEvent::Wrapped) {
-#endif
         QWrappedEvent *we = static_cast<QWrappedEvent*>(event);
         return (we->object() == d->object)
             && (we->event()->type() == d->eventType);
diff --git a/src/corelib/statemachine/qeventtransition.h b/src/corelib/statemachine/qeventtransition.h
index a128cee..68ee4fc 100644
--- a/src/corelib/statemachine/qeventtransition.h
+++ b/src/corelib/statemachine/qeventtransition.h
@@ -42,11 +42,7 @@
 #ifndef QEVENTTRANSITION_H
 #define QEVENTTRANSITION_H
 
-#ifndef QT_STATEMACHINE_SOLUTION
 #include <QtCore/qabstracttransition.h>
-#else
-#include "qabstracttransition.h"
-#endif
 #include <QtCore/qcoreevent.h>
 
 QT_BEGIN_HEADER
@@ -60,9 +56,7 @@ class Q_CORE_EXPORT QEventTransition : public QAbstractTransition
 {
     Q_OBJECT
     Q_PROPERTY(QObject* eventObject READ eventObject WRITE setEventObject)
-#ifndef QT_STATEMACHINE_SOLUTION
     Q_PROPERTY(QEvent::Type eventType READ eventType WRITE setEventType)
-#endif
 public:
     QEventTransition(QState *sourceState = 0);
     QEventTransition(QObject *object, QEvent::Type type, QState *sourceState = 0);
diff --git a/src/corelib/statemachine/qfinalstate.h b/src/corelib/statemachine/qfinalstate.h
index eb8aa0f..fa68394 100644
--- a/src/corelib/statemachine/qfinalstate.h
+++ b/src/corelib/statemachine/qfinalstate.h
@@ -42,11 +42,7 @@
 #ifndef QFINALSTATE_H
 #define QFINALSTATE_H
 
-#ifndef QT_STATEMACHINE_SOLUTION
 #include <QtCore/qabstractstate.h>
-#else
-#include "qabstractstate.h"
-#endif
 
 QT_BEGIN_HEADER
 
diff --git a/src/corelib/statemachine/qhistorystate.h b/src/corelib/statemachine/qhistorystate.h
index d0f75de..a0682bd 100644
--- a/src/corelib/statemachine/qhistorystate.h
+++ b/src/corelib/statemachine/qhistorystate.h
@@ -42,11 +42,7 @@
 #ifndef QHISTORYSTATE_H
 #define QHISTORYSTATE_H
 
-#ifndef QT_STATEMACHINE_SOLUTION
 #include <QtCore/qabstractstate.h>
-#else
-#include "qabstractstate.h"
-#endif
 
 QT_BEGIN_HEADER
 
diff --git a/src/corelib/statemachine/qsignaleventgenerator_p.h b/src/corelib/statemachine/qsignaleventgenerator_p.h
index d18def8..cf0ea1e 100644
--- a/src/corelib/statemachine/qsignaleventgenerator_p.h
+++ b/src/corelib/statemachine/qsignaleventgenerator_p.h
@@ -62,11 +62,7 @@ class QStateMachine;
 class QSignalEventGenerator : public QObject
 {
 public:
-    QSignalEventGenerator(
-#ifdef QT_STATEMACHINE_SOLUTION
-        int signalIndex,
-#endif
-        QStateMachine *parent);
+    QSignalEventGenerator(QStateMachine *parent);
 
     static const QMetaObject staticMetaObject;
     virtual const QMetaObject *metaObject() const;
@@ -74,9 +70,6 @@ public:
     virtual int qt_metacall(QMetaObject::Call, int, void **argv);
 
 private:
-#ifdef QT_STATEMACHINE_SOLUTION
-    int signalIndex;
-#endif
     Q_DISABLE_COPY(QSignalEventGenerator)
 };
 
diff --git a/src/corelib/statemachine/qsignaltransition.cpp b/src/corelib/statemachine/qsignaltransition.cpp
index d5833bd..fd17292 100644
--- a/src/corelib/statemachine/qsignaltransition.cpp
+++ b/src/corelib/statemachine/qsignaltransition.cpp
@@ -228,11 +228,7 @@ void QSignalTransition::setSignal(const QByteArray &signal)
 bool QSignalTransition::eventTest(QEvent *event) const
 {
     Q_D(const QSignalTransition);
-#ifndef QT_STATEMACHINE_SOLUTION
     if (event->type() == QEvent::Signal) {
-#else
-    if (event->type() == QEvent::Type(QEvent::User-1)) {
-#endif
         if (d->signalIndex == -1)
             return false;
         QSignalEvent *se = static_cast<QSignalEvent*>(event);
diff --git a/src/corelib/statemachine/qsignaltransition.h b/src/corelib/statemachine/qsignaltransition.h
index 98a9ae7..7f457b8 100644
--- a/src/corelib/statemachine/qsignaltransition.h
+++ b/src/corelib/statemachine/qsignaltransition.h
@@ -42,11 +42,7 @@
 #ifndef QSIGNALTRANSITION_H
 #define QSIGNALTRANSITION_H
 
-#ifndef QT_STATEMACHINE_SOLUTION
 #include <QtCore/qabstracttransition.h>
-#else
-#include "qabstracttransition.h"
-#endif
 
 QT_BEGIN_HEADER
 
diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp
index f1528b8..8893bfe 100644
--- a/src/corelib/statemachine/qstate.cpp
+++ b/src/corelib/statemachine/qstate.cpp
@@ -193,9 +193,6 @@ QList<QAbstractState*> QStatePrivate::childStates() const
 {
     QList<QAbstractState*> result;
     QList<QObject*>::const_iterator it;
-#ifdef QT_STATEMACHINE_SOLUTION
-    const QObjectList &children = q_func()->children();
-#endif
     for (it = children.constBegin(); it != children.constEnd(); ++it) {
         QAbstractState *s = qobject_cast<QAbstractState*>(*it);
         if (!s || qobject_cast<QHistoryState*>(s))
@@ -209,9 +206,6 @@ QList<QHistoryState*> QStatePrivate::historyStates() const
 {
     QList<QHistoryState*> result;
     QList<QObject*>::const_iterator it;
-#ifdef QT_STATEMACHINE_SOLUTION
-    const QObjectList &children = q_func()->children();
-#endif
     for (it = children.constBegin(); it != children.constEnd(); ++it) {
         QHistoryState *h = qobject_cast<QHistoryState*>(*it);
         if (h)
@@ -224,9 +218,6 @@ QList<QAbstractTransition*> QStatePrivate::transitions() const
 {
     QList<QAbstractTransition*> result;
     QList<QObject*>::const_iterator it;
-#ifdef QT_STATEMACHINE_SOLUTION
-    const QObjectList &children = q_func()->children();
-#endif
     for (it = children.constBegin(); it != children.constEnd(); ++it) {
         QAbstractTransition *t = qobject_cast<QAbstractTransition*>(*it);
         if (t)
diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h
index 73955d7..6729c69 100644
--- a/src/corelib/statemachine/qstate.h
+++ b/src/corelib/statemachine/qstate.h
@@ -42,11 +42,7 @@
 #ifndef QSTATE_H
 #define QSTATE_H
 
-#ifndef QT_STATEMACHINE_SOLUTION
 #include <QtCore/qabstractstate.h>
-#else
-#include "qabstractstate.h"
-#endif
 
 QT_BEGIN_HEADER
 
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index 40a465a..c2b2696 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -54,10 +54,8 @@
 #include "qfinalstate.h"
 #include "qhistorystate.h"
 #include "qhistorystate_p.h"
-#ifndef QT_STATEMACHINE_SOLUTION
 #include "private/qobject_p.h"
 #include "private/qthread_p.h"
-#endif
 
 #ifndef QT_NO_STATEMACHINE_EVENTFILTER
 #include "qeventtransition.h"
@@ -68,11 +66,7 @@
 #ifndef QT_NO_ANIMATION
 #include "qpropertyanimation.h"
 #include "qanimationgroup.h"
-# ifndef QT_STATEMACHINE_SOLUTION
-# include <private/qvariantanimation_p.h>
-# else
-# include "qvariantanimation_p.h"
-# endif
+#include <private/qvariantanimation_p.h>
 #endif
 
 #include <QtCore/qmetaobject.h>
@@ -212,9 +206,7 @@ QStateMachinePrivate::QStateMachinePrivate()
     globalRestorePolicy = QStateMachine::DoNotRestoreProperties;
     rootState = 0;
     initialErrorStateForRoot = 0;
-#ifndef QT_STATEMACHINE_SOLUTION
     signalEventGenerator = 0;
-#endif
 #ifndef QT_NO_ANIMATION
     animationsEnabled = true;
 #endif
@@ -1274,8 +1266,6 @@ void QStateMachinePrivate::unregisterTransition(QAbstractTransition *transition)
 #endif
 }
 
-#ifndef QT_STATEMACHINE_SOLUTION
-
 static int senderSignalIndex(const QObject *sender)
 {
     QObjectPrivate *d = QObjectPrivate::get(const_cast<QObject*>(sender));
@@ -1292,8 +1282,6 @@ static int senderSignalIndex(const QObject *sender)
     return d->currentSender->signal;
 }
 
-#endif
-
 void QStateMachinePrivate::registerSignalTransition(QSignalTransition *transition)
 {
     Q_Q(QStateMachine);
@@ -1315,12 +1303,8 @@ void QStateMachinePrivate::registerSignalTransition(QSignalTransition *transitio
     if (connectedSignalIndexes.size() <= signalIndex)
         connectedSignalIndexes.resize(signalIndex+1);
     if (connectedSignalIndexes.at(signalIndex) == 0) {
-#ifndef QT_STATEMACHINE_SOLUTION
         if (!signalEventGenerator)
             signalEventGenerator = new QSignalEventGenerator(q);
-#else
-        QSignalEventGenerator *signalEventGenerator = new QSignalEventGenerator(signalIndex, q);
-#endif
         bool ok = QMetaObject::connect(sender, signalIndex, signalEventGenerator,
                                        signalEventGenerator->metaObject()->methodOffset());
         if (!ok) {
@@ -1346,7 +1330,6 @@ void QStateMachinePrivate::unregisterSignalTransition(QSignalTransition *transit
     int signalIndex = QSignalTransitionPrivate::get(transition)->signalIndex;
     if (signalIndex == -1)
         return; // not registered
-#ifndef QT_STATEMACHINE_SOLUTION
     QSignalTransitionPrivate::get(transition)->signalIndex = -1;
     const QObject *sender = QSignalTransitionPrivate::get(transition)->sender;
     QVector<int> &connectedSignalIndexes = connections[sender];
@@ -1362,7 +1345,6 @@ void QStateMachinePrivate::unregisterSignalTransition(QSignalTransition *transit
         if (sum == 0)
             connections.remove(sender);
     }
-#endif
 }
 
 void QStateMachinePrivate::unregisterAllTransitions()
@@ -1392,10 +1374,8 @@ void QStateMachinePrivate::registerEventTransition(QEventTransition *transition)
     QObject *object = QEventTransitionPrivate::get(transition)->object;
     if (!object)
         return;
-#ifndef QT_STATEMACHINE_SOLUTION
     QObjectPrivate *od = QObjectPrivate::get(object);
     if (!od->eventFilters.contains(q))
-#endif
         object->installEventFilter(q);
     qobjectEvents[object].insert(transition->eventType());
     QEventTransitionPrivate::get(transition)->registered = true;
@@ -1449,36 +1429,16 @@ void QStateMachinePrivate::handleTransitionSignal(const QObject *sender, int sig
   Constructs a new state machine with the given \a parent.
 */
 QStateMachine::QStateMachine(QObject *parent)
-    : QObject(
-#ifndef QT_STATEMACHINE_SOLUTION
-        *new QStateMachinePrivate,
-#endif
-        parent)
-#ifdef QT_STATEMACHINE_SOLUTION
-    , d_ptr(new QStateMachinePrivate)
-#endif
+    : QObject(*new QStateMachinePrivate, parent)
 {
-#ifdef QT_STATEMACHINE_SOLUTION
-    d_ptr->q_ptr = this;
-#endif
 }
 
 /*!
   \internal
 */
 QStateMachine::QStateMachine(QStateMachinePrivate &dd, QObject *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
 }
 
 /*!
@@ -1486,9 +1446,6 @@ QStateMachine::QStateMachine(QStateMachinePrivate &dd, QObject *parent)
 */
 QStateMachine::~QStateMachine()
 {
-#ifdef QT_STATEMACHINE_SOLUTION
-    delete d_ptr;
-#endif
 }
 
 namespace {
@@ -2088,11 +2045,9 @@ int QSignalEventGenerator::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_c == QMetaObject::InvokeMetaMethod) {
         switch (_id) {
         case 0: {
-#ifndef QT_STATEMACHINE_SOLUTION
 // ### in Qt 4.6 we can use QObject::senderSignalIndex()
             int signalIndex = senderSignalIndex(this);
             Q_ASSERT(signalIndex != -1);
-#endif
             QStateMachine *machine = qobject_cast<QStateMachine*>(parent());
             QStateMachinePrivate::get(machine)->handleTransitionSignal(sender(), signalIndex, _a);
             break;
@@ -2104,15 +2059,8 @@ int QSignalEventGenerator::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     return _id;
 }
 
-QSignalEventGenerator::QSignalEventGenerator(
-#ifdef QT_STATEMACHINE_SOLUTION
-    int sigIdx,
-#endif
-    QStateMachine *parent)
+QSignalEventGenerator::QSignalEventGenerator(QStateMachine *parent)
     : QObject(parent)
-#ifdef QT_STATEMACHINE_SOLUTION
-    , signalIndex(sigIdx)
-#endif
 {
 }
 
@@ -2143,13 +2091,8 @@ QSignalEventGenerator::QSignalEventGenerator(
 */
 QSignalEvent::QSignalEvent(const QObject *sender, int signalIndex,
                            const QList<QVariant> &arguments)
-    :
-#ifndef QT_STATEMACHINE_SOLUTION
-    QEvent(QEvent::Signal)
-#else
-    QEvent(QEvent::Type(QEvent::User-1))
-#endif
-    , m_sender(sender), m_signalIndex(signalIndex), m_arguments(arguments)
+    : QEvent(QEvent::Signal), m_sender(sender),
+      m_signalIndex(signalIndex), m_arguments(arguments)
 {
 }
 
@@ -2208,12 +2151,7 @@ QSignalEvent::~QSignalEvent()
   and \a event.
 */
 QWrappedEvent::QWrappedEvent(QObject *object, QEvent *event)
-#ifdef QT_STATEMACHINE_SOLUTION
-      : QEvent(QEvent::Type(QEvent::User-3))
-#else
-      : QEvent(QEvent::Wrapped)
-#endif
-      , m_object(object), m_event(event)
+    : QEvent(QEvent::Wrapped), m_object(object), m_event(event)
 {
 }
 
diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h
index 5dc6c0b..2a98a9a 100644
--- a/src/corelib/statemachine/qstatemachine.h
+++ b/src/corelib/statemachine/qstatemachine.h
@@ -42,11 +42,7 @@
 #ifndef QSTATEMACHINE_H
 #define QSTATEMACHINE_H
 
-#ifndef QT_STATEMACHINE_SOLUTION
-#  include <QtCore/qabstractstate.h>
-#else
-#  include "qabstractstate.h"
-#endif
+#include <QtCore/qabstractstate.h>
 
 #include <QtCore/qlist.h>
 #include <QtCore/qobject.h>
@@ -151,9 +147,6 @@ protected:
     bool event(QEvent *e);
 
 protected:
-#ifdef QT_STATEMACHINE_SOLUTION
-     QStateMachinePrivate *d_ptr;
-#endif
     QStateMachine(QStateMachinePrivate &dd, QObject *parent);
 
 private:
diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h
index 4bf9ce2..9b4b861 100644
--- a/src/corelib/statemachine/qstatemachine_p.h
+++ b/src/corelib/statemachine/qstatemachine_p.h
@@ -53,9 +53,7 @@
 // We mean it.
 //
 
-#ifndef QT_STATEMACHINE_SOLUTION
 #include <private/qobject_p.h>
-#endif
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qhash.h>
 #include <QtCore/qlist.h>
@@ -84,9 +82,7 @@ class QAbstractAnimation;
 
 class QStateMachine;
 class Q_CORE_EXPORT QStateMachinePrivate
-#ifndef QT_STATEMACHINE_SOLUTION
     : public QObjectPrivate
-#endif
 {
     Q_DECLARE_PUBLIC(QStateMachine)
 public:
@@ -200,9 +196,8 @@ public:
 
 #endif // QT_NO_ANIMATION
 
-#ifndef QT_STATEMACHINE_SOLUTION
     QSignalEventGenerator *signalEventGenerator;
-#endif
+
     QHash<const QObject*, QVector<int> > connections;
 #ifndef QT_NO_STATEMACHINE_EVENTFILTER
     QHash<QObject*, QSet<QEvent::Type> > qobjectEvents;
@@ -215,10 +210,6 @@ public:
     };
 
     static const Handler *handler;
-
-#ifdef QT_STATEMACHINE_SOLUTION
-    QStateMachine *q_ptr;
-#endif
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/statemachine/qguistatemachine.cpp b/src/gui/statemachine/qguistatemachine.cpp
index d30265a..b7563d7 100644
--- a/src/gui/statemachine/qguistatemachine.cpp
+++ b/src/gui/statemachine/qguistatemachine.cpp
@@ -9,13 +9,8 @@
 **
 ****************************************************************************/
 
-#ifdef QT_STATEMACHINE_SOLUTION
-#include "qstatemachine.h"
-#include "qstatemachine_p.h"
-#else
 #include <QtCore/qstatemachine.h>
 #include <private/qstatemachine_p.h>
-#endif
 #include <QtGui/qevent.h>
 #include <QtGui/qgraphicssceneevent.h>