svn commit: r478113 - head/x11/kdelibs-kde4/files

[Adriaan de Groot]

Author: adridg
Date: Sun Aug 26 09:39:31 2018
New Revision: 478113
URL: https://svnweb.freebsd.org/changeset/ports/478113

Log:
  More fixes for kdelibs-kde4 for clang7. Same kind of change
  as previous commit -- >0 is weird for bools.
  
  Reported by:	antoine

Added:
  head/x11/kdelibs-kde4/files/patch-kio_kfile_kopenwithdialog.cpp   (contents, props changed)
  head/x11/kdelibs-kde4/files/patch-kio_kfile_kpropertiesdialog.cpp   (contents, props changed)

Added: head/x11/kdelibs-kde4/files/patch-kio_kfile_kopenwithdialog.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/kdelibs-kde4/files/patch-kio_kfile_kopenwithdialog.cpp	Sun Aug 26 09:39:31 2018	(r478113)
@@ -0,0 +1,11 @@
+--- kio/kfile/kopenwithdialog.cpp.orig	2018-08-26 09:15:08 UTC
++++ kio/kfile/kopenwithdialog.cpp
+@@ -713,7 +713,7 @@ void KOpenWithDialog::slotHighlighted(const QString& e
+         // ### indicate that default value was restored
+         d->terminal->setChecked(d->curService->terminal());
+         QString terminalOptions = d->curService->terminalOptions();
+-        d->nocloseonexit->setChecked((terminalOptions.contains(QLatin1String("--noclose")) > 0));
++        d->nocloseonexit->setChecked(bool(terminalOptions.contains(QLatin1String("--noclose"))));
+         d->m_terminaldirty = false; // slotTerminalToggled changed it
+     }
+ }

Added: head/x11/kdelibs-kde4/files/patch-kio_kfile_kpropertiesdialog.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/kdelibs-kde4/files/patch-kio_kfile_kpropertiesdialog.cpp	Sun Aug 26 09:39:31 2018	(r478113)
@@ -0,0 +1,11 @@
+--- kio/kfile/kpropertiesdialog.cpp.orig	2018-08-26 08:56:17 UTC
++++ kio/kfile/kpropertiesdialog.cpp
+@@ -3306,7 +3306,7 @@ void KDesktopPropsPlugin::slotAdvanced()
+ 
+     if (preferredTerminal == "konsole")
+     {
+-        terminalCloseBool = (d->m_terminalOptionStr.contains( "--noclose" ) > 0);
++        terminalCloseBool = bool(d->m_terminalOptionStr.contains( "--noclose" ));
+         w.terminalCloseCheck->setChecked(terminalCloseBool);
+         d->m_terminalOptionStr.remove( "--noclose");
+     }