tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "use override"

Browse source 
Whatever the problem was, this is not a fix

This reverts commit c99678915e.
This commit is contained in:
Nicolas Fella 2019-06-02 22:10:21 +02:00
parent c99678915e
commit 4f4b105adf
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
smsapp/conversationlistmodel.h
View file

@ -56,8 +56,8 @@ public:
sortNow();
}
OurSortFilterProxyModel() override;
~OurSortFilterProxyModel() override;
OurSortFilterProxyModel();
~OurSortFilterProxyModel();
private:
void sortNow() {
@ -76,8 +76,8 @@ class KDECONNECTSMSAPPLIB_EXPORT ConversationListModel
Q_PROPERTY(QString deviceId READ deviceId WRITE setDeviceId NOTIFY deviceIdChanged)
public:
ConversationListModel(QObject* parent = nullptr) override;
~ConversationListModel() override;
ConversationListModel(QObject* parent = nullptr);
~ConversationListModel();
enum Roles {
FromMeRole = Qt::UserRole,
@ -89,13 +89,13 @@ public:
Q_ENUM(Roles)
QString deviceId() const { return m_deviceId; }
void setDeviceId(const QString &/*deviceId*/) override;
void setDeviceId(const QString &/*deviceId*/);
public Q_SLOTS:
void handleCreatedConversation(const QVariantMap& msg) override;
void handleConversationUpdated(const QVariantMap& msg) override;
void createRowFromMessage(const QVariantMap& message) override;
void printDBusError(const QDBusError& error) override;
void handleCreatedConversation(const QVariantMap& msg);
void handleConversationUpdated(const QVariantMap& msg);
void createRowFromMessage(const QVariantMap& message);
void printDBusError(const QDBusError& error);
Q_SIGNALS:
void deviceIdChanged();
@ -104,14 +104,14 @@ private:
/**
* Get all conversations currently known by the conversationsInterface, if any
*/
void prepareConversationsList() override;
void prepareConversationsList();
/**
* Get the data for a particular person given their contact address
*/
KPeople::PersonData* lookupPersonByAddress(const QString& address) override;
KPeople::PersonData* lookupPersonByAddress(const QString& address);
QStandardItem* conversationForThreadId(qint32 threadId) override;
QStandardItem* conversationForThreadId(qint32 threadId);
DeviceConversationsDbusInterface* m_conversationsInterface;
QString m_deviceId;

18
smsapp/conversationmodel.h
View file

@ -42,8 +42,8 @@ class KDECONNECTSMSAPPLIB_EXPORT ConversationModel
Q_PROPERTY(QString deviceId READ deviceId WRITE setDeviceId)
public:
ConversationModel(QObject* parent = nullptr) override;
~ConversationModel() override;
ConversationModel(QObject* parent = nullptr);
~ConversationModel();
enum Roles {
FromMeRole = Qt::UserRole,
@ -52,18 +52,18 @@ public:
Q_ENUM(Roles)
qint64 threadId() const override;
void setThreadId(const qint64& threadId) override;
qint64 threadId() const;
void setThreadId(const qint64& threadId);
QString deviceId() const { return m_deviceId; }
void setDeviceId(const QString &/*deviceId*/) override;
void setDeviceId(const QString &/*deviceId*/);
Q_INVOKABLE void sendReplyToConversation(const QString& message) override;
Q_INVOKABLE void requestMoreMessages(const quint32& howMany = 10) override;
Q_INVOKABLE void sendReplyToConversation(const QString& message);
Q_INVOKABLE void requestMoreMessages(const quint32& howMany = 10);
private Q_SLOTS:
void createRowFromMessage(const QVariantMap &msg, int pos) override;
void handleConversationUpdate(const QVariantMap &msg) override;
void createRowFromMessage(const QVariantMap &msg, int pos);
void handleConversationUpdate(const QVariantMap &msg);
private:
DeviceConversationsDbusInterface* m_conversationsInterface;