Merge commit 'e723ead864edb4bc160e4d69713309174ad9e82e'

src/olympic/studio/applib/src/CMakeLists.txt

@@ -1,17 +1,17 @@
 add_library(
 	StudioAppLib
 		aboutpopup.cpp
+		app.cpp
 		clawviewer.cpp
 		deleteconfirmation.cpp
 		filedialogmanager.cpp
-		main.cpp
 		makecopypopup.cpp
 		newdir.cpp
 		newmenu.cpp
 		newproject.cpp
 		projectexplorer.cpp
 		renamefile.cpp
-		studioapp.cpp
+		studioui.cpp
 )
 target_compile_definitions(
 	StudioAppLib PUBLIC

src/olympic/studio/applib/src/app.cpp

@@ -11,8 +11,7 @@
 #include <turbine/turbine.hpp>
 
 #include <studio/context.hpp>
-#include <studioapp/studioapp.hpp>
-#include "studioapp.hpp"
+#include "studioui.hpp"
 
 namespace studio {
 

src/olympic/studio/applib/src/studioui.cpp

@@ -14,7 +14,7 @@
 #include <studio/configio.hpp>
 #include "clawviewer.hpp"
 #include "filedialogmanager.hpp"
-#include "studioapp.hpp"
+#include "studioui.hpp"
 
 namespace studio {