Fixup merge

giogix2 · Dec 6, 2016 · 519a0e1 · 519a0e1
1 parent d9115aa
commit 519a0e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/PquadTree.cpp b/PquadTree.cpp
@@ -25,7 +25,7 @@
 
 PquadTree::PquadTree(const std::string name, Ogre::uint16 levelSize,
                      Ogre::Matrix3 orientation, Ogre::Real seaHeight,
-                     std::ResourceParameter *parameters)
+                     ResourceParameter *parameters)
 {
     Ogre::Vector2 upperLeft, lowerRight;
 

diff --git a/PquadTree.h b/PquadTree.h
@@ -31,7 +31,7 @@ class PquadTree
 public:
     PquadTree(const std::string name, Ogre::uint16 levelSize,
               Ogre::Matrix3 orientation, Ogre::Real seaHeight,
-              std::ResourceParameter *parameters);
+              ResourceParameter *parameters);
     ~PquadTree();
 
     /* Set viewer position and render face accordingly. */
@@ -44,7 +44,7 @@ class PquadTree
     std::string             name;
     Ogre::SceneManager      *scene;
     Ogre::SceneNode         *scNode;
-    std::ResourceParameter  *params;
+    ResourceParameter       *params;
     Ogre::uint32            runningNumber;
 
     /* Recursively subdivide face. Three states: match, subdivide, leaf reached. */