use override
This commit is contained in:
parent
e8a2e81421
commit
c99678915e
2 changed files with 21 additions and 21 deletions
|
@ -56,8 +56,8 @@ public:
|
||||||
sortNow();
|
sortNow();
|
||||||
}
|
}
|
||||||
|
|
||||||
OurSortFilterProxyModel();
|
OurSortFilterProxyModel() override;
|
||||||
~OurSortFilterProxyModel();
|
~OurSortFilterProxyModel() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void sortNow() {
|
void sortNow() {
|
||||||
|
@ -76,8 +76,8 @@ class KDECONNECTSMSAPPLIB_EXPORT ConversationListModel
|
||||||
Q_PROPERTY(QString deviceId READ deviceId WRITE setDeviceId NOTIFY deviceIdChanged)
|
Q_PROPERTY(QString deviceId READ deviceId WRITE setDeviceId NOTIFY deviceIdChanged)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
ConversationListModel(QObject* parent = nullptr);
|
ConversationListModel(QObject* parent = nullptr) override;
|
||||||
~ConversationListModel();
|
~ConversationListModel() override;
|
||||||
|
|
||||||
enum Roles {
|
enum Roles {
|
||||||
FromMeRole = Qt::UserRole,
|
FromMeRole = Qt::UserRole,
|
||||||
|
@ -89,13 +89,13 @@ public:
|
||||||
Q_ENUM(Roles)
|
Q_ENUM(Roles)
|
||||||
|
|
||||||
QString deviceId() const { return m_deviceId; }
|
QString deviceId() const { return m_deviceId; }
|
||||||
void setDeviceId(const QString &/*deviceId*/);
|
void setDeviceId(const QString &/*deviceId*/) override;
|
||||||
|
|
||||||
public Q_SLOTS:
|
public Q_SLOTS:
|
||||||
void handleCreatedConversation(const QVariantMap& msg);
|
void handleCreatedConversation(const QVariantMap& msg) override;
|
||||||
void handleConversationUpdated(const QVariantMap& msg);
|
void handleConversationUpdated(const QVariantMap& msg) override;
|
||||||
void createRowFromMessage(const QVariantMap& message);
|
void createRowFromMessage(const QVariantMap& message) override;
|
||||||
void printDBusError(const QDBusError& error);
|
void printDBusError(const QDBusError& error) override;
|
||||||
|
|
||||||
Q_SIGNALS:
|
Q_SIGNALS:
|
||||||
void deviceIdChanged();
|
void deviceIdChanged();
|
||||||
|
@ -104,14 +104,14 @@ private:
|
||||||
/**
|
/**
|
||||||
* Get all conversations currently known by the conversationsInterface, if any
|
* Get all conversations currently known by the conversationsInterface, if any
|
||||||
*/
|
*/
|
||||||
void prepareConversationsList();
|
void prepareConversationsList() override;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the data for a particular person given their contact address
|
* Get the data for a particular person given their contact address
|
||||||
*/
|
*/
|
||||||
KPeople::PersonData* lookupPersonByAddress(const QString& address);
|
KPeople::PersonData* lookupPersonByAddress(const QString& address) override;
|
||||||
|
|
||||||
QStandardItem* conversationForThreadId(qint32 threadId);
|
QStandardItem* conversationForThreadId(qint32 threadId) override;
|
||||||
|
|
||||||
DeviceConversationsDbusInterface* m_conversationsInterface;
|
DeviceConversationsDbusInterface* m_conversationsInterface;
|
||||||
QString m_deviceId;
|
QString m_deviceId;
|
||||||
|
|
|
@ -42,8 +42,8 @@ class KDECONNECTSMSAPPLIB_EXPORT ConversationModel
|
||||||
Q_PROPERTY(QString deviceId READ deviceId WRITE setDeviceId)
|
Q_PROPERTY(QString deviceId READ deviceId WRITE setDeviceId)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
ConversationModel(QObject* parent = nullptr);
|
ConversationModel(QObject* parent = nullptr) override;
|
||||||
~ConversationModel();
|
~ConversationModel() override;
|
||||||
|
|
||||||
enum Roles {
|
enum Roles {
|
||||||
FromMeRole = Qt::UserRole,
|
FromMeRole = Qt::UserRole,
|
||||||
|
@ -52,18 +52,18 @@ public:
|
||||||
|
|
||||||
Q_ENUM(Roles)
|
Q_ENUM(Roles)
|
||||||
|
|
||||||
qint64 threadId() const;
|
qint64 threadId() const override;
|
||||||
void setThreadId(const qint64& threadId);
|
void setThreadId(const qint64& threadId) override;
|
||||||
|
|
||||||
QString deviceId() const { return m_deviceId; }
|
QString deviceId() const { return m_deviceId; }
|
||||||
void setDeviceId(const QString &/*deviceId*/);
|
void setDeviceId(const QString &/*deviceId*/) override;
|
||||||
|
|
||||||
Q_INVOKABLE void sendReplyToConversation(const QString& message);
|
Q_INVOKABLE void sendReplyToConversation(const QString& message) override;
|
||||||
Q_INVOKABLE void requestMoreMessages(const quint32& howMany = 10);
|
Q_INVOKABLE void requestMoreMessages(const quint32& howMany = 10) override;
|
||||||
|
|
||||||
private Q_SLOTS:
|
private Q_SLOTS:
|
||||||
void createRowFromMessage(const QVariantMap &msg, int pos);
|
void createRowFromMessage(const QVariantMap &msg, int pos) override;
|
||||||
void handleConversationUpdate(const QVariantMap &msg);
|
void handleConversationUpdate(const QVariantMap &msg) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
DeviceConversationsDbusInterface* m_conversationsInterface;
|
DeviceConversationsDbusInterface* m_conversationsInterface;
|
||||||
|
|
Loading…
Reference in a new issue