diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 23d94711f7..a65787c2b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ variables: Ubuntu_GCC_preprocess: extends: .Ubuntu_Image cache: - key: Ubuntu_GCC_preprocess.ubuntu_24.04.v1 + key: Ubuntu_GCC_preprocess.ubuntu_24.04.v2 paths: - apt-cache/ - .cache/pip/ @@ -105,7 +105,7 @@ Coverity: rules: - if: $CI_PIPELINE_SOURCE == "schedule" cache: - key: Coverity.ubuntu_24.04.v1 + key: Coverity.ubuntu_24.04.v2 paths: - apt-cache/ - ccache/ @@ -161,7 +161,7 @@ Coverity_Upload: Ubuntu_GCC: extends: .Ubuntu cache: - key: Ubuntu_GCC.ubuntu_24.04.v1 + key: Ubuntu_GCC.ubuntu_24.04.v2 before_script: - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic variables: @@ -174,7 +174,7 @@ Ubuntu_GCC: Ubuntu_GCC_asan: extends: Ubuntu_GCC cache: - key: Ubuntu_GCC_asan.ubuntu_24.04.v1 + key: Ubuntu_GCC_asan.ubuntu_24.04.v2 variables: CMAKE_BUILD_TYPE: Debug CMAKE_CXX_FLAGS_DEBUG: -g -O1 -fno-omit-frame-pointer -fsanitize=address -fsanitize=pointer-subtract -fsanitize=leak @@ -187,7 +187,7 @@ Clang_Format: extends: .Ubuntu_Image stage: checks cache: - key: Ubuntu_Clang_Format.ubuntu_24.04.v1 + key: Ubuntu_Clang_Format.ubuntu_24.04.v2 paths: - apt-cache/ variables: @@ -203,7 +203,7 @@ Lupdate: extends: .Ubuntu_Image stage: checks cache: - key: Ubuntu_lupdate.ubuntu_24.04.v1 + key: Ubuntu_lupdate.ubuntu_24.04.v2 paths: - apt-cache/ variables: @@ -229,7 +229,7 @@ Teal: Ubuntu_GCC_Debug: extends: .Ubuntu cache: - key: Ubuntu_GCC_Debug.ubuntu_24.04.v2 + key: Ubuntu_GCC_Debug.ubuntu_24.04.v3 before_script: - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic variables: @@ -245,7 +245,7 @@ Ubuntu_GCC_Debug: Ubuntu_GCC_tests: extends: Ubuntu_GCC cache: - key: Ubuntu_GCC_tests.ubuntu_24.04.v1 + key: Ubuntu_GCC_tests.ubuntu_24.04.v2 variables: CCACHE_SIZE: 1G BUILD_TESTS_ONLY: 1 @@ -259,7 +259,7 @@ Ubuntu_GCC_tests: .Ubuntu_GCC_tests_Debug: extends: Ubuntu_GCC cache: - key: Ubuntu_GCC_tests_Debug.ubuntu_24.04.v1 + key: Ubuntu_GCC_tests_Debug.ubuntu_24.04.v2 variables: CCACHE_SIZE: 1G BUILD_TESTS_ONLY: 1 @@ -275,7 +275,7 @@ Ubuntu_GCC_tests: Ubuntu_GCC_tests_asan: extends: Ubuntu_GCC cache: - key: Ubuntu_GCC_tests_asan.ubuntu_24.04.v1 + key: Ubuntu_GCC_tests_asan.ubuntu_24.04.v2 variables: CCACHE_SIZE: 1G BUILD_TESTS_ONLY: 1 @@ -298,7 +298,7 @@ Ubuntu_GCC_tests_asan: Ubuntu_GCC_tests_ubsan: extends: Ubuntu_GCC cache: - key: Ubuntu_GCC_tests_ubsan.ubuntu_24.04.v1 + key: Ubuntu_GCC_tests_ubsan.ubuntu_24.04.v2 variables: CCACHE_SIZE: 1G BUILD_TESTS_ONLY: 1 @@ -318,7 +318,7 @@ Ubuntu_GCC_tests_ubsan: .Ubuntu_GCC_tests_tsan: extends: Ubuntu_GCC cache: - key: Ubuntu_GCC_tests_tsan.ubuntu_24.04.v1 + key: Ubuntu_GCC_tests_tsan.ubuntu_24.04.v2 variables: CCACHE_SIZE: 1G BUILD_TESTS_ONLY: 1 @@ -336,7 +336,7 @@ Ubuntu_GCC_tests_ubsan: Ubuntu_GCC_tests_coverage: extends: .Ubuntu_GCC_tests_Debug cache: - key: Ubuntu_GCC_tests_coverage.ubuntu_24.04.v1 + key: Ubuntu_GCC_tests_coverage.ubuntu_24.04.v2 paths: - .cache/pip variables: @@ -369,7 +369,7 @@ Ubuntu_GCC_tests_coverage: - "CI/**/*" - ".gitlab-ci.yml" cache: - key: Ubuntu_Static_Deps.ubuntu_24.04.v1 + key: Ubuntu_Static_Deps.ubuntu_24.04.v2 paths: - apt-cache/ - ccache/ @@ -386,7 +386,7 @@ Ubuntu_GCC_tests_coverage: .Ubuntu_Static_Deps_tests: extends: .Ubuntu_Static_Deps cache: - key: Ubuntu_Static_Deps_tests.ubuntu_24.04.v1 + key: Ubuntu_Static_Deps_tests.ubuntu_24.04.v2 variables: CCACHE_SIZE: 1G BUILD_TESTS_ONLY: 1 @@ -405,7 +405,7 @@ Ubuntu_Clang: before_script: - CI/install_debian_deps.sh clang openmw-deps openmw-deps-dynamic cache: - key: Ubuntu_Clang.ubuntu_24.04.v2 + key: Ubuntu_Clang.ubuntu_24.04.v3 variables: CC: clang CXX: clang++ @@ -418,7 +418,7 @@ Ubuntu_Clang: before_script: - CI/install_debian_deps.sh clang clang-tidy openmw-deps openmw-deps-dynamic cache: - key: Ubuntu_Clang_Tidy.ubuntu_24.04.v1 + key: Ubuntu_Clang_Tidy.ubuntu_24.04.v2 variables: CMAKE_BUILD_TYPE: Debug CMAKE_CXX_FLAGS_DEBUG: -O0 @@ -476,7 +476,7 @@ Ubuntu_Clang_Tidy_other: .Ubuntu_Clang_tests: extends: Ubuntu_Clang cache: - key: Ubuntu_Clang_tests.ubuntu_24.04.v1 + key: Ubuntu_Clang_tests.ubuntu_24.04.v2 variables: CCACHE_SIZE: 1G BUILD_TESTS_ONLY: 1 @@ -490,7 +490,7 @@ Ubuntu_Clang_Tidy_other: Ubuntu_Clang_tests_Debug: extends: Ubuntu_Clang cache: - key: Ubuntu_Clang_tests_Debug.ubuntu_24.04.v1 + key: Ubuntu_Clang_tests_Debug.ubuntu_24.04.v2 variables: CCACHE_SIZE: 1G BUILD_TESTS_ONLY: 1 @@ -525,7 +525,7 @@ Ubuntu_Clang_integration_tests: needs: - Ubuntu_Clang cache: - key: Ubuntu_Clang_integration_tests.ubuntu_24.04.v2 + key: Ubuntu_Clang_integration_tests.ubuntu_24.04.v3 variables: OPENMW_DEPS: openmw-integration-tests @@ -534,7 +534,7 @@ Ubuntu_GCC_integration_tests_asan: needs: - Ubuntu_GCC_asan cache: - key: Ubuntu_GCC_integration_tests_asan.ubuntu_24.04.v1 + key: Ubuntu_GCC_integration_tests_asan.ubuntu_24.04.v2 variables: OPENMW_DEPS: openmw-integration-tests libasan ASAN_OPTIONS: halt_on_error=1:strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:detect_leaks=0 @@ -587,7 +587,7 @@ Ubuntu_GCC_integration_tests_asan: macOS15_Xcode16_amd64: extends: .MacOS cache: - key: macOS15_Xcode16_amd64.v1 + key: macOS15_Xcode16_amd64.v2 variables: CCACHE_SIZE: 3G DMG_IDENTIFIER: amd64 @@ -599,7 +599,7 @@ macOS15_Xcode16_amd64: macOS15_Xcode16_arm64: extends: .MacOS cache: - key: macOS15_Xcode16_arm64.v1 + key: macOS15_Xcode16_arm64.v2 variables: DMG_IDENTIFIER: arm64 CCACHE_SIZE: 3G diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp index 4f79f49637..81011ee24a 100644 --- a/apps/openmw/mwgui/dialogue.hpp +++ b/apps/openmw/mwgui/dialogue.hpp @@ -117,8 +117,7 @@ namespace MWGui { virtual ~DialogueText() = default; virtual void write(std::shared_ptr typesetter, const TopicSearch& keywordSearch, - std::map>& topicLinks) const - = 0; + std::map>& topicLinks) const = 0; std::string mText; }; diff --git a/apps/openmw/mwgui/journalviewmodel.hpp b/apps/openmw/mwgui/journalviewmodel.hpp index 7a1733894d..57cd3c3374 100644 --- a/apps/openmw/mwgui/journalviewmodel.hpp +++ b/apps/openmw/mwgui/journalviewmodel.hpp @@ -76,22 +76,19 @@ namespace MWGui /// walks over the journal entries related to all quests with the given name /// If \a questName is empty, simply visits all journal entries virtual void visitJournalEntries( - std::string_view questName, std::function visitor) const - = 0; + std::string_view questName, std::function visitor) const = 0; /// provides the name of the topic specified by its id - virtual void visitTopicName(const MWDialogue::Topic& topic, std::function visitor) const - = 0; + virtual void visitTopicName( + const MWDialogue::Topic& topic, std::function visitor) const = 0; /// walks over the topics whose names start with the character virtual void visitTopicNamesStartingWith( - Utf8Stream::UnicodeChar character, std::function visitor) const - = 0; + Utf8Stream::UnicodeChar character, std::function visitor) const = 0; /// walks over the topic entries for the topic specified by its identifier virtual void visitTopicEntries( - const MWDialogue::Topic& topic, std::function visitor) const - = 0; + const MWDialogue::Topic& topic, std::function visitor) const = 0; // create an instance of the default journal view model implementation static std::shared_ptr create(); diff --git a/components/sceneutil/keyframe.hpp b/components/sceneutil/keyframe.hpp index e8d53c1876..391a3aafc4 100644 --- a/components/sceneutil/keyframe.hpp +++ b/components/sceneutil/keyframe.hpp @@ -33,7 +33,7 @@ namespace SceneUtil virtual osg::Vec3f getTranslation(float time) const { return osg::Vec3f(); } - virtual KfTransform getCurrentTransformation(osg::NodeVisitor* nv) { return KfTransform(); }; + virtual KfTransform getCurrentTransformation(osg::NodeVisitor* nv) { return KfTransform(); } /// @note We could drop this function in favour of osg::Object::asCallback from OSG 3.6 on. virtual osg::Callback* getAsCallback() = 0;