From 6bbcb8f8f2b29e8e6c59c00df95c7d350d1875a2 Mon Sep 17 00:00:00 2001
From: Sergio Martins <sergio.martins@kdab.com>
Date: Thu, 11 Jun 2020 16:46:53 +0100
Subject: [PATCH] Rename LayoutSaver::MultiSplitterLayout to
 LayoutSaver::MultiSplitter

---
 src/LayoutSaver.cpp                   | 8 ++++----
 src/LayoutSaver.h                     | 2 +-
 src/LayoutSaver_p.h                   | 6 +++---
 src/private/widgets/MultiSplitter.cpp | 6 +++---
 src/private/widgets/MultiSplitter_p.h | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/LayoutSaver.cpp b/src/LayoutSaver.cpp
index b128b4be..a4bf4a3f 100644
--- a/src/LayoutSaver.cpp
+++ b/src/LayoutSaver.cpp
@@ -731,7 +731,7 @@ void LayoutSaver::MainWindow::fromVariantMap(const QVariantMap &map)
 
 }
 
-bool LayoutSaver::MultiSplitterLayout::isValid() const
+bool LayoutSaver::MultiSplitter::isValid() const
 {
     if (layout.isEmpty())
         return false;
@@ -744,14 +744,14 @@ bool LayoutSaver::MultiSplitterLayout::isValid() const
     return true;
 }
 
-void LayoutSaver::MultiSplitterLayout::scaleSizes(const ScalingInfo &)
+void LayoutSaver::MultiSplitter::scaleSizes(const ScalingInfo &)
 {
     // scalingInfo.applyFactorsTo(/*by-ref*/size);
     //for (LayoutSaver::Item &item : items) TODO
     //    item.scaleSizes(scalingInfo);
 }
 
-QVariantMap LayoutSaver::MultiSplitterLayout::toVariantMap() const
+QVariantMap LayoutSaver::MultiSplitter::toVariantMap() const
 {
     QVariantMap result;
     result.insert(QStringLiteral("layout"), layout);
@@ -764,7 +764,7 @@ QVariantMap LayoutSaver::MultiSplitterLayout::toVariantMap() const
     return result;
 }
 
-void LayoutSaver::MultiSplitterLayout::fromVariantMap(const QVariantMap &map)
+void LayoutSaver::MultiSplitter::fromVariantMap(const QVariantMap &map)
 {
     layout = map.value(QStringLiteral("layout")).toMap();
     const QVariantMap framesV = map.value(QStringLiteral("frames")).toMap();
diff --git a/src/LayoutSaver.h b/src/LayoutSaver.h
index 423364fe..34bfd180 100644
--- a/src/LayoutSaver.h
+++ b/src/LayoutSaver.h
@@ -107,7 +107,7 @@ public:
     struct FloatingWindow;
     struct DockWidget;
     struct Position;
-    struct MultiSplitterLayout;
+    struct MultiSplitter;
     struct Frame;
     struct Placeholder;
     struct ScalingInfo;
diff --git a/src/LayoutSaver_p.h b/src/LayoutSaver_p.h
index de120dc6..980b7667 100644
--- a/src/LayoutSaver_p.h
+++ b/src/LayoutSaver_p.h
@@ -198,7 +198,7 @@ struct LayoutSaver::Frame
     LayoutSaver::DockWidget::List dockWidgets;
 };
 
-struct LayoutSaver::MultiSplitterLayout
+struct LayoutSaver::MultiSplitter
 {
     bool isValid() const;
     /// Iterates throught the layout and patches all absolute sizes. See RestoreOption_RelativeToMainWindow.
@@ -223,7 +223,7 @@ struct LayoutSaver::FloatingWindow
     QVariantMap toVariantMap() const;
     void fromVariantMap(const QVariantMap &map);
 
-    LayoutSaver::MultiSplitterLayout multiSplitterLayout;
+    LayoutSaver::MultiSplitter multiSplitterLayout;
     QStringList affinities;
     int parentIndex = -1;
     QRect geometry;
@@ -246,7 +246,7 @@ public:
     void fromVariantMap(const QVariantMap &map);
 
     KDDockWidgets::MainWindowOptions options;
-    LayoutSaver::MultiSplitterLayout multiSplitterLayout;
+    LayoutSaver::MultiSplitter multiSplitterLayout;
     QString uniqueName;
     QStringList affinities;
     QRect geometry;
diff --git a/src/private/widgets/MultiSplitter.cpp b/src/private/widgets/MultiSplitter.cpp
index ec6f196d..458ce8c7 100644
--- a/src/private/widgets/MultiSplitter.cpp
+++ b/src/private/widgets/MultiSplitter.cpp
@@ -442,7 +442,7 @@ QRect MultiSplitter::rectForDrop(const QWidgetOrQuick *widget, Location location
     return container->suggestedDropRect(&item, relativeTo, Layouting::Item::Location(location));
 }
 
-bool MultiSplitter::deserialize(const LayoutSaver::MultiSplitterLayout &l)
+bool MultiSplitter::deserialize(const LayoutSaver::MultiSplitter &l)
 {
     setRootItem(new Layouting::ItemContainer(this));
 
@@ -461,9 +461,9 @@ bool MultiSplitter::deserialize(const LayoutSaver::MultiSplitterLayout &l)
     return true;
 }
 
-LayoutSaver::MultiSplitterLayout MultiSplitter::serialize() const
+LayoutSaver::MultiSplitter MultiSplitter::serialize() const
 {
-    LayoutSaver::MultiSplitterLayout l;
+    LayoutSaver::MultiSplitter l;
     l.layout = m_rootItem->toVariantMap();
     const Layouting::Item::List items = m_rootItem->items_recursive();
     l.frames.reserve(items.size());
diff --git a/src/private/widgets/MultiSplitter_p.h b/src/private/widgets/MultiSplitter_p.h
index c4a29d19..70bbcb27 100644
--- a/src/private/widgets/MultiSplitter_p.h
+++ b/src/private/widgets/MultiSplitter_p.h
@@ -144,8 +144,8 @@ public:
      */
     QRect rectForDrop(const QWidgetOrQuick *widget, KDDockWidgets::Location location, const Layouting::Item *relativeTo) const;
 
-    bool deserialize(const LayoutSaver::MultiSplitterLayout &);
-    LayoutSaver::MultiSplitterLayout serialize() const;
+    bool deserialize(const LayoutSaver::MultiSplitter &);
+    LayoutSaver::MultiSplitter serialize() const;
 
     ///@brief returns the list of separators
     QVector<Layouting::Separator*> separators() const;