summaryrefslogtreecommitdiffstats
path: root/src/compositor
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2018-09-11 12:59:59 +0200
committerJohan Helsing <johan.helsing@qt.io>2018-09-14 14:00:37 +0000
commitc1e36e212090cd02bc238f70dfeb70d7c651e348 (patch)
treea135128d3633967162471bb97e39efb377ad2d94 /src/compositor
parent86625d60ff7aaa44ab082cfbc27a76b6bb69a39c (diff)
Remove confusing elses after returns
Change-Id: I0ba39df637f6e5ce93ba57f40f279c81532e9289 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/compositor')
-rw-r--r--src/compositor/extensions/qwaylandxdgshell.cpp6
-rw-r--r--src/compositor/extensions/qwaylandxdgshellv6.cpp6
2 files changed, 4 insertions, 8 deletions
diff --git a/src/compositor/extensions/qwaylandxdgshell.cpp b/src/compositor/extensions/qwaylandxdgshell.cpp
index 4a0db2a53..bd332287e 100644
--- a/src/compositor/extensions/qwaylandxdgshell.cpp
+++ b/src/compositor/extensions/qwaylandxdgshell.cpp
@@ -1458,8 +1458,7 @@ void QWaylandXdgToplevelPrivate::xdg_toplevel_set_max_size(QtWaylandServer::xdg_
return;
}
- else
- m_maxSize = maxSize;
+ m_maxSize = maxSize;
Q_Q(QWaylandXdgToplevel);
emit q->maxSizeChanged();
@@ -1489,8 +1488,7 @@ void QWaylandXdgToplevelPrivate::xdg_toplevel_set_min_size(QtWaylandServer::xdg_
return;
}
- else
- m_minSize = minSize;
+ m_minSize = minSize;
Q_Q(QWaylandXdgToplevel);
emit q->minSizeChanged();
diff --git a/src/compositor/extensions/qwaylandxdgshellv6.cpp b/src/compositor/extensions/qwaylandxdgshellv6.cpp
index a8b0d3914..8338fe6e2 100644
--- a/src/compositor/extensions/qwaylandxdgshellv6.cpp
+++ b/src/compositor/extensions/qwaylandxdgshellv6.cpp
@@ -1389,8 +1389,7 @@ void QWaylandXdgToplevelV6Private::zxdg_toplevel_v6_set_max_size(QtWaylandServer
return;
}
- else
- m_maxSize = maxSize;
+ m_maxSize = maxSize;
Q_Q(QWaylandXdgToplevelV6);
emit q->maxSizeChanged();
@@ -1420,8 +1419,7 @@ void QWaylandXdgToplevelV6Private::zxdg_toplevel_v6_set_min_size(QtWaylandServer
return;
}
- else
- m_minSize = minSize;
+ m_minSize = minSize;
Q_Q(QWaylandXdgToplevelV6);
emit q->minSizeChanged();