From 98cac624a93fc039f055a788fe19ba8e2e46656e Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sun, 23 Aug 2015 12:58:49 +0200
Subject: [PATCH] added info tables and pathgrid table to merge operation

(cherry picked from commit 103073150e87d62582649ea6943fdc510eb5ca59)
---
 apps/opencs/model/tools/mergeoperation.cpp |  5 ++++-
 apps/opencs/model/tools/mergestages.hpp    | 16 +++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/apps/opencs/model/tools/mergeoperation.cpp b/apps/opencs/model/tools/mergeoperation.cpp
index 4a85eca798..d010e343b7 100644
--- a/apps/opencs/model/tools/mergeoperation.cpp
+++ b/apps/opencs/model/tools/mergeoperation.cpp
@@ -31,8 +31,11 @@ CSMTools::MergeOperation::MergeOperation (CSMDoc::Document& document, ToUTF8::Fr
     appendStage (new MergeIdCollectionStage<ESM::SoundGenerator> (mState, &CSMWorld::Data::getSoundGens));
     appendStage (new MergeIdCollectionStage<ESM::MagicEffect> (mState, &CSMWorld::Data::getMagicEffects));
     appendStage (new MergeIdCollectionStage<ESM::StartScript> (mState, &CSMWorld::Data::getStartScripts));
+    appendStage (new MergeIdCollectionStage<CSMWorld::Pathgrid, CSMWorld::SubCellCollection<CSMWorld::Pathgrid> > (mState, &CSMWorld::Data::getPathgrids));
+    appendStage (new MergeIdCollectionStage<CSMWorld::Info, CSMWorld::InfoCollection> (mState, &CSMWorld::Data::getTopicInfos));
+    appendStage (new MergeIdCollectionStage<CSMWorld::Info, CSMWorld::InfoCollection> (mState, &CSMWorld::Data::getJournalInfos));
 
-    /// \todo TopicInfo, JournalInfo, Referencables, References, Land, LandTextures, Pathgrids
+    /// \todo Referencables, References, Land, LandTextures
 }
 
 void CSMTools::MergeOperation::setTarget (std::auto_ptr<CSMDoc::Document> document)
diff --git a/apps/opencs/model/tools/mergestages.hpp b/apps/opencs/model/tools/mergestages.hpp
index 749fab18c7..f9d29420bc 100644
--- a/apps/opencs/model/tools/mergestages.hpp
+++ b/apps/opencs/model/tools/mergestages.hpp
@@ -27,11 +27,9 @@ namespace CSMTools
             ///< Messages resulting from this stage will be appended to \a messages.
     };
 
-    template<typename RecordType>
+    template<typename RecordType, typename Collection = CSMWorld::IdCollection<RecordType> >
     class MergeIdCollectionStage : public CSMDoc::Stage
     {
-            typedef typename CSMWorld::IdCollection<RecordType> Collection;
-
             MergeState& mState;
             Collection& (CSMWorld::Data::*mAccessor)();
 
@@ -46,19 +44,19 @@ namespace CSMTools
             ///< Messages resulting from this stage will be appended to \a messages.
     };
 
-    template<typename RecordType>
-    MergeIdCollectionStage<RecordType>::MergeIdCollectionStage (MergeState& state, Collection& (CSMWorld::Data::*accessor)())
+    template<typename RecordType, typename Collection>
+    MergeIdCollectionStage<RecordType, Collection>::MergeIdCollectionStage (MergeState& state, Collection& (CSMWorld::Data::*accessor)())
     : mState (state), mAccessor (accessor)
     {}
 
-    template<typename RecordType>
-    int MergeIdCollectionStage<RecordType>::setup()
+    template<typename RecordType, typename Collection>
+    int MergeIdCollectionStage<RecordType, Collection>::setup()
     {
         return 1;
     }
 
-    template<typename RecordType>
-    void MergeIdCollectionStage<RecordType>::perform (int stage, CSMDoc::Messages& messages)
+    template<typename RecordType, typename Collection>
+    void MergeIdCollectionStage<RecordType, Collection>::perform (int stage, CSMDoc::Messages& messages)
     {
         const Collection& source = (mState.mSource.getData().*mAccessor)();
         Collection& target = (mState.mTarget->getData().*mAccessor)();