X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fstorage.h;h=1af8d86ef909a4a6f072628e23f1549d62e33701;hp=f98b75b7dd21c03382c826499e544afd40543d33;hb=5c00beb706c7761d19f9a6b86751193056086b4a;hpb=97d674034551438238c568e8b42efb08e1ba7354

diff --git a/src/core/storage.h b/src/core/storage.h
index f98b75b7..1af8d86e 100644
--- a/src/core/storage.h
+++ b/src/core/storage.h
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel Team                             *
+ *   Copyright (C) 2005-08 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        *
@@ -22,7 +22,6 @@
 #define _STORAGE_H_
 
 #include <QtCore>
-#include <QSqlDatabase>
 
 #include "message.h"
 
@@ -30,9 +29,10 @@ class Storage : public QObject {
   Q_OBJECT
 
   public:
-    Storage() {};
+    Storage(QObject *parent = 0);
     virtual ~Storage() {};
 
+  public slots:
     /* General */
 
     //! Check if the storage type is available.
@@ -51,7 +51,7 @@ class Storage : public QObject {
      *  \param settings   Hostname, port, username, password, ...
      *  \return True if and only if the storage provider was initialized successfully.
      */
-    virtual bool setup(const QVariantMap &settings = QVariantMap()) { return false; }
+    virtual bool setup(const QVariantMap &settings = QVariantMap()) { Q_UNUSED(settings); return false; }
     
     //! Initialize the storage provider
     /** \param settings   Hostname, port, username, password, ...  
@@ -101,7 +101,7 @@ class Storage : public QObject {
      *  \param network The network name
      *  \return The BufferInfo corresponding to the given network and buffer name, or 0 if not found
      */
-    virtual uint getNetworkId(UserId user, const QString &network) = 0;
+    virtual NetworkId getNetworkId(UserId user, const QString &network) = 0;
 
     /* Buffer handling */
 
@@ -157,7 +157,7 @@ class Storage : public QObject {
 
   signals:
     //! Sent when a new BufferInfo is created, or an existing one changed somehow.
-    void bufferInfoUpdated(BufferInfo);
+    void bufferInfoUpdated(UserId user, const BufferInfo &);
     //! Sent when a new user has been added
     void userAdded(UserId, const QString &username);
     //! Sent when a user has been renamed
@@ -166,8 +166,7 @@ class Storage : public QObject {
     void userRemoved(UserId);
 
   public:
-    /* Exceptions */
-    struct AuthError : public Exception {};
+
 };