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
Education
KGeography
Commits
62c837f1
Commit
62c837f1
authored
Jun 07, 2020
by
Pino Toscano
Committed by
Albert Astals Cid
Jun 09, 2020
Browse files
Store the untranslated name in division
It will be needed to distinguish them without using translations.
parent
d2f3ac47
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/division.cpp
View file @
62c837f1
...
...
@@ -41,6 +41,11 @@ bool division::canAsk(askMode am) const
return
can
;
}
QString
division
::
getUntranslatedName
()
const
{
return
p_untranslatedName
;
}
QString
division
::
getName
()
const
{
return
p_name
;
...
...
@@ -81,6 +86,11 @@ void division::setCanAsk(int askMode)
p_askMode
=
askMode
;
}
void
division
::
setUntranslatedName
(
const
QString
&
name
)
{
p_untranslatedName
=
name
;
}
void
division
::
setName
(
const
QString
&
name
)
{
p_name
=
name
;
...
...
src/division.h
View file @
62c837f1
...
...
@@ -25,6 +25,7 @@ class division
eFlag
=
4
};
bool
canAsk
(
askMode
am
)
const
;
QString
getUntranslatedName
()
const
;
QString
getName
()
const
;
QRgb
getRGB
()
const
;
QString
getFlagFile
()
const
;
...
...
@@ -34,12 +35,13 @@ class division
void
setCapital
(
const
QString
&
name
);
void
setFalseCapitals
(
const
QStringList
&
falseCapitals
);
void
setCanAsk
(
int
askMode
);
void
setUntranslatedName
(
const
QString
&
name
);
void
setName
(
const
QString
&
name
);
void
setRGB
(
int
r
,
int
g
,
int
b
);
bool
setFlagFile
(
const
QString
&
path
);
private:
QString
p_name
,
p_flagFile
,
p_capital
;
QString
p_untranslatedName
,
p_name
,
p_flagFile
,
p_capital
;
QStringList
p_falseCapitals
;
QRgb
p_color
;
int
p_askMode
;
...
...
src/mapparser.cpp
View file @
62c837f1
...
...
@@ -107,7 +107,8 @@ KGmap *mapReader::parseMap(const QString &path)
division
*
kgdiv
=
new
division
();
// division name
kgdiv
->
setName
(
getElementString
(
QStringLiteral
(
"name"
),
divisionTag
,
Mandatory
)
);
kgdiv
->
setUntranslatedName
(
getElementString
(
QStringLiteral
(
"name"
),
divisionTag
,
Mandatory
)
);
kgdiv
->
setName
(
kgdiv
->
getUntranslatedName
()
);
// division capital
QString
capital
=
getElementString
(
QStringLiteral
(
"capital"
),
divisionTag
,
Optional
);
...
...
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