From d8f847d7070aa433df06aa5231276433e3bc481c Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 24 May 2025 15:01:17 -0500 Subject: [PATCH] [studio/applib] Move popup types into their own directory --- .../studio/applib/include/studioapp/studioapp.hpp | 2 +- src/olympic/studio/applib/src/CMakeLists.txt | 14 +++++++------- .../src/{aboutpopup.cpp => popups/about.cpp} | 2 +- .../src/{aboutpopup.hpp => popups/about.hpp} | 0 .../applib/src/{ => popups}/deleteconfirmation.cpp | 0 .../applib/src/{ => popups}/deleteconfirmation.hpp | 0 .../src/{makecopypopup.cpp => popups/makecopy.cpp} | 2 +- .../src/{makecopypopup.hpp => popups/makecopy.hpp} | 0 .../studio/applib/src/{ => popups}/newdir.cpp | 0 .../studio/applib/src/{ => popups}/newdir.hpp | 0 .../studio/applib/src/{ => popups}/newmenu.cpp | 0 .../studio/applib/src/{ => popups}/newmenu.hpp | 0 .../studio/applib/src/{ => popups}/newproject.cpp | 2 +- .../studio/applib/src/{ => popups}/newproject.hpp | 0 .../studio/applib/src/{ => popups}/renamefile.cpp | 0 .../studio/applib/src/{ => popups}/renamefile.hpp | 0 src/olympic/studio/applib/src/studioui.hpp | 14 +++++++------- 17 files changed, 18 insertions(+), 18 deletions(-) rename src/olympic/studio/applib/src/{aboutpopup.cpp => popups/about.cpp} (97%) rename src/olympic/studio/applib/src/{aboutpopup.hpp => popups/about.hpp} (100%) rename src/olympic/studio/applib/src/{ => popups}/deleteconfirmation.cpp (100%) rename src/olympic/studio/applib/src/{ => popups}/deleteconfirmation.hpp (100%) rename src/olympic/studio/applib/src/{makecopypopup.cpp => popups/makecopy.cpp} (98%) rename src/olympic/studio/applib/src/{makecopypopup.hpp => popups/makecopy.hpp} (100%) rename src/olympic/studio/applib/src/{ => popups}/newdir.cpp (100%) rename src/olympic/studio/applib/src/{ => popups}/newdir.hpp (100%) rename src/olympic/studio/applib/src/{ => popups}/newmenu.cpp (100%) rename src/olympic/studio/applib/src/{ => popups}/newmenu.hpp (100%) rename src/olympic/studio/applib/src/{ => popups}/newproject.cpp (98%) rename src/olympic/studio/applib/src/{ => popups}/newproject.hpp (100%) rename src/olympic/studio/applib/src/{ => popups}/renamefile.cpp (100%) rename src/olympic/studio/applib/src/{ => popups}/renamefile.hpp (100%) diff --git a/src/olympic/studio/applib/include/studioapp/studioapp.hpp b/src/olympic/studio/applib/include/studioapp/studioapp.hpp index 53ad4915..8defebe1 100644 --- a/src/olympic/studio/applib/include/studioapp/studioapp.hpp +++ b/src/olympic/studio/applib/include/studioapp/studioapp.hpp @@ -10,6 +10,6 @@ namespace studio { -void registerModule(studio::Module const*) noexcept; +void registerModule(Module const*) noexcept; } diff --git a/src/olympic/studio/applib/src/CMakeLists.txt b/src/olympic/studio/applib/src/CMakeLists.txt index 79fa52d2..555550ef 100644 --- a/src/olympic/studio/applib/src/CMakeLists.txt +++ b/src/olympic/studio/applib/src/CMakeLists.txt @@ -1,17 +1,17 @@ add_library( StudioAppLib - aboutpopup.cpp app.cpp clawviewer.cpp - deleteconfirmation.cpp filedialogmanager.cpp font.cpp - makecopypopup.cpp - newdir.cpp - newmenu.cpp - newproject.cpp + popups/about.cpp + popups/deleteconfirmation.cpp + popups/makecopy.cpp + popups/newdir.cpp + popups/newmenu.cpp + popups/newproject.cpp + popups/renamefile.cpp projectexplorer.cpp - renamefile.cpp studioui.cpp ) target_compile_definitions( diff --git a/src/olympic/studio/applib/src/aboutpopup.cpp b/src/olympic/studio/applib/src/popups/about.cpp similarity index 97% rename from src/olympic/studio/applib/src/aboutpopup.cpp rename to src/olympic/studio/applib/src/popups/about.cpp index 65844bf5..4b7dc1fd 100644 --- a/src/olympic/studio/applib/src/aboutpopup.cpp +++ b/src/olympic/studio/applib/src/popups/about.cpp @@ -5,7 +5,7 @@ #include #include -#include "aboutpopup.hpp" +#include "about.hpp" namespace olympic { extern ox::String appVersion; diff --git a/src/olympic/studio/applib/src/aboutpopup.hpp b/src/olympic/studio/applib/src/popups/about.hpp similarity index 100% rename from src/olympic/studio/applib/src/aboutpopup.hpp rename to src/olympic/studio/applib/src/popups/about.hpp diff --git a/src/olympic/studio/applib/src/deleteconfirmation.cpp b/src/olympic/studio/applib/src/popups/deleteconfirmation.cpp similarity index 100% rename from src/olympic/studio/applib/src/deleteconfirmation.cpp rename to src/olympic/studio/applib/src/popups/deleteconfirmation.cpp diff --git a/src/olympic/studio/applib/src/deleteconfirmation.hpp b/src/olympic/studio/applib/src/popups/deleteconfirmation.hpp similarity index 100% rename from src/olympic/studio/applib/src/deleteconfirmation.hpp rename to src/olympic/studio/applib/src/popups/deleteconfirmation.hpp diff --git a/src/olympic/studio/applib/src/makecopypopup.cpp b/src/olympic/studio/applib/src/popups/makecopy.cpp similarity index 98% rename from src/olympic/studio/applib/src/makecopypopup.cpp rename to src/olympic/studio/applib/src/popups/makecopy.cpp index becc7130..fa998171 100644 --- a/src/olympic/studio/applib/src/makecopypopup.cpp +++ b/src/olympic/studio/applib/src/popups/makecopy.cpp @@ -4,7 +4,7 @@ #include -#include "makecopypopup.hpp" +#include "makecopy.hpp" namespace studio { diff --git a/src/olympic/studio/applib/src/makecopypopup.hpp b/src/olympic/studio/applib/src/popups/makecopy.hpp similarity index 100% rename from src/olympic/studio/applib/src/makecopypopup.hpp rename to src/olympic/studio/applib/src/popups/makecopy.hpp diff --git a/src/olympic/studio/applib/src/newdir.cpp b/src/olympic/studio/applib/src/popups/newdir.cpp similarity index 100% rename from src/olympic/studio/applib/src/newdir.cpp rename to src/olympic/studio/applib/src/popups/newdir.cpp diff --git a/src/olympic/studio/applib/src/newdir.hpp b/src/olympic/studio/applib/src/popups/newdir.hpp similarity index 100% rename from src/olympic/studio/applib/src/newdir.hpp rename to src/olympic/studio/applib/src/popups/newdir.hpp diff --git a/src/olympic/studio/applib/src/newmenu.cpp b/src/olympic/studio/applib/src/popups/newmenu.cpp similarity index 100% rename from src/olympic/studio/applib/src/newmenu.cpp rename to src/olympic/studio/applib/src/popups/newmenu.cpp diff --git a/src/olympic/studio/applib/src/newmenu.hpp b/src/olympic/studio/applib/src/popups/newmenu.hpp similarity index 100% rename from src/olympic/studio/applib/src/newmenu.hpp rename to src/olympic/studio/applib/src/popups/newmenu.hpp diff --git a/src/olympic/studio/applib/src/newproject.cpp b/src/olympic/studio/applib/src/popups/newproject.cpp similarity index 98% rename from src/olympic/studio/applib/src/newproject.cpp rename to src/olympic/studio/applib/src/popups/newproject.cpp index b4588092..2e2038a6 100644 --- a/src/olympic/studio/applib/src/newproject.cpp +++ b/src/olympic/studio/applib/src/popups/newproject.cpp @@ -7,7 +7,7 @@ #include #include -#include "filedialogmanager.hpp" +#include "../filedialogmanager.hpp" #include "newproject.hpp" namespace studio { diff --git a/src/olympic/studio/applib/src/newproject.hpp b/src/olympic/studio/applib/src/popups/newproject.hpp similarity index 100% rename from src/olympic/studio/applib/src/newproject.hpp rename to src/olympic/studio/applib/src/popups/newproject.hpp diff --git a/src/olympic/studio/applib/src/renamefile.cpp b/src/olympic/studio/applib/src/popups/renamefile.cpp similarity index 100% rename from src/olympic/studio/applib/src/renamefile.cpp rename to src/olympic/studio/applib/src/popups/renamefile.cpp diff --git a/src/olympic/studio/applib/src/renamefile.hpp b/src/olympic/studio/applib/src/popups/renamefile.hpp similarity index 100% rename from src/olympic/studio/applib/src/renamefile.hpp rename to src/olympic/studio/applib/src/popups/renamefile.hpp diff --git a/src/olympic/studio/applib/src/studioui.hpp b/src/olympic/studio/applib/src/studioui.hpp index b56fe9a8..d1bf8e83 100644 --- a/src/olympic/studio/applib/src/studioui.hpp +++ b/src/olympic/studio/applib/src/studioui.hpp @@ -14,14 +14,14 @@ #include #include -#include "aboutpopup.hpp" -#include "deleteconfirmation.hpp" -#include "makecopypopup.hpp" -#include "newdir.hpp" -#include "newmenu.hpp" -#include "newproject.hpp" +#include "popups/about.hpp" +#include "popups/deleteconfirmation.hpp" +#include "popups/makecopy.hpp" +#include "popups/newdir.hpp" +#include "popups/newmenu.hpp" +#include "popups/newproject.hpp" #include "projectexplorer.hpp" -#include "renamefile.hpp" +#include "popups/renamefile.hpp" namespace studio {