Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
Plasma Workspace
Commits
cb47835d
Commit
cb47835d
authored
Oct 30, 2020
by
Laurent Montel
Browse files
it depends against qt5.15
parent
11d3721a
Changes
2
Hide whitespace changes
Inline
Side-by-side
libkworkspace/kdisplaymanager.cpp
View file @
cb47835d
...
...
@@ -591,11 +591,7 @@ KDisplayManager::bootOptions(QStringList &opts, int &defopt, int ¤t)
if
(
!
exec
(
"listbootoptions
\n
"
,
re
))
return
false
;
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
opts
=
QString
::
fromLocal8Bit
(
re
.
data
()).
split
(
'\t'
,
QString
::
SkipEmptyParts
);
#else
opts
=
QString
::
fromLocal8Bit
(
re
.
data
()).
split
(
'\t'
,
Qt
::
SkipEmptyParts
);
#endif
if
(
opts
.
size
()
<
4
)
return
false
;
...
...
@@ -607,11 +603,7 @@ KDisplayManager::bootOptions(QStringList &opts, int &defopt, int ¤t)
if
(
!
ok
)
return
false
;
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
opts
=
opts
[
1
].
split
(
' '
,
QString
::
SkipEmptyParts
);
#else
opts
=
opts
[
1
].
split
(
' '
,
Qt
::
SkipEmptyParts
);
#endif
for
(
QStringList
::
Iterator
it
=
opts
.
begin
();
it
!=
opts
.
end
();
++
it
)
(
*
it
).
replace
(
QLatin1String
(
"
\\
s"
),
QLatin1String
(
" "
));
...
...
@@ -755,11 +747,7 @@ KDisplayManager::localSessions(SessList &list)
if
(
DMType
==
OldGDM
)
{
if
(
!
exec
(
"CONSOLE_SERVERS
\n
"
,
re
))
return
false
;
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
const
QStringList
sess
=
QString
(
re
.
data
()
+
3
).
split
(
QChar
(
';'
),
QString
::
SkipEmptyParts
);
#else
const
QStringList
sess
=
QString
(
re
.
data
()
+
3
).
split
(
QChar
(
';'
),
Qt
::
SkipEmptyParts
);
#endif
for
(
QStringList
::
ConstIterator
it
=
sess
.
constBegin
();
it
!=
sess
.
constEnd
();
++
it
)
{
QStringList
ts
=
(
*
it
).
split
(
QChar
(
','
));
SessEnt
se
;
...
...
@@ -774,11 +762,7 @@ KDisplayManager::localSessions(SessList &list)
}
else
{
if
(
!
exec
(
"list
\t
alllocal
\n
"
,
re
))
return
false
;
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
const
QStringList
sess
=
QString
(
re
.
data
()
+
3
).
split
(
QChar
(
'\t'
),
QString
::
SkipEmptyParts
);
#else
const
QStringList
sess
=
QString
(
re
.
data
()
+
3
).
split
(
QChar
(
'\t'
),
Qt
::
SkipEmptyParts
);
#endif
for
(
QStringList
::
ConstIterator
it
=
sess
.
constBegin
();
it
!=
sess
.
constEnd
();
++
it
)
{
QStringList
ts
=
(
*
it
).
split
(
QChar
(
','
));
SessEnt
se
;
...
...
libtaskmanager/launchertasksmodel_p.h
View file @
cb47835d
...
...
@@ -59,11 +59,7 @@ inline static std::pair<QUrl, QStringList> deserializeLauncher(const QString &se
const
auto
activitiesBlockEnd
=
serializedLauncher
.
indexOf
(
"]
\n
"
);
if
(
activitiesBlockEnd
!=
-
1
)
{
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
activities
=
serializedLauncher
.
mid
(
1
,
activitiesBlockEnd
-
1
).
split
(
","
,
QString
::
SkipEmptyParts
);
#else
activities
=
serializedLauncher
.
mid
(
1
,
activitiesBlockEnd
-
1
).
split
(
","
,
Qt
::
SkipEmptyParts
);
#endif
if
(
!
activities
.
isEmpty
())
{
url
=
QUrl
(
serializedLauncher
.
mid
(
activitiesBlockEnd
+
2
));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment