From 3c8338faaef0a00814d43a351b2bd2767ac3537c Mon Sep 17 00:00:00 2001
From: dismine <dismine@gmail.com>
Date: Tue, 6 May 2014 12:48:48 +0300
Subject: [PATCH] Use nullptr instead NULL.

--HG--
branch : feature
---
 src/libs/qmuparser/qmuparserbase.h          | 2 +-
 src/libs/qmuparser/qmuparserbytecode.cpp    | 6 +++---
 src/libs/qmuparser/qmuparsertoken.h         | 2 +-
 src/libs/qmuparser/qmuparsertokenreader.cpp | 7 ++++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/libs/qmuparser/qmuparserbase.h b/src/libs/qmuparser/qmuparserbase.h
index 62171abad..ff79c0868 100644
--- a/src/libs/qmuparser/qmuparserbase.h
+++ b/src/libs/qmuparser/qmuparserbase.h
@@ -67,7 +67,7 @@ public:
     void               Eval(qreal *results, int nBulkSize) const;
     int                GetNumResults() const;
     void               SetExpr(const QString &a_sExpr);
-    void               SetVarFactory(facfun_type a_pFactory, void *pUserData = NULL);
+    void               SetVarFactory(facfun_type a_pFactory, void *pUserData = nullptr);
     void               SetDecSep(char_type cDecSep);
     void               SetThousandsSep(char_type cThousandsSep = 0);
     void               ResetLocale();
diff --git a/src/libs/qmuparser/qmuparserbytecode.cpp b/src/libs/qmuparser/qmuparserbytecode.cpp
index aa2a9e7be..ea68e5d66 100644
--- a/src/libs/qmuparser/qmuparserbytecode.cpp
+++ b/src/libs/qmuparser/qmuparserbytecode.cpp
@@ -140,7 +140,7 @@ void QmuParserByteCode::AddVal(qreal a_fVal) Q_DECL_NOEXCEPT
     // If optimization does not apply
     SToken tok;
     tok.Cmd = cmVAL;
-    tok.Val.ptr   = NULL;
+    tok.Val.ptr   = nullptr;
     tok.Val.data  = 0;
     tok.Val.data2 = a_fVal;
     m_vRPN.push_back(tok);
@@ -361,8 +361,8 @@ void QmuParserByteCode::AddOp(ECmdCode a_Oprt)
                          (m_vRPN[sz-1].Cmd == cmVARMUL && m_vRPN[sz-2].Cmd == cmVARMUL &&
                           m_vRPN[sz-2].Val.ptr == m_vRPN[sz-1].Val.ptr) )
                     {
-                        assert( (m_vRPN[sz-2].Val.ptr==NULL && m_vRPN[sz-1].Val.ptr!=NULL) ||
-                        (m_vRPN[sz-2].Val.ptr!=NULL && m_vRPN[sz-1].Val.ptr==NULL) ||
+                        assert( (m_vRPN[sz-2].Val.ptr==nullptr && m_vRPN[sz-1].Val.ptr!=nullptr) ||
+                        (m_vRPN[sz-2].Val.ptr!=nullptr && m_vRPN[sz-1].Val.ptr==nullptr) ||
                         (m_vRPN[sz-2].Val.ptr == m_vRPN[sz-1].Val.ptr) );
 
                         m_vRPN[sz-2].Cmd = cmVARMUL;
diff --git a/src/libs/qmuparser/qmuparsertoken.h b/src/libs/qmuparser/qmuparsertoken.h
index 73db7485a..5dd720766 100644
--- a/src/libs/qmuparser/qmuparsertoken.h
+++ b/src/libs/qmuparser/qmuparsertoken.h
@@ -314,7 +314,7 @@ public:
     //------------------------------------------------------------------------------
     EOprtAssociativity GetAssociativity() const
     {
-        if ( m_pCallback.get() == NULL || m_pCallback->GetCode() != cmOPRT_BIN )
+        if ( m_pCallback.get() == nullptr || m_pCallback->GetCode() != cmOPRT_BIN )
         {
             throw QmuParserError ( ecINTERNAL_ERROR );
         }
diff --git a/src/libs/qmuparser/qmuparsertokenreader.cpp b/src/libs/qmuparser/qmuparsertokenreader.cpp
index e16e6404f..0ae8cb90d 100644
--- a/src/libs/qmuparser/qmuparsertokenreader.cpp
+++ b/src/libs/qmuparser/qmuparsertokenreader.cpp
@@ -118,9 +118,10 @@ void QmuParserTokenReader::Assign ( const QmuParserTokenReader &a_Reader ) Q_DEC
  */
 QmuParserTokenReader::QmuParserTokenReader ( QmuParserBase *a_pParent )
     : m_pParser ( a_pParent ), m_strFormula(), m_iPos ( 0 ), m_iSynFlags ( 0 ), m_bIgnoreUndefVar ( false ),
-      m_pFunDef ( NULL ), m_pPostOprtDef ( NULL ), m_pInfixOprtDef ( NULL ), m_pOprtDef ( NULL ), m_pConstDef ( NULL ),
-      m_pStrVarDef ( NULL ), m_pVarDef ( NULL ), m_pFactory ( NULL ), m_pFactoryData ( NULL ), m_vIdentFun(),
-      m_UsedVar(), m_fZero ( 0 ), m_iBrackets ( 0 ), m_lastTok(), m_cArgSep ( ',' )
+      m_pFunDef ( nullptr ), m_pPostOprtDef ( nullptr ), m_pInfixOprtDef ( nullptr ), m_pOprtDef ( nullptr ),
+      m_pConstDef ( nullptr ), m_pStrVarDef ( nullptr ), m_pVarDef ( nullptr ), m_pFactory ( nullptr ),
+      m_pFactoryData ( nullptr ), m_vIdentFun(), m_UsedVar(), m_fZero ( 0 ), m_iBrackets ( 0 ), m_lastTok(),
+      m_cArgSep ( ',' )
 {
     assert ( m_pParser );
     SetParent ( m_pParser );