Date: Fri, 7 Sep 2018 10:21:10 +0000 (UTC) From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479185 - head/net-im/kopete-kde4/files Message-ID: <201809071021.w87ALADU030831@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adridg Date: Fri Sep 7 10:21:09 2018 New Revision: 479185 URL: https://svnweb.freebsd.org/changeset/ports/479185 Log: Fix net-im/kopete-kde4 with clang7. More of the same boolean foolishness. Reported by: jbeich Added: head/net-im/kopete-kde4/files/patch-kopete_kconf__update_kopete-nameTracking.cpp (contents, props changed) head/net-im/kopete-kde4/files/patch-protocols_irc_libkirc_kircengine__ctcp.cpp (contents, props changed) head/net-im/kopete-kde4/files/patch-protocols_irc_libkirc_plugins_ctcp_kircctcpmessages.cpp (contents, props changed) head/net-im/kopete-kde4/files/patch-protocols_jabber_libiris_src_xmpp_xmpp-im_filetransfer.cpp (contents, props changed) Added: head/net-im/kopete-kde4/files/patch-kopete_kconf__update_kopete-nameTracking.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/kopete-kde4/files/patch-kopete_kconf__update_kopete-nameTracking.cpp Fri Sep 7 10:21:09 2018 (r479185) @@ -0,0 +1,11 @@ +--- kopete/kconf_update/kopete-nameTracking.cpp.orig 2018-09-07 10:14:33 UTC ++++ kopete/kconf_update/kopete-nameTracking.cpp +@@ -59,7 +59,7 @@ int main() + // check if it's a contact by checking for "protocol" substring in the tag, + // and the presence of a contactId child element. + QString pluginId = elem.attribute( QLatin1String( "plugin-id" ) ); +- bool isProtocol = ( pluginId.contains( "protocol", false ) > 0 ); // case-insensitive search ++ bool isProtocol = bool( pluginId.contains( "protocol", false ) ); // case-insensitive search + bool hasContactId = false; + QDomNode field = elem.firstChild(); + while( !field.isNull() ) Added: head/net-im/kopete-kde4/files/patch-protocols_irc_libkirc_kircengine__ctcp.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/kopete-kde4/files/patch-protocols_irc_libkirc_kircengine__ctcp.cpp Fri Sep 7 10:21:09 2018 (r479185) @@ -0,0 +1,11 @@ +--- protocols/irc/libkirc/kircengine_ctcp.cpp.orig 2018-09-07 10:14:46 UTC ++++ protocols/irc/libkirc/kircengine_ctcp.cpp +@@ -153,7 +153,7 @@ void Engine::CtcpRequest_dcc(const QStri + { + QFileInfo file(fileName); + QString noWhiteSpace = file.fileName(); +- if (noWhiteSpace.contains(' ') > 0) ++ if (noWhiteSpace.contains(' ') ) + noWhiteSpace.replace(QRegExp("\\s+"), "_"); + + TransferServer *server = TransferHandler::self()->createServer(this, nickname, type, fileName, file.size()); Added: head/net-im/kopete-kde4/files/patch-protocols_irc_libkirc_plugins_ctcp_kircctcpmessages.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/kopete-kde4/files/patch-protocols_irc_libkirc_plugins_ctcp_kircctcpmessages.cpp Fri Sep 7 10:21:09 2018 (r479185) @@ -0,0 +1,11 @@ +--- protocols/irc/libkirc/plugins/ctcp/kircctcpmessages.cpp.orig 2018-09-07 10:14:53 UTC ++++ protocols/irc/libkirc/plugins/ctcp/kircctcpmessages.cpp +@@ -101,7 +101,7 @@ void StdCommands::CtcpRequest_dcc(const + { + QFileInfo file(fileName); + QString noWhiteSpace = file.fileName(); +- if (noWhiteSpace.contains(' ') > 0) ++ if (noWhiteSpace.contains(' ') ) + noWhiteSpace.replace(QRegExp("\\s+"), "_"); + + TransferServer *server = TransferHandler::self()->createServer(this, nickname, type, fileName, file.size()); Added: head/net-im/kopete-kde4/files/patch-protocols_jabber_libiris_src_xmpp_xmpp-im_filetransfer.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/kopete-kde4/files/patch-protocols_jabber_libiris_src_xmpp_xmpp-im_filetransfer.cpp Fri Sep 7 10:21:09 2018 (r479185) @@ -0,0 +1,11 @@ +--- protocols/jabber/libiris/src/xmpp/xmpp-im/filetransfer.cpp.orig 2018-09-07 10:16:18 UTC ++++ protocols/jabber/libiris/src/xmpp/xmpp-im/filetransfer.cpp +@@ -430,7 +430,7 @@ FileTransfer *FileTransferManager::takeI + + bool FileTransferManager::isActive(const FileTransfer *ft) const + { +- return d->list.contains(const_cast<FileTransfer*>(ft)) > 0; ++ return d->list.contains(const_cast<FileTransfer*>(ft)); + } + + void FileTransferManager::setDisabled(const QString &ns, bool state)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809071021.w87ALADU030831>