diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-05-11 13:18:06 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:10:31 +0200 |
| commit | 51879e4884d50c83729d4346647c436d8961881e (patch) | |
| tree | de48598487bb16d3dbf6048efd4c4abc4628f2a6 /src/compositor/global | |
| parent | 5d9e9033df46dcf84b0ea719b7240e437906606b (diff) | |
Fix Compile errors and warnings
Change-Id: I2caba2c9de7823214f20529437453c3df02b7b37
Diffstat (limited to 'src/compositor/global')
| -rw-r--r-- | src/compositor/global/qwaylandextension.h | 8 |
1 files changed, 4 insertions, 4 deletions
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) { } }; |