moved Operation and Stage from model/tools to model/doc

apps/opencs/CMakeLists.txt

@@ -5,11 +5,11 @@ opencs_units (. editor)
 set (CMAKE_BUILD_TYPE DEBUG)
 
 opencs_units (model/doc
-    document
+    document operation
     )
 
 opencs_units_noqt (model/doc
-    documentmanager
+    documentmanager stage
     )
 
 opencs_hdrs_noqt (model/doc
@@ -33,11 +33,11 @@ opencs_hdrs_noqt (model/world
 
 
 opencs_units (model/tools
-    tools operation reportmodel
+    tools reportmodel
     )
 
 opencs_units_noqt (model/tools
-    stage verifier mandatoryid skillcheck classcheck factioncheck racecheck soundcheck regioncheck
+    verifier mandatoryid skillcheck classcheck factioncheck racecheck soundcheck regioncheck
     birthsigncheck spellcheck
     )
 

apps/opencs/model/doc/operation.cpp

@@ -6,11 +6,10 @@
 
 #include <QTimer>
 
-#include "../doc/state.hpp"
+#include "state.hpp"
-
 #include "stage.hpp"
 
-void CSMTools::Operation::prepareStages()
+void CSMDoc::Operation::prepareStages()
 {
     mCurrentStage = mStages.begin();
     mCurrentStep = 0;
@@ -24,15 +23,15 @@ void CSMTools::Operation::prepareStages()
     }
 }
 
-CSMTools::Operation::Operation (int type) : mType (type) {}
+CSMDoc::Operation::Operation (int type) : mType (type) {}
 
-CSMTools::Operation::~Operation()
+CSMDoc::Operation::~Operation()
 {
     for (std::vector<std::pair<Stage *, int> >::iterator iter (mStages.begin()); iter!=mStages.end(); ++iter)
         delete iter->first;
 }
 
-void CSMTools::Operation::run()
+void CSMDoc::Operation::run()
 {
     prepareStages();
 
@@ -45,17 +44,17 @@ void CSMTools::Operation::run()
     exec();
 }
 
-void CSMTools::Operation::appendStage (Stage *stage)
+void CSMDoc::Operation::appendStage (Stage *stage)
 {
     mStages.push_back (std::make_pair (stage, 0));
 }
 
-void CSMTools::Operation::abort()
+void CSMDoc::Operation::abort()
 {
     exit();
 }
 
-void CSMTools::Operation::verify()
+void CSMDoc::Operation::verify()
 {
     std::vector<std::string> messages;
 

apps/opencs/model/doc/operation.hpp

@@ -1,11 +1,11 @@
-#ifndef CSM_TOOLS_OPERATION_H
+#ifndef CSM_DOC_OPERATION_H
-#define CSM_TOOLS_OPERATION_H
+#define CSM_DOC_OPERATION_H
 
 #include <vector>
 
 #include <QThread>
 
-namespace CSMTools
+namespace CSMDoc
 {
     class Stage;
 

apps/opencs/model/doc/stage.cpp

@@ -0,0 +1,4 @@
+
+#include "stage.hpp"
+
+CSMDoc::Stage::~Stage() {}

apps/opencs/model/doc/stage.hpp

@@ -1,10 +1,10 @@
-#ifndef CSM_TOOLS_STAGE_H
+#ifndef CSM_DOC_STAGE_H
-#define CSM_TOOLS_STAGE_H
+#define CSM_DOC_STAGE_H
 
 #include <vector>
 #include <string>
 
-namespace CSMTools
+namespace CSMDoc
 {
     class Stage
     {
@@ -16,7 +16,7 @@ namespace CSMTools
             ///< \return number of steps
 
             virtual void perform (int stage, std::vector<std::string>& messages) = 0;
-            ///< Messages resulting from this tage will be appended to \a messages.
+            ///< Messages resulting from this stage will be appended to \a messages.
     };
 }
 

apps/opencs/model/tools/birthsigncheck.hpp

@@ -5,12 +5,12 @@
 
 #include "../world/idcollection.hpp"
 
-#include "stage.hpp"
+#include "../doc/stage.hpp"
 
 namespace CSMTools
 {
     /// \brief VerifyStage: make sure that birthsign records are internally consistent
-    class BirthsignCheckStage : public Stage
+    class BirthsignCheckStage : public CSMDoc::Stage
     {
             const CSMWorld::IdCollection<ESM::BirthSign>& mBirthsigns;
 

apps/opencs/model/tools/classcheck.hpp

@@ -5,12 +5,12 @@
 
 #include "../world/idcollection.hpp"
 
-#include "stage.hpp"
+#include "../doc/stage.hpp"
 
 namespace CSMTools
 {
     /// \brief VerifyStage: make sure that class records are internally consistent
-    class ClassCheckStage : public Stage
+    class ClassCheckStage : public CSMDoc::Stage
     {
             const CSMWorld::IdCollection<ESM::Class>& mClasses;
 

apps/opencs/model/tools/factioncheck.hpp

@@ -5,12 +5,12 @@
 
 #include "../world/idcollection.hpp"
 
-#include "stage.hpp"
+#include "../doc/stage.hpp"
 
 namespace CSMTools
 {
     /// \brief VerifyStage: make sure that faction records are internally consistent
-    class FactionCheckStage : public Stage
+    class FactionCheckStage : public CSMDoc::Stage
     {
             const CSMWorld::IdCollection<ESM::Faction>& mFactions;
 

apps/opencs/model/tools/mandatoryid.hpp

@@ -6,7 +6,7 @@
 
 #include "../world/universalid.hpp"
 
-#include "stage.hpp"
+#include "../doc/stage.hpp"
 
 namespace CSMWorld
 {
@@ -16,7 +16,7 @@ namespace CSMWorld
 namespace CSMTools
 {
     /// \brief Verify stage: make sure that records with specific IDs exist.
-    class MandatoryIdStage : public Stage
+    class MandatoryIdStage : public CSMDoc::Stage
     {
             const CSMWorld::CollectionBase& mIdCollection;
             CSMWorld::UniversalId mCollectionId;

apps/opencs/model/tools/racecheck.hpp

@@ -5,12 +5,12 @@
 
 #include "../world/idcollection.hpp"
 
-#include "stage.hpp"
+#include "../doc/stage.hpp"
 
 namespace CSMTools
 {
     /// \brief VerifyStage: make sure that race records are internally consistent
-    class RaceCheckStage : public Stage
+    class RaceCheckStage : public CSMDoc::Stage
     {
             const CSMWorld::IdCollection<ESM::Race>& mRaces;
             bool mPlayable;

apps/opencs/model/tools/regioncheck.hpp

@@ -5,12 +5,12 @@
 
 #include "../world/idcollection.hpp"
 
-#include "stage.hpp"
+#include "../doc/stage.hpp"
 
 namespace CSMTools
 {
     /// \brief VerifyStage: make sure that region records are internally consistent
-    class RegionCheckStage : public Stage
+    class RegionCheckStage : public CSMDoc::Stage
     {
             const CSMWorld::IdCollection<ESM::Region>& mRegions;
 

apps/opencs/model/tools/skillcheck.hpp

@@ -5,12 +5,12 @@
 
 #include "../world/idcollection.hpp"
 
-#include "stage.hpp"
+#include "../doc/stage.hpp"
 
 namespace CSMTools
 {
     /// \brief VerifyStage: make sure that skill records are internally consistent
-    class SkillCheckStage : public Stage
+    class SkillCheckStage : public CSMDoc::Stage
     {
             const CSMWorld::IdCollection<ESM::Skill>& mSkills;
 

apps/opencs/model/tools/soundcheck.hpp

@@ -5,12 +5,12 @@
 
 #include "../world/idcollection.hpp"
 
-#include "stage.hpp"
+#include "../doc/stage.hpp"
 
 namespace CSMTools
 {
     /// \brief VerifyStage: make sure that sound records are internally consistent
-    class SoundCheckStage : public Stage
+    class SoundCheckStage : public CSMDoc::Stage
     {
             const CSMWorld::IdCollection<ESM::Sound>& mSounds;
 

apps/opencs/model/tools/spellcheck.hpp

@@ -5,12 +5,12 @@
 
 #include "../world/idcollection.hpp"
 
-#include "stage.hpp"
+#include "../doc/stage.hpp"
 
 namespace CSMTools
 {
     /// \brief VerifyStage: make sure that spell records are internally consistent
-    class SpellCheckStage : public Stage
+    class SpellCheckStage : public CSMDoc::Stage
     {
             const CSMWorld::IdCollection<ESM::Spell>& mSpells;
 

apps/opencs/model/tools/stage.cpp

@@ -1,4 +0,0 @@
-
-#include "stage.hpp"
-
-CSMTools::Stage::~Stage() {}

apps/opencs/model/tools/tools.cpp

@@ -21,7 +21,7 @@
 #include "birthsigncheck.hpp"
 #include "spellcheck.hpp"
 
-CSMTools::Operation *CSMTools::Tools::get (int type)
+CSMDoc::Operation *CSMTools::Tools::get (int type)
 {
     switch (type)
     {
@@ -31,7 +31,7 @@ CSMTools::Operation *CSMTools::Tools::get (int type)
     return 0;
 }
 
-const CSMTools::Operation *CSMTools::Tools::get (int type) const
+const CSMDoc::Operation *CSMTools::Tools::get (int type) const
 {
     return const_cast<Tools *> (this)->get (type);
 }
@@ -103,7 +103,7 @@ CSMWorld::UniversalId CSMTools::Tools::runVerifier()
 
 void CSMTools::Tools::abortOperation (int type)
 {
-    if (Operation *operation = get (type))
+    if (CSMDoc::Operation *operation = get (type))
         operation->abort();
 }
 
@@ -118,7 +118,7 @@ int CSMTools::Tools::getRunningOperations() const
     int result = 0;
 
     for (int i=0; sOperations[i]!=-1; ++i)
-        if (const Operation *operation = get (sOperations[i]))
+        if (const CSMDoc::Operation *operation = get (sOperations[i]))
             if (operation->isRunning())
                 result |= sOperations[i];
 

apps/opencs/model/tools/tools.hpp

@@ -11,10 +11,14 @@ namespace CSMWorld
     class UniversalId;
 }
 
+namespace CSMDoc
+{
+    class Operation;
+}
+
 namespace CSMTools
 {
     class Verifier;
-    class Operation;
     class ReportModel;
 
     class Tools : public QObject
@@ -33,10 +37,10 @@ namespace CSMTools
 
             Verifier *getVerifier();
 
-            Operation *get (int type);
+            CSMDoc::Operation *get (int type);
             ///< Returns a 0-pointer, if operation hasn't been used yet.
 
-            const Operation *get (int type) const;
+            const CSMDoc::Operation *get (int type) const;
             ///< Returns a 0-pointer, if operation hasn't been used yet.
 
         public:

apps/opencs/model/tools/verifier.hpp

@@ -1,11 +1,11 @@
 #ifndef CSM_TOOLS_VERIFIER_H
 #define CSM_TOOLS_VERIFIER_H
 
-#include "operation.hpp"
+#include "../doc/operation.hpp"
 
 namespace CSMTools
 {
-    class Verifier : public Operation
+    class Verifier : public CSMDoc::Operation
     {
         public: