summaryrefslogtreecommitdiffstats
path: root/src/client/qwaylandwindow.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/qwaylandwindow.cpp')
-rw-r--r--src/client/qwaylandwindow.cpp15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index 9ad90293..eebc9bda 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -81,7 +81,6 @@ QWaylandWindow::QWaylandWindow(QWindow *window)
, mMouseEventsInContentArea(false)
, mMousePressedInContentArea(Qt::NoButton)
, m_cursorShape(Qt::ArrowCursor)
- , mBuffer(0)
, mWaitingForFrameSync(false)
, mFrameCallback(0)
, mRequestResizeSent(false)
@@ -432,9 +431,8 @@ void QWaylandWindow::requestResize()
void QWaylandWindow::attach(QWaylandBuffer *buffer, int x, int y)
{
- mBuffer = buffer;
- if (mBuffer)
- attach(mBuffer->buffer(), x, y);
+ if (buffer)
+ attach(buffer->buffer(), x, y);
else
QtWayland::wl_surface::attach(0, 0, 0);
}
@@ -445,11 +443,6 @@ void QWaylandWindow::attachOffset(QWaylandBuffer *buffer)
mOffset = QPoint();
}
-QWaylandBuffer *QWaylandWindow::attached() const
-{
- return mBuffer;
-}
-
void QWaylandWindow::damage(const QRect &rect)
{
//We have to do sync stuff before calling damage, or we might
@@ -459,9 +452,7 @@ void QWaylandWindow::damage(const QRect &rect)
wl_callback_add_listener(mFrameCallback,&QWaylandWindow::callbackListener,this);
mWaitingForFrameSync = true;
}
- if (mBuffer) {
- damage(rect.x(), rect.y(), rect.width(), rect.height());
- }
+ damage(rect.x(), rect.y(), rect.width(), rect.height());
}
const wl_callback_listener QWaylandWindow::callbackListener = {