mirror of https://github.com/mgba-emu/mgba.git
Qt: Remove use of NaN
This commit is contained in:
parent
fbeb673960
commit
e25d522148
1
CHANGES
1
CHANGES
|
@ -15,6 +15,7 @@ Misc:
|
|||
- Qt: Add preset for DualShock 4
|
||||
- SDL: Remove default gamepad mappings
|
||||
- Qt: Update 360 input profile on OS X to reflect newer drivers
|
||||
- Qt: Remove use of NaN
|
||||
|
||||
0.4.0: (2016-02-02)
|
||||
Features:
|
||||
|
|
|
@ -45,11 +45,6 @@ extern "C" {
|
|||
|
||||
using namespace QGBA;
|
||||
|
||||
#if defined(__WIN32) || defined(__OpenBSD__)
|
||||
// This is a macro everywhere except MinGW and OpenBSD, it seems
|
||||
using std::isnan;
|
||||
#endif
|
||||
|
||||
Window::Window(ConfigController* config, int playerId, QWidget* parent)
|
||||
: QMainWindow(parent)
|
||||
, m_log(0)
|
||||
|
@ -731,7 +726,7 @@ void Window::updateTitle(float fps) {
|
|||
m_controller->threadContinue();
|
||||
if (title.isNull()) {
|
||||
setWindowTitle(tr("%1 - %2").arg(projectName).arg(projectVersion));
|
||||
} else if (isnan(fps)) {
|
||||
} else if (fps < 0) {
|
||||
setWindowTitle(tr("%1 - %2 - %3").arg(projectName).arg(title).arg(projectVersion));
|
||||
} else {
|
||||
setWindowTitle(tr("%1 - %2 (%3 fps) - %4").arg(projectName).arg(title).arg(fps).arg(projectVersion));
|
||||
|
|
|
@ -144,7 +144,7 @@ private:
|
|||
QAction* addControlledAction(QMenu* menu, QAction* action, const QString& name);
|
||||
QAction* addHiddenAction(QMenu* menu, QAction* action, const QString& name);
|
||||
|
||||
void updateTitle(float fps = NAN);
|
||||
void updateTitle(float fps = -1);
|
||||
|
||||
GameController* m_controller;
|
||||
Display* m_display;
|
||||
|
|
Loading…
Reference in New Issue