From ea611115c4a202598978f71f64e9d0887f45030f Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 19 Dec 2022 16:22:07 +0200 Subject: [PATCH] generic: call KToolInvocation::setLaunchEnv() as static method Signed-off-by: Ivailo Monev --- kcminit/main.cpp | 2 +- kcontrol/input/main.cpp | 4 ++-- kcontrol/input/xcursor/themepage.cpp | 2 +- kcontrol/krdb/krdb.cpp | 2 +- kdontchangethehostname/khostname.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kcminit/main.cpp b/kcminit/main.cpp index 15804102..f37097b5 100644 --- a/kcminit/main.cpp +++ b/kcminit/main.cpp @@ -192,7 +192,7 @@ KCMInit::KCMInit( KCmdLineArgs* args ) // Pass env. var to klauncher. QString name = "KDE_MULTIHEAD"; QString value = multihead ? "true" : "false"; - KToolInvocation::self()->setLaunchEnv(name, value); + KToolInvocation::setLaunchEnv(name, value); setenv( name.toLatin1().constData(), value.toLatin1().constData(), 1 ); // apply effect also to itself if( startup ) diff --git a/kcontrol/input/main.cpp b/kcontrol/input/main.cpp index c5ad55c9..7fdcec1a 100644 --- a/kcontrol/input/main.cpp +++ b/kcontrol/input/main.cpp @@ -77,9 +77,9 @@ extern "C" // Tell klauncher to set the XCURSOR_THEME and XCURSOR_SIZE environment // variables when launching applications. if(!theme.isEmpty()) - KToolInvocation::self()->setLaunchEnv("XCURSOR_THEME", theme); + KToolInvocation::setLaunchEnv("XCURSOR_THEME", theme); if( !size.isEmpty()) - KToolInvocation::self()->setLaunchEnv("XCURSOR_SIZE", size); + KToolInvocation::setLaunchEnv("XCURSOR_SIZE", size); #endif diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp index 97a01992..a1e4d45e 100644 --- a/kcontrol/input/xcursor/themepage.cpp +++ b/kcontrol/input/xcursor/themepage.cpp @@ -258,7 +258,7 @@ bool ThemePage::applyTheme(const CursorTheme *theme, const int size) QByteArray themeName = QFile::encodeName(theme->name()); // Set up the proper launch environment for newly started apps - KToolInvocation::self()->setLaunchEnv("XCURSOR_THEME", themeName); + KToolInvocation::setLaunchEnv("XCURSOR_THEME", themeName); // Update the Xcursor X resources runRdb(0); diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index 6c7c97c8..dda5547f 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -97,7 +97,7 @@ static void applyGtkStyles(bool active, int version) // Pass env. var to klauncher. QString name = gtkEnvVar(version); QString value = list.join(":"); - KToolInvocation::self()->setLaunchEnv(name, value); + KToolInvocation::setLaunchEnv(name, value); } // ----------------------------------------------------------------------------- diff --git a/kdontchangethehostname/khostname.cpp b/kdontchangethehostname/khostname.cpp index 04d32402..84f3257e 100644 --- a/kdontchangethehostname/khostname.cpp +++ b/kdontchangethehostname/khostname.cpp @@ -167,7 +167,7 @@ void KHostName::changeSessionManager() return; } sm = "local/"+newName+sm.mid(i); - KToolInvocation::self()->setLaunchEnv(QString::fromLatin1("SESSION_MANAGER"), sm); + KToolInvocation::setLaunchEnv(QString::fromLatin1("SESSION_MANAGER"), sm); } int main(int argc, char **argv)