Well, if we check for a settings version, maybe we should set it too...

[quassel.git] / src / common / settings.h

diff --git a/src/common/settings.h b/src/common/settings.h
index 02cb4ca..26c8ead 100644 (file)
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -23,9 +23,12 @@
 
 #include <QCoreApplication>
 #include <QHash>
+#include <QSettings>
 #include <QString>
 #include <QVariant>
 
+#include "quassel.h"
+
 class SettingsChangeNotifier : public QObject {
   Q_OBJECT
 
@@ -36,41 +39,44 @@ private:
   friend class Settings;
 };
 
-
-
 class Settings {
 public:
   enum Mode { Default, Custom };
 
 public:
-  void notify(const QString &key, QObject *receiver, const char *slot);
+  virtual void notify(const QString &key, QObject *receiver, const char *slot);
+  virtual uint version();
 
 protected:
   inline Settings(QString group_, QString appName_) : group(group_), appName(appName_) {}
   inline virtual ~Settings() {}
-  
+
   inline void setGroup(const QString &group_) { group = group_; }
-  
+
   virtual QStringList allLocalKeys();
   virtual QStringList localChildKeys(const QString &rootkey = QString());
   virtual QStringList localChildGroups(const QString &rootkey = QString());
-  
+
   virtual void setLocalValue(const QString &key, const QVariant &data);
   virtual const QVariant &localValue(const QString &key, const QVariant &def = QVariant());
-  
+
   virtual void removeLocalKey(const QString &key);
 
   QString group;
   QString appName;
 
 private:
-  inline QString org() {
-#ifdef Q_WS_MAC
-    return QCoreApplication::organizationDomain();
+  inline QSettings::Format format() {
+#ifdef Q_WS_WIN
+    return QSettings::IniFormat;
 #else
-    return QCoreApplication::organizationName();
+    return QSettings::NativeFormat;
 #endif
   }
+  inline QString fileName() {
+    return Quassel::configDirPath() + appName
+           + ((format() == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini"));
+  }
 
   static QHash<QString, QHash<QString, QVariant> > settingsCache;
   static QHash<QString, QHash<QString, SettingsChangeNotifier *> > settingsChangeNotifier;