From ceac601e60d28d6524f23fb6494624ffb7b16bec Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sun, 21 Feb 2016 11:16:21 -0800
Subject: [PATCH] Qt: Remove use of NaN

---
 CHANGES                    | 1 +
 src/platform/qt/Window.cpp | 7 +------
 src/platform/qt/Window.h   | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6c3823495..3edb15832 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,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:
diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index ed6c5ed93..f5916c5f3 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -48,11 +48,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)
@@ -774,7 +769,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));
diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h
index 7d6ece721..5a244b9e3 100644
--- a/src/platform/qt/Window.h
+++ b/src/platform/qt/Window.h
@@ -142,7 +142,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;