From 19c638697359f3a1b1d59ba35007cc8981ba4b26 Mon Sep 17 00:00:00 2001
From: dismine <dismine@gmail.com>
Date: Sat, 31 May 2014 17:33:37 +0300
Subject: [PATCH] Build with Clang.

--HG--
branch : develop
---
 src/app/app.pro                             | 7 ++++++-
 src/app/dialogs/app/configdialog.cpp        | 2 +-
 src/libs/qmuparser/qmuparser.pro            | 8 +++++++-
 src/libs/qmuparser/qmuparsertoken.h         | 4 ++--
 src/libs/qmuparser/qmuparsertokenreader.cpp | 2 +-
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/app/app.pro b/src/app/app.pro
index bbc31238c..94d5eaf1a 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -84,7 +84,12 @@ TRANSLATIONS += share/translations/valentina.ts \
                 share/translations/valentina_nl.ts
 
 unix {
-QMAKE_CXX = ccache g++
+    *-g++{
+        QMAKE_CXX = ccache g++
+    }
+    clang*{
+        QMAKE_CXX = ccache clang++
+    }
 }
 
 CONFIG += precompile_header
diff --git a/src/app/dialogs/app/configdialog.cpp b/src/app/dialogs/app/configdialog.cpp
index 49d978f9d..0ddf78d7a 100644
--- a/src/app/dialogs/app/configdialog.cpp
+++ b/src/app/dialogs/app/configdialog.cpp
@@ -80,7 +80,7 @@ ConfigDialog::ConfigDialog(QWidget *parent) :
 //---------------------------------------------------------------------------------------------------------------------
 void ConfigDialog::changePage(QListWidgetItem *current, QListWidgetItem *previous)
 {
-    if (current == false)
+    if (current == nullptr)
     {
         current = previous;
     }
diff --git a/src/libs/qmuparser/qmuparser.pro b/src/libs/qmuparser/qmuparser.pro
index cb3c24548..54e0732cd 100644
--- a/src/libs/qmuparser/qmuparser.pro
+++ b/src/libs/qmuparser/qmuparser.pro
@@ -56,7 +56,13 @@ unix {
     target.path = /usr/lib
     INSTALLS += target
 
-    QMAKE_CXX = ccache g++
+    *-g++{
+        QMAKE_CXX = ccache g++
+    }
+
+    clang*{
+        QMAKE_CXX = ccache clang++
+    }
 }
 
 CONFIG += precompile_header
diff --git a/src/libs/qmuparser/qmuparsertoken.h b/src/libs/qmuparser/qmuparsertoken.h
index 7241abeef..c609e3f0d 100644
--- a/src/libs/qmuparser/qmuparsertoken.h
+++ b/src/libs/qmuparser/qmuparsertoken.h
@@ -298,7 +298,7 @@ public:
     //------------------------------------------------------------------------------
     int GetPri() const
     {
-        if ( m_pCallback.get() == false)
+        if ( m_pCallback.get() == nullptr)
         {
             throw QmuParserError ( ecINTERNAL_ERROR );
         }
@@ -424,7 +424,7 @@ public:
     {
         assert ( m_pCallback.get() );
 
-        if ( m_pCallback->GetAddr() == false)
+        if ( m_pCallback->GetAddr() == nullptr)
         {
             throw QmuParserError ( ecINTERNAL_ERROR );
         }
diff --git a/src/libs/qmuparser/qmuparsertokenreader.cpp b/src/libs/qmuparser/qmuparsertokenreader.cpp
index baff8cf16..a152d5d75 100644
--- a/src/libs/qmuparser/qmuparsertokenreader.cpp
+++ b/src/libs/qmuparser/qmuparsertokenreader.cpp
@@ -884,7 +884,7 @@ bool QmuParserTokenReader::IsVarTok ( token_type &a_Tok )
 //---------------------------------------------------------------------------------------------------------------------
 bool QmuParserTokenReader::IsStrVarTok ( token_type &a_Tok )
 {
-    if ( m_pStrVarDef == false || m_pStrVarDef->empty() )
+    if ( m_pStrVarDef == nullptr || m_pStrVarDef->empty() )
     {
         return false;
     }