X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsettings.h;h=26c8ead0d7b15f64dab866daa97fbe0330040bc0;hp=1d3f28e190de04367730f5bf5adb55dd7a52c006;hb=e06ce3bfa98752cb9e87586477dfaf31e7e1ab0a;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c

diff --git a/src/common/settings.h b/src/common/settings.h
index 1d3f28e1..26c8ead0 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -23,9 +23,12 @@
 
 #include <QCoreApplication>
 #include <QHash>
+#include <QSettings>
 #include <QString>
 #include <QVariant>
 
+#include "quassel.h"
+
 class SettingsChangeNotifier : public QObject {
   Q_OBJECT
 
@@ -42,6 +45,7 @@ public:
 
 public:
   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_) {}
@@ -62,13 +66,17 @@ protected:
   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;