Renamed SDL_Pixels -> SDL_PixelAccess due to similar SDL header

2025-10-31 00:07:39 +02:00 · 2023-01-30 20:06:08 +02:00
parent 9c3030603d
commit 5cc23cc286
9 changed files with 6 additions and 9 deletions
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -111,7 +111,7 @@ set(client_HEADERS
 		gui/Fonts.h
 		gui/TextAlignment.h
 		gui/SDL_Extensions.h
-		gui/SDL_Pixels.h
+		gui/SDL_PixelAccess.h
 		gui/NotificationHandler.h
 		gui/InterfaceObjectConfigurable.h

--- a/client/gui/CAnimation.cpp
+++ b/client/gui/CAnimation.cpp
@@ -11,7 +11,6 @@
 #include "CAnimation.h"

 #include "SDL_Extensions.h"
-#include "SDL_Pixels.h"
 #include "ColorFilter.h"

 #include "../CBitmapHandler.h"
--- a/client/gui/Fonts.cpp
+++ b/client/gui/Fonts.cpp
@@ -12,7 +12,7 @@

 #include <SDL_ttf.h>

-#include "SDL_Pixels.h"
+#include "SDL_Extensions.h"
 #include "../../lib/JsonNode.h"
 #include "../../lib/vcmi_endian.h"
 #include "../../lib/filesystem/Filesystem.h"
--- a/client/gui/SDL_Extensions.cpp
+++ b/client/gui/SDL_Extensions.cpp
@@ -9,7 +9,7 @@
 */
 #include "StdInc.h"
 #include "SDL_Extensions.h"
-#include "SDL_Pixels.h"
+#include "SDL_PixelAccess.h"

 #include "../CGameInfo.h"
 #include "../CMessage.h"
--- a/client/gui/SDL_PixelAccess.h
+++ b/client/gui/SDL_PixelAccess.h
@@ -1,5 +1,5 @@
 /*
- * SDL_Pixels.h, part of VCMI engine
+ * SDL_PixelAccess.h, part of VCMI engine
 *
 * Authors: listed in file AUTHORS in main folder
 *
--- a/client/widgets/AdventureMapClasses.cpp
+++ b/client/widgets/AdventureMapClasses.cpp
@@ -22,7 +22,7 @@
 #include "../mainmenu/CMainMenu.h"

 #include "../gui/CGuiHandler.h"
-#include "../gui/SDL_Pixels.h"
+#include "../gui/SDL_PixelAccess.h"
 #include "../gui/CAnimation.h"

 #include "../windows/InfoWindows.h"
--- a/client/widgets/Images.cpp
+++ b/client/widgets/Images.cpp
@@ -13,7 +13,6 @@
 #include "MiscWidgets.h"

 #include "../gui/CAnimation.h"
-#include "../gui/SDL_Pixels.h"
 #include "../gui/CGuiHandler.h"
 #include "../gui/CursorHandler.h"
 #include "../gui/ColorFilter.h"
--- a/client/windows/CWindowObject.cpp
+++ b/client/windows/CWindowObject.cpp
@@ -15,7 +15,7 @@
 #include "../widgets/MiscWidgets.h"
 #include "../widgets/Images.h"

-#include "../gui/SDL_Pixels.h"
+#include "../gui/SDL_PixelAccess.h"
 #include "../gui/SDL_Extensions.h"
 #include "../gui/CGuiHandler.h"
 #include "../gui/CursorHandler.h"
--- a/client/windows/InfoWindows.cpp
+++ b/client/windows/InfoWindows.cpp
@@ -21,7 +21,6 @@
 #include "../widgets/CComponent.h"
 #include "../widgets/MiscWidgets.h"

-#include "../gui/SDL_Pixels.h"
 #include "../gui/SDL_Extensions.h"
 #include "../gui/CGuiHandler.h"
 #include "../gui/CursorHandler.h"