From 159f4e4f3987a514158f45cc15bc7f8ff2d2b456 Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Fri, 6 Mar 2015 17:00:36 +0100
Subject: [PATCH] Debugger: Replace LocalsUpdateForNewFrame enum value by a
 bool

Change-Id: I4e7f6ec14a4c40a7d402e6a57f1b14fc37651747
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
---
 src/plugins/debugger/cdb/cdbengine.cpp | 19 ++++++++-----------
 src/plugins/debugger/cdb/cdbengine.h   |  4 ++--
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 4b3d33af833..9585b124a76 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -85,8 +85,6 @@ enum { debugSourceMapping = 0 };
 enum { debugWatches = 0 };
 enum { debugBreakpoints = 0 };
 
-enum { LocalsUpdateForNewFrame = 0x1 };
-
 #define CB(callback) [this](const CdbCommandPtr &r) { callback(r); }
 
 #if 0
@@ -1050,7 +1048,7 @@ void CdbEngine::updateLocalVariable(const QByteArray &iname)
     }
     str << blankSeparator << iname;
     postExtensionCommand(isWatch ? "watches" : "locals", localsArguments, 0,
-                         [this](const CdbCommandPtr &r) { handleLocals(r, 0); });
+                         [this](const CdbCommandPtr &r) { handleLocals(r, false); });
 }
 
 bool CdbEngine::hasCapability(unsigned cap) const
@@ -1303,7 +1301,7 @@ void CdbEngine::assignValueInDebugger(const WatchData *w, const QString &expr, c
     postCommand(cmd, 0);
     // Update all locals in case we change a union or something pointed to
     // that affects other variables, too.
-    updateLocals();
+    updateLocals(false);
 }
 
 void CdbEngine::handleThreads(const CdbCommandPtr &reply)
@@ -1436,7 +1434,7 @@ void CdbEngine::activateFrame(int index)
     updateLocals(true);
 }
 
-void CdbEngine::updateLocals(bool forNewStackFrame)
+void CdbEngine::updateLocals(bool newFrame)
 {
     typedef QHash<QByteArray, int> WatcherHash;
 
@@ -1450,7 +1448,7 @@ void CdbEngine::updateLocals(bool forNewStackFrame)
         watchHandler()->removeAllData();
         return;
     }
-    if (forNewStackFrame)
+    if (newFrame)
         watchHandler()->resetValueCache();
     /* Watchers: Forcibly discard old symbol group as switching from
      * thread 0/frame 0 -> thread 1/assembly -> thread 0/frame 0 will otherwise re-use it
@@ -1499,10 +1497,9 @@ void CdbEngine::updateLocals(bool forNewStackFrame)
     }
 
     // Required arguments: frame
-    const int flags = forNewStackFrame ? LocalsUpdateForNewFrame : 0;
     str << blankSeparator << frameIndex;
     postExtensionCommand("locals", arguments, 0,
-                         [this, flags](const CdbCommandPtr &r) { handleLocals(r, flags); });
+                         [this, newFrame](const CdbCommandPtr &r) { handleLocals(r, newFrame); });
 }
 
 void CdbEngine::selectThread(ThreadId threadId)
@@ -1857,14 +1854,14 @@ void CdbEngine::handleRegistersExt(const CdbCommandPtr &reply)
     postCommandSequence(reply->commandSequence);
 }
 
-void CdbEngine::handleLocals(const CdbCommandPtr &reply, int flags)
+void CdbEngine::handleLocals(const CdbCommandPtr &reply, bool newFrame)
 {
     if (reply->success) {
         if (boolSetting(VerboseLog))
             showMessage(QLatin1String("Locals: ") + QString::fromLatin1(reply->extensionReply), LogDebug);
         QList<WatchData> watchData;
         WatchHandler *handler = watchHandler();
-        if (flags & LocalsUpdateForNewFrame) {
+        if (newFrame) {
             watchData.append(*handler->findData("local"));
             watchData.append(*handler->findData("watch"));
         }
@@ -1896,7 +1893,7 @@ void CdbEngine::handleLocals(const CdbCommandPtr &reply, int flags)
             foreach (const WatchData &wd, watchData)
                 nsp << wd.toString() <<'\n';
         }
-        if (flags & LocalsUpdateForNewFrame) {
+        if (newFrame) {
             emit stackFrameCompleted();
             DebuggerToolTipManager::updateEngine(this);
         }
diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h
index b2708e98c8c..a20e4bfef7d 100644
--- a/src/plugins/debugger/cdb/cdbengine.h
+++ b/src/plugins/debugger/cdb/cdbengine.h
@@ -234,7 +234,7 @@ private:
     // Extension commands
     void handleThreads(const CdbCommandPtr &);
     void handlePid(const CdbCommandPtr &reply);
-    void handleLocals(const CdbCommandPtr &reply, int flags);
+    void handleLocals(const CdbCommandPtr &reply, bool newFrame);
     void handleAddWatch(const CdbCommandPtr &reply, WatchData item);
     void handleExpandLocals(const CdbCommandPtr &reply);
     void handleRegistersExt(const CdbCommandPtr &reply);
@@ -246,7 +246,7 @@ private:
     void handleAdditionalQmlStack(const CdbCommandPtr &);
     NormalizedSourceFileName sourceMapNormalizeFileNameFromDebugger(const QString &f);
     void updateLocalVariable(const QByteArray &iname);
-    void updateLocals(bool forNewStackFrame = false);
+    void updateLocals(bool forNewStackFrame);
     int elapsedLogTime() const;
     void addLocalsOptions(ByteArrayInputStream &s) const;
     unsigned parseStackTrace(const GdbMi &data, bool sourceStepInto);