X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fcoreaccountmodel.h;h=88bc341d97c5656d03b9e34a262b98e5e462abf4;hp=24aeffda132a77ebd04061139c8cb768f9610f29;hb=e8a39b4c3c92e193ab861a3fea84a261bb6fbd24;hpb=76db8cdfbeffaaba359c8e80cf2146da9e9e7f8a

diff --git a/src/client/coreaccountmodel.h b/src/client/coreaccountmodel.h
index 24aeffda..88bc341d 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-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,15 +18,16 @@
  *   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
 
@@ -36,11 +37,11 @@ public:
         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(AccountId) const;
@@ -50,13 +51,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);
 
     bool operator==(const CoreAccountModel &other) const;
+    bool operator!=(const CoreAccountModel &other) const;
 
 public slots:
     void save();
@@ -87,6 +89,3 @@ AccountId CoreAccountModel::internalAccount() const
 {
     return _internalAccount;
 }
-
-
-#endif