Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-24 02:42:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: adjust to KToolInvocation changes

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-12-08 06:36:46 +02:00
parent 5d2fc37272
commit eba0c48859
5 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
kcminit/main.cpp
View file

@ -38,7 +38,6 @@
#include <klocale.h> #include <klocale.h>
#include <ktoolinvocation.h> #include <ktoolinvocation.h>
#include <kservicetypetrader.h> #include <kservicetypetrader.h>
#include <klauncher_iface.h>
#ifdef Q_WS_X11 #ifdef Q_WS_X11
#include <X11/Xlib.h> #include <X11/Xlib.h>
@ -193,7 +192,7 @@ KCMInit::KCMInit( KCmdLineArgs* args )
// Pass env. var to klauncher. // Pass env. var to klauncher.
QString name = "KDE_MULTIHEAD"; QString name = "KDE_MULTIHEAD";
QString value = multihead ? "true" : "false"; QString value = multihead ? "true" : "false";
KToolInvocation::klauncher()->setLaunchEnv(name, value); KToolInvocation::self()->setLaunchEnv(name, value);
setenv( name.toLatin1().constData(), value.toLatin1().constData(), 1 ); // apply effect also to itself setenv( name.toLatin1().constData(), value.toLatin1().constData(), 1 ); // apply effect also to itself
if( startup ) if( startup )

5
kcontrol/input/main.cpp
View file

@ -32,7 +32,6 @@
#include <QtGui/qx11info_x11.h> #include <QtGui/qx11info_x11.h>
#include <ktoolinvocation.h> #include <ktoolinvocation.h>
#include <klauncher_iface.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#ifdef HAVE_XCURSOR #ifdef HAVE_XCURSOR
@ -78,9 +77,9 @@ extern "C"
// Tell klauncher to set the XCURSOR_THEME and XCURSOR_SIZE environment // Tell klauncher to set the XCURSOR_THEME and XCURSOR_SIZE environment
// variables when launching applications. // variables when launching applications.
if(!theme.isEmpty()) if(!theme.isEmpty())
KToolInvocation::klauncher()->setLaunchEnv("XCURSOR_THEME", theme); KToolInvocation::self()->setLaunchEnv("XCURSOR_THEME", theme);
if( !size.isEmpty()) if( !size.isEmpty())
KToolInvocation::klauncher()->setLaunchEnv("XCURSOR_SIZE", size); KToolInvocation::self()->setLaunchEnv("XCURSOR_SIZE", size);
#endif #endif

3
kcontrol/input/xcursor/themepage.cpp
View file

@ -31,7 +31,6 @@
#include <KArchive> #include <KArchive>
#include <KDebug> #include <KDebug>
#include <klauncher_iface.h>
#include "../../krdb/krdb.h" #include "../../krdb/krdb.h"
#include <QWidget> #include <QWidget>
@ -259,7 +258,7 @@ bool ThemePage::applyTheme(const CursorTheme *theme, const int size)
QByteArray themeName = QFile::encodeName(theme->name()); QByteArray themeName = QFile::encodeName(theme->name());
// Set up the proper launch environment for newly started apps // Set up the proper launch environment for newly started apps
KToolInvocation::klauncher()->setLaunchEnv("XCURSOR_THEME", themeName); KToolInvocation::self()->setLaunchEnv("XCURSOR_THEME", themeName);
// Update the Xcursor X resources // Update the Xcursor X resources
runRdb(0); runRdb(0);

3
kcontrol/krdb/krdb.cpp
View file

@ -34,7 +34,6 @@
#include <QProcess> #include <QProcess>
#include <ktoolinvocation.h> #include <ktoolinvocation.h>
#include <klauncher_iface.h>
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <kconfig.h>
#include <kconfiggroup.h> #include <kconfiggroup.h>
@ -98,7 +97,7 @@ static void applyGtkStyles(bool active, int version)
// Pass env. var to klauncher. // Pass env. var to klauncher.
QString name = gtkEnvVar(version); QString name = gtkEnvVar(version);
QString value = list.join(":"); QString value = list.join(":");
KToolInvocation::klauncher()->setLaunchEnv(name, value); KToolInvocation::self()->setLaunchEnv(name, value);
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

3
kdontchangethehostname/khostname.cpp
View file

@ -33,7 +33,6 @@
#include <kglobal.h> #include <kglobal.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <ktoolinvocation.h> #include <ktoolinvocation.h>
#include <klauncher_iface.h>
#include <kde_file.h> #include <kde_file.h>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
@ -168,7 +167,7 @@ void KHostName::changeSessionManager()
return; return;
} }
sm = "local/"+newName+sm.mid(i); sm = "local/"+newName+sm.mid(i);
KToolInvocation::klauncher()->setLaunchEnv(QString::fromLatin1("SESSION_MANAGER"), sm); KToolInvocation::self()->setLaunchEnv(QString::fromLatin1("SESSION_MANAGER"), sm);
} }
int main(int argc, char **argv) int main(int argc, char **argv)