From bd7b3e33998016681b1d958b03d459dd6c26c3e6 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 7 Oct 2016 15:48:12 +0200
Subject: [PATCH] Save wrapper and splitter state as base64 so it encodes to
 JSON

---
 qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp   | 4 ++--
 .../3rdparty/toolwindowmanager/ToolWindowManagerWrapper.cpp   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp
index b6f226836..fc2d72e64 100644
--- a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp
+++ b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp
@@ -443,7 +443,7 @@ void ToolWindowManager::startDrag(const QList<QWidget *> &toolWindows) {
 
 QVariantMap ToolWindowManager::saveSplitterState(QSplitter *splitter) {
   QVariantMap result;
-  result["state"] = splitter->saveState();
+  result["state"] = splitter->saveState().toBase64();
   result["type"] = "splitter";
   QVariantList items;
   for(int i = 0; i < splitter->count(); i++) {
@@ -485,7 +485,7 @@ QSplitter *ToolWindowManager::restoreSplitterState(const QVariantMap &data) {
       qWarning("unknown item type");
     }
   }
-  splitter->restoreState(data["state"].toByteArray());
+  splitter->restoreState(QByteArray::fromBase64(data["state"].toByteArray()));
   return splitter;
 }
 
diff --git a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerWrapper.cpp b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerWrapper.cpp
index 4fca71d55..3d3ed3ec6 100644
--- a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerWrapper.cpp
+++ b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerWrapper.cpp
@@ -65,7 +65,7 @@ QVariantMap ToolWindowManagerWrapper::saveState() {
     return QVariantMap();
   }
   QVariantMap result;
-  result["geometry"] = saveGeometry();
+  result["geometry"] = saveGeometry().toBase64();
   QSplitter* splitter = findChild<QSplitter*>(QString(), Qt::FindDirectChildrenOnly);
   if (splitter) {
     result["splitter"] = m_manager->saveSplitterState(splitter);
@@ -82,7 +82,7 @@ QVariantMap ToolWindowManagerWrapper::saveState() {
 }
 
 void ToolWindowManagerWrapper::restoreState(const QVariantMap &data) {
-  restoreGeometry(data["geometry"].toByteArray());
+  restoreGeometry(QByteArray::fromBase64(data["geometry"].toByteArray()));
   if (layout()->count() > 0) {
     qWarning("wrapper is not empty");
     return;