From 90985e849efc5b82cd910fde7da6f6a5c7c777bb Mon Sep 17 00:00:00 2001 From: Lukasz Gromanowski Date: Sun, 19 Jun 2011 18:14:03 +0200 Subject: [PATCH] Mantis: #18 - Move components from global namespace into their own namespace. Moving classes from components/misc into Misc namespace. Note: Misc namespace introduced conflict with ESM::Misc and MWClass::Misc classes, so both of them are renamed to ESM::Miscellaneous and MWClass::Miscellaneous. Signed-off-by: Lukasz Gromanowski --- apps/openmw/engine.cpp | 4 ++-- apps/openmw/main.cpp | 2 +- apps/openmw/mwclass/classes.cpp | 2 +- apps/openmw/mwclass/misc.cpp | 28 +++++++++++++------------- apps/openmw/mwclass/misc.hpp | 2 +- apps/openmw/mwworld/containerstore.hpp | 2 +- apps/openmw/mwworld/world.cpp | 4 ++-- components/esm/esm_reader.cpp | 2 ++ components/esm/loadmisc.cpp | 2 +- components/esm/loadmisc.hpp | 2 +- components/esm_store/cell_store.hpp | 2 +- components/esm_store/store.hpp | 2 +- components/misc/fileops.cpp | 4 ++++ components/misc/fileops.hpp | 9 +++++++-- components/misc/slice_array.hpp | 9 +++++++-- components/misc/stringops.cpp | 5 +++++ components/misc/stringops.hpp | 9 +++++++-- components/nif/controlled.hpp | 2 +- components/nif/data.hpp | 8 ++++---- components/nif/extra.hpp | 4 ++-- components/nif/nif_file.cpp | 1 + components/nif/nif_file.hpp | 10 ++++----- components/nif/record.hpp | 4 +++- components/nifogre/ogre_nif_loader.cpp | 1 + 24 files changed, 75 insertions(+), 45 deletions(-) diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index e1386d3c4..dae2c9df7 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -338,12 +338,12 @@ void OMW::Engine::go() ogreCfg.insert(0, cfgUserDir); //A local plugins.cfg will be used if it exist, otherwise look in the default path - if(!isFile(plugCfg.c_str())) + if(!Misc::isFile(plugCfg.c_str())) { plugCfg.insert(0, cfgDir); } - mOgre.configure(!isFile(ogreCfg.c_str()), cfgUserDir, plugCfg, false); + mOgre.configure(!Misc::isFile(ogreCfg.c_str()), cfgUserDir, plugCfg, false); addResourcesDirectory (mDataDir / "Meshes"); addResourcesDirectory (mDataDir / "Textures"); diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp index e117a0688..56f78afe3 100644 --- a/apps/openmw/main.cpp +++ b/apps/openmw/main.cpp @@ -84,7 +84,7 @@ bool parseOptions (int argc, char**argv, OMW::Engine& engine) //If there is an openmw.cfg in the current path use that as global config //Otherwise try getPath std::string cfgFile = "openmw.cfg"; - if(!isFile(cfgFile.c_str())) + if(!Misc::isFile(cfgFile.c_str())) { cfgFile = Files::getPath (Files::Path_ConfigGlobal, "openmw", "openmw.cfg"); } diff --git a/apps/openmw/mwclass/classes.cpp b/apps/openmw/mwclass/classes.cpp index 745614852..e9538a6cb 100644 --- a/apps/openmw/mwclass/classes.cpp +++ b/apps/openmw/mwclass/classes.cpp @@ -42,7 +42,7 @@ namespace MWClass ItemLevList::registerSelf(); Light::registerSelf(); Lockpick::registerSelf(); - Misc::registerSelf(); + Miscellaneous::registerSelf(); Probe::registerSelf(); Repair::registerSelf(); Static::registerSelf(); diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp index f9995b77f..2986c812d 100644 --- a/apps/openmw/mwclass/misc.cpp +++ b/apps/openmw/mwclass/misc.cpp @@ -14,11 +14,11 @@ namespace MWClass { - void Misc::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender, + void Miscellaneous::insertObj (const MWWorld::Ptr& ptr, MWRender::CellRenderImp& cellRender, MWWorld::Environment& environment) const { - ESMS::LiveCellRef *ref = - ptr.get(); + ESMS::LiveCellRef *ref = + ptr.get(); assert (ref->base != NULL); const std::string &model = ref->base->model; @@ -31,39 +31,39 @@ namespace MWClass } } - std::string Misc::getName (const MWWorld::Ptr& ptr) const + std::string Miscellaneous::getName (const MWWorld::Ptr& ptr) const { - ESMS::LiveCellRef *ref = - ptr.get(); + ESMS::LiveCellRef *ref = + ptr.get(); return ref->base->name; } - boost::shared_ptr Misc::activate (const MWWorld::Ptr& ptr, + boost::shared_ptr Miscellaneous::activate (const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor, const MWWorld::Environment& environment) const { return boost::shared_ptr ( new MWWorld::ActionTake (ptr)); } - void Misc::insertIntoContainer (const MWWorld::Ptr& ptr, + void Miscellaneous::insertIntoContainer (const MWWorld::Ptr& ptr, MWWorld::ContainerStore& containerStore) const { insertIntoContainerStore (ptr, containerStore.miscItems); } - std::string Misc::getScript (const MWWorld::Ptr& ptr) const + std::string Miscellaneous::getScript (const MWWorld::Ptr& ptr) const { - ESMS::LiveCellRef *ref = - ptr.get(); + ESMS::LiveCellRef *ref = + ptr.get(); return ref->base->script; } - void Misc::registerSelf() + void Miscellaneous::registerSelf() { - boost::shared_ptr instance (new Misc); + boost::shared_ptr instance (new Miscellaneous); - registerClass (typeid (ESM::Misc).name(), instance); + registerClass (typeid (ESM::Miscellaneous).name(), instance); } } diff --git a/apps/openmw/mwclass/misc.hpp b/apps/openmw/mwclass/misc.hpp index 0da1f0d3a..81262cbee 100644 --- a/apps/openmw/mwclass/misc.hpp +++ b/apps/openmw/mwclass/misc.hpp @@ -5,7 +5,7 @@ namespace MWClass { - class Misc : public MWWorld::Class + class Miscellaneous : public MWWorld::Class { public: diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp index c05bfe156..971a79c15 100644 --- a/apps/openmw/mwworld/containerstore.hpp +++ b/apps/openmw/mwworld/containerstore.hpp @@ -16,7 +16,7 @@ namespace MWWorld ESMS::CellRefList ingreds; ESMS::CellRefList lights; ESMS::CellRefList lockpicks; - ESMS::CellRefList miscItems; + ESMS::CellRefList miscItems; ESMS::CellRefList probes; ESMS::CellRefList repairs; ESMS::CellRefList weapons; diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp index f1563e621..3a4151e3a 100644 --- a/apps/openmw/mwworld/world.cpp +++ b/apps/openmw/mwworld/world.cpp @@ -135,7 +135,7 @@ namespace MWWorld if (ESMS::LiveCellRef *ref = cell.lockpicks.find (name)) return Ptr (ref, &cell); - if (ESMS::LiveCellRef *ref = cell.miscItems.find (name)) + if (ESMS::LiveCellRef *ref = cell.miscItems.find (name)) return Ptr (ref, &cell); if (ESMS::LiveCellRef *ref = cell.npcs.find (name)) @@ -198,7 +198,7 @@ namespace MWWorld if (ESMS::LiveCellRef *ref = searchViaHandle (handle, cell.lockpicks)) return Ptr (ref, &cell); - if (ESMS::LiveCellRef *ref = searchViaHandle (handle, cell.miscItems)) + if (ESMS::LiveCellRef *ref = searchViaHandle (handle, cell.miscItems)) return Ptr (ref, &cell); if (ESMS::LiveCellRef *ref = searchViaHandle (handle, cell.npcs)) diff --git a/components/esm/esm_reader.cpp b/components/esm/esm_reader.cpp index 00a34e2df..2c342178b 100644 --- a/components/esm/esm_reader.cpp +++ b/components/esm/esm_reader.cpp @@ -3,6 +3,8 @@ namespace ESM { +using namespace Misc; + ESM_Context ESMReader::getContext() { // Update the file position before returning diff --git a/components/esm/loadmisc.cpp b/components/esm/loadmisc.cpp index dc3d04f50..0206661c4 100644 --- a/components/esm/loadmisc.cpp +++ b/components/esm/loadmisc.cpp @@ -3,7 +3,7 @@ namespace ESM { -void Misc::load(ESMReader &esm) +void Miscellaneous::load(ESMReader &esm) { model = esm.getHNString("MODL"); name = esm.getHNOString("FNAM"); diff --git a/components/esm/loadmisc.hpp b/components/esm/loadmisc.hpp index 36400eb74..7e151f797 100644 --- a/components/esm/loadmisc.hpp +++ b/components/esm/loadmisc.hpp @@ -11,7 +11,7 @@ namespace ESM * carried, bought and sold. It also includes keys. */ -struct Misc +struct Miscellaneous { struct MCDTstruct { diff --git a/components/esm_store/cell_store.hpp b/components/esm_store/cell_store.hpp index 0b8c25d4f..59464236f 100644 --- a/components/esm_store/cell_store.hpp +++ b/components/esm_store/cell_store.hpp @@ -100,7 +100,7 @@ namespace ESMS CellRefList itemLists; CellRefList lights; CellRefList lockpicks; - CellRefList miscItems; + CellRefList miscItems; CellRefList npcs; CellRefList probes; CellRefList repairs; diff --git a/components/esm_store/store.hpp b/components/esm_store/store.hpp index 2af6fab37..e3bbf9e82 100644 --- a/components/esm_store/store.hpp +++ b/components/esm_store/store.hpp @@ -52,7 +52,7 @@ namespace ESMS RecListT itemLists; RecListT lights; RecListT lockpicks; - RecListT miscItems; + RecListT miscItems; RecListWithIDT npcs; RecListT npcChange; RecListT probes; diff --git a/components/misc/fileops.cpp b/components/misc/fileops.cpp index b7b9a8d78..eb3b58d84 100644 --- a/components/misc/fileops.cpp +++ b/components/misc/fileops.cpp @@ -4,9 +4,13 @@ #include +namespace Misc +{ + bool isFile(const char *name) { boost::filesystem::path cfg_file_path(name); return boost::filesystem::exists(cfg_file_path); } +} diff --git a/components/misc/fileops.hpp b/components/misc/fileops.hpp index 004f01dd6..f4e7701bb 100644 --- a/components/misc/fileops.hpp +++ b/components/misc/fileops.hpp @@ -1,8 +1,11 @@ -#ifndef __FILEOPS_H_ -#define __FILEOPS_H_ +#ifndef MISC_FILEOPS_H +#define MISC_FILEOPS_H #include +namespace Misc +{ + /// Check if a given path is an existing file (not a directory) bool isFile(const char *name); @@ -10,4 +13,6 @@ bool isFile(const char *name); std::string macBundlePath(); #endif +} + #endif diff --git a/components/misc/slice_array.hpp b/components/misc/slice_array.hpp index f7e2ffeff..cd58e7bd6 100644 --- a/components/misc/slice_array.hpp +++ b/components/misc/slice_array.hpp @@ -21,14 +21,17 @@ */ -#ifndef _SLICE_ARRAY_H_ -#define _SLICE_ARRAY_H_ +#ifndef MISC_SLICE_ARRAY_H +#define MISC_SLICE_ARRAY_H // A simple array implementation containing a pointer and a // length. Used for holding slices into a data buffer. #include #include +namespace Misc +{ + template struct SliceArray { @@ -74,4 +77,6 @@ typedef SliceArray SString; typedef SliceArray IntArray; typedef SliceArray FloatArray; +} + #endif diff --git a/components/misc/stringops.cpp b/components/misc/stringops.cpp index f6b63372c..53eed1fdc 100644 --- a/components/misc/stringops.cpp +++ b/components/misc/stringops.cpp @@ -3,6 +3,9 @@ #include #include +namespace Misc +{ + bool begins(const char* str1, const char* str2) { while(*str2) @@ -57,3 +60,5 @@ bool iends(const char* str1, const char* str2) return strcasecmp(str2, str1+len1-len2) == 0; } + +} diff --git a/components/misc/stringops.hpp b/components/misc/stringops.hpp index e76b8a87a..a32104bf3 100644 --- a/components/misc/stringops.hpp +++ b/components/misc/stringops.hpp @@ -1,5 +1,8 @@ -#ifndef __STRINGOPS_H -#define __STRINGOPS_H +#ifndef MISC_STRINGOPS_H +#define MISC_STRINGOPS_H + +namespace Misc +{ /// Returns true if str1 begins with substring str2 bool begins(const char* str1, const char* str2); @@ -13,4 +16,6 @@ bool ibegins(const char* str1, const char* str2); /// Case insensitive, returns true if str1 ends with substring str2 bool iends(const char* str1, const char* str2); +} + #endif diff --git a/components/nif/controlled.hpp b/components/nif/controlled.hpp index 67f2dec36..d59950132 100644 --- a/components/nif/controlled.hpp +++ b/components/nif/controlled.hpp @@ -46,7 +46,7 @@ public: class Named : public Controlled { public: - SString name; + Misc::SString name; void read(NIFFile *nif) { diff --git a/components/nif/data.hpp b/components/nif/data.hpp index 6fc2c4b82..ee8a9e4b3 100644 --- a/components/nif/data.hpp +++ b/components/nif/data.hpp @@ -37,7 +37,7 @@ public: // internal (data is inside the nif itself) texture? bool external; - SString filename; // In case of external textures + Misc::SString filename; // In case of external textures NiPixelDataPtr data; // In case of internal textures /* Pixel layout @@ -88,7 +88,7 @@ public: class ShapeData : public Record { public: - FloatArray vertices, normals, colors, uvlist; + Misc::FloatArray vertices, normals, colors, uvlist; const Vector *center; float radius; @@ -123,7 +123,7 @@ class NiTriShapeData : public ShapeData { public: // Triangles, three vertex indices per triangle - SliceArray triangles; + Misc::SliceArray triangles; void read(NIFFile *nif) { @@ -377,7 +377,7 @@ public: { const BoneTrafo *trafo; const Vector4 *unknown; - SliceArray weights; + Misc::SliceArray weights; }; const BoneTrafo *trafo; diff --git a/components/nif/extra.hpp b/components/nif/extra.hpp index 25375c325..eec1aa7b4 100644 --- a/components/nif/extra.hpp +++ b/components/nif/extra.hpp @@ -65,7 +65,7 @@ public: struct TextKey { float time; - SString text; + Misc::SString text; }; std::vector list; @@ -93,7 +93,7 @@ public: "MRK" - marker, only visible in the editor, not rendered in-game "NCO" - no collision */ - SString string; + Misc::SString string; void read(NIFFile *nif) { diff --git a/components/nif/nif_file.cpp b/components/nif/nif_file.cpp index 3c7d7fb17..361e5f6e9 100644 --- a/components/nif/nif_file.cpp +++ b/components/nif/nif_file.cpp @@ -36,6 +36,7 @@ #include using namespace std; using namespace Nif; +using namespace Misc; /* This file implements functions from the NIFFile class. It is also where we stash all the functions we couldn't add as inline diff --git a/components/nif/nif_file.hpp b/components/nif/nif_file.hpp index ebf1fe4a4..951ae1f75 100644 --- a/components/nif/nif_file.hpp +++ b/components/nif/nif_file.hpp @@ -128,24 +128,24 @@ class NIFFile char getByte() { return getType(); } template - SliceArray getArrayLen(int num) - { return SliceArray((const X*)inp->getPtr(num*sizeof(X)),num); } + Misc::SliceArray getArrayLen(int num) + { return Misc::SliceArray((const X*)inp->getPtr(num*sizeof(X)),num); } template - SliceArray getArray() + Misc::SliceArray getArray() { int len = getInt(); return getArrayLen(len); } - SString getString() { return getArray(); } + Misc::SString getString() { return getArray(); } const Vector *getVector() { return getPtr(); } const Matrix *getMatrix() { return getPtr(); } const Transformation *getTrafo() { return getPtr(); } const Vector4 *getVector4() { return getPtr(); } - FloatArray getFloatLen(int num) + Misc::FloatArray getFloatLen(int num) { return getArrayLen(num); } // For fixed-size strings where you already know the size diff --git a/components/nif/record.hpp b/components/nif/record.hpp index 8b8910118..e94e3d0d3 100644 --- a/components/nif/record.hpp +++ b/components/nif/record.hpp @@ -24,6 +24,8 @@ #ifndef _NIF_RECORD_H_ #define _NIF_RECORD_H_ +#include + namespace Nif { @@ -88,7 +90,7 @@ struct Record { // Record type and type name int recType; - SString recName; + Misc::SString recName; Record() : recType(RC_MISSING) {} diff --git a/components/nifogre/ogre_nif_loader.cpp b/components/nifogre/ogre_nif_loader.cpp index 2db51b003..e4d09d941 100644 --- a/components/nifogre/ogre_nif_loader.cpp +++ b/components/nifogre/ogre_nif_loader.cpp @@ -50,6 +50,7 @@ using namespace std; using namespace Ogre; using namespace Nif; using namespace Mangle::VFS; +using namespace Misc; NIFLoader& NIFLoader::getSingleton() {