From c1e36e212090cd02bc238f70dfeb70d7c651e348 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Tue, 11 Sep 2018 12:59:59 +0200 Subject: Remove confusing elses after returns Change-Id: I0ba39df637f6e5ce93ba57f40f279c81532e9289 Reviewed-by: Paul Olav Tvete --- src/compositor/extensions/qwaylandxdgshell.cpp | 6 ++---- src/compositor/extensions/qwaylandxdgshellv6.cpp | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/compositor/extensions/qwaylandxdgshell.cpp b/src/compositor/extensions/qwaylandxdgshell.cpp index 4a0db2a5..bd332287 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 a8b0d391..8338fe6e 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(); -- cgit v1.2.1