mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-23 04:30:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move all network namespace members into the openspace namespace

Browse Source
This commit is contained in:
Emil Axelsson
2016-09-30 14:13:36 +02:00
parent 4f61479190
commit b448b0ec5e
15 changed files with 153 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/engine/openspaceengine.cpp
View File

@@ -146,7 +146,7 @@ OpenSpaceEngine::OpenSpaceEngine(std::string programName,
#ifdef OPENSPACE_MODULE_ONSCREENGUI_ENABLED
, _gui(new gui::GUI)
#endif
, _parallelConnection(new network::ParallelConnection)
, _parallelConnection(new ParallelConnection)
, _windowWrapper(std::move(windowWrapper))
, _globalPropertyNamespace(new properties::PropertyOwner)
, _isMaster(false)
@@ -1151,7 +1151,7 @@ gui::GUI& OpenSpaceEngine::gui() {
}
#endif
network::ParallelConnection& OpenSpaceEngine::parallelConnection() {
ParallelConnection& OpenSpaceEngine::parallelConnection() {
ghoul_assert(_parallelConnection, "ParallelConnection must not be nullptr");
return *_parallelConnection;
}