svn commit: r478418 - in head/games: kolf-kde4/files ksirk-kde4/files

[Adriaan de Groot]

Author: adridg
Date: Wed Aug 29 20:49:02 2018
New Revision: 478418
URL: https://svnweb.freebsd.org/changeset/ports/478418

Log:
  Clang7 fixes for some old soon-to-be-deprecated KDE4 games.
  
  PR:		230938 230942
  Reported by:	jbeich

Added:
  head/games/kolf-kde4/files/
  head/games/kolf-kde4/files/patch-kcomboboxdialog.cpp   (contents, props changed)
  head/games/kolf-kde4/files/patch-newgame.cpp   (contents, props changed)
  head/games/ksirk-kde4/files/
  head/games/ksirk-kde4/files/patch-ksirk_iris_src_xmpp_xmpp-im_filetransfer.cpp   (contents, props changed)

Added: head/games/kolf-kde4/files/patch-kcomboboxdialog.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/kolf-kde4/files/patch-kcomboboxdialog.cpp	Wed Aug 29 20:49:02 2018	(r478418)
@@ -0,0 +1,11 @@
+--- kcomboboxdialog.cpp.orig	2018-08-29 20:31:46 UTC
++++ kcomboboxdialog.cpp
+@@ -94,7 +94,7 @@ QString KComboBoxDialog::getItem( const 
+ 		KConfigGroup *configGroup = new KConfigGroup(config->group("Notification Messages"));
+ 		prevAnswer = configGroup->readEntry( dontAskAgainName,QString() );
+ 		if ( !prevAnswer.isEmpty() )
+-			if ( _items.contains( prevAnswer ) > 0 )
++			if ( bool(_items.contains( prevAnswer ) ) )
+ 				return prevAnswer;
+ 	}
+ 

Added: head/games/kolf-kde4/files/patch-newgame.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/kolf-kde4/files/patch-newgame.cpp	Wed Aug 29 20:49:02 2018	(r478418)
@@ -0,0 +1,11 @@
+--- newgame.cpp.orig	2018-08-29 20:35:41 UTC
++++ newgame.cpp
+@@ -285,7 +285,7 @@ void NewGameDialog::addCourse()
+ 
+ 	for (QStringList::const_iterator fileIt = files.begin(); fileIt != files.end(); ++fileIt)
+ 	{
+-		if (names.contains(*fileIt) > 0)
++		if (bool(names.contains(*fileIt)))
+ 		{
+ 			hasDuplicates = true;
+ 			continue;

Added: head/games/ksirk-kde4/files/patch-ksirk_iris_src_xmpp_xmpp-im_filetransfer.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/ksirk-kde4/files/patch-ksirk_iris_src_xmpp_xmpp-im_filetransfer.cpp	Wed Aug 29 20:49:02 2018	(r478418)
@@ -0,0 +1,11 @@
+--- ksirk/iris/src/xmpp/xmpp-im/filetransfer.cpp.orig	2018-08-29 15:45:06 UTC
++++ ksirk/iris/src/xmpp/xmpp-im/filetransfer.cpp
+@@ -396,7 +396,7 @@ FileTransfer *FileTransferManager::takeI
+ 
+ bool FileTransferManager::isActive(const FileTransfer *ft) const
+ {
+-	return d->list.contains(const_cast<FileTransfer*>(ft)) > 0;
++	return bool(d->list.contains(const_cast<FileTransfer*>(ft)));
+ }
+ 
+ void FileTransferManager::pft_incoming(const FTRequest &req)