Changing WindowWrapper from pointer to reference

This commit is contained in:
Alexander Bock
2015-10-26 15:10:15 -05:00
parent f3fd055db8
commit 20861d68ad
9 changed files with 32 additions and 31 deletions
+3 -2
View File
@@ -182,6 +182,7 @@ bool OpenSpaceEngine::create(
ghoul::initialize();
ghoul_assert(!_engine, "OpenSpaceEngine was already created");
ghoul_assert(windowWrapper != nullptr, "No Window Wrapper was provided");
// Initialize the LogManager and add the console log as this will be used every time
// and we need a fall back if something goes wrong between here and when we add the
@@ -834,9 +835,9 @@ properties::PropertyOwner* OpenSpaceEngine::globalPropertyOwner() {
return _globalPropertyNamespace;
}
WindowWrapper* OpenSpaceEngine::windowWrapper() {
WindowWrapper& OpenSpaceEngine::windowWrapper() {
ghoul_assert(_windowWrapper, "Window Wrapper");
return _windowWrapper;
return *_windowWrapper;
}
} // namespace openspace