From d0a11322f4499e57dc1a6b2ec15755d3b48c0622 Mon Sep 17 00:00:00 2001
From: Andre Hartmann <aha_1980@gmx.de>
Date: Sun, 16 Feb 2020 08:37:37 +0100
Subject: [PATCH] Baremetal: Fix three compiler warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With gcc version 7.4.0 (Ubuntu 7.4.0-1ubuntu1~18.04.1)

plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp:173:13:
warning: ‘BareMetal::Internal::Uv::PackageItem::m_file’ will be initialized after [-Wreorder]
     QString m_file;
             ^~~~~~
plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp:172:13:
warning: ‘QString BareMetal::Internal::Uv::PackageItem::m_version’ [-Wreorder]
     QString m_version;
             ^~~~~~~~~
plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp:155:14:
warning: when initialized here [-Wreorder]
     explicit PackageItem(const QString &file)
              ^~~~~~~~~~~

plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp:500:19:
warning: suggest parentheses around assignment used as truth value [-Wparentheses]
     } while (item = item->parentPackItem());
              ~~~~~^~~~~~~~~~~~~~~~~~~~~~~~

plugins/debugger/uvsc/uvscclient.cpp:376:14: warning: variable
‘istkenum’ set but not used [-Wunused-but-set-variable]
     iSTKENUM istkenum = {};
              ^~~~~~~~

Change-Id: I95d0868e1b3ba9162bd9a308a7d39db9daf59742
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 .../baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp      | 4 ++--
 src/plugins/debugger/uvsc/uvscclient.cpp                     | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp
index 07a8554515a..c6807b61095 100644
--- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp
+++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp
@@ -169,8 +169,8 @@ public:
         return {};
     }
 
-    QString m_version;
     QString m_file;
+    QString m_version;
     QString m_desc;
     QString m_vendor;
     QString m_url;
@@ -497,7 +497,7 @@ DeviceSelection DeviceSelectionView::buildSelection(const DeviceSelectionItem *i
         default:
             break;
         }
-    } while (item = item->parentPackItem());
+    } while ((item = item->parentPackItem()));
     return selection;
 }
 
diff --git a/src/plugins/debugger/uvsc/uvscclient.cpp b/src/plugins/debugger/uvsc/uvscclient.cpp
index f0495ad4edc..b7bb035c524 100644
--- a/src/plugins/debugger/uvsc/uvscclient.cpp
+++ b/src/plugins/debugger/uvsc/uvscclient.cpp
@@ -373,11 +373,6 @@ bool UvscClient::fetchStackFrames(quint32 taskId, quint64 address, GdbMi &data)
     if (!checkConnection())
         return false;
 
-    iSTKENUM istkenum = {};
-    istkenum.task = taskId;
-    istkenum.isFull = true;
-    istkenum.hasExtended = true;
-
     std::vector<STACKENUM> stackenums;
     const bool success = enumerateStack(taskId, stackenums);
     if (!success) {