From b6b251cb8b36be434cf878a916c15019fd65b6f0 Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Mon, 25 May 2009 14:46:47 +0200 Subject: Removed some export to symbols that don't need it ...hopefully --- examples/animation/sub-attaq/qanimationstate.cpp | 45 +++++++----------------- examples/animation/sub-attaq/qanimationstate.h | 4 +-- src/corelib/concurrent/qfuturewatcher_p.h | 4 +-- src/corelib/kernel/qabstractitemmodel_p.h | 2 +- src/corelib/kernel/qeventdispatcher_unix_p.h | 4 +-- src/corelib/statemachine/qabstractstate_p.h | 3 +- src/corelib/statemachine/qstate.cpp | 14 -------- src/corelib/statemachine/qstate_p.h | 6 ++-- src/corelib/statemachine/qstatemachine_p.h | 5 ++- 9 files changed, 25 insertions(+), 62 deletions(-) diff --git a/examples/animation/sub-attaq/qanimationstate.cpp b/examples/animation/sub-attaq/qanimationstate.cpp index 26e0ef3..d4d109c 100644 --- a/examples/animation/sub-attaq/qanimationstate.cpp +++ b/examples/animation/sub-attaq/qanimationstate.cpp @@ -42,8 +42,6 @@ #include "qanimationstate.h" #include -#include - QT_BEGIN_NAMESPACE @@ -76,25 +74,11 @@ machine.start(); #ifndef QT_NO_ANIMATION -class QAnimationStatePrivate : public QStatePrivate -{ - Q_DECLARE_PUBLIC(QAnimationState) -public: - QAnimationStatePrivate() - : animation(0) - { - - } - ~QAnimationStatePrivate() {} - - QAbstractAnimation *animation; -}; - /*! Constructs a new state with the given \a parent state. */ QAnimationState::QAnimationState(QState *parent) - : QState(*new QAnimationStatePrivate, parent) + : QState(parent), m_animation(0) { } @@ -112,20 +96,18 @@ QAnimationState::~QAnimationState() */ void QAnimationState::setAnimation(QAbstractAnimation *animation) { - Q_D(QAnimationState); - - if (animation == d->animation) + if (animation == m_animation) return; //Disconnect from the previous animation if exist - if(d->animation) - disconnect(d->animation, SIGNAL(finished()), this, SIGNAL(animationFinished())); + if(m_animation) + disconnect(m_animation, SIGNAL(finished()), this, SIGNAL(animationFinished())); - d->animation = animation; + m_animation = animation; - if (d->animation) { + if (m_animation) { //connect the new animation - connect(d->animation, SIGNAL(finished()), this, SIGNAL(animationFinished())); + connect(m_animation, SIGNAL(finished()), this, SIGNAL(animationFinished())); } } @@ -134,8 +116,7 @@ void QAnimationState::setAnimation(QAbstractAnimation *animation) */ QAbstractAnimation* QAnimationState::animation() const { - Q_D(const QAnimationState); - return d->animation; + return m_animation; } /*! @@ -143,9 +124,8 @@ QAbstractAnimation* QAnimationState::animation() const */ void QAnimationState::onEntry(QEvent *) { - Q_D(QAnimationState); - if (d->animation) - d->animation->start(); + if (m_animation) + m_animation->start(); } /*! @@ -153,9 +133,8 @@ void QAnimationState::onEntry(QEvent *) */ void QAnimationState::onExit(QEvent *) { - Q_D(QAnimationState); - if (d->animation) - d->animation->stop(); + if (m_animation) + m_animation->stop(); } /*! diff --git a/examples/animation/sub-attaq/qanimationstate.h b/examples/animation/sub-attaq/qanimationstate.h index 88c0a6d..e5322ad 100644 --- a/examples/animation/sub-attaq/qanimationstate.h +++ b/examples/animation/sub-attaq/qanimationstate.h @@ -58,7 +58,7 @@ QT_MODULE(Gui) #ifndef QT_NO_ANIMATION -class QAnimationStatePrivate; +class QAbstractAnimation; class QAnimationState : public QState { @@ -80,7 +80,7 @@ protected: private: Q_DISABLE_COPY(QAnimationState) - Q_DECLARE_PRIVATE(QAnimationState) + QAbstractAnimation *m_animation; }; #endif diff --git a/src/corelib/concurrent/qfuturewatcher_p.h b/src/corelib/concurrent/qfuturewatcher_p.h index 324839d..d53a1bd 100644 --- a/src/corelib/concurrent/qfuturewatcher_p.h +++ b/src/corelib/concurrent/qfuturewatcher_p.h @@ -63,8 +63,8 @@ QT_BEGIN_NAMESPACE class QFutureWatcherBase; -class Q_CORE_EXPORT QFutureWatcherBasePrivate : public QObjectPrivate, - public QFutureCallOutInterface +class QFutureWatcherBasePrivate : public QObjectPrivate, + public QFutureCallOutInterface { Q_DECLARE_PUBLIC(QFutureWatcherBase) diff --git a/src/corelib/kernel/qabstractitemmodel_p.h b/src/corelib/kernel/qabstractitemmodel_p.h index df1a6ce..27f1b28 100644 --- a/src/corelib/kernel/qabstractitemmodel_p.h +++ b/src/corelib/kernel/qabstractitemmodel_p.h @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE -class Q_CORE_EXPORT QPersistentModelIndexData +class QPersistentModelIndexData { public: QPersistentModelIndexData() : model(0) {} diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h index 41329cf..8c08bd2 100644 --- a/src/corelib/kernel/qeventdispatcher_unix_p.h +++ b/src/corelib/kernel/qeventdispatcher_unix_p.h @@ -153,14 +153,14 @@ public: int activateTimers(); }; -struct Q_CORE_EXPORT QSockNot +struct QSockNot { QSocketNotifier *obj; int fd; fd_set *queue; }; -class Q_CORE_EXPORT QSockNotType +class QSockNotType { public: QSockNotType(); 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 childStates() const; QList 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 -- cgit v0.12