From c170347975ecc096314e9cf744d47ece6ffb1325 Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Sat, 3 Sep 2016 18:03:23 +0200 Subject: Fix FTBFS with GCC6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- src/kvilib/ext/kvi_regusersdb.cpp | 6 +++--- src/kvirc/kvs/kvi_kvs_parser_dollar.cpp | 4 ++-- src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp | 2 +- src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp | 2 +- src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp | 2 +- src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp | 2 +- src/modules/mediaplayer/mp_amarokinterface.cpp | 4 ++-- src/modules/mediaplayer/mp_jukinterface.cpp | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/kvilib/ext/kvi_regusersdb.cpp b/src/kvilib/ext/kvi_regusersdb.cpp index 1edd2d77..dcbd58a2 100644 --- a/src/kvilib/ext/kvi_regusersdb.cpp +++ b/src/kvilib/ext/kvi_regusersdb.cpp @@ -330,7 +330,7 @@ KviRegisteredUserDataBase::~KviRegisteredUserDataBase() KviRegisteredUser * KviRegisteredUserDataBase::addUser(const TQString & name) { - if(name.isEmpty()) return false; + if(name.isEmpty()) return 0; if(m_pUserDict->find(name))return 0; KviRegisteredUser * u = new KviRegisteredUser(name); m_pUserDict->replace(u->name(),u); //u->name() because we're NOT copying keys! @@ -340,7 +340,7 @@ KviRegisteredUser * KviRegisteredUserDataBase::addUser(const TQString & name) KviRegisteredUserGroup * KviRegisteredUserDataBase::addGroup(const TQString & name) { - if(name.isEmpty()) return false; + if(name.isEmpty()) return 0; if(m_pGroupDict->find(name))return 0; KviRegisteredUserGroup * pGroup = new KviRegisteredUserGroup(name); m_pGroupDict->replace(pGroup->name(),pGroup); //u->name() because we're NOT copying keys! @@ -592,7 +592,7 @@ KviRegisteredUser * KviRegisteredUserDataBase::findMatchingUser(const TQString & KviRegisteredMask * KviRegisteredUserDataBase::findMatchingMask(const TQString & nick,const TQString &user,const TQString & host) { // first lookup the nickname in the maskDict - if(nick.isEmpty()) return false; + if(nick.isEmpty()) return 0; KviRegisteredMaskList * l = m_pMaskDict->find(nick); if(l) { diff --git a/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp b/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp index b5566149..a6afcc60 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp @@ -82,10 +82,10 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope) KviKvsTreeNodeInstruction * i = parseInstructionBlock(); if(!i) { - if(error())return false; + if(error())return 0; // trigger an error anyway: this is abused syntax :D error(KVSP_curCharPointer,__tr2qs("Empty instruction block for command evaluation")); - return false; + return 0; } return new KviKvsTreeNodeCommandEvaluation(pDollarBegin,i); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp index e3cd6687..196698da 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp @@ -125,7 +125,7 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeArrayElement::evaluateReadWriteInObject { #ifdef COMPILE_NEW_KVS kvs_int_t iVal; - if(!evaluateIndex(c,iVal))return false; + if(!evaluateIndex(c,iVal))return 0; KviKvsRWEvaluationResult * result; if(o)result = m_pSource->evaluateReadWriteInObjectScope(o,c); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp index 0d52c07e..5df818e5 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp @@ -88,7 +88,7 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeArrayReferenceAssert::evaluateReadWrite KviKvsRWEvaluationResult * r; if(o)r = m_pSource->evaluateReadWriteInObjectScope(o,c); else r = m_pSource->evaluateReadWrite(c); - if(!r)return false; + if(!r)return 0; return r; #else diff --git a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp index 74a5e84d..e263eba1 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp @@ -72,7 +72,7 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeExtendedScopeVariable::evaluateReadWrit if(!c->extendedScopeVariables()) { c->error(this,__tr2qs("There are no extended scope variables in this scope")); - return false; + return 0; } return new KviKvsHashElement(0,c->extendedScopeVariables()->get(m_szIdentifier),c->extendedScopeVariables(),m_szIdentifier); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp index 954e2218..8cff6680 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp @@ -88,7 +88,7 @@ KviKvsRWEvaluationResult * KviKvsTreeNodeHashReferenceAssert::evaluateReadWriteI KviKvsRWEvaluationResult * r; if(o)r = m_pSource->evaluateReadWriteInObjectScope(o,c); else r = m_pSource->evaluateReadWrite(c); - if(!r)return false; + if(!r)return 0; return r; #else diff --git a/src/modules/mediaplayer/mp_amarokinterface.cpp b/src/modules/mediaplayer/mp_amarokinterface.cpp index 7a458b2e..77064507 100644 --- a/src/modules/mediaplayer/mp_amarokinterface.cpp +++ b/src/modules/mediaplayer/mp_amarokinterface.cpp @@ -79,7 +79,7 @@ bool KviAmarokInterface::setVol(kvs_int_t &iVol) TQString KviAmarokInterface::_fncname() \ { \ TQString ret; \ - if(!stringRetVoidDCOPCall(_iface,_fnc,ret))return false; \ + if(!stringRetVoidDCOPCall(_iface,_fnc,ret))return 0; \ return ret; \ } @@ -168,7 +168,7 @@ KviMediaPlayerInterface::PlayerStatus KviAmarokInterface::status() TQString KviAmarokInterface::mrl() { TQString ret; - if(!stringRetVoidDCOPCall("player","encodedURL()",ret))return false; + if(!stringRetVoidDCOPCall("player","encodedURL()",ret))return 0; KURL url(ret); return url.prettyURL(); } diff --git a/src/modules/mediaplayer/mp_jukinterface.cpp b/src/modules/mediaplayer/mp_jukinterface.cpp index 190b0aff..3ce2abc4 100644 --- a/src/modules/mediaplayer/mp_jukinterface.cpp +++ b/src/modules/mediaplayer/mp_jukinterface.cpp @@ -102,7 +102,7 @@ bool KviJukInterface::setShuffle(bool &bVal) TQString KviJukInterface::_fncname() \ { \ TQString ret; \ - if(!stringRetVoidDCOPCall(_iface,_fnc,ret))return false; \ + if(!stringRetVoidDCOPCall(_iface,_fnc,ret))return 0; \ return ret; \ } -- cgit v1.2.3