diff --git a/src/drivers/Qt/ColorMenu.cpp b/src/drivers/Qt/ColorMenu.cpp index edcc440c..f62deaa6 100644 --- a/src/drivers/Qt/ColorMenu.cpp +++ b/src/drivers/Qt/ColorMenu.cpp @@ -73,7 +73,7 @@ void ColorMenuItem::setImageColor( QColor c ) lastColor = c; - b = parentWidget()->palette().color(QPalette::WindowText); + b = qobject_cast(parent())->palette().color(QPalette::WindowText); i=0; @@ -140,7 +140,7 @@ void ColorMenuItem::openColorPicker(void) qs = title; qs.replace( "&", "", Qt::CaseInsensitive); // get rid of & accelerator characters - picker = new ColorMenuPickerDialog_t( colorPtr, qs.toLocal8Bit().constData(), parentWidget() ); + picker = new ColorMenuPickerDialog_t( colorPtr, qs.toLocal8Bit().constData(), qobject_cast(parent()) ); picker->show(); diff --git a/src/drivers/Qt/QtScriptManager.cpp b/src/drivers/Qt/QtScriptManager.cpp index 010077a6..e4e3047d 100644 --- a/src/drivers/Qt/QtScriptManager.cpp +++ b/src/drivers/Qt/QtScriptManager.cpp @@ -441,7 +441,7 @@ bool FileScriptObject::putChar(char c) { auto* engine = FCEU::JSEngine::getCurrent(); engine->throwError(QJSValue::GenericError, "file is not open "); - return -1; + return false; } bool success = file->putChar(c); diff --git a/src/types.h b/src/types.h index df530bc7..4aff2c5e 100644 --- a/src/types.h +++ b/src/types.h @@ -191,6 +191,7 @@ typedef uint8 (*readfunc)(uint32 A); #define __FCEU_PRINTF_ATTRIBUTE( fmt, va ) #endif +#if defined(__cplusplus) // Scoped pointer ensures that memory pointed to by this object gets cleaned up // and deallocated when this object goes out of scope. Helps prevent memory leaks // on temporary memory allocations in functions with early outs. @@ -261,6 +262,7 @@ class fceuScopedPtr enum fceuAllocType _allocType; }; +#endif // __cplusplus #include "utils/endian.h"