File Fix-compilation-with-gcc11.patch of Package kdebase4-workspace

From e6546c32085abeec42d79de70d2f5796f1b70233 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Tue, 8 Jun 2021 20:05:40 +0200
Subject: [PATCH] Fix compilation with gcc11

`QString.contains()` returns boolean, so checking for > 0 doesn't really
make sense.

Fixes "ordered comparison of pointer with integer zero" compiler errors
when using gcc11.
---
 .../windows_helper/window_selection_rules.cpp                 | 2 +-
 libs/taskmanager/task.cpp                                     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/khotkeys/libkhotkeysprivate/windows_helper/window_selection_rules.cpp b/khotkeys/libkhotkeysprivate/windows_helper/window_selection_rules.cpp
index 29f6bd325e..1a67e62f23 100644
--- a/khotkeys/libkhotkeysprivate/windows_helper/window_selection_rules.cpp
+++ b/khotkeys/libkhotkeysprivate/windows_helper/window_selection_rules.cpp
@@ -91,7 +91,7 @@ bool Windowdef_simple::is_substr_match( const QString& str1_P, const QString& st
         case NOT_IMPORTANT :
           return true;
         case CONTAINS :
-          return str1_P.contains( str2_P ) > 0;
+          return str1_P.contains( str2_P );
         case IS :
           return str1_P == str2_P;
         case REGEXP :
diff --git a/libs/taskmanager/task.cpp b/libs/taskmanager/task.cpp
index 3d5da1a7bd..411bdb57da 100644
--- a/libs/taskmanager/task.cpp
+++ b/libs/taskmanager/task.cpp
@@ -478,10 +478,10 @@ bool Task::idMatch(const QString& id1, const QString& id2)
     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;
-- 
2.26.2

openSUSE Build Service is sponsored by