From 641c6ae637a8a80def29816821327d45fbb59735 Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Fri, 6 Dec 2019 19:22:07 -0600
Subject: [PATCH] [nostalgia/studio] Add studio::Editor type as base type for
 editors

---
 src/nostalgia/studio/lib/CMakeLists.txt | 2 ++
 src/nostalgia/studio/main.cpp           | 6 +-----
 src/nostalgia/studio/studio.hpp         | 1 +
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/nostalgia/studio/lib/CMakeLists.txt b/src/nostalgia/studio/lib/CMakeLists.txt
index 4614c961..6a9fa89d 100644
--- a/src/nostalgia/studio/lib/CMakeLists.txt
+++ b/src/nostalgia/studio/lib/CMakeLists.txt
@@ -3,6 +3,7 @@ set(CMAKE_AUTOMOC ON)
 
 add_library(
 	NostalgiaStudio SHARED
+		editor.cpp
 		json_read.cpp
 		json_write.cpp
 		wizard.cpp
@@ -23,6 +24,7 @@ target_link_libraries(
 
 install(
 	FILES
+		editor.hpp
 		json.hpp
 		json_err.hpp
 		json_read.hpp
diff --git a/src/nostalgia/studio/main.cpp b/src/nostalgia/studio/main.cpp
index 7c9ef2c1..e8197df2 100644
--- a/src/nostalgia/studio/main.cpp
+++ b/src/nostalgia/studio/main.cpp
@@ -16,7 +16,7 @@
 using namespace nostalgia::studio;
 using namespace ox;
 
-int run(int argc, char **args) {
+int main(int argc, char **args) {
 	ClArgs clargs(argc, const_cast<const char**>(args));
 	QString argProfilePath = clargs.getString("profile").c_str();
 
@@ -31,7 +31,3 @@ int run(int argc, char **args) {
 
 	return app.exec();
 }
-
-int main(int argc, char **args) {
-	return run(argc, args);
-}
diff --git a/src/nostalgia/studio/studio.hpp b/src/nostalgia/studio/studio.hpp
index cc347f9b..c8313f55 100644
--- a/src/nostalgia/studio/studio.hpp
+++ b/src/nostalgia/studio/studio.hpp
@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include "lib/editor.hpp"
 #include "lib/json.hpp"
 #include "lib/plugin.hpp"
 #include "lib/project.hpp"