summaryrefslogtreecommitdiff
path: root/src/gui/statemachine
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-05-20 13:18:35 +0200
committerKent Hansen <khansen@trolltech.com>2009-05-20 13:18:35 +0200
commitdfdb8555afc5a7e69c25c5a0c8b98167f15f51e5 (patch)
treeb68cb19f4cba8c1ab91e3db05d7cd45f23c31ead /src/gui/statemachine
parent87f51bd2526130f1b3c79d59aec89fe078094d68 (diff)
downloadqt4-tools-dfdb8555afc5a7e69c25c5a0c8b98167f15f51e5.tar.gz
remove QT_EXPERIMENTAL stuff
Diffstat (limited to 'src/gui/statemachine')
-rw-r--r--src/gui/statemachine/qbasickeyeventtransition.cpp8
-rw-r--r--src/gui/statemachine/qbasickeyeventtransition_p.h7
-rw-r--r--src/gui/statemachine/qbasicmouseeventtransition.cpp7
-rw-r--r--src/gui/statemachine/qbasicmouseeventtransition_p.h7
-rw-r--r--src/gui/statemachine/qkeyeventtransition.cpp7
-rw-r--r--src/gui/statemachine/qkeyeventtransition.h7
-rw-r--r--src/gui/statemachine/qmouseeventtransition.cpp7
-rw-r--r--src/gui/statemachine/qmouseeventtransition.h8
8 files changed, 10 insertions, 48 deletions
diff --git a/src/gui/statemachine/qbasickeyeventtransition.cpp b/src/gui/statemachine/qbasickeyeventtransition.cpp
index 7f515cdbc7..fe89f8175b 100644
--- a/src/gui/statemachine/qbasickeyeventtransition.cpp
+++ b/src/gui/statemachine/qbasickeyeventtransition.cpp
@@ -12,13 +12,7 @@
#include "qbasickeyeventtransition_p.h"
#include <QtGui/qevent.h>
#include <qdebug.h>
-
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qabstracttransition_p.h"
-#else
-# include <private/qabstracttransition_p.h>
-#endif
-
+#include <private/qabstracttransition_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/gui/statemachine/qbasickeyeventtransition_p.h b/src/gui/statemachine/qbasickeyeventtransition_p.h
index 7506747608..c4ff863546 100644
--- a/src/gui/statemachine/qbasickeyeventtransition_p.h
+++ b/src/gui/statemachine/qbasickeyeventtransition_p.h
@@ -23,12 +23,7 @@
// We mean it.
//
-// Qt
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qabstracttransition.h"
-#else
-# include <QtCore/qabstracttransition.h>
-#endif
+#include <QtCore/qabstracttransition.h>
#include <QtGui/qevent.h>
QT_BEGIN_NAMESPACE
diff --git a/src/gui/statemachine/qbasicmouseeventtransition.cpp b/src/gui/statemachine/qbasicmouseeventtransition.cpp
index 42b7580322..a18d1e8f98 100644
--- a/src/gui/statemachine/qbasicmouseeventtransition.cpp
+++ b/src/gui/statemachine/qbasicmouseeventtransition.cpp
@@ -13,12 +13,7 @@
#include <QtGui/qevent.h>
#include <QtGui/qpainterpath.h>
#include <qdebug.h>
-
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qabstracttransition_p.h"
-#else
-# include <private/qabstracttransition_p.h>
-#endif
+#include <private/qabstracttransition_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/gui/statemachine/qbasicmouseeventtransition_p.h b/src/gui/statemachine/qbasicmouseeventtransition_p.h
index 57f83c6f5b..6a3ad1e84c 100644
--- a/src/gui/statemachine/qbasicmouseeventtransition_p.h
+++ b/src/gui/statemachine/qbasicmouseeventtransition_p.h
@@ -23,12 +23,7 @@
// We mean it.
//
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qabstracttransition.h"
-#else
-# include <QtCore/qabstracttransition.h>
-#endif
-
+#include <QtCore/qabstracttransition.h>
#include <QtGui/qevent.h>
QT_BEGIN_NAMESPACE
diff --git a/src/gui/statemachine/qkeyeventtransition.cpp b/src/gui/statemachine/qkeyeventtransition.cpp
index 3cf51a387b..0418501e46 100644
--- a/src/gui/statemachine/qkeyeventtransition.cpp
+++ b/src/gui/statemachine/qkeyeventtransition.cpp
@@ -12,12 +12,7 @@
#include "qkeyeventtransition.h"
#include "qbasickeyeventtransition_p.h"
#include <QtCore/qwrappedevent.h>
-
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qeventtransition_p.h"
-#else
-# include <private/qeventtransition_p.h>
-#endif
+#include <private/qeventtransition_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/gui/statemachine/qkeyeventtransition.h b/src/gui/statemachine/qkeyeventtransition.h
index 08595e8bac..08c4800f78 100644
--- a/src/gui/statemachine/qkeyeventtransition.h
+++ b/src/gui/statemachine/qkeyeventtransition.h
@@ -12,11 +12,8 @@
#ifndef QKEYEVENTTRANSITION_H
#define QKEYEVENTTRANSITION_H
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qeventtransition.h"
-#else
-# include <QtCore/qeventtransition.h>
-#endif
+#include <QtCore/qeventtransition.h>
+
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
diff --git a/src/gui/statemachine/qmouseeventtransition.cpp b/src/gui/statemachine/qmouseeventtransition.cpp
index 5ffdab05da..ae3c407913 100644
--- a/src/gui/statemachine/qmouseeventtransition.cpp
+++ b/src/gui/statemachine/qmouseeventtransition.cpp
@@ -13,12 +13,7 @@
#include "qbasicmouseeventtransition_p.h"
#include <QtCore/qwrappedevent.h>
#include <QtGui/qpainterpath.h>
-
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qeventtransition_p.h"
-#else
-# include <private/qeventtransition_p.h>
-#endif
+#include <private/qeventtransition_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/gui/statemachine/qmouseeventtransition.h b/src/gui/statemachine/qmouseeventtransition.h
index e878a58bc0..aedc5c281e 100644
--- a/src/gui/statemachine/qmouseeventtransition.h
+++ b/src/gui/statemachine/qmouseeventtransition.h
@@ -12,12 +12,8 @@
#ifndef QMOUSEEVENTTRANSITION_H
#define QMOUSEEVENTTRANSITION_H
-//Qt
-#if defined(QT_EXPERIMENTAL_SOLUTION)
-# include "qeventtransition.h"
-#else
-# include <QtCore/qeventtransition.h>
-#endif
+#include <QtCore/qeventtransition.h>
+
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE