Fix FTBFS with GCC6

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/1/head
Slávek Banko 8 years ago
parent 72db948aa6
commit c170347975

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

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

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

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

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

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

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

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

Loading…
Cancel
Save