summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/directfb
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2011-09-11 14:54:20 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-21 16:54:45 +0200
commitd8fc8aa585ed791ea90a52b953dbd7335248e845 (patch)
tree51ce6e2e7ae35f84c02a8bfec6ca8b7b6d3abc1c /src/plugins/platforms/directfb
parentab50b60f5cc237d5620f3ff3b2eb44c857f8f60b (diff)
[directfb] Rename class from WindowSurface to BackingStore
Catch up with the naming by renaming the file from windowsurface to backingstore, update the class names and include files. Change-Id: I1b16826b60c19490946a77f61518e18f8099adce Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'src/plugins/platforms/directfb')
-rw-r--r--src/plugins/platforms/directfb/directfb.pro4
-rw-r--r--src/plugins/platforms/directfb/qdirectfbbackingstore.cpp (renamed from src/plugins/platforms/directfb/qdirectfbwindowsurface.cpp)18
-rw-r--r--src/plugins/platforms/directfb/qdirectfbbackingstore.h (renamed from src/plugins/platforms/directfb/qdirectfbwindowsurface.h)6
-rw-r--r--src/plugins/platforms/directfb/qdirectfbintegration.cpp4
-rw-r--r--src/plugins/platforms/directfb/qdirectfbwindow.cpp2
5 files changed, 17 insertions, 17 deletions
diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro
index 2ec4efabc8..af95bd372c 100644
--- a/src/plugins/platforms/directfb/directfb.pro
+++ b/src/plugins/platforms/directfb/directfb.pro
@@ -16,14 +16,14 @@ LIBS += $$DIRECTFB_LIBS
SOURCES = main.cpp \
qdirectfbintegration.cpp \
- qdirectfbwindowsurface.cpp \
+ qdirectfbbackingstore.cpp \
qdirectfbblitter.cpp \
qdirectfbconvenience.cpp \
qdirectfbinput.cpp \
qdirectfbcursor.cpp \
qdirectfbwindow.cpp
HEADERS = qdirectfbintegration.h \
- qdirectfbwindowsurface.h \
+ qdirectfbbackingstore.h \
qdirectfbblitter.h \
qdirectfbconvenience.h \
qdirectfbinput.h \
diff --git a/src/plugins/platforms/directfb/qdirectfbwindowsurface.cpp b/src/plugins/platforms/directfb/qdirectfbbackingstore.cpp
index ab355c48f4..736c9bc8c9 100644
--- a/src/plugins/platforms/directfb/qdirectfbwindowsurface.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbbackingstore.cpp
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#include "qdirectfbwindowsurface.h"
+#include "qdirectfbbackingstore.h"
#include "qdirectfbintegration.h"
#include "qdirectfbblitter.h"
#include "qdirectfbconvenience.h"
@@ -49,7 +49,7 @@
QT_BEGIN_NAMESPACE
-QDirectFbWindowSurface::QDirectFbWindowSurface(QWindow *window)
+QDirectFbBackingStore::QDirectFbBackingStore(QWindow *window)
: QPlatformBackingStore(window), m_pixmap(0), m_pmdata(0), m_dfbSurface(0)
{
@@ -68,17 +68,17 @@ QDirectFbWindowSurface::QDirectFbWindowSurface(QWindow *window)
m_pixmap = new QPixmap(m_pmdata);
}
-QDirectFbWindowSurface::~QDirectFbWindowSurface()
+QDirectFbBackingStore::~QDirectFbBackingStore()
{
delete m_pixmap;
}
-QPaintDevice *QDirectFbWindowSurface::paintDevice()
+QPaintDevice *QDirectFbBackingStore::paintDevice()
{
return m_pixmap;
}
-void QDirectFbWindowSurface::flush(QWindow *, const QRegion &region, const QPoint &offset)
+void QDirectFbBackingStore::flush(QWindow *, const QRegion &region, const QPoint &offset)
{
m_pmdata->blittable()->unlock();
@@ -90,7 +90,7 @@ void QDirectFbWindowSurface::flush(QWindow *, const QRegion &region, const QPoin
}
}
-void QDirectFbWindowSurface::resize(const QSize &size, const QRegion& reg)
+void QDirectFbBackingStore::resize(const QSize &size, const QRegion& reg)
{
QPlatformBackingStore::resize(size, reg);
@@ -108,7 +108,7 @@ static inline void scrollSurface(IDirectFBSurface *surface, const QRect &r, int
surface->Flip(surface, &region, DFBSurfaceFlipFlags(DSFLIP_BLIT));
}
-bool QDirectFbWindowSurface::scroll(const QRegion &area, int dx, int dy)
+bool QDirectFbBackingStore::scroll(const QRegion &area, int dx, int dy)
{
m_pmdata->blittable()->unlock();
@@ -127,12 +127,12 @@ bool QDirectFbWindowSurface::scroll(const QRegion &area, int dx, int dy)
return true;
}
-void QDirectFbWindowSurface::beginPaint(const QRegion &region)
+void QDirectFbBackingStore::beginPaint(const QRegion &region)
{
Q_UNUSED(region);
}
-void QDirectFbWindowSurface::endPaint(const QRegion &region)
+void QDirectFbBackingStore::endPaint(const QRegion &region)
{
Q_UNUSED(region);
}
diff --git a/src/plugins/platforms/directfb/qdirectfbwindowsurface.h b/src/plugins/platforms/directfb/qdirectfbbackingstore.h
index 2b6cb58aef..aed78b6f93 100644
--- a/src/plugins/platforms/directfb/qdirectfbwindowsurface.h
+++ b/src/plugins/platforms/directfb/qdirectfbbackingstore.h
@@ -49,11 +49,11 @@
QT_BEGIN_NAMESPACE
-class QDirectFbWindowSurface : public QPlatformBackingStore
+class QDirectFbBackingStore : public QPlatformBackingStore
{
public:
- QDirectFbWindowSurface(QWindow *window);
- ~QDirectFbWindowSurface();
+ QDirectFbBackingStore(QWindow *window);
+ ~QDirectFbBackingStore();
QPaintDevice *paintDevice();
void flush(QWindow *window, const QRegion &region, const QPoint &offset);
diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.cpp b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
index 803d2f5dac..ab0db78a40 100644
--- a/src/plugins/platforms/directfb/qdirectfbintegration.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include "qdirectfbintegration.h"
-#include "qdirectfbwindowsurface.h"
+#include "qdirectfbbackingstore.h"
#include "qdirectfbblitter.h"
#include "qdirectfbconvenience.h"
#include "qdirectfbcursor.h"
@@ -143,7 +143,7 @@ QAbstractEventDispatcher *QDirectFbIntegration::guiThreadEventDispatcher() const
QPlatformBackingStore *QDirectFbIntegration::createPlatformBackingStore(QWindow *window) const
{
- return new QDirectFbWindowSurface(window);
+ return new QDirectFbBackingStore(window);
}
QPlatformFontDatabase *QDirectFbIntegration::fontDatabase() const
diff --git a/src/plugins/platforms/directfb/qdirectfbwindow.cpp b/src/plugins/platforms/directfb/qdirectfbwindow.cpp
index e75291b5c1..c81c6d74da 100644
--- a/src/plugins/platforms/directfb/qdirectfbwindow.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbwindow.cpp
@@ -42,7 +42,7 @@
#include "qdirectfbwindow.h"
#include "qdirectfbinput.h"
-#include "qdirectfbwindowsurface.h"
+#include "qdirectfbbackingstore.h"
#include <directfb.h>