From 675d5c421688b637f8aea97fffb6ee77a3a2dfaa Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Mon, 19 Apr 2021 10:42:58 +0300
Subject: [PATCH] effects: Remove outdated ksplash window class strings

ksplash nowadays has only "ksplashqml ksplashqml" window class.
---
 src/effects/fade/package/contents/code/main.js       |  4 +---
 .../fadingpopups/package/contents/code/main.js       |  4 +---
 src/effects/glide/glide.cpp                          |  2 --
 src/effects/login/package/contents/code/main.js      | 12 +-----------
 src/effects/scale/package/contents/code/main.js      |  4 +---
 5 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/src/effects/fade/package/contents/code/main.js b/src/effects/fade/package/contents/code/main.js
index d5337fb3a5..7957007f03 100644
--- a/src/effects/fade/package/contents/code/main.js
+++ b/src/effects/fade/package/contents/code/main.js
@@ -14,9 +14,7 @@ var blacklist = [
     "ksmserver-logout-greeter ksmserver-logout-greeter",
 
     // The splash screen has to be animated only by the login effect.
-    "ksplashqml ksplashqml",
-    "ksplashsimple ksplashsimple",
-    "ksplashx ksplashx"
+    "ksplashqml ksplashqml"
 ];
 
 function isFadeWindow(w) {
diff --git a/src/effects/fadingpopups/package/contents/code/main.js b/src/effects/fadingpopups/package/contents/code/main.js
index b49adcd274..a51f2a19ec 100644
--- a/src/effects/fadingpopups/package/contents/code/main.js
+++ b/src/effects/fadingpopups/package/contents/code/main.js
@@ -15,9 +15,7 @@ var blacklist = [
     "ksmserver-logout-greeter ksmserver-logout-greeter",
 
     // KDE Plasma splash screen has to be animated only by the login effect.
-    "ksplashqml ksplashqml",
-    "ksplashsimple ksplashsimple",
-    "ksplashx ksplashx"
+    "ksplashqml ksplashqml"
 ];
 
 function isPopupWindow(window) {
diff --git a/src/effects/glide/glide.cpp b/src/effects/glide/glide.cpp
index ea3d2be75d..adfb5bc7b2 100644
--- a/src/effects/glide/glide.cpp
+++ b/src/effects/glide/glide.cpp
@@ -27,8 +27,6 @@ static const QSet<QString> s_blacklist {
     QStringLiteral("ksmserver ksmserver"),
     QStringLiteral("ksmserver-logout-greeter ksmserver-logout-greeter"),
     QStringLiteral("ksplashqml ksplashqml"),
-    QStringLiteral("ksplashsimple ksplashsimple"),
-    QStringLiteral("ksplashx ksplashx")
 };
 
 GlideEffect::GlideEffect()
diff --git a/src/effects/login/package/contents/code/main.js b/src/effects/login/package/contents/code/main.js
index a4b91a853d..7f849a6e2e 100644
--- a/src/effects/login/package/contents/code/main.js
+++ b/src/effects/login/package/contents/code/main.js
@@ -17,17 +17,7 @@ var loginEffect = {
         loginEffect.isFadeToBlack = effect.readConfig("FadeToBlack", false);
     },
     isLoginSplash: function (window) {
-        var windowClass = window.windowClass;
-        if (windowClass === "ksplashx ksplashx") {
-            return true;
-        }
-        if (windowClass === "ksplashsimple ksplashsimple") {
-            return true;
-        }
-        if (windowClass === "ksplashqml ksplashqml") {
-            return true;
-        }
-        return false;
+        return window.windowClass === "ksplashqml ksplashqml";
     },
     fadeOut: function (window) {
         animate({
diff --git a/src/effects/scale/package/contents/code/main.js b/src/effects/scale/package/contents/code/main.js
index f088f8ce38..61c0ec37fc 100644
--- a/src/effects/scale/package/contents/code/main.js
+++ b/src/effects/scale/package/contents/code/main.js
@@ -15,9 +15,7 @@ var blacklist = [
     "ksmserver-logout-greeter ksmserver-logout-greeter",
 
     // KDE Plasma splash screen has to be animated only by the login effect.
-    "ksplashqml ksplashqml",
-    "ksplashsimple ksplashsimple",
-    "ksplashx ksplashx"
+    "ksplashqml ksplashqml"
 ];
 
 var scaleEffect = {