Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 Aug 2018 09:56:48 +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: r478438 - head/x11-fm/krusader2-kde4/files
Message-ID:  <201808300956.w7U9umMV027912@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adridg
Date: Thu Aug 30 09:56:48 2018
New Revision: 478438
URL: https://svnweb.freebsd.org/changeset/ports/478438

Log:
  Fix clang7 build.
  
  PR:		230939
  Reported by:	jbeich

Added:
  head/x11-fm/krusader2-kde4/files/patch-krusader_Dialogs_packgui.cpp   (contents, props changed)
  head/x11-fm/krusader2-kde4/files/patch-krusader_Konfigurator_kgarchives.cpp   (contents, props changed)
  head/x11-fm/krusader2-kde4/files/patch-krusader_Konfigurator_krresulttable.cpp   (contents, props changed)
  head/x11-fm/krusader2-kde4/files/patch-krusader_MountMan_kmountman.cpp   (contents, props changed)

Added: head/x11-fm/krusader2-kde4/files/patch-krusader_Dialogs_packgui.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-fm/krusader2-kde4/files/patch-krusader_Dialogs_packgui.cpp	Thu Aug 30 09:56:48 2018	(r478438)
@@ -0,0 +1,11 @@
+--- krusader/Dialogs/packgui.cpp.orig	2018-08-30 09:48:14 UTC
++++ krusader/Dialogs/packgui.cpp
+@@ -40,7 +40,7 @@
+ #include <QtGui/QComboBox>
+ #include <khistorycombobox.h>
+ 
+-#define PS(x) lst.contains(x)>0
++#define PS(x) bool(lst.contains(x))
+ 
+ // clear the statics first
+ QString PackGUI::filename = 0;

Added: head/x11-fm/krusader2-kde4/files/patch-krusader_Konfigurator_kgarchives.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-fm/krusader2-kde4/files/patch-krusader_Konfigurator_kgarchives.cpp	Thu Aug 30 09:56:48 2018	(r478438)
@@ -0,0 +1,11 @@
+--- krusader/Konfigurator/kgarchives.cpp.orig	2018-08-30 09:48:24 UTC
++++ krusader/Konfigurator/kgarchives.cpp
+@@ -163,7 +163,7 @@ void KgArchives::slotAutoConfigure()
+ 
+ void KgArchives::disableNonExistingPackers()
+ {
+-#define PS(x) lst.contains(x)>0
++#define PS(x) bool(lst.contains(x))
+ 
+     // get list of available packers
+     QStringList lst = KRarcHandler::supportedPackers();

Added: head/x11-fm/krusader2-kde4/files/patch-krusader_Konfigurator_krresulttable.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-fm/krusader2-kde4/files/patch-krusader_Konfigurator_krresulttable.cpp	Thu Aug 30 09:56:48 2018	(r478438)
@@ -0,0 +1,11 @@
+--- krusader/Konfigurator/krresulttable.cpp.orig	2018-08-30 09:48:49 UTC
++++ krusader/Konfigurator/krresulttable.cpp
+@@ -27,7 +27,7 @@
+ 
+ using namespace std;
+ 
+-#define PS(x) _supported.contains(x)>0
++#define PS(x) bool(_supported.contains(x))
+ 
+ KrResultTable::KrResultTable(QWidget* parent)
+         : QWidget(parent),

Added: head/x11-fm/krusader2-kde4/files/patch-krusader_MountMan_kmountman.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-fm/krusader2-kde4/files/patch-krusader_MountMan_kmountman.cpp	Thu Aug 30 09:56:48 2018	(r478438)
@@ -0,0 +1,24 @@
+--- krusader/MountMan/kmountman.cpp.orig	2018-08-30 09:48:03 UTC
++++ krusader/MountMan/kmountman.cpp
+@@ -109,18 +109,18 @@ KMountMan::~KMountMan() {}
+ 
+ bool KMountMan::invalidFilesystem(QString type)
+ {
+-    return (invalid_fs.contains(type) > 0);
++    return (invalid_fs.contains(type));
+ }
+ 
+ // this is an ugly hack, but type can actually be a mountpoint. oh well...
+ bool KMountMan::nonmountFilesystem(QString type, QString mntPoint)
+ {
+-    return((nonmount_fs.contains(type) > 0) || (nonmount_fs_mntpoint.contains(mntPoint) > 0));
++    return(bool(nonmount_fs.contains(type)) || bool(nonmount_fs_mntpoint.contains(mntPoint)));
+ }
+ 
+ bool KMountMan::networkFilesystem(QString type)
+ {
+-    return (network_fs.contains(type) > 0);
++    return (network_fs.contains(type));
+ }
+ 
+ void KMountMan::mainWindow()



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808300956.w7U9umMV027912>