equal
deleted
inserted
replaced
24 #include <QMap> |
24 #include <QMap> |
25 #include <QStringList> |
25 #include <QStringList> |
26 #include <QStandardItemModel> |
26 #include <QStandardItemModel> |
27 #include <QFileInfo> |
27 #include <QFileInfo> |
28 #include <QSettings> |
28 #include <QSettings> |
|
29 #include <QColor> |
29 |
30 |
30 #include "hwconsts.h" |
31 #include "hwconsts.h" |
31 #include "HWApplication.h" |
32 #include "HWApplication.h" |
32 #include "sdlkeys.h" |
33 #include "sdlkeys.h" |
33 |
34 |
181 QSettings sOld(oldSettingsFile.fileName(), QSettings::IniFormat); |
182 QSettings sOld(oldSettingsFile.fileName(), QSettings::IniFormat); |
182 QSettings sNew(settingsFile.fileName(), QSettings::IniFormat); |
183 QSettings sNew(settingsFile.fileName(), QSettings::IniFormat); |
183 sNew.setIniCodec("UTF-8"); |
184 sNew.setIniCodec("UTF-8"); |
184 |
185 |
185 foreach(const QString & key, sOld.allKeys()) |
186 foreach(const QString & key, sOld.allKeys()) |
186 sNew.setValue(key, sOld.value(key)); |
187 { |
|
188 if(key.startsWith("colors/color")) |
|
189 sNew.setValue(key, sOld.value(key).value<QColor>().name()); |
|
190 else |
|
191 sNew.setValue(key, sOld.value(key)); |
|
192 } |
187 } |
193 } |
188 } |
194 } |
189 |
195 |
190 m_settingsFileName = settingsFile.fileName(); |
196 m_settingsFileName = settingsFile.fileName(); |
191 } |
197 } |