Merge remote-tracking branch 'cc9cii/pathgrid-check-extra'

apps/opencs/model/tools/pathgridcheck.cpp

@@ -8,16 +8,6 @@
 #include "../world/subcellcollection.hpp"
 #include "../world/pathgrid.hpp"
 
-namespace
-{
-    struct Point
-    {
-        unsigned char mConnectionNum;
-        std::vector<int> mOtherIndex;
-        Point() : mConnectionNum(0), mOtherIndex(0) {}
-    };
-}
-
 CSMTools::PathgridCheckStage::PathgridCheckStage (const CSMWorld::SubCellCollection<CSMWorld::Pathgrid>& pathgrids)
 : mPathgrids (pathgrids)
 {}
@@ -44,7 +34,7 @@ void CSMTools::PathgridCheckStage::perform (int stage, CSMDoc::Messages& message
     else if (pathgrid.mData.mS2 > static_cast<int>(pathgrid.mPoints.size()))
         messages.push_back (std::make_pair (id, pathgrid.mId + " has more points than expected"));
 
-    std::vector<Point> pointList(pathgrid.mPoints.size());
+    std::vector<CSMTools::Point> pointList(pathgrid.mPoints.size());
     std::vector<int> duplList;
 
     for (unsigned int i = 0; i < pathgrid.mEdges.size(); ++i)

apps/opencs/model/tools/pathgridcheck.hpp

@@ -14,17 +14,26 @@ namespace CSMWorld
 
 namespace CSMTools
 {
+    struct Point
+    {
+        unsigned char mConnectionNum;
+        std::vector<int> mOtherIndex;
+        Point() : mConnectionNum(0), mOtherIndex(0) {}
+    };
+
     class PathgridCheckStage : public CSMDoc::Stage
     {
-            const CSMWorld::SubCellCollection<CSMWorld::Pathgrid, CSMWorld::IdAccessor<CSMWorld::Pathgrid> >& mPathgrids;
+        const CSMWorld::SubCellCollection<CSMWorld::Pathgrid,
+              CSMWorld::IdAccessor<CSMWorld::Pathgrid> >& mPathgrids;
 
-        public:
+    public:
 
-            PathgridCheckStage (const CSMWorld::SubCellCollection<CSMWorld::Pathgrid, CSMWorld::IdAccessor<CSMWorld::Pathgrid> >& pathgrids);
+        PathgridCheckStage (const CSMWorld::SubCellCollection<CSMWorld::Pathgrid,
+            CSMWorld::IdAccessor<CSMWorld::Pathgrid> >& pathgrids);
 
-            virtual int setup();
+        virtual int setup();
 
-            virtual void perform (int stage, CSMDoc::Messages& messages);
+        virtual void perform (int stage, CSMDoc::Messages& messages);
     };
 }