summaryrefslogtreecommitdiffstats
path: root/src/corelib/statemachine
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2009-05-25 12:46:47 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2009-05-25 12:47:24 (GMT)
commitb6b251cb8b36be434cf878a916c15019fd65b6f0 (patch)
tree6e79e80f06738ceaa5be66f1b8998d47b8aaa590 /src/corelib/statemachine
parentee443b7873586592773190457ce8d21bcaae248e (diff)
downloadQt-b6b251cb8b36be434cf878a916c15019fd65b6f0.zip
Qt-b6b251cb8b36be434cf878a916c15019fd65b6f0.tar.gz
Qt-b6b251cb8b36be434cf878a916c15019fd65b6f0.tar.bz2
Removed some export to symbols that don't need it
...hopefully
Diffstat (limited to 'src/corelib/statemachine')
-rw-r--r--src/corelib/statemachine/qabstractstate_p.h3
-rw-r--r--src/corelib/statemachine/qstate.cpp14
-rw-r--r--src/corelib/statemachine/qstate_p.h6
-rw-r--r--src/corelib/statemachine/qstatemachine_p.h5
4 files changed, 6 insertions, 22 deletions
diff --git a/src/corelib/statemachine/qabstractstate_p.h b/src/corelib/statemachine/qabstractstate_p.h
index 2aad47e..b4f3108 100644
--- a/src/corelib/statemachine/qabstractstate_p.h
+++ b/src/corelib/statemachine/qabstractstate_p.h
@@ -60,8 +60,7 @@ QT_BEGIN_NAMESPACE
class QStateMachine;
class QAbstractState;
-class Q_CORE_EXPORT QAbstractStatePrivate
- : public QObjectPrivate
+class QAbstractStatePrivate : public QObjectPrivate
{
Q_DECLARE_PUBLIC(QAbstractState)
diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp
index e42e463..5463059 100644
--- a/src/corelib/statemachine/qstate.cpp
+++ b/src/corelib/statemachine/qstate.cpp
@@ -129,20 +129,6 @@ QStatePrivate::~QStatePrivate()
{
}
-QStatePrivate *QStatePrivate::get(QState *q)
-{
- if (!q)
- return 0;
- return q->d_func();
-}
-
-const QStatePrivate *QStatePrivate::get(const QState *q)
-{
- if (!q)
- return 0;
- return q->d_func();
-}
-
void QStatePrivate::emitFinished()
{
Q_Q(QState);
diff --git a/src/corelib/statemachine/qstate_p.h b/src/corelib/statemachine/qstate_p.h
index 1f913b4..491cb87 100644
--- a/src/corelib/statemachine/qstate_p.h
+++ b/src/corelib/statemachine/qstate_p.h
@@ -79,15 +79,15 @@ class QAbstractTransition;
class QHistoryState;
class QState;
-class Q_CORE_EXPORT QStatePrivate : public QAbstractStatePrivate
+class QStatePrivate : public QAbstractStatePrivate
{
Q_DECLARE_PUBLIC(QState)
public:
QStatePrivate();
~QStatePrivate();
- static QStatePrivate *get(QState *q);
- static const QStatePrivate *get(const QState *q);
+ static QStatePrivate *get(QState *q) { return q ? q->d_func() : 0; }
+ static const QStatePrivate *get(const QState *q) { return q? q->d_func() : 0; }
QList<QAbstractState*> childStates() const;
QList<QHistoryState*> historyStates() const;
diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h
index dfa5575..54953b4 100644
--- a/src/corelib/statemachine/qstatemachine_p.h
+++ b/src/corelib/statemachine/qstatemachine_p.h
@@ -81,8 +81,7 @@ class QAbstractAnimation;
#endif
class QStateMachine;
-class Q_CORE_EXPORT QStateMachinePrivate
- : public QObjectPrivate
+class QStateMachinePrivate : public QObjectPrivate
{
Q_DECLARE_PUBLIC(QStateMachine)
public:
@@ -209,7 +208,7 @@ public:
f_cloneEvent cloneEvent;
};
- static const Handler *handler;
+ static Q_CORE_EXPORT const Handler *handler;
};
QT_END_NAMESPACE