From 4c51383bce60bc49e36f17675d0a68f0843279ea Mon Sep 17 00:00:00 2001
From: andreja6 <andrejaandjic@hotmail.com>
Date: Fri, 8 Nov 2019 17:55:59 -0800
Subject: [PATCH] Moved some variables in datamodelinstance from public to
 private

---
 Application.cpp     | 5 +----
 DataModelInstance.h | 6 +++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Application.cpp b/Application.cpp
index b194ead..373ce09 100644
--- a/Application.cpp
+++ b/Application.cpp
@@ -696,12 +696,9 @@ void Application::onKeyPressed(int key)
 	{
 		deleteInstance();
 	}
-	if (GetHoldKeyState(VK_RCONTROL))
+	if (GetHoldKeyState(VK_RCONTROL) && key=='O')
 	{
-		if (key=='O')
-		{
 			_dataModel->getOpen();
-		}
 	}
 }
 void Application::onKeyUp(int key)
diff --git a/DataModelInstance.h b/DataModelInstance.h
index aa91b5b..926d916 100644
--- a/DataModelInstance.h
+++ b/DataModelInstance.h
@@ -22,10 +22,7 @@ public:
 	bool					readXMLFileStream(std::ifstream* file);
 	void					drawMessage(RenderDevice*);
 	WorkspaceInstance*		getWorkspace();
-	WorkspaceInstance*		workspace;
-	LevelInstance *			level;
 	LevelInstance *			getLevel();
-	GuiRoot*				guiRoot;
 	std::string				message;
 	std::string				_loadedFileName;
 	bool					showMessage;
@@ -51,4 +48,7 @@ private:
 	std::string				_errMsg;
 	bool					_legacyLoad;
 	float					_modY;
+	WorkspaceInstance*		workspace;
+	LevelInstance *			level;
+	GuiRoot*				guiRoot;
 };