From 6d4da51f0fdcecc2d4398f60dbca43f499fdbe16 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 8 May 2014 22:46:48 +0300
Subject: Fix code style in gui.

---
 src/gui/widgets/itemcontainer.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/gui/widgets/itemcontainer.cpp')

diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index f24be7737..4a944c276 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -145,12 +145,13 @@ namespace
                 if (!pair1 || !pair2)
                     return false;
 
-                const int t1 = pair1->mItem->getInfo().getType();
-                const int t2 = pair2->mItem->getInfo().getType();
+                const ItemInfo &info1 = pair1->mItem->getInfo();
+                const ItemInfo &info2 = pair2->mItem->getInfo();
+                const ItemType t1 = info1.getType();
+                const ItemType t2 = info2.getType();
                 if (t1 == t2)
                 {
-                    return (pair1->mItem->getInfo().getName()
-                            < pair2->mItem->getInfo().getName());
+                    return (info1.getName() < info2.getName());
                 }
                 return t1 < t2;
             }
@@ -645,7 +646,7 @@ void ItemContainer::updateMatrix()
         return;
 
     delete []mShowMatrix;
-    mShowMatrix = new int[mGridRows * mGridColumns];
+    mShowMatrix = new int[static_cast<size_t>(mGridRows * mGridColumns)];
 
     std::vector<ItemIdPair*> sortedItems;
     int i = 0;
-- 
cgit v1.2.3-60-g2f50