# # # patch "src/util/Settings.cpp" # from [c721a0196b365efd6e237c976f4cd0a77a16025e] # to [1101bd4a627996f8fe9f6ce52eb82a1f37e81c63] # # patch "src/util/Settings.h" # from [da27ac6c5551cfd88073109df8624bf22e548556] # to [1fd9fd774712efeb13b3d3916f314d35071dc6a0] # ============================================================ --- src/util/Settings.cpp c721a0196b365efd6e237c976f4cd0a77a16025e +++ src/util/Settings.cpp 1101bd4a627996f8fe9f6ce52eb82a1f37e81c63 @@ -54,16 +54,16 @@ bool Settings::getBool(const QString & n return singleton()->value(name, defaultVal).toBool(); } -void Settings::setWindowGeometry(const QByteArray & data, const QString & name) +void Settings::setWindowGeometry(const QString & windowClass, const QByteArray & data) { - I(!name.isEmpty()); - singleton()->setValue(name, data); + I(!windowClass.isEmpty()); + singleton()->setValue(windowClass, data); } -QByteArray Settings::getWindowGeometry(const QString & name) +QByteArray Settings::getWindowGeometry(const QString & windowClass) { - I(!name.isEmpty()); - return singleton()->value(name).toByteArray(); + I(!windowClass.isEmpty()); + return singleton()->value(windowClass).toByteArray(); } void Settings::sync() ============================================================ --- src/util/Settings.h da27ac6c5551cfd88073109df8624bf22e548556 +++ src/util/Settings.h 1fd9fd774712efeb13b3d3916f314d35071dc6a0 @@ -29,40 +29,40 @@ public: { public: - static void setBool(const QString &, bool); - static bool getBool(const QString &, bool); - - static void setWindowGeometry(const QByteArray &, const QString &); + static void setBool(const QString &, bool); + static bool getBool(const QString &, bool); + + static void setWindowGeometry(const QString &, const QByteArray &); static QByteArray getWindowGeometry(const QString &); - + static QStringList getItemList(const QString &); - static void setItemList(const QString &, const QStringList &); - static void addItemToList(const QString&, const QString &, int); - static void removeItemFromList(const QString &, const QString &); - + static void setItemList(const QString &, const QStringList &); + static void addItemToList(const QString&, const QString &, int); + static void removeItemFromList(const QString &, const QString &); + static QString getMtnBinaryPath(); static void setMtnBinaryPath(QString); - + static bool getConsoleLogEnabled(); static void setConsoleLogEnabled(bool); static bool getFileLogEnabled(); static void setFileLogEnabled(bool); static int getLogLevel(); static void setLogLevel(int); - + static void saveHeaderViewState(QHeaderView *, QString); static void restoreHeaderViewState(QHeaderView *, QString); - + static QByteArray getSplitterState(QString); - static void setSplitterState(const QByteArray &, QString); - + static void setSplitterState(const QByteArray &, QString); + static void sync(); - + private: - Settings(); - ~Settings(void); - static Settings* singleton(); - static Settings* instance; + Settings(); + ~Settings(void); + static Settings* singleton(); + static Settings* instance; };