From 5bce3cbc6830ce0dfffd7698be4a18ffa55698a7 Mon Sep 17 00:00:00 2001
From: bzzt <bzzt@bzzt.bzzt>
Date: Wed, 20 Feb 2019 13:37:00 +0000
Subject: [PATCH] Don't use MWRender namespace in common terrain components

---
 components/terrain/cellborder.cpp  | 2 +-
 components/terrain/cellborder.hpp  | 3 ---
 components/terrain/terraingrid.cpp | 2 +-
 components/terrain/terraingrid.hpp | 2 +-
 components/terrain/world.cpp       | 2 +-
 components/terrain/world.hpp       | 2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/components/terrain/cellborder.cpp b/components/terrain/cellborder.cpp
index d9e6d52fc1..64434727eb 100644
--- a/components/terrain/cellborder.cpp
+++ b/components/terrain/cellborder.cpp
@@ -7,7 +7,7 @@
 #include "world.hpp"
 #include "../esm/loadland.hpp"
 
-namespace MWRender
+namespace Terrain
 {
 
 CellBorder::CellBorder(Terrain::World *world, osg::Group *root, int borderMask):
diff --git a/components/terrain/cellborder.hpp b/components/terrain/cellborder.hpp
index 530ea31ca3..908cdea097 100644
--- a/components/terrain/cellborder.hpp
+++ b/components/terrain/cellborder.hpp
@@ -7,10 +7,7 @@
 namespace Terrain
 {
     class World;
-}
 
-namespace MWRender
-{
     /**
      * @Brief Handles the debug cell borders.
      */
diff --git a/components/terrain/terraingrid.cpp b/components/terrain/terraingrid.cpp
index dbc1429da2..1888a02b34 100644
--- a/components/terrain/terraingrid.cpp
+++ b/components/terrain/terraingrid.cpp
@@ -84,7 +84,7 @@ void TerrainGrid::loadCell(int x, int y)
 
 void TerrainGrid::unloadCell(int x, int y)
 {
-    MWRender::CellBorder::CellGrid::iterator it = mGrid.find(std::make_pair(x,y));
+    CellBorder::CellGrid::iterator it = mGrid.find(std::make_pair(x,y));
     if (it == mGrid.end())
         return;
 
diff --git a/components/terrain/terraingrid.hpp b/components/terrain/terraingrid.hpp
index 87e3b432c0..eb30fb97d2 100644
--- a/components/terrain/terraingrid.hpp
+++ b/components/terrain/terraingrid.hpp
@@ -33,7 +33,7 @@ namespace Terrain
         // split each ESM::Cell into mNumSplits*mNumSplits terrain chunks
         unsigned int mNumSplits;
 
-        MWRender::CellBorder::CellGrid mGrid;
+        CellBorder::CellGrid mGrid;
     };
 }
 
diff --git a/components/terrain/world.cpp b/components/terrain/world.cpp
index cc81dbef8e..6a8322bb54 100644
--- a/components/terrain/world.cpp
+++ b/components/terrain/world.cpp
@@ -47,7 +47,7 @@ World::World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSyst
 
     mTextureManager.reset(new TextureManager(mResourceSystem->getSceneManager()));
     mChunkManager.reset(new ChunkManager(mStorage, mResourceSystem->getSceneManager(), mTextureManager.get(), mCompositeMapRenderer));
-    mCellBorder.reset(new MWRender::CellBorder(this,mTerrainRoot.get(),borderMask));
+    mCellBorder.reset(new CellBorder(this,mTerrainRoot.get(),borderMask));
 
     mResourceSystem->addResourceManager(mChunkManager.get());
     mResourceSystem->addResourceManager(mTextureManager.get());
diff --git a/components/terrain/world.hpp b/components/terrain/world.hpp
index da10047832..4fb724ebbf 100644
--- a/components/terrain/world.hpp
+++ b/components/terrain/world.hpp
@@ -116,7 +116,7 @@ namespace Terrain
         std::unique_ptr<TextureManager> mTextureManager;
         std::unique_ptr<ChunkManager> mChunkManager;
 
-        std::unique_ptr<MWRender::CellBorder> mCellBorder;
+        std::unique_ptr<CellBorder> mCellBorder;
 
         bool mBorderVisible;