From a80134e7db195b0332e3dd324d4182a8a793b6a1 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Tue, 18 Feb 2020 15:22:51 -0500
Subject: [PATCH] Remove redefinition of nullptr that caused compilation errors
 under Qt 5.14.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thanks to mjphyi for tracking this down!

gcc didn't provide very useful error messages, saying that
error: invalid conversion from ‘long int’ to ‘QDebug::Stream*’
was in qglobal.h.

But it really had to do with a few scattered #defines in OSCAR changing
nullptr to NULL (an int). Since OSCAR now requires C++11, and nullptr
is a keyword in C++11, these #defines can go.

Resolves issue #5.
---
 dumpSTR/common.h        |  5 -----
 oscar/Graphs/glcommon.h |  4 ----
 oscar/SleepLib/common.h | 10 ----------
 oscar/updateparser.cpp  |  7 +------
 4 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/dumpSTR/common.h b/dumpSTR/common.h
index 4bbb8261..278655f6 100644
--- a/dumpSTR/common.h
+++ b/dumpSTR/common.h
@@ -13,11 +13,6 @@
 #include <QDateTime>
 #include <QObject>
 
-
-#ifndef nullptr
-#define nullptr NULL
-#endif
-
 typedef float EventDataType;
 
 #endif // COMMON_H
diff --git a/oscar/Graphs/glcommon.h b/oscar/Graphs/glcommon.h
index bb28127f..8f7711d1 100644
--- a/oscar/Graphs/glcommon.h
+++ b/oscar/Graphs/glcommon.h
@@ -11,10 +11,6 @@
 
 #include <QColor>
 
-#ifndef nullptr
-#define nullptr NULL
-#endif
-
 //! \brief Returns the grayscale brightness (between 0 and 1) of a color
 float brightness(QColor color);
 
diff --git a/oscar/SleepLib/common.h b/oscar/SleepLib/common.h
index 5c61e273..8ddadca4 100644
--- a/oscar/SleepLib/common.h
+++ b/oscar/SleepLib/common.h
@@ -125,16 +125,6 @@ float median(RandAccessIter begin, RandAccessIter end)
 }
 
 
-#ifndef nullptr
-#define nullptr NULL
-#endif
-
-#ifdef TEST_BUILD
-const QString STR_TestBuild = "-Testing";
-#else
-const QString STR_TestBuild = "";
-#endif
-
 const QString getAppName();
 const QString getDeveloperName();
 const QString getDeveloperDomain();
diff --git a/oscar/updateparser.cpp b/oscar/updateparser.cpp
index fde68c33..e02cbf1e 100644
--- a/oscar/updateparser.cpp
+++ b/oscar/updateparser.cpp
@@ -1,4 +1,4 @@
-/* UpdateParser Implementation (Autoupdater component)
+/* UpdateParser Implementation (Autoupdater component)
  *
  * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
  *
@@ -11,11 +11,6 @@
 
 #include "updateparser.h"
 
-#ifndef nullptr
-#define nullptr NULL
-#endif
-
-
 Update::Update()
 {
     size = 0;