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 Desktop
Commits
a910acb7
Commit
a910acb7
authored
Oct 21, 2020
by
Ahmad Samir
Browse files
kcm_keyboard: Port foreach (deprecated) to range-for and qDeleteAll
parent
e725782c
Changes
6
Hide whitespace changes
Inline
Side-by-side
kcms/keyboard/layouts_menu.cpp
View file @
a910acb7
...
...
@@ -106,15 +106,15 @@ QList<QAction*> LayoutsMenu::contextualActions()
actionGroup
=
new
QActionGroup
(
this
);
X11Helper
::
getLayoutsList
();
//UGLY: seems to be more reliable with extra call
QList
<
LayoutUnit
>
currentLayouts
=
X11Helper
::
getLayoutsList
();
for
each
(
const
LayoutUnit
&
layoutUnit
,
currentLayouts
)
{
const
QList
<
LayoutUnit
>
currentLayouts
=
X11Helper
::
getLayoutsList
();
for
(
const
auto
&
layoutUnit
:
currentLayouts
)
{
QAction
*
action
=
createAction
(
layoutUnit
);
actionGroup
->
addAction
(
action
);
}
if
(
keyboardConfig
.
configureLayouts
)
{
QList
<
LayoutUnit
>
extraLayouts
=
keyboardConfig
.
layouts
;
for
each
(
const
LayoutUnit
&
layoutUnit
,
currentLayouts
)
{
for
(
const
auto
&
layoutUnit
:
currentLayouts
)
{
extraLayouts
.
removeOne
(
layoutUnit
);
}
if
(
extraLayouts
.
size
()
>
0
)
{
...
...
@@ -122,7 +122,7 @@ QList<QAction*> LayoutsMenu::contextualActions()
separator
->
setSeparator
(
true
);
actionGroup
->
addAction
(
separator
);
for
each
(
const
LayoutUnit
&
layoutUnit
,
extraLayouts
)
{
for
(
const
auto
&
layoutUnit
:
qAsConst
(
extraLayouts
)
)
{
QAction
*
action
=
createAction
(
layoutUnit
);
actionGroup
->
addAction
(
action
);
}
...
...
kcms/keyboard/x11_helper.cpp
View file @
a910acb7
...
...
@@ -92,7 +92,7 @@ void X11Helper::scrollLayouts(int delta)
QStringList
X11Helper
::
getLayoutsListAsString
(
const
QList
<
LayoutUnit
>&
layoutsList
)
{
QStringList
stringList
;
for
each
(
const
LayoutUnit
&
layoutUnit
,
layoutsList
)
{
for
(
const
auto
&
layoutUnit
:
layoutsList
)
{
stringList
<<
layoutUnit
.
toString
();
}
return
stringList
;
...
...
kcms/keyboard/x11_helper.h
View file @
a910acb7
...
...
@@ -168,7 +168,7 @@ struct LayoutSet {
QString
toString
()
const
{
QString
str
(
currentLayout
.
toString
());
str
+=
QLatin1String
(
": "
);
for
each
(
const
LayoutUnit
&
layoutUnit
,
layouts
)
{
for
(
const
auto
&
layoutUnit
:
qAsConst
(
layouts
)
)
{
str
+=
layoutUnit
.
toString
()
+
QLatin1Char
(
' '
);
}
return
str
;
...
...
@@ -176,7 +176,7 @@ struct LayoutSet {
static
QString
toString
(
const
QList
<
LayoutUnit
>&
layoutUnits
)
{
QString
str
;
for
each
(
const
LayoutUnit
&
layoutUnit
,
layoutUnits
)
{
for
(
const
auto
&
layoutUnit
:
layoutUnits
)
{
str
+=
layoutUnit
.
toString
()
+
QLatin1Char
(
','
);
}
return
str
;
...
...
kcms/keyboard/xkb_helper.cpp
View file @
a910acb7
...
...
@@ -124,7 +124,7 @@ bool XkbHelper::initializeKeyboardLayouts(const QList<LayoutUnit>& layoutUnits)
{
QStringList
layouts
;
QStringList
variants
;
for
each
(
const
LayoutUnit
&
layoutUnit
,
layoutUnits
)
{
for
(
const
auto
&
layoutUnit
:
layoutUnits
)
{
layouts
.
append
(
layoutUnit
.
layout
());
variants
.
append
(
layoutUnit
.
variant
());
}
...
...
@@ -154,8 +154,8 @@ bool XkbHelper::initializeKeyboardLayouts(KeyboardConfig& config)
if
(
config
.
configureLayouts
)
{
QStringList
layouts
;
QStringList
variants
;
QList
<
LayoutUnit
>
defaultLayouts
=
config
.
getDefaultLayouts
();
for
each
(
const
LayoutUnit
&
layoutUnit
,
defaultLayouts
)
{
const
QList
<
LayoutUnit
>
defaultLayouts
=
config
.
getDefaultLayouts
();
for
(
const
auto
&
layoutUnit
:
defaultLayouts
)
{
layouts
.
append
(
layoutUnit
.
layout
());
variants
.
append
(
layoutUnit
.
variant
());
}
...
...
kcms/keyboard/xkb_rules.cpp
View file @
a910acb7
...
...
@@ -117,24 +117,24 @@ void postProcess(Rules* rules)
// setlocale(LC_ALL, "");
// bindtextdomain("xkeyboard-config", LOCALE_DIR);
for
each
(
ModelInfo
*
modelInfo
,
rules
->
modelInfos
)
{
for
(
ModelInfo
*
modelInfo
:
qAsConst
(
rules
->
modelInfos
)
)
{
modelInfo
->
vendor
=
translate_xml_item
(
modelInfo
->
vendor
);
modelInfo
->
description
=
translate_description
(
modelInfo
);
}
for
each
(
LayoutInfo
*
layoutInfo
,
rules
->
layoutInfos
)
{
for
(
LayoutInfo
*
layoutInfo
:
qAsConst
(
rules
->
layoutInfos
)
)
{
layoutInfo
->
description
=
translate_description
(
layoutInfo
);
removeEmptyItems
(
layoutInfo
->
variantInfos
);
for
each
(
VariantInfo
*
variantInfo
,
layoutInfo
->
variantInfos
)
{
for
(
VariantInfo
*
variantInfo
:
qAsConst
(
layoutInfo
->
variantInfos
)
)
{
variantInfo
->
description
=
translate_description
(
variantInfo
);
}
}
for
each
(
OptionGroupInfo
*
optionGroupInfo
,
rules
->
optionGroupInfos
)
{
for
(
OptionGroupInfo
*
optionGroupInfo
:
qAsConst
(
rules
->
optionGroupInfos
)
)
{
optionGroupInfo
->
description
=
translate_description
(
optionGroupInfo
);
removeEmptyItems
(
optionGroupInfo
->
optionInfos
);
for
each
(
OptionInfo
*
optionInfo
,
optionGroupInfo
->
optionInfos
)
{
for
(
OptionInfo
*
optionInfo
:
qAsConst
(
optionGroupInfo
->
optionInfos
)
)
{
optionInfo
->
description
=
translate_description
(
optionInfo
);
}
}
...
...
@@ -192,7 +192,7 @@ void mergeRules(Rules* rules, Rules* extraRules)
rules
->
optionGroupInfos
.
append
(
extraRules
->
optionGroupInfos
);
// need to iterate and merge?
QList
<
LayoutInfo
*>
layoutsToAdd
;
for
each
(
LayoutInfo
*
extraLayoutInfo
,
extraRules
->
layoutInfos
)
{
for
(
LayoutInfo
*
extraLayoutInfo
:
qAsConst
(
extraRules
->
layoutInfos
)
)
{
LayoutInfo
*
layoutInfo
=
findByName
(
rules
->
layoutInfos
,
extraLayoutInfo
->
name
);
if
(
layoutInfo
!=
nullptr
)
{
layoutInfo
->
variantInfos
.
append
(
extraLayoutInfo
->
variantInfos
);
...
...
@@ -380,7 +380,7 @@ bool LayoutInfo::isLanguageSupportedByLayout(const QString& lang) const
bool
LayoutInfo
::
isLanguageSupportedByVariants
(
const
QString
&
lang
)
const
{
for
each
(
const
VariantInfo
*
info
,
variantInfos
)
{
for
(
const
VariantInfo
*
info
:
qAsConst
(
variantInfos
)
)
{
if
(
info
->
languages
.
contains
(
lang
)
)
return
true
;
}
...
...
kcms/keyboard/xkb_rules.h
View file @
a910acb7
...
...
@@ -33,7 +33,7 @@ struct ConfigItem {
template
<
class
T
>
inline
T
*
findByName
(
QList
<
T
*>
list
,
QString
name
)
{
for
each
(
T
*
info
,
list
)
{
for
(
T
*
info
:
qAsConst
(
list
)
)
{
if
(
info
->
name
==
name
)
return
info
;
}
...
...
@@ -56,7 +56,7 @@ struct LayoutInfo: public ConfigItem {
// LayoutInfo() {}
LayoutInfo
(
bool
fromExtras_
)
:
fromExtras
(
fromExtras_
)
{}
~
LayoutInfo
()
{
foreach
(
VariantInfo
*
variantInfo
,
variantInfos
)
d
elete
variantInfo
;
}
~
LayoutInfo
()
{
qD
elete
All
(
variantInfo
s
)
;
}
VariantInfo
*
getVariantInfo
(
const
QString
&
variantName
)
const
{
return
findByName
(
variantInfos
,
variantName
);
...
...
@@ -79,7 +79,7 @@ struct OptionGroupInfo: public ConfigItem {
QList
<
OptionInfo
*>
optionInfos
;
bool
exclusive
;
~
OptionGroupInfo
()
{
foreach
(
OptionInfo
*
opt
,
optionInfos
)
delete
opt
;
}
~
OptionGroupInfo
()
{
qDeleteAll
(
optionInfos
);
}
const
OptionInfo
*
getOptionInfo
(
const
QString
&
optionName
)
const
{
return
findByName
(
optionInfos
,
optionName
);
...
...
@@ -99,9 +99,9 @@ struct Rules {
Rules
();
~
Rules
()
{
foreach
(
LayoutInfo
*
layoutInfo
,
layoutInfos
)
delete
layoutInfo
;
foreach
(
ModelInfo
*
modelInfo
,
modelInfos
)
delete
modelInfo
;
foreach
(
OptionGroupInfo
*
optionGroupInfo
,
optionGroupInfos
)
d
elete
optionGroupInfo
;
qDeleteAll
(
layoutInfos
)
;
qDeleteAll
(
modelInfo
s
)
;
qD
elete
All
(
optionGroupInfo
s
)
;
}
const
LayoutInfo
*
getLayoutInfo
(
const
QString
&
layoutName
)
const
{
...
...
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