aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build with Clang.

Browse Source 
--HG--
branch : develop
This commit is contained in:
dismine 2014-05-31 17:33:37 +03:00
parent 07f75f7212
commit 19c6386973
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/app.pro
View File

@ -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

2
src/app/dialogs/app/configdialog.cpp
View File

@ -80,7 +80,7 @@ ConfigDialog::ConfigDialog(QWidget *parent) :
//---------------------------------------------------------------------------------------------------------------------
void ConfigDialog::changePage(QListWidgetItem *current, QListWidgetItem *previous)
{
if (current == false)
if (current == nullptr)
{
current = previous;
}

8
src/libs/qmuparser/qmuparser.pro
View File

@ -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

4
src/libs/qmuparser/qmuparsertoken.h
View File

@ -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 );
}

2
src/libs/qmuparser/qmuparsertokenreader.cpp
View File

@ -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;
}