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
SDDM KCM
Commits
4b6bf615
Commit
4b6bf615
authored
Jan 16, 2021
by
Alexander Lohnau
💬
Browse files
clang-tidy: Force braces around statements
parent
0f779598
Changes
4
Hide whitespace changes
Inline
Side-by-side
sddmauthhelper.cpp
View file @
4b6bf615
...
...
@@ -145,8 +145,9 @@ ActionReply SddmAuthHelper::sync(const QVariantMap &args)
QMap
<
QString
,
QVariant
>::
const_iterator
iterator
;
for
(
iterator
=
args
.
constBegin
();
iterator
!=
args
.
constEnd
();
++
iterator
)
{
if
(
iterator
.
key
()
==
QLatin1String
(
"kde_settings.conf"
))
if
(
iterator
.
key
()
==
QLatin1String
(
"kde_settings.conf"
))
{
continue
;
}
QStringList
configFields
=
iterator
.
key
().
split
(
QLatin1Char
(
'/'
));
if
(
configFields
.
size
()
!=
3
)
{
...
...
@@ -196,8 +197,9 @@ ActionReply SddmAuthHelper::reset(const QVariantMap &args)
QMap
<
QString
,
QVariant
>::
const_iterator
iterator
;
for
(
iterator
=
args
.
constBegin
();
iterator
!=
args
.
constEnd
();
++
iterator
)
{
if
(
iterator
.
key
()
==
QLatin1String
(
"kde_settings.conf"
))
if
(
iterator
.
key
()
==
QLatin1String
(
"kde_settings.conf"
))
{
continue
;
}
QStringList
configFields
=
iterator
.
key
().
split
(
QLatin1Char
(
'/'
));
if
(
configFields
.
size
()
!=
3
)
{
...
...
@@ -236,8 +238,9 @@ ActionReply SddmAuthHelper::save(const QVariantMap &args)
QMap
<
QString
,
QVariant
>::
const_iterator
iterator
;
for
(
iterator
=
args
.
constBegin
();
iterator
!=
args
.
constEnd
();
++
iterator
)
{
if
(
iterator
.
key
()
==
QLatin1String
(
"kde_settings.conf"
)
||
iterator
.
key
()
==
QLatin1String
(
"theme.conf.user"
))
if
(
iterator
.
key
()
==
QLatin1String
(
"kde_settings.conf"
)
||
iterator
.
key
()
==
QLatin1String
(
"theme.conf.user"
))
{
continue
;
}
QStringList
configFields
=
iterator
.
key
().
split
(
QLatin1Char
(
'/'
));
if
(
configFields
.
size
()
!=
3
)
{
...
...
@@ -292,8 +295,9 @@ ActionReply SddmAuthHelper::save(const QVariantMap &args)
sddmOldConfig
->
sync
();
sddmConfig
->
sync
();
if
(
!
themeConfig
.
isNull
())
if
(
!
themeConfig
.
isNull
())
{
themeConfig
->
sync
();
}
return
ActionReply
::
SuccessReply
();
}
...
...
src/sessionmodel.cpp
View file @
4b6bf615
...
...
@@ -67,8 +67,9 @@ void SessionModel::loadDir(const QString &path, SessionType type)
// read session
foreach
(
const
QString
&
session
,
dir
.
entryList
())
{
QFile
inputFile
(
dir
.
absoluteFilePath
(
session
));
if
(
!
inputFile
.
open
(
QIODevice
::
ReadOnly
))
if
(
!
inputFile
.
open
(
QIODevice
::
ReadOnly
))
{
continue
;
}
SessionPtr
si
{
new
Session
{
session
.
chopped
(
strlen
(
".desktop"
)),
QString
(),
QString
(),
QString
()}};
bool
isHidden
=
false
;
QString
current_section
;
...
...
@@ -79,12 +80,14 @@ void SessionModel::loadDir(const QString &path, SessionType type)
if
(
line
.
startsWith
(
QLatin1String
(
"["
)))
{
// The section name ends before the last ] before the start of a comment
int
end
=
line
.
lastIndexOf
(
QLatin1Char
(
']'
),
line
.
indexOf
(
QLatin1Char
(
'#'
)));
if
(
end
!=
-
1
)
if
(
end
!=
-
1
)
{
current_section
=
line
.
mid
(
1
,
end
-
1
);
}
}
if
(
current_section
!=
QLatin1String
(
"Desktop Entry"
))
if
(
current_section
!=
QLatin1String
(
"Desktop Entry"
))
{
continue
;
// We are only interested in the "Desktop Entry" section
}
if
(
line
.
startsWith
(
QLatin1String
(
"Name="
)))
{
si
->
name
=
line
.
mid
(
5
);
...
...
@@ -96,12 +99,15 @@ void SessionModel::loadDir(const QString &path, SessionType type)
}
}
}
if
(
line
.
startsWith
(
QLatin1String
(
"Exec="
)))
if
(
line
.
startsWith
(
QLatin1String
(
"Exec="
)))
{
si
->
exec
=
line
.
mid
(
5
);
if
(
line
.
startsWith
(
QLatin1String
(
"Comment="
)))
}
if
(
line
.
startsWith
(
QLatin1String
(
"Comment="
)))
{
si
->
comment
=
line
.
mid
(
8
);
if
(
line
.
startsWith
(
QLatin1String
(
"Hidden="
)))
}
if
(
line
.
startsWith
(
QLatin1String
(
"Hidden="
)))
{
isHidden
=
line
.
mid
(
7
).
toLower
()
==
QLatin1String
(
"true"
);
}
}
if
(
!
isHidden
)
{
// add to sessions list
...
...
@@ -133,21 +139,23 @@ int SessionModel::rowCount(const QModelIndex &parent) const
QVariant
SessionModel
::
data
(
const
QModelIndex
&
index
,
int
role
)
const
{
if
(
index
.
row
()
<
0
||
index
.
row
()
>=
d
->
sessions
.
count
())
if
(
index
.
row
()
<
0
||
index
.
row
()
>=
d
->
sessions
.
count
())
{
return
QVariant
();
}
// get session
SessionPtr
session
=
d
->
sessions
[
index
.
row
()];
// return correct value
if
(
role
==
FileRole
)
if
(
role
==
FileRole
)
{
return
session
->
file
;
else
if
(
role
==
NameRole
)
}
else
if
(
role
==
NameRole
)
{
return
session
->
name
;
else
if
(
role
==
ExecRole
)
}
else
if
(
role
==
ExecRole
)
{
return
session
->
exec
;
else
if
(
role
==
CommentRole
)
}
else
if
(
role
==
CommentRole
)
{
return
session
->
comment
;
}
// return empty value
return
QVariant
();
...
...
src/thememetadata.cpp
View file @
4b6bf615
...
...
@@ -59,8 +59,9 @@ ThemeMetadata::ThemeMetadata(const ThemeMetadata &other)
ThemeMetadata
&
ThemeMetadata
::
operator
=
(
const
ThemeMetadata
&
other
)
{
if
(
this
!=
&
other
)
if
(
this
!=
&
other
)
{
d
=
other
.
d
;
}
return
*
this
;
}
...
...
src/usersmodel.cpp
View file @
4b6bf615
...
...
@@ -89,12 +89,15 @@ void UsersModel::populate()
int
UsersModel
::
indexOf
(
const
QString
&
user
)
{
if
(
user
.
isEmpty
())
if
(
user
.
isEmpty
())
{
return
0
;
}
// find user index
for
(
int
i
=
0
;
i
<
mUserList
.
size
();
++
i
)
if
(
mUserList
.
at
(
i
).
loginName
()
==
user
)
for
(
int
i
=
0
;
i
<
mUserList
.
size
();
++
i
)
{
if
(
mUserList
.
at
(
i
).
loginName
()
==
user
)
{
return
i
;
}
}
// user not found
return
0
;
}
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