From b37e1e03f0c9d3b7d2d6682a2b5acebf0c0e52b3 Mon Sep 17 00:00:00 2001 From: mjbudd77 Date: Fri, 21 Aug 2020 11:55:19 -0400 Subject: [PATCH] Cppcheck warning fixes for Qt GUI. --- src/drivers/Qt/fceuWrapper.cpp | 3 ++- src/drivers/Qt/input.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/drivers/Qt/fceuWrapper.cpp b/src/drivers/Qt/fceuWrapper.cpp index cfbbb98b..a8dcad5f 100644 --- a/src/drivers/Qt/fceuWrapper.cpp +++ b/src/drivers/Qt/fceuWrapper.cpp @@ -104,7 +104,8 @@ void FCEUD_PrintError(const char *errormsg) */ FILE *FCEUD_UTF8fopen(const char *fn, const char *mode) { - return(fopen(fn,mode)); + FILE *fp = ::fopen(fn,mode); + return(fp); } /** diff --git a/src/drivers/Qt/input.cpp b/src/drivers/Qt/input.cpp index ce2bf93b..1510857b 100644 --- a/src/drivers/Qt/input.cpp +++ b/src/drivers/Qt/input.cpp @@ -1570,6 +1570,7 @@ const char * ButtonName (const ButtConfig * bc) { int joyNum, inputNum; const char *inputType, *inputDirection; + char direction[128] = ""; joyNum = bc->DeviceNum; @@ -1582,7 +1583,6 @@ const char * ButtonName (const ButtConfig * bc) else if (bc->ButtonNum & 0x2000) { int inputValue; - char direction[128] = ""; inputType = "Hat"; inputNum = (bc->ButtonNum >> 8) & 0x1F;