diff options
| author | Adriaan de Groot <adridg@FreeBSD.org> | 2018-08-30 09:56:48 +0000 |
|---|---|---|
| committer | Adriaan de Groot <adridg@FreeBSD.org> | 2018-08-30 09:56:48 +0000 |
| commit | 3bce3e09285de805cfe8eb73ba4f989bf15e6173 (patch) | |
| tree | 4d9c4df5f7274a6f1cd907db7ac435e3ed17bf1e /x11-fm | |
| parent | 0f1fcce5bb6856a47f15b622c11315c045031c8e (diff) | |
| download | ports-3bce3e09285de805cfe8eb73ba4f989bf15e6173.tar.gz ports-3bce3e09285de805cfe8eb73ba4f989bf15e6173.zip | |
Fix clang7 build.
PR: 230939
Reported by: jbeich
Notes
Notes:
svn path=/head/; revision=478438
Diffstat (limited to 'x11-fm')
4 files changed, 57 insertions, 0 deletions
diff --git a/x11-fm/krusader2-kde4/files/patch-krusader_Dialogs_packgui.cpp b/x11-fm/krusader2-kde4/files/patch-krusader_Dialogs_packgui.cpp new file mode 100644 index 000000000000..9f239e6e03dd --- /dev/null +++ b/x11-fm/krusader2-kde4/files/patch-krusader_Dialogs_packgui.cpp @@ -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; diff --git a/x11-fm/krusader2-kde4/files/patch-krusader_Konfigurator_kgarchives.cpp b/x11-fm/krusader2-kde4/files/patch-krusader_Konfigurator_kgarchives.cpp new file mode 100644 index 000000000000..b8466274de91 --- /dev/null +++ b/x11-fm/krusader2-kde4/files/patch-krusader_Konfigurator_kgarchives.cpp @@ -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(); diff --git a/x11-fm/krusader2-kde4/files/patch-krusader_Konfigurator_krresulttable.cpp b/x11-fm/krusader2-kde4/files/patch-krusader_Konfigurator_krresulttable.cpp new file mode 100644 index 000000000000..11169caf4c4e --- /dev/null +++ b/x11-fm/krusader2-kde4/files/patch-krusader_Konfigurator_krresulttable.cpp @@ -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), diff --git a/x11-fm/krusader2-kde4/files/patch-krusader_MountMan_kmountman.cpp b/x11-fm/krusader2-kde4/files/patch-krusader_MountMan_kmountman.cpp new file mode 100644 index 000000000000..2c80dad452df --- /dev/null +++ b/x11-fm/krusader2-kde4/files/patch-krusader_MountMan_kmountman.cpp @@ -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() |