From 4ae655caab36d75c4ae9e0e761853d5af13cb6c0 Mon Sep 17 00:00:00 2001 From: Andrea Odetti Date: Sun, 7 Feb 2021 13:46:50 +0000 Subject: [PATCH] Fix a few issues reported by clang. Signed-off-by: Andrea Odetti --- source/frontends/common2/commonframe.cpp | 2 +- source/frontends/ncurses/nframe.cpp | 2 +- source/frontends/qt/qtframe.cpp | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/frontends/common2/commonframe.cpp b/source/frontends/common2/commonframe.cpp index e7c58079..744f6d0f 100644 --- a/source/frontends/common2/commonframe.cpp +++ b/source/frontends/common2/commonframe.cpp @@ -99,7 +99,7 @@ BYTE* CommonFrame::GetResource(WORD id, LPCSTR lpType, DWORD expectedSize) if (myResource.empty()) { - LogFileOutput("FindResource: could not load resource %s\n", filename); + LogFileOutput("FindResource: could not load resource %s\n", filename.c_str()); } return myResource.data(); diff --git a/source/frontends/ncurses/nframe.cpp b/source/frontends/ncurses/nframe.cpp index c96da64d..618d1c9d 100644 --- a/source/frontends/ncurses/nframe.cpp +++ b/source/frontends/ncurses/nframe.cpp @@ -204,7 +204,7 @@ void NFrame::VideoUpdateFlash() if (myTextFlashCounter == 16) // Flash rate = 0.5 * 60 / 16 Hz (as we need 2 changes for a period) { myTextFlashCounter = 0; - myTextFlashState = myTextFlashState; + myTextFlashState = !myTextFlashState; } } diff --git a/source/frontends/qt/qtframe.cpp b/source/frontends/qt/qtframe.cpp index af89cfb0..39a77f8c 100644 --- a/source/frontends/qt/qtframe.cpp +++ b/source/frontends/qt/qtframe.cpp @@ -128,16 +128,16 @@ BYTE* QtFrame::GetResource(WORD id, LPCSTR lpType, DWORD expectedSize) QFile res(QString::fromStdString(path)); if (res.exists() && res.open(QIODevice::ReadOnly)) { - QByteArray resource = res.readAll(); - if (resource.size() == expectedSize) - { - std::swap(myResource, resource); - } + QByteArray resource = res.readAll(); + if (resource.size() == expectedSize) + { + std::swap(myResource, resource); + } } if (myResource.isEmpty()) { - LogFileOutput("FindResource: could not load resource %s\n", filename); + LogFileOutput("FindResource: could not load resource %s\n", filename.c_str()); } return reinterpret_cast(myResource.data());