From 04a601c50e86178d87c14e6bba038792aad01a5b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 26 Aug 2018 09:39:31 +0000 Subject: [PATCH] More fixes for kdelibs-kde4 for clang7. Same kind of change as previous commit -- >0 is weird for bools. Reported by: antoine --- .../files/patch-kio_kfile_kopenwithdialog.cpp | 11 +++++++++++ .../files/patch-kio_kfile_kpropertiesdialog.cpp | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 x11/kdelibs-kde4/files/patch-kio_kfile_kopenwithdialog.cpp create mode 100644 x11/kdelibs-kde4/files/patch-kio_kfile_kpropertiesdialog.cpp diff --git a/x11/kdelibs-kde4/files/patch-kio_kfile_kopenwithdialog.cpp b/x11/kdelibs-kde4/files/patch-kio_kfile_kopenwithdialog.cpp new file mode 100644 index 000000000000..0dfa1a985a48 --- /dev/null +++ b/x11/kdelibs-kde4/files/patch-kio_kfile_kopenwithdialog.cpp @@ -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 + } + } diff --git a/x11/kdelibs-kde4/files/patch-kio_kfile_kpropertiesdialog.cpp b/x11/kdelibs-kde4/files/patch-kio_kfile_kpropertiesdialog.cpp new file mode 100644 index 000000000000..d213a2ac172e --- /dev/null +++ b/x11/kdelibs-kde4/files/patch-kio_kfile_kpropertiesdialog.cpp @@ -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"); + }