kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix build with clang7.

Browse source 
PR:		230936
Reported by:	jbeich
This commit is contained in:
Adriaan de Groot 2018-08-30 10:09:40 +00:00
parent f50362b4fc
commit f88c332dc0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=478440
3 changed files with 60 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
x11/kde-workspace-kde4/files/patch-khotkeys_libkhotkeysprivate_windows__helper_window__selection__rules.cpp Normal file
View file

@ -0,0 +1,20 @@
--- khotkeys/libkhotkeysprivate/windows_helper/window_selection_rules.cpp.orig 2018-08-30 10:04:38 UTC
+++ khotkeys/libkhotkeysprivate/windows_helper/window_selection_rules.cpp
@@ -91,7 +91,7 @@ bool Windowdef_simple::is_substr_match(
case NOT_IMPORTANT :
return true;
case CONTAINS :
- return str1_P.contains( str2_P ) > 0;
+ return bool(str1_P.contains( str2_P ));
case IS :
return str1_P == str2_P;
case REGEXP :
@@ -100,7 +100,7 @@ bool Windowdef_simple::is_substr_match(
return rg.indexIn( str1_P ) >= 0;
}
case CONTAINS_NOT :
- return str1_P.contains( str2_P ) == 0;
+ return !str1_P.contains( str2_P );
case IS_NOT :
return str1_P != str2_P;
case REGEXP_NOT :

15
x11/kde-workspace-kde4/files/patch-libs_taskmanager_task.cpp Normal file
View file

@ -0,0 +1,15 @@
--- libs/taskmanager/task.cpp.orig 2018-08-30 10:05:33 UTC
+++ libs/taskmanager/task.cpp
@@ -478,10 +478,10 @@ bool Task::idMatch(const QString& id1, c
if (id1.isEmpty() || id2.isEmpty())
return false;
- if (id1.contains(id2) > 0)
+ if (id1.contains(id2))
return true;
- if (id2.contains(id1) > 0)
+ if (id2.contains(id1))
return true;
return false;

25
x11/kde-workspace-kde4/files/patch-plasma_generic_dataengines_weather_ions_bbcukmet_ion__bbcukmet.cpp Normal file
View file

@ -0,0 +1,25 @@
--- plasma/generic/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp.orig 2018-08-30 10:05:25 UTC
+++ plasma/generic/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp
@@ -312,11 +312,11 @@ void UKMETIon::readSearchHTMLData(const
while (!stream.atEnd()) {
line = stream.readLine();
- if (line.contains("<p class=\"response\">") > 0) {
+ if (line.contains("<p class=\"response\">")) {
flag = 1;
}
- if (line.contains("There are no forecasts matching") > 0) {
+ if (line.contains("There are no forecasts matching")) {
break;
}
@@ -342,7 +342,7 @@ void UKMETIon::readSearchHTMLData(const
}
}
- if (line.contains("<div class=\"line\">") > 0) {
+ if (line.contains("<div class=\"line\">")) {
flag = 0;
}
}