modernize: Use override instead of virtual

[quassel.git] / src / core / storage.h

diff --git a/src/core/storage.h b/src/core/storage.h
index f912c8b..da09a2a 100644 (file)
--- a/src/core/storage.h
+++ b/src/core/storage.h
@@ -33,8 +33,8 @@ class Storage : public QObject
     Q_OBJECT
 
 public:
     Q_OBJECT
 
 public:

-    Storage(QObject *parent = 0);
-    virtual ~Storage() {};
+    Storage(QObject *parent = nullptr);
+    ~Storage() override {};

 
     enum State {
         IsReady,    // ready to go
 
     enum State {
         IsReady,    // ready to go


@@ -533,12 +533,6 @@ public slots:
      */
     virtual QMap<UserId, QString> getAllAuthUserNames() = 0;
 
      */
     virtual QMap<UserId, QString> getAllAuthUserNames() = 0;
 

-    //! Get the auth username associated with a userId
-    /** \param user  The user to retrieve the username for
-     *  \return      The username for the user
-     */
-    virtual QString getAuthUserName(UserId user) = 0;
-

 signals:
     //! Sent when a new BufferInfo is created, or an existing one changed somehow.
     void bufferInfoUpdated(UserId user, const BufferInfo &);
 signals:
     //! Sent when a new BufferInfo is created, or an existing one changed somehow.
     void bufferInfoUpdated(UserId user, const BufferInfo &);


@@ -551,6 +545,9 @@ signals:
     //! Sent when a user has been removed
     void userRemoved(UserId);
 
     //! Sent when a user has been removed
     void userRemoved(UserId);
 

+    //! Emitted when database schema upgrade starts or ends
+    void dbUpgradeInProgress(bool inProgress);
+

 protected:
     QString hashPassword(const QString &password);
     bool checkHashedPassword(const UserId user, const QString &password, const QString &hashedPassword, const Storage::HashVersion version);
 protected:
     QString hashPassword(const QString &password);
     bool checkHashedPassword(const UserId user, const QString &password, const QString &hashedPassword, const Storage::HashVersion version);