From 7e83093561b1609ca85ebfb9d14e8d4b6eb1ecf3 Mon Sep 17 00:00:00 2001 From: danij Date: Sat, 11 Aug 2012 15:04:42 +0100 Subject: [PATCH] Refactor: Member variables of de::PathDirectoryNode now private --- doomsday/engine/portable/include/pathdirectory.h | 2 +- doomsday/engine/portable/src/pathdirectory.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doomsday/engine/portable/include/pathdirectory.h b/doomsday/engine/portable/include/pathdirectory.h index 146bacce4d..9b1ce5329d 100644 --- a/doomsday/engine/portable/include/pathdirectory.h +++ b/doomsday/engine/portable/include/pathdirectory.h @@ -123,7 +123,7 @@ class PathDirectoryNode /// @fixme should be private: StringPoolId internId() const; -public: +private: typedef struct pathdirectorynode_userdatapair_s { StringPoolId internId; void* data; diff --git a/doomsday/engine/portable/src/pathdirectory.cpp b/doomsday/engine/portable/src/pathdirectory.cpp index 7ef1c0cb34..e6785762ec 100644 --- a/doomsday/engine/portable/src/pathdirectory.cpp +++ b/doomsday/engine/portable/src/pathdirectory.cpp @@ -179,7 +179,7 @@ struct de::PathDirectory::Instance de::PathDirectory::NodeHash::const_iterator i = ph->find(hash); while(i != ph->end() && i.key() == hash) { - if(parent == (*i)->parent() && internId == (*i)->pair.internId) + if(parent == (*i)->parent() && internId == (*i)->internId()) { return *i; } @@ -863,7 +863,7 @@ void PathDirectory_DebugPrint(PathDirectory* pd, char delimiter) const ddstring_t* de::PathDirectory::pathFragment(const de::PathDirectoryNode* node) { DENG2_ASSERT(node); - return StringPool_String(d->stringPool, node->pair.internId); + return StringPool_String(d->stringPool, node->internId()); } ddstring_t* de::PathDirectory::composePath(const de::PathDirectoryNode* node,