From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Fri, 26 Sep 2008 21:10:58 +0000 (+0200)
Subject: Init SQL resource
X-Git-Tag: 0.3.1~251
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=10f9c27ee5d92ece2931947cd341c7f7b548f580;ds=sidebyside

Init SQL resource
---

diff --git a/src/common/settings.h b/src/common/settings.h
index 02cb4ca4..08db0cd9 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -36,8 +36,6 @@ private:
   friend class Settings;
 };
 
-
-
 class Settings {
 public:
   enum Mode { Default, Custom };
@@ -48,16 +46,16 @@ public:
 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;
diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index 7098ab89..3d8b1596 100644
--- a/src/core/coreapplication.cpp
+++ b/src/core/coreapplication.cpp
@@ -22,9 +22,11 @@
 
 #include "core.h"
 
-CoreApplicationInternal::CoreApplicationInternal() 
+CoreApplicationInternal::CoreApplicationInternal()
   : _coreCreated(false)
 {
+  Q_INIT_RESOURCE(sql);
+
   // put core-only arguments here
   CliParser *parser = Quassel::cliParser();
   parser->addOption("port",'p', tr("The port quasselcore will listen at"), QString("4242"));
diff --git a/src/core/coresettings.cpp b/src/core/coresettings.cpp
index 8d0a5cea..7ea3b46e 100644
--- a/src/core/coresettings.cpp
+++ b/src/core/coresettings.cpp
@@ -23,6 +23,7 @@
 #include "quassel.h"
 
 CoreSettings::CoreSettings(const QString group) : Settings(group, Quassel::buildInfo().coreApplicationName) {
+
 }
 
 CoreSettings::~CoreSettings() {