Fix some warnings in ToolWindowManager so we can keep level 4 globally

* Nested foreach() hiding a local variable in the macro definition.
* Declarations of 'data' parameters that hide a class member variable.

qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp

@@ -148,10 +148,10 @@ void ToolWindowManager::moveToolWindows(QList<QWidget *> toolWindows,
   if (area.type() == NoArea) {
     //do nothing
   } else if (area.type() == NewFloatingArea) {
-    ToolWindowManagerArea* area = createArea();
-    area->addToolWindows(toolWindows);
+    ToolWindowManagerArea* floatArea = createArea();
+    floatArea->addToolWindows(toolWindows);
     ToolWindowManagerWrapper* wrapper = new ToolWindowManagerWrapper(this);
-    wrapper->layout()->addWidget(area);
+    wrapper->layout()->addWidget(floatArea);
     wrapper->move(QCursor::pos());
     wrapper->show();
   } else if (area.type() == AddTo) {
@@ -535,13 +535,13 @@ QVariantMap ToolWindowManager::saveSplitterState(QSplitter *splitter) {
   return result;
 }
 
-QSplitter *ToolWindowManager::restoreSplitterState(const QVariantMap &data) {
-  if (data["items"].toList().count() < 2) {
+QSplitter *ToolWindowManager::restoreSplitterState(const QVariantMap &savedData) {
+  if (savedData["items"].toList().count() < 2) {
     qWarning("invalid splitter encountered");
   }
   QSplitter* splitter = createSplitter();
 
-  foreach(QVariant itemData, data["items"].toList()) {
+  foreach(QVariant itemData, savedData["items"].toList()) {
     QVariantMap itemValue = itemData.toMap();
     QString itemType = itemValue["type"].toString();
     if (itemType == "splitter") {
@@ -554,7 +554,7 @@ QSplitter *ToolWindowManager::restoreSplitterState(const QVariantMap &data) {
       qWarning("unknown item type");
     }
   }
-  splitter->restoreState(QByteArray::fromBase64(data["state"].toByteArray()));
+  splitter->restoreState(QByteArray::fromBase64(savedData["state"].toByteArray()));
   return splitter;
 }
 
@@ -650,14 +650,14 @@ void ToolWindowManager::findSuggestions(ToolWindowManagerWrapper* wrapper) {
         continue;
       }
 
-      ToolWindowManagerArea* area = qobject_cast<ToolWindowManagerArea*>(parent);
-      ToolWindowManagerWrapper* wrapper = qobject_cast<ToolWindowManagerWrapper*>(parent);
+      ToolWindowManagerArea* areaParent = qobject_cast<ToolWindowManagerArea*>(parent);
+      ToolWindowManagerWrapper* wrapperParent = qobject_cast<ToolWindowManagerWrapper*>(parent);
 
       // if it's an area or wrapper, check if it's ours
-      if(area)
-        valid = area->manager() == this;
-      else if(wrapper)
-        valid = wrapper->manager() == this;
+      if(areaParent)
+        valid = areaParent->manager() == this;
+      else if(wrapperParent)
+        valid = wrapperParent->manager() == this;
 
       // we're done now, whether we checked for validity, or if we
       // found something that's none of the above
@@ -672,7 +672,7 @@ void ToolWindowManager::findSuggestions(ToolWindowManagerWrapper* wrapper) {
       candidates << area;
     }
   }
-  foreach(QWidget* widget, candidates) {
+  for(QWidget* widget : candidates) {
     QSplitter* splitter = qobject_cast<QSplitter*>(widget);
     ToolWindowManagerArea* area = qobject_cast<ToolWindowManagerArea*>(widget);
     if (!splitter && !area) {
@@ -700,7 +700,7 @@ void ToolWindowManager::findSuggestions(ToolWindowManagerWrapper* wrapper) {
         allowedSides << BottomOf;
       }
     }
-    foreach(AreaReferenceType side, allowedSides) {
+    for(AreaReferenceType side : allowedSides) {
       if (sideSensitiveArea(widget, side).contains(widget->mapFromGlobal(globalPos))) {
         m_suggestions << AreaReference(side, widget);
       }

qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerArea.cpp

@@ -194,14 +194,14 @@ QVariantMap ToolWindowManagerArea::saveState() {
   return result;
 }
 
-void ToolWindowManagerArea::restoreState(const QVariantMap &data) {
-  foreach(QVariant object, data["objects"].toList()) {
+void ToolWindowManagerArea::restoreState(const QVariantMap &savedData) {
+  for(QVariant object : savedData["objects"].toList()) {
     QVariantMap objectData = object.toMap();
     if (objectData.isEmpty()) { continue; }
     QString objectName = objectData["name"].toString();
     if (objectName.isEmpty()) { continue; }
     QWidget *t = NULL;
-    foreach(QWidget* toolWindow, m_manager->m_toolWindows) {
+    for(QWidget* toolWindow : m_manager->m_toolWindows) {
       if (toolWindow->objectName() == objectName) {
         t = toolWindow;
         break;
@@ -215,7 +215,7 @@ void ToolWindowManagerArea::restoreState(const QVariantMap &data) {
       qWarning("tool window with name '%s' not found or created", objectName.toLocal8Bit().constData());
     }
   }
-  setCurrentIndex(data["currentIndex"].toInt());
+  setCurrentIndex(savedData["currentIndex"].toInt());
 }
 
 void ToolWindowManagerArea::check_mouse_move() {

qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerWrapper.cpp

@@ -81,17 +81,17 @@ QVariantMap ToolWindowManagerWrapper::saveState() {
   return result;
 }
 
-void ToolWindowManagerWrapper::restoreState(const QVariantMap &data) {
-  restoreGeometry(QByteArray::fromBase64(data["geometry"].toByteArray()));
+void ToolWindowManagerWrapper::restoreState(const QVariantMap &savedData) {
+  restoreGeometry(QByteArray::fromBase64(savedData["geometry"].toByteArray()));
   if (layout()->count() > 0) {
     qWarning("wrapper is not empty");
     return;
   }
-  if (data.contains("splitter")) {
-    layout()->addWidget(m_manager->restoreSplitterState(data["splitter"].toMap()));
-  } else if (data.contains("area")) {
+  if (savedData.contains("splitter")) {
+    layout()->addWidget(m_manager->restoreSplitterState(savedData["splitter"].toMap()));
+  } else if (savedData.contains("area")) {
     ToolWindowManagerArea* area = m_manager->createArea();
-    area->restoreState(data["area"].toMap());
+    area->restoreState(savedData["area"].toMap());
     layout()->addWidget(area);
   }
 }

qrenderdoc/qrenderdoc_local.vcxproj

@@ -729,7 +729,6 @@
     <ClCompile Include="Windows\Dialogs\VirtualFileDialog.cpp" />
     <ClCompile Include="Windows\EventBrowser.cpp" />
     <ClCompile Include="3rdparty\flowlayout\FlowLayout.cpp">
-      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <ClCompile Include="Widgets\Extended\RDLineEdit.cpp" />
     <ClCompile Include="Widgets\Extended\RDTextEdit.cpp" />
@@ -746,13 +745,10 @@
     <ClCompile Include="Windows\StatisticsViewer.cpp" />
     <ClCompile Include="Windows\TextureViewer.cpp" />
     <ClCompile Include="3rdparty\toolwindowmanager\ToolWindowManager.cpp">
-      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <ClCompile Include="3rdparty\toolwindowmanager\ToolWindowManagerArea.cpp">
-      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <ClCompile Include="3rdparty\toolwindowmanager\ToolWindowManagerWrapper.cpp">
-      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <ClCompile Include="Code\qrenderdoc.cpp" />
   </ItemGroup>
@@ -1584,4 +1580,4 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
+</Project>