Changeset View
Changeset View
Standalone View
Standalone View
startkde/plasma-session/startup.h
Show All 20 Lines | |||||
21 | CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 21 | CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
22 | 22 | | |||
23 | ******************************************************************/ | 23 | ******************************************************************/ | ||
24 | 24 | | |||
25 | #pragma once | 25 | #pragma once | ||
26 | 26 | | |||
27 | #include <QObject> | 27 | #include <QObject> | ||
28 | #include <KJob> | 28 | #include <KJob> | ||
29 | #include <QProcessEnvironment> | ||||
29 | 30 | | |||
30 | #include "autostart.h" | 31 | #include "autostart.h" | ||
31 | 32 | | |||
32 | class QProcess; | 33 | class QProcess; | ||
33 | 34 | | |||
34 | class Startup : public QObject | 35 | class Startup : public QObject | ||
35 | { | 36 | { | ||
36 | Q_OBJECT | 37 | Q_OBJECT | ||
▲ Show 20 Lines • Show All 45 Lines • ▼ Show 20 Line(s) | |||||
82 | 83 | | |||
83 | /** | 84 | /** | ||
84 | * Launches a process, and waits for the process to start | 85 | * Launches a process, and waits for the process to start | ||
85 | */ | 86 | */ | ||
86 | class StartProcessJob: public KJob | 87 | class StartProcessJob: public KJob | ||
87 | { | 88 | { | ||
88 | Q_OBJECT | 89 | Q_OBJECT | ||
89 | public: | 90 | public: | ||
90 | StartProcessJob(const QString &process, const QStringList &args, const QStringList &env = {}); | 91 | StartProcessJob(const QString &process, const QStringList &args, const QProcessEnvironment &env = QProcessEnvironment::systemEnvironment()); | ||
91 | void start() override; | 92 | void start() override; | ||
92 | private: | 93 | private: | ||
93 | QProcess* m_process; | 94 | QProcess* m_process; | ||
94 | }; | 95 | }; | ||
95 | 96 | | |||
96 | /** | 97 | /** | ||
97 | * Launches a process, and waits for the service to appear on the session bus | 98 | * Launches a process, and waits for the service to appear on the session bus | ||
98 | */ | 99 | */ | ||
99 | class StartServiceJob: public KJob | 100 | class StartServiceJob: public KJob | ||
100 | { | 101 | { | ||
101 | Q_OBJECT | 102 | Q_OBJECT | ||
102 | public: | 103 | public: | ||
103 | StartServiceJob(const QString &process, const QStringList &args, const QString &serviceId, const QStringList &env = {}); | 104 | StartServiceJob(const QString &process, const QStringList &args, const QString &serviceId, const QProcessEnvironment &env = QProcessEnvironment::systemEnvironment()); | ||
104 | void start() override; | 105 | void start() override; | ||
105 | private: | 106 | private: | ||
106 | const QString m_process; | 107 | const QString m_process; | ||
107 | const QStringList m_args; | 108 | const QStringList m_args; | ||
108 | const QStringList m_env; | 109 | const QProcessEnvironment m_env; | ||
109 | }; | 110 | }; | ||
110 | 111 | | |||
111 | class RestoreSessionJob: public KJob | 112 | class RestoreSessionJob: public KJob | ||
112 | { | 113 | { | ||
113 | Q_OBJECT | 114 | Q_OBJECT | ||
114 | public: | 115 | public: | ||
115 | RestoreSessionJob(); | 116 | RestoreSessionJob(); | ||
116 | void start() override; | 117 | void start() override; | ||
117 | private: | 118 | private: | ||
118 | }; | 119 | }; | ||
119 | 120 | |