Skip to content

Commit 007280b

Browse files
committed
sc ide: config serialization: treat all scalars as UTF-8
1 parent 1e95b20 commit 007280b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Diff for: editors/sc-ide/core/settings/serialization.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ static void parseSequence( const YAML::Node &node, const QString &parentKey, QSe
116116
{
117117
std::string val;
118118
item >> val;
119-
values << QString(val.c_str());
119+
values << QString::fromUtf8(val.c_str());
120120
break;
121121
}
122122

@@ -149,7 +149,7 @@ static void parseNode( const YAML::Node &node, const QString &parentKey, QSettin
149149
{
150150
std::string val;
151151
node >> val;
152-
map.insert( parentKey, QVariant(val.c_str()) );
152+
map.insert( parentKey, QVariant( QString::fromUtf8(val.c_str()) ) );
153153
return;
154154
}
155155

@@ -225,7 +225,7 @@ static void writeValue( const QVariant &var, YAML::Emitter &out )
225225

226226
QStringList list = var.value<QStringList>();
227227
Q_FOREACH(const QString & str, list)
228-
out << str.toStdString();
228+
out << str.toUtf8().constData();
229229

230230
out << YAML::EndSeq;
231231
break;
@@ -234,7 +234,7 @@ static void writeValue( const QVariant &var, YAML::Emitter &out )
234234
{
235235
QKeySequence kseq = var.value<QKeySequence>();
236236

237-
out << kseq.toString( QKeySequence::PortableText ).toStdString();
237+
out << kseq.toString( QKeySequence::PortableText ).toUtf8().constData();
238238

239239
break;
240240
}
@@ -248,13 +248,13 @@ static void writeValue( const QVariant &var, YAML::Emitter &out )
248248
}
249249
else
250250
{
251-
out << var.toString().toStdString();
251+
out << var.toString().toUtf8().constData();
252252
}
253253
break;
254254
}
255255
default:
256256
{
257-
out << var.toString().toStdString();
257+
out << var.toString().toUtf8().constData();
258258
}
259259
}
260260
}

0 commit comments

Comments
 (0)