From 4ea4a61d542777a270c4e2c283e0e986fc9eec9c Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 11 Jan 2025 12:32:00 -0600 Subject: [PATCH] Squashed 'deps/nostalgia/' changes from 98ddb08a..791b7746 791b7746 [nostalgia] Update liccor file 842e3587 [nostalgia] Update .gitignore for new location of scripts dir 318e7900 [ox] Update liccor file 9f338a74 [ox] Run liccor 645e48af [nostalgia,olympic] Run liccor ef92c8df [nostalgia] Make pkg-gba.py force lower case for pack tool 849d50be [nostalgia/core] Make getTileIdx return an Optional 845092f1 [turbine] Make common turbine.cpp file private to its target 75819a17 [ox/std] Add SmallMap::values() d66da857 [ox/std] SmallMap fixes, add findIdx function git-subtree-dir: deps/nostalgia git-subtree-split: 791b7746f331a3ad02cfdcdbc7c3ecde0cab7779 --- .gitignore | 2 +- .liccor.yml | 2 +- deps/ox/.liccor.yml | 2 +- deps/ox/src/ox/clargs/clargs.cpp | 2 +- deps/ox/src/ox/clargs/clargs.hpp | 2 +- deps/ox/src/ox/claw/claw.hpp | 2 +- deps/ox/src/ox/claw/format.hpp | 2 +- deps/ox/src/ox/claw/read.cpp | 2 +- deps/ox/src/ox/claw/read.hpp | 2 +- deps/ox/src/ox/claw/readclaw.cpp | 2 +- deps/ox/src/ox/claw/test/tests.cpp | 2 +- deps/ox/src/ox/claw/write.cpp | 2 +- deps/ox/src/ox/claw/write.hpp | 2 +- deps/ox/src/ox/event/event.hpp | 2 +- deps/ox/src/ox/event/signal.cpp | 2 +- deps/ox/src/ox/event/signal.hpp | 2 +- deps/ox/src/ox/event/test/tests.cpp | 2 +- .../src/ox/fs/filestore/filestoretemplate.cpp | 2 +- .../src/ox/fs/filestore/filestoretemplate.hpp | 2 +- deps/ox/src/ox/fs/filesystem/directory.cpp | 2 +- deps/ox/src/ox/fs/filesystem/directory.hpp | 2 +- deps/ox/src/ox/fs/filesystem/filelocation.cpp | 2 +- deps/ox/src/ox/fs/filesystem/filelocation.hpp | 2 +- deps/ox/src/ox/fs/filesystem/filesystem.cpp | 2 +- deps/ox/src/ox/fs/filesystem/filesystem.hpp | 2 +- .../ox/src/ox/fs/filesystem/passthroughfs.cpp | 2 +- .../ox/src/ox/fs/filesystem/passthroughfs.hpp | 2 +- deps/ox/src/ox/fs/filesystem/pathiterator.cpp | 2 +- deps/ox/src/ox/fs/filesystem/pathiterator.hpp | 2 +- deps/ox/src/ox/fs/filesystem/types.hpp | 2 +- deps/ox/src/ox/fs/fs.hpp | 2 +- deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp | 2 +- deps/ox/src/ox/fs/ptrarith/ptr.hpp | 2 +- deps/ox/src/ox/fs/test/tests.cpp | 2 +- deps/ox/src/ox/fs/tool.cpp | 2 +- deps/ox/src/ox/logconn/circularbuff.hpp | 2 +- deps/ox/src/ox/logconn/def.hpp | 2 +- deps/ox/src/ox/logconn/logconn.cpp | 2 +- deps/ox/src/ox/logconn/logconn.hpp | 2 +- deps/ox/src/ox/mc/err.hpp | 2 +- deps/ox/src/ox/mc/intops.hpp | 2 +- deps/ox/src/ox/mc/mc.hpp | 2 +- deps/ox/src/ox/mc/presenceindicator.cpp | 2 +- deps/ox/src/ox/mc/presenceindicator.hpp | 2 +- deps/ox/src/ox/mc/read.cpp | 2 +- deps/ox/src/ox/mc/read.hpp | 2 +- deps/ox/src/ox/mc/test/tests.cpp | 2 +- deps/ox/src/ox/mc/types.hpp | 2 +- deps/ox/src/ox/mc/write.cpp | 2 +- deps/ox/src/ox/mc/write.hpp | 2 +- deps/ox/src/ox/model/def.hpp | 2 +- deps/ox/src/ox/model/descread.hpp | 2 +- deps/ox/src/ox/model/desctypes.cpp | 2 +- deps/ox/src/ox/model/desctypes.hpp | 2 +- deps/ox/src/ox/model/descwrite.cpp | 2 +- deps/ox/src/ox/model/descwrite.hpp | 2 +- deps/ox/src/ox/model/fieldcounter.hpp | 2 +- deps/ox/src/ox/model/metadata.hpp | 2 +- deps/ox/src/ox/model/model.hpp | 2 +- deps/ox/src/ox/model/modelhandleradaptor.hpp | 2 +- deps/ox/src/ox/model/modelops.hpp | 2 +- deps/ox/src/ox/model/modelvalue.cpp | 2 +- deps/ox/src/ox/model/modelvalue.hpp | 2 +- deps/ox/src/ox/model/optype.hpp | 2 +- deps/ox/src/ox/model/test/tests.cpp | 2 +- deps/ox/src/ox/model/typenamecatcher.hpp | 2 +- deps/ox/src/ox/model/types.hpp | 2 +- deps/ox/src/ox/model/typestore.hpp | 2 +- deps/ox/src/ox/model/walk.hpp | 2 +- deps/ox/src/ox/oc/oc.hpp | 2 +- deps/ox/src/ox/oc/read.cpp | 2 +- deps/ox/src/ox/oc/read.hpp | 2 +- deps/ox/src/ox/oc/test/tests.cpp | 2 +- deps/ox/src/ox/oc/write.cpp | 2 +- deps/ox/src/ox/oc/write.hpp | 2 +- deps/ox/src/ox/preloader/alignmentcatcher.hpp | 2 +- deps/ox/src/ox/preloader/platspecs.hpp | 2 +- deps/ox/src/ox/preloader/preloader.cpp | 2 +- deps/ox/src/ox/preloader/preloader.hpp | 2 +- deps/ox/src/ox/preloader/sizecatcher.hpp | 2 +- deps/ox/src/ox/preloader/unionsizecatcher.hpp | 2 +- deps/ox/src/ox/std/algorithm.hpp | 16 +++++- deps/ox/src/ox/std/anyptr.hpp | 2 +- deps/ox/src/ox/std/array.hpp | 2 +- deps/ox/src/ox/std/assert.cpp | 2 +- deps/ox/src/ox/std/assert.hpp | 2 +- deps/ox/src/ox/std/basestringview.hpp | 2 +- deps/ox/src/ox/std/bit.cpp | 2 +- deps/ox/src/ox/std/bit.hpp | 2 +- deps/ox/src/ox/std/bounds.hpp | 2 +- deps/ox/src/ox/std/buffer.cpp | 2 +- deps/ox/src/ox/std/buffer.hpp | 2 +- deps/ox/src/ox/std/buildinfo.cpp | 2 +- deps/ox/src/ox/std/buildinfo.hpp | 2 +- deps/ox/src/ox/std/byteswap.cpp | 2 +- deps/ox/src/ox/std/byteswap.hpp | 2 +- deps/ox/src/ox/std/concepts.cpp | 2 +- deps/ox/src/ox/std/concepts.hpp | 2 +- deps/ox/src/ox/std/conv.hpp | 2 +- deps/ox/src/ox/std/cstringview.hpp | 2 +- deps/ox/src/ox/std/cstrops.hpp | 2 +- deps/ox/src/ox/std/def.hpp | 2 +- deps/ox/src/ox/std/defer.hpp | 2 +- deps/ox/src/ox/std/defines.hpp | 2 +- deps/ox/src/ox/std/error.hpp | 2 +- deps/ox/src/ox/std/fmt.cpp | 2 +- deps/ox/src/ox/std/fmt.hpp | 2 +- deps/ox/src/ox/std/hardware.hpp | 2 +- deps/ox/src/ox/std/hash.hpp | 2 +- deps/ox/src/ox/std/hashmap.hpp | 2 +- deps/ox/src/ox/std/heapmgr.cpp | 2 +- deps/ox/src/ox/std/heapmgr.hpp | 2 +- deps/ox/src/ox/std/ignore.hpp | 2 +- deps/ox/src/ox/std/initializerlist.hpp | 2 +- deps/ox/src/ox/std/istring.hpp | 2 +- deps/ox/src/ox/std/iterator.hpp | 2 +- deps/ox/src/ox/std/math.cpp | 2 +- deps/ox/src/ox/std/math.hpp | 2 +- deps/ox/src/ox/std/maybeview.hpp | 2 +- deps/ox/src/ox/std/memops.cpp | 2 +- deps/ox/src/ox/std/memops.hpp | 2 +- deps/ox/src/ox/std/memory.hpp | 2 +- deps/ox/src/ox/std/new.hpp | 2 +- deps/ox/src/ox/std/optional.hpp | 2 +- deps/ox/src/ox/std/pair.hpp | 2 +- deps/ox/src/ox/std/point.hpp | 2 +- deps/ox/src/ox/std/random.cpp | 2 +- deps/ox/src/ox/std/random.hpp | 2 +- deps/ox/src/ox/std/range.hpp | 2 +- deps/ox/src/ox/std/ranges.hpp | 2 +- deps/ox/src/ox/std/reader.cpp | 2 +- deps/ox/src/ox/std/reader.hpp | 2 +- deps/ox/src/ox/std/realstd.hpp | 2 +- deps/ox/src/ox/std/serialize.hpp | 2 +- deps/ox/src/ox/std/size.hpp | 2 +- deps/ox/src/ox/std/smallmap.hpp | 56 ++++++++++++++----- deps/ox/src/ox/std/source_location.hpp | 2 +- deps/ox/src/ox/std/span.hpp | 2 +- deps/ox/src/ox/std/stacktrace.cpp | 2 +- deps/ox/src/ox/std/stacktrace.hpp | 2 +- deps/ox/src/ox/std/std.hpp | 2 +- deps/ox/src/ox/std/stddef.hpp | 2 +- deps/ox/src/ox/std/strconv.hpp | 2 +- deps/ox/src/ox/std/string.cpp | 2 +- deps/ox/src/ox/std/string.hpp | 2 +- deps/ox/src/ox/std/stringliteral.hpp | 2 +- deps/ox/src/ox/std/stringparam.hpp | 2 +- deps/ox/src/ox/std/stringview.cpp | 2 +- deps/ox/src/ox/std/stringview.hpp | 2 +- deps/ox/src/ox/std/strongint.hpp | 2 +- deps/ox/src/ox/std/strops.cpp | 2 +- deps/ox/src/ox/std/strops.hpp | 2 +- deps/ox/src/ox/std/substitutes.cpp | 2 +- deps/ox/src/ox/std/test/CMakeLists.txt | 1 + deps/ox/src/ox/std/test/tests.cpp | 29 +++++++++- deps/ox/src/ox/std/trace.cpp | 2 +- deps/ox/src/ox/std/trace.hpp | 2 +- deps/ox/src/ox/std/tracehook.cpp | 2 +- deps/ox/src/ox/std/typeinfo.hpp | 2 +- deps/ox/src/ox/std/types.hpp | 2 +- deps/ox/src/ox/std/typetraits.cpp | 2 +- deps/ox/src/ox/std/typetraits.hpp | 2 +- deps/ox/src/ox/std/units.hpp | 2 +- deps/ox/src/ox/std/utility.hpp | 2 +- deps/ox/src/ox/std/uuid.cpp | 2 +- deps/ox/src/ox/std/uuid.hpp | 2 +- deps/ox/src/ox/std/vec.cpp | 2 +- deps/ox/src/ox/std/vec.hpp | 2 +- deps/ox/src/ox/std/vector.hpp | 2 +- deps/ox/src/ox/std/writer.hpp | 2 +- .../core/include/nostalgia/core/color.hpp | 2 +- .../core/include/nostalgia/core/consts.hpp | 2 +- .../core/include/nostalgia/core/context.hpp | 2 +- .../core/include/nostalgia/core/core.hpp | 2 +- .../core/include/nostalgia/core/gfx.hpp | 2 +- .../include/nostalgia/core/initparams.hpp | 2 +- .../include/nostalgia/core/keelmodule.hpp | 2 +- .../core/include/nostalgia/core/palette.hpp | 2 +- .../core/include/nostalgia/core/ptidxconv.hpp | 2 +- .../include/nostalgia/core/studiomodule.hpp | 2 +- .../core/include/nostalgia/core/tilesheet.hpp | 10 +++- .../modules/core/src/gba/context.cpp | 2 +- .../modules/core/src/gba/context.hpp | 2 +- src/nostalgia/modules/core/src/gba/gfx.cpp | 2 +- src/nostalgia/modules/core/src/gba/gfx.hpp | 2 +- src/nostalgia/modules/core/src/gba/panic.cpp | 2 +- src/nostalgia/modules/core/src/gfx.cpp | 2 +- .../modules/core/src/keel/keelmodule.cpp | 2 +- .../modules/core/src/keel/typeconv.cpp | 2 +- .../modules/core/src/keel/typeconv.hpp | 2 +- .../modules/core/src/opengl/context.cpp | 2 +- .../modules/core/src/opengl/context.hpp | 2 +- src/nostalgia/modules/core/src/opengl/gfx.cpp | 2 +- src/nostalgia/modules/core/src/opengl/gfx.hpp | 2 +- .../commands/addcolorcommand.cpp | 2 +- .../commands/addcolorcommand.hpp | 2 +- .../commands/applycolorallpagescommand.cpp | 2 +- .../commands/applycolorallpagescommand.hpp | 2 +- .../paletteeditor/commands/commands.hpp | 2 +- .../commands/duplicatepagecommand.cpp | 2 +- .../commands/duplicatepagecommand.hpp | 2 +- .../commands/movecolorcommand.cpp | 2 +- .../commands/movecolorcommand.hpp | 2 +- .../commands/removecolorcommand.cpp | 2 +- .../commands/removecolorcommand.hpp | 2 +- .../commands/removepagecommand.cpp | 2 +- .../commands/removepagecommand.hpp | 2 +- .../commands/renamepagecommand.cpp | 2 +- .../commands/renamepagecommand.hpp | 2 +- .../commands/updatecolorcommand.cpp | 2 +- .../commands/updatecolorcommand.hpp | 2 +- .../commands/updatecolorinfocommand.cpp | 2 +- .../commands/updatecolorinfocommand.hpp | 2 +- .../paletteeditor/paletteeditor-imgui.cpp | 2 +- .../paletteeditor/paletteeditor-imgui.hpp | 2 +- .../modules/core/src/studio/studiomodule.cpp | 2 +- .../commands/addsubsheetcommand.cpp | 2 +- .../commands/addsubsheetcommand.hpp | 2 +- .../tilesheeteditor/commands/commands.hpp | 2 +- .../commands/cutpastecommand.cpp | 2 +- .../commands/cutpastecommand.hpp | 2 +- .../commands/deletetilescommand.cpp | 2 +- .../commands/deletetilescommand.hpp | 2 +- .../tilesheeteditor/commands/drawcommand.cpp | 2 +- .../tilesheeteditor/commands/drawcommand.hpp | 2 +- .../commands/inserttilescommand.cpp | 2 +- .../commands/inserttilescommand.hpp | 2 +- .../commands/palettechangecommand.cpp | 2 +- .../commands/palettechangecommand.hpp | 2 +- .../commands/rmsubsheetcommand.cpp | 2 +- .../commands/rmsubsheetcommand.hpp | 2 +- .../commands/updatesubsheetcommand.cpp | 2 +- .../commands/updatesubsheetcommand.hpp | 2 +- .../tilesheeteditor/tilesheeteditor-imgui.cpp | 2 +- .../tilesheeteditor/tilesheeteditor-imgui.hpp | 2 +- .../tilesheeteditor/tilesheeteditormodel.cpp | 2 +- .../tilesheeteditor/tilesheeteditormodel.hpp | 2 +- .../tilesheeteditor/tilesheeteditorview.cpp | 2 +- .../tilesheeteditor/tilesheeteditorview.hpp | 2 +- .../tilesheeteditor/tilesheetpixelgrid.cpp | 2 +- .../tilesheeteditor/tilesheetpixelgrid.hpp | 2 +- .../tilesheeteditor/tilesheetpixels.cpp | 2 +- .../tilesheeteditor/tilesheetpixels.hpp | 2 +- src/nostalgia/modules/core/src/tilesheet.cpp | 14 +++-- src/nostalgia/modules/core/test/tests.cpp | 2 +- src/nostalgia/modules/keelmodules.cpp | 2 +- src/nostalgia/modules/keelmodules.hpp | 2 +- .../include/nostalgia/scene/keelmodule.hpp | 2 +- .../scene/include/nostalgia/scene/scene.hpp | 2 +- .../include/nostalgia/scene/scenestatic.hpp | 2 +- .../include/nostalgia/scene/studiomodule.hpp | 2 +- .../modules/scene/src/keel/keelmodule.cpp | 2 +- .../modules/scene/src/keel/typeconv.cpp | 2 +- .../modules/scene/src/keel/typeconv.hpp | 2 +- src/nostalgia/modules/scene/src/scene.cpp | 2 +- .../modules/scene/src/scenestatic.cpp | 2 +- .../scene/src/studio/sceneeditor-imgui.cpp | 2 +- .../scene/src/studio/sceneeditor-imgui.hpp | 2 +- .../modules/scene/src/studio/sceneeditor.cpp | 2 +- .../modules/scene/src/studio/sceneeditor.hpp | 2 +- .../scene/src/studio/sceneeditorview.cpp | 2 +- .../scene/src/studio/sceneeditorview.hpp | 2 +- .../modules/scene/src/studio/studiomodule.cpp | 2 +- src/nostalgia/modules/studiomodules.cpp | 2 +- src/nostalgia/modules/studiomodules.hpp | 2 +- src/nostalgia/player/app.cpp | 2 +- src/nostalgia/player/app.hpp | 2 +- src/olympic/applib/applib.cpp | 2 +- src/olympic/keel/include/keel/asset.hpp | 2 +- .../keel/include/keel/assetmanager.hpp | 2 +- src/olympic/keel/include/keel/context.hpp | 2 +- src/olympic/keel/include/keel/keel.hpp | 2 +- src/olympic/keel/include/keel/media.hpp | 2 +- src/olympic/keel/include/keel/module.hpp | 2 +- src/olympic/keel/include/keel/pack.hpp | 2 +- src/olympic/keel/include/keel/typeconv.hpp | 2 +- src/olympic/keel/include/keel/typestore.hpp | 2 +- src/olympic/keel/include/keel/validation.hpp | 2 +- src/olympic/keel/src/asset.cpp | 2 +- src/olympic/keel/src/keel.cpp | 2 +- src/olympic/keel/src/media.cpp | 2 +- src/olympic/keel/src/module.cpp | 2 +- src/olympic/keel/src/pack-applib.cpp | 2 +- src/olympic/keel/src/pack.cpp | 2 +- src/olympic/keel/src/typeconv.cpp | 2 +- src/olympic/keel/src/typestore.cpp | 2 +- src/olympic/keel/test/tests.cpp | 2 +- .../applib/include/studioapp/studioapp.hpp | 2 +- src/olympic/studio/applib/src/aboutpopup.cpp | 2 +- src/olympic/studio/applib/src/aboutpopup.hpp | 2 +- src/olympic/studio/applib/src/clawviewer.cpp | 2 +- src/olympic/studio/applib/src/clawviewer.hpp | 2 +- .../studio/applib/src/filedialogmanager.cpp | 2 +- .../studio/applib/src/filedialogmanager.hpp | 2 +- src/olympic/studio/applib/src/main.cpp | 2 +- src/olympic/studio/applib/src/newmenu.cpp | 2 +- src/olympic/studio/applib/src/newmenu.hpp | 2 +- src/olympic/studio/applib/src/newproject.cpp | 2 +- src/olympic/studio/applib/src/newproject.hpp | 2 +- .../studio/applib/src/projectexplorer.cpp | 2 +- .../studio/applib/src/projectexplorer.hpp | 2 +- .../studio/applib/src/projecttreemodel.cpp | 2 +- .../studio/applib/src/projecttreemodel.hpp | 2 +- src/olympic/studio/applib/src/studioapp.cpp | 2 +- src/olympic/studio/applib/src/studioapp.hpp | 2 +- .../studio/modlib/include/studio/configio.hpp | 2 +- .../studio/modlib/include/studio/context.hpp | 2 +- .../studio/modlib/include/studio/editor.hpp | 2 +- .../modlib/include/studio/filedialog.hpp | 2 +- .../modlib/include/studio/imguiutil.hpp | 2 +- .../modlib/include/studio/itemmaker.hpp | 2 +- .../studio/modlib/include/studio/module.hpp | 2 +- .../studio/modlib/include/studio/popup.hpp | 2 +- .../studio/modlib/include/studio/project.hpp | 2 +- .../include/studio/selectiontracker.hpp | 2 +- .../studio/modlib/include/studio/studio.hpp | 2 +- .../studio/modlib/include/studio/task.hpp | 2 +- .../modlib/include/studio/undocommand.hpp | 2 +- .../modlib/include/studio/undostack.hpp | 2 +- .../studio/modlib/include/studio/widget.hpp | 2 +- src/olympic/studio/modlib/src/configio.cpp | 2 +- src/olympic/studio/modlib/src/editor.cpp | 2 +- .../studio/modlib/src/filedialog_nfd.cpp | 2 +- src/olympic/studio/modlib/src/imguiutil.cpp | 2 +- src/olympic/studio/modlib/src/module.cpp | 2 +- src/olympic/studio/modlib/src/popup.cpp | 2 +- src/olympic/studio/modlib/src/project.cpp | 2 +- src/olympic/studio/modlib/src/task.cpp | 2 +- src/olympic/studio/modlib/src/undocommand.cpp | 2 +- src/olympic/studio/modlib/src/undostack.cpp | 2 +- .../turbine/include/turbine/clipboard.hpp | 2 +- .../turbine/include/turbine/context.hpp | 2 +- src/olympic/turbine/include/turbine/event.hpp | 2 +- src/olympic/turbine/include/turbine/gfx.hpp | 2 +- src/olympic/turbine/include/turbine/input.hpp | 2 +- .../turbine/include/turbine/turbine.hpp | 2 +- src/olympic/turbine/src/CMakeLists.txt | 2 +- src/olympic/turbine/src/gba/clipboard.cpp | 2 +- src/olympic/turbine/src/gba/config.hpp | 2 +- src/olympic/turbine/src/gba/context.cpp | 2 +- src/olympic/turbine/src/gba/context.hpp | 2 +- src/olympic/turbine/src/gba/event.cpp | 2 +- src/olympic/turbine/src/gba/gfx.cpp | 2 +- src/olympic/turbine/src/gba/irq.arm.cpp | 2 +- src/olympic/turbine/src/gba/irqstub.cpp | 2 +- src/olympic/turbine/src/gba/turbine.arm.cpp | 2 +- src/olympic/turbine/src/gba/turbine.cpp | 2 +- src/olympic/turbine/src/gba/turbine.hpp | 2 +- src/olympic/turbine/src/glfw/clipboard.cpp | 2 +- src/olympic/turbine/src/glfw/config.hpp | 2 +- src/olympic/turbine/src/glfw/context.cpp | 2 +- src/olympic/turbine/src/glfw/context.hpp | 2 +- src/olympic/turbine/src/glfw/event.cpp | 2 +- src/olympic/turbine/src/glfw/gfx.cpp | 2 +- src/olympic/turbine/src/glfw/turbine.cpp | 2 +- src/olympic/turbine/src/turbine.cpp | 2 +- util/scripts/pkg-gba.py | 4 +- 357 files changed, 453 insertions(+), 377 deletions(-) diff --git a/.gitignore b/.gitignore index 3186e14..de4312c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ .mypy_cache .stfolder .stignore -scripts/__pycache__ +util/scripts/__pycache__ pyenv CMakeLists.txt.user ROM.oxfs diff --git a/.liccor.yml b/.liccor.yml index 1306833..040afaf 100644 --- a/.liccor.yml +++ b/.liccor.yml @@ -2,4 +2,4 @@ source: - src copyright_notice: |- - Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. diff --git a/deps/ox/.liccor.yml b/deps/ox/.liccor.yml index b68fc72..df8bcd0 100644 --- a/deps/ox/.liccor.yml +++ b/deps/ox/.liccor.yml @@ -2,7 +2,7 @@ source: - src copyright_notice: |- - Copyright 2015 - 2024 gary@drinkingtea.net + Copyright 2015 - 2025 gary@drinkingtea.net This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/clargs/clargs.cpp b/deps/ox/src/ox/clargs/clargs.cpp index 475ab2f..e72f364 100644 --- a/deps/ox/src/ox/clargs/clargs.cpp +++ b/deps/ox/src/ox/clargs/clargs.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/clargs/clargs.hpp b/deps/ox/src/ox/clargs/clargs.hpp index ee54b4a..4f53b90 100644 --- a/deps/ox/src/ox/clargs/clargs.hpp +++ b/deps/ox/src/ox/clargs/clargs.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/claw/claw.hpp b/deps/ox/src/ox/claw/claw.hpp index bb4f47c..d4272e3 100644 --- a/deps/ox/src/ox/claw/claw.hpp +++ b/deps/ox/src/ox/claw/claw.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/claw/format.hpp b/deps/ox/src/ox/claw/format.hpp index 55dbb63..b64456d 100644 --- a/deps/ox/src/ox/claw/format.hpp +++ b/deps/ox/src/ox/claw/format.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/claw/read.cpp b/deps/ox/src/ox/claw/read.cpp index 1b0ef86..91870b5 100644 --- a/deps/ox/src/ox/claw/read.cpp +++ b/deps/ox/src/ox/claw/read.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/claw/read.hpp b/deps/ox/src/ox/claw/read.hpp index bbffa43..b6d69d6 100644 --- a/deps/ox/src/ox/claw/read.hpp +++ b/deps/ox/src/ox/claw/read.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/claw/readclaw.cpp b/deps/ox/src/ox/claw/readclaw.cpp index 607dc5a..b1915d0 100644 --- a/deps/ox/src/ox/claw/readclaw.cpp +++ b/deps/ox/src/ox/claw/readclaw.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/claw/test/tests.cpp b/deps/ox/src/ox/claw/test/tests.cpp index dfbacb4..a6ef919 100644 --- a/deps/ox/src/ox/claw/test/tests.cpp +++ b/deps/ox/src/ox/claw/test/tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/claw/write.cpp b/deps/ox/src/ox/claw/write.cpp index ec8f7c5..c184be2 100644 --- a/deps/ox/src/ox/claw/write.cpp +++ b/deps/ox/src/ox/claw/write.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/claw/write.hpp b/deps/ox/src/ox/claw/write.hpp index 0d7183a..d80c706 100644 --- a/deps/ox/src/ox/claw/write.hpp +++ b/deps/ox/src/ox/claw/write.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/event/event.hpp b/deps/ox/src/ox/event/event.hpp index abf3f3f..e3d2cc5 100644 --- a/deps/ox/src/ox/event/event.hpp +++ b/deps/ox/src/ox/event/event.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/event/signal.cpp b/deps/ox/src/ox/event/signal.cpp index e086cb7..a0928f6 100644 --- a/deps/ox/src/ox/event/signal.cpp +++ b/deps/ox/src/ox/event/signal.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/event/signal.hpp b/deps/ox/src/ox/event/signal.hpp index bb58e7b..f3aacd0 100644 --- a/deps/ox/src/ox/event/signal.hpp +++ b/deps/ox/src/ox/event/signal.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/event/test/tests.cpp b/deps/ox/src/ox/event/test/tests.cpp index e421c5e..07b61bc 100644 --- a/deps/ox/src/ox/event/test/tests.cpp +++ b/deps/ox/src/ox/event/test/tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/fs/filestore/filestoretemplate.cpp b/deps/ox/src/ox/fs/filestore/filestoretemplate.cpp index 04274cd..3e3a638 100644 --- a/deps/ox/src/ox/fs/filestore/filestoretemplate.cpp +++ b/deps/ox/src/ox/fs/filestore/filestoretemplate.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp b/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp index a11da15..392b249 100644 --- a/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp +++ b/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/fs/filesystem/directory.cpp b/deps/ox/src/ox/fs/filesystem/directory.cpp index f87f22a..648a3f1 100644 --- a/deps/ox/src/ox/fs/filesystem/directory.cpp +++ b/deps/ox/src/ox/fs/filesystem/directory.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/fs/filesystem/directory.hpp b/deps/ox/src/ox/fs/filesystem/directory.hpp index 616116a..540ba7a 100644 --- a/deps/ox/src/ox/fs/filesystem/directory.hpp +++ b/deps/ox/src/ox/fs/filesystem/directory.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/fs/filesystem/filelocation.cpp b/deps/ox/src/ox/fs/filesystem/filelocation.cpp index a808892..b7c3b18 100644 --- a/deps/ox/src/ox/fs/filesystem/filelocation.cpp +++ b/deps/ox/src/ox/fs/filesystem/filelocation.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/fs/filesystem/filelocation.hpp b/deps/ox/src/ox/fs/filesystem/filelocation.hpp index e106a1e..796b7e1 100644 --- a/deps/ox/src/ox/fs/filesystem/filelocation.hpp +++ b/deps/ox/src/ox/fs/filesystem/filelocation.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/fs/filesystem/filesystem.cpp b/deps/ox/src/ox/fs/filesystem/filesystem.cpp index 9e097d3..750e417 100644 --- a/deps/ox/src/ox/fs/filesystem/filesystem.cpp +++ b/deps/ox/src/ox/fs/filesystem/filesystem.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/fs/filesystem/filesystem.hpp b/deps/ox/src/ox/fs/filesystem/filesystem.hpp index 0028e54..e785e4b 100644 --- a/deps/ox/src/ox/fs/filesystem/filesystem.hpp +++ b/deps/ox/src/ox/fs/filesystem/filesystem.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp b/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp index 5217069..dc56b9c 100644 --- a/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp +++ b/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp b/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp index 19eeadb..0a42d82 100644 --- a/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp +++ b/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/fs/filesystem/pathiterator.cpp b/deps/ox/src/ox/fs/filesystem/pathiterator.cpp index cf6f237..07c5dec 100644 --- a/deps/ox/src/ox/fs/filesystem/pathiterator.cpp +++ b/deps/ox/src/ox/fs/filesystem/pathiterator.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/fs/filesystem/pathiterator.hpp b/deps/ox/src/ox/fs/filesystem/pathiterator.hpp index 33659ab..78819f0 100644 --- a/deps/ox/src/ox/fs/filesystem/pathiterator.hpp +++ b/deps/ox/src/ox/fs/filesystem/pathiterator.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/fs/filesystem/types.hpp b/deps/ox/src/ox/fs/filesystem/types.hpp index 84ab161..62de029 100644 --- a/deps/ox/src/ox/fs/filesystem/types.hpp +++ b/deps/ox/src/ox/fs/filesystem/types.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/fs/fs.hpp b/deps/ox/src/ox/fs/fs.hpp index 6773dbc..646a5e1 100644 --- a/deps/ox/src/ox/fs/fs.hpp +++ b/deps/ox/src/ox/fs/fs.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp b/deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp index 4f7b44e..7171a8a 100644 --- a/deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp +++ b/deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/fs/ptrarith/ptr.hpp b/deps/ox/src/ox/fs/ptrarith/ptr.hpp index c12bb50..a8fea67 100644 --- a/deps/ox/src/ox/fs/ptrarith/ptr.hpp +++ b/deps/ox/src/ox/fs/ptrarith/ptr.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/fs/test/tests.cpp b/deps/ox/src/ox/fs/test/tests.cpp index ec66ee3..bb706b9 100644 --- a/deps/ox/src/ox/fs/test/tests.cpp +++ b/deps/ox/src/ox/fs/test/tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/fs/tool.cpp b/deps/ox/src/ox/fs/tool.cpp index 82e4b4c..da18878 100644 --- a/deps/ox/src/ox/fs/tool.cpp +++ b/deps/ox/src/ox/fs/tool.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/logconn/circularbuff.hpp b/deps/ox/src/ox/logconn/circularbuff.hpp index 802ab3a..d536a04 100644 --- a/deps/ox/src/ox/logconn/circularbuff.hpp +++ b/deps/ox/src/ox/logconn/circularbuff.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/logconn/def.hpp b/deps/ox/src/ox/logconn/def.hpp index 71b4e72..260fa0e 100644 --- a/deps/ox/src/ox/logconn/def.hpp +++ b/deps/ox/src/ox/logconn/def.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/logconn/logconn.cpp b/deps/ox/src/ox/logconn/logconn.cpp index 6bec299..f027dab 100644 --- a/deps/ox/src/ox/logconn/logconn.cpp +++ b/deps/ox/src/ox/logconn/logconn.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/logconn/logconn.hpp b/deps/ox/src/ox/logconn/logconn.hpp index fc14369..eb2ced9 100644 --- a/deps/ox/src/ox/logconn/logconn.hpp +++ b/deps/ox/src/ox/logconn/logconn.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/mc/err.hpp b/deps/ox/src/ox/mc/err.hpp index a27be39..bbcf370 100644 --- a/deps/ox/src/ox/mc/err.hpp +++ b/deps/ox/src/ox/mc/err.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/mc/intops.hpp b/deps/ox/src/ox/mc/intops.hpp index 6e8f685..fb087a9 100644 --- a/deps/ox/src/ox/mc/intops.hpp +++ b/deps/ox/src/ox/mc/intops.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/mc/mc.hpp b/deps/ox/src/ox/mc/mc.hpp index 234ec94..2d4949d 100644 --- a/deps/ox/src/ox/mc/mc.hpp +++ b/deps/ox/src/ox/mc/mc.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/mc/presenceindicator.cpp b/deps/ox/src/ox/mc/presenceindicator.cpp index a7ef0fd..c5055f4 100644 --- a/deps/ox/src/ox/mc/presenceindicator.cpp +++ b/deps/ox/src/ox/mc/presenceindicator.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/mc/presenceindicator.hpp b/deps/ox/src/ox/mc/presenceindicator.hpp index 6f68e5b..bc6ed04 100644 --- a/deps/ox/src/ox/mc/presenceindicator.hpp +++ b/deps/ox/src/ox/mc/presenceindicator.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/mc/read.cpp b/deps/ox/src/ox/mc/read.cpp index 8882978..de3e603 100644 --- a/deps/ox/src/ox/mc/read.cpp +++ b/deps/ox/src/ox/mc/read.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/mc/read.hpp b/deps/ox/src/ox/mc/read.hpp index abb6c39..282ce44 100644 --- a/deps/ox/src/ox/mc/read.hpp +++ b/deps/ox/src/ox/mc/read.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/mc/test/tests.cpp b/deps/ox/src/ox/mc/test/tests.cpp index e795ba3..180d8ef 100644 --- a/deps/ox/src/ox/mc/test/tests.cpp +++ b/deps/ox/src/ox/mc/test/tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/mc/types.hpp b/deps/ox/src/ox/mc/types.hpp index 1413e51..df7d890 100644 --- a/deps/ox/src/ox/mc/types.hpp +++ b/deps/ox/src/ox/mc/types.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/mc/write.cpp b/deps/ox/src/ox/mc/write.cpp index 70d9bcd..80dea56 100644 --- a/deps/ox/src/ox/mc/write.cpp +++ b/deps/ox/src/ox/mc/write.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/mc/write.hpp b/deps/ox/src/ox/mc/write.hpp index cfc1a58..ba19e3f 100644 --- a/deps/ox/src/ox/mc/write.hpp +++ b/deps/ox/src/ox/mc/write.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/def.hpp b/deps/ox/src/ox/model/def.hpp index 0599ebd..4546f3c 100644 --- a/deps/ox/src/ox/model/def.hpp +++ b/deps/ox/src/ox/model/def.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/descread.hpp b/deps/ox/src/ox/model/descread.hpp index 05b8fc1..8699610 100644 --- a/deps/ox/src/ox/model/descread.hpp +++ b/deps/ox/src/ox/model/descread.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/desctypes.cpp b/deps/ox/src/ox/model/desctypes.cpp index 380f245..f04b906 100644 --- a/deps/ox/src/ox/model/desctypes.cpp +++ b/deps/ox/src/ox/model/desctypes.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/desctypes.hpp b/deps/ox/src/ox/model/desctypes.hpp index f22d2a2..843c22f 100644 --- a/deps/ox/src/ox/model/desctypes.hpp +++ b/deps/ox/src/ox/model/desctypes.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/descwrite.cpp b/deps/ox/src/ox/model/descwrite.cpp index cebd026..9421d51 100644 --- a/deps/ox/src/ox/model/descwrite.cpp +++ b/deps/ox/src/ox/model/descwrite.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/descwrite.hpp b/deps/ox/src/ox/model/descwrite.hpp index 290d586..4270871 100644 --- a/deps/ox/src/ox/model/descwrite.hpp +++ b/deps/ox/src/ox/model/descwrite.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/fieldcounter.hpp b/deps/ox/src/ox/model/fieldcounter.hpp index b39397d..206b6fc 100644 --- a/deps/ox/src/ox/model/fieldcounter.hpp +++ b/deps/ox/src/ox/model/fieldcounter.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/metadata.hpp b/deps/ox/src/ox/model/metadata.hpp index c11ebc5..be9c3d9 100644 --- a/deps/ox/src/ox/model/metadata.hpp +++ b/deps/ox/src/ox/model/metadata.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/model.hpp b/deps/ox/src/ox/model/model.hpp index 07f6fb0..824fd8f 100644 --- a/deps/ox/src/ox/model/model.hpp +++ b/deps/ox/src/ox/model/model.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/modelhandleradaptor.hpp b/deps/ox/src/ox/model/modelhandleradaptor.hpp index 2853b75..28b6785 100644 --- a/deps/ox/src/ox/model/modelhandleradaptor.hpp +++ b/deps/ox/src/ox/model/modelhandleradaptor.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/modelops.hpp b/deps/ox/src/ox/model/modelops.hpp index f40f678..4f98356 100644 --- a/deps/ox/src/ox/model/modelops.hpp +++ b/deps/ox/src/ox/model/modelops.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/modelvalue.cpp b/deps/ox/src/ox/model/modelvalue.cpp index 839ac71..93744fb 100644 --- a/deps/ox/src/ox/model/modelvalue.cpp +++ b/deps/ox/src/ox/model/modelvalue.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/modelvalue.hpp b/deps/ox/src/ox/model/modelvalue.hpp index 7b17862..3031509 100644 --- a/deps/ox/src/ox/model/modelvalue.hpp +++ b/deps/ox/src/ox/model/modelvalue.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/optype.hpp b/deps/ox/src/ox/model/optype.hpp index f0e473b..19593cd 100644 --- a/deps/ox/src/ox/model/optype.hpp +++ b/deps/ox/src/ox/model/optype.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/test/tests.cpp b/deps/ox/src/ox/model/test/tests.cpp index 9aea6bf..2c7d46a 100644 --- a/deps/ox/src/ox/model/test/tests.cpp +++ b/deps/ox/src/ox/model/test/tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/typenamecatcher.hpp b/deps/ox/src/ox/model/typenamecatcher.hpp index 870ae6e..ec65009 100644 --- a/deps/ox/src/ox/model/typenamecatcher.hpp +++ b/deps/ox/src/ox/model/typenamecatcher.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/types.hpp b/deps/ox/src/ox/model/types.hpp index 5d54bfe..fd8927c 100644 --- a/deps/ox/src/ox/model/types.hpp +++ b/deps/ox/src/ox/model/types.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/typestore.hpp b/deps/ox/src/ox/model/typestore.hpp index d79902c..e27f0e3 100644 --- a/deps/ox/src/ox/model/typestore.hpp +++ b/deps/ox/src/ox/model/typestore.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/model/walk.hpp b/deps/ox/src/ox/model/walk.hpp index 0d452bb..e92fdab 100644 --- a/deps/ox/src/ox/model/walk.hpp +++ b/deps/ox/src/ox/model/walk.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/oc/oc.hpp b/deps/ox/src/ox/oc/oc.hpp index bb4f47c..d4272e3 100644 --- a/deps/ox/src/ox/oc/oc.hpp +++ b/deps/ox/src/ox/oc/oc.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/oc/read.cpp b/deps/ox/src/ox/oc/read.cpp index d27b5ab..2862e17 100644 --- a/deps/ox/src/ox/oc/read.cpp +++ b/deps/ox/src/ox/oc/read.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/oc/read.hpp b/deps/ox/src/ox/oc/read.hpp index 9306d65..30638c8 100644 --- a/deps/ox/src/ox/oc/read.hpp +++ b/deps/ox/src/ox/oc/read.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/oc/test/tests.cpp b/deps/ox/src/ox/oc/test/tests.cpp index 3532f90..1d8127a 100644 --- a/deps/ox/src/ox/oc/test/tests.cpp +++ b/deps/ox/src/ox/oc/test/tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/oc/write.cpp b/deps/ox/src/ox/oc/write.cpp index 88e4417..31770ac 100644 --- a/deps/ox/src/ox/oc/write.cpp +++ b/deps/ox/src/ox/oc/write.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/oc/write.hpp b/deps/ox/src/ox/oc/write.hpp index a1a3388..2f956f4 100644 --- a/deps/ox/src/ox/oc/write.hpp +++ b/deps/ox/src/ox/oc/write.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/preloader/alignmentcatcher.hpp b/deps/ox/src/ox/preloader/alignmentcatcher.hpp index 3175190..6953397 100644 --- a/deps/ox/src/ox/preloader/alignmentcatcher.hpp +++ b/deps/ox/src/ox/preloader/alignmentcatcher.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/preloader/platspecs.hpp b/deps/ox/src/ox/preloader/platspecs.hpp index 5145fb5..0d8ebe8 100644 --- a/deps/ox/src/ox/preloader/platspecs.hpp +++ b/deps/ox/src/ox/preloader/platspecs.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/preloader/preloader.cpp b/deps/ox/src/ox/preloader/preloader.cpp index 9540395..732df29 100644 --- a/deps/ox/src/ox/preloader/preloader.cpp +++ b/deps/ox/src/ox/preloader/preloader.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/preloader/preloader.hpp b/deps/ox/src/ox/preloader/preloader.hpp index e836b7c..29e8093 100644 --- a/deps/ox/src/ox/preloader/preloader.hpp +++ b/deps/ox/src/ox/preloader/preloader.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/preloader/sizecatcher.hpp b/deps/ox/src/ox/preloader/sizecatcher.hpp index fb1eba6..2883106 100644 --- a/deps/ox/src/ox/preloader/sizecatcher.hpp +++ b/deps/ox/src/ox/preloader/sizecatcher.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/preloader/unionsizecatcher.hpp b/deps/ox/src/ox/preloader/unionsizecatcher.hpp index e6a59be..042aded 100644 --- a/deps/ox/src/ox/preloader/unionsizecatcher.hpp +++ b/deps/ox/src/ox/preloader/unionsizecatcher.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/algorithm.hpp b/deps/ox/src/ox/std/algorithm.hpp index c6c9bd6..f3e93b3 100644 --- a/deps/ox/src/ox/std/algorithm.hpp +++ b/deps/ox/src/ox/std/algorithm.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -9,13 +9,25 @@ #pragma once #include "def.hpp" +#include "error.hpp" OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage) namespace ox { template -constexpr It find(It begin, It end, const T &value) { +constexpr ox::Result findIdx(It begin, It end, T const&value) { + auto it = begin; + for (; it != end; ++it) { + if (*it == value) { + return it.offset(); + } + } + return ox::Error{1, "item not found"}; +} + +template +constexpr It find(It begin, It end, T const&value) { for (; begin != end; ++begin) { if (*begin == value) { return begin; diff --git a/deps/ox/src/ox/std/anyptr.hpp b/deps/ox/src/ox/std/anyptr.hpp index 2eba974..2e3ad1c 100644 --- a/deps/ox/src/ox/std/anyptr.hpp +++ b/deps/ox/src/ox/std/anyptr.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/array.hpp b/deps/ox/src/ox/std/array.hpp index 996fe5a..32281de 100644 --- a/deps/ox/src/ox/std/array.hpp +++ b/deps/ox/src/ox/std/array.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/assert.cpp b/deps/ox/src/ox/std/assert.cpp index 94ad5f6..bda1262 100644 --- a/deps/ox/src/ox/std/assert.cpp +++ b/deps/ox/src/ox/std/assert.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/assert.hpp b/deps/ox/src/ox/std/assert.hpp index dd95982..7bce373 100644 --- a/deps/ox/src/ox/std/assert.hpp +++ b/deps/ox/src/ox/std/assert.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/basestringview.hpp b/deps/ox/src/ox/std/basestringview.hpp index 5532a53..3d50cc9 100644 --- a/deps/ox/src/ox/std/basestringview.hpp +++ b/deps/ox/src/ox/std/basestringview.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/bit.cpp b/deps/ox/src/ox/std/bit.cpp index a9d1078..24600af 100644 --- a/deps/ox/src/ox/std/bit.cpp +++ b/deps/ox/src/ox/std/bit.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/bit.hpp b/deps/ox/src/ox/std/bit.hpp index 250d087..9a2ef8b 100644 --- a/deps/ox/src/ox/std/bit.hpp +++ b/deps/ox/src/ox/std/bit.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/bounds.hpp b/deps/ox/src/ox/std/bounds.hpp index e49fa51..b176d4a 100644 --- a/deps/ox/src/ox/std/bounds.hpp +++ b/deps/ox/src/ox/std/bounds.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/buffer.cpp b/deps/ox/src/ox/std/buffer.cpp index e961c4f..b15548c 100644 --- a/deps/ox/src/ox/std/buffer.cpp +++ b/deps/ox/src/ox/std/buffer.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/buffer.hpp b/deps/ox/src/ox/std/buffer.hpp index d6b9a3d..c9fed98 100644 --- a/deps/ox/src/ox/std/buffer.hpp +++ b/deps/ox/src/ox/std/buffer.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/buildinfo.cpp b/deps/ox/src/ox/std/buildinfo.cpp index e3ea874..62bfc5a 100644 --- a/deps/ox/src/ox/std/buildinfo.cpp +++ b/deps/ox/src/ox/std/buildinfo.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/buildinfo.hpp b/deps/ox/src/ox/std/buildinfo.hpp index 1d960da..34d9e47 100644 --- a/deps/ox/src/ox/std/buildinfo.hpp +++ b/deps/ox/src/ox/std/buildinfo.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/byteswap.cpp b/deps/ox/src/ox/std/byteswap.cpp index a7dd59f..85963cb 100644 --- a/deps/ox/src/ox/std/byteswap.cpp +++ b/deps/ox/src/ox/std/byteswap.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/byteswap.hpp b/deps/ox/src/ox/std/byteswap.hpp index e29c49d..b35b91f 100644 --- a/deps/ox/src/ox/std/byteswap.hpp +++ b/deps/ox/src/ox/std/byteswap.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/concepts.cpp b/deps/ox/src/ox/std/concepts.cpp index 043aa38..e6314cf 100644 --- a/deps/ox/src/ox/std/concepts.cpp +++ b/deps/ox/src/ox/std/concepts.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/concepts.hpp b/deps/ox/src/ox/std/concepts.hpp index 7468768..1cf0138 100644 --- a/deps/ox/src/ox/std/concepts.hpp +++ b/deps/ox/src/ox/std/concepts.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/conv.hpp b/deps/ox/src/ox/std/conv.hpp index f17e69f..f5a9965 100644 --- a/deps/ox/src/ox/std/conv.hpp +++ b/deps/ox/src/ox/std/conv.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/cstringview.hpp b/deps/ox/src/ox/std/cstringview.hpp index 2b61dbc..d356f2b 100644 --- a/deps/ox/src/ox/std/cstringview.hpp +++ b/deps/ox/src/ox/std/cstringview.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/cstrops.hpp b/deps/ox/src/ox/std/cstrops.hpp index 6b7820d..140a795 100644 --- a/deps/ox/src/ox/std/cstrops.hpp +++ b/deps/ox/src/ox/std/cstrops.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/def.hpp b/deps/ox/src/ox/std/def.hpp index eb7ee0e..44eca5e 100644 --- a/deps/ox/src/ox/std/def.hpp +++ b/deps/ox/src/ox/std/def.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/defer.hpp b/deps/ox/src/ox/std/defer.hpp index b1f0ea4..6366608 100644 --- a/deps/ox/src/ox/std/defer.hpp +++ b/deps/ox/src/ox/std/defer.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/defines.hpp b/deps/ox/src/ox/std/defines.hpp index a655a4d..0c274a7 100644 --- a/deps/ox/src/ox/std/defines.hpp +++ b/deps/ox/src/ox/std/defines.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/error.hpp b/deps/ox/src/ox/std/error.hpp index 2e8e65c..5e6885c 100644 --- a/deps/ox/src/ox/std/error.hpp +++ b/deps/ox/src/ox/std/error.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/fmt.cpp b/deps/ox/src/ox/std/fmt.cpp index 32b1ea7..7abf8c8 100644 --- a/deps/ox/src/ox/std/fmt.cpp +++ b/deps/ox/src/ox/std/fmt.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/fmt.hpp b/deps/ox/src/ox/std/fmt.hpp index 4694d02..1cde475 100644 --- a/deps/ox/src/ox/std/fmt.hpp +++ b/deps/ox/src/ox/std/fmt.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/hardware.hpp b/deps/ox/src/ox/std/hardware.hpp index 83eba78..7bba864 100644 --- a/deps/ox/src/ox/std/hardware.hpp +++ b/deps/ox/src/ox/std/hardware.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/hash.hpp b/deps/ox/src/ox/std/hash.hpp index 8f7e923..11e5658 100644 --- a/deps/ox/src/ox/std/hash.hpp +++ b/deps/ox/src/ox/std/hash.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/hashmap.hpp b/deps/ox/src/ox/std/hashmap.hpp index 938add9..f2fbb59 100644 --- a/deps/ox/src/ox/std/hashmap.hpp +++ b/deps/ox/src/ox/std/hashmap.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/heapmgr.cpp b/deps/ox/src/ox/std/heapmgr.cpp index b73b5f8..0ab856e 100644 --- a/deps/ox/src/ox/std/heapmgr.cpp +++ b/deps/ox/src/ox/std/heapmgr.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/heapmgr.hpp b/deps/ox/src/ox/std/heapmgr.hpp index f97deed..230b859 100644 --- a/deps/ox/src/ox/std/heapmgr.hpp +++ b/deps/ox/src/ox/std/heapmgr.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/ignore.hpp b/deps/ox/src/ox/std/ignore.hpp index f806ebb..5dcaa5c 100644 --- a/deps/ox/src/ox/std/ignore.hpp +++ b/deps/ox/src/ox/std/ignore.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/initializerlist.hpp b/deps/ox/src/ox/std/initializerlist.hpp index bdddcab..d6bd117 100644 --- a/deps/ox/src/ox/std/initializerlist.hpp +++ b/deps/ox/src/ox/std/initializerlist.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/istring.hpp b/deps/ox/src/ox/std/istring.hpp index 3108341..83d21e4 100644 --- a/deps/ox/src/ox/std/istring.hpp +++ b/deps/ox/src/ox/std/istring.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/iterator.hpp b/deps/ox/src/ox/std/iterator.hpp index d82e13f..1f06297 100644 --- a/deps/ox/src/ox/std/iterator.hpp +++ b/deps/ox/src/ox/std/iterator.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/math.cpp b/deps/ox/src/ox/std/math.cpp index d1872dd..962bbed 100644 --- a/deps/ox/src/ox/std/math.cpp +++ b/deps/ox/src/ox/std/math.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/math.hpp b/deps/ox/src/ox/std/math.hpp index 18319a4..7882f68 100644 --- a/deps/ox/src/ox/std/math.hpp +++ b/deps/ox/src/ox/std/math.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/maybeview.hpp b/deps/ox/src/ox/std/maybeview.hpp index 9860e4d..f57275e 100644 --- a/deps/ox/src/ox/std/maybeview.hpp +++ b/deps/ox/src/ox/std/maybeview.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/memops.cpp b/deps/ox/src/ox/std/memops.cpp index 312b571..06b9ad5 100644 --- a/deps/ox/src/ox/std/memops.cpp +++ b/deps/ox/src/ox/std/memops.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/memops.hpp b/deps/ox/src/ox/std/memops.hpp index 6aa4b58..2ade763 100644 --- a/deps/ox/src/ox/std/memops.hpp +++ b/deps/ox/src/ox/std/memops.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/memory.hpp b/deps/ox/src/ox/std/memory.hpp index 9d08eb3..1686c52 100644 --- a/deps/ox/src/ox/std/memory.hpp +++ b/deps/ox/src/ox/std/memory.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/new.hpp b/deps/ox/src/ox/std/new.hpp index 980d0a4..450a999 100644 --- a/deps/ox/src/ox/std/new.hpp +++ b/deps/ox/src/ox/std/new.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/optional.hpp b/deps/ox/src/ox/std/optional.hpp index db8d2d0..4bcce2e 100644 --- a/deps/ox/src/ox/std/optional.hpp +++ b/deps/ox/src/ox/std/optional.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/pair.hpp b/deps/ox/src/ox/std/pair.hpp index d7424de..08a5f30 100644 --- a/deps/ox/src/ox/std/pair.hpp +++ b/deps/ox/src/ox/std/pair.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/point.hpp b/deps/ox/src/ox/std/point.hpp index c273855..0d99d05 100644 --- a/deps/ox/src/ox/std/point.hpp +++ b/deps/ox/src/ox/std/point.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/random.cpp b/deps/ox/src/ox/std/random.cpp index cd7c035..53c27d3 100644 --- a/deps/ox/src/ox/std/random.cpp +++ b/deps/ox/src/ox/std/random.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/random.hpp b/deps/ox/src/ox/std/random.hpp index 5f4ae4d..ec4cb31 100644 --- a/deps/ox/src/ox/std/random.hpp +++ b/deps/ox/src/ox/std/random.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/range.hpp b/deps/ox/src/ox/std/range.hpp index 4804b1e..937f429 100644 --- a/deps/ox/src/ox/std/range.hpp +++ b/deps/ox/src/ox/std/range.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/ranges.hpp b/deps/ox/src/ox/std/ranges.hpp index b945b74..fe42656 100644 --- a/deps/ox/src/ox/std/ranges.hpp +++ b/deps/ox/src/ox/std/ranges.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/reader.cpp b/deps/ox/src/ox/std/reader.cpp index 0159600..b29c4b5 100644 --- a/deps/ox/src/ox/std/reader.cpp +++ b/deps/ox/src/ox/std/reader.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/reader.hpp b/deps/ox/src/ox/std/reader.hpp index b8be88c..5a6a1cd 100644 --- a/deps/ox/src/ox/std/reader.hpp +++ b/deps/ox/src/ox/std/reader.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/realstd.hpp b/deps/ox/src/ox/std/realstd.hpp index 4d70318..8ce8691 100644 --- a/deps/ox/src/ox/std/realstd.hpp +++ b/deps/ox/src/ox/std/realstd.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/serialize.hpp b/deps/ox/src/ox/std/serialize.hpp index 2ff5c62..0690171 100644 --- a/deps/ox/src/ox/std/serialize.hpp +++ b/deps/ox/src/ox/std/serialize.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/size.hpp b/deps/ox/src/ox/std/size.hpp index b43d1f0..604dc38 100644 --- a/deps/ox/src/ox/std/size.hpp +++ b/deps/ox/src/ox/std/size.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/smallmap.hpp b/deps/ox/src/ox/std/smallmap.hpp index 0c3ab26..881730f 100644 --- a/deps/ox/src/ox/std/smallmap.hpp +++ b/deps/ox/src/ox/std/smallmap.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -62,6 +62,9 @@ class SmallMap { [[nodiscard]] constexpr Vector keys() const noexcept; + [[nodiscard]] + constexpr Vector values() const noexcept; + [[nodiscard]] constexpr K const&key(size_t i) const noexcept; @@ -86,10 +89,13 @@ class SmallMap { private: template - constexpr Pair const&access(PairVector const&pairs, KK const&key, bool &isNew) const; + constexpr Pair const*access(PairVector const&pairs, KK const&key, bool &isNew) const; template - constexpr Pair &access(PairVector &pairs, KK const&key, bool &isNew); + constexpr Pair *access(PairVector &pairs, KK const&key, bool &isNew); + + template + constexpr Pair *accessNoCreate(PairVector &pairs, KK const&key); }; @@ -129,7 +135,7 @@ constexpr SmallMap &SmallMap::operator=(SmallMap constexpr T &SmallMap::operator[](MaybeView_t const&k) { bool isNew{}; - auto p = &access(m_pairs, k, isNew); + auto p = access(m_pairs, k, isNew); if (isNew) { p->key = k; } @@ -138,7 +144,7 @@ constexpr T &SmallMap::operator[](MaybeView_t const&k) { template constexpr Result SmallMap::at(MaybeView_t const&k) noexcept { - auto p = access(m_pairs, k); + auto const p = accessNoCreate(m_pairs, k); if (!p) { return {nullptr, ox::Error(1, "value not found for given key")}; } @@ -147,7 +153,8 @@ constexpr Result SmallMap::at(MaybeView_t const&k) noexcep template constexpr Result SmallMap::at(MaybeView_t const&k) const noexcept { - auto p = access(m_pairs, k); + bool isNew{}; + auto p = access(m_pairs, k, isNew); if (!p) { return {nullptr, ox::Error(1, "value not found for given key")}; } @@ -168,7 +175,8 @@ constexpr void SmallMap::erase(MaybeView_t const&k) { template constexpr bool SmallMap::contains(MaybeView_t const&k) const noexcept { - return access(m_pairs, k) != nullptr; + bool isNew{}; + return access(m_pairs, k, isNew) != nullptr; } template @@ -186,6 +194,16 @@ constexpr Vector SmallMap::keys() const noexcept { return keys; } +template +constexpr Vector SmallMap::values() const noexcept { + ox::Vector keys; + keys.reserve(m_pairs.size()); + for (auto const&p : m_pairs) { + keys.emplace_back(p.key); + } + return keys; +} + template constexpr K const&SmallMap::key(size_t i) const noexcept { return m_pairs[i].key; @@ -218,30 +236,42 @@ constexpr void SmallMap::clear() { template template -constexpr typename SmallMap::Pair const&SmallMap::access( +constexpr typename SmallMap::Pair const*SmallMap::access( PairVector const&pairs, KK const&k, bool &isNew) const { for (auto const&p : pairs) { if (p.key == k) { isNew = false; - return p; + return &p; } } isNew = true; - return pairs.emplace_back(); + return nullptr; } template template -constexpr typename SmallMap::Pair &SmallMap::access( +constexpr typename SmallMap::Pair *SmallMap::access( PairVector &pairs, KK const&k, bool &isNew) { for (auto &p : pairs) { if (p.key == k) { isNew = false; - return p; + return &p; } } isNew = true; - return pairs.emplace_back(); + return &pairs.emplace_back(); +} + +template +template +constexpr typename SmallMap::Pair *SmallMap::accessNoCreate( + PairVector &pairs, KK const&k) { + for (auto &p : pairs) { + if (p.key == k) { + return &p; + } + } + return nullptr; } template diff --git a/deps/ox/src/ox/std/source_location.hpp b/deps/ox/src/ox/std/source_location.hpp index 54bff14..96c091e 100644 --- a/deps/ox/src/ox/std/source_location.hpp +++ b/deps/ox/src/ox/std/source_location.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/span.hpp b/deps/ox/src/ox/std/span.hpp index c4ad680..ddd978a 100644 --- a/deps/ox/src/ox/std/span.hpp +++ b/deps/ox/src/ox/std/span.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/stacktrace.cpp b/deps/ox/src/ox/std/stacktrace.cpp index 5d3271a..ae4d3d1 100644 --- a/deps/ox/src/ox/std/stacktrace.cpp +++ b/deps/ox/src/ox/std/stacktrace.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/stacktrace.hpp b/deps/ox/src/ox/std/stacktrace.hpp index 0c462d0..814756d 100644 --- a/deps/ox/src/ox/std/stacktrace.hpp +++ b/deps/ox/src/ox/std/stacktrace.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/std.hpp b/deps/ox/src/ox/std/std.hpp index 8029f56..1e507e9 100644 --- a/deps/ox/src/ox/std/std.hpp +++ b/deps/ox/src/ox/std/std.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/stddef.hpp b/deps/ox/src/ox/std/stddef.hpp index 4f99881..930edfb 100644 --- a/deps/ox/src/ox/std/stddef.hpp +++ b/deps/ox/src/ox/std/stddef.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/strconv.hpp b/deps/ox/src/ox/std/strconv.hpp index 5ef1bfc..b7f33de 100644 --- a/deps/ox/src/ox/std/strconv.hpp +++ b/deps/ox/src/ox/std/strconv.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/string.cpp b/deps/ox/src/ox/std/string.cpp index a5c63ed..ff43e3c 100644 --- a/deps/ox/src/ox/std/string.cpp +++ b/deps/ox/src/ox/std/string.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/string.hpp b/deps/ox/src/ox/std/string.hpp index 88e23be..caaf105 100644 --- a/deps/ox/src/ox/std/string.hpp +++ b/deps/ox/src/ox/std/string.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/stringliteral.hpp b/deps/ox/src/ox/std/stringliteral.hpp index 0eafc76..7dbff8e 100644 --- a/deps/ox/src/ox/std/stringliteral.hpp +++ b/deps/ox/src/ox/std/stringliteral.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/stringparam.hpp b/deps/ox/src/ox/std/stringparam.hpp index a8505db..b875ac3 100644 --- a/deps/ox/src/ox/std/stringparam.hpp +++ b/deps/ox/src/ox/std/stringparam.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/stringview.cpp b/deps/ox/src/ox/std/stringview.cpp index b8a449b..b71f116 100644 --- a/deps/ox/src/ox/std/stringview.cpp +++ b/deps/ox/src/ox/std/stringview.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/stringview.hpp b/deps/ox/src/ox/std/stringview.hpp index 03b7a3b..ced0c90 100644 --- a/deps/ox/src/ox/std/stringview.hpp +++ b/deps/ox/src/ox/std/stringview.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/strongint.hpp b/deps/ox/src/ox/std/strongint.hpp index a624f7a..0ac6b98 100644 --- a/deps/ox/src/ox/std/strongint.hpp +++ b/deps/ox/src/ox/std/strongint.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/strops.cpp b/deps/ox/src/ox/std/strops.cpp index add1742..c138b5e 100644 --- a/deps/ox/src/ox/std/strops.cpp +++ b/deps/ox/src/ox/std/strops.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/strops.hpp b/deps/ox/src/ox/std/strops.hpp index 0f34103..db85d4c 100644 --- a/deps/ox/src/ox/std/strops.hpp +++ b/deps/ox/src/ox/std/strops.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/substitutes.cpp b/deps/ox/src/ox/std/substitutes.cpp index 2adb2b3..0c4c41b 100644 --- a/deps/ox/src/ox/std/substitutes.cpp +++ b/deps/ox/src/ox/std/substitutes.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/test/CMakeLists.txt b/deps/ox/src/ox/std/test/CMakeLists.txt index 1ecad4e..2fa8f28 100644 --- a/deps/ox/src/ox/std/test/CMakeLists.txt +++ b/deps/ox/src/ox/std/test/CMakeLists.txt @@ -18,6 +18,7 @@ add_test("[ox/std] SmallMap" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "SmallMap add_test("[ox/std] SmallMap2" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "SmallMap2") add_test("[ox/std] Vector" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "Vector") add_test("[ox/std] Vector::shrink_to_fit" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "Vector::shrink_to_fit") +add_test("[ox/std] findIdx" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "findIdx") add_test("[ox/std] HashMap" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "HashMap") add_test("[ox/std] HeapMgr" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest malloc) add_test("[ox/std] Serialize-Int" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/StdTest "Serialize-Int") diff --git a/deps/ox/src/ox/std/test/tests.cpp b/deps/ox/src/ox/std/test/tests.cpp index 6325d15..68f5252 100644 --- a/deps/ox/src/ox/std/test/tests.cpp +++ b/deps/ox/src/ox/std/test/tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -267,6 +267,20 @@ OX_CLANG_NOWARN_END return ox::Error{}; } }, + { + "findIdx", + [] { + ox::Vector> const v {"zero", "one", "two", "three", "four"}; + oxExpect(ox::findIdx(v.begin(), v.end(), "zero").or_value(5), 0u); + oxExpect(ox::findIdx(v.begin(), v.end(), "one").or_value(5), 1u); + oxExpect(ox::findIdx(v.begin(), v.end(), "two").or_value(5), 2u); + oxExpect(ox::findIdx(v.begin(), v.end(), "three").or_value(5), 3u); + oxExpect(ox::findIdx(v.begin(), v.end(), "four").or_value(5), 4u); + oxExpect(ox::findIdx(v.begin(), v.end(), "five").or_value(5), 5u); + oxExpect(ox::findIdx(v.begin(), v.end(), "six").or_value(6), 6u); + return ox::Error{}; + } + }, { "SmallMap", [] { @@ -276,7 +290,18 @@ OX_CLANG_NOWARN_END oxExpect(map.size(), 1u); oxExpect(map["aoeu"], ""); oxExpect(map.size(), 2u); - return ox::Error(0); + ox::SmallMap cmap; + cmap["asdf"] = "aoeu"; + auto constexpr constTest = [](ox::SmallMap const&map) { + OX_REQUIRE(asdf, map.at("asdf")); + oxExpect(*asdf, "aoeu"); + oxExpect(map.size(), 1u); + auto const aoeu = map.at("aoeu"); + oxExpect(aoeu.ok(), false); + oxExpect(map.size(), 1u); + return ox::Error{}; + }; + return constTest(cmap); } }, { diff --git a/deps/ox/src/ox/std/trace.cpp b/deps/ox/src/ox/std/trace.cpp index 0267c5d..bb43e4b 100644 --- a/deps/ox/src/ox/std/trace.cpp +++ b/deps/ox/src/ox/std/trace.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/trace.hpp b/deps/ox/src/ox/std/trace.hpp index ca201e9..c33cf82 100644 --- a/deps/ox/src/ox/std/trace.hpp +++ b/deps/ox/src/ox/std/trace.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/tracehook.cpp b/deps/ox/src/ox/std/tracehook.cpp index fd194b4..13b26db 100644 --- a/deps/ox/src/ox/std/tracehook.cpp +++ b/deps/ox/src/ox/std/tracehook.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/typeinfo.hpp b/deps/ox/src/ox/std/typeinfo.hpp index b7d6df4..d47db39 100644 --- a/deps/ox/src/ox/std/typeinfo.hpp +++ b/deps/ox/src/ox/std/typeinfo.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/types.hpp b/deps/ox/src/ox/std/types.hpp index 2e2f3c8..a441f08 100644 --- a/deps/ox/src/ox/std/types.hpp +++ b/deps/ox/src/ox/std/types.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/typetraits.cpp b/deps/ox/src/ox/std/typetraits.cpp index cfa0ba9..2db4639 100644 --- a/deps/ox/src/ox/std/typetraits.cpp +++ b/deps/ox/src/ox/std/typetraits.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/typetraits.hpp b/deps/ox/src/ox/std/typetraits.hpp index 6202efb..720ac05 100644 --- a/deps/ox/src/ox/std/typetraits.hpp +++ b/deps/ox/src/ox/std/typetraits.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/units.hpp b/deps/ox/src/ox/std/units.hpp index 6dc9b6b..51073ff 100644 --- a/deps/ox/src/ox/std/units.hpp +++ b/deps/ox/src/ox/std/units.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/utility.hpp b/deps/ox/src/ox/std/utility.hpp index 70e60d9..1c628e1 100644 --- a/deps/ox/src/ox/std/utility.hpp +++ b/deps/ox/src/ox/std/utility.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/uuid.cpp b/deps/ox/src/ox/std/uuid.cpp index 4c6a47f..595a80c 100644 --- a/deps/ox/src/ox/std/uuid.cpp +++ b/deps/ox/src/ox/std/uuid.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/uuid.hpp b/deps/ox/src/ox/std/uuid.hpp index 81a7a30..60cd20a 100644 --- a/deps/ox/src/ox/std/uuid.hpp +++ b/deps/ox/src/ox/std/uuid.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/vec.cpp b/deps/ox/src/ox/std/vec.cpp index deac106..e482585 100644 --- a/deps/ox/src/ox/std/vec.cpp +++ b/deps/ox/src/ox/std/vec.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/vec.hpp b/deps/ox/src/ox/std/vec.hpp index 7124cfb..09e1a22 100644 --- a/deps/ox/src/ox/std/vec.hpp +++ b/deps/ox/src/ox/std/vec.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/vector.hpp b/deps/ox/src/ox/std/vector.hpp index 2b0bf69..b5b4f44 100644 --- a/deps/ox/src/ox/std/vector.hpp +++ b/deps/ox/src/ox/std/vector.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/deps/ox/src/ox/std/writer.hpp b/deps/ox/src/ox/std/writer.hpp index 9ac3393..920ec06 100644 --- a/deps/ox/src/ox/std/writer.hpp +++ b/deps/ox/src/ox/std/writer.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2024 gary@drinkingtea.net + * Copyright 2015 - 2025 gary@drinkingtea.net * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/src/nostalgia/modules/core/include/nostalgia/core/color.hpp b/src/nostalgia/modules/core/include/nostalgia/core/color.hpp index c6b73ad..9eb9bdf 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/color.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/color.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/include/nostalgia/core/consts.hpp b/src/nostalgia/modules/core/include/nostalgia/core/consts.hpp index 288c76a..182fca5 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/consts.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/consts.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/include/nostalgia/core/context.hpp b/src/nostalgia/modules/core/include/nostalgia/core/context.hpp index e71b23d..9fcffb2 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/context.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/context.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/include/nostalgia/core/core.hpp b/src/nostalgia/modules/core/include/nostalgia/core/core.hpp index 3c91563..e34c58a 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/core.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/core.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/include/nostalgia/core/gfx.hpp b/src/nostalgia/modules/core/include/nostalgia/core/gfx.hpp index db6f013..c8c8ed7 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/gfx.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/gfx.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/include/nostalgia/core/initparams.hpp b/src/nostalgia/modules/core/include/nostalgia/core/initparams.hpp index 701a19c..52b61cc 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/initparams.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/initparams.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/include/nostalgia/core/keelmodule.hpp b/src/nostalgia/modules/core/include/nostalgia/core/keelmodule.hpp index ee5b34f..ace09a8 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/keelmodule.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/keelmodule.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/include/nostalgia/core/palette.hpp b/src/nostalgia/modules/core/include/nostalgia/core/palette.hpp index 8da07c4..61cec29 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/palette.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/palette.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/include/nostalgia/core/ptidxconv.hpp b/src/nostalgia/modules/core/include/nostalgia/core/ptidxconv.hpp index 4b8eda4..ad60899 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/ptidxconv.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/ptidxconv.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/include/nostalgia/core/studiomodule.hpp b/src/nostalgia/modules/core/include/nostalgia/core/studiomodule.hpp index 3f182fa..79e1db6 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/studiomodule.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/studiomodule.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp b/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp index bbb7aca..532de0d 100644 --- a/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp +++ b/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once @@ -212,6 +212,10 @@ struct TileSheetV4 { pixels(std::move(pPixels)) { } + /** + * + * @return the dimensional size of the SubSheet (e.g. width * height) + */ [[nodiscard]] constexpr std::size_t size() const noexcept { return static_cast(columns) * static_cast(rows); @@ -273,7 +277,7 @@ size_t getTileCnt(TileSheet const&ts) noexcept; TileSheet::SubSheet const*getSubsheet(TileSheet const&ts, SubSheetId id) noexcept; [[nodiscard]] -size_t getTileIdx(TileSheet const&ts, SubSheetId id) noexcept; +ox::Optional getTileIdx(TileSheet const&ts, SubSheetId id) noexcept; [[nodiscard]] uint8_t getPixel4Bpp(TileSheet::SubSheet const&ss, std::size_t idx) noexcept; @@ -392,6 +396,8 @@ ox::Result getIdFor(TileSheet const&ts, ox::StringViewCR path) noexc ox::Result getTileOffset(TileSheet const&ts, ox::StringViewCR pNamePath) noexcept; +ox::Result getTileOffset(TileSheet const&ts, SubSheetId pId) noexcept; + ox::Result getNameFor(TileSheet::SubSheet const&ss, SubSheetId pId) noexcept; ox::Result getNameFor(TileSheet const&ts, SubSheetId pId) noexcept; diff --git a/src/nostalgia/modules/core/src/gba/context.cpp b/src/nostalgia/modules/core/src/gba/context.cpp index 69f7c40..d54262d 100644 --- a/src/nostalgia/modules/core/src/gba/context.cpp +++ b/src/nostalgia/modules/core/src/gba/context.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/gba/context.hpp b/src/nostalgia/modules/core/src/gba/context.hpp index 23329da..99d2a22 100644 --- a/src/nostalgia/modules/core/src/gba/context.hpp +++ b/src/nostalgia/modules/core/src/gba/context.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/gba/gfx.cpp b/src/nostalgia/modules/core/src/gba/gfx.cpp index de6084b..59e2528 100644 --- a/src/nostalgia/modules/core/src/gba/gfx.cpp +++ b/src/nostalgia/modules/core/src/gba/gfx.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/gba/gfx.hpp b/src/nostalgia/modules/core/src/gba/gfx.hpp index d4d8cf4..21aad7e 100644 --- a/src/nostalgia/modules/core/src/gba/gfx.hpp +++ b/src/nostalgia/modules/core/src/gba/gfx.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/gba/panic.cpp b/src/nostalgia/modules/core/src/gba/panic.cpp index b878cf8..a009318 100644 --- a/src/nostalgia/modules/core/src/gba/panic.cpp +++ b/src/nostalgia/modules/core/src/gba/panic.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ diff --git a/src/nostalgia/modules/core/src/gfx.cpp b/src/nostalgia/modules/core/src/gfx.cpp index 94f8eb6..c5094ad 100644 --- a/src/nostalgia/modules/core/src/gfx.cpp +++ b/src/nostalgia/modules/core/src/gfx.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/keel/keelmodule.cpp b/src/nostalgia/modules/core/src/keel/keelmodule.cpp index d67b783..8f788d6 100644 --- a/src/nostalgia/modules/core/src/keel/keelmodule.cpp +++ b/src/nostalgia/modules/core/src/keel/keelmodule.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/keel/typeconv.cpp b/src/nostalgia/modules/core/src/keel/typeconv.cpp index e28d684..04ffb4b 100644 --- a/src/nostalgia/modules/core/src/keel/typeconv.cpp +++ b/src/nostalgia/modules/core/src/keel/typeconv.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "typeconv.hpp" diff --git a/src/nostalgia/modules/core/src/keel/typeconv.hpp b/src/nostalgia/modules/core/src/keel/typeconv.hpp index d25fc38..b35b2e3 100644 --- a/src/nostalgia/modules/core/src/keel/typeconv.hpp +++ b/src/nostalgia/modules/core/src/keel/typeconv.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/opengl/context.cpp b/src/nostalgia/modules/core/src/opengl/context.cpp index 9d0cbc6..0644e9a 100644 --- a/src/nostalgia/modules/core/src/opengl/context.cpp +++ b/src/nostalgia/modules/core/src/opengl/context.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "context.hpp" diff --git a/src/nostalgia/modules/core/src/opengl/context.hpp b/src/nostalgia/modules/core/src/opengl/context.hpp index 1424a79..df8ad4f 100644 --- a/src/nostalgia/modules/core/src/opengl/context.hpp +++ b/src/nostalgia/modules/core/src/opengl/context.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/opengl/gfx.cpp b/src/nostalgia/modules/core/src/opengl/gfx.cpp index e8bbba2..41a1413 100644 --- a/src/nostalgia/modules/core/src/opengl/gfx.cpp +++ b/src/nostalgia/modules/core/src/opengl/gfx.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/opengl/gfx.hpp b/src/nostalgia/modules/core/src/opengl/gfx.hpp index 81200d7..5681380 100644 --- a/src/nostalgia/modules/core/src/opengl/gfx.hpp +++ b/src/nostalgia/modules/core/src/opengl/gfx.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/addcolorcommand.cpp b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/addcolorcommand.cpp index b92f372..7e5d4b0 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/addcolorcommand.cpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/addcolorcommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "commands.hpp" diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/addcolorcommand.hpp b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/addcolorcommand.hpp index 73668b0..cf7ba65 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/addcolorcommand.hpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/addcolorcommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/applycolorallpagescommand.cpp b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/applycolorallpagescommand.cpp index 38d2e11..902d339 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/applycolorallpagescommand.cpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/applycolorallpagescommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "commands.hpp" diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/applycolorallpagescommand.hpp b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/applycolorallpagescommand.hpp index 4582d8e..0272544 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/applycolorallpagescommand.hpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/applycolorallpagescommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/commands.hpp b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/commands.hpp index dd258c2..778e450 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/commands.hpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/commands.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/duplicatepagecommand.cpp b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/duplicatepagecommand.cpp index a6ea2b6..6f52860 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/duplicatepagecommand.cpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/duplicatepagecommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "commands.hpp" diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/duplicatepagecommand.hpp b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/duplicatepagecommand.hpp index c827c3d..6fba6ba 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/duplicatepagecommand.hpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/duplicatepagecommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/movecolorcommand.cpp b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/movecolorcommand.cpp index f8df2a2..cbb7e8a 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/movecolorcommand.cpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/movecolorcommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "commands.hpp" diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/movecolorcommand.hpp b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/movecolorcommand.hpp index ed366cd..9397a65 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/movecolorcommand.hpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/movecolorcommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/removecolorcommand.cpp b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/removecolorcommand.cpp index d3c1605..2472af6 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/removecolorcommand.cpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/removecolorcommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "commands.hpp" diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/removecolorcommand.hpp b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/removecolorcommand.hpp index 76039cf..64c70c0 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/removecolorcommand.hpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/removecolorcommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/removepagecommand.cpp b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/removepagecommand.cpp index 5a9fc37..a63935b 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/removepagecommand.cpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/removepagecommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "commands.hpp" diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/removepagecommand.hpp b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/removepagecommand.hpp index 8137c73..ef7f6d7 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/removepagecommand.hpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/removepagecommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/renamepagecommand.cpp b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/renamepagecommand.cpp index 844e997..b7042e9 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/renamepagecommand.cpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/renamepagecommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "renamepagecommand.hpp" diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/renamepagecommand.hpp b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/renamepagecommand.hpp index c5046eb..4e1733f 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/renamepagecommand.hpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/renamepagecommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/updatecolorcommand.cpp b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/updatecolorcommand.cpp index 5e4191a..a384839 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/updatecolorcommand.cpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/updatecolorcommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "commands.hpp" diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/updatecolorcommand.hpp b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/updatecolorcommand.hpp index 49f94ef..387afbf 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/updatecolorcommand.hpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/updatecolorcommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/updatecolorinfocommand.cpp b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/updatecolorinfocommand.cpp index a2d8374..e86797a 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/updatecolorinfocommand.cpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/updatecolorinfocommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "commands.hpp" diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/updatecolorinfocommand.hpp b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/updatecolorinfocommand.hpp index 59e898d..170514f 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/commands/updatecolorinfocommand.hpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/commands/updatecolorinfocommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.cpp b/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.cpp index 7dca2ee..ade3751 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.cpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.hpp b/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.hpp index 1ea1a95..14eca23 100644 --- a/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.hpp +++ b/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/studiomodule.cpp b/src/nostalgia/modules/core/src/studio/studiomodule.cpp index a880ee2..f789c2a 100644 --- a/src/nostalgia/modules/core/src/studio/studiomodule.cpp +++ b/src/nostalgia/modules/core/src/studio/studiomodule.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/addsubsheetcommand.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/addsubsheetcommand.cpp index 1e1b024..e61a5f4 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/addsubsheetcommand.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/addsubsheetcommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "addsubsheetcommand.hpp" diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/addsubsheetcommand.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/addsubsheetcommand.hpp index 64863fc..65f79b5 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/addsubsheetcommand.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/addsubsheetcommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/commands.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/commands.hpp index 77dbf35..27db437 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/commands.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/commands.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/cutpastecommand.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/cutpastecommand.cpp index 0ab608f..60e19f5 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/cutpastecommand.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/cutpastecommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "cutpastecommand.hpp" diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/cutpastecommand.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/cutpastecommand.hpp index d6f648d..4d263e5 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/cutpastecommand.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/cutpastecommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/deletetilescommand.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/deletetilescommand.cpp index ab2bc2e..9eff525 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/deletetilescommand.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/deletetilescommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/deletetilescommand.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/deletetilescommand.hpp index d96be81..792848b 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/deletetilescommand.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/deletetilescommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/drawcommand.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/drawcommand.cpp index 1353d5e..6217f8f 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/drawcommand.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/drawcommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "drawcommand.hpp" diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/drawcommand.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/drawcommand.hpp index 3c0befe..593ade1 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/drawcommand.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/drawcommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/inserttilescommand.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/inserttilescommand.cpp index 99d0d52..3a98643 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/inserttilescommand.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/inserttilescommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "inserttilescommand.hpp" diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/inserttilescommand.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/inserttilescommand.hpp index 4bbb32b..5761c9a 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/inserttilescommand.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/inserttilescommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.cpp index 6166ce8..741ad01 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "palettechangecommand.hpp" diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.hpp index c4540b7..3be318e 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/rmsubsheetcommand.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/rmsubsheetcommand.cpp index 5b8108f..8246c9f 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/rmsubsheetcommand.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/rmsubsheetcommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "rmsubsheetcommand.hpp" diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/rmsubsheetcommand.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/rmsubsheetcommand.hpp index f65e963..0b0f9ce 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/rmsubsheetcommand.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/rmsubsheetcommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/updatesubsheetcommand.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/updatesubsheetcommand.cpp index 56a4e75..f5e3806 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/updatesubsheetcommand.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/updatesubsheetcommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "updatesubsheetcommand.hpp" diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/updatesubsheetcommand.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/updatesubsheetcommand.hpp index fbfaebb..7bdb617 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/updatesubsheetcommand.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/updatesubsheetcommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp index 4f781f9..ad047ab 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp index 7ad6f27..40acda3 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditormodel.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditormodel.cpp index bfef4a2..b3acb13 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditormodel.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditormodel.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditormodel.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditormodel.hpp index fcceb58..6dd03b6 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditormodel.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditormodel.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditorview.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditorview.cpp index 7b1c318..0cf1d87 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditorview.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditorview.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditorview.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditorview.hpp index 5289738..5c0d11f 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditorview.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditorview.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixelgrid.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixelgrid.cpp index bd68bff..e38cb40 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixelgrid.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixelgrid.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixelgrid.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixelgrid.hpp index 1c7a8ed..f1690d8 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixelgrid.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixelgrid.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixels.cpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixels.cpp index 2fa55a3..b97e968 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixels.cpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixels.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixels.hpp b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixels.hpp index f8bc34f..f9fabea 100644 --- a/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixels.hpp +++ b/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixels.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/core/src/tilesheet.cpp b/src/nostalgia/modules/core/src/tilesheet.cpp index 6a11393..3856b95 100644 --- a/src/nostalgia/modules/core/src/tilesheet.cpp +++ b/src/nostalgia/modules/core/src/tilesheet.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include @@ -66,10 +66,10 @@ static ox::Optional getPixelIdx( return ox::Optional{}; } -size_t getTileIdx(TileSheet const&ts, SubSheetId const id) noexcept { +ox::Optional getTileIdx(TileSheet const&ts, SubSheetId const id) noexcept { size_t idx{}; auto const out = getPixelIdx(ts.subsheet, id, idx, ts.bpp); - return out.or_value(0) / PixelsPerTile; + return out ? ox::Optional{ox::in_place, *out / PixelsPerTile} : out; } uint8_t getPixel4Bpp(TileSheet::SubSheet const&ss, std::size_t idx) noexcept { @@ -355,12 +355,12 @@ ox::Result getIdFor(TileSheet const&ts, ox::StringViewCR path) noexc /** * Gets the offset in tiles of the desired subsheet. */ -static ox::Result getTileOffset( +static ox::Result getTileOffset( TileSheet::SubSheet const&ss, ox::SpanView const&pNamePath, int8_t pBpp, std::size_t pIt = 0, - unsigned pCurrentTotal = 0) noexcept { + uint32_t pCurrentTotal = 0) noexcept { // pIt == pNamePath.size() - 1 && if (ss.name != pNamePath[pIt]) { return ox::Error(2, "Wrong branch"); @@ -374,12 +374,14 @@ static ox::Result getTileOffset( if (!err) { return offset; } + // Possible bug? Shoud this be usinga a recursive version of + // pixelCnt will count pixels in subsheets of sub as well. pCurrentTotal += pixelCnt(sub, pBpp) / PixelsPerTile; } return ox::Error(1, "SubSheet not found"); } -ox::Result getTileOffset(TileSheet const&ts, ox::StringViewCR pNamePath) noexcept { +ox::Result getTileOffset(TileSheet const&ts, ox::StringViewCR pNamePath) noexcept { return core::getTileOffset(ts.subsheet, ox::split<8>(pNamePath, '.'), ts.bpp); } diff --git a/src/nostalgia/modules/core/test/tests.cpp b/src/nostalgia/modules/core/test/tests.cpp index 1d46812..03c59fc 100644 --- a/src/nostalgia/modules/core/test/tests.cpp +++ b/src/nostalgia/modules/core/test/tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #undef NDEBUG diff --git a/src/nostalgia/modules/keelmodules.cpp b/src/nostalgia/modules/keelmodules.cpp index 15901fa..00f4745 100644 --- a/src/nostalgia/modules/keelmodules.cpp +++ b/src/nostalgia/modules/keelmodules.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/keelmodules.hpp b/src/nostalgia/modules/keelmodules.hpp index 0247ed2..2226cd1 100644 --- a/src/nostalgia/modules/keelmodules.hpp +++ b/src/nostalgia/modules/keelmodules.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/scene/include/nostalgia/scene/keelmodule.hpp b/src/nostalgia/modules/scene/include/nostalgia/scene/keelmodule.hpp index 2404e9e..e972b85 100644 --- a/src/nostalgia/modules/scene/include/nostalgia/scene/keelmodule.hpp +++ b/src/nostalgia/modules/scene/include/nostalgia/scene/keelmodule.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/scene/include/nostalgia/scene/scene.hpp b/src/nostalgia/modules/scene/include/nostalgia/scene/scene.hpp index 8555dda..7863d79 100644 --- a/src/nostalgia/modules/scene/include/nostalgia/scene/scene.hpp +++ b/src/nostalgia/modules/scene/include/nostalgia/scene/scene.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/scene/include/nostalgia/scene/scenestatic.hpp b/src/nostalgia/modules/scene/include/nostalgia/scene/scenestatic.hpp index 3cc9825..19747c9 100644 --- a/src/nostalgia/modules/scene/include/nostalgia/scene/scenestatic.hpp +++ b/src/nostalgia/modules/scene/include/nostalgia/scene/scenestatic.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/scene/include/nostalgia/scene/studiomodule.hpp b/src/nostalgia/modules/scene/include/nostalgia/scene/studiomodule.hpp index 6eeed6f..82902e0 100644 --- a/src/nostalgia/modules/scene/include/nostalgia/scene/studiomodule.hpp +++ b/src/nostalgia/modules/scene/include/nostalgia/scene/studiomodule.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/scene/src/keel/keelmodule.cpp b/src/nostalgia/modules/scene/src/keel/keelmodule.cpp index 534d584..f99d28d 100644 --- a/src/nostalgia/modules/scene/src/keel/keelmodule.cpp +++ b/src/nostalgia/modules/scene/src/keel/keelmodule.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/scene/src/keel/typeconv.cpp b/src/nostalgia/modules/scene/src/keel/typeconv.cpp index ede2069..f9c51fc 100644 --- a/src/nostalgia/modules/scene/src/keel/typeconv.cpp +++ b/src/nostalgia/modules/scene/src/keel/typeconv.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/scene/src/keel/typeconv.hpp b/src/nostalgia/modules/scene/src/keel/typeconv.hpp index b6fe8d8..0654d00 100644 --- a/src/nostalgia/modules/scene/src/keel/typeconv.hpp +++ b/src/nostalgia/modules/scene/src/keel/typeconv.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/scene/src/scene.cpp b/src/nostalgia/modules/scene/src/scene.cpp index aa08f35..558e76d 100644 --- a/src/nostalgia/modules/scene/src/scene.cpp +++ b/src/nostalgia/modules/scene/src/scene.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/scene/src/scenestatic.cpp b/src/nostalgia/modules/scene/src/scenestatic.cpp index fc29860..18e3aaa 100644 --- a/src/nostalgia/modules/scene/src/scenestatic.cpp +++ b/src/nostalgia/modules/scene/src/scenestatic.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.cpp b/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.cpp index b7891a8..8a7416c 100644 --- a/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.cpp +++ b/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.hpp b/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.hpp index 24bc0b6..26dc62a 100644 --- a/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.hpp +++ b/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/scene/src/studio/sceneeditor.cpp b/src/nostalgia/modules/scene/src/studio/sceneeditor.cpp index 50788ab..7c5c017 100644 --- a/src/nostalgia/modules/scene/src/studio/sceneeditor.cpp +++ b/src/nostalgia/modules/scene/src/studio/sceneeditor.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/scene/src/studio/sceneeditor.hpp b/src/nostalgia/modules/scene/src/studio/sceneeditor.hpp index 6891d23..7d7962a 100644 --- a/src/nostalgia/modules/scene/src/studio/sceneeditor.hpp +++ b/src/nostalgia/modules/scene/src/studio/sceneeditor.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/scene/src/studio/sceneeditorview.cpp b/src/nostalgia/modules/scene/src/studio/sceneeditorview.cpp index fabba29..6d0776f 100644 --- a/src/nostalgia/modules/scene/src/studio/sceneeditorview.cpp +++ b/src/nostalgia/modules/scene/src/studio/sceneeditorview.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/scene/src/studio/sceneeditorview.hpp b/src/nostalgia/modules/scene/src/studio/sceneeditorview.hpp index 276839f..c1f2991 100644 --- a/src/nostalgia/modules/scene/src/studio/sceneeditorview.hpp +++ b/src/nostalgia/modules/scene/src/studio/sceneeditorview.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/modules/scene/src/studio/studiomodule.cpp b/src/nostalgia/modules/scene/src/studio/studiomodule.cpp index e622c5a..564fd19 100644 --- a/src/nostalgia/modules/scene/src/studio/studiomodule.cpp +++ b/src/nostalgia/modules/scene/src/studio/studiomodule.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/studiomodules.cpp b/src/nostalgia/modules/studiomodules.cpp index c9c78df..ead8a18 100644 --- a/src/nostalgia/modules/studiomodules.cpp +++ b/src/nostalgia/modules/studiomodules.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/modules/studiomodules.hpp b/src/nostalgia/modules/studiomodules.hpp index 3f4bb72..6c4dfc7 100644 --- a/src/nostalgia/modules/studiomodules.hpp +++ b/src/nostalgia/modules/studiomodules.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/nostalgia/player/app.cpp b/src/nostalgia/player/app.cpp index 7a531f1..a2d20ea 100644 --- a/src/nostalgia/player/app.cpp +++ b/src/nostalgia/player/app.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/nostalgia/player/app.hpp b/src/nostalgia/player/app.hpp index 04e73a5..3435715 100644 --- a/src/nostalgia/player/app.hpp +++ b/src/nostalgia/player/app.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/applib/applib.cpp b/src/olympic/applib/applib.cpp index 3bb0210..ac1a7e8 100644 --- a/src/olympic/applib/applib.cpp +++ b/src/olympic/applib/applib.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/keel/include/keel/asset.hpp b/src/olympic/keel/include/keel/asset.hpp index a3d5da7..35d53e6 100644 --- a/src/olympic/keel/include/keel/asset.hpp +++ b/src/olympic/keel/include/keel/asset.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/keel/include/keel/assetmanager.hpp b/src/olympic/keel/include/keel/assetmanager.hpp index 5c22a70..4c8ae38 100644 --- a/src/olympic/keel/include/keel/assetmanager.hpp +++ b/src/olympic/keel/include/keel/assetmanager.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/keel/include/keel/context.hpp b/src/olympic/keel/include/keel/context.hpp index a34d8a1..a64fd61 100644 --- a/src/olympic/keel/include/keel/context.hpp +++ b/src/olympic/keel/include/keel/context.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/keel/include/keel/keel.hpp b/src/olympic/keel/include/keel/keel.hpp index 203bb15..f03b2bb 100644 --- a/src/olympic/keel/include/keel/keel.hpp +++ b/src/olympic/keel/include/keel/keel.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/keel/include/keel/media.hpp b/src/olympic/keel/include/keel/media.hpp index 17646fd..7accfae 100644 --- a/src/olympic/keel/include/keel/media.hpp +++ b/src/olympic/keel/include/keel/media.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/keel/include/keel/module.hpp b/src/olympic/keel/include/keel/module.hpp index 6d17a1b..4dab0b2 100644 --- a/src/olympic/keel/include/keel/module.hpp +++ b/src/olympic/keel/include/keel/module.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/keel/include/keel/pack.hpp b/src/olympic/keel/include/keel/pack.hpp index 658bad6..417e51a 100644 --- a/src/olympic/keel/include/keel/pack.hpp +++ b/src/olympic/keel/include/keel/pack.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/keel/include/keel/typeconv.hpp b/src/olympic/keel/include/keel/typeconv.hpp index d4dde27..7041e25 100644 --- a/src/olympic/keel/include/keel/typeconv.hpp +++ b/src/olympic/keel/include/keel/typeconv.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/keel/include/keel/typestore.hpp b/src/olympic/keel/include/keel/typestore.hpp index 619c050..106b91b 100644 --- a/src/olympic/keel/include/keel/typestore.hpp +++ b/src/olympic/keel/include/keel/typestore.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/keel/include/keel/validation.hpp b/src/olympic/keel/include/keel/validation.hpp index 71f2a59..2c9a16a 100644 --- a/src/olympic/keel/include/keel/validation.hpp +++ b/src/olympic/keel/include/keel/validation.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/keel/src/asset.cpp b/src/olympic/keel/src/asset.cpp index b24ab97..d4d907e 100644 --- a/src/olympic/keel/src/asset.cpp +++ b/src/olympic/keel/src/asset.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/keel/src/keel.cpp b/src/olympic/keel/src/keel.cpp index dbaf50a..9f85770 100644 --- a/src/olympic/keel/src/keel.cpp +++ b/src/olympic/keel/src/keel.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/keel/src/media.cpp b/src/olympic/keel/src/media.cpp index fdbb011..ff1b708 100644 --- a/src/olympic/keel/src/media.cpp +++ b/src/olympic/keel/src/media.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/keel/src/module.cpp b/src/olympic/keel/src/module.cpp index 5fd0012..7a0357a 100644 --- a/src/olympic/keel/src/module.cpp +++ b/src/olympic/keel/src/module.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/keel/src/pack-applib.cpp b/src/olympic/keel/src/pack-applib.cpp index b57b119..1583213 100644 --- a/src/olympic/keel/src/pack-applib.cpp +++ b/src/olympic/keel/src/pack-applib.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/keel/src/pack.cpp b/src/olympic/keel/src/pack.cpp index 8714416..301ffe4 100644 --- a/src/olympic/keel/src/pack.cpp +++ b/src/olympic/keel/src/pack.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/keel/src/typeconv.cpp b/src/olympic/keel/src/typeconv.cpp index cd6ff7f..aeb598b 100644 --- a/src/olympic/keel/src/typeconv.cpp +++ b/src/olympic/keel/src/typeconv.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/keel/src/typestore.cpp b/src/olympic/keel/src/typestore.cpp index f171400..fb7970a 100644 --- a/src/olympic/keel/src/typestore.cpp +++ b/src/olympic/keel/src/typestore.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/keel/test/tests.cpp b/src/olympic/keel/test/tests.cpp index c3ee316..f4681d9 100644 --- a/src/olympic/keel/test/tests.cpp +++ b/src/olympic/keel/test/tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #undef NDEBUG diff --git a/src/olympic/studio/applib/include/studioapp/studioapp.hpp b/src/olympic/studio/applib/include/studioapp/studioapp.hpp index 460c006..53ad491 100644 --- a/src/olympic/studio/applib/include/studioapp/studioapp.hpp +++ b/src/olympic/studio/applib/include/studioapp/studioapp.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/applib/src/aboutpopup.cpp b/src/olympic/studio/applib/src/aboutpopup.cpp index 0a5ca95..005b52f 100644 --- a/src/olympic/studio/applib/src/aboutpopup.cpp +++ b/src/olympic/studio/applib/src/aboutpopup.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/applib/src/aboutpopup.hpp b/src/olympic/studio/applib/src/aboutpopup.hpp index 39e8c40..d8a2e82 100644 --- a/src/olympic/studio/applib/src/aboutpopup.hpp +++ b/src/olympic/studio/applib/src/aboutpopup.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/applib/src/clawviewer.cpp b/src/olympic/studio/applib/src/clawviewer.cpp index ad8466e..65f895e 100644 --- a/src/olympic/studio/applib/src/clawviewer.cpp +++ b/src/olympic/studio/applib/src/clawviewer.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/applib/src/clawviewer.hpp b/src/olympic/studio/applib/src/clawviewer.hpp index 3be1f96..50f7bd5 100644 --- a/src/olympic/studio/applib/src/clawviewer.hpp +++ b/src/olympic/studio/applib/src/clawviewer.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/applib/src/filedialogmanager.cpp b/src/olympic/studio/applib/src/filedialogmanager.cpp index 28187d7..bb4c941 100644 --- a/src/olympic/studio/applib/src/filedialogmanager.cpp +++ b/src/olympic/studio/applib/src/filedialogmanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/applib/src/filedialogmanager.hpp b/src/olympic/studio/applib/src/filedialogmanager.hpp index 42b0dd9..e712188 100644 --- a/src/olympic/studio/applib/src/filedialogmanager.hpp +++ b/src/olympic/studio/applib/src/filedialogmanager.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/applib/src/main.cpp b/src/olympic/studio/applib/src/main.cpp index 6b229ce..440b070 100644 --- a/src/olympic/studio/applib/src/main.cpp +++ b/src/olympic/studio/applib/src/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/applib/src/newmenu.cpp b/src/olympic/studio/applib/src/newmenu.cpp index e8e8c53..806e3dc 100644 --- a/src/olympic/studio/applib/src/newmenu.cpp +++ b/src/olympic/studio/applib/src/newmenu.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/applib/src/newmenu.hpp b/src/olympic/studio/applib/src/newmenu.hpp index 658e72e..c8ac34e 100644 --- a/src/olympic/studio/applib/src/newmenu.hpp +++ b/src/olympic/studio/applib/src/newmenu.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/applib/src/newproject.cpp b/src/olympic/studio/applib/src/newproject.cpp index 6957791..a3f0099 100644 --- a/src/olympic/studio/applib/src/newproject.cpp +++ b/src/olympic/studio/applib/src/newproject.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/applib/src/newproject.hpp b/src/olympic/studio/applib/src/newproject.hpp index ce6914b..14e6e50 100644 --- a/src/olympic/studio/applib/src/newproject.hpp +++ b/src/olympic/studio/applib/src/newproject.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/applib/src/projectexplorer.cpp b/src/olympic/studio/applib/src/projectexplorer.cpp index 76ed4dc..0a05842 100644 --- a/src/olympic/studio/applib/src/projectexplorer.cpp +++ b/src/olympic/studio/applib/src/projectexplorer.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/applib/src/projectexplorer.hpp b/src/olympic/studio/applib/src/projectexplorer.hpp index 1e3cc73..8341670 100644 --- a/src/olympic/studio/applib/src/projectexplorer.hpp +++ b/src/olympic/studio/applib/src/projectexplorer.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/applib/src/projecttreemodel.cpp b/src/olympic/studio/applib/src/projecttreemodel.cpp index 5d0eb87..40d98dc 100644 --- a/src/olympic/studio/applib/src/projecttreemodel.cpp +++ b/src/olympic/studio/applib/src/projecttreemodel.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/applib/src/projecttreemodel.hpp b/src/olympic/studio/applib/src/projecttreemodel.hpp index ce6be79..6e20505 100644 --- a/src/olympic/studio/applib/src/projecttreemodel.hpp +++ b/src/olympic/studio/applib/src/projecttreemodel.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/applib/src/studioapp.cpp b/src/olympic/studio/applib/src/studioapp.cpp index 204bfbf..1fbea6e 100644 --- a/src/olympic/studio/applib/src/studioapp.cpp +++ b/src/olympic/studio/applib/src/studioapp.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/applib/src/studioapp.hpp b/src/olympic/studio/applib/src/studioapp.hpp index b0534d7..92cefaa 100644 --- a/src/olympic/studio/applib/src/studioapp.hpp +++ b/src/olympic/studio/applib/src/studioapp.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/configio.hpp b/src/olympic/studio/modlib/include/studio/configio.hpp index edf4dd8..dae06f9 100644 --- a/src/olympic/studio/modlib/include/studio/configio.hpp +++ b/src/olympic/studio/modlib/include/studio/configio.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/context.hpp b/src/olympic/studio/modlib/include/studio/context.hpp index 16ca8d1..970d27e 100644 --- a/src/olympic/studio/modlib/include/studio/context.hpp +++ b/src/olympic/studio/modlib/include/studio/context.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/editor.hpp b/src/olympic/studio/modlib/include/studio/editor.hpp index 548d2ad..14a2440 100644 --- a/src/olympic/studio/modlib/include/studio/editor.hpp +++ b/src/olympic/studio/modlib/include/studio/editor.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/filedialog.hpp b/src/olympic/studio/modlib/include/studio/filedialog.hpp index f79b568..c1a491f 100644 --- a/src/olympic/studio/modlib/include/studio/filedialog.hpp +++ b/src/olympic/studio/modlib/include/studio/filedialog.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/imguiutil.hpp b/src/olympic/studio/modlib/include/studio/imguiutil.hpp index 00f0ad9..2ef22c3 100644 --- a/src/olympic/studio/modlib/include/studio/imguiutil.hpp +++ b/src/olympic/studio/modlib/include/studio/imguiutil.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/itemmaker.hpp b/src/olympic/studio/modlib/include/studio/itemmaker.hpp index e1647be..ec2f79b 100644 --- a/src/olympic/studio/modlib/include/studio/itemmaker.hpp +++ b/src/olympic/studio/modlib/include/studio/itemmaker.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/module.hpp b/src/olympic/studio/modlib/include/studio/module.hpp index 78fcd82..8019be0 100644 --- a/src/olympic/studio/modlib/include/studio/module.hpp +++ b/src/olympic/studio/modlib/include/studio/module.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/popup.hpp b/src/olympic/studio/modlib/include/studio/popup.hpp index 4f6fb31..40ae00f 100644 --- a/src/olympic/studio/modlib/include/studio/popup.hpp +++ b/src/olympic/studio/modlib/include/studio/popup.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/project.hpp b/src/olympic/studio/modlib/include/studio/project.hpp index f2f88fb..dc13901 100644 --- a/src/olympic/studio/modlib/include/studio/project.hpp +++ b/src/olympic/studio/modlib/include/studio/project.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/selectiontracker.hpp b/src/olympic/studio/modlib/include/studio/selectiontracker.hpp index 1859f94..35173b0 100644 --- a/src/olympic/studio/modlib/include/studio/selectiontracker.hpp +++ b/src/olympic/studio/modlib/include/studio/selectiontracker.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/studio.hpp b/src/olympic/studio/modlib/include/studio/studio.hpp index 674186e..b18e826 100644 --- a/src/olympic/studio/modlib/include/studio/studio.hpp +++ b/src/olympic/studio/modlib/include/studio/studio.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/task.hpp b/src/olympic/studio/modlib/include/studio/task.hpp index 2730b09..5c69fb7 100644 --- a/src/olympic/studio/modlib/include/studio/task.hpp +++ b/src/olympic/studio/modlib/include/studio/task.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/undocommand.hpp b/src/olympic/studio/modlib/include/studio/undocommand.hpp index 6f41d0d..c7271b2 100644 --- a/src/olympic/studio/modlib/include/studio/undocommand.hpp +++ b/src/olympic/studio/modlib/include/studio/undocommand.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/undostack.hpp b/src/olympic/studio/modlib/include/studio/undostack.hpp index b6a5d56..c8b0df1 100644 --- a/src/olympic/studio/modlib/include/studio/undostack.hpp +++ b/src/olympic/studio/modlib/include/studio/undostack.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/include/studio/widget.hpp b/src/olympic/studio/modlib/include/studio/widget.hpp index 0b08ddf..844e27c 100644 --- a/src/olympic/studio/modlib/include/studio/widget.hpp +++ b/src/olympic/studio/modlib/include/studio/widget.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/studio/modlib/src/configio.cpp b/src/olympic/studio/modlib/src/configio.cpp index c937927..af3b59c 100644 --- a/src/olympic/studio/modlib/src/configio.cpp +++ b/src/olympic/studio/modlib/src/configio.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/modlib/src/editor.cpp b/src/olympic/studio/modlib/src/editor.cpp index de5e652..0491753 100644 --- a/src/olympic/studio/modlib/src/editor.cpp +++ b/src/olympic/studio/modlib/src/editor.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/modlib/src/filedialog_nfd.cpp b/src/olympic/studio/modlib/src/filedialog_nfd.cpp index 38744ae..ac9707e 100644 --- a/src/olympic/studio/modlib/src/filedialog_nfd.cpp +++ b/src/olympic/studio/modlib/src/filedialog_nfd.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/modlib/src/imguiutil.cpp b/src/olympic/studio/modlib/src/imguiutil.cpp index b24fab7..be7d946 100644 --- a/src/olympic/studio/modlib/src/imguiutil.cpp +++ b/src/olympic/studio/modlib/src/imguiutil.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/modlib/src/module.cpp b/src/olympic/studio/modlib/src/module.cpp index c26acbd..b2fccce 100644 --- a/src/olympic/studio/modlib/src/module.cpp +++ b/src/olympic/studio/modlib/src/module.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/modlib/src/popup.cpp b/src/olympic/studio/modlib/src/popup.cpp index 65a3d09..a31e859 100644 --- a/src/olympic/studio/modlib/src/popup.cpp +++ b/src/olympic/studio/modlib/src/popup.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/modlib/src/project.cpp b/src/olympic/studio/modlib/src/project.cpp index 15525c3..84acad6 100644 --- a/src/olympic/studio/modlib/src/project.cpp +++ b/src/olympic/studio/modlib/src/project.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/modlib/src/task.cpp b/src/olympic/studio/modlib/src/task.cpp index 9aa202a..fe6a2cd 100644 --- a/src/olympic/studio/modlib/src/task.cpp +++ b/src/olympic/studio/modlib/src/task.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/modlib/src/undocommand.cpp b/src/olympic/studio/modlib/src/undocommand.cpp index 2f60ad1..bb63d7c 100644 --- a/src/olympic/studio/modlib/src/undocommand.cpp +++ b/src/olympic/studio/modlib/src/undocommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/studio/modlib/src/undostack.cpp b/src/olympic/studio/modlib/src/undostack.cpp index dc51354..f672501 100644 --- a/src/olympic/studio/modlib/src/undostack.cpp +++ b/src/olympic/studio/modlib/src/undostack.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/turbine/include/turbine/clipboard.hpp b/src/olympic/turbine/include/turbine/clipboard.hpp index 2b88d86..ffd4122 100644 --- a/src/olympic/turbine/include/turbine/clipboard.hpp +++ b/src/olympic/turbine/include/turbine/clipboard.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/include/turbine/context.hpp b/src/olympic/turbine/include/turbine/context.hpp index 2108f08..c4f8416 100644 --- a/src/olympic/turbine/include/turbine/context.hpp +++ b/src/olympic/turbine/include/turbine/context.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/include/turbine/event.hpp b/src/olympic/turbine/include/turbine/event.hpp index a8f8c02..9f415e9 100644 --- a/src/olympic/turbine/include/turbine/event.hpp +++ b/src/olympic/turbine/include/turbine/event.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/include/turbine/gfx.hpp b/src/olympic/turbine/include/turbine/gfx.hpp index 5ff11ba..b618390 100644 --- a/src/olympic/turbine/include/turbine/gfx.hpp +++ b/src/olympic/turbine/include/turbine/gfx.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/include/turbine/input.hpp b/src/olympic/turbine/include/turbine/input.hpp index d2ad284..20667cb 100644 --- a/src/olympic/turbine/include/turbine/input.hpp +++ b/src/olympic/turbine/include/turbine/input.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/include/turbine/turbine.hpp b/src/olympic/turbine/include/turbine/turbine.hpp index aa6cfc6..e5fa4b1 100644 --- a/src/olympic/turbine/include/turbine/turbine.hpp +++ b/src/olympic/turbine/include/turbine/turbine.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/src/CMakeLists.txt b/src/olympic/turbine/src/CMakeLists.txt index c8b08b8..33a7d92 100644 --- a/src/olympic/turbine/src/CMakeLists.txt +++ b/src/olympic/turbine/src/CMakeLists.txt @@ -19,7 +19,7 @@ target_include_directories( ) target_sources( - Turbine PUBLIC + Turbine PRIVATE turbine.cpp ) diff --git a/src/olympic/turbine/src/gba/clipboard.cpp b/src/olympic/turbine/src/gba/clipboard.cpp index 03a74ae..46e29f0 100644 --- a/src/olympic/turbine/src/gba/clipboard.cpp +++ b/src/olympic/turbine/src/gba/clipboard.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/turbine/src/gba/config.hpp b/src/olympic/turbine/src/gba/config.hpp index 5f6891b..647eaa4 100644 --- a/src/olympic/turbine/src/gba/config.hpp +++ b/src/olympic/turbine/src/gba/config.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/src/gba/context.cpp b/src/olympic/turbine/src/gba/context.cpp index 37a4c71..4cce844 100644 --- a/src/olympic/turbine/src/gba/context.cpp +++ b/src/olympic/turbine/src/gba/context.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include "context.hpp" diff --git a/src/olympic/turbine/src/gba/context.hpp b/src/olympic/turbine/src/gba/context.hpp index 36d0fc1..664faef 100644 --- a/src/olympic/turbine/src/gba/context.hpp +++ b/src/olympic/turbine/src/gba/context.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/src/gba/event.cpp b/src/olympic/turbine/src/gba/event.cpp index 74218f0..52e792e 100644 --- a/src/olympic/turbine/src/gba/event.cpp +++ b/src/olympic/turbine/src/gba/event.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/turbine/src/gba/gfx.cpp b/src/olympic/turbine/src/gba/gfx.cpp index f9591c8..393cb74 100644 --- a/src/olympic/turbine/src/gba/gfx.cpp +++ b/src/olympic/turbine/src/gba/gfx.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/turbine/src/gba/irq.arm.cpp b/src/olympic/turbine/src/gba/irq.arm.cpp index 977d071..283176e 100644 --- a/src/olympic/turbine/src/gba/irq.arm.cpp +++ b/src/olympic/turbine/src/gba/irq.arm.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ // NOTE: this file is compiled as ARM and not THUMB, so don't but too much in diff --git a/src/olympic/turbine/src/gba/irqstub.cpp b/src/olympic/turbine/src/gba/irqstub.cpp index 8d3148f..9cb93c5 100644 --- a/src/olympic/turbine/src/gba/irqstub.cpp +++ b/src/olympic/turbine/src/gba/irqstub.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ // stub for building TeaGBA for PC targets, for purposes of not having to diff --git a/src/olympic/turbine/src/gba/turbine.arm.cpp b/src/olympic/turbine/src/gba/turbine.arm.cpp index 84f0213..1281039 100644 --- a/src/olympic/turbine/src/gba/turbine.arm.cpp +++ b/src/olympic/turbine/src/gba/turbine.arm.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/turbine/src/gba/turbine.cpp b/src/olympic/turbine/src/gba/turbine.cpp index 068ae4e..816723d 100644 --- a/src/olympic/turbine/src/gba/turbine.cpp +++ b/src/olympic/turbine/src/gba/turbine.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/turbine/src/gba/turbine.hpp b/src/olympic/turbine/src/gba/turbine.hpp index 29312bf..284b236 100644 --- a/src/olympic/turbine/src/gba/turbine.hpp +++ b/src/olympic/turbine/src/gba/turbine.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/src/glfw/clipboard.cpp b/src/olympic/turbine/src/glfw/clipboard.cpp index 65a81ae..88e5238 100644 --- a/src/olympic/turbine/src/glfw/clipboard.cpp +++ b/src/olympic/turbine/src/glfw/clipboard.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/turbine/src/glfw/config.hpp b/src/olympic/turbine/src/glfw/config.hpp index 7f84f85..66ac958 100644 --- a/src/olympic/turbine/src/glfw/config.hpp +++ b/src/olympic/turbine/src/glfw/config.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/src/glfw/context.cpp b/src/olympic/turbine/src/glfw/context.cpp index ed83f00..09f906f 100644 --- a/src/olympic/turbine/src/glfw/context.cpp +++ b/src/olympic/turbine/src/glfw/context.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/turbine/src/glfw/context.hpp b/src/olympic/turbine/src/glfw/context.hpp index de760da..80d0f40 100644 --- a/src/olympic/turbine/src/glfw/context.hpp +++ b/src/olympic/turbine/src/glfw/context.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #pragma once diff --git a/src/olympic/turbine/src/glfw/event.cpp b/src/olympic/turbine/src/glfw/event.cpp index 74218f0..52e792e 100644 --- a/src/olympic/turbine/src/glfw/event.cpp +++ b/src/olympic/turbine/src/glfw/event.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/turbine/src/glfw/gfx.cpp b/src/olympic/turbine/src/glfw/gfx.cpp index a5445a8..058cc49 100644 --- a/src/olympic/turbine/src/glfw/gfx.cpp +++ b/src/olympic/turbine/src/glfw/gfx.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/turbine/src/glfw/turbine.cpp b/src/olympic/turbine/src/glfw/turbine.cpp index d814823..b6997c5 100644 --- a/src/olympic/turbine/src/glfw/turbine.cpp +++ b/src/olympic/turbine/src/glfw/turbine.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/src/olympic/turbine/src/turbine.cpp b/src/olympic/turbine/src/turbine.cpp index 56b2499..2b52507 100644 --- a/src/olympic/turbine/src/turbine.cpp +++ b/src/olympic/turbine/src/turbine.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved. + * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved. */ #include diff --git a/util/scripts/pkg-gba.py b/util/scripts/pkg-gba.py index e3ee369..10f069b 100755 --- a/util/scripts/pkg-gba.py +++ b/util/scripts/pkg-gba.py @@ -28,11 +28,11 @@ project_name = sys.argv[2] bin = f'./build/{host_env}-{current_build}/bin/' project_bin = f'build/gba-release/bin/{project_name}.bin' project_gba = f'{project_name}.gba' -project_manifest = f'{project_name}-manifest.json' +project_manifest = f'{project_name.lower()}-manifest.json' shutil.copyfile(project_bin, project_gba) subprocess.run([ - f'{bin}/{project_name}-pack', + f'{bin}/{project_name.lower()}-pack', '-src', project_dir, '-rom-bin', project_gba, '-manifest', project_manifest])