diff options
author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2011-11-28 15:40:35 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-01 14:35:42 +0100 |
commit | e650859dc9c26b3d411c534286f477d786723a74 (patch) | |
tree | d06bb9f7b6623b45834ab1abb7281f84bf7745a8 /src/widgets | |
parent | 389538c2e76698944834526a2f36284cce109afe (diff) |
Improve Q_CONSTRUCTOR_FUNCTION and Q_DESTRUCTOR_FUNCTION macros.
By adding anonymous namespace and static linkage we are reducing
visibility of implementation of these macros.
This patch also fixes warning about a declared but unused variable which
was issued by gcc 4.6 for Q_CONSTRUCTOR_FUNCTION.
Change-Id: I2cb70ad4c93f6f77e5518420abcce6fd4cadccfa
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/animation/qguivariantanimation.cpp | 7 | ||||
-rw-r--r-- | src/widgets/kernel/qapplication.cpp | 4 | ||||
-rw-r--r-- | src/widgets/kernel/qwidgetsvariant.cpp | 6 | ||||
-rw-r--r-- | src/widgets/statemachine/qguistatemachine.cpp | 6 |
4 files changed, 8 insertions, 15 deletions
diff --git a/src/widgets/animation/qguivariantanimation.cpp b/src/widgets/animation/qguivariantanimation.cpp index b0b18ed21b..f99b74e2ab 100644 --- a/src/widgets/animation/qguivariantanimation.cpp +++ b/src/widgets/animation/qguivariantanimation.cpp @@ -64,18 +64,17 @@ template<> Q_INLINE_TEMPLATE QQuaternion _q_interpolate(const QQuaternion &f,con return QQuaternion::slerp(f, t, progress); } -static int qRegisterGuiGetInterpolator() +static void qRegisterGuiGetInterpolator() { qRegisterAnimationInterpolator<QColor>(_q_interpolateVariant<QColor>); qRegisterAnimationInterpolator<QVector2D>(_q_interpolateVariant<QVector2D>); qRegisterAnimationInterpolator<QVector3D>(_q_interpolateVariant<QVector3D>); qRegisterAnimationInterpolator<QVector4D>(_q_interpolateVariant<QVector4D>); qRegisterAnimationInterpolator<QQuaternion>(_q_interpolateVariant<QQuaternion>); - return 1; } Q_CONSTRUCTOR_FUNCTION(qRegisterGuiGetInterpolator) -static int qUnregisterGuiGetInterpolator() +static void qUnregisterGuiGetInterpolator() { // casts required by Sun CC 5.5 qRegisterAnimationInterpolator<QColor>( @@ -88,8 +87,6 @@ static int qUnregisterGuiGetInterpolator() (QVariant (*)(const QVector4D &, const QVector4D &, qreal))0); qRegisterAnimationInterpolator<QQuaternion>( (QVariant (*)(const QQuaternion &, const QQuaternion &, qreal))0); - - return 1; } Q_DESTRUCTOR_FUNCTION(qUnregisterGuiGetInterpolator) diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index beeb3dad17..472f19a3c1 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -859,8 +859,8 @@ QApplication::QApplication(Display *dpy, int &argc, char **argv, #endif // Q_WS_X11 #ifndef QT_NO_STATEMACHINE -extern int qRegisterGuiStateMachine(); -extern int qUnregisterGuiStateMachine(); +void qRegisterGuiStateMachine(); +void qUnregisterGuiStateMachine(); #endif /*! diff --git a/src/widgets/kernel/qwidgetsvariant.cpp b/src/widgets/kernel/qwidgetsvariant.cpp index 2e945d28e1..18fec508ea 100644 --- a/src/widgets/kernel/qwidgetsvariant.cpp +++ b/src/widgets/kernel/qwidgetsvariant.cpp @@ -151,19 +151,17 @@ static const QMetaTypeInterface qVariantWidgetsHelper[] = { extern Q_GUI_EXPORT const QVariant::Handler *qt_widgets_variant_handler; -int qRegisterWidgetsVariant() +void qRegisterWidgetsVariant() { qt_widgets_variant_handler = &widgets_handler; qMetaTypeWidgetsHelper = qVariantWidgetsHelper; - return 1; } Q_CONSTRUCTOR_FUNCTION(qRegisterWidgetsVariant) -int qUnregisterWidgetsVariant() +void qUnregisterWidgetsVariant() { qt_widgets_variant_handler = 0; qMetaTypeWidgetsHelper = 0; - return 1; } Q_DESTRUCTOR_FUNCTION(qUnregisterWidgetsVariant) diff --git a/src/widgets/statemachine/qguistatemachine.cpp b/src/widgets/statemachine/qguistatemachine.cpp index 7a498eb77f..f717662ace 100644 --- a/src/widgets/statemachine/qguistatemachine.cpp +++ b/src/widgets/statemachine/qguistatemachine.cpp @@ -474,18 +474,16 @@ const QStateMachinePrivate::Handler qt_gui_statemachine_handler = { }; static const QStateMachinePrivate::Handler *qt_guistatemachine_last_handler = 0; -int qRegisterGuiStateMachine() +void qRegisterGuiStateMachine() { qt_guistatemachine_last_handler = QStateMachinePrivate::handler; QStateMachinePrivate::handler = &qt_gui_statemachine_handler; - return 1; } Q_CONSTRUCTOR_FUNCTION(qRegisterGuiStateMachine) -int qUnregisterGuiStateMachine() +void qUnregisterGuiStateMachine() { QStateMachinePrivate::handler = qt_guistatemachine_last_handler; - return 1; } Q_DESTRUCTOR_FUNCTION(qUnregisterGuiStateMachine) |