ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More attempted to fix Qt6 win build.

This commit is contained in:
harry 2024-02-24 17:37:00 -05:00
parent 9d08ff453a
commit 245a8701e0
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/Qt/ColorMenu.cpp
View File

@ -73,7 +73,7 @@ void ColorMenuItem::setImageColor( QColor c )
lastColor = c; lastColor = c;
b = parentWidget()->palette().color(QPalette::WindowText); b = qobject_cast<QWidget*>(parent())->palette().color(QPalette::WindowText);
i=0; i=0;
@ -140,7 +140,7 @@ void ColorMenuItem::openColorPicker(void)
qs = title; qs = title;
qs.replace( "&", "", Qt::CaseInsensitive); // get rid of & accelerator characters 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<QWidget*>(parent()) );
picker->show(); picker->show();

2
src/drivers/Qt/QtScriptManager.cpp
View File

@ -441,7 +441,7 @@ bool FileScriptObject::putChar(char c)
{ {
auto* engine = FCEU::JSEngine::getCurrent(); auto* engine = FCEU::JSEngine::getCurrent();
engine->throwError(QJSValue::GenericError, "file is not open "); engine->throwError(QJSValue::GenericError, "file is not open ");
return -1; return false;
} }
bool success = file->putChar(c); bool success = file->putChar(c);

2
src/types.h
View File

@ -191,6 +191,7 @@ typedef uint8 (*readfunc)(uint32 A);
#define __FCEU_PRINTF_ATTRIBUTE( fmt, va ) #define __FCEU_PRINTF_ATTRIBUTE( fmt, va )
#endif #endif
#if defined(__cplusplus)
// Scoped pointer ensures that memory pointed to by this object gets cleaned up // 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 // and deallocated when this object goes out of scope. Helps prevent memory leaks
// on temporary memory allocations in functions with early outs. // on temporary memory allocations in functions with early outs.
@ -261,6 +262,7 @@ class fceuScopedPtr
enum fceuAllocType _allocType; enum fceuAllocType _allocType;
}; };
#endif // __cplusplus
#include "utils/endian.h" #include "utils/endian.h"