From edd424d1ed41434f979abe42428ed74c664d59a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Mon, 5 Mar 2012 08:09:17 +0100
Subject: [PATCH] Fixed warnings in qwidget-compositor.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I22f12e2d78f2951e1c1c5a3b2c05794f0c26abb6
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
---
 examples/qwidget-compositor/main.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/qwidget-compositor/main.cpp b/examples/qwidget-compositor/main.cpp
index 970074cf..adac4cfa 100644
--- a/examples/qwidget-compositor/main.cpp
+++ b/examples/qwidget-compositor/main.cpp
@@ -70,13 +70,13 @@ class QWidgetCompositor : public QWidget, public WaylandCompositor
 public:
     QWidgetCompositor()
         : WaylandCompositor(windowHandle())
-        , m_moveSurface(0)
-        , m_dragSourceSurface(0)
 #ifdef QT_COMPOSITOR_WAYLAND_GL
         , m_surfaceCompositorFbo(0)
         , m_textureBlitter(0)
         , m_textureCache(0)
 #endif
+        , m_moveSurface(0)
+        , m_dragSourceSurface(0)
     {
         enableSubSurfaceExtension();
         setMouseTracking(true);
@@ -307,7 +307,7 @@ protected:
             return;
         }
         QPointF local;
-        if (WaylandSurface *surface = surfaceAt(e->pos(), &local))
+        if (surfaceAt(e->pos(), &local))
             defaultInputDevice()->sendMouseMoveEvent(local.toPoint(),pos());
     }
 
@@ -326,7 +326,7 @@ protected:
             return;
         }
         QPointF local;
-        if (WaylandSurface *surface = surfaceAt(e->pos(), &local))
+        if (surfaceAt(e->pos(), &local))
             defaultInputDevice()->sendMouseReleaseEvent(e->button(), local.toPoint(), e->pos());
     }
 
-- 
GitLab