Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-24 02:42:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kcontrol: compiler warnings fix

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-05-15 18:22:45 +00:00
parent 751c90cf55
commit d1e72f0d03
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kcontrol/kfontinst/lib/Family.cpp
View file

@ -74,7 +74,7 @@ void Family::toXml(bool disabled, QTextStream &s) const
if(entries.count()>0)
{
if(!disabled)
s << " <"FAMILY_TAG" "NAME_ATTR"=\"" << KFI::Misc::encodeText(itsName, s) << "\">\n";
s << " <" FAMILY_TAG " " NAME_ATTR "=\"" << KFI::Misc::encodeText(itsName, s) << "\">\n";
QStringList::ConstIterator it(entries.begin()),
end(entries.end());
@ -83,7 +83,7 @@ void Family::toXml(bool disabled, QTextStream &s) const
s << *it << endl;
if(!disabled)
s << " </"FAMILY_TAG">" << endl;
s << " </" FAMILY_TAG ">" << endl;
}
}

18
kcontrol/kfontinst/lib/Style.cpp
View file

@ -108,7 +108,7 @@ QString Style::toXml(bool disabled, const QString &family, QTextStream &s) const
if(files.count()>0)
{
QString str(" <"FONT_TAG" ");
QString str(" <" FONT_TAG " ");
int weight,
width,
slant;
@ -116,20 +116,20 @@ QString Style::toXml(bool disabled, const QString &family, QTextStream &s) const
KFI::FC::decomposeStyleVal(itsValue, weight, width, slant);
if(!family.isEmpty())
str+=FAMILY_ATTR"=\""+family+"\" ";
str+= FAMILY_ATTR "=\""+family+"\" ";
if(KFI_NULL_SETTING!=weight)
str+=WEIGHT_ATTR"=\""+QString::number(weight)+"\" ";
str+=WEIGHT_ATTR "=\""+QString::number(weight)+"\" ";
if(KFI_NULL_SETTING!=width)
str+=WIDTH_ATTR"=\""+QString::number(width)+"\" ";
str+= WIDTH_ATTR "=\""+QString::number(width)+"\" ";
if(KFI_NULL_SETTING!=slant)
str+=SLANT_ATTR"=\""+QString::number(slant)+"\" ";
str+= SLANT_ATTR "=\""+QString::number(slant)+"\" ";
if(!itsScalable)
str+=SCALABLE_ATTR"=\"false\" ";
str+= SCALABLE_ATTR "=\"false\" ";
QStringList ws(WritingSystems::instance()->getLangs(itsWritingSystems));
if(ws.count())
str+=LANGS_ATTR"=\""+ws.join(LANG_SEP)+"\" ";
str+= LANGS_ATTR "=\"" +ws.join(LANG_SEP)+"\" ";
if(1==files.count())
@ -141,8 +141,8 @@ QString Style::toXml(bool disabled, const QString &family, QTextStream &s) const
str+=">\n";
for(; it!=end; ++it)
str+=" <"FILE_TAG" "+(*it)+"/>\n";
str+=" </"FONT_TAG">";
str+=" <" FILE_TAG " "+(*it)+"/>\n";
str+=" </" FONT_TAG ">";
}
return str;