From b138645cc618a248cd38b3319315d905c31025a8 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
Date: Fri, 3 Jul 2015 16:15:37 +0200
Subject: [PATCH] QMainWindowLayout::hover does not need to return a value

The return value of the function is never used

Change-Id: I75e51bce36eedd42f5527ddb86efd434fe11551d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
---
 src/widgets/widgets/qmainwindowlayout.cpp | 14 ++++++--------
 src/widgets/widgets/qmainwindowlayout_p.h |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp
index ee76720a276..d208cddc88b 100644
--- a/src/widgets/widgets/qmainwindowlayout.cpp
+++ b/src/widgets/widgets/qmainwindowlayout.cpp
@@ -2283,11 +2283,11 @@ void QMainWindowLayout::updateGapIndicator()
 #endif
 }
 
-QList<int> QMainWindowLayout::hover(QLayoutItem *widgetItem, const QPoint &mousePos)
+void QMainWindowLayout::hover(QLayoutItem *widgetItem, const QPoint &mousePos)
 {
     if (!parentWidget()->isVisible() || parentWidget()->isMinimized()
         || pluggingWidget != 0 || widgetItem == 0)
-        return QList<int>();
+        return;
 
     QWidget *widget = widgetItem->widget();
     QPoint pos = parentWidget()->mapFromGlobal(mousePos);
@@ -2317,13 +2317,13 @@ QList<int> QMainWindowLayout::hover(QLayoutItem *widgetItem, const QPoint &mouse
     }
 
     if (path == currentGapPos)
-        return currentGapPos; // the gap is already there
+        return; // the gap is already there
 
     currentGapPos = path;
     if (path.isEmpty()) {
         fixToolBarOrientation(widgetItem, 2); // 2 = top dock, ie. horizontal
         restore(true);
-        return QList<int>();
+        return;
     }
 
     fixToolBarOrientation(widgetItem, currentGapPos.at(1));
@@ -2332,7 +2332,7 @@ QList<int> QMainWindowLayout::hover(QLayoutItem *widgetItem, const QPoint &mouse
 
     if (!newState.insertGap(path, widgetItem)) {
         restore(true); // not enough space
-        return QList<int>();
+        return;
     }
 
     QSize min = newState.minimumSize();
@@ -2340,7 +2340,7 @@ QList<int> QMainWindowLayout::hover(QLayoutItem *widgetItem, const QPoint &mouse
 
     if (min.width() > size.width() || min.height() > size.height()) {
         restore(true);
-        return QList<int>();
+        return;
     }
 
     newState.fitLayout();
@@ -2354,8 +2354,6 @@ QList<int> QMainWindowLayout::hover(QLayoutItem *widgetItem, const QPoint &mouse
     applyState(layoutState);
 
     updateGapIndicator();
-
-    return path;
 }
 
 QDockWidgetGroupWindow *QMainWindowLayout::createTabbedDockWindow()
diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h
index 9155c5fb23b..0c76a0ce90e 100644
--- a/src/widgets/widgets/qmainwindowlayout_p.h
+++ b/src/widgets/widgets/qmainwindowlayout_p.h
@@ -291,7 +291,7 @@ public:
     QRubberBand *gapIndicator;
 #endif
 
-    QList<int> hover(QLayoutItem *widgetItem, const QPoint &mousePos);
+    void hover(QLayoutItem *widgetItem, const QPoint &mousePos);
     bool plug(QLayoutItem *widgetItem);
     QLayoutItem *unplug(QWidget *widget, bool group = false);
     void revert(QLayoutItem *widgetItem);