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

Qt: Remove use of NaN

This commit is contained in:
Jeffrey Pfau 2016-02-21 11:16:21 -08:00
parent 5d9730433f
commit ceac601e60
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -18,6 +18,7 @@ Misc:
- Qt: Add preset for DualShock 4 - Qt: Add preset for DualShock 4
- SDL: Remove default gamepad mappings - SDL: Remove default gamepad mappings
- Qt: Update 360 input profile on OS X to reflect newer drivers - Qt: Update 360 input profile on OS X to reflect newer drivers
- Qt: Remove use of NaN
0.4.0: (2016-02-02) 0.4.0: (2016-02-02)
Features: Features:

7
src/platform/qt/Window.cpp
View File

@ -48,11 +48,6 @@ extern "C" {
using namespace QGBA; 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) Window::Window(ConfigController* config, int playerId, QWidget* parent)
: QMainWindow(parent) : QMainWindow(parent)
, m_log(0) , m_log(0)
@ -774,7 +769,7 @@ void Window::updateTitle(float fps) {
m_controller->threadContinue(); m_controller->threadContinue();
if (title.isNull()) { if (title.isNull()) {
setWindowTitle(tr("%1 - %2").arg(projectName).arg(projectVersion)); 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)); setWindowTitle(tr("%1 - %2 - %3").arg(projectName).arg(title).arg(projectVersion));
} else { } else {
setWindowTitle(tr("%1 - %2 (%3 fps) - %4").arg(projectName).arg(title).arg(fps).arg(projectVersion)); setWindowTitle(tr("%1 - %2 (%3 fps) - %4").arg(projectName).arg(title).arg(fps).arg(projectVersion));

2
src/platform/qt/Window.h
View File

@ -142,7 +142,7 @@ private:
QAction* addControlledAction(QMenu* menu, QAction* action, const QString& name); QAction* addControlledAction(QMenu* menu, QAction* action, const QString& name);
QAction* addHiddenAction(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; GameController* m_controller;
Display* m_display; Display* m_display;