summaryrefslogtreecommitdiff
path: root/src/unittests/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-10-16 01:03:02 +0300
committerAndrei Karas <akaras@inbox.ru>2019-10-16 01:03:02 +0300
commite15da561988948de26c80105dc9762943009b9e7 (patch)
tree717dbdffe08daf6a1832ce79043697d3f7e62a23 /src/unittests/resources
parent71cfaf012217cf3bbbc39207a12131b748535fcc (diff)
downloadplus-e15da561988948de26c80105dc9762943009b9e7.tar.gz
plus-e15da561988948de26c80105dc9762943009b9e7.tar.bz2
plus-e15da561988948de26c80105dc9762943009b9e7.tar.xz
plus-e15da561988948de26c80105dc9762943009b9e7.zip
Fix code style, ignore some warning in clang-tidy
Diffstat (limited to 'src/unittests/resources')
-rw-r--r--src/unittests/resources/dye/dye.cc4
-rw-r--r--src/unittests/resources/dye/dyepalette.cc4
-rw-r--r--src/unittests/resources/map/maplayer/drawfringenormal.cc4
-rw-r--r--src/unittests/resources/map/maplayer/drawfringesimple.cc4
-rw-r--r--src/unittests/resources/map/maplayer/drawspeciallayer1.cc4
-rw-r--r--src/unittests/resources/map/maplayer/drawspeciallayer2.cc4
-rw-r--r--src/unittests/resources/map/speciallayer.cc4
-rw-r--r--src/unittests/resources/resourcemanager/resourcemanager.cc4
-rw-r--r--src/unittests/resources/sdlimagehelper.cc4
-rw-r--r--src/unittests/resources/sprite/animatedsprite.cc4
10 files changed, 20 insertions, 20 deletions
diff --git a/src/unittests/resources/dye/dye.cc b/src/unittests/resources/dye/dye.cc
index 97eecc2cd..52613cd60 100644
--- a/src/unittests/resources/dye/dye.cc
+++ b/src/unittests/resources/dye/dye.cc
@@ -1973,13 +1973,13 @@ TEST_CASE("Dye real dye", "")
imageHelper = new SurfaceImageHelper;
SDLImageHelper::setRenderer(graphicsManager.createRenderer(
- graphicsManager.createWindow(640, 480, 0,
+ GraphicsManager::createWindow(640, 480, 0,
SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
#else // USE_SDL2
imageHelper = new SDLImageHelper;
- graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
+ GraphicsManager::createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
#endif // USE_SDL2
userPalette = new UserPalette;
diff --git a/src/unittests/resources/dye/dyepalette.cc b/src/unittests/resources/dye/dyepalette.cc
index a2a17225c..6318977bc 100644
--- a/src/unittests/resources/dye/dyepalette.cc
+++ b/src/unittests/resources/dye/dyepalette.cc
@@ -77,11 +77,11 @@ TEST_CASE("DyePalette tests", "")
#ifdef USE_SDL2
SDLImageHelper::setRenderer(graphicsManager.createRenderer(
- graphicsManager.createWindow(640, 480, 0,
+ GraphicsManager::createWindow(640, 480, 0,
SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
#else // USE_SDL2
- graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
+ GraphicsManager::createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
#endif // USE_SDL2
theme = new Theme;
diff --git a/src/unittests/resources/map/maplayer/drawfringenormal.cc b/src/unittests/resources/map/maplayer/drawfringenormal.cc
index 65e20812f..6f68d77e7 100644
--- a/src/unittests/resources/map/maplayer/drawfringenormal.cc
+++ b/src/unittests/resources/map/maplayer/drawfringenormal.cc
@@ -67,11 +67,11 @@ TEST_CASE("MapLayer drawFringe normal", "")
#ifdef USE_SDL2
SDLImageHelper::setRenderer(graphicsManager.createRenderer(
- graphicsManager.createWindow(640, 480, 0,
+ GraphicsManager::createWindow(640, 480, 0,
SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
#else // USE_SDL2
- graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
+ GraphicsManager::createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
#endif // USE_SDL2
theme = new Theme;
diff --git a/src/unittests/resources/map/maplayer/drawfringesimple.cc b/src/unittests/resources/map/maplayer/drawfringesimple.cc
index 2865c8299..ad2c87434 100644
--- a/src/unittests/resources/map/maplayer/drawfringesimple.cc
+++ b/src/unittests/resources/map/maplayer/drawfringesimple.cc
@@ -64,11 +64,11 @@ TEST_CASE("MapLayer drawFringe simple", "")
#ifdef USE_SDL2
SDLImageHelper::setRenderer(graphicsManager.createRenderer(
- graphicsManager.createWindow(640, 480, 0,
+ GraphicsManager::createWindow(640, 480, 0,
SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
#else // USE_SDL2
- graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
+ GraphicsManager::createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
#endif // USE_SDL2
theme = new Theme;
diff --git a/src/unittests/resources/map/maplayer/drawspeciallayer1.cc b/src/unittests/resources/map/maplayer/drawspeciallayer1.cc
index 01adf0ee7..8e60592f7 100644
--- a/src/unittests/resources/map/maplayer/drawspeciallayer1.cc
+++ b/src/unittests/resources/map/maplayer/drawspeciallayer1.cc
@@ -60,11 +60,11 @@ TEST_CASE("MapLayer drawSpecialLayer (specialLayer)", "")
#ifdef USE_SDL2
SDLImageHelper::setRenderer(graphicsManager.createRenderer(
- graphicsManager.createWindow(640, 480, 0,
+ GraphicsManager::createWindow(640, 480, 0,
SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
#else // USE_SDL2
- graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
+ GraphicsManager::createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
#endif // USE_SDL2
Map *map = nullptr;
diff --git a/src/unittests/resources/map/maplayer/drawspeciallayer2.cc b/src/unittests/resources/map/maplayer/drawspeciallayer2.cc
index 9897f3ad3..b40ac745b 100644
--- a/src/unittests/resources/map/maplayer/drawspeciallayer2.cc
+++ b/src/unittests/resources/map/maplayer/drawspeciallayer2.cc
@@ -60,11 +60,11 @@ TEST_CASE("MapLayer drawSpecialLayer (tempLayer)", "")
#ifdef USE_SDL2
SDLImageHelper::setRenderer(graphicsManager.createRenderer(
- graphicsManager.createWindow(640, 480, 0,
+ GraphicsManager::createWindow(640, 480, 0,
SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
#else // USE_SDL2
- graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
+ GraphicsManager::createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
#endif // USE_SDL2
Map *map = nullptr;
diff --git a/src/unittests/resources/map/speciallayer.cc b/src/unittests/resources/map/speciallayer.cc
index 443d252b5..c3b1f78b8 100644
--- a/src/unittests/resources/map/speciallayer.cc
+++ b/src/unittests/resources/map/speciallayer.cc
@@ -65,11 +65,11 @@ TEST_CASE("SpecialLayer updateCache", "")
#ifdef USE_SDL2
SDLImageHelper::setRenderer(graphicsManager.createRenderer(
- graphicsManager.createWindow(640, 480, 0,
+ GraphicsManager::createWindow(640, 480, 0,
SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
#else // USE_SDL2
- graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
+ GraphicsManager::createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
#endif // USE_SDL2
userPalette = new UserPalette;
diff --git a/src/unittests/resources/resourcemanager/resourcemanager.cc b/src/unittests/resources/resourcemanager/resourcemanager.cc
index 0f4a7db65..39871e3c7 100644
--- a/src/unittests/resources/resourcemanager/resourcemanager.cc
+++ b/src/unittests/resources/resourcemanager/resourcemanager.cc
@@ -110,11 +110,11 @@ TEST_CASE("resourcemanager", "resourcemanager")
#ifdef USE_SDL2
SDLImageHelper::setRenderer(graphicsManager.createRenderer(
- graphicsManager.createWindow(640, 480, 0,
+ GraphicsManager::createWindow(640, 480, 0,
SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
#else // USE_SDL2
- graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
+ GraphicsManager::createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
#endif // USE_SDL2
userPalette = new UserPalette;
diff --git a/src/unittests/resources/sdlimagehelper.cc b/src/unittests/resources/sdlimagehelper.cc
index 8c858ce69..67aaa384b 100644
--- a/src/unittests/resources/sdlimagehelper.cc
+++ b/src/unittests/resources/sdlimagehelper.cc
@@ -89,11 +89,11 @@ TEST_CASE("sdlimagehelper combineSurface", "")
#ifdef USE_SDL2
SDLImageHelper::setRenderer(graphicsManager.createRenderer(
- graphicsManager.createWindow(640, 480, 0,
+ GraphicsManager::createWindow(640, 480, 0,
SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
#else // USE_SDL2
- graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
+ GraphicsManager::createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
#endif // USE_SDL2
userPalette = new UserPalette;
diff --git a/src/unittests/resources/sprite/animatedsprite.cc b/src/unittests/resources/sprite/animatedsprite.cc
index 34627ff07..1f5f6f9ef 100644
--- a/src/unittests/resources/sprite/animatedsprite.cc
+++ b/src/unittests/resources/sprite/animatedsprite.cc
@@ -78,11 +78,11 @@ TEST_CASE("AnimatedSprite tests", "animatedsprite")
#ifdef USE_SDL2
SDLImageHelper::setRenderer(graphicsManager.createRenderer(
- graphicsManager.createWindow(640, 480, 0,
+ GraphicsManager::createWindow(640, 480, 0,
SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
#else // USE_SDL2
- graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
+ GraphicsManager::createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
#endif // USE_SDL2
theme = new Theme;