summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Freling <fabien.freling@nokia.com>2011-03-16 12:53:30 (GMT)
committerFabien Freling <fabien.freling@nokia.com>2011-03-16 12:53:30 (GMT)
commitd149125e0b539ff13f77cb2a67194ac3d6e331a0 (patch)
tree30863ef3940dc4c4a61ad9f20092aacbd84787bf
parentcc994cf5a10a4ab31e37ae8712b9cd1b37878e79 (diff)
downloadQt-d149125e0b539ff13f77cb2a67194ac3d6e331a0.zip
Qt-d149125e0b539ff13f77cb2a67194ac3d6e331a0.tar.gz
Qt-d149125e0b539ff13f77cb2a67194ac3d6e331a0.tar.bz2
Add an overloading function to flush().
In the case of the unified toolbar, we don't need as much arguments for flush(). So we overload flush() to only take one argument, the widget. Reviewed-by: Samuel Rødal
-rw-r--r--src/gui/painting/qunifiedtoolbarsurface_mac.cpp8
-rw-r--r--src/gui/painting/qunifiedtoolbarsurface_mac_p.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
index 63364f3..9913c9a 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac.cpp
@@ -156,6 +156,14 @@ void QUnifiedToolbarSurface::updateToolbarOffset(QWidget *widget)
mlayout->updateUnifiedToolbarOffset();
}
+void QUnifiedToolbarSurface::flush(QWidget *widget, const QRegion &region, const QPoint &offset)
+{
+ Q_UNUSED(region);
+ Q_UNUSED(offset);
+
+ this->flush(widget);
+}
+
void QUnifiedToolbarSurface::flush(QWidget *widget)
{
Q_D(QUnifiedToolbarSurface);
diff --git a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
index b0075b6..0a7ebf1 100644
--- a/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
+++ b/src/gui/painting/qunifiedtoolbarsurface_mac_p.h
@@ -80,6 +80,7 @@ public:
~QUnifiedToolbarSurface();
void flush(QWidget *widget);
+ void flush(QWidget *widget, const QRegion &region, const QPoint &offset);
void setGeometry(const QRect &rect);
void beginPaint(const QRegion &rgn);
void insertToolbar(QWidget *toolbar, const QPoint &offset);