diff options
| author | adridg <adridg@FreeBSD.org> | 2018-09-07 18:21:09 +0800 |
|---|---|---|
| committer | adridg <adridg@FreeBSD.org> | 2018-09-07 18:21:09 +0800 |
| commit | e24b1a69d53259698b2e375a9a59d483f822ff48 (patch) | |
| tree | 9ea2465eca0f45fd41568ceb5894ec9144908e60 /net-im | |
| parent | 322f37e0b4b7564071cc212e893103a39bdf8724 (diff) | |
| download | freebsd-ports-gnome-e24b1a69d53259698b2e375a9a59d483f822ff48.tar.gz freebsd-ports-gnome-e24b1a69d53259698b2e375a9a59d483f822ff48.tar.zst freebsd-ports-gnome-e24b1a69d53259698b2e375a9a59d483f822ff48.zip | |
Fix net-im/kopete-kde4 with clang7. More of the same boolean foolishness.
Reported by: jbeich
Diffstat (limited to 'net-im')
4 files changed, 44 insertions, 0 deletions
diff --git a/net-im/kopete-kde4/files/patch-kopete_kconf__update_kopete-nameTracking.cpp b/net-im/kopete-kde4/files/patch-kopete_kconf__update_kopete-nameTracking.cpp new file mode 100644 index 000000000000..1ed2632205be --- /dev/null +++ b/net-im/kopete-kde4/files/patch-kopete_kconf__update_kopete-nameTracking.cpp @@ -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() ) diff --git a/net-im/kopete-kde4/files/patch-protocols_irc_libkirc_kircengine__ctcp.cpp b/net-im/kopete-kde4/files/patch-protocols_irc_libkirc_kircengine__ctcp.cpp new file mode 100644 index 000000000000..e0e8106b3351 --- /dev/null +++ b/net-im/kopete-kde4/files/patch-protocols_irc_libkirc_kircengine__ctcp.cpp @@ -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()); diff --git a/net-im/kopete-kde4/files/patch-protocols_irc_libkirc_plugins_ctcp_kircctcpmessages.cpp b/net-im/kopete-kde4/files/patch-protocols_irc_libkirc_plugins_ctcp_kircctcpmessages.cpp new file mode 100644 index 000000000000..95093da31c1f --- /dev/null +++ b/net-im/kopete-kde4/files/patch-protocols_irc_libkirc_plugins_ctcp_kircctcpmessages.cpp @@ -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()); diff --git a/net-im/kopete-kde4/files/patch-protocols_jabber_libiris_src_xmpp_xmpp-im_filetransfer.cpp b/net-im/kopete-kde4/files/patch-protocols_jabber_libiris_src_xmpp_xmpp-im_filetransfer.cpp new file mode 100644 index 000000000000..948cdfd3008e --- /dev/null +++ b/net-im/kopete-kde4/files/patch-protocols_jabber_libiris_src_xmpp_xmpp-im_filetransfer.cpp @@ -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) |