Commit 4f4b105a authored by Nicolas Fella's avatar Nicolas Fella

Revert "use override"

Whatever the problem was, this is not a fix

This reverts commit c9967891.
parent c9967891
Pipeline #3969 failed with stage
in 13 minutes and 47 seconds
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment