World|BspLeaf: Simplified BspLeaf (no need for pimpl here)

skyjake · Oct 22, 2014 · 3951887 · 3951887
1 parent 9c14991
commit 3951887
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/doomsday/client/include/world/bspleaf.h b/doomsday/client/include/world/bspleaf.h
@@ -99,7 +99,7 @@ class BspLeaf : public de::MapElement
     Sector const *sectorPtr() const;
 
 private:
-    DENG2_PRIVATE(d)
+    ConvexSubspace *_subspace;
 };
 
 #endif // DENG_WORLD_BSPLEAF_H
diff --git a/doomsday/client/src/world/bspleaf.cpp b/doomsday/client/src/world/bspleaf.cpp
@@ -27,46 +27,40 @@
 
 using namespace de;
 
-DENG2_PIMPL_NOREF(BspLeaf)
-{
-    ConvexSubspace *subspace;
-};
-
 BspLeaf::BspLeaf(Sector *sector)
-    : MapElement(DMU_BSPLEAF, sector), d(new Instance)
-{
-    d->subspace = 0;
-}
+    : MapElement(DMU_BSPLEAF, sector)
+    , _subspace(0)
+{}
 
 bool BspLeaf::hasSubspace() const
 {
-    return d->subspace != 0;
+    return _subspace != 0;
 }
 
 ConvexSubspace &BspLeaf::subspace() const
 {
     if(hasSubspace())
     {
-        return *d->subspace;
+        return *_subspace;
     }
     /// @throw MissingSubspaceError Attempted with no subspace attributed.
     throw MissingSubspaceError("BspLeaf::subspace", "No subspace is attributed");
 }
 
 void BspLeaf::setSubspace(ConvexSubspace *newSubspace)
 {
-    if(d->subspace == newSubspace) return;
+    if(_subspace == newSubspace) return;
 
     if(hasSubspace())
     {
-        d->subspace->setBspLeaf(0);
+        _subspace->setBspLeaf(0);
     }
 
-    d->subspace = newSubspace;
+    _subspace = newSubspace;
 
     if(hasSubspace())
     {
-        d->subspace->setBspLeaf(this);
+        _subspace->setBspLeaf(this);
     }
 }