From ed6e0afd17ba9942ad0f769addf42ce94d21006d Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Sun, 21 Jul 2019 17:22:50 +0300
Subject: [PATCH] Cppcheck warnings.

--HG--
branch : develop
---
 src/libs/vlayout/vbank.cpp | 32 ++++++++++++++------------------
 src/libs/vlayout/vbank.h   |  1 -
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/libs/vlayout/vbank.cpp b/src/libs/vlayout/vbank.cpp
index 326ca6853..df9ef89f0 100644
--- a/src/libs/vlayout/vbank.cpp
+++ b/src/libs/vlayout/vbank.cpp
@@ -147,6 +147,18 @@ bool NotArrangedDetail(QMap<uint, QMultiMap<qint64, int>> &container, QMap<uint,
     }
     return false;
 }
+
+//---------------------------------------------------------------------------------------------------------------------
+int TakeFirstForPriority(const QMap<uint, QHash<int, qint64>> &container, uint priority)
+{
+    const QHash<int, qint64> priorityGroup = container.value(priority);
+    if (not priorityGroup.isEmpty())
+    {
+        return priorityGroup.constBegin().key();
+    }
+
+    return -1;
+}
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -541,9 +553,7 @@ void VBank::PrepareDescGroup(uint priority)
 //---------------------------------------------------------------------------------------------------------------------
 int VBank::GetNextThreeGroups(uint priority) const
 {
-    int next = -1;
-
-    next = TakeFirstForPriority(big, priority);
+    int next = TakeFirstForPriority(big, priority);
     if (next != -1)
     {
         return next;
@@ -562,9 +572,7 @@ int VBank::GetNextThreeGroups(uint priority) const
 //---------------------------------------------------------------------------------------------------------------------
 int VBank::GetNextTwoGroups(uint priority) const
 {
-    int next = -1;
-
-    next = TakeFirstForPriority(big, priority);
+    int next = TakeFirstForPriority(big, priority);
     if (next != -1)
     {
         return next;
@@ -611,18 +619,6 @@ void VBank::SqMaxMin(qint64 &sMax, qint64 &sMin, uint priority) const
     }
 }
 
-//---------------------------------------------------------------------------------------------------------------------
-int VBank::TakeFirstForPriority(const QMap<uint, QHash<int, qint64>> &container, uint priority) const
-{
-    const QHash<int, qint64> priorityGroup = container.value(priority);
-    if (not priorityGroup.isEmpty())
-    {
-        return priorityGroup.constBegin().key();
-    }
-
-    return -1;
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 bool VBank::ArrangedDetail(QMap<uint, QHash<int, qint64>> &container, int i)
 {
diff --git a/src/libs/vlayout/vbank.h b/src/libs/vlayout/vbank.h
index 9a807074c..cef34eb67 100644
--- a/src/libs/vlayout/vbank.h
+++ b/src/libs/vlayout/vbank.h
@@ -115,7 +115,6 @@ private:
     int GetNextDescGroup(uint priority) const;
 
     void SqMaxMin(qint64 &sMax, qint64 &sMin, uint priority) const;
-    int  TakeFirstForPriority(const QMap<uint, QHash<int, qint64>> &container, uint priority) const;
 
     bool ArrangedDetail(QMap<uint, QHash<int, qint64>> &container, int i);
     bool ArrangedDetail(QMap<uint, QMultiMap<qint64, int>> &container, int i);