From 7733df239efee09ea2abfb46583342a8aae94bab Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 20 Sep 2014 10:36:43 +0200
Subject: [PATCH] made CloneCommand a subclass of CreateCommand

---
 apps/opencs/model/world/commands.cpp | 32 +++++++++----------
 apps/opencs/model/world/commands.hpp | 46 +++++++++++++++-------------
 2 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index d7bce5da9..de0e9a4e5 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -24,6 +24,13 @@ void CSMWorld::ModifyCommand::undo()
     mModel.setData (mIndex, mOld);
 }
 
+
+void CSMWorld::CreateCommand::applyModifications()
+{
+    for (std::map<int, QVariant>::const_iterator iter (mValues.begin()); iter!=mValues.end(); ++iter)
+        mModel.setData (mModel.getModelIndex (mId, iter->first), iter->second);
+}
+
 CSMWorld::CreateCommand::CreateCommand (IdTable& model, const std::string& id, QUndoCommand* parent)
 : QUndoCommand (parent), mModel (model), mId (id), mType (UniversalId::Type_None)
 {
@@ -43,9 +50,7 @@ void CSMWorld::CreateCommand::setType (UniversalId::Type type)
 void CSMWorld::CreateCommand::redo()
 {
     mModel.addRecord (mId, mType);
-
-    for (std::map<int, QVariant>::const_iterator iter (mValues.begin()); iter!=mValues.end(); ++iter)
-        mModel.setData (mModel.getModelIndex (mId, iter->first), iter->second);
+    applyModifications();
 }
 
 void CSMWorld::CreateCommand::undo()
@@ -147,27 +152,22 @@ void CSMWorld::ReorderRowsCommand::undo()
 
 CSMWorld::CloneCommand::CloneCommand (CSMWorld::IdTable& model,
                                       const std::string& idOrigin,
-                                      const std::string& IdDestination,
+                                      const std::string& idDestination,
                                       const CSMWorld::UniversalId::Type type,
-                                      QUndoCommand* parent) :
-    QUndoCommand (parent),
-    mModel (model),
-    mIdOrigin (idOrigin),
-    mIdDestination (Misc::StringUtils::lowerCase (IdDestination)),
-    mType (type)
+                                      QUndoCommand* parent)
+: CreateCommand (model, idDestination, parent), mIdOrigin (idOrigin)
 {
-    setText ( ("Clone record " + idOrigin + " to the " + IdDestination).c_str());
+    setType (type);
+    setText ( ("Clone record " + idOrigin + " to the " + idDestination).c_str());
 }
 
 void CSMWorld::CloneCommand::redo()
 {
-    mModel.cloneRecord (mIdOrigin, mIdDestination, mType);
-
-    for (std::map<int, QVariant>::const_iterator iter (mValues.begin()); iter != mValues.end(); ++iter)
-        mModel.setData (mModel.getModelIndex (mIdDestination, iter->first), iter->second);
+    mModel.cloneRecord (mIdOrigin, mId, mType);
+    applyModifications();
 }
 
 void CSMWorld::CloneCommand::undo()
 {
-    mModel.removeRow (mModel.getModelIndex (mIdDestination, 0).row());
+    mModel.removeRow (mModel.getModelIndex (mId, 0).row());
 }
\ No newline at end of file
diff --git a/apps/opencs/model/world/commands.hpp b/apps/opencs/model/world/commands.hpp
index 947be68fd..a15c071a8 100644
--- a/apps/opencs/model/world/commands.hpp
+++ b/apps/opencs/model/world/commands.hpp
@@ -39,32 +39,20 @@ namespace CSMWorld
             virtual void undo();
     };
 
-    class CloneCommand : public QUndoCommand
-    {
-            IdTable& mModel;
-            std::string mIdOrigin;
-            std::string mIdDestination;
-            UniversalId::Type mType;
-            std::map<int, QVariant> mValues;
-
-        public:
-
-            CloneCommand (IdTable& model, const std::string& idOrigin,
-                          const std::string& IdDestination,
-                          const UniversalId::Type type,
-                          QUndoCommand* parent = 0);
-
-            virtual void redo();
-
-            virtual void undo();
-    };
-
     class CreateCommand : public QUndoCommand
     {
+            std::map<int, QVariant> mValues;
+
+        protected:
+
             IdTable& mModel;
             std::string mId;
             UniversalId::Type mType;
-            std::map<int, QVariant> mValues;
+
+        protected:
+
+            /// Apply modifications set via addValue.
+            void applyModifications();
 
         public:
 
@@ -79,6 +67,22 @@ namespace CSMWorld
             virtual void undo();
     };
 
+    class CloneCommand : public CreateCommand
+    {
+            std::string mIdOrigin;
+
+        public:
+
+            CloneCommand (IdTable& model, const std::string& idOrigin,
+                          const std::string& IdDestination,
+                          const UniversalId::Type type,
+                          QUndoCommand* parent = 0);
+
+            virtual void redo();
+
+            virtual void undo();
+    };
+
     class RevertCommand : public QUndoCommand
     {
             IdTable& mModel;