summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel
diff options
context:
space:
mode:
authorGirish Ramakrishnan <girish.1.ramakrishnan@nokia.com>2012-04-11 22:42:41 -0700
committerQt by Nokia <qt-info@nokia.com>2012-04-12 15:39:05 +0200
commit40a1e8eccf42dad9ff70ad54658abcfc9bf896ae (patch)
tree18507e4c70b13489552787f56646d2be16d789ce /src/widgets/kernel
parenta5dccb0ece9f10d1de4dd6083f780cb594552b67 (diff)
Remove hasDirtyFromPreviousSync from backingstore.
It's always false (used to be some qws specific variable). Change-Id: I3dc185dba4c778797f180410ce8d293336ecfd9c Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/widgets/kernel')
-rw-r--r--src/widgets/kernel/qwidgetbackingstore.cpp6
-rw-r--r--src/widgets/kernel/qwidgetbackingstore_p.h5
2 files changed, 2 insertions, 9 deletions
diff --git a/src/widgets/kernel/qwidgetbackingstore.cpp b/src/widgets/kernel/qwidgetbackingstore.cpp
index ef4483195e..f9361cc357 100644
--- a/src/widgets/kernel/qwidgetbackingstore.cpp
+++ b/src/widgets/kernel/qwidgetbackingstore.cpp
@@ -696,8 +696,7 @@ void QWidgetBackingStore::updateLists(QWidget *cur)
}
QWidgetBackingStore::QWidgetBackingStore(QWidget *topLevel)
- : tlw(topLevel), dirtyOnScreenWidgets(0), hasDirtyFromPreviousSync(false)
- , fullUpdatePending(0)
+ : tlw(topLevel), dirtyOnScreenWidgets(0), fullUpdatePending(0)
{
store = tlw->backingStore();
Q_ASSERT(store);
@@ -982,9 +981,6 @@ void QWidgetBackingStore::sync()
if (updatesDisabled)
return;
- if (hasDirtyFromPreviousSync)
- dirty += dirtyFromPreviousSync;
-
// Contains everything that needs repaint.
QRegion toClean(dirty);
diff --git a/src/widgets/kernel/qwidgetbackingstore_p.h b/src/widgets/kernel/qwidgetbackingstore_p.h
index 56c2547d3e..7c350932ea 100644
--- a/src/widgets/kernel/qwidgetbackingstore_p.h
+++ b/src/widgets/kernel/qwidgetbackingstore_p.h
@@ -85,9 +85,7 @@ public:
inline bool isDirty() const
{
- return !(dirtyWidgets.isEmpty() && dirty.isEmpty() && !hasDirtyFromPreviousSync
- && !fullUpdatePending
- );
+ return !(dirtyWidgets.isEmpty() && dirty.isEmpty() && !fullUpdatePending);
}
// ### Qt 4.6: Merge into a template function (after MSVC isn't supported anymore).
@@ -105,7 +103,6 @@ private:
QVector<QWidget *> *dirtyOnScreenWidgets;
QList<QWidget *> staticWidgets;
QBackingStore *store;
- uint hasDirtyFromPreviousSync : 1;
uint fullUpdatePending : 1;
QPoint tlwOffset;