X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresettings.h;h=ac70a36cd7fed956a3088c636fb01995db99c34a;hp=8c19d73286671c38e3a689046bb39bdd3f1fd181;hb=c194ed5fb3d15e14b9364f9796d3521910dc72fe;hpb=97d674034551438238c568e8b42efb08e1ba7354

diff --git a/src/core/coresettings.h b/src/core/coresettings.h
index 8c19d732..ac70a36c 100644
--- a/src/core/coresettings.h
+++ b/src/core/coresettings.h
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel IRC Development Team             *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -15,34 +15,30 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef CORESETTINGS_H_
-#define CORESETTINGS_H_
+#ifndef _CORESETTINGS_H_
+#define _CORESETTINGS_H_
 
 #include "settings.h"
-#include "global.h"
-
-class CoreSettings : public Settings {
-  Q_OBJECT
-  
-  public:
-    virtual ~CoreSettings();
-    CoreSettings();
-    
-    void setDatabaseSettings(const QVariant &data);
-    QVariant databaseSettings(const QVariant &def = QVariant());
-    
-    void setPort(const uint &port);
-    uint port(const uint &def = DEFAULT_PORT);
-        
-  private:
-    //virtual QStringList allSessionKeys() = 0;
-    virtual QStringList sessionKeys();
-    
-    virtual void setSessionValue(const QString &key, const QVariant &data);
-    virtual QVariant sessionValue(const QString &key, const QVariant &def = QVariant());
+
+class CoreSettings : public Settings
+{
+public:
+    CoreSettings(const QString group = "Core");
+
+    void setStorageSettings(const QVariant &data);
+    QVariant storageSettings(const QVariant &def = QVariant());
+
+    void setAuthSettings(const QVariant &data);
+    QVariant authSettings(const QVariant &def = QVariant());
+
+    QVariant oldDbSettings();  // FIXME remove
+
+    void setCoreState(const QVariant &data);
+    QVariant coreState(const QVariant &def = QVariant());
 };
 
-#endif /*CORESETTINGS_H_*/
+
+#endif /*_CORESETTINGS_H_*/