Fix Compile errors and warnings

Change-Id: I2caba2c9de7823214f20529437453c3df02b7b37

6 files changed, 10 insertions, 10 deletions

diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h
index a58562dc6..d8cf009e3 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.h
+++ b/src/compositor/compositor_api/qwaylandcompositor.h
@@ -77,7 +77,7 @@ class Q_COMPOSITOR_EXPORT QWaylandCompositor : public QObject, public QWaylandEx
     Q_PROPERTY(QWaylandCompositor::ExtensionFlags extensionFlags READ extensionFlags WRITE setExtensionFlags)
     Q_PROPERTY(bool retainedSelection READ retainedSelectionEnabled WRITE setRetainedSelectionEnabled)
     Q_PROPERTY(QWaylandOutputSpace *primaryOutputSpace READ primaryOutputSpace WRITE setPrimaryOutputSpace NOTIFY primaryOutputSpaceChanged)
-    Q_PROPERTY(QWaylandOutput *primaryOutput READ primaryOutput NOTIFY primaryOutputChanged);
+    Q_PROPERTY(QWaylandOutput *primaryOutput READ primaryOutput NOTIFY primaryOutputChanged)
 
 public:
     enum ExtensionFlag {
diff --git a/src/compositor/compositor_api/qwaylandpointer.h b/src/compositor/compositor_api/qwaylandpointer.h
index 2d06f6434..c43ab773f 100644
--- a/src/compositor/compositor_api/qwaylandpointer.h
+++ b/src/compositor/compositor_api/qwaylandpointer.h
@@ -69,9 +69,9 @@ public:
     QWaylandDefaultPointerGrabber()
         : QWaylandPointerGrabber()
     {}
-    QWaylandDefaultPointerGrabber(QWaylandPointer *pointer)
+    QWaylandDefaultPointerGrabber(QWaylandPointer *_pointer)
         : QWaylandPointerGrabber()
-    { this->pointer = pointer; }
+    { this->pointer = _pointer; }
 
     void focus() Q_DECL_OVERRIDE;
     void motion(uint32_t time) Q_DECL_OVERRIDE;
diff --git a/src/compositor/compositor_api/qwaylandquickview.h b/src/compositor/compositor_api/qwaylandquickview.h
index 936a34c02..20a4256a5 100644
--- a/src/compositor/compositor_api/qwaylandquickview.h
+++ b/src/compositor/compositor_api/qwaylandquickview.h
@@ -61,7 +61,7 @@ class Q_COMPOSITOR_EXPORT QWaylandQuickItem : public QQuickItem, public QWayland
     Q_PROPERTY(QWaylandQuickSurface* surface READ surface WRITE setSurface NOTIFY surfaceChanged)
     Q_PROPERTY(bool paintEnabled READ paintEnabled WRITE setPaintEnabled)
     Q_PROPERTY(bool touchEventsEnabled READ touchEventsEnabled WRITE setTouchEventsEnabled NOTIFY touchEventsEnabledChanged)
-    Q_PROPERTY(QWaylandSurface::Origin origin READ origin NOTIFY originChanged);
+    Q_PROPERTY(QWaylandSurface::Origin origin READ origin NOTIFY originChanged)
     Q_PROPERTY(bool resizeSurfaceToItem READ resizeSurfaceToItem WRITE setResizeSurfaceToItem NOTIFY resizeSurfaceToItemChanged)
     Q_PROPERTY(bool followRequestedPosition READ followRequestedPosition WRITE setFollowRequestedPosition NOTIFY followRequestedPositionChanged)
     Q_PROPERTY(qreal requestedXPosition READ requestedXPosition WRITE setRequestedXPosition NOTIFY requestedXPositionChanged)
diff --git a/src/compositor/compositor_api/qwaylandsurface.h b/src/compositor/compositor_api/qwaylandsurface.h
index c4d0857fc..df7a9f385 100644
--- a/src/compositor/compositor_api/qwaylandsurface.h
+++ b/src/compositor/compositor_api/qwaylandsurface.h
@@ -108,7 +108,7 @@ class Q_COMPOSITOR_EXPORT QWaylandSurface : public QObject, public QWaylandExten
     Q_PROPERTY(QString className READ className NOTIFY classNameChanged)
     Q_PROPERTY(QString title READ title NOTIFY titleChanged)
     Q_PROPERTY(QWaylandOutput *primaryOutput READ primaryOutput WRITE setPrimaryOutput NOTIFY primaryOutputChanged)
-    Q_PROPERTY(QWaylandSurface::Origin origin READ origin NOTIFY originChanged);
+    Q_PROPERTY(QWaylandSurface::Origin origin READ origin NOTIFY originChanged)
 
 public:
     enum Origin {
diff --git a/src/compositor/global/qwaylandextension.h b/src/compositor/global/qwaylandextension.h
index 851483268..a25667331 100644
--- a/src/compositor/global/qwaylandextension.h
+++ b/src/compositor/global/qwaylandextension.h
@@ -84,8 +84,8 @@ class Q_COMPOSITOR_EXPORT QWaylandExtensionTemplate : public QWaylandExtension
 {
     Q_DECLARE_PRIVATE(QWaylandExtensionTemplate)
 public:
-    QWaylandExtensionTemplate(QWaylandExtensionContainer *container, QObject *parent = 0)
-        : QWaylandExtension(container, parent)
+    QWaylandExtensionTemplate(QWaylandExtensionContainer *container, QObject *_parent = 0)
+        : QWaylandExtension(container, _parent)
     { }
 
     const struct wl_interface *extensionInterface() const Q_DECL_OVERRIDE
@@ -100,8 +100,8 @@ public:
     }
 
 protected:
-    QWaylandExtensionTemplate(QWaylandExtensionTemplatePrivate &dd, QObject *parent = 0)
-        : QWaylandExtension(dd, parent)
+    QWaylandExtensionTemplate(QWaylandExtensionTemplatePrivate &dd, QObject *_parent = 0)
+        : QWaylandExtension(dd, _parent)
     { }
 };
 
diff --git a/src/imports/compositor/qwaylandquickcompositorplugin.cpp b/src/imports/compositor/qwaylandquickcompositorplugin.cpp
index 488ca43d8..1b78ce8ae 100644
--- a/src/imports/compositor/qwaylandquickcompositorplugin.cpp
+++ b/src/imports/compositor/qwaylandquickcompositorplugin.cpp
@@ -40,7 +40,7 @@
 #include <QtQuick/QQuickItem>
 
 #include <QtCompositor/QWaylandQuickCompositor>
-#include <QtCompositor/QWaylandQuickView>
+#include <QtCompositor/QWaylandQuickItem>
 #include <QtCompositor/QWaylandQuickSurface>
 #include <QtCompositor/QWaylandClient>
 #include <QtCompositor/QWaylandOutput>