Index: sources/model/settings/MSettings.h =================================================================== diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -r2216ac6ac7f77437a7c29ac8b4043be01bc4609e --- sources/model/settings/MSettings.h (.../MSettings.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) +++ sources/model/settings/MSettings.h (.../MSettings.h) (revision 2216ac6ac7f77437a7c29ac8b4043be01bc4609e) @@ -23,7 +23,7 @@ #include "main.h" // Doxygen : don't remove // Define -#define _SettingModel Storage::MSettings::I() +#define _Settings Storage::MSettings::I() // namespace namespace Storage { @@ -33,25 +33,30 @@ Q_OBJECT struct KeyValue { + QString category; + QString location; QList keys; QList values; }; + QMap _settings; - QMap _settings; - QMap _location; + QMap _category; QMutex _mutex; // Singleton SINGLETON(MSettings) public: - QStringList groups (); - QStringList keys (const QString &vGroup); - QVariantList values (const QString &vGroup); - QString location(const QString &vGroup); + QStringList categorys(); + QStringList groups (); + QStringList groups (const QString &vCategory); + QStringList keys (const QString &vGroup ); + QString key (const QString &vGroup , uint vIndex); + QVariantList values (const QString &vGroup ); + QString location (const QString &vGroup ); - void add (const QString &vGroup, const QString &vKey, const QVariant &vValue, const QString &vLocation); + void add (const QString &vGroup, const QString &vKey, const QVariant &vValue, const QString &vLocation, const QString &vCategory); }; }