Merge branch 'master' of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System

githubuser0xFFFF · githubuser0xFFFF · commit bfa512499987 · 2023-11-06T12:18:40.000+01:00
diff --git a/src/DockContainerWidget.cpp b/src/DockContainerWidget.cpp
@@ -1932,10 +1932,11 @@ bool CDockContainerWidget::restoreState(CDockingStateReader& s, bool Testing)
 		NewRootSplitter = d->newSplitter(Qt::Horizontal);
 	}
 
-	d->Layout->replaceWidget(d->RootSplitter, NewRootSplitter);
+	QLayoutItem* li = d->Layout->replaceWidget(d->RootSplitter, NewRootSplitter);
 	auto OldRoot = d->RootSplitter;
 	d->RootSplitter = qobject_cast<CDockSplitter*>(NewRootSplitter);
 	OldRoot->deleteLater();
+	delete li;
 
 	return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -1932,10 +1932,11 @@ bool CDockContainerWidget::restoreState(CDockingStateReader& s, bool Testing)`
`1932`	`1932`	`NewRootSplitter = d->newSplitter(Qt::Horizontal);`
`1933`	`1933`	`}`
`1934`	`1934`
`1935`		`- d->Layout->replaceWidget(d->RootSplitter, NewRootSplitter);`
	`1935`	`+ QLayoutItem* li = d->Layout->replaceWidget(d->RootSplitter, NewRootSplitter);`
`1936`	`1936`	`auto OldRoot = d->RootSplitter;`
`1937`	`1937`	`d->RootSplitter = qobject_cast<CDockSplitter*>(NewRootSplitter);`
`1938`	`1938`	`OldRoot->deleteLater();`
	`1939`	`+ delete li;`
`1939`	`1940`
`1940`	`1941`	`return true;`
`1941`	`1942`	`}`