1 files changed, 12 insertions, 11 deletions
diff --git a/src/platformsupport/fbconvenience/qfbscreen_p.h b/src/platformsupport/fbconvenience/qfbscreen_p.h
index 55aacab9bc..17b2cab43d 100644
--- a/src/platformsupport/fbconvenience/qfbscreen_p.h
+++ b/src/platformsupport/fbconvenience/qfbscreen_p.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -80,7 +80,7 @@ public:
     virtual void lower(QFbWindow *window);
     virtual void topWindowChanged(QWindow *) {}
 
-    void addBackingStore(QFbBackingStore *bs) {mBackingStores << bs;}
+    void addPendingBackingStore(QFbBackingStore *bs) { mPendingBackingStores << bs; }
 
     void scheduleUpdate();
 
@@ -89,13 +89,14 @@ public slots:
     void setPhysicalSize(const QSize &size);
     void setGeometry(const QRect &rect);
 
-protected slots:
+protected:
     virtual QRegion doRedraw();
 
-protected:
     void initializeCompositor();
     bool event(QEvent *event);
 
+    QFbWindow *windowForId(WId wid) const;
+
     QList<QFbWindow *> mWindowStack;
     QRegion mRepaintRegion;
     bool mUpdatePending;
@@ -113,7 +114,7 @@ private:
 
     QPainter *mCompositePainter;
     QVector<QPair<QRect, int> > mCachedRects;
-    QList <QFbBackingStore*> mBackingStores;
+    QList<QFbBackingStore*> mPendingBackingStores;
 
     friend class QFbWindow;
     bool mIsUpToDate;