Skip to content

Commit

Permalink
revert change to utf-8 ini as QSettings is very broken
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinhendricks committed Mar 5, 2019
1 parent ebfb613 commit 5484463
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/Misc/SettingsStore.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/************************************************************************
**
** Copyright (C) 2016, 2017, 2018 Kevin B. Hendricks, Stratford, ON
** Copyright (C) 2019 - 2016 Kevin B. Hendricks, Stratford, ON
** Copyright (C) 2011, 2012, 2013 John Schember <john@nachtimwald.com>
** Copyright (C) 2012, 2013 Dave Heiland
**
Expand Down Expand Up @@ -100,14 +100,16 @@ static QString KEY_CLIPBOARD_HISTORY_LIMIT = SETTINGS_GROUP + "/" + "clipboard_h

SettingsStore::SettingsStore()
: QSettings(Utility::DefinePrefsDir() + "/sigil.ini", QSettings::IniFormat)
{
setIniCodec("UTF-8");
{
// See QTBUG-40796 and QTBUG-54510 as using UTF-8 as a codec for ini files is very broken
// setIniCodec("UTF-8");
}

SettingsStore::SettingsStore(QString filename)
: QSettings(filename, QSettings::IniFormat)
{
setIniCodec("UTF-8");
// See QTBUG-40796 and QTBUG-54510 as using UTF-8 as a codec for ini files is very broken
// setIniCodec("UTF-8");
}

QString SettingsStore::uiLanguage()
Expand Down

0 comments on commit 5484463

Please sign in to comment.