From 636aebb82372b15440ceba73546067743c7be681 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Mon, 19 Dec 2011 19:08:07 +0100 Subject: Replace a pseudo-virtual slot with a virtual method. Change-Id: I5d0e1e54e0d3d441b71b7594bc14e872512cc937 Reviewed-by: Jonas Gastal Reviewed-by: Thiago Macieira --- src/widgets/widgets/qabstractscrollarea.cpp | 2 +- src/widgets/widgets/qabstractscrollarea.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/widgets') 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); -- cgit v1.2.3