lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-12 21:10:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* Nested foreach() hiding a local variable in the macro definition.
* Declarations of 'data' parameters that hide a class member variable.
This commit is contained in:
baldurk
2017-04-28 13:47:21 +01:00
parent 8e32da581e
commit 628df6d9c8
4 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp
Vendored
+15 -15
View File
@@ -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);
}