From c7351716c0d9cc4a54816e8d0b39fb6417caf30b Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Wed, 17 Jun 2020 18:34:03 +0300 Subject: [PATCH] Fix some implicit int to bool conversions --- SDL2pp/Font.cc | 4 ++-- SDL2pp/Mixer.cc | 6 +++--- tests/live_mixer.cc | 6 +++--- tests/live_rendering.cc | 10 +++++----- tests/live_window.cc | 28 ++++++++++++++-------------- tests/test_font.cc | 10 +++++----- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/SDL2pp/Font.cc b/SDL2pp/Font.cc index 04f84d9..71a6595 100644 --- a/SDL2pp/Font.cc +++ b/SDL2pp/Font.cc @@ -95,7 +95,7 @@ Font& Font::SetHinting(int hinting) { } bool Font::GetKerning() const { - return TTF_GetFontKerning(font_); + return TTF_GetFontKerning(font_) > 0; } Font& Font::SetKerning(bool allowed) { @@ -124,7 +124,7 @@ long Font::GetNumFaces() const { } bool Font::IsFixedWidth() const { - return TTF_FontFaceIsFixedWidth(font_); + return TTF_FontFaceIsFixedWidth(font_) > 0; } Optional Font::GetFamilyName() const { diff --git a/SDL2pp/Mixer.cc b/SDL2pp/Mixer.cc index 951151e..c03f3e9 100644 --- a/SDL2pp/Mixer.cc +++ b/SDL2pp/Mixer.cc @@ -213,15 +213,15 @@ void Mixer::HaltMusic() { } bool Mixer::FadeOutMusic(int ms) { - return Mix_FadeOutMusic(ms); + return Mix_FadeOutMusic(ms) > 0; } bool Mixer::IsMusicPlaying() const { - return Mix_PlayingMusic(); + return Mix_PlayingMusic() > 0; } bool Mixer::IsMusicPaused() const { - return Mix_PausedMusic(); + return Mix_PausedMusic() > 0; } Mix_Fading Mixer::GetMusicFading() const { diff --git a/tests/live_mixer.cc b/tests/live_mixer.cc index ca5a054..6632e20 100644 --- a/tests/live_mixer.cc +++ b/tests/live_mixer.cc @@ -32,18 +32,18 @@ BEGIN_TEST(int, char*[]) auto rwops = RWops::FromFile(TESTDATA_DIR "/test.ogg"); Chunk chunk_by_rw(rwops); - EXPECT_TRUE(chunk_by_rw.Get()); + EXPECT_TRUE(chunk_by_rw.Get() != nullptr); rwops.Seek(0, RW_SEEK_SET); Music music_by_rw1(rwops); - EXPECT_TRUE(music_by_rw1.Get()); + EXPECT_TRUE(music_by_rw1.Get() != nullptr); EXPECT_EQUAL(music_by_rw1.GetType(), MUS_OGG); rwops.Seek(0, RW_SEEK_SET); Music music_by_rw2(rwops, MUS_OGG); - EXPECT_TRUE(music_by_rw2.Get()); + EXPECT_TRUE(music_by_rw2.Get() != nullptr); EXPECT_EQUAL(music_by_rw2.GetType(), MUS_OGG); // bad format diff --git a/tests/live_rendering.cc b/tests/live_rendering.cc index 1418902..c983ec4 100644 --- a/tests/live_rendering.cc +++ b/tests/live_rendering.cc @@ -45,8 +45,8 @@ public: bool Test3x3(int x, int y, int mask, int r, int g, int b, int a = -1) { for (int dy = -1; dy <= 1; dy++) { for (int dx = -1; dx <= 1; dx++) { - bool maskbit = mask & (1 << ((1 - dx) + (1 - dy) * 4)); - if (Test(x + dx, y + dy, r, g, b, a) != !!maskbit) + bool maskbit = !!(mask & (1 << ((1 - dx) + (1 - dy) * 4))); + if (Test(x + dx, y + dy, r, g, b, a) != maskbit) return false; } } @@ -59,15 +59,15 @@ BEGIN_TEST(int, char*[]) { // SDL initialization stuff - EXPECT_TRUE(sdl.WasInit(SDL_INIT_VIDEO)); + EXPECT_TRUE(sdl.WasInit(SDL_INIT_VIDEO) > 0); sdl.QuitSubSystem(SDL_INIT_VIDEO); - EXPECT_TRUE(!sdl.WasInit(SDL_INIT_VIDEO)); + EXPECT_TRUE(sdl.WasInit(SDL_INIT_VIDEO) == 0); sdl.InitSubSystem(SDL_INIT_VIDEO); - EXPECT_TRUE(sdl.WasInit(SDL_INIT_VIDEO)); + EXPECT_TRUE(sdl.WasInit(SDL_INIT_VIDEO) > 0); } Window window("libSDL2pp test", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 320, 240, 0); diff --git a/tests/live_window.cc b/tests/live_window.cc index 9009837..727704e 100644 --- a/tests/live_window.cc +++ b/tests/live_window.cc @@ -120,33 +120,33 @@ BEGIN_TEST(int, char*[]) // Flags std::cerr << "Window flags: " << std::hex << "0x" << window.GetFlags() << std::dec << std::endl; - EXPECT_TRUE(window.GetFlags() & SDL_WINDOW_SHOWN); - EXPECT_TRUE(window.GetFlags() & SDL_WINDOW_RESIZABLE); + EXPECT_EQUAL(window.GetFlags() & SDL_WINDOW_SHOWN, SDL_WINDOW_SHOWN); + EXPECT_EQUAL(window.GetFlags() & SDL_WINDOW_RESIZABLE, SDL_WINDOW_RESIZABLE); window.Hide(); - EXPECT_TRUE(!(window.GetFlags() & SDL_WINDOW_SHOWN)); + EXPECT_EQUAL(window.GetFlags() & SDL_WINDOW_SHOWN, 0U); EventSleep(1000); window.Show(); - EXPECT_TRUE(window.GetFlags() & SDL_WINDOW_SHOWN); + EXPECT_EQUAL(window.GetFlags() & SDL_WINDOW_SHOWN, SDL_WINDOW_SHOWN); EventSleep(1000); window.Maximize(); - EXPECT_TRUE(window.GetFlags() & SDL_WINDOW_MAXIMIZED); + EXPECT_EQUAL(window.GetFlags() & SDL_WINDOW_MAXIMIZED, SDL_WINDOW_MAXIMIZED); EventSleep(1000); window.Restore(); - EXPECT_TRUE(!(window.GetFlags() & SDL_WINDOW_MAXIMIZED)); + EXPECT_EQUAL(window.GetFlags() & SDL_WINDOW_MAXIMIZED, 0U); EventSleep(1000); window.Minimize(); EventSleep(1000); // Minimization may take some time, e.g. on Ubuntu due to animations - EXPECT_TRUE(window.GetFlags() & SDL_WINDOW_MINIMIZED, "May fail on some WMs", NON_FATAL); + EXPECT_EQUAL(window.GetFlags() & SDL_WINDOW_MINIMIZED, SDL_WINDOW_MINIMIZED, "May fail on some WMs", NON_FATAL); EventSleep(1000); window.Restore(); EventSleep(1000); // Restore from minimized state may take some time, e.g. on Ubuntu due to animations - EXPECT_TRUE(!(window.GetFlags() & SDL_WINDOW_MINIMIZED)); + EXPECT_EQUAL(window.GetFlags() & SDL_WINDOW_MINIMIZED, 0U); EventSleep(1000); // May hang until window is moved (SDL bug?) @@ -183,11 +183,11 @@ BEGIN_TEST(int, char*[]) { // Fullscreen window.SetFullscreen(SDL_WINDOW_FULLSCREEN_DESKTOP); - EXPECT_TRUE(window.GetFlags() & SDL_WINDOW_FULLSCREEN_DESKTOP); + EXPECT_EQUAL(window.GetFlags() & SDL_WINDOW_FULLSCREEN_DESKTOP, SDL_WINDOW_FULLSCREEN_DESKTOP); EventSleep(1000); window.SetFullscreen(0); - EXPECT_TRUE(!(window.GetFlags() & SDL_WINDOW_FULLSCREEN_DESKTOP)); + EXPECT_EQUAL(window.GetFlags() & SDL_WINDOW_FULLSCREEN_DESKTOP, 0U); EventSleep(1000); } @@ -219,19 +219,19 @@ BEGIN_TEST(int, char*[]) if (flags & SDL_WINDOW_RESIZABLE) { window.SetResizable(false); - EXPECT_TRUE(!(window.GetFlags() & SDL_WINDOW_RESIZABLE)); + EXPECT_EQUAL(window.GetFlags() & SDL_WINDOW_RESIZABLE, 0U); EventSleep(1000); window.SetResizable(true); - EXPECT_TRUE(window.GetFlags() & SDL_WINDOW_RESIZABLE); + EXPECT_EQUAL(window.GetFlags() & SDL_WINDOW_RESIZABLE, SDL_WINDOW_RESIZABLE); EventSleep(1000); } else { window.SetResizable(true); - EXPECT_TRUE(window.GetFlags() & SDL_WINDOW_RESIZABLE); + EXPECT_EQUAL(window.GetFlags() & SDL_WINDOW_RESIZABLE, SDL_WINDOW_RESIZABLE); EventSleep(1000); window.SetResizable(false); - EXPECT_TRUE(!(window.GetFlags() & SDL_WINDOW_RESIZABLE)); + EXPECT_EQUAL(window.GetFlags() & SDL_WINDOW_RESIZABLE, 0U); EventSleep(1000); } } diff --git a/tests/test_font.cc b/tests/test_font.cc index 688daed..fdd9c22 100644 --- a/tests/test_font.cc +++ b/tests/test_font.cc @@ -19,7 +19,7 @@ BEGIN_TEST(int, char*[]) auto rwops = RWops::FromFile(TESTDATA_DIR "/Vera.ttf"); Font font_by_rw(rwops, 30); - EXPECT_TRUE(font_by_rw.Get()); + EXPECT_TRUE(font_by_rw.Get() != nullptr); } MOVE_TEST(Font, font, Get, nullptr); @@ -97,11 +97,11 @@ BEGIN_TEST(int, char*[]) { // Glyphs provided - EXPECT_TRUE(font.IsGlyphProvided(u'A')); + EXPECT_TRUE(font.IsGlyphProvided(u'A') > 0); #ifndef _MSC_VER // MSVC has problems with unicode literals - EXPECT_TRUE(font.IsGlyphProvided(u'¼')); - EXPECT_TRUE(!font.IsGlyphProvided(u'л')); - EXPECT_TRUE(!font.IsGlyphProvided(u'Ы')); + EXPECT_TRUE(font.IsGlyphProvided(u'¼') > 0); + EXPECT_TRUE(font.IsGlyphProvided(u'л') == 0); + EXPECT_TRUE(font.IsGlyphProvided(u'Ы') == 0); #endif }