X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fcoreaccountmodel.h;h=012554d9a53ddbd3e5e1e3c3b2236bf22055e483;hp=24aeffda132a77ebd04061139c8cb768f9610f29;hb=a8ab790b2218d6131f12b622b1373ba62958f3ef;hpb=04315f46a16fc3627218377071e008b6b9744992

diff --git a/src/client/coreaccountmodel.h b/src/client/coreaccountmodel.h
index 24aeffda..012554d9 100644
--- a/src/client/coreaccountmodel.h
+++ b/src/client/coreaccountmodel.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,31 +18,33 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef COREACCOUNTMODEL_H_
-#define COREACCOUNTMODEL_H_
+#pragma once
+
+#include "client-export.h"
 
 #include <QAbstractListModel>
 #include <QUuid>
 
 #include "coreaccount.h"
 
-class CoreAccountModel : public QAbstractListModel
+class CLIENT_EXPORT CoreAccountModel : public QAbstractListModel
 {
     Q_OBJECT
 
 public:
-    enum {
+    enum
+    {
         AccountIdRole = Qt::UserRole,
         UuidRole
     };
 
-    CoreAccountModel(QObject *parent = 0);
-    CoreAccountModel(const CoreAccountModel *other, QObject *parent = 0);
+    CoreAccountModel(QObject* parent = nullptr);
+    CoreAccountModel(const CoreAccountModel* other, QObject* parent = nullptr);
 
-    inline int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    inline int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
 
-    CoreAccount account(const QModelIndex &) const;
+    CoreAccount account(const QModelIndex&) const;
     CoreAccount account(AccountId) const;
     QList<CoreAccount> accounts() const;
     QList<AccountId> accountIds() const;
@@ -50,13 +52,14 @@ public:
 
     inline AccountId internalAccount() const;
 
-    AccountId createOrUpdateAccount(const CoreAccount &newAccountData = CoreAccount());
+    AccountId createOrUpdateAccount(const CoreAccount& newAccountData);
     CoreAccount takeAccount(AccountId);
     void removeAccount(AccountId);
 
-    void update(const CoreAccountModel *other);
+    void update(const CoreAccountModel* other);
 
-    bool operator==(const CoreAccountModel &other) const;
+    bool operator==(const CoreAccountModel& other) const;
+    bool operator!=(const CoreAccountModel& other) const;
 
 public slots:
     void save();
@@ -64,7 +67,7 @@ public slots:
     void clear();
 
 protected:
-    void insertAccount(const CoreAccount &);
+    void insertAccount(const CoreAccount&);
     int findAccountIdx(AccountId) const;
 
 private:
@@ -75,18 +78,13 @@ private:
     AccountId _internalAccount;
 };
 
-
 // Inlines
-int CoreAccountModel::rowCount(const QModelIndex &) const
+int CoreAccountModel::rowCount(const QModelIndex&) const
 {
     return _accounts.count();
 }
 
-
 AccountId CoreAccountModel::internalAccount() const
 {
     return _internalAccount;
 }
-
-
-#endif