[CI] Cache the Windows compile results with sccache

A pull request that touches one file rebuilds it, but sccache can hand
back the objects for everything else, and the GitHub Actions cache keeps
them between runs, so the second build of a branch costs about what the
first one stored and nothing more.

sccache has to wrap the compiler, and cmake only wraps it for the
generators that run the compiler themselves: the Visual Studio
generator drives MSBuild, which would drop a launcher on the floor
without a word. The cache therefore goes on the Ninja job, and
compile.sh now refuses --sccache on any other generator instead of
pretending to cache, and prints the sccache statistics next to the
existing ccache ones so the hit rate is visible in the log.

For MSVC, a cacheable object has to carry its debug information
inside, which is /Z7 rather than /Zi; sccache cannot restore the
latter, it can only restore a whole object file. Ask CMake for the
format by name through CMP0141 and CMAKE_MSVC_DEBUG_INFORMATION_FORMAT
instead of hardcoding /Zi in the flags, where it would end up next to
/Z7, and keep the format as it was for every build that does not
cache. The linker still gets /DEBUG, so the release PDBs are written
either way, which is what that flag is there for.

The policy is set before project(), since that is when it takes
effect, and behind an if(POLICY) guard because it does not exist
before CMake 3.25 - where the old defaults remain the only option.

.ci/Ubuntu26.04/Dockerfile

@@ -8,7 +8,6 @@ RUN apt-get update && \
         cmake \
         file \
         g++ \
-        gcovr \
         git \
         libgl-dev \
         liblzma-dev \

.ci/compile.sh

@@ -8,9 +8,6 @@
 # --suffix <suffix> renames package with this suffix, requires arg
 # --server compiles servatrice
 # --test runs tests
-# --sanitize builds with AddressSanitizer and UndefinedBehaviorSanitizer, gcc/clang only
-# --coverage instruments the test run for line coverage and prints a gcovr summary, gcc only
-
 # --debug or --release sets the build type ie CMAKE_BUILD_TYPE
 # --ccache [<size>] uses ccache and shows stats, optionally provide size
 # --evict-ccache <age> runs ccache eviction based on given age after build
@@ -19,8 +16,8 @@
 # --cmake-generator <generator> sets CMAKE_GENERATOR as used by cmake
 # --target-macos-version <version> sets the min os version - only used for macOS builds
 # --profile writes an MSBuild performance summary and binary log, Windows only
-# uses env: BUILDTYPE MAKE_INSTALL MAKE_PACKAGE PACKAGE_TYPE PACKAGE_SUFFIX MAKE_SERVER MAKE_NO_CLIENT MAKE_TEST USE_CCACHE CCACHE_SIZE CCACHE_EVICTION_AGE BUILD_DIR CMAKE_GENERATOR TARGET_MACOS_VERSION MAKE_SANITIZE MAKE_COVERAGE VCPKG_TARGET_MACOS_VERSION BUILD_PARALLEL_LEVEL BUILD_PROFILE USE_SCCACHE
-# (correspond to args: --debug/--release --install --package <package type> --suffix <suffix> --server --test --sanitize --coverage --ccache <ccache_size> --dir <dir> --profile --sccache)
+# uses env: BUILDTYPE MAKE_INSTALL MAKE_PACKAGE PACKAGE_TYPE PACKAGE_SUFFIX MAKE_SERVER MAKE_NO_CLIENT MAKE_TEST USE_CCACHE CCACHE_SIZE CCACHE_EVICTION_AGE BUILD_DIR CMAKE_GENERATOR TARGET_MACOS_VERSION VCPKG_TARGET_MACOS_VERSION BUILD_PARALLEL_LEVEL BUILD_PROFILE USE_SCCACHE
+# (correspond to args: --debug/--release --install --package <package type> --suffix <suffix> --server --test --ccache <ccache_size> --dir <dir> --profile --sccache)
 # exitcode: 1 for failure, 3 for invalid arguments
 
 # Read arguments
@@ -62,14 +59,6 @@ while [[ $# != 0 ]]; do
       MAKE_TEST=1
       shift
       ;;
-    '--sanitize')
-      MAKE_SANITIZE=1
-      shift
-      ;;
-    '--coverage')
-      MAKE_COVERAGE=1
-      shift
-      ;;
     '--debug')
       BUILDTYPE="Debug"
       shift
@@ -158,15 +147,6 @@ if [[ ! $BUILD_DIR ]]; then
   BUILD_DIR="build"
 fi
 mkdir -p "$BUILD_DIR"
-
-if [[ $MAKE_COVERAGE ]]; then
-  # Resolved while the working directory is still the source root. $0 is relative to the
-  # directory the script was invoked from, so after the cd below it no longer resolves, and
-  # under `set -e` the failed subshell would abort the build rather than just yielding an empty
-  # variable. Only the coverage report needs this, so only coverage pays for it.
-  SRC_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
-fi
-
 cd "$BUILD_DIR"
 
 # Set minimum CMake Version
@@ -193,17 +173,6 @@ fi
 if [[ $MAKE_TEST ]]; then
   flags+=("-DTEST=1")
 fi
-if [[ $MAKE_SANITIZE ]]; then
-  flags+=("-DENABLE_SANITIZERS=ON")
-else
-  # The release-package step re-runs cmake in the same build dir, so an
-  # ENABLE_SANITIZERS=ON left over from the debug step would otherwise leak
-  # into the shipped binaries (libasan/libubsan Depends in the DEB).
-  flags+=("-DENABLE_SANITIZERS=OFF")
-fi
-if [[ $MAKE_COVERAGE ]]; then
-  flags+=("-DENABLE_COVERAGE=ON")
-fi
 if [[ $USE_CCACHE ]]; then
   flags+=("-DUSE_CCACHE=1")
   # PCH-aware caching is required or ccache refuses to cache any TU that
@@ -426,50 +395,7 @@ fi
 
 if [[ $MAKE_TEST ]]; then
   echo "::group::Run tests"
-  if [[ $MAKE_SANITIZE ]]; then
-    # detect_leaks=0: Qt and the sanitizers' own runtimes both leak at exit by design, and
-    # LeakSanitizer's default is aggressive enough to bury our real findings under hundreds
-    # of process-teardown reports. Malloc/free misuse and use-after-free are what ASan is for
-    # and they stay fully on.
-    # abort_on_error=1: a bad access leaves the process in an unusable state, so continuing
-    # only produces a second, more confusing report from the wreckage.
-    # UBSAN halt_on_error=1: without it UBSan prints "runtime error: ..." but the
-    # process exits 0 (recover mode), so gtest/ctest report a pass and the job
-    # stays green. Combined with -fno-sanitize-recover=undefined at compile time,
-    # the first finding aborts the test process with a non-zero exit.
-    export ASAN_OPTIONS="detect_leaks=0:abort_on_error=1:print_stacktrace=1:symbolize=1"
-    export UBSAN_OPTIONS="print_stacktrace=1:halt_on_error=1:symbolize=1"
-  fi
-  # Every TEST() is its own CTest entry, so the suite is process-spawn bound rather than CPU
-  # bound and -j recovers nearly all of the per-process overhead. The test binaries are safe to
-  # run concurrently: the only one that claims a fixed resource is single_instance_manager_test,
-  # which already scopes its local socket name to its own pid so parallel copies cannot collide.
-  ctest -C "$BUILDTYPE" --output-on-failure -j "${CTEST_JOBS:-4}"
-  echo "::endgroup::"
-fi
-
-if [[ $MAKE_COVERAGE ]]; then
-  # gcovr is not a build dependency and is not available everywhere, so a missing one is reported
-  # and skipped rather than failing an otherwise green build.
-  echo "::group::Coverage report"
-  GCOVR="$(command -v gcovr || true)"
-  if [[ -z $GCOVR ]]; then
-    echo "gcovr not found; install it to produce a coverage report"
-  else
-    "$GCOVR" --version
-    # This script configures with `cmake ..`, so the build dir it was started from is the object
-    # directory and the source root is one level up. Both are passed explicitly: gcovr otherwise
-    # walks the current directory and trips over in-tree build directories left by other tooling,
-    # whose stale .gcno files cannot be resolved. --config is named too, so the filters apply no
-    # matter what directory gcovr happens to start from.
-    GCOVR_ARGS=("." --root "$SRC_ROOT" --object-directory "." --config "$SRC_ROOT/gcovr.cfg")
-    "$GCOVR" "${GCOVR_ARGS[@]}" --txt --decisions
-    "$GCOVR" "${GCOVR_ARGS[@]}" --html-details coverage-details.html --html-title "Cockatrice line coverage"
-    "$GCOVR" "${GCOVR_ARGS[@]}" --lcov -o coverage.lcov
-    "$GCOVR" "${GCOVR_ARGS[@]}" --cobertura-pretty -o coverage.xml
-    "$GCOVR" "${GCOVR_ARGS[@]}" --json-summary-pretty -o coverage-summary.json
-    echo "Coverage artifacts written to coverage-details.html, coverage.lcov, coverage.xml and coverage-summary.json"
-  fi
+  ctest -C "$BUILDTYPE" --output-on-failure
   echo "::endgroup::"
 fi
 
@@ -516,21 +442,15 @@ if [[ $MAKE_PACKAGE ]]; then
       fi
       echo "Installer content is clean"
 
-      # Fail the build if the installer does not carry the runtime the
-      # applications link against - a file that must be there, or a DLL that must
-      # not be. The runtime DLLs reach the package by globbing every *.dll out of
-      # the build output directories, so anything that build produced can ride
-      # along and nothing else in the build objects to it: a Qt module the client
-      # links statically (Qt6Multimedia.dll, Qt6QuickWidgets.dll) can be left out,
-      # and the test framework's gtest.dll can be shipped. Either only surfaces on
-      # a user's machine after an update has already replaced their install, as
-      # "The code execution cannot proceed because Qt6Multimedia.dll was not
-      # found" or "abseil_dll.dll is either not designed to run on Windows or it
-      # contains an error". required-runtime.txt is written by the top level
-      # CMakeLists.txt from the same module lists the targets are built against
-      # plus the vcpkg bin directory the app-local copies come from.
-      if [[ ! -f required-runtime.txt ]]; then
-        echo "::error file=$0::required-runtime.txt not found in the build dir, cannot verify the runtime"
+      # Fail the build if the installer is missing a Qt runtime the applications
+      # link against. The DLLs reach the package by globbing every *.dll out of
+      # the build output directories, so a module the client links statically
+      # (Qt6Multimedia.dll, Qt6QuickWidgets.dll) can be left out without anything
+      # else noticing, and the only symptom is a client that refuses to start
+      # after an update. required-qt-runtime.txt is written by the top level
+      # CMakeLists.txt from the same module list the targets are built against.
+      if [[ ! -f required-qt-runtime.txt ]]; then
+        echo "::error file=$0::required-qt-runtime.txt not found in the build dir, cannot verify the Qt runtime"
         exit 1
       fi
       # 7-Zip writes CRLF on Windows, so the \r has to come off before any
@@ -540,7 +460,7 @@ if [[ $MAKE_PACKAGE ]]; then
       # being a wildcard; -i because that is how the installed tree behaves -
       # the uninstaller clears both $INSTDIR\plugins and $INSTDIR\Plugins.
       # The archive side and the manifest side have to agree on line endings.
-      # CMake writes required-runtime.txt with the platform's line ending and
+      # CMake writes required-qt-runtime.txt with the platform's line ending and
       # 7-Zip writes CRLF on Windows, so a trailing \r survives on $entry and
       # defeats the whole-line match - every entry then reads as missing even
       # though the listing holds it verbatim.
@@ -549,7 +469,7 @@ if [[ $MAKE_PACKAGE ]]; then
       installer_paths="$("$seven_zip" l -slt "$package" | tr -d '\r' |
         sed -n 's/^Path = //p' |
         sed -e 's|\\|/|g' -e 's|^[$]INSTDIR/||' -e 's|^[$]OUTDIR/||' -e 's|^[$]PLUGINSDIR/||' -e 's|^\./||' -e 's|^/||')"
-      manifest="$(tr -d '\r' <required-runtime.txt)"
+      manifest="$(tr -d '\r' <required-qt-runtime.txt)"
       missing=""
       checked=0
       while IFS= read -r entry; do
@@ -562,11 +482,11 @@ if [[ $MAKE_PACKAGE ]]; then
         fi
       done <<<"$manifest"
       if [[ -n $missing ]]; then
-        echo "::error file=$0::Installer is missing required runtime files:$missing"
+        echo "::error file=$0::Installer is missing required Qt runtime files:$missing"
         # Print both sides of the comparison. A mismatch here has twice been
         # caused by the shape of 7-Zip's output rather than by a missing file,
         # and a bare "missing" line cannot tell those apart.
-        echo "required-runtime.txt asked for $checked path(s); 7-Zip listed $(grep -c '' <<<"$installer_paths") path(s)"
+        echo "required-qt-runtime.txt asked for $checked path(s); 7-Zip listed $(grep -c '' <<<"$installer_paths") path(s)"
         # Indent with parameter expansion rather than sed 's/^/  /', which the
         # linter reports as SC2001.
         echo "--- required ---"
@@ -576,66 +496,7 @@ if [[ $MAKE_PACKAGE ]]; then
         echo "${listed_head//$'\n'/$'\n  '}"
         exit 1
       fi
-      echo "Installer carries the Qt runtime of every module the three applications link ($checked files)"
-
-      # Now the other direction: a top level DLL in the package that the manifest
-      # does not name. The missing check above cannot see a runtime that was
-      # never expected.
-      #
-      # Two things are reported here and neither may fail the build.
-      #
-      # The test framework is a fact rather than a guess - no shipped executable
-      # links gtest or gmock, and the build output directories the "*.dll" glob
-      # reads are shared with the test targets, so gtest.dll and gmock.dll are
-      # one filter away from shipping in every release. Even so it is reported
-      # instead of enforced: a check that has never passed on a real package has
-      # not earned the right to block a release, and the first Windows run of an
-      # enforcing version is exactly when its own wrong assumptions show up.
-      #
-      # Everything else is expected to be there. required-runtime.txt names the
-      # Qt modules the three applications link, and the protobuf, Abseil,
-      # OpenSSL, liblzma, ffmpeg and Qt debug DLLs in the package come in on the
-      # build output glob instead, because nothing in the build declares them by
-      # name. So this list is a report of what the package carries, not a verdict.
-      # Read it when a dependency is added; do not fail on it.
-      forbidden=""
-      unexpected=""
-      while IFS= read -r entry; do
-        [[ -z $entry ]] && continue
-        # Top level only. A DLL under Plugins/ or a nested image format plugin is
-        # a plugin the platform loads by name, not a runtime the executable
-        # imports, and requiring one here would list all of them every run.
-        [[ $entry == */* ]] && continue
-        if grep -qxiF "$entry" <<<"$manifest"; then
-          continue
-        fi
-        # NSIS extracts its plugins to $PLUGINSDIR, which the path normalization
-        # above strips, so they arrive here looking like payload files. They are
-        # part of the installer, not of the installed tree.
-        if [[ $entry == [Nn][Ss][Dd][Ii][Aa][Ll][Oo][Gg][Ss].dll ||
-          $entry == [Nn][Ss][Ee][Xx][Ee][Cc].dll ||
-          $entry == [Ss][Yy][Ss][Tt][Ee][Mm].dll ||
-          $entry == [Uu][Ss][Ee][Rr][Ii][Nn][Ff][Oo].dll ||
-          $entry == [Ii][Nn][Ee][Tt].dll ]]; then
-          continue
-        fi
-        if [[ $entry == [Gg][Tt][Ee][Ss][Tt]* || $entry == [Gg][Mm][Oo][Cc][Kk]* ]]; then
-          forbidden+=" $entry"
-        else
-          unexpected+=" $entry"
-        fi
-      done < <(grep -i '\.dll$' <<<"$installer_paths")
-      if [[ -n $forbidden ]]; then
-        echo "::warning file=$0::Installer contains test framework DLLs that no shipped executable links:$forbidden"
-        echo "A build output directory shared with the test targets has leaked into the package."
-      fi
-      if [[ -n $unexpected ]]; then
-        echo "Top level DLLs in the package beyond the linked Qt modules:$unexpected"
-        echo "These arrive on the build output glob, not from required-runtime.txt, so they are reported and not required."
-      fi
-      if [[ -z $forbidden && -z $unexpected ]]; then
-        echo "Installer carries no runtime files beyond the linked Qt modules"
-      fi
+      echo "Installer contains the full Qt runtime ($checked files)"
     fi
     echo "::endgroup::"
   fi

.ci/docker.sh

@@ -13,17 +13,11 @@
 # --set-cache <location> sets the location to cache the image or for ccache
 #
 # requires: docker
-# uses env: NAME IMAGE_SUFFIX CACHE BUILD GET SAVE INTERACTIVE
+# uses env: NAME CACHE BUILD GET SAVE INTERACTIVE
 # (correspond to args: <name> --set-cache <cache> --build --get --save --interactive)
 # sets env: RUN CCACHE_DIR IMAGE_NAME RUN_ARGS RUN_OPTS BUILD_SCRIPT
 # exitcode: 1 for failure, 2 for missing dockerfile, 3 for invalid arguments
 #
-# IMAGE_SUFFIX is optional and only appended to the image name, never to NAME, so that a matrix
-# leg can have its own image and image cache without needing its own directory under .ci. Two legs
-# building and tagging the same image concurrently would race on `docker build --tag`.
-# It is deliberately not called SUFFIX: compile.sh already uses SUFFIX for output file names, and
-# a job-level SUFFIX would be silently overridden by those per-step env blocks.
-#
 # exported RUN function will run the BUILD_SCRIPT inside of the docker container.
 # note that the docker container will not inherit any environment variables!
 #
@@ -87,7 +81,7 @@ if ! [[ $NAME ]]; then
   return 3
 fi
 
-export IMAGE_NAME="${project_name,,}_${NAME,,}${IMAGE_SUFFIX:+_${IMAGE_SUFFIX,,}}" # lower case
+export IMAGE_NAME="${project_name,,}_${NAME,,}" # lower case
 
 docker_dir=".ci/$NAME"
 if ! [[ -r $docker_dir/Dockerfile ]]; then

.dockerignore

@@ -1,3 +1,4 @@
+.git/
 build/
 .github/
 .tx/

.github/workflows/desktop-build.yml

@@ -144,36 +144,17 @@ jobs:
 
             package: DEB
 
-            # The one leg that runs the suite under AddressSanitizer and
-            # UndefinedBehaviorSanitizer. Debian 13 and Fedora 44 keep covering the
-            # uninstrumented suite, so nothing is lost by instrumenting this one.
-            sanitize: yes
-
-          - distro: Ubuntu
-            version: 26.04
-            variant: cover    # separate image and ccache, same distro
-
-            # The one leg that runs instrumented for line coverage and publishes the report as
-            # a workflow artifact. It is a separate leg rather than a second flag on the
-            # sanitizer leg because the two instruments answer different questions: the
-            # sanitizer leg reports what the run did wrong, the coverage leg reports what the
-            # run never touched at all. Combining them would also slow both down. Packaging is
-            # skipped because the leg above already publishes the DEB for this distro.
-            coverage: yes
-            package: skip
-
-    name: ${{ matrix.distro }} ${{ matrix.version }}${{ matrix.variant && format(' {0}', matrix.variant) || '' }}
+    name: ${{ matrix.distro }} ${{ matrix.version }}
     needs: configure
     runs-on: ubuntu-latest    # https://github.com/actions/runner-images
     continue-on-error: ${{ matrix.allow-failure == 'yes' }}
     timeout-minutes: 70
     env:
-      CACHE: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.version }}${{ matrix.variant }}    # directory for caching docker image and ccache
+      CACHE: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.version }}    # directory for caching the compiler cache
       CCACHE_EVICTION_AGE: 7d
       CCACHE_SIZE: 600M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
       CMAKE_GENERATOR: 'Ninja'
       NAME: ${{ matrix.distro }}${{ matrix.version }}
-      IMAGE_SUFFIX: ${{ matrix.variant }}
 
     steps:
       - name: "Checkout"
@@ -183,7 +164,7 @@ jobs:
         id: restore_ccache
         uses: actions/cache/restore@v6
         with:
-          key: ccache-${{ matrix.distro }}${{ matrix.version }}${{ matrix.variant }}
+          key: ccache-${{ matrix.distro }}${{ matrix.version }}
           path: ${{ env.CACHE }}/.ccache
 
       - name: "Build ${{ matrix.distro }} ${{ matrix.version }} Docker image"
@@ -193,9 +174,6 @@ jobs:
       - name: "Build debug and test"
         if: matrix.test != 'skip'
         shell: bash
-        env:
-          sanitize: '${{ matrix.sanitize }}'
-          coverage: '${{ matrix.coverage }}'
         run: |
           source .ci/docker.sh
           args=()
@@ -203,33 +181,7 @@ jobs:
           args+=(--ccache "$CCACHE_SIZE")
           args+=(--cmake-generator "$CMAKE_GENERATOR")
 
-          extra=()
-          [[ $sanitize == yes ]] && extra+=(--sanitize)
-          [[ $coverage == yes ]] && extra+=(--coverage)
-
-          RUN --server --debug --test "${extra[@]}" "${args[@]}"
-
-      # RUN bind-mounts the workspace into the container, so the report the build wrote into
-      # build/ is already on the host and no second container is needed to collect it.
-      - name: "Collect coverage report"
-        if: matrix.coverage == 'yes'
-        shell: bash
-        run: |
-          mkdir -p coverage
-          # --html-details writes one page per source file plus a stylesheet and script, and the
-          # index links to all of them by relative name. Copying the index alone would publish a
-          # report where every link 404s, so the whole family has to travel together.
-          cp build/coverage-details* coverage/
-          cp build/coverage.lcov build/coverage.xml build/coverage-summary.json coverage/
-          ls -la coverage/
-
-      - name: "Upload coverage artifact"
-        if: matrix.coverage == 'yes'
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage-report
-          path: coverage/
-          if-no-files-found: warn
+          RUN --server --debug --test "${args[@]}"
 
       - name: "Build release package"
         id: build
@@ -587,16 +539,15 @@ jobs:
           TARGET_MACOS_VERSION: '${{ matrix.override_target }}'
           USE_CCACHE: ${{ matrix.use_ccache }}
           USE_SCCACHE: ${{ matrix.use_sccache }}
-          # Only pushes to the default branch may write the shared binary cache: the
-          # archives a run compiles are only as trustworthy as the code they were
-          # built from, and only merged code may populate the scope that master and
-          # release builds restore and link. Pull requests (same-repository ones
-          # included) restore the shared cache but never write it; with the source
-          # left at read the collect step below finds nothing on PRs, so no
-          # pull-request-scoped entry is ever saved that no later run could restore.
-          # Forks pushing to their own default branch resolve github.ref against
-          # their own repository, so they keep a working cache of their own there.
-          VCPKG_BINARY_SOURCES: "clear;files,${{ steps.vcpkg-cache.outputs.path }},${{ case(github.ref == 'refs/heads/master', 'readwrite', 'read') }}"
+          # vcpkg has to be allowed to write into the cache directory even on a pull
+          # request, because that is where "Collect new vcpkg entries" looks for the
+          # archives this run had to compile itself. With the source left at read those
+          # archives are never written, the collect step finds nothing, and vcpkg-cache-import.yml
+          # gets no artifact to heal the shared cache with. The importer is what publishes
+          # to master's scope; a pull request's own merge ref stays unreadable by every
+          # later run, so the action's own save there costs quota but nothing else.
+          # Forks keep the read-only mode, they are the case that must not be trusted.
+          VCPKG_BINARY_SOURCES: "clear;files,${{ steps.vcpkg-cache.outputs.path }},${{ case(github.ref == 'refs/heads/master' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository), 'readwrite', 'read') }}"
           VCPKG_DISABLE_METRICS: 1
           VCPKG_FEATURE_FLAGS: dependencygraph
           VCPKG_TARGET_MACOS_VERSION: ${{ matrix.vcpkg_deployment_target }}
@@ -613,18 +564,19 @@ jobs:
         shell: bash
         run: find . -name NSISOutput.log -exec cat {} +
 
-      # A master run hands over the archives it had to build itself so that
-      # vcpkg-cache-import.yml, which runs in the default branch scope, can save them
-      # where later runs can restore them. Pull requests hand over nothing: their cache
-      # entries would be scoped to refs/pull/<n>/merge and stay unreadable for every
-      # other run, so writing them only burns the repository's quota.
+      # A pull request cannot write the shared cache itself: its cache entries are scoped
+      # to refs/pull/<n>/merge and stay unreadable for every other run, so writing them
+      # from a pull request only burns the repository's quota. So hand over only the
+      # archives this leg had to build itself and let vcpkg-cache-import.yml, which runs
+      # in the default branch scope, save them where later runs can restore them.
+      # Forks are skipped, they are the one case where the archives must not be trusted.
       # vcpkg_upload keeps this to one leg per scope: macOS 14, 15 and 26 share a scope
       # by design, and all three rebuild the same archives, so uploading from each of them
       # would publish three identical 269 MB artifacts under one artifact name and make
       # the importer spawn a save job per copy.
       - name: "Collect new vcpkg entries"
         id: vcpkg_new
-        if: github.ref == 'refs/heads/master' && matrix.vcpkg_upload == 1
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && matrix.vcpkg_upload == 1
         shell: bash
         env:
           CACHE_DIR: '${{ steps.vcpkg-cache.outputs.path }}'

.github/workflows/docker-release.yml

@@ -20,22 +20,11 @@ on:
   release:
     types:
       - released    # publishing of stable releases
-  workflow_dispatch:    # (re)publish the image for an existing stable release
-    inputs:
-      tag:
-        description: 'Existing release tag to build and publish (e.g. 2026-10-03-Release-3.1.0)'
-        required: true
-        type: string
-      latest:
-        description: 'Also update the "latest" tag'
-        required: true
-        type: boolean
-        default: true
 
-# Cancel earlier, unfinished runs of this workflow on the same branch (unless publishing)
+# Cancel earlier, unfinished runs of this workflow on the same branch (unless on release)
 concurrency:
-  group: "${{ github.workflow }} @ ${{ inputs.tag || github.ref_name }}"
-  cancel-in-progress: ${{ github.event_name != 'release' && github.event_name != 'workflow_dispatch' }}
+  group: "${{ github.workflow }} @ ${{ github.ref_name }}"
+  cancel-in-progress: ${{ github.event_name != 'release' }}
 
 env:
   GHCR_IMAGE: ghcr.io/cockatrice/servatrice
@@ -68,14 +57,12 @@ jobs:
     steps:
       - name: "Checkout"
         uses: actions/checkout@v7
-        with:
-          ref: ${{ case(github.event_name == 'workflow_dispatch', format('refs/tags/{0}', inputs.tag), '') }}
 
       - name: "Set up Docker buildx"
         uses: docker/setup-buildx-action@v4
 
       - name: "Login to GitHub Container Registry (GHCR)"
-        if: (github.event_name == 'release' && github.event.release.prerelease == false) || github.event_name == 'workflow_dispatch'
+        if: github.event_name == 'release' && github.event.release.prerelease == false
         id: login
         uses: docker/login-action@v4
         with:
@@ -83,7 +70,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ github.token }}
 
-      # Don't push for non-publishing triggers
+      # Don't push for non-release triggers
       - name: "Build image"
         if: steps.login.outcome != 'success'
         uses: docker/build-push-action@v7
@@ -124,6 +111,7 @@ jobs:
         if: steps.login.outcome == 'success'
         uses: actions/upload-artifact@v7
         with:
+          archive: false
           if-no-files-found: error
           name: digest-${{ matrix.label }}
           path: ${{ runner.temp }}/digests/*
@@ -133,7 +121,7 @@ jobs:
   # Create an OCI image index from the platform-specific image manifests
   index:
     name: "Publish multi-platform Servatrice image"
-    if: github.repository_owner == 'Cockatrice' && ((github.event_name == 'release' && github.event.release.prerelease == false) || github.event_name == 'workflow_dispatch')
+    if: github.repository_owner == 'Cockatrice' && github.event_name == 'release' && github.event.release.prerelease == false
     needs: build
     runs-on: ubuntu-slim    # https://github.com/actions/runner-images/blob/main/images/ubuntu-slim/ubuntu-slim-Readme.md
 
@@ -159,11 +147,8 @@ jobs:
           images: ${{ env.GHCR_IMAGE }}
           flavor: |
             latest=auto
-          # if semver, also: type=semver,pattern={{version}} / {{major}}.{{minor}}
           tags: |
-            type=ref,event=tag
-            type=raw,value=${{ inputs.tag }},enable=${{ github.event_name == 'workflow_dispatch' }}
-            type=raw,value=latest,enable=${{ github.event_name == 'workflow_dispatch' && inputs.latest }}
+            type=ref,event=tag    # if semver, also: type=semver,pattern={{version}} / {{major}}.{{minor}}
 
       # Add OCI annotations to image index and publish tags
       - name: "Create image index"
@@ -191,7 +176,7 @@ jobs:
 
       - name: "Inspect images"
         env:
-          GITHUB_TAG: ${{ inputs.tag || github.ref_name }}
+          GITHUB_TAG: ${{ github.ref_name }}
         run: |
           docker buildx imagetools inspect "$GHCR_IMAGE:latest"
           docker buildx imagetools inspect "$GHCR_IMAGE:$GITHUB_TAG"

.github/workflows/documentation-build.yml

@@ -28,13 +28,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: "Checkout"
+      - name: "Checkout code"
         uses: actions/checkout@v7
         with:
           submodules: recursive
 
       - name: "Install Graphviz"
-        shell: bash
         run: |
           sudo apt-get install -y graphviz
           dot -V
@@ -45,7 +44,6 @@ jobs:
           version: "1.18.0"
 
       - name: "Update Doxygen Configuration"
-        shell: bash
         run: |
           git diff Doxyfile
           doxygen -u Doxyfile
@@ -60,10 +58,9 @@ jobs:
 
       - name: "Generate Documentation"
         if: always()
-        shell: bash
         run: doxygen Doxyfile
 
-      - name: "Deploy to cockatrice.github.io/docs"
+      - name: "Deploy to cockatrice.github.io"
         if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
         uses: peaceiris/actions-gh-pages@v4
         with:
@@ -72,8 +69,3 @@ jobs:
           external_repository: Cockatrice/cockatrice.github.io
           publish_branch: master
           publish_dir: ./docs/html
-
-      - name: Link to Documentation Page
-        if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
-        shell: bash
-        run: echo "::notice title=New documentation published::Shortly available at https://cockatrice.github.io/docs/"

.github/workflows/translations-pull.yml

@@ -1,7 +1,7 @@
 name: Update Translations
 
 permissions:
-  contents: write
+  contents: read
   pull-requests: write
 
 on:

.github/workflows/translations-push.yml

@@ -1,7 +1,7 @@
 name: Update Translation Source
 
 permissions:
-  contents: write
+  contents: read
   pull-requests: write
 
 on:

.github/workflows/vcpkg-cache-import.yml

@@ -1,15 +1,11 @@
 name: Import vcpkg cache
 
-# After a runner image update changes every port's ABI hash, the first master run
-# rebuilds protobuf, openssl and abseil from source and saves them into the shared
-# cache, where every later run can restore them.
-#
-# Only master pushes are imported here: the collect step, keys.txt and the zip
-# contents all come from the workflow run being imported, so importing from an
-# unmerged pull request would let anyone who can push a branch — or a bot actor
-# such as Dependabot, whose PRs are same-repo — promote arbitrary binaries into
-# the scope that master and tag builds restore and link into signed releases.
-# Forks build untrusted code and must never reach that scope either.
+# A pull request run can only write caches into its own refs/pull/<n>/merge scope, which
+# nothing else is allowed to restore. So after a runner image update changes every port's
+# ABI hash, the first pull request rebuilds protobuf, openssl and abseil from source and
+# the next one does the same, until somebody merges and a master run finally repopulates
+# the shared cache. This workflow takes the archives such a run produced and saves them
+# in the default branch scope instead, where every later run can restore them.
 #
 # repository_dispatch is not used on purpose: it would also resolve to the default branch,
 # but it counts as a low-trust trigger and may only write there when it declares a
@@ -32,17 +28,12 @@ concurrency:
 jobs:
   list:
     name: List new vcpkg entries
-    # Only a successful push to the default branch has archives worth importing.
-    # Only code that landed on master may populate the scope master runs restore.
-    # Bot actors are excluded on top: their runs must never promote binaries into
-    # the shared scope even if they somehow target the default branch.
+    # Only a successful same-repository pull request has archives worth importing. Forks
+    # build untrusted code and must never reach a cache that master runs restore and link.
     if: >-
       github.event.workflow_run.conclusion == 'success' &&
-      github.event.workflow_run.event == 'push' &&
-      github.event.workflow_run.head_branch == 'master' &&
-      github.event.workflow_run.head_repository.full_name == github.repository &&
-      !endsWith(github.event.workflow_run.actor.login, '[bot]') &&
-      !endsWith(github.event.workflow_run.triggering_actor.login, '[bot]')
+      github.event.workflow_run.event == 'pull_request' &&
+      github.event.workflow_run.head_repository.full_name == github.repository
     runs-on: ubuntu-slim    # https://github.com/actions/runner-images/blob/main/images/ubuntu-slim/ubuntu-slim-Readme.md
     # workflow_run is a low-trust trigger, so cache access is read-only by default even
     # though this run resolves to the default branch. Assert below that this took effect,

CMakeLists.txt

@@ -33,10 +33,6 @@ option(WITH_ORACLE "Build Cockatrice card database tool (Oracle)" ON)
 option(WITH_SERVER "Build Cockatrice server (Servatrice)" OFF)
 # Compile tests
 option(TEST "Build tests" OFF)
-# Build with AddressSanitizer and UndefinedBehaviorSanitizer
-option(ENABLE_SANITIZERS "Build with AddressSanitizer and UndefinedBehaviorSanitizer" OFF)
-# Build instrumented for GCC line coverage, reported with gcovr
-option(ENABLE_COVERAGE "Build instrumented for GCC line coverage" OFF)
 # Use vcpkg regardless of OS
 option(USE_VCPKG "Use vcpkg regardless of OS" OFF)
 
@@ -101,11 +97,11 @@ endif()
 
 # A project name is needed for CPack
 # Version can be overriden by git tags, see cmake/getversion.cmake
-project("Cockatrice" VERSION 3.1.2)
+project("Cockatrice" VERSION 3.1.0)
 
 # Set release name if not provided via env/cmake var
 if(NOT DEFINED GIT_TAG_RELEASENAME)
-  set(GIT_TAG_RELEASENAME "Reality Check")
+  set(GIT_TAG_RELEASENAME "Graduation Day")
 endif()
 
 # Use c++20 for all targets
@@ -235,12 +231,6 @@ else()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe")
 endif()
 
-# Always included, because they define cockatrice_disable_sanitizers_for() and
-# cockatrice_disable_coverage_for() for the vendored trees. They only touch the global flags
-# when ENABLE_SANITIZERS or ENABLE_COVERAGE is on.
-include(Sanitizers)
-include(Coverage)
-
 # GNU systems need to define the Mersenne exponent for the RNG to compile w/o warning
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
   add_definitions("-DSFMT_MEXP=19937")
@@ -356,54 +346,38 @@ elseif(WIN32)
   # Configure file with custom definitions for NSIS.
   configure_file("${COCKATRICE_CMAKE_PATH}/NSIS.definitions.nsh.in" "${PROJECT_BINARY_DIR}/NSIS.definitions.nsh")
 
-  # Every runtime DLL a Windows install has to contain, as paths relative to the
-  # install root. .ci/compile.sh reads this and fails the build when the packaged
-  # installer is missing one of them, or carries a runtime it does not know about.
+  # Every Qt module the client links against, as the DLL names a Windows install
+  # has to contain, plus the platform plugin without which the client cannot
+  # start. .ci/compile.sh reads this and fails the build when the packaged
+  # installer is missing one of them.
   #
-  # All three applications are packaged into the same directory on Windows, so
-  # this is the union of their Qt module lists, not just the client's: Servatrice
-  # contributes Qt6Sql.dll and Oracle contributes nothing the client lacks, and a
-  # client-only manifest leaves Qt6Sql.dll unasserted even though servatrice.exe
-  # is installed next to cockatrice.exe and cannot start without it.
+  # Only the client is packaged on Windows, so this is the client's module list
+  # rather than the union across server, client and Oracle: demanding Oracle's or
+  # Servatrice's modules of the client installer checks nothing about the client.
   #
   # A statically linked Qt module ships no runtime DLL, so requiring one would
   # fail the package check on a static build for no reason. cockatrice/CMakeLists.txt
   # installs the runtime of every module listed here, and skips static ones the
   # same way, so the two can never disagree.
   #
-  # Only the Qt modules, and that is deliberate. protobuf, Abseil, liblzma, zlib
-  # and OpenSSL also ride in on the "*.dll" glob, and a client whose runtime is
-  # absent, stale or of the wrong architecture fails to start with "abseil_dll.dll
-  # is either not designed to run on Windows or it contains an error", so they
-  # are exactly the files worth asserting.
-  #
-  # Their names cannot be derived from the vcpkg bin directory, which is what a
-  # first attempt did and what a Windows build immediately refuted: bin holds
-  # everything vcpkg installed, not everything the applications import. It also
-  # contains gmock.dll, libprotobuf-lite.dll, libprotoc.dll, legacy.dll and three
-  # pthreadVC*.dll FindThreads probes, none of which any shipped executable
-  # links, so requiring them failed a build over a package that was correct.
-  #
-  # Deriving them from the executables' own import tables is the real answer,
-  # and fixup_bundle already walks it to decide what to copy. Until that result
-  # is available to CMake, requiring the vcpkg half would mean guessing names
-  # again, which is what produced this bug report in the first place. So assert
-  # what is derived from the build's own link lists and leave the rest to the
-  # purge in cmake/NSIS.template.in, which removes every DLL regardless of name.
-  set(_required_runtime "")
-  foreach(_qt_module IN LISTS COCKATRICE_QT_MODULES SERVATRICE_QT_MODULES ORACLE_QT_MODULES)
+  # A DLL missing from the package only surfaces on a user's machine, after an
+  # update has already replaced their install, as "The code execution cannot
+  # proceed because Qt6Multimedia.dll was not found" or as a missing procedure
+  # entry point in a Qt6QuickWidgets.dll left over from the previous version.
+  # Assert it while the installer is still being built instead.
+  set(_required_qt_runtime "")
+  foreach(_qt_module IN LISTS COCKATRICE_QT_MODULES)
     get_target_property(_qt_module_type ${_qt_module} TYPE)
     if(_qt_module_type STREQUAL "SHARED_LIBRARY")
       string(REGEX REPLACE "^Qt6::" "" _qt_component "${_qt_module}")
-      list(APPEND _required_runtime "Qt6${_qt_component}.dll")
+      list(APPEND _required_qt_runtime "Qt6${_qt_component}.dll")
     endif()
   endforeach()
-  list(APPEND _required_runtime "Plugins/platforms/qwindows.dll")
-
-  list(REMOVE_DUPLICATES _required_runtime)
-  list(SORT _required_runtime)
-  string(REPLACE ";" "\n" _required_runtime "${_required_runtime}")
-  file(WRITE "${PROJECT_BINARY_DIR}/required-runtime.txt" "${_required_runtime}\n")
+  list(APPEND _required_qt_runtime "Plugins/platforms/qwindows.dll")
+  list(REMOVE_DUPLICATES _required_qt_runtime)
+  list(SORT _required_qt_runtime)
+  string(REPLACE ";" "\n" _required_qt_runtime "${_required_qt_runtime}")
+  file(WRITE "${PROJECT_BINARY_DIR}/required-qt-runtime.txt" "${_required_qt_runtime}\n")
 
   # include vcredist into the package; NSIS will take care of running it
   if(VCREDISTRUNTIME_FOUND)

Doxyfile

@@ -1066,11 +1066,25 @@ INPUT_FILE_ENCODING    =
 # provided as Doxygen C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
 # *.f18, *.f, *.for, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
 
-FILE_PATTERNS          = *.cpp \
+FILE_PATTERNS          = *.cc \
+                         *.cxx \
+                         *.cxxm \
+                         *.cpp \
                          *.cppm \
+                         *.ccm \
+                         *.c++ \
+                         *.c++m \
+                         *.ii \
+                         *.ixx \
                          *.ipp \
+                         *.i++ \
                          *.inl \
                          *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.markdown \
                          *.md \
                          *.dox \
                          *.proto
@@ -2653,7 +2667,7 @@ DOT_NUM_THREADS        = 0
 # Minimum value: 1, maximum value: 1000, default value: 50.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_BATCH_SIZE         = 50
+DOT_BATCH_SIZE         = 500
 
 # DOT_COMMON_ATTR is common attributes for nodes, edges and labels of
 # subgraphs. When you want a differently looking font in the dot files that

README.md

@@ -102,7 +102,6 @@ There are various places where useful information for different needs are mainta
 - [Official Wiki](https://github.com/Cockatrice/Cockatrice/wiki) `Community supported`
 - [Official Webpage](https://cockatrice.github.io/)
 - [Official README](https://github.com/Cockatrice/Cockatrice/blob/master/README.md) `This file`
-- [Official CONTRIBUTING](https://github.com/Cockatrice/Cockatrice/blob/master/.github/CONTRIBUTING.md)
 
 Cockatrice tries to use the [Google Developer Documentation Style Guide](https://developers.google.com/style/) to ensure consistent documentation. We encourage you to improve the documentation by suggesting edits based on this guide.
 
@@ -160,12 +159,6 @@ The following flags (with their non-default values) can be passed to `cmake`:
 | `-DUPDATE_TRANSLATIONS=1`  |  Configure `make` to update the translation .ts files for new strings in the source code<br> **Note:** `make clean` will remove the .ts files |
 | `-DTEST=1`                 | Enable regression tests<br> **Note:** `make test` to run tests, *googletest* will be downloaded if not available                              |
 
-> [!TIP]
-> Build code documentation ([Doxygen](https://www.doxygen.nl)) according to our [configuration](https://github.com/Cockatrice/Cockatrice/blob/master/Doxyfile) into `/docs`:
-> ```bash
-> doxygen Doxyfile
-> ```
-
 
 # Run
 

cmake/Coverage.cmake

@@ -1,75 +0,0 @@
-# Line-coverage instrumentation opt-in, plus per-source opt-out
-# Input: ENABLE_COVERAGE
-# Defines: cockatrice_disable_coverage_for
-#
-# Included once from the root CMakeLists.txt, immediately after the per-compiler flag
-# block, so add_compile_options() reaches every library and executable defined below.
-#
-# Note the name deliberately shadows CMake's own built-in Modules/Coverage.cmake. It resolves
-# to this file only because the root CMakeLists.txt puts cmake/ at the front of
-# CMAKE_MODULE_PATH; if that ever moves, include(Coverage) would silently pick up the built-in
-# module, which only defines a `COVERAGE` custom target and touches no global flags, so
-# instrumentation would quietly stop happening rather than erroring.
-
-include(CheckCXXSourceCompiles)
-
-# Opt a set of vendored sources out of instrumentation.
-#
-# cockatrice_disable_coverage_for(<source> ...)
-#
-# Third-party code drags the total down with lines no test can ever reach, and a total that
-# cannot move is not a useful signal. This is the same carve-out the sanitizer build uses.
-#
-# The sources must be named relative to the directory that compiles them. CMake resolves a
-# source-file property against the directory scope the target was declared in, so calling
-# this from the root with absolute paths silently does nothing. That is why the call sites
-# live next to the add_library/add_executable that pull the vendored code in.
-#
-# SKIP_PRECOMPILE_HEADERS mirrors the sanitizer helper. The precompiled header carries the
-# instrumentation flags, and mixing an instrumented PCH with an uninstrumented translation
-# unit makes GCC reject it.
-function(cockatrice_disable_coverage_for)
-  if(NOT ENABLE_COVERAGE)
-    return()
-  endif()
-  # There is no -fno-coverage: --coverage is shorthand for -fprofile-arcs -ftest-coverage, so both
-  # halves have to be negated. CC rejects "-fno-coverage" outright, which is how the vendored C
-  # files below hit it first.
-  set_source_files_properties(
-    ${ARGN} PROPERTIES COMPILE_OPTIONS "-fno-profile-arcs;-fno-test-coverage" SKIP_PRECOMPILE_HEADERS ON
-  )
-endfunction()
-
-if(ENABLE_COVERAGE)
-  # Line coverage needs the compiler's own toolchain, so only GCC is supported. Clang's
-  # equivalent is llvm-cov, which reads a different intermediate format and would need a
-  # separate report path; rejecting it is better than emitting .gcno files that gcovr cannot
-  # read.
-  if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    message(FATAL_ERROR "ENABLE_COVERAGE requires GCC, but the compiler is ${CMAKE_CXX_COMPILER_ID}. "
-                        "Clang coverage needs llvm-cov and is not wired up."
-    )
-  endif()
-
-  # Probe the way the flag will actually be used: compile AND link. A .gcno file comes from the
-  # compile step, but the runtime that writes .gcda files comes from the link step, so probing
-  # only the compile step would pass on a toolchain that cannot actually produce coverage.
-  set(_cockatrice_saved_required_flags "${CMAKE_REQUIRED_FLAGS}")
-  set(_cockatrice_saved_required_link_options "${CMAKE_REQUIRED_LINK_OPTIONS}")
-  set(CMAKE_REQUIRED_FLAGS "-O0 -g")
-  set(CMAKE_REQUIRED_LINK_OPTIONS -fprofile-arcs -ftest-coverage)
-  check_cxx_source_compiles("int main() { return 0; }" COCKATRICE_HAVE_COVERAGE_FLAGS)
-  set(CMAKE_REQUIRED_FLAGS "${_cockatrice_saved_required_flags}")
-  set(CMAKE_REQUIRED_LINK_OPTIONS "${_cockatrice_saved_required_link_options}")
-
-  if(NOT COCKATRICE_HAVE_COVERAGE_FLAGS)
-    message(FATAL_ERROR "ENABLE_COVERAGE is on, but this toolchain rejected the coverage flags.")
-  endif()
-
-  # -O0 keeps the line mapping honest: at higher optimisation levels the compiler merges and
-  # relocates lines, and the report describes code that no longer exists in that form.
-  add_compile_options(--coverage -O0 -g)
-  add_link_options(--coverage)
-
-  message(STATUS "Coverage instrumentation enabled (--coverage). Report with gcovr over the build dir.")
-endif()

cmake/FindQtRuntime.cmake

@@ -7,12 +7,6 @@
 # Output: ORACLE_QT_MODULES
 # Output: TEST_QT_MODULES
 
-# Every Qt module an application links against, as the DLL names a Windows
-# install has to contain. Core is listed explicitly rather than left to arrive
-# transitively: it is the one module nothing can do without, and required-runtime.txt
-# is built from these lists, so a module missing here is a runtime the package
-# check never asserts. That is how Qt6Core.dll went unasserted while every other
-# Qt module was checked.
 set(REQUIRED_QT_COMPONENTS Core)
 if(WITH_SERVER)
   set(_SERVATRICE_NEEDED Network Sql WebSockets)
@@ -20,7 +14,6 @@ endif()
 if(WITH_CLIENT)
   set(_COCKATRICE_NEEDED
       Concurrent
-      Core
       Gui
       Multimedia
       Network
@@ -40,9 +33,7 @@ endif()
 if(TEST)
   # Union of Qt modules required across all test targets (independent of application targets).
   # When adding a new test that needs additional Qt modules, add them here rather than in the test's CMakeLists.txt.
-  # Test is QtTest: it brings QAbstractItemModelTester and QSignalSpy, which are how the Qt model
-  # and signal contracts get verified without standing up a GUI.
-  set(_TEST_NEEDED Concurrent Network Svg Widgets Test)
+  set(_TEST_NEEDED Concurrent Network Svg Widgets)
 endif()
 
 set(REQUIRED_QT_COMPONENTS ${REQUIRED_QT_COMPONENTS} ${_SERVATRICE_NEEDED} ${_COCKATRICE_NEEDED} ${_ORACLE_NEEDED}

cmake/NSIS.template.in

@@ -21,13 +21,6 @@ Var IsUpgrade
 Var AbortReason
 Var WaitPid
 Var LauncherExited
-Var InstallLogPath
-Var LogHandle
-Var LogMessage
-Var LogFindHandle
-Var LogFindName
-Var LogMatchLabel
-Var LogMatchPattern
 
 !include LogicLib.nsh
 !include FileFunc.nsh
@@ -71,67 +64,8 @@ Page Custom PortableModePageCreate PortableModePageLeave
 
 !insertmacro MUI_LANGUAGE English
 
-; Installer log
-; Every run appends a step-by-step trace to a file so a failed upgrade on a
-; user's machine can be diagnosed after the fact. Kept in $TEMP rather than in
-; $INSTDIR because the previous version's uninstaller removes the whole install
-; directory part-way through an upgrade. Read it back with:
-;   notepad %TEMP%\Cockatrice-installer.log
-!macro CockLog text
-    Push "${text}"
-    Call CockLogWrite
-!macroend
-
-Function CockLogWrite
-    Pop $LogMessage
-    FileOpen $LogHandle "$InstallLogPath" a
-    ${If} $LogHandle == ""
-        Return
-    ${EndIf}
-    ; FileOpen places the pointer at the start of the file in every mode, so
-    ; 'a' alone would overwrite the log from the beginning on each line. Seek
-    ; past the existing content first to actually append.
-    FileSeek $LogHandle 0 END
-    FileWrite $LogHandle "$LogMessage$\r$\n"
-    FileClose $LogHandle
-FunctionEnd
-
-; Logs every file matching $INSTDIR\<mask>. Used to record the DLL inventory
-; before and after the upgrade purge, which is what shows whether Qt6Gui.dll was
-; on disk and what (if anything) survived the deletes.
-!macro CockLogListing label mask
-    Push "${label}"
-    Push "$INSTDIR\${mask}"
-    Call CockLogListing
-!macroend
-
-Function CockLogListing
-    Pop $LogMatchPattern
-    Pop $LogMatchLabel
-    !insertmacro CockLog "listing [$LogMatchLabel] pattern=$LogMatchPattern"
-    FindFirst $LogFindHandle $LogFindName "$LogMatchPattern"
-    ${If} $LogFindHandle == ""
-        !insertmacro CockLog "listing [$LogMatchLabel] (no matches)"
-        Return
-    ${EndIf}
-    log_listing_loop:
-        !insertmacro CockLog "listing [$LogMatchLabel] $LogFindName"
-        ClearErrors
-        FindNext $LogFindHandle $LogFindName
-        IfErrors 0 log_listing_loop
-    FindClose $LogFindHandle
-FunctionEnd
-
 Function .onInit
 
-StrCpy $InstallLogPath "$TEMP\Cockatrice-installer.log"
-; Start each run from a clean file so the log that gets sent back is the last
-; run, not every past run glued together.
-FileOpen $LogHandle "$InstallLogPath" w
-FileClose $LogHandle
-!insertmacro CockLog "=================================================================="
-!insertmacro CockLog "installer start: @CPACK_PACKAGE_NAME@ @CPACK_PACKAGE_VERSION@"
-
 ${If} ${NSIS_IS_64_BIT} == 1    #NSIS 64bit
     ${IfNot} ${RunningX64}
         MessageBox MB_OK|MB_ICONSTOP "This version of Cockatrice requires a 64-bit Windows system."
@@ -224,13 +158,6 @@ ${EndIf}
 ; Now that $PortableMode reflects reality, commit InstDir into the correct slot
 Call SetModeDestinationFromInstdir
 
-!insertmacro CockLog "options: InstDir=$InstDir PortableMode=$PortableMode ReinstallMode=$ReinstallMode WaitPid=$WaitPid"
-${If} ${Silent}
-    !insertmacro CockLog "options: running silently"
-${Else}
-    !insertmacro CockLog "options: interactive"
-${EndIf}
-
 ; Wait for the process that launched this installer to exit before anything is
 ; replaced or deleted. It goes first because it is the one check here that needs
 ; no powershell.exe: on a machine where the process lookup cannot run at all, the
@@ -248,14 +175,12 @@ ${EndIf}
 ; interactive installs the section re-checks after the directory page, when
 ; $INSTDIR is the directory the user actually picked.
 ${If} $ReinstallMode = 1
-    !insertmacro CockLog "reinstall: waiting for launcher and other instances"
     Call WaitForLauncherToExit
     Call EnsureAppsNotRunning
 ${EndIf}
 
 ${If} $ReinstallMode = 1
 ${AndIf} $PortableMode = 0
-    !insertmacro CockLog "reinstall: auto-uninstalling previous version"
     Call AutoUninstallIfNeeded
 ${EndIf}
 
@@ -301,23 +226,13 @@ Function AutoUninstallIfNeeded
 
 SetShellVarContext all
 
-; _?=$INSTDIR keeps the old uninstaller running in place. An NSIS uninstaller
-; normally copies itself to %TEMP% and runs from there so that it can delete its
-; own directory, and the process we started exits at once. ExecWait then returns
-; before the uninstall has run, and the temp copy keeps deleting files - from
-; 3.1.0 and 3.1.1 on disk a blanket "RMDir /r $INSTDIR" - while the section
-; below is still writing the new payload. _?= disables the copy and makes
-; ExecWait block until the uninstall finishes. It must be the last argument
-; and must not be quoted, even when the path contains spaces.
-;
 ; --- 32-bit uninstall ---
 SetRegView 32
 ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "QuietUninstallString"
 
-!insertmacro CockLog "uninstall (32-bit): '$R0 _?=$INSTDIR'"
 StrCmp $R0 "" done32
 DetailPrint "Removing previous version (32-bit)..."
-ExecWait '$R0 _?=$INSTDIR'
+ExecWait '$R0'
 
 done32:
 
@@ -326,10 +241,9 @@ ${If} ${RunningX64}
     SetRegView 64
     ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "QuietUninstallString"
 
-    !insertmacro CockLog "uninstall (64-bit): '$R0 _?=$INSTDIR'"
     StrCmp $R0 "" done64
     DetailPrint "Removing previous version (64-bit)..."
-    ExecWait '$R0 _?=$INSTDIR'
+    ExecWait '$R0'
 
     done64:
 ${EndIf}
@@ -446,7 +360,6 @@ Function WaitForAppToClose
     ; usage: set $R1 to the display name (e.g. "cockatrice.exe") and $R2 to the
     ; base image name (e.g. "cockatrice")
     Call IsAppRunning
-    !insertmacro CockLog "guard $R1: state=$R0 (dir=$GuardDir)"
     ; Only a definite "running" is worth waiting for. "Not running" is done, and
     ; "could not determine" must not keep the installer waiting on an answer it
     ; will never get - but it cannot simply be waved through either, see
@@ -471,7 +384,6 @@ Function WaitForAppToClose
         Sleep 500
         Call IsAppRunning
         ${If} $R0 = 0
-            !insertmacro CockLog "guard $R1: closed gracefully"
             DetailPrint "$R1 closed."
             Return
         ${EndIf}
@@ -490,7 +402,6 @@ Function WaitForAppToClose
         ; deck, and nothing has been replaced yet, so aborting just defers the
         ; update and preserves the user's data.
         ${If} $AllowForceClose = 0
-            !insertmacro CockLog "guard $R1: still running after 60s, aborting (no force close)"
             DetailPrint "$R1 is still running after 60 s; aborting the update so that no data is lost."
             StrCpy $AbortReason \
                 "$R1 did not close within 60 seconds, so the installation was aborted to avoid losing unsaved data.$\r$\n$\r$\nPlease close $R1 and run the installer again."
@@ -499,13 +410,11 @@ Function WaitForAppToClose
         ; Oracle and Servatrice are console applications: CloseMainWindow()
         ; returned false for them and waiting longer cannot help. They hold no
         ; unsaved user data, so stop them by PID.
-        !insertmacro CockLog "guard $R1: still running after 60s, force-stopping"
         DetailPrint "Force-stopping $R1 ..."
         Call ForceCloseApps
         Sleep 2000
         Call IsAppRunning
         ${If} $R0 = 0
-            !insertmacro CockLog "guard $R1: force-stopped"
             DetailPrint "$R1 closed."
             Return
         ${EndIf}
@@ -513,7 +422,6 @@ Function WaitForAppToClose
             Call HandleUnknownAppState
             Return
         ${EndIf}
-        !insertmacro CockLog "guard $R1: could not be stopped, aborting"
         DetailPrint "$R1 is still running after 60 s; aborting the update."
         StrCpy $AbortReason \
             "$R1 could not be stopped, so the installation was aborted.$\r$\n$\r$\nPlease close $R1 and run the installer again."
@@ -578,16 +486,8 @@ FunctionEnd
 ; Only the first of those two gets a dialog; the second reports through the log
 ; and the exit code.
 Function AbortInstall
-    !insertmacro CockLog "ABORT: $AbortReason"
-    !insertmacro CockLog "full installer log: $InstallLogPath"
-    ; Show a dialog whenever someone is at the keyboard to see it: an interactive
-    ; install, or the in-app updater's /R upgrade. The /R upgrade is silent, but
-    ; the client that launched the installer has already quit, so the user is
-    ; still there. Only a /S install without /R is attended by a package manager
-    ; and must go straight to the exit code.
-    ${If} $ReinstallMode = 1
-    ${OrIfNot} ${Silent}
-        MessageBox MB_OK|MB_ICONEXCLAMATION "$AbortReason$\r$\n$\r$\nA detailed installer log was written to:$\r$\n$InstallLogPath"
+    ${IfNot} ${Silent}
+        MessageBox MB_OK|MB_ICONEXCLAMATION "$AbortReason"
     ${EndIf}
     SetErrorLevel 1
     Abort
@@ -610,33 +510,17 @@ FunctionEnd
 ; falls back to the name based guard.
 Function WaitForLauncherToExit
     StrCpy $LauncherExited 0
-    !insertmacro CockLog "wait-launcher: pid='$WaitPid'"
     ${If} $WaitPid == ""
-        !insertmacro CockLog "wait-launcher: no pid given, falling back to name check"
         Return
     ${EndIf}
     ; PROCESS_SYNCHRONIZE is the only access this needs - enough to wait on the
     ; handle, and the least likely to be refused for a reason that has nothing to
     ; do with the upgrade.
-    ;
-    ; System.dll maps its output registers so that .rN writes $N and .RN writes
-    ; $RN. The caller reads $R0/$R1, so the uppercase .RN form is required; the
-    ; original .r0/.r1 wrote $0/$1 and left $R1 empty, which made the "did not
-    ; exit" test below compare "" against "0" and abort on every /PID= upgrade.
     ClearErrors
-    System::Call 'kernel32::OpenProcess(i 0x00100000, i 0, i $WaitPid) p.R0'
-    ; OpenProcess returns a null handle for a process that is already gone. The
-    ; System plugin does not raise the NSIS error flag from a called function's
-    ; return value, so ${Errors} alone never saw that case and the null handle was
-    ; passed straight to WaitForSingleObject. Fold a plugin failure into the same
-    ; null-handle case instead of reading a handle that was never written.
+    System::Call 'kernel32::OpenProcess(i 0x00100000, i 0, i $WaitPid) p.r0'
     ${If} ${Errors}
-        StrCpy $R0 0
-    ${EndIf}
-    ${If} $R0 == 0
     ; The launcher is gone - OpenProcess cannot open a dead process - which is
     ; exactly the state the wait was for.
-        !insertmacro CockLog "wait-launcher: already exited"
         DetailPrint "The application that started this installer has already exited."
         StrCpy $LauncherExited 1
         Return
@@ -645,16 +529,14 @@ Function WaitForLauncherToExit
     ; Same 60 s grace period the name based check uses, so a client that is slow
     ; to flush its card database does not get less room than it used to.
     ; WAIT_OBJECT_0 is 0; WAIT_TIMEOUT is 258 and a failed wait reports 0xFFFFFFFF.
-    System::Call 'kernel32::WaitForSingleObject(p R0, i 60000) i.R1'
-    System::Call 'kernel32::CloseHandle(p R0)'
+    System::Call 'kernel32::WaitForSingleObject(p r0, i 60000) i.r1'
+    System::Call 'kernel32::CloseHandle(p r0)'
     ${If} $R1 != 0
-        !insertmacro CockLog "wait-launcher: did not exit within 60s (wait=$R1)"
         DetailPrint "The application that started this installer did not exit within 60 s."
         StrCpy $AbortReason \
             "The application that started this update has not exited yet, so the installation was cancelled rather than replace files it is still using.$\r$\n$\r$\nPlease close Cockatrice and run the installer again."
         Call AbortInstall
     ${EndIf}
-    !insertmacro CockLog "wait-launcher: launcher exited"
     DetailPrint "The application that started this installer has exited."
     StrCpy $LauncherExited 1
 FunctionEnd
@@ -680,11 +562,9 @@ FunctionEnd
 Function GuardAppsNotRunning
     ; usage: set $GuardDir to the directory to guard, then call this
     Call IsProcessLookupAvailable
-    !insertmacro CockLog "guard: powershell available=$R0 dir=$GuardDir launcherExited=$LauncherExited"
     ${If} $R0 = 0
         ; Without PowerShell we cannot tell whether a running instance is
         ; holding locks on the files we are about to replace.
-        !insertmacro CockLog "guard: powershell unavailable, skipping instance check"
         DetailPrint "Could not start powershell.exe; skipping the running instance check. Close Cockatrice, Oracle and Servatrice manually if the installation reports a problem."
         ; On a silent upgrade that used to be a warning and nothing more, which
         ; left the very process that launched the installer free to go on
@@ -707,8 +587,7 @@ Function GuardAppsNotRunning
         ${EndIf}
         ; The user has to be told to close the applications by hand, but a /S
         ; install without /R is unattended and would block on this forever.
-        ${If} $ReinstallMode = 1
-        ${OrIfNot} ${Silent}
+        ${IfNot} ${Silent}
             MessageBox MB_OK|MB_ICONEXCLAMATION "This installer could not check whether Cockatrice is still running, because powershell.exe could not be started.$\r$\n$\r$\nPlease close Cockatrice, Oracle and Servatrice manually before continuing."
         ${EndIf}
         Return
@@ -754,11 +633,7 @@ Function IsExistingCockatriceInstall
     ; there to prove that it is one. Every Qt module Cockatrice links is part of
     ; the payload, so match them all: probing only Qt6Core.dll would miss a
     ; directory where that one file happened to be deletable and the others
-    ; were not. Qt6*.dll rather than *.dll on purpose: this function decides
-    ; whether a directory is ours, and a folder that merely holds some DLLs of
-    ; its own must not be purged. Qt6*.dll is enough even when only the protobuf
-    ; runtime survived, because the whole Qt set is mapped by the same process
-    ; that maps abseil_dll.dll and so is locked or free with it.
+    ; were not.
     StrCpy $R3 "Qt6*.dll"
     Call CheckStaleRuntimeMask
     ${If} ${FileExists} "$INSTDIR\qt.conf"
@@ -770,23 +645,36 @@ FunctionEnd
 ; the purge. NSIS silently skips whatever it cannot delete, so one surviving file
 ; is enough to prove that something still holds a lock on the install directory.
 ;
-; Any DLL at all counts, not a list of expected ones. The purge removes every
-; top-level DLL, so after it has run the only DLL that can still be there is one
-; it failed to delete, whatever its name. A mask per library family (Qt, then
-; OpenSSL, then zlib) is what let abseil_dll.dll through: it is in neither the
-; purge nor this check, so it survived a 3.0.2 to 3.1 update untouched, the new
-; executables were written next to it, and the client then failed to start with
-; "abseil_dll.dll is either not designed to run on Windows or it contains an
-; error". Probing *.dll has no list to fall out of date when the next
-; transitive dependency appears.
+; The masks below have to cover the purge above one for one. A check that only
+; probed named files could not see a locked Qt6Multimedia.dll or a Plugins
+; directory the purge was unable to remove, so the exact files that broke the
+; install were also the ones this check was blind to.
 Function HasStaleRuntimeFiles
     StrCpy $R0 0
-    StrCpy $R3 "*.dll"
+    StrCpy $R3 "Qt*.dll"
     Call CheckStaleRuntimeMask
+    StrCpy $R3 "libcrypto*.dll"
+    Call CheckStaleRuntimeMask
+    StrCpy $R3 "libssl*.dll"
+    Call CheckStaleRuntimeMask
+    StrCpy $R3 "zlib*.dll"
+    Call CheckStaleRuntimeMask
+    StrCpy $R3 "icu*.dll"
+    Call CheckStaleRuntimeMask
+    StrCpy $R3 "libeay32.dll"
+    Call CheckStaleRuntimeMask
+    StrCpy $R3 "ssleay32.dll"
+    Call CheckStaleRuntimeMask
+    ${If} $R0 = 1
+        Return
+    ${EndIf}
+    ${If} ${FileExists} "$INSTDIR\libmysql.dll"
+        StrCpy $R0 1
+        Return
+    ${EndIf}
     ; IfFileExists takes wildcards, so a Plugins directory the purge could not
     ; remove counts as a leftover too.
     ${If} ${FileExists} "$INSTDIR\Plugins\*.*"
-        !insertmacro CockLog "stale-runtime: Plugins directory survived the purge"
         StrCpy $R0 1
     ${EndIf}
 FunctionEnd
@@ -799,7 +687,6 @@ Function CheckStaleRuntimeMask
     ${EndIf}
     FindFirst $StaleFindHandle $StaleFindName "$INSTDIR\$R3"
     ${If} $StaleFindHandle != ""
-        !insertmacro CockLog "stale-runtime: '$StaleFindName' matched $R3 in $INSTDIR"
         StrCpy $R0 1
         FindClose $StaleFindHandle
     ${EndIf}
@@ -1038,10 +925,9 @@ ${If} $PortableMode = 0
     ; directory before letting it delete anything. The uninstall string is
     ; stashed away first, the check works on $R0.
     StrCpy $OldUninstallString $R0
-    !insertmacro CockLog "componentsPagePre: old 32-bit uninstall '$OldUninstallString _?=$INSTDIR'"
     Call EnsureOldInstallNotRunning
     ClearErrors
-    ExecWait "$OldUninstallString _?=$INSTDIR"
+    ExecWait "$OldUninstallString"
 
 	done32:
 
@@ -1061,10 +947,9 @@ ${If} $PortableMode = 0
 
 	    uninst64:
 	    StrCpy $OldUninstallString $R0
-	    !insertmacro CockLog "componentsPagePre: old 64-bit uninstall '$OldUninstallString _?=$INSTDIR'"
 	    Call EnsureOldInstallNotRunning
 	    ClearErrors
-	    ExecWait "$OldUninstallString _?=$INSTDIR"
+	    ExecWait "$OldUninstallString"
 
 		done64:
 	${EndIf}
@@ -1079,19 +964,15 @@ Section "Application" SecApplication
 SetShellVarContext all
 SetOutPath "$INSTDIR"
 
-!insertmacro CockLog "section: InstDir=$INSTDIR PortableMode=$PortableMode ReinstallMode=$ReinstallMode"
-
 ; No application instance may be running while any file below is deleted or
 ; replaced: both upgrade blocks start by removing the old executables and
 ; runtime DLLs, and NSIS silently skips whatever is locked, which is how an
-; install ends up with a mix of old and new runtimes next to the new executable.
-; The next start then fails with "The procedure entry point X could not be
-; located in the dynamic link library ...Qt6Network.dll" for the Qt ones, or
-; "abseil_dll.dll is either not designed to run on Windows or it contains an
-; error" for the protobuf ones. So the check has to come before the first
-; Delete/RMDir and not after it: an interactive install into an existing portable
-; directory with cockatrice.exe still running would otherwise delete the old
-; files under its feet.
+; install ends up with a mix of old and new Qt DLLs next to the new executable
+; ("The procedure entry point X could not be located in the dynamic link
+; library ...Qt6Network.dll"). So the check has to come before the first
+; Delete/RMDir and not after it - an interactive install into an existing
+; portable directory with cockatrice.exe still running would otherwise delete
+; the old files under its feet.
 ;
 ; It is skipped on the /R path: .onInit already ran it before
 ; AutoUninstallIfNeeded removed the previous installation, so by the time this
@@ -1106,39 +987,32 @@ ${EndIf}
 ${If} $PortableMode = 1
 ${AndIf} ${FileExists} "$INSTDIR\portable.dat"
 	; upgrade portable mode
-	!insertmacro CockLog "section: portable upgrade purge"
-	!insertmacro CockLogListing "before-portable-purge" "*.dll"
-	; plugins and translations are payload and are rewritten by the payload
-	; below, so removing them here is safe. sounds and themes are payload
-	; too - the default packs are rewritten below as well - but a portable
-	; user's custom sounds and themes live in exactly those folders, so a
-	; recursive purge here would delete user content along with the defaults.
-	; Stale default files from an older release are overwritten or replaced
-	; by the payload, never by a purge.
 	RMDir /r "$INSTDIR\plugins"
+	RMDir /r "$INSTDIR\sounds"
+	RMDir /r "$INSTDIR\themes"
 	RMDir /r "$INSTDIR\translations"
 	Delete "$INSTDIR\uninstall.exe"
 	Delete "$INSTDIR\cockatrice.exe"
 	Delete "$INSTDIR\oracle.exe"
 	Delete "$INSTDIR\servatrice.exe"
-	; Every top-level DLL, not a list of expected ones. The payload is written
-	; after this block, so a DLL the new build still needs is put straight back;
-	; what this has to guarantee is that nothing from the previous build is left
-	; to be loaded next to the new executables. Naming the families by hand is
-	; what let abseil_dll.dll through; see HasStaleRuntimeFiles.
-	Delete "$INSTDIR\*.dll"
+	Delete "$INSTDIR\Qt*.dll"
+	Delete "$INSTDIR\libmysql.dll"
+	Delete "$INSTDIR\icu*.dll"
+	Delete "$INSTDIR\libcrypto*.dll"
+	Delete "$INSTDIR\libssl*.dll"
+	Delete "$INSTDIR\libeay32.dll"
+	Delete "$INSTDIR\ssleay32.dll"
 	Delete "$INSTDIR\qt.conf"
 	Delete "$INSTDIR\qdebug.txt"
 	Delete "$INSTDIR\servatrice.sql"
 	Delete "$INSTDIR\servatrice.ini.example"
+	Delete "$INSTDIR\zlib*.dll"
 	RMDir "$INSTDIR"
-	!insertmacro CockLogListing "after-portable-purge" "*.dll"
 ${EndIf}
 
 ; Remove any runtime DLLs left over from older versions, so a mismatched
-; Qt/OpenSSL/protobuf set cannot survive next to the new executables.
+; Qt/OpenSSL set cannot survive next to the new executables.
 Call IsExistingCockatriceInstall
-!insertmacro CockLog "section: IsExistingCockatriceInstall=$R0"
 ; Remembered because the stale-runtime check below must only ever fire for a
 ; directory this installer recognised as a Cockatrice install. Scanning for
 ; leftovers in an unrelated directory (a first-time install into a folder that
@@ -1147,48 +1021,48 @@ Call IsExistingCockatriceInstall
 StrCpy $IsUpgrade $R0
 ${If} $PortableMode = 0
 ${AndIf} $R0 = 1
-	!insertmacro CockLog "section: non-portable upgrade purge"
-	!insertmacro CockLogListing "before-purge" "*.dll"
 	RMDir /r "$INSTDIR\Plugins"
-	Delete "$INSTDIR\*.dll"
-	!insertmacro CockLogListing "after-purge" "*.dll"
-	!insertmacro CockLogListing "after-plugins" "Plugins\*.*"
+	Delete "$INSTDIR\Qt*.dll"
+	Delete "$INSTDIR\libcrypto*.dll"
+	Delete "$INSTDIR\libssl*.dll"
+	Delete "$INSTDIR\zlib*.dll"
+	Delete "$INSTDIR\libmysql.dll"
+	Delete "$INSTDIR\icu*.dll"
+	Delete "$INSTDIR\libeay32.dll"
+	Delete "$INSTDIR\ssleay32.dll"
 ${EndIf}
 
-; Whatever was locked during the purge (by an instance that started while the
+; Whatever was locked during the purge - by an instance that started while the
 ; installer was running, or because the running instance check could not be
-; performed at all) is still on disk, and the new executables are about to be
+; performed at all - is still on disk, and the new executables are about to be
 ; written next to it. That mix is exactly what makes the next start fail with
 ; "The procedure entry point X could not be located in the dynamic link library
-; ...Qt6QuickWidgets.dll", "The code execution cannot proceed because
-; Qt6Multimedia.dll was not found", or "abseil_dll.dll is either not designed to
-; run on Windows or it contains an error", so stop here instead of compounding
-; it. Nothing of the new payload has been written at this point, so the next run,
-; with the applications closed, gets a clean install.
+; ...Qt6QuickWidgets.dll" or "The code execution cannot proceed because
+; Qt6Multimedia.dll was not found", so stop here instead of compounding it.
+; Nothing of the new payload has been written at this point, so the next run -
+; with the applications closed - gets a clean install.
 ${If} $IsUpgrade = 1
     Call HasStaleRuntimeFiles
-    !insertmacro CockLog "section: HasStaleRuntimeFiles=$R0"
 ${Else}
     StrCpy $R0 0
 ${EndIf}
 ${If} $R0 = 1
-    !insertmacro CockLog "section: aborting, files of a previous version survived the purge"
     DetailPrint "Files of a previous version could not be removed; aborting the installation."
     ; The in-app updater runs this installer silent and detached and never looks
     ; at its exit code, so the user has to be told what happened. A /S install
-    ; without /R is unattended (a package manager, for instance) and a message
+    ; without /R is unattended - a package manager, for instance - and a message
     ; box there would block forever, so that case only reports through the log
-    ; and the exit code. AbortInstall owns that decision.
-    StrCpy $AbortReason \
-        "The installation could not remove all files of a previous version of Cockatrice, most likely because it is still running or was started as administrator, and was cancelled rather than leave a mismatched install behind.$\r$\n$\r$\nPlease close Cockatrice, Oracle and Servatrice and run the installer again."
-    Call AbortInstall
+    ; and the exit code.
+    ${IfNot} ${Silent}
+        MessageBox MB_OK|MB_ICONEXCLAMATION \
+            "The installation could not remove all files of a previous version of Cockatrice, most likely because it is still running or was started as administrator, and was cancelled rather than leave a mismatched install behind.$\r$\n$\r$\nPlease close Cockatrice, Oracle and Servatrice and run the installer again."
+    ${EndIf}
+    SetErrorLevel 1
+    Abort
 ${EndIf}
 
 @CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS@
-!insertmacro CockLog "section: writing payload to $INSTDIR"
 @CPACK_NSIS_FULL_INSTALL@
-!insertmacro CockLog "section: payload written"
-!insertmacro CockLogListing "final" "Qt6*.dll"
 
 ${If} $PortableMode = 0
 	WriteUninstaller "$INSTDIR\uninstall.exe"
@@ -1252,7 +1126,6 @@ ${If} $ReinstallMode = 1
         Exec '"$INSTDIR\cockatrice.exe"'
 ${EndIf}
 
-!insertmacro CockLog "section: application install complete"
 SectionEnd
 
 Section "Start menu item" SecStartMenu
@@ -1269,32 +1142,16 @@ Section "un.Application" UnSecApplication
 	SetShellVarContext all
 	StrCpy $R1 0
 
-	; Record whether this was a portable install before portable.dat is
-	; removed below.
+	; Record whether this was a portable install before the directory (and the
+	; portable.dat marker inside it) is removed below.
 	IfFileExists "$INSTDIR\portable.dat" 0 +2
 		StrCpy $R1 1
 
-	; Remove only what the installer wrote. The two lists below are generated
-	; by CPack from the staged install tree: one Delete per installed file and
-	; one non-recursive RMDir per installed directory, children first.
-	; Anything the user put in $INSTDIR - decks, pictures, portable data
-	; folders - is not on those lists and survives, and $INSTDIR itself is
-	; only removed when nothing else is left in it. An earlier version of this
-	; section ran a blanket "RMDir /r $INSTDIR" to keep build-tree artifacts
-	; out of a fresh reinstall; that also deleted user decks whenever a user
-	; had pointed their data folders into the install directory, so payload
-	; purity may never be bought at that price again.
-@CPACK_NSIS_DELETE_FILES@
-@CPACK_NSIS_DELETE_DIRECTORIES@
-
-	; Written by the installer itself, so absent from the staged payload
-	; above; qdebug.txt is app-generated log output next to the executables.
-	Delete "$INSTDIR\uninstall.exe"
-	Delete "$INSTDIR\portable.dat"
-	Delete "$INSTDIR\qdebug.txt"
-
-	; Succeeds only when no foreign files remain.
-	RMDir "$INSTDIR"
+	; Remove the entire application directory so any file that is not part of
+	; the installed payload (e.g. build-tree artifacts such as *.dir folders,
+	; *_autogen and *.tlog files from a build) cannot survive between an
+	; uninstall and a fresh reinstall.
+	RMDir /r "$INSTDIR"
 
 	RMDir /r "$SMPROGRAMS\Cockatrice"
 

cmake/Sanitizers.cmake

@@ -1,109 +0,0 @@
-# AddressSanitizer + UndefinedBehaviorSanitizer opt-in, plus per-source opt-out
-# Input: ENABLE_SANITIZERS
-# Defines: cockatrice_disable_sanitizers_for
-#
-# Included once from the root CMakeLists.txt, immediately after the per-compiler flag
-# block, so add_compile_options() reaches every library and executable defined below.
-
-include(CheckCXXSourceCompiles)
-
-# Opt a set of vendored sources out of instrumentation.
-#
-# cockatrice_disable_sanitizers_for(<source> ...)
-#
-# Sanitizer findings inside vendored code are not actionable for us, and letting them
-# through buries our own bugs in noise until everyone learns to skip the job.
-#
-# The sources must be named relative to the directory that compiles them. CMake resolves a
-# source-file property against the directory scope the target was declared in, so calling
-# this from the root with absolute paths silently does nothing. That is why the call sites
-# live next to the add_library/add_executable that pull the vendored code in.
-#
-# SKIP_PRECOMPILE_HEADERS is not optional. The precompiled header is built with the
-# sanitizer flags, so it defines __SANITIZE_ADDRESS__; a translation unit compiled with
-# -fno-sanitize=all does not, and GCC then refuses the PCH with
-# "not used because __SANITIZE_ADDRESS__ not defined", which is a fatal -Werror=invalid-pch
-# in the servatrice and oracle builds.
-function(cockatrice_disable_sanitizers_for)
-  if(NOT ENABLE_SANITIZERS)
-    return()
-  endif()
-  set_source_files_properties(${ARGN} PROPERTIES COMPILE_OPTIONS "-fno-sanitize=all" SKIP_PRECOMPILE_HEADERS ON)
-endfunction()
-
-if(ENABLE_SANITIZERS)
-  # Probe a flag the way it will actually be used: on the compile step AND the link step.
-  # check_cxx_compiler_flag() only probes the compile step, which makes every sanitizer
-  # flag look unsupported because linking an ASan object without -fsanitize=address leaves
-  # __asan_init undefined. That is a silent misconfiguration rather than an error, so the
-  # probe has to link.
-  function(cockatrice_probe_flag FLAG VARNAME)
-    set(CMAKE_REQUIRED_FLAGS "${FLAG}")
-    set(CMAKE_REQUIRED_LINK_OPTIONS "${FLAG}")
-    check_cxx_source_compiles("int main() { return 0; }" ${VARNAME})
-    unset(CMAKE_REQUIRED_FLAGS)
-    unset(CMAKE_REQUIRED_LINK_OPTIONS)
-  endfunction()
-
-  set(SANITIZER_FLAGS
-      -fsanitize=address,undefined
-      -fno-omit-frame-pointer
-      # UBSan defaults to recover mode: it prints "runtime error: ..." but the
-      # process exits 0, so gtest/ctest report a pass and CI stays green.
-      # -fno-sanitize-recover makes the first finding abort instead. This is
-      # probed like the other cosmetic flags, but CI also sets
-      # UBSAN_OPTIONS=halt_on_error=1 as the runtime-side guarantee.
-      -fno-sanitize-recover=undefined
-      # Qt builds QObject subclasses into raw storage and writes the vptr afterwards, which
-      # the vptr check reports on essentially every QObject instantiation. The check has no
-      # value for us because nothing outside moc-generated code inherits QObject, so it is
-      # off outright rather than suppressed piecemeal.
-      -fno-sanitize=vptr
-  )
-
-  # MSVC has no ASan/UBSan equivalent, and clang-cl would need /fsanitize=address plus a
-  # matching runtime link, which is a separate piece of work.
-  if(MSVC)
-    message(FATAL_ERROR "ENABLE_SANITIZERS is not supported with MSVC")
-  endif()
-
-  # Probe rather than assume, so an older toolchain gets the sanitizers it can support
-  # instead of failing the build on a flag it does not recognize.
-  set(SANITIZER_SUPPORTED_FLAGS)
-  foreach(FLAG ${SANITIZER_FLAGS})
-    string(MAKE_C_IDENTIFIER "COCKATRICE_HAS${FLAG}" _FLAG_VAR)
-    cockatrice_probe_flag("${FLAG}" ${_FLAG_VAR})
-    if(${_FLAG_VAR})
-      list(APPEND SANITIZER_SUPPORTED_FLAGS ${FLAG})
-    else()
-      message(STATUS "Sanitizers: ${FLAG} unsupported by ${CMAKE_CXX_COMPILER_ID}, skipping")
-    endif()
-  endforeach()
-
-  # The whole point of the option is the sanitizers, so an unsupported pair is fatal even
-  # though the cosmetic flags above are allowed to degrade.
-  if(NOT "-fsanitize=address,undefined" IN_LIST SANITIZER_SUPPORTED_FLAGS)
-    message(FATAL_ERROR "ENABLE_SANITIZERS requires -fsanitize=address,undefined, which "
-                        "${CMAKE_CXX_COMPILER_ID} does not accept"
-    )
-  endif()
-
-  add_compile_options(${SANITIZER_SUPPORTED_FLAGS})
-  add_link_options(-fsanitize=address,undefined)
-
-  # Recorded so the test tree can label its entries and a plain `make` at the same time
-  # cannot quietly disagree with what CI ran.
-  set(COCKATRICE_SANITIZERS
-      ON
-      CACHE INTERNAL "AddressSanitizer and UBSan are enabled"
-  )
-else()
-  # ENABLE_SANITIZERS is OFF, but COCKATRICE_SANITIZERS is CACHE INTERNAL, so a
-  # reused build dir (e.g. CI's release-package step reconfiguring the same dir
-  # after the sanitized debug step) would otherwise keep skipping NO_SANITIZE
-  # tests and keep the 300s discovery timeout. Reset it explicitly.
-  set(COCKATRICE_SANITIZERS
-      OFF
-      CACHE INTERNAL "AddressSanitizer and UBSan are enabled" FORCE
-  )
-endif()

cmake/pch/qtcore_pch.h

@@ -3,53 +3,22 @@
  *
  * Safe for every target that links Qt Core, including the headless
  * Servatrice binary. Keep this header free of any widget/gui types.
- *
- * Candidates are chosen from IWYU include statistics: a header earns a
- * spot when it is not already reachable from the rest of this list and
- * enough translation units re-parse it. Qt headers are stable across
- * builds, so the precompiled header rarely invalidates.
  */
 
 #include <QBasicTimer>
 #include <QByteArray>
-#include <QCommandLineParser>
-#include <QCoreApplication>
-#include <QCryptographicHash>
 #include <QDateTime>
 #include <QDebug>
-#include <QDir>
-#include <QElapsedTimer>
 #include <QFile>
-#include <QFileInfo>
 #include <QHash>
-#include <QItemSelectionModel>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonValue>
 #include <QList>
 #include <QLoggingCategory>
 #include <QMap>
-#include <QMetaEnum>
 #include <QMetaObject>
-#include <QMutex>
-#include <QMutexLocker>
 #include <QObject>
-#include <QPointer>
-#include <QPropertyAnimation>
 #include <QRandomGenerator>
-#include <QReadWriteLock>
-#include <QRegularExpression>
-#include <QSet>
-#include <QSettings>
 #include <QSharedPointer>
-#include <QSortFilterProxyModel>
 #include <QString>
 #include <QStringList>
-#include <QTemporaryDir>
-#include <QThread>
 #include <QTimer>
-#include <QUuid>
 #include <QVariant>
-#include <QXmlStreamReader>
-#include <QXmlStreamWriter>

cmake/pch/qtwidgets_pch.h

@@ -4,56 +4,27 @@
  * Includes the Qt Core precompiled header plus the heavy Gui, Widgets and
  * Network layers that virtually every client translation unit re-parses.
  * Do not use on Servatrice (headless, QT_DONT_USE_QTGUI).
- *
- * Candidates are chosen from IWYU include statistics: a header earns a
- * spot when it is not already reachable from the rest of this list and
- * enough translation units re-parse it. Qt headers are stable across
- * builds, so the precompiled header rarely invalidates.
  */
 
 #include "qtcore_pch.h"
 
 #include <QAction>
 #include <QApplication>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QCompleter>
-#include <QDialogButtonBox>
-#include <QDockWidget>
-#include <QFileDialog>
-#include <QFormLayout>
 #include <QFrame>
 #include <QGraphicsItem>
 #include <QGraphicsScene>
-#include <QGraphicsSceneMouseEvent>
 #include <QGraphicsView>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QHBoxLayout>
-#include <QHeaderView>
 #include <QImage>
-#include <QImageReader>
-#include <QInputDialog>
 #include <QLabel>
 #include <QLayout>
-#include <QListWidget>
 #include <QMainWindow>
 #include <QMenu>
-#include <QMessageBox>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QPainter>
-#include <QPlainTextEdit>
 #include <QPushButton>
 #include <QScrollArea>
-#include <QSpinBox>
-#include <QSplitter>
-#include <QStandardItemModel>
 #include <QTabWidget>
-#include <QTableWidget>
-#include <QTableWidgetItem>
 #include <QToolBar>
-#include <QToolButton>
 #include <QTreeWidget>
-#include <QVBoxLayout>
 #include <QWidget>

cockatrice/CMakeLists.txt

@@ -59,7 +59,6 @@ set(cockatrice_SOURCES
     src/interface/widgets/dialogs/dlg_update.cpp
     src/interface/widgets/dialogs/dlg_view_log.cpp
     src/interface/widgets/dialogs/override_printing_warning.cpp
-    src/interface/widgets/dialogs/path_safety_warning.cpp
     src/interface/widgets/dialogs/tip_of_the_day.cpp
     src/interface/widgets/deck_share/deck_share_utils.cpp
     src/interface/widgets/deck_share/shared_deck_preview_widget.cpp
@@ -141,10 +140,6 @@ set(cockatrice_SOURCES
     src/game_graphics/zones/view_zone.cpp
     src/game_graphics/zones/view_zone_widget.cpp
     src/game_graphics/board/abstract_graphics_item.cpp
-    src/interface/card_database_update/card_database_update_status_bar.cpp
-    src/interface/card_database_update/card_database_update_status_bar.h
-    src/interface/card_database_update/card_update_progress.cpp
-    src/interface/card_database_update/card_update_progress.h
     src/interface/card_picture_loader/card_picture_loader.cpp
     src/interface/card_picture_loader/card_picture_loader_local.cpp
     src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp
@@ -692,7 +687,7 @@ if(WIN32)
   # import table, and the glob above only sees DLLs that were already copied next
   # to the executable. Qt6::Concurrent is linked but never imported - QtConcurrent::run
   # and QFutureWatcher are header-only in Qt 6 - so neither step ships
-  # Qt6Concurrent.dll, even though required-runtime.txt lists it and the
+  # Qt6Concurrent.dll, even though required-qt-runtime.txt lists it and the
   # Windows package check then fails on a package that is fine to run.
   # Qt6::ShaderTools is skipped for the same reason.
   #

cockatrice/cockatrice.desktop

@@ -6,4 +6,5 @@ Name=Cockatrice
 Exec=cockatrice %U
 Icon=cockatrice
 Categories=Game;CardGame;
-MimeType=application/x-cockatrice;x-scheme-handler/cockatrice;
+MimeType=application/x-cockatrice;
+X-Scheme-Handler/cockatrice=true

cockatrice/src/client/lag_monitor.cpp

@@ -1,10 +1,7 @@
 #include "lag_monitor.h"
 
-#include <QApplication>
 #include <QCoreApplication>
-#include <QDateTime>
 #include <QEvent>
-#include <QMessageLogger>
 #include <QTimer>
 
 LagMonitor::LagMonitor(QObject *parent) : QObject(parent)

cockatrice/src/client/lag_monitor.h

@@ -6,15 +6,15 @@
 #ifndef LAG_MONITOR_H
 #define LAG_MONITOR_H
 
+#include <QDateTime>
 #include <QElapsedTimer>
 #include <QList>
 #include <QLoggingCategory>
 #include <QObject>
-#include <QtGlobal>
-#include <qtmetamacros.h>
 
 inline Q_LOGGING_CATEGORY(LagMonitorLog, "lag_monitor");
 
+class QEvent;
 class QTimer;
 
 /**

cockatrice/src/client/latency_graph_widget.cpp

@@ -5,11 +5,7 @@
 
 #include "latency_graph_widget.h"
 
-#include <QColor>
 #include <QPainter>
-#include <QRectF>
-#include <QtGlobal>
-#include <qnumeric.h>
 
 LatencyGraphWidget::LatencyGraphWidget(QWidget *parent) : QWidget(parent)
 {

cockatrice/src/client/latency_graph_widget.h

@@ -8,8 +8,6 @@
 
 #include <QList>
 #include <QWidget>
-#include <QtGlobal>
-#include <qtmetamacros.h>
 
 /**
  * @brief Bar graph of recent network round-trip samples.

cockatrice/src/client/latency_status_widget.cpp

@@ -6,15 +6,11 @@
 #include "latency_status_widget.h"
 
 #include "latency_graph_widget.h"
-#include "latency_tracker.h"
 
 #include <QEvent>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QObject>
-#include <QPoint>
 #include <QVBoxLayout>
-#include <qnamespace.h>
 
 LatencyStatusWidget::LatencyStatusWidget(QWidget *parent) : QWidget(parent)
 {

cockatrice/src/client/latency_status_widget.h

@@ -7,10 +7,8 @@
 #define LATENCY_STATUS_WIDGET_H
 
 #include <QList>
-#include <QString>
 #include <QWidget>
 #include <libcockatrice/network/client/abstract/latency_tracker.h>
-#include <qtmetamacros.h>
 
 class QLabel;
 class LatencyGraphWidget;

cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp

@@ -8,25 +8,14 @@
 #include "../interface/widgets/dialogs/dlg_forgot_password_reset.h"
 #include "../interface/widgets/dialogs/dlg_register.h"
 #include "../interface/widgets/utility/get_text_with_max.h"
-#include "libcockatrice/protocol/pb/event_connection_closed.pb.h"
-#include "libcockatrice/protocol/pb/event_server_shutdown.pb.h"
 
-#include <QChar>
 #include <QDateTime>
-#include <QDebug>
 #include <QLineEdit>
-#include <QList>
 #include <QMessageBox>
-#include <QPixmap>
-#include <QStringList>
-#include <QStringLiteral>
 #include <QThread>
 #include <libcockatrice/network/client/remote/remote_client.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/settings/servers_settings.h>
-#include <qnamespace.h>
-
-class QWidget;
 
 ConnectionController::ConnectionController(QWidget *dialogParent, QObject *parent)
     : QObject(parent), dialogParent(dialogParent)

cockatrice/src/client/network/connection_controller/remote_connection_controller.h

@@ -2,22 +2,17 @@
 #define COCKATRICE_REMOTE_CONNECTION_CONTROLLER_H
 
 #include "abstract_client.h"
-#include "latency_tracker.h"
 
 #include <QMessageBox>
 #include <QObject>
 #include <QString>
-#include <QtGlobal>
-#include <qtmetamacros.h>
+#include <QThread>
+#include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
+#include <libcockatrice/protocol/pb/event_server_shutdown.pb.h>
 
 class RemoteClient;
 class ServerInfo_User;
 class DlgConnect;
-class Event_ConnectionClosed;
-class Event_ServerShutdown;
-class QThread;
-class QWidget;
-template <typename T> class QList;
 
 /**
  * Owns the RemoteClient and its worker thread.

cockatrice/src/client/network/interfaces/deck_stats_interface.cpp

@@ -1,22 +1,11 @@
 #include "deck_stats_interface.h"
 
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
-
-#include <QByteArray>
 #include <QDesktopServices>
 #include <QMessageBox>
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QSharedPointer>
-#include <QString>
-#include <QUrl>
 #include <QUrlQuery>
-#include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>

cockatrice/src/client/network/interfaces/deck_stats_interface.h

@@ -7,8 +7,7 @@
 #ifndef DECKSTATS_INTERFACE_H
 #define DECKSTATS_INTERFACE_H
 
-#include <QObject>
-#include <qtmetamacros.h>
+#include <libcockatrice/deck_list/deck_list.h>
 
 class QByteArray;
 class QNetworkAccessManager;

cockatrice/src/client/network/interfaces/tapped_out_interface.cpp

@@ -1,28 +1,11 @@
 #include "tapped_out_interface.h"
 
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
-
-#include <QByteArray>
-#include <QDebug>
 #include <QDesktopServices>
-#include <QList>
 #include <QMessageBox>
-#include <QMessageLogger>
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QRegularExpressionMatchIterator>
-#include <QSharedPointer>
-#include <QString>
-#include <QStringList>
-#include <QUrl>
 #include <QUrlQuery>
-#include <QVariant>
-#include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/tree/deck_list_card_node.h>

cockatrice/src/client/network/interfaces/tapped_out_interface.h

@@ -9,7 +9,6 @@
 
 #include <QLoggingCategory>
 #include <QObject>
-#include <qtmetamacros.h>
 
 inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface");
 

cockatrice/src/client/network/parsers/deck_link_to_api_transformer.cpp

@@ -1,7 +1,6 @@
 #include "deck_link_to_api_transformer.h"
 
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
 
 namespace DeckLinkToApiTransformer
 {

cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp

@@ -1,36 +1,21 @@
 #include "spoiler_background_updater.h"
 
+#include "../../../../interface/window_main.h"
 #include "../../../../main.h"
 #include "../../../settings/cache_settings.h"
 
-#include <QChar>
 #include <QCryptographicHash>
 #include <QDateTime>
 #include <QDebug>
-#include <QDir>
 #include <QFile>
-#include <QFileInfo>
-#include <QFutureWatcher>
-#include <QIODevice>
-#include <QList>
 #include <QLocale>
-#include <QMessageLogger>
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QSharedPointer>
-#include <QSystemTrayIcon>
-#include <QTimeZone>
 #include <QUrl>
-#include <QtConcurrentRun>
-#include <QtGlobal>
-#include <functional>
+#include <QtConcurrent>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/settings/download_settings.h>
 #include <libcockatrice/settings/paths_settings.h>
-#include <tuple>
-#include <utility>
 #include <version_string.h>
 
 #define SPOILERS_STATUS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/SpoilerSeasonEnabled"
@@ -178,15 +163,7 @@ bool SpoilerBackgroundUpdater::saveDownloadedFile(QByteArray data)
 
     // Data written, so reload the card database
     qCInfo(SpoilerBackgroundUpdaterLog) << "Spoiler Service Data Written";
-    // Spoilers can introduce sets the config has never seen; the loader never
-    // runs checkUnknownSets() itself, so run it once the finished snapshot has
-    // been swapped in.
-    auto *watcher = new QFutureWatcher<void>(this);
-    connect(watcher, &QFutureWatcher<void>::finished, this, [watcher] {
-        watcher->deleteLater();
-        CardDatabaseManager::getInstance()->checkUnknownSets();
-    });
-    watcher->setFuture(QtConcurrent::run([] { CardDatabaseManager::getInstance()->loadCardDatabases(); }));
+    const auto reloadOk = QtConcurrent::run([] { CardDatabaseManager::getInstance()->loadCardDatabases(); });
 
     // If the user has notifications enabled, let them know
     // when the database was last updated

cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.h

@@ -10,11 +10,7 @@
 #include <QByteArray>
 #include <QLoggingCategory>
 #include <QObject>
-#include <QString>
-#include <qtmetamacros.h>
-
-class QProcess;
-class QUrl;
+#include <QProcess>
 
 inline Q_LOGGING_CATEGORY(SpoilerBackgroundUpdaterLog, "spoiler_background_updater");
 

cockatrice/src/client/network/update/client/client_update_checker.h

@@ -6,12 +6,9 @@
 
 #ifndef CLIENT_UPDATE_CHECKER_H
 #define CLIENT_UPDATE_CHECKER_H
-#include "release_channel.h"
-
-#include <QMetaObject>
 #include <QObject>
-#include <QString>
-#include <qtmetamacros.h>
+
+class Release;
 
 /**
  * We use a singleton instance of UpdateChannel, which can cause interference and feedback loops when multiple objects

cockatrice/src/client/network/update/client/release_channel.cpp

@@ -2,27 +2,15 @@
 
 #include "version_string.h"
 
-#include <QByteArray>
-#include <QDebug>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonParseError>
-#include <QJsonValue>
-#include <QMap>
-#include <QMessageLogger>
-#include <QNetworkAccessManager>
+#include <QMessageBox>
 #include <QNetworkReply>
-#include <QNetworkRequest>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QUrl>
-#include <QVariant>
-#include <QVariantMap>
+#include <QSysInfo>
 #include <QtGlobal>
 #include <optional>
-#include <qnamespace.h>
-#include <qprocessordetection.h>
 
 #if defined(Q_OS_MACOS)
 #include <sys/sysctl.h>

cockatrice/src/client/network/update/client/release_channel.h

@@ -11,9 +11,8 @@
 #include <QLoggingCategory>
 #include <QObject>
 #include <QString>
-#include <QVariantList>
+#include <QVariantMap>
 #include <optional>
-#include <qtmetamacros.h>
 #include <utility>
 
 inline Q_LOGGING_CATEGORY(ReleaseChannelLog, "release_channel");

cockatrice/src/client/network/update/client/update_downloader.cpp

@@ -1,14 +1,6 @@
 #include "update_downloader.h"
 
-#include <QByteArray>
-#include <QChar>
-#include <QDir>
-#include <QFile>
-#include <QIODevice>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
 #include <QUrl>
-#include <QVariant>
 
 UpdateDownloader::UpdateDownloader(QObject *parent) : QObject(parent), response(nullptr)
 {

cockatrice/src/client/network/update/client/update_downloader.h

@@ -7,14 +7,8 @@
 #ifndef COCKATRICE_UPDATEDOWNLOADER_H
 #define COCKATRICE_UPDATEDOWNLOADER_H
 
-#include <QNetworkReply>
 #include <QObject>
-#include <QString>
-#include <QUrl>
-#include <QtGlobal>
-#include <qtmetamacros.h>
-
-class QNetworkAccessManager;
+#include <QtNetwork>
 
 class UpdateDownloader : public QObject
 {

cockatrice/src/client/settings/cache_settings.cpp

@@ -2,20 +2,15 @@
 
 #include "../network/update/client/release_channel.h"
 #include "card_counter_settings.h"
-#include "libcockatrice/interfaces/interface_card_database_path_provider.h"
 #include "shortcuts_settings.h"
+#include "version_string.h"
 
-#include <QApplication>
 #include <QDebug>
 #include <QDir>
 #include <QFile>
 #include <QGlobalStatic>
-#include <QMessageLogger>
 #include <QSettings>
-#include <QSharedPointer>
 #include <QStandardPaths>
-#include <QVariant>
-#include <QtGlobal>
 #include <libcockatrice/settings/appearance_settings.h>
 #include <libcockatrice/settings/cache_storage_settings.h>
 #include <libcockatrice/settings/card_database_settings.h>
@@ -133,10 +128,6 @@ SettingsCache::SettingsCache()
     // Migrate settings from global.ini to per-class INI files (runs at most once)
     SettingsMigration::migrateSettingsFromGlobalIni(settingsPath);
 
-    // Repair gamefilters.ini keys renamed to camelCase by #7084 for profiles that migrated
-    // before that rename (idempotent, safe to run on every startup, portable builds included).
-    SettingsMigration::migrateGameFiltersToCamelCase(settingsPath);
-
     shortcutsSettings = new ShortcutsSettings(settingsPath, this);
     cardDatabaseSettings = new CardDatabaseSettings(settingsPath, this);
     serversSettings = new ServersSettings(settingsPath, this);

cockatrice/src/client/settings/cache_settings.h

@@ -7,13 +7,11 @@
 #ifndef SETTINGSCACHE_H
 #define SETTINGSCACHE_H
 
-#include <QList>
 #include <QLoggingCategory>
-#include <QString>
 #include <QStringList>
 #include <libcockatrice/interfaces/interface_card_database_path_provider.h>
 #include <libcockatrice/interfaces/interface_network_settings_provider.h>
-#include <qtmetamacros.h>
+#include <libcockatrice/utility/macros.h>
 
 inline Q_LOGGING_CATEGORY(SettingsCacheLog, "settings_cache");
 

cockatrice/src/client/settings/card_counter_settings.cpp

@@ -1,15 +1,8 @@
 #include "card_counter_settings.h"
 
-#include "libcockatrice/settings/settings_manager.h"
-
-#include <QChar>
 #include <QColor>
 #include <QSettings>
-#include <QVariant>
 #include <QtMath>
-#include <iterator>
-
-class QObject;
 
 CardCounterSettings::CardCounterSettings(const QString &settingsPath, QObject *parent)
     : SettingsManager(settingsPath + "card_counters.ini", "cards", "counters", parent)

cockatrice/src/client/settings/card_counter_settings.h

@@ -7,12 +7,10 @@
 #ifndef CARD_COUNTER_SETTINGS_H
 #define CARD_COUNTER_SETTINGS_H
 
-#include <QString>
 #include <libcockatrice/settings/settings_manager.h>
-#include <qtmetamacros.h>
 
+class QSettings;
 class QColor;
-class QObject;
 
 class CardCounterSettings : public SettingsManager
 {

cockatrice/src/client/settings/shortcut_treeview.cpp

@@ -3,24 +3,7 @@
 #include "cache_settings.h"
 #include "shortcuts_settings.h"
 
-#include <QAbstractItemModel>
-#include <QAbstractItemView>
-#include <QFont>
-#include <QHash>
 #include <QHeaderView>
-#include <QList>
-#include <QModelIndex>
-#include <QRegularExpression>
-#include <QSharedPointer>
-#include <QStandardItem>
-#include <QStandardItemModel>
-#include <QStringList>
-#include <QVariant>
-#include <algorithm>
-#include <qnamespace.h>
-
-class QObject;
-class QWidget;
 
 ShortcutFilterProxyModel::ShortcutFilterProxyModel(QObject *parent) : QSortFilterProxyModel(parent)
 {

cockatrice/src/client/settings/shortcut_treeview.h

@@ -8,13 +8,8 @@
 #define SHORTCUT_TREEVIEW_H
 
 #include <QSortFilterProxyModel>
-#include <QString>
+#include <QStandardItemModel>
 #include <QTreeView>
-#include <qtmetamacros.h>
-
-class QObject;
-class QStandardItemModel;
-class QWidget;
 
 /**
  * Custom implementation of QSortFilterProxyModel that appends the source and parent strings together when filtering

cockatrice/src/client/settings/shortcuts_settings.cpp

@@ -2,13 +2,9 @@
 
 #include <QDebug>
 #include <QFile>
-#include <QMap>
 #include <QMessageBox>
-#include <QMessageLogger>
-#include <QSettings>
-#include <QSharedPointer>
 #include <QStringList>
-#include <QVariant>
+#include <utility>
 
 ShortcutKey::ShortcutKey(const QString &_name, QList<QKeySequence> _sequence, ShortcutGroup::Groups _group)
     : QList<QKeySequence>(_sequence), name(_name), group(_group)

cockatrice/src/client/settings/shortcuts_settings.h

@@ -8,18 +8,9 @@
 #define SHORTCUTSSETTINGS_H
 
 #include <QApplication>
-#include <QByteArray>
-#include <QChar>
-#include <QHash>
 #include <QKeySequence>
-#include <QList>
 #include <QLoggingCategory>
-#include <QObject>
-#include <QString>
-#include <QStringList>
-#include <QtGlobal>
-#include <qtmetamacros.h>
-#include <utility>
+#include <QSettings>
 
 inline Q_LOGGING_CATEGORY(ShortcutsSettingsLog, "shortcuts_settings");
 

cockatrice/src/client/sound_engine.cpp

@@ -4,15 +4,8 @@
 
 #include <QApplication>
 #include <QAudioOutput>
-#include <QDebug>
 #include <QDir>
-#include <QFile>
-#include <QList>
 #include <QMediaPlayer>
-#include <QMessageLogger>
-#include <QStringList>
-#include <QUrl>
-#include <QtGlobal>
 #include <libcockatrice/settings/sound_settings.h>
 
 #define DEFAULT_THEME_NAME "Default"

cockatrice/src/client/sound_engine.h

@@ -7,17 +7,17 @@
 #ifndef SOUNDENGINE_H
 #define SOUNDENGINE_H
 
+#include <QAudioOutput>
 #include <QLoggingCategory>
 #include <QMap>
+#include <QMediaPlayer>
 #include <QObject>
 #include <QString>
-#include <qtmetamacros.h>
-
-class QAudioOutput;
-class QMediaPlayer;
 
 inline Q_LOGGING_CATEGORY(SoundEngineLog, "sound_engine");
 
+class QBuffer;
+
 typedef QMap<QString, QString> QStringMap;
 
 class SoundEngine : public QObject

cockatrice/src/database/interface/settings_card_preference_provider.h

@@ -13,6 +13,11 @@ public:
     {
         return SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardName);
     }
+
+    [[nodiscard]] bool getIncludeRebalancedCards() const override
+    {
+        return SettingsCache::instance().cardsDisplay().getIncludeRebalancedCards();
+    }
 };
 
 #endif // COCKATRICE_SETTINGS_CARD_PREFERENCE_PROVIDER_H

cockatrice/src/filters/deck_filter_string.cpp

@@ -1,27 +1,9 @@
 #include "deck_filter_string.h"
 
-#include "../interface/deck_loader/loaded_deck.h"
-#include "libcockatrice/card/card_localization.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/deck_list/deck_list.h"
-#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
-
-#include <QByteArray>
-#include <QDebug>
 #include <QFileInfo>
-#include <QList>
-#include <QMessageLogger>
-#include <QSharedPointer>
-#include <algorithm>
-#include <any>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/filters/filter_string.h>
 #include <libcockatrice/utility/peglib.h>
-#include <mutex>
-#include <qnamespace.h>
-#include <stddef.h>
-#include <string>
-#include <vector>
 
 static peg::parser search(R"(
 Start <- QueryPartList

cockatrice/src/filters/deck_filter_string.h

@@ -7,14 +7,13 @@
 #ifndef DECK_FILTER_STRING_H
 #define DECK_FILTER_STRING_H
 
+#include "../interface/deck_loader/loaded_deck.h"
+
 #include <QLoggingCategory>
 #include <QString>
 #include <functional>
 #include <libcockatrice/card/card_localization.h>
 
-struct CardSearchLanguage;
-struct LoadedDeck;
-
 inline Q_LOGGING_CATEGORY(DeckFilterStringLog, "deck_filter_string");
 
 /**

cockatrice/src/filters/filter_builder.cpp

@@ -5,15 +5,8 @@
 
 #include <QComboBox>
 #include <QGridLayout>
-#include <QIcon>
 #include <QPushButton>
-#include <QSizePolicy>
-#include <QString>
-#include <QStringLiteral>
-#include <QVariant>
-#include <QtGlobal>
 #include <libcockatrice/filters/filter_card.h>
-#include <stddef.h>
 
 FilterBuilder::FilterBuilder(QWidget *parent) : QWidget(parent)
 {

cockatrice/src/filters/filter_builder.h

@@ -8,8 +8,8 @@
 #define FILTERBUILDER_H
 
 #include <QWidget>
-#include <qtmetamacros.h>
 
+class QCheckBox;
 class QComboBox;
 class LineEditUnfocusable;
 class CardFilter;

cockatrice/src/filters/filter_tree_model.cpp

@@ -1,15 +1,8 @@
 #include "filter_tree_model.h"
 
-#include <QFlags>
 #include <QFont>
-#include <QString>
-#include <QVariant>
-#include <functional>
 #include <libcockatrice/filters/filter_card.h>
 #include <libcockatrice/filters/filter_tree.h>
-#include <stddef.h>
-
-class QObject;
 
 FilterTreeModel::FilterTreeModel(QObject *parent) : QAbstractItemModel(parent)
 {

cockatrice/src/filters/filter_tree_model.h

@@ -8,15 +8,11 @@
 #define FILTERTREEMODEL_H
 
 #include <QAbstractItemModel>
-#include <QList>
-#include <QModelIndex>
 #include <libcockatrice/filters/filter_card.h>
-#include <qnamespace.h>
-#include <qtmetamacros.h>
 
 class FilterTree;
+class CardFilter;
 class FilterTreeNode;
-class QObject;
 
 class FilterTreeModel : public QAbstractItemModel
 {

cockatrice/src/filters/syntax_help.cpp

@@ -1,21 +1,8 @@
 #include "syntax_help.h"
 
-#include <QDebug>
 #include <QFile>
-#include <QFlags>
-#include <QIODevice>
-#include <QLineEdit>
-#include <QMessageLogger>
-#include <QObject>
 #include <QRegularExpression>
-#include <QSharedPointer>
-#include <QSize>
-#include <QString>
-#include <QTextBrowser>
-#include <QTextDocument>
 #include <QTextStream>
-#include <QUrl>
-#include <qnamespace.h>
 
 /**
  * Creates the card search syntax help window

cockatrice/src/filters/syntax_help.h

@@ -8,10 +8,9 @@
 #ifndef SEARCH_SYNTAX_HELP_H
 #define SEARCH_SYNTAX_HELP_H
 
+#include <QLineEdit>
 #include <QLoggingCategory>
-
-class QLineEdit;
-class QTextBrowser;
+#include <QTextBrowser>
 
 inline Q_LOGGING_CATEGORY(SyntaxHelpLog, "syntax_help");
 

cockatrice/src/game/abstract_game.cpp

@@ -1,18 +1,7 @@
 #include "abstract_game.h"
 
-#include "game_event_handler.h"
-#include "game_meta_info.h"
-#include "game_state.h"
-#include "libcockatrice/protocol/pb/game_replay.pb.h"
-#include "player/player_info.h"
+#include "../interface/widgets/tabs/tab_game.h"
 #include "player/player_logic.h"
-#include "player/player_manager.h"
-#include "zones/card_zone_logic.h"
-
-#include <QList>
-#include <QMap>
-
-class AbstractClient;
 
 AbstractGame::AbstractGame(QObject *_parent) : QObject(_parent)
 {

cockatrice/src/game/abstract_game.h

@@ -7,18 +7,15 @@
 #ifndef COCKATRICE_ABSTRACT_GAME_H
 #define COCKATRICE_ABSTRACT_GAME_H
 
+#include "game_event_handler.h"
+#include "game_meta_info.h"
+#include "game_state.h"
+#include "player/player_manager.h"
+
 #include <QObject>
-#include <QString>
-#include <qtmetamacros.h>
+#include <libcockatrice/protocol/pb/game_replay.pb.h>
 
 class CardItem;
-class AbstractClient;
-class GameEventHandler;
-class GameMetaInfo;
-class GameReplay;
-class GameState;
-class PlayerManager;
-
 class AbstractGame : public QObject
 {
     Q_OBJECT

cockatrice/src/game/arrow_registry.cpp

@@ -1,9 +1,6 @@
 #include "arrow_registry.h"
 
 #include "../game_graphics/board/arrow_item.h"
-#include "board/arrow_data.h"
-
-#include <QSharedPointer>
 
 void ArrowRegistry::insert(QSharedPointer<ArrowData> data, ArrowItem *arrow)
 {

cockatrice/src/game/arrow_registry.h

@@ -1,13 +1,13 @@
 #ifndef COCKATRICE_ARROW_REGISTRY_H
 #define COCKATRICE_ARROW_REGISTRY_H
 
-#include <QList>
+#include "board/arrow_data.h"
+
 #include <QMap>
 #include <QSet>
+#include <QSharedPointer>
 
 class ArrowItem;
-struct ArrowData;
-template <class T> class QSharedPointer;
 
 struct ArrowKey
 {

cockatrice/src/game/board/arrow_data.cpp

@@ -1,8 +1,5 @@
 #include "arrow_data.h"
 
-#include "libcockatrice/protocol/pb/serverinfo_arrow.pb.h"
-#include "libcockatrice/utility/color.h"
-
 ArrowData ArrowData::fromProto(const ServerInfo_Arrow &arrow, int creatorId, bool isLocalCreator)
 {
     ArrowData data;

cockatrice/src/game/board/arrow_data.h

@@ -3,8 +3,8 @@
 
 #include <QColor>
 #include <QString>
-
-class ServerInfo_Arrow;
+#include <libcockatrice/protocol/pb/serverinfo_arrow.pb.h>
+#include <libcockatrice/utility/color.h>
 
 struct ArrowData
 {

cockatrice/src/game/board/card_list.cpp

@@ -1,14 +1,9 @@
 #include "card_list.h"
 
 #include "../../game_graphics/board/card_item.h"
-#include "libcockatrice/card/printing/exact_card.h"
 
-#include <QChar>
 #include <QDebug>
-#include <QMessageLogger>
-#include <QSharedPointer>
 #include <algorithm>
-#include <compare>
 #include <libcockatrice/card/card_info.h>
 
 CardList::CardList(bool _contentsKnown) : QList<CardItem *>(), contentsKnown(_contentsKnown)

cockatrice/src/game/board/card_list.h

@@ -9,8 +9,6 @@
 
 #include <QList>
 #include <QLoggingCategory>
-#include <QString>
-#include <functional>
 
 inline Q_LOGGING_CATEGORY(CardListLog, "card_list");
 

cockatrice/src/game/board/card_state.cpp

@@ -1,7 +1,5 @@
 #include "card_state.h"
 
-#include <QSharedPointer>
-
 void CardState::resetState(bool keepAnnotations)
 {
     attacking = false;

cockatrice/src/game/board/card_state.h

@@ -3,12 +3,9 @@
 
 #include <QMap>
 #include <QObject>
-#include <QString>
-#include <qtmetamacros.h>
 
 class CardZoneLogic;
 class CardItem;
-
 class CardState : public QObject
 {
     Q_OBJECT

cockatrice/src/game/board/counter_state.cpp

@@ -1,7 +1,5 @@
 #include "counter_state.h"
 
-#include "libcockatrice/protocol/pb/serverinfo_counter.pb.h"
-
 #include <libcockatrice/utility/color.h>
 
 CounterState::CounterState(int id, const QString &name, const QColor &color, int radius, int value, QObject *parent)

cockatrice/src/game/board/counter_state.h

@@ -4,9 +4,7 @@
 #include <QColor>
 #include <QObject>
 #include <QString>
-#include <qtmetamacros.h>
-
-class ServerInfo_Counter;
+#include <libcockatrice/protocol/pb/serverinfo_counter.pb.h>
 
 class CounterState : public QObject
 {

cockatrice/src/game/game.cpp

@@ -1,17 +1,9 @@
 #include "game.h"
 
-#include "game_meta_info.h"
-#include "game_state.h"
-#include "player/player_manager.h"
+#include "../interface/widgets/tabs/tab_game.h"
 
-#include <QList>
-#include <QMap>
-#include <QString>
 #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
 
-class AbstractClient;
-class QObject;
-
 Game::Game(QObject *_parent,
            bool isLocalGame,
            QList<AbstractClient *> &_clients,

cockatrice/src/game/game.h

@@ -9,14 +9,7 @@
 
 #include "abstract_game.h"
 
-#include <qtmetamacros.h>
-
-class AbstractClient;
-class Event_GameJoined;
-class QObject;
-class QString;
-template <class Key, class T> class QMap;
-template <typename T> class QList;
+#include <QObject>
 
 class Game : public AbstractGame
 {

cockatrice/src/game/game_event_handler.cpp

@@ -1,30 +1,9 @@
 #include "game_event_handler.h"
 
+#include "../game_graphics/log/message_log_widget.h"
+#include "../interface/widgets/tabs/tab_game.h"
 #include "abstract_game.h"
-#include "game_meta_info.h"
-#include "game_state.h"
-#include "libcockatrice/protocol/pb/commands.pb.h"
-#include "libcockatrice/protocol/pb/game_commands.pb.h"
-#include "libcockatrice/protocol/pb/game_event.pb.h"
-#include "libcockatrice/protocol/pb/game_event_context.pb.h"
-#include "libcockatrice/protocol/pb/response.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_game.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_player.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-#include "player/player_event_handler.h"
-#include "player/player_info.h"
-#include "player/player_logic.h"
-#include "player/player_manager.h"
 
-#include <QList>
-#include <QMap>
-#include <QMapIterator>
-#include <QMessageLogger>
-#include <QSharedPointer>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/stubs/port.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/protocol/pb/command_concede.pb.h>
@@ -34,6 +13,7 @@
 #include <libcockatrice/protocol/pb/command_next_turn.pb.h>
 #include <libcockatrice/protocol/pb/command_reverse_turn.pb.h>
 #include <libcockatrice/protocol/pb/command_set_active_phase.pb.h>
+#include <libcockatrice/protocol/pb/context_connection_state_changed.pb.h>
 #include <libcockatrice/protocol/pb/context_deck_select.pb.h>
 #include <libcockatrice/protocol/pb/event_game_closed.pb.h>
 #include <libcockatrice/protocol/pb/event_game_host_changed.pb.h>
@@ -48,8 +28,6 @@
 #include <libcockatrice/protocol/pb/event_set_active_player.pb.h>
 #include <libcockatrice/protocol/pb/game_event_container.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <string>
-#include <utility>
 
 GameEventHandler::GameEventHandler(AbstractGame *_game) : QObject(_game), game(_game)
 {
@@ -277,6 +255,8 @@ void GameEventHandler::eventSpectatorLeave(const Event_Leave &event,
     emit spectatorLeft(eventPlayerId);
 
     game->getPlayerManager()->removeSpectator(eventPlayerId);
+
+    emitUserEvent();
 }
 
 void GameEventHandler::eventGameStateChanged(const Event_GameStateChanged &event,
@@ -463,9 +443,9 @@ void GameEventHandler::eventJoin(const Event_Join &event, int /*eventPlayerId*/,
         PlayerLogic *newPlayer = game->getPlayerManager()->addPlayer(playerId, playerInfo.user_info());
         emit logJoinPlayer(newPlayer);
         emit playerJoined(playerInfo);
-
-        emitUserEvent();
     }
+
+    emitUserEvent();
 }
 
 QString GameEventHandler::getLeaveReason(Event_Leave::LeaveReason reason)

cockatrice/src/game/game_event_handler.h

@@ -19,29 +19,23 @@
 
 #include <QLoggingCategory>
 #include <QObject>
-#include <QPair>
-#include <QString>
-#include <QVector>
 #include <libcockatrice/protocol/pb/event_leave.pb.h>
-#include <qtmetamacros.h>
-
-// IWYU pragma: keep
-// GameEventContext, ServerInfo_Player and ServerInfo_User are passed by value
-// to signals and slots, so the moc-generated code needs the complete types.
-#include <libcockatrice/protocol/pb/game_event_context.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 class AbstractClient;
 class AbstractGame;
+class CommandContainer;
+class GameCommand;
 class GameEventContainer;
 class GameEventContext;
 class PendingCommand;
 class PlayerLogic;
 class Response;
+
 class Event_GameStateChanged;
 class Event_PlayerPropertiesChanged;
 class Event_Join;
+class Event_Leave;
 class Event_GameHostChanged;
 class Event_GameClosed;
 class Event_SetActivePlayer;
@@ -50,15 +44,6 @@ class Event_GameSay;
 class Event_Kicked;
 class Event_ReverseTurn;
 class Event_Ping;
-class ServerInfo_PlayerProperties;
-namespace google
-{
-namespace protobuf
-{
-class Message;
-} // namespace protobuf
-} // namespace google
-template <typename T> class QList;
 
 inline Q_LOGGING_CATEGORY(GameEventHandlerLog, "game_event_handler");
 

cockatrice/src/game/game_meta_info.h

@@ -9,16 +9,13 @@
 
 #include <QMap>
 #include <QObject>
-#include <QString>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
-#include <qtmetamacros.h>
 
 // Translation layer class to expose protobuf safely and hook it up to Qt Signals.
 // This class de-couples the domain object (i.e. the GameMetaInfo) from the network object.
 // If the network object changes, only this class needs to be adjusted.
 
 class AbstractGame;
-
 class GameMetaInfo : public QObject
 {
     Q_OBJECT

cockatrice/src/game/game_state.cpp

@@ -2,11 +2,6 @@
 
 #include "abstract_game.h"
 
-#include <QChar>
-#include <QTimer>
-
-class AbstractClient;
-
 GameState::GameState(AbstractGame *parent,
                      int _secondsElapsed,
                      int _hostId,

cockatrice/src/game/game_state.h

@@ -7,14 +7,12 @@
 #ifndef COCKATRICE_GAME_STATE_H
 #define COCKATRICE_GAME_STATE_H
 
-#include <QList>
-#include <QObject>
-#include <QString>
-#include <qtmetamacros.h>
+#include <QTimer>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
 
 class AbstractGame;
-class AbstractClient;
-class QTimer;
+class ServerInfo_PlayerProperties;
+class ServerInfo_User;
 
 class GameState : public QObject
 {

cockatrice/src/game/phase.cpp

@@ -1,10 +1,5 @@
 #include "phase.h"
 
-#include <QByteArray>
-#include <QList>
-#include <QSharedPointer>
-#include <QtGlobal>
-
 Phase::Phase(const QString &_name, const QString &_color, const QString &_soundFileName)
     : name(_name), color(_color), soundFileName(_soundFileName)
 {

cockatrice/src/game/phase.h

@@ -7,9 +7,8 @@
 #ifndef PHASE_H
 #define PHASE_H
 
-#include <QCoreApplication>
+#include <QApplication>
 #include <QString>
-#include <QVector>
 
 class Phase
 {

cockatrice/src/game/player/player_actions.cpp

@@ -1,54 +1,14 @@
 #include "player_actions.h"
 
-#include "../../client/settings/cache_settings.h"
-#include "../../game_graphics/board/card_item.h"
-#include "../../game_graphics/dialogs/dlg_create_token.h"
 #include "../../game_graphics/dialogs/dlg_move_top_cards_until.h"
+#include "../../game_graphics/dialogs/dlg_roll_dice.h"
 #include "../../game_graphics/player/card_menu_action_type.h"
+#include "../../game_graphics/zones/hand_zone.h"
 #include "../../game_graphics/zones/table_zone.h"
-#include "../../interface/deck_loader/loaded_deck.h"
-#include "../abstract_game.h"
-#include "../board/counter_state.h"
-#include "../game_event_handler.h"
-#include "../zones/card_zone_logic.h"
-#include "../zones/hand_zone_logic.h"
-#include "../zones/pile_zone_logic.h"
-#include "../zones/table_zone_logic.h"
+#include "../../interface/widgets/tabs/tab_game.h"
+#include "../../interface/widgets/utility/get_text_with_max.h"
 #include "../zones/view_zone_logic.h"
-#include "libcockatrice/card/database/card_database_querier.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/card/printing/printing_info.h"
-#include "libcockatrice/card/relation/card_relation_type.h"
-#include "libcockatrice/deck_list/deck_list.h"
-#include "libcockatrice/filters/filter_string.h"
-#include "libcockatrice/protocol/pb/card_attributes.pb.h"
-#include "libcockatrice/protocol/pb/game_commands.pb.h"
-#include "libcockatrice/settings/cards_display_settings.h"
-#include "player_info.h"
-#include "player_logic.h"
 
-#include <QAction>
-#include <QChar>
-#include <QColor>
-#include <QFlags>
-#include <QInputDialog>
-#include <QKeyEvent>
-#include <QList>
-#include <QMap>
-#include <QMapIterator>
-#include <QMetaType>
-#include <QPoint>
-#include <QPointF>
-#include <QSharedPointer>
-#include <QTimer>
-#include <QVariant>
-#include <QVariantList>
-#include <QtGlobal>
-#include <algorithm>
-#include <functional>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/stubs/port.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/protocol/pb/command_attach_card.pb.h>
@@ -66,16 +26,13 @@
 #include <libcockatrice/protocol/pb/command_set_card_counter.pb.h>
 #include <libcockatrice/protocol/pb/command_shuffle.pb.h>
 #include <libcockatrice/protocol/pb/command_undo_draw.pb.h>
+#include <libcockatrice/protocol/pb/context_move_card.pb.h>
 #include <libcockatrice/settings/card_override_settings.h>
 #include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/clamped_arithmetic.h>
 #include <libcockatrice/utility/counter_limits.h>
 #include <libcockatrice/utility/expression.h>
 #include <libcockatrice/utility/zone_names.h>
-#include <memory>
-#include <qnamespace.h>
-#include <qnumeric.h>
-#include <string>
 
 // milliseconds in between triggers of the move top cards until action
 static constexpr int MOVE_TOP_CARD_UNTIL_INTERVAL = 100;

cockatrice/src/game/player/player_actions.h

@@ -8,25 +8,17 @@
 #ifndef COCKATRICE_PLAYER_ACTIONS_H
 #define COCKATRICE_PLAYER_ACTIONS_H
 
-#include "../../game_graphics/board/card_item.h" // IWYU pragma: keep - moc instantiates the metatype for QList<CardItem *>, which Qt 6.4 needs complete
+#include "../../game_graphics/board/card_item.h"
 #include "../../game_graphics/dialogs/dlg_create_token.h"
 #include "../../game_graphics/dialogs/dlg_move_top_cards_until.h"
 #include "../../game_graphics/player/card_menu_action_type.h"
-#include "../board/card_list.h"
-#include "libcockatrice/card/card_info.h"
+#include "event_processing_options.h"
+#include "player_logic.h"
 
+#include <QMenu>
 #include <QObject>
-#include <QString>
-#include <QStringList>
 #include <libcockatrice/card/relation/card_relation_type.h>
 #include <libcockatrice/filters/filter_string.h>
-#include <qtmetamacros.h>
-
-class CardItem;
-class CardRelation;
-class QAction;
-class QTimer;
-template <typename T> class QList;
 
 namespace google
 {
@@ -37,9 +29,9 @@ class Message;
 } // namespace google
 
 class Command_MoveCard;
+class GameEventContext;
 class PendingCommand;
 class PlayerLogic;
-
 class PlayerActions : public QObject
 {
     Q_OBJECT

cockatrice/src/game/player/player_event_handler.cpp

@@ -1,32 +1,15 @@
 #include "player_event_handler.h"
 
+#include "../../game_graphics/board/arrow_item.h"
 #include "../../game_graphics/board/card_item.h"
 #include "../../game_graphics/zones/view_zone.h"
-#include "../abstract_game.h"
+#include "../../interface/widgets/tabs/tab_game.h"
 #include "../board/arrow_data.h"
 #include "../board/card_list.h"
-#include "../board/counter_state.h"
-#include "../zones/card_zone_logic.h"
-#include "../zones/hand_zone_logic.h"
-#include "../zones/pile_zone_logic.h"
-#include "libcockatrice/card/card_info.h"
-#include "libcockatrice/card/printing/exact_card.h"
-#include "libcockatrice/protocol/pb/card_attributes.pb.h"
-#include "libcockatrice/protocol/pb/game_event.pb.h"
-#include "libcockatrice/protocol/pb/game_event_context.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_card.pb.h"
-#include "libcockatrice/utility/card_ref.h"
 #include "player_actions.h"
-#include "player_info.h"
 #include "player_logic.h"
-#include "player_manager.h"
 
-#include <QDebug>
-#include <QList>
-#include <QMap>
-#include <QSharedPointer>
-#include <QtGlobal>
-#include <algorithm>
+#include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
 #include <libcockatrice/protocol/pb/context_move_card.pb.h>
 #include <libcockatrice/protocol/pb/context_undo_draw.pb.h>
 #include <libcockatrice/protocol/pb/event_attach_card.pb.h>
@@ -49,9 +32,8 @@
 #include <libcockatrice/protocol/pb/event_set_card_counter.pb.h>
 #include <libcockatrice/protocol/pb/event_set_counter.pb.h>
 #include <libcockatrice/protocol/pb/event_shuffle.pb.h>
+#include <libcockatrice/utility/color.h>
 #include <libcockatrice/utility/zone_names.h>
-#include <qlogging.h>
-#include <string>
 
 PlayerEventHandler::PlayerEventHandler(PlayerLogic *_player) : QObject(_player), player(_player)
 {

cockatrice/src/game/player/player_event_handler.h

@@ -22,14 +22,14 @@
 #include "event_processing_options.h"
 
 #include <QObject>
-#include <QString>
+#include <libcockatrice/protocol/pb/card_attributes.pb.h>
 #include <libcockatrice/protocol/pb/game_event.pb.h>
-#include <qtmetamacros.h>
-#include <sys/types.h>
+#include <libcockatrice/protocol/pb/game_event_context.pb.h>
 
 class CardItem;
 class CardZoneLogic;
 class PlayerLogic;
+
 class Event_AttachCard;
 class Event_ChangeZoneProperties;
 class Event_CreateArrow;
@@ -50,9 +50,6 @@ class Event_SetCardCounter;
 class Event_SetCounter;
 class Event_Shuffle;
 class Event_GameLogNotice;
-class GameEventContext;
-enum CardAttribute : int;
-template <typename T> class QList;
 
 /**
  * @class PlayerEventHandler

cockatrice/src/game/player/player_info.cpp

@@ -1,7 +1,5 @@
 #include "player_info.h"
 
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-
 PlayerInfo::PlayerInfo(const ServerInfo_User &info, int _id, bool _local, bool _judge)
     : id(_id), local(_local), judge(_judge)
 {

cockatrice/src/game/player/player_info.h

@@ -7,10 +7,10 @@
 #ifndef COCKATRICE_PLAYER_INFO_H
 #define COCKATRICE_PLAYER_INFO_H
 
+#include "../../game_graphics/player/player_target.h"
+
 #include <QObject>
-#include <QString>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <qtmetamacros.h>
 
 class PlayerInfo : public QObject
 {

cockatrice/src/game/player/player_logic.cpp

@@ -1,37 +1,33 @@
 #include "player_logic.h"
 
+#include "../../game_graphics/board/arrow_item.h"
 #include "../../game_graphics/board/card_item.h"
-#include "../abstract_game.h"
-#include "../board/arrow_data.h"
-#include "../board/counter_state.h"
-#include "../game_meta_info.h"
-#include "../zones/hand_zone_logic.h"
-#include "../zones/pile_zone_logic.h"
-#include "../zones/stack_zone_logic.h"
-#include "../zones/table_zone_logic.h"
-#include "libcockatrice/protocol/pb/serverinfo_card.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_counter.pb.h"
-#include "libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h"
-#include "libcockatrice/utility/zone_names.h"
+#include "../../game_graphics/board/counter_general.h"
+#include "../../game_graphics/game_scene.h"
+#include "../../game_graphics/player/player_target.h"
+#include "../../game_graphics/zones/hand_zone.h"
+#include "../../game_graphics/zones/pile_zone.h"
+#include "../../game_graphics/zones/stack_zone.h"
+#include "../../game_graphics/zones/table_zone.h"
+#include "../../interface/theme_manager.h"
+#include "../../interface/widgets/tabs/tab_game.h"
+#include "../board/card_list.h"
 #include "player_actions.h"
-#include "player_event_handler.h"
-#include "player_info.h"
-#include "player_manager.h"
 
 #include <QDebug>
-#include <QMapIterator>
-#include <QMessageLogger>
-#include <QMutableMapIterator>
-#include <QSet>
-#include <QSharedPointer>
-#include <QtGlobal>
+#include <QMenu>
+#include <QMetaType>
+#include <QPainter>
+#include <QtConcurrent>
+#include <libcockatrice/protocol/pb/command_attach_card.pb.h>
+#include <libcockatrice/protocol/pb/command_set_card_counter.pb.h>
+#include <libcockatrice/protocol/pb/event_create_arrow.pb.h>
+#include <libcockatrice/protocol/pb/event_create_counter.pb.h>
+#include <libcockatrice/protocol/pb/event_draw_cards.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_zone.pb.h>
-#include <libcockatrice/utility/card_ref.h>
 #include <libcockatrice/utility/color.h>
-#include <qalgorithms.h>
-#include <string>
 
 PlayerLogic::PlayerLogic(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent)
     : QObject(_parent), game(_parent), playerInfo(new PlayerInfo(info, _id, _local, _judge)),

cockatrice/src/game/player/player_logic.h

@@ -7,48 +7,57 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
-#include "../zones/card_zone_logic.h"
+#include "../../game_graphics/player/player_area.h"
+#include "../../interface/widgets/menus/tearoff_menu.h"
+#include "../board/arrow_data.h"
+#include "../interface/deck_loader/loaded_deck.h"
 #include "../zones/hand_zone_logic.h"
 #include "../zones/pile_zone_logic.h"
 #include "../zones/stack_zone_logic.h"
 #include "../zones/table_zone_logic.h"
-#include "libcockatrice/deck_list/deck_list.h"
-#include "libcockatrice/utility/card_ref.h"
-#include "libcockatrice/utility/playmat_params.h"
+#include "player_event_handler.h"
+#include "player_info.h"
+#include "player_manager.h"
 
-#include <QColor>
 #include <QInputDialog>
-#include <QList>
 #include <QLoggingCategory>
 #include <QMap>
-#include <QObject>
-#include <QString>
+#include <QTimer>
+#include <libcockatrice/filters/filter_string.h>
+#include <libcockatrice/protocol/pb/card_attributes.pb.h>
+#include <libcockatrice/protocol/pb/game_event.pb.h>
 #include <libcockatrice/utility/zone_names.h>
-#include <qtmetamacros.h>
-
-// IWYU pragma: keep
-// ServerInfo_Card appears inside QList<...> in signal and slot
-// signatures, which the moc-generated code needs to be complete.
-#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
-
-class CardItem;
-class CounterState;
-class QWidget;
-class ServerInfo_PlayerProperties;
-struct ArrowData;
-struct LoadedDeck;
-template <class T> class QSharedPointer;
 
 inline Q_LOGGING_CATEGORY(PlayerLog, "player");
+
+namespace google
+{
+namespace protobuf
+{
+class Message;
+}
+} // namespace google
 class AbstractCardItem;
 class AbstractGame;
+class ArrowItem;
+class ArrowTarget;
+class CardDatabase;
+class CardZone;
+class CommandContainer;
+class GameCommand;
+class GameEvent;
 class PlayerInfo;
 class PlayerEventHandler;
 class PlayerActions;
+class PlayerMenu;
+class QAction;
+class QMenu;
+class ServerInfo_Arrow;
 class ServerInfo_Card;
 class ServerInfo_Counter;
 class ServerInfo_Player;
 class ServerInfo_User;
+class TabGame;
 
 const int MAX_TOKENS_PER_DIALOG = 99;
 

cockatrice/src/game/player/player_manager.cpp

@@ -1,14 +1,8 @@
 #include "player_manager.h"
 
 #include "../abstract_game.h"
-#include "../game_state.h"
-#include "player_info.h"
 #include "player_logic.h"
 
-#include <QList>
-#include <QMapIterator>
-#include <QSharedPointer>
-
 PlayerManager::PlayerManager(AbstractGame *_game,
                              int _localPlayerId,
                              bool _localPlayerIsJudge,

cockatrice/src/game/player/player_manager.h

@@ -7,17 +7,12 @@
 #ifndef COCKATRICE_PLAYER_MANAGER_H
 #define COCKATRICE_PLAYER_MANAGER_H
 
-#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
-
 #include <QMap>
 #include <QObject>
-#include <QString>
 #include <libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h>
-#include <qtmetamacros.h>
 
 class AbstractGame;
 class PlayerLogic;
-
 class PlayerManager : public QObject
 {
     Q_OBJECT

cockatrice/src/game/replay.cpp

@@ -1,13 +1,6 @@
 #include "replay.h"
 
-#include "game_meta_info.h"
-#include "game_state.h"
-#include "player/player_manager.h"
-
-#include <QList>
-
-class GameReplay;
-class QObject;
+#include "../interface/widgets/tabs/tab_game.h"
 
 Replay::Replay(QObject *_parent, const GameReplay *_replay, bool isLocalGame) : AbstractGame(_parent)
 {

cockatrice/src/game/replay.h

@@ -10,11 +10,6 @@
 
 #include "abstract_game.h"
 
-#include <qtmetamacros.h>
-
-class GameReplay;
-class QObject;
-
 class Replay : public AbstractGame
 {
     Q_OBJECT

cockatrice/src/game/zones/card_zone_logic.cpp

@@ -1,25 +1,16 @@
 #include "card_zone_logic.h"
 
-#include "../../client/translation.h"
 #include "../../game_graphics/board/card_item.h"
-#include "../../game_graphics/zones/card_zone.h"
 #include "../../game_graphics/zones/view_zone.h"
-#include "../board/card_list.h"
 #include "../player/player_actions.h"
-#include "../player/player_info.h"
 #include "../player/player_logic.h"
-#include "libcockatrice/card/database/card_database.h"
 #include "view_zone_logic.h"
 
 #include <QAction>
 #include <QDebug>
-#include <QMessageLogger>
-#include <QSharedPointer>
-#include <QVariant>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
 #include <libcockatrice/utility/zone_names.h>
-#include <string>
 
 /**
  * @param _player the player that the zone belongs to

cockatrice/src/game/zones/card_zone_logic.h

@@ -10,18 +10,17 @@
 #include "../../client/translation.h"
 #include "../board/card_list.h"
 
-#include <QList>
 #include <QLoggingCategory>
 #include <QObject>
-#include <QString>
-#include <qtmetamacros.h>
-
-class CardItem;
 
 inline Q_LOGGING_CATEGORY(CardZoneLogicLog, "card_zone_logic");
 
 class PlayerLogic;
 class ZoneViewZone;
+class QMenu;
+class QAction;
+class QPainter;
+class CardDragItem;
 
 class CardZoneLogic : public QObject
 {

cockatrice/src/game/zones/hand_zone_logic.cpp

@@ -3,9 +3,6 @@
 #include "../../game_graphics/board/card_item.h"
 #include "card_zone_algorithms.h"
 
-class PlayerLogic;
-class QObject;
-
 HandZoneLogic::HandZoneLogic(PlayerLogic *_player,
                              const QString &_name,
                              bool _hasCardAttr,

cockatrice/src/game/zones/hand_zone_logic.h

@@ -8,12 +8,6 @@
 #define COCKATRICE_HAND_ZONE_LOGIC_H
 #include "card_zone_logic.h"
 
-#include <QString>
-#include <qtmetamacros.h>
-
-class PlayerLogic;
-class QObject;
-
 class HandZoneLogic : public CardZoneLogic
 {
     Q_OBJECT

cockatrice/src/game/zones/pile_zone_logic.cpp

@@ -1,10 +1,6 @@
 #include "pile_zone_logic.h"
 
 #include "../../game_graphics/board/card_item.h"
-#include "../board/card_list.h"
-
-class PlayerLogic;
-class QObject;
 
 PileZoneLogic::PileZoneLogic(PlayerLogic *_player,
                              const QString &_name,

cockatrice/src/game/zones/pile_zone_logic.h

@@ -8,12 +8,6 @@
 #define COCKATRICE_PILE_ZONE_LOGIC_H
 #include "card_zone_logic.h"
 
-#include <QString>
-#include <qtmetamacros.h>
-
-class PlayerLogic;
-class QObject;
-
 class PileZoneLogic : public CardZoneLogic
 {