From ed1262cab9fbc0bcf8fbadc417f207944cb571a7 Mon Sep 17 00:00:00 2001
From: Peter Nelson <peter1138@openttd.org>
Date: Thu, 7 Aug 2025 09:21:44 +0100
Subject: [PATCH] Codefix: Move provider instances to static members. (#14501)

Avoids misnaming in global scope.
---
 src/screenshot_bmp.cpp   | 5 ++++-
 src/screenshot_pcx.cpp   | 5 ++++-
 src/screenshot_png.cpp   | 5 ++++-
 src/soundloader_opus.cpp | 5 ++++-
 src/soundloader_raw.cpp  | 5 ++++-
 src/soundloader_wav.cpp  | 5 ++++-
 6 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/screenshot_bmp.cpp b/src/screenshot_bmp.cpp
index a47058bc15..6ad3c8dd98 100644
--- a/src/screenshot_bmp.cpp
+++ b/src/screenshot_bmp.cpp
@@ -145,6 +145,9 @@ public:
 
 		return true;
 	}
+
+private:
+	static ScreenshotProvider_Bmp instance;
 };
 
-static ScreenshotProvider_Bmp s_screenshot_provider_bmp;
+/* static */ ScreenshotProvider_Bmp ScreenshotProvider_Bmp::instance{};
diff --git a/src/screenshot_pcx.cpp b/src/screenshot_pcx.cpp
index 7e9b1f89d3..e3c4c70441 100644
--- a/src/screenshot_pcx.cpp
+++ b/src/screenshot_pcx.cpp
@@ -149,6 +149,9 @@ public:
 
 		return success;
 	}
+
+private:
+	static ScreenshotProvider_Pcx instance;
 };
 
-static const ScreenshotProvider_Pcx s_screenshot_provider_pcx;
+/* static */ ScreenshotProvider_Pcx ScreenshotProvider_Pcx::instance{};
diff --git a/src/screenshot_png.cpp b/src/screenshot_png.cpp
index 9c526de1e4..c0c868bbe0 100644
--- a/src/screenshot_png.cpp
+++ b/src/screenshot_png.cpp
@@ -177,6 +177,9 @@ private:
 	{
 		Debug(misc, 1, "[libpng] warning: {} - {}", message, *static_cast<std::string_view *>(png_get_error_ptr(png_ptr)));
 	}
+
+private:
+	static ScreenshotProvider_Png instance;
 };
 
-static ScreenshotProvider_Png s_screenshot_provider_png;
+/* static */ ScreenshotProvider_Png ScreenshotProvider_Png::instance{};
diff --git a/src/soundloader_opus.cpp b/src/soundloader_opus.cpp
index 5cf92c571c..7bb924e9bc 100644
--- a/src/soundloader_opus.cpp
+++ b/src/soundloader_opus.cpp
@@ -83,6 +83,9 @@ public:
 
 		return true;
 	}
+
+private:
+	static SoundLoader_Opus instance;
 };
 
-static SoundLoader_Opus s_sound_loader_opus;
+/* static */ SoundLoader_Opus SoundLoader_Opus::instance{};
diff --git a/src/soundloader_raw.cpp b/src/soundloader_raw.cpp
index a1d71ed035..7caaf52905 100644
--- a/src/soundloader_raw.cpp
+++ b/src/soundloader_raw.cpp
@@ -47,6 +47,9 @@ public:
 
 		return true;
 	}
+
+private:
+	static SoundLoader_Raw instance;
 };
 
-static SoundLoader_Raw s_sound_loader_raw;
+/* static */ SoundLoader_Raw SoundLoader_Raw::instance{};
diff --git a/src/soundloader_wav.cpp b/src/soundloader_wav.cpp
index d8d915cc6b..36897aab73 100644
--- a/src/soundloader_wav.cpp
+++ b/src/soundloader_wav.cpp
@@ -96,6 +96,9 @@ public:
 
 		return false;
 	}
+
+private:
+	static SoundLoader_Wav instance;
 };
 
-static SoundLoader_Wav s_sound_loader_wav;
+/* static */ SoundLoader_Wav SoundLoader_Wav::instance{};