From 843da4a810c70cd1d4098eef9bbb86f657324944 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Thu, 17 Dec 2020 20:40:23 -0600 Subject: [PATCH] [nostalgia] Rename plugin references to module --- CMakeLists.txt | 4 ++-- src/nostalgia/core/studio/CMakeLists.txt | 2 +- src/nostalgia/core/studio/consts.hpp | 2 +- src/nostalgia/core/studio/core-studio.json | 4 ++-- src/nostalgia/core/studio/tilesheeteditor.cpp | 4 ++-- src/nostalgia/world/studio/CMakeLists.txt | 2 +- src/nostalgia/world/studio/world-studio.json | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fb188cd..8672b5f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,7 +97,7 @@ if(APPLE) set(CMAKE_INSTALL_NAME_DIR "@executable_path/../Library/nostalgia") set(NOSTALGIA_DIST_BIN nostalgia-studio.app/Contents/MacOS) set(NOSTALGIA_DIST_LIB nostalgia-studio.app/Contents/Library) - set(NOSTALGIA_DIST_PLUGIN nostalgia-studio.app/Contents/Plugins) + set(NOSTALGIA_DIST_MODULE nostalgia-studio.app/Contents/Plugins) set(NOSTALGIA_DIST_RESOURCES nostalgia-studio.app/Contents/Resources) set(NOSTALGIA_DIST_MAC_APP_CONTENTS nostalgia-studio.app/Contents) else() @@ -108,7 +108,7 @@ else() set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) set(NOSTALGIA_DIST_BIN bin) set(NOSTALGIA_DIST_LIB lib) - set(NOSTALGIA_DIST_PLUGIN lib/nostalgia/modules) + set(NOSTALGIA_DIST_MODULE lib/nostalgia/modules) set(NOSTALGIA_DIST_RESOURCES share) endif() diff --git a/src/nostalgia/core/studio/CMakeLists.txt b/src/nostalgia/core/studio/CMakeLists.txt index 81ed0da0..e3e66aa5 100644 --- a/src/nostalgia/core/studio/CMakeLists.txt +++ b/src/nostalgia/core/studio/CMakeLists.txt @@ -34,5 +34,5 @@ install( TARGETS NostalgiaCore-Studio LIBRARY DESTINATION - ${NOSTALGIA_DIST_PLUGIN} + ${NOSTALGIA_DIST_MODULE} ) diff --git a/src/nostalgia/core/studio/consts.hpp b/src/nostalgia/core/studio/consts.hpp index c4b9c569..18957778 100644 --- a/src/nostalgia/core/studio/consts.hpp +++ b/src/nostalgia/core/studio/consts.hpp @@ -10,7 +10,7 @@ namespace nostalgia::core { -constexpr auto PluginName = "NostalgiaCore"; +constexpr auto ModuleName = "NostalgiaCore"; constexpr auto TileSheetDir = "/TileSheets/"; constexpr auto PaletteDir = "/Palettes/"; diff --git a/src/nostalgia/core/studio/core-studio.json b/src/nostalgia/core/studio/core-studio.json index 23100699..98df762c 100644 --- a/src/nostalgia/core/studio/core-studio.json +++ b/src/nostalgia/core/studio/core-studio.json @@ -1,3 +1,3 @@ { - "plugin_name": "Nostalgia Core" -} \ No newline at end of file + "module_name": "Nostalgia Core" +} diff --git a/src/nostalgia/core/studio/tilesheeteditor.cpp b/src/nostalgia/core/studio/tilesheeteditor.cpp index 590e7f8a..8e62a214 100644 --- a/src/nostalgia/core/studio/tilesheeteditor.cpp +++ b/src/nostalgia/core/studio/tilesheeteditor.cpp @@ -966,7 +966,7 @@ void TileSheetEditor::setPalette() { } void TileSheetEditor::saveState() { - QSettings settings(m_ctx->orgName, PluginName); + QSettings settings(m_ctx->orgName, ModuleName); settings.beginGroup("TileSheetEditor/" + m_itemName); settings.setValue("m_splitter/state", m_splitter->saveState()); settings.setValue("m_sheetData/tileRows", m_sheetData.rows()); @@ -976,7 +976,7 @@ void TileSheetEditor::saveState() { } void TileSheetEditor::restoreState() { - QSettings settings(m_ctx->orgName, PluginName); + QSettings settings(m_ctx->orgName, ModuleName); settings.beginGroup("TileSheetEditor/" + m_itemName); m_splitter->restoreState(settings.value("m_splitter/state", m_splitter->saveState()).toByteArray()); m_colorPicker.colorTable->horizontalHeader()->restoreState(settings.value("m_colorPicker.colorTable/geometry", m_colorPicker.colorTable->horizontalHeader()->saveState()).toByteArray()); diff --git a/src/nostalgia/world/studio/CMakeLists.txt b/src/nostalgia/world/studio/CMakeLists.txt index 2630a26f..583f64b0 100644 --- a/src/nostalgia/world/studio/CMakeLists.txt +++ b/src/nostalgia/world/studio/CMakeLists.txt @@ -18,5 +18,5 @@ install( TARGETS NostalgiaWorld-Studio LIBRARY DESTINATION - ${NOSTALGIA_DIST_PLUGIN} + ${NOSTALGIA_DIST_MODULE} ) diff --git a/src/nostalgia/world/studio/world-studio.json b/src/nostalgia/world/studio/world-studio.json index 3cd12d3b..c79fd351 100644 --- a/src/nostalgia/world/studio/world-studio.json +++ b/src/nostalgia/world/studio/world-studio.json @@ -1,3 +1,3 @@ { - "plugin_name": "Nostalgia World" -} \ No newline at end of file + "module_name": "Nostalgia World" +}