From 55a3c43db4e7b26d9d27442f3ee5fac23055efe2 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Thu, 18 Dec 2014 17:21:20 +0100
Subject: [PATCH] Move imgui file to its own folder

---
 ext/ghoul                                  | 2 +-
 include/openspace/engine/openspaceengine.h | 2 +-
 include/openspace/{engine => gui}/gui.h    | 0
 src/CMakeLists.txt                         | 6 ++++++
 src/{engine => gui}/gui.cpp                | 2 +-
 src/scenegraph/scenegraph.cpp              | 2 +-
 src/util/spicemanager.cpp                  | 3 +--
 7 files changed, 11 insertions(+), 6 deletions(-)
 rename include/openspace/{engine => gui}/gui.h (100%)
 rename src/{engine => gui}/gui.cpp (99%)

diff --git a/ext/ghoul b/ext/ghoul
index fd9674595b..8e787753ab 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit fd9674595b34ade668935e549ed2b42487deba95
+Subproject commit 8e787753ab54f60c9a74a1ded9ed9191f4b42502
diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h
index a0b38eb422..0f7d9e5c29 100644
--- a/include/openspace/engine/openspaceengine.h
+++ b/include/openspace/engine/openspaceengine.h
@@ -29,7 +29,7 @@
 #include <openspace/interaction/luaconsole.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/engine/configurationmanager.h>
-#include <openspace/engine/gui.h>
+#include <openspace/gui/gui.h>
 #include <ghoul/cmdparser/commandlineparser.h>
 
 namespace openspace {
diff --git a/include/openspace/engine/gui.h b/include/openspace/gui/gui.h
similarity index 100%
rename from include/openspace/engine/gui.h
rename to include/openspace/gui/gui.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e1a36a3bef..8edb55f9e7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -46,6 +46,12 @@ file(GLOB ENGINE_HEADER ${HEADER_ROOT_DIR}/openspace/engine/*.h)
 set(OPENSPACE_HEADER ${OPENSPACE_HEADER} ${ENGINE_HEADER})
 source_group(Engine FILES ${ENGINE_SOURCE} ${ENGINE_HEADER})
 
+file(GLOB GUI_SOURCE ${SOURCE_ROOT_DIR}/gui/*.cpp)
+set(OPENSPACE_SOURCE ${OPENSPACE_SOURCE} ${GUI_SOURCE})
+file(GLOB GUI_HEADER ${HEADER_ROOT_DIR}/openspace/gui/*.h)
+set(OPENSPACE_HEADER ${OPENSPACE_HEADER} ${GUI_HEADER})
+source_group(GUI FILES ${GUI_SOURCE} ${GUI_HEADER})
+
 file(GLOB INTERACTION_SOURCE ${SOURCE_ROOT_DIR}/interaction/*.cpp)
 set(OPENSPACE_SOURCE ${OPENSPACE_SOURCE} ${INTERACTION_SOURCE})
 file(GLOB INTERACTION_HEADER ${HEADER_ROOT_DIR}/openspace/interaction/*.h)
diff --git a/src/engine/gui.cpp b/src/gui/gui.cpp
similarity index 99%
rename from src/engine/gui.cpp
rename to src/gui/gui.cpp
index 5de3254b65..70ac8d5d55 100644
--- a/src/engine/gui.cpp
+++ b/src/gui/gui.cpp
@@ -22,7 +22,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include <openspace/engine/gui.h>
+#include <openspace/gui/gui.h>
 
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/properties/property.h>
diff --git a/src/scenegraph/scenegraph.cpp b/src/scenegraph/scenegraph.cpp
index e0614a6dd9..8ebaccbee8 100644
--- a/src/scenegraph/scenegraph.cpp
+++ b/src/scenegraph/scenegraph.cpp
@@ -31,7 +31,7 @@
 #include <openspace/query/query.h>
 #include <openspace/util/time.h>
 #include <openspace/abuffer/abuffer.h>
-#include <openspace/engine/gui.h>
+#include <openspace/gui/gui.h>
 
 #include "ghoul/logging/logmanager.h"
 #include "ghoul/opengl/programobject.h"
diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp
index f845e95778..2c15eb1149 100644
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -118,8 +118,7 @@ SpiceManager::KernelIdentifier SpiceManager::loadKernel(const std::string& fileP
 	if (hasError)
 		return KernelFailed;
 	else {
-		KernelInformation&& info = { path, std::move(kernelId) };
-		_loadedKernels.push_back(info);
+		_loadedKernels.push_back({ path, std::move(kernelId) });
 		return kernelId;
 	}
 }