Started switching OpenSpace projects to nested namespaces

Various cleanups
This commit is contained in:
Alexander Bock
2017-07-15 20:01:55 -04:00
parent 9d4215695d
commit 4dba552fd1
331 changed files with 1126 additions and 1917 deletions
+3 -5
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -30,8 +30,7 @@
#include <string>
#include <vector>
namespace openspace {
namespace scripting {
namespace openspace::scripting {
/**
* This structure represents a Lua library, itself consisting of a unique #name and
@@ -78,7 +77,6 @@ struct LuaLibrary {
bool operator<(const LuaLibrary& rhs) const;
};
} // namespace scripting
} // namespace openspace
} // namespace openspace::scripting
#endif // __OPENSPACE_CORE___LUALIBRARY___H__
+4 -7
View File
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -38,11 +38,9 @@
#include <memory>
#include <set>
namespace openspace {
namespace openspace { class SyncBuffer; }
class SyncBuffer;
namespace scripting {
namespace openspace::scripting {
/**
* The ScriptEngine is responsible for handling the execution of custom Lua functions and
@@ -132,7 +130,6 @@ private:
std::string _logFilename;
};
} // namespace scripting
} // namespace openspace
} // namespace openspace::scripting
#endif // __OPENSPACE_CORE___SCRIPTENGINE___H__
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -30,13 +30,11 @@
#include <queue>
#include <vector>
namespace ghoul {
class Dictionary;
} // namespace ghoul
namespace ghoul { class Dictionary; }
namespace openspace {
namespace documentation { struct Documentation; }
namespace scripting {
namespace openspace::documentation { struct Documentation; }
namespace openspace::scripting {
/**
* Maintains an ordered list of <code>ScheduledScript</code>s and provides a simple
@@ -123,7 +121,6 @@ private:
};
} // namespace scripting
} // namespace openspace
} // namespace openspace::scripting
#endif // __OPENSPACE_CORE___SCRIPTSCHEDULER___H__
@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -27,13 +27,11 @@
#include <openspace/scripting/lualibrary.h>
namespace openspace {
namespace scripting {
namespace openspace::scripting {
LuaLibrary generalSystemCapabilities();
LuaLibrary openglSystemCapabilities();
} // namespace scripting
} // namespace openspace
} // namespace openspace::scripting
#endif // __OPENSPACE_CORE___SYSTEMCAPABILITIESBINDING___H__