- moved shared and uibase libraries to namespaces

- bugfix: the "fix mods" function was accessing the save game data incorrectly, causing a crash

1 files changed, 204 insertions, 204 deletions

diff --git a/src/settings.h b/src/settings.h
index d02de1a6..04781611 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -17,207 +17,207 @@ You should have received a copy of the GNU General Public License
 along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef WORKAROUNDS_H

-#define WORKAROUNDS_H

-

-#include "loadmechanism.h"

-

-#include <iplugin.h>

-

-#include <QSettings>

-#include <QListWidget>

-#include <QComboBox>

-

-

-/**

- * manages the settings for Mod Organizer. The settings are not cached

- * inside the class but read/written directly from/to disc

- **/

-class Settings : public QObject

-{

-

-  Q_OBJECT

-

-public:

-

-  /**

-   * @brief constructor

-   **/

-  Settings();

-

-  virtual ~Settings();

-

-  static Settings &instance();

-

-  /**

-   * unregister all plugins from settings

-   */

-  void clearPlugins();

-

-  /**

-   * @brief register plugin to be configurable

-   * @param plugin the plugin to register

-   */

-  void registerPlugin(IPlugin *plugin);

-

-  /**

-   * displays a SettingsDialog that allows the user to change settings. If the

-   * user accepts the changes, the settings are immediately written

-   **/

-  void query(QWidget *parent);

-

-  /**

-   * set up the settings for the specified plugins

-   **/

-  void addPluginSettings(const std::vector<IPlugin*> &plugins);

-

-  /**

-   * @return true if the user wants unchecked plugins (esp, esm) should be hidden from

-   *         the virtual dat adirectory

-   **/

-  bool hideUncheckedPlugins() const;

-

-  /**

-   * @return true if files of the core game are forced-enabled so the user can't accidentally disable them

-   */

-  bool forceEnableCoreFiles() const;

-

-  /**

-   * the steam appid is assigned by the steam platform to each product sold there.

-   * The appid may differ between different versions of a game so it may be impossible

-   * for Mod Organizer to automatically recognize it, though usually it does

-   * @return the steam appid for the game

-   **/

-  QString getSteamAppID() const;

-

-  /**

-   * retrieve the directory where downloads are stored (with native separators)

-   **/

-  QString getDownloadDirectory() const;

-

-  /**

-   * retrieve the directory where mods are stored (with native separators)

-   **/

-  QString getModDirectory() const;

-

-  /**

-   * returns the version of nmm to impersonate when connecting to nexus

-   **/

-  QString getNMMVersion() const;

-

-  /**

-   * retrieve the directory where the web cache is stored (with native separators)

-   **/

-  QString getCacheDirectory() const;

-

-  /**

-   * @return true if the user has set up automatic login to nexus

-   **/

-  bool automaticLoginEnabled() const;

-

-  /**

-   * @brief retrieve the login information for nexus

-   *

-   * @param username (out) receives the user name for nexus

-   * @param password (out) received the password for nexus

-   * @return true if automatic login is active, false otherwise

-   **/

-  bool getNexusLogin(QString &username, QString &password) const;

-

-  /**

-   * @return the configured log level

-   */

-  int logLevel() const;

-

-  /**

-   * @brief set the nexus login information

-   *

-   * @param username username

-   * @param password password

-   */

-  void setNexusLogin(QString username, QString password);

-

-  /**

-   * @return the load mechanism to be used

-   **/

-  LoadMechanism::EMechanism getLoadMechanism() const;

-

-  /**

-   * @brief activate the load mechanism selected by the user

-   **/

-  void setupLoadMechanism();

-

-  /**

-   * @return true if the user prefers the integrated installer over external variants

-   **/

-  bool preferIntegratedInstallers();

-

-  /**

-   * @return true if the user prefers to use an external browser over the integrated one

-   **/

-  bool preferExternalBrowser();

-

-  /**

-   * @return true if the user has enabled the quick installer (default true)

-   **/

-  bool enableQuickInstaller();

-

-  /**

-   * @brief sets the new motd hash

-   **/

-  void setMotDHash(uint hash);

-

-  /**

-   * @return hash of the last displayed message of the day

-   **/

-  uint getMotDHash() const;

-

-  /**

-   * @brief allows direct access to the wrapped QSettings object

-   * @return the wrapped QSettings object

-   */

-  QSettings &directInterface() { return m_Settings; }

-

-  /**

-   * @brief retrieve a setting for one of the installed plugins

-   * @param pluginName name of the plugin

-   * @param key name of the setting to retrieve

-   * @return the requested value as a QVariant

-   * @throws an exception is thrown if this setting doesn't exist

-   */

-  QVariant pluginSetting(const QString &pluginName, const QString &key) const;

-

-private:

-

-  QString obfuscate(const QString &password) const;

-  QString deObfuscate(const QString &password) const;

-

-  void addLanguages(QComboBox *languageBox);

-  void addStyles(QComboBox *styleBox);

-  bool isNXMHandler(bool *modifyable);

-  void setNXMHandlerActive(bool active, bool writable);

-

-private slots:

-

-  void resetDialogs();

-

-signals:

-

-  void languageChanged(const QString &newLanguage);

-  void styleChanged(const QString &newStyle);

-

-private:

-

-  static Settings *s_Instance;

-

-  QSettings m_Settings;

-

-  LoadMechanism m_LoadMechanism;

-

-  std::vector<IPlugin*> m_Plugins;

-

-  QMap<QString, QMap<QString, QVariant> > m_PluginSettings;

-

-};

-

-#endif // WORKAROUNDS_H

+#ifndef WORKAROUNDS_H
+#define WORKAROUNDS_H
+
+#include "loadmechanism.h"
+
+#include <iplugin.h>
+
+#include <QSettings>
+#include <QListWidget>
+#include <QComboBox>
+
+
+/**
+ * manages the settings for Mod Organizer. The settings are not cached
+ * inside the class but read/written directly from/to disc
+ **/
+class Settings : public QObject
+{
+
+  Q_OBJECT
+
+public:
+
+  /**
+   * @brief constructor
+   **/
+  Settings();
+
+  virtual ~Settings();
+
+  static Settings &instance();
+
+  /**
+   * unregister all plugins from settings
+   */
+  void clearPlugins();
+
+  /**
+   * @brief register plugin to be configurable
+   * @param plugin the plugin to register
+   */
+  void registerPlugin(MOBase::IPlugin *plugin);
+
+  /**
+   * displays a SettingsDialog that allows the user to change settings. If the
+   * user accepts the changes, the settings are immediately written
+   **/
+  void query(QWidget *parent);
+
+  /**
+   * set up the settings for the specified plugins
+   **/
+  void addPluginSettings(const std::vector<MOBase::IPlugin*> &plugins);
+
+  /**
+   * @return true if the user wants unchecked plugins (esp, esm) should be hidden from
+   *         the virtual dat adirectory
+   **/
+  bool hideUncheckedPlugins() const;
+
+  /**
+   * @return true if files of the core game are forced-enabled so the user can't accidentally disable them
+   */
+  bool forceEnableCoreFiles() const;
+
+  /**
+   * the steam appid is assigned by the steam platform to each product sold there.
+   * The appid may differ between different versions of a game so it may be impossible
+   * for Mod Organizer to automatically recognize it, though usually it does
+   * @return the steam appid for the game
+   **/
+  QString getSteamAppID() const;
+
+  /**
+   * retrieve the directory where downloads are stored (with native separators)
+   **/
+  QString getDownloadDirectory() const;
+
+  /**
+   * retrieve the directory where mods are stored (with native separators)
+   **/
+  QString getModDirectory() const;
+
+  /**
+   * returns the version of nmm to impersonate when connecting to nexus
+   **/
+  QString getNMMVersion() const;
+
+  /**
+   * retrieve the directory where the web cache is stored (with native separators)
+   **/
+  QString getCacheDirectory() const;
+
+  /**
+   * @return true if the user has set up automatic login to nexus
+   **/
+  bool automaticLoginEnabled() const;
+
+  /**
+   * @brief retrieve the login information for nexus
+   *
+   * @param username (out) receives the user name for nexus
+   * @param password (out) received the password for nexus
+   * @return true if automatic login is active, false otherwise
+   **/
+  bool getNexusLogin(QString &username, QString &password) const;
+
+  /**
+   * @return the configured log level
+   */
+  int logLevel() const;
+
+  /**
+   * @brief set the nexus login information
+   *
+   * @param username username
+   * @param password password
+   */
+  void setNexusLogin(QString username, QString password);
+
+  /**
+   * @return the load mechanism to be used
+   **/
+  LoadMechanism::EMechanism getLoadMechanism() const;
+
+  /**
+   * @brief activate the load mechanism selected by the user
+   **/
+  void setupLoadMechanism();
+
+  /**
+   * @return true if the user prefers the integrated installer over external variants
+   **/
+  bool preferIntegratedInstallers();
+
+  /**
+   * @return true if the user prefers to use an external browser over the integrated one
+   **/
+  bool preferExternalBrowser();
+
+  /**
+   * @return true if the user has enabled the quick installer (default true)
+   **/
+  bool enableQuickInstaller();
+
+  /**
+   * @brief sets the new motd hash
+   **/
+  void setMotDHash(uint hash);
+
+  /**
+   * @return hash of the last displayed message of the day
+   **/
+  uint getMotDHash() const;
+
+  /**
+   * @brief allows direct access to the wrapped QSettings object
+   * @return the wrapped QSettings object
+   */
+  QSettings &directInterface() { return m_Settings; }
+
+  /**
+   * @brief retrieve a setting for one of the installed plugins
+   * @param pluginName name of the plugin
+   * @param key name of the setting to retrieve
+   * @return the requested value as a QVariant
+   * @throws an exception is thrown if this setting doesn't exist
+   */
+  QVariant pluginSetting(const QString &pluginName, const QString &key) const;
+
+private:
+
+  QString obfuscate(const QString &password) const;
+  QString deObfuscate(const QString &password) const;
+
+  void addLanguages(QComboBox *languageBox);
+  void addStyles(QComboBox *styleBox);
+  bool isNXMHandler(bool *modifyable);
+  void setNXMHandlerActive(bool active, bool writable);
+
+private slots:
+
+  void resetDialogs();
+
+signals:
+
+  void languageChanged(const QString &newLanguage);
+  void styleChanged(const QString &newStyle);
+
+private:
+
+  static Settings *s_Instance;
+
+  QSettings m_Settings;
+
+  LoadMechanism m_LoadMechanism;
+
+  std::vector<MOBase::IPlugin*> m_Plugins;
+
+  QMap<QString, QMap<QString, QVariant> > m_PluginSettings;
+
+};
+
+#endif // WORKAROUNDS_H