diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2011-12-19 19:08:07 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-27 15:57:36 +0100 |
| commit | 636aebb82372b15440ceba73546067743c7be681 (patch) | |
| tree | 378c034ae7cd4396967af874646c763e011a7030 /src/widgets/widgets | |
| parent | d17b56f42b77da1fa46c5b0fbc10a9b6c2a1e145 (diff) | |
Replace a pseudo-virtual slot with a virtual method.
Change-Id: I5d0e1e54e0d3d441b71b7594bc14e872512cc937
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/widgets/widgets')
| -rw-r--r-- | src/widgets/widgets/qabstractscrollarea.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qabstractscrollarea.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp index 801160d080..901ea99c1b 100644 --- a/src/widgets/widgets/qabstractscrollarea.cpp +++ b/src/widgets/widgets/qabstractscrollarea.cpp @@ -572,7 +572,7 @@ void QAbstractScrollArea::setViewport(QWidget *widget) d->layoutChildren(); if (isVisible()) d->viewport->show(); - QMetaObject::invokeMethod(this, "setupViewport", Q_ARG(QWidget *, widget)); + setupViewport(widget); delete oldViewport; } } diff --git a/src/widgets/widgets/qabstractscrollarea.h b/src/widgets/widgets/qabstractscrollarea.h index 3f2a273297..2288888286 100644 --- a/src/widgets/widgets/qabstractscrollarea.h +++ b/src/widgets/widgets/qabstractscrollarea.h @@ -90,8 +90,7 @@ public: QSize sizeHint() const; -protected Q_SLOTS: - void setupViewport(QWidget *viewport); + virtual void setupViewport(QWidget *viewport); protected: QAbstractScrollArea(QAbstractScrollAreaPrivate &dd, QWidget *parent = 0); |