summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@theqtcompany.com>2016-03-01 12:16:39 +0100
committerJohan Helsing <johan.helsing@theqtcompany.com>2016-03-02 09:14:20 +0000
commitd839f25fb75cf4b3769319e10855c5827389e932 (patch)
tree5b116d419f6c6f03267468a4033429a5ca55ff5a /src
parent53112ac6d97a61125cc3e45f0b8a2f0439df23ca (diff)
Rename QWaylandShellSurface::DefaultEdge to NoneEdge
This matches the name and value defined in the wayland protocol (wayland.xml) Change-Id: I562d14b637c615550d3467d469e147488b4b4340 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> Reviewed-by: Erik Larsson <erik@ortogonal.com>
Diffstat (limited to 'src')
-rw-r--r--src/compositor/extensions/qwaylandshell.cpp2
-rw-r--r--src/compositor/extensions/qwaylandshell.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor/extensions/qwaylandshell.cpp b/src/compositor/extensions/qwaylandshell.cpp
index 9865432ed..633129b26 100644
--- a/src/compositor/extensions/qwaylandshell.cpp
+++ b/src/compositor/extensions/qwaylandshell.cpp
@@ -431,7 +431,7 @@ QSize QWaylandShellSurface::sizeForResize(const QSizeF &size, const QPointF &del
* This enum type provides a way to specify a specific edge or corner of
* the surface.
*
- * \value DefaultEdge The default edge.
+ * \value None No edge.
* \value TopEdge The top edge.
* \value BottomEdge The bottom edge.
* \value LeftEdge The left edge.
diff --git a/src/compositor/extensions/qwaylandshell.h b/src/compositor/extensions/qwaylandshell.h
index 6de141fef..3b0d1c255 100644
--- a/src/compositor/extensions/qwaylandshell.h
+++ b/src/compositor/extensions/qwaylandshell.h
@@ -88,7 +88,7 @@ public:
Q_ENUM(FullScreenMethod);
enum ResizeEdge {
- DefaultEdge = 0,
+ NoneEdge = 0,
TopEdge = 1,
BottomEdge = 2,
LeftEdge = 4,