Use override specifiers wherever it makes sense

Refactored with clang-tidy

146 files changed, 353 insertions, 353 deletions

diff --git a/TelepathyQt/Farstream/channel.h b/TelepathyQt/Farstream/channel.h
index 6ed6a023..09d60e4b 100644
--- a/TelepathyQt/Farstream/channel.h
+++ b/TelepathyQt/Farstream/channel.h
@@ -45,7 +45,7 @@ class TP_QT_FS_EXPORT PendingChannel : public Tp::PendingOperation
     Q_DISABLE_COPY(PendingChannel)
 
 public:
-    ~PendingChannel();
+    ~PendingChannel() override;
 
     TfChannel *tfChannel() const;
     CallChannelPtr callChannel() const;
diff --git a/TelepathyQt/abstract-adaptor.h b/TelepathyQt/abstract-adaptor.h
index 52601e39..43410b14 100644
--- a/TelepathyQt/abstract-adaptor.h
+++ b/TelepathyQt/abstract-adaptor.h
@@ -43,7 +43,7 @@ class TP_QT_EXPORT AbstractAdaptor : public QDBusAbstractAdaptor
 
 public:
     AbstractAdaptor(const QDBusConnection &connection, QObject *adaptee, QObject *parent);
-    ~AbstractAdaptor();
+    ~AbstractAdaptor() override;
 
     QDBusConnection dbusConnection() const;
 
diff --git a/TelepathyQt/abstract-client.h b/TelepathyQt/abstract-client.h
index 7658489c..81539289 100644
--- a/TelepathyQt/abstract-client.h
+++ b/TelepathyQt/abstract-client.h
@@ -49,7 +49,7 @@ class TP_QT_EXPORT AbstractClient : public RefCounted
 
 public:
     AbstractClient();
-    virtual ~AbstractClient();
+    ~AbstractClient() override;
 
     bool isRegistered() const;
 
@@ -86,7 +86,7 @@ public:
         QSharedDataPointer<Private> mPriv;
     };
 
-    virtual ~AbstractClientObserver();
+    ~AbstractClientObserver() override;
 
     ChannelClassSpecList observerFilter() const;
 
@@ -114,7 +114,7 @@ class TP_QT_EXPORT AbstractClientApprover : public virtual AbstractClient
     Q_DISABLE_COPY(AbstractClientApprover)
 
 public:
-    virtual ~AbstractClientApprover();
+    ~AbstractClientApprover() override;
 
     ChannelClassSpecList approverFilter() const;
 
@@ -286,7 +286,7 @@ public:
         QSharedDataPointer<Private> mPriv;
     };
 
-    virtual ~AbstractClientHandler();
+    ~AbstractClientHandler() override;
 
     ChannelClassSpecList handlerFilter() const;
 
diff --git a/TelepathyQt/abstract-interface.h b/TelepathyQt/abstract-interface.h
index fd735edd..06a91c08 100644
--- a/TelepathyQt/abstract-interface.h
+++ b/TelepathyQt/abstract-interface.h
@@ -45,7 +45,7 @@ class TP_QT_EXPORT AbstractInterface : public QDBusAbstractInterface
     Q_DISABLE_COPY(AbstractInterface)
 
 public:
-    virtual ~AbstractInterface();
+    ~AbstractInterface() override;
 
     bool isValid() const;
     QString invalidationReason() const;
diff --git a/TelepathyQt/account-factory.h b/TelepathyQt/account-factory.h
index cb59f129..589595c4 100644
--- a/TelepathyQt/account-factory.h
+++ b/TelepathyQt/account-factory.h
@@ -51,7 +51,7 @@ public:
     static AccountFactoryPtr create(const QDBusConnection &bus,
             const Features &features = Features());
 
-    virtual ~AccountFactory();
+    ~AccountFactory() override;
 
     PendingReady *proxy(const QString &busName, const QString &objectPath,
             const ConnectionFactoryConstPtr &connFactory,
@@ -65,7 +65,7 @@ protected:
             const ConnectionFactoryConstPtr &connFactory,
             const ChannelFactoryConstPtr &chanFactory,
             const ContactFactoryConstPtr &contactFactory) const;
-    virtual QString finalBusNameFrom(const QString &uniqueOrWellKnown) const;
+    QString finalBusNameFrom(const QString &uniqueOrWellKnown) const override;
     // Nothing we'd like to prepare()
     // Fixed features
 
diff --git a/TelepathyQt/account-manager.h b/TelepathyQt/account-manager.h
index 01dc161f..39b00e57 100644
--- a/TelepathyQt/account-manager.h
+++ b/TelepathyQt/account-manager.h
@@ -76,7 +76,7 @@ public:
             const ContactFactoryConstPtr &contactFactory =
                 ContactFactory::create());
 
-    virtual ~AccountManager();
+    ~AccountManager() override;
 
     AccountFactoryConstPtr accountFactory() const;
     ConnectionFactoryConstPtr connectionFactory() const;
diff --git a/TelepathyQt/account-property-filter.h b/TelepathyQt/account-property-filter.h
index 5694831e..ae98134c 100644
--- a/TelepathyQt/account-property-filter.h
+++ b/TelepathyQt/account-property-filter.h
@@ -42,9 +42,9 @@ public:
         return AccountPropertyFilterPtr(new AccountPropertyFilter);
     }
 
-    ~AccountPropertyFilter();
+    ~AccountPropertyFilter() override;
 
-    bool isValid() const;
+    bool isValid() const override;
 
 private:
     AccountPropertyFilter();
diff --git a/TelepathyQt/account-set-internal.h b/TelepathyQt/account-set-internal.h
index f7dbf9e0..2f49f053 100644
--- a/TelepathyQt/account-set-internal.h
+++ b/TelepathyQt/account-set-internal.h
@@ -59,7 +59,7 @@ class TP_QT_NO_EXPORT AccountSet::Private::AccountWrapper : public QObject
 
 public:
     AccountWrapper(const AccountPtr &account, QObject *parent = 0);
-    ~AccountWrapper();
+    ~AccountWrapper() override;
 
     AccountPtr account() const { return mAccount; }
 
diff --git a/TelepathyQt/account-set.h b/TelepathyQt/account-set.h
index 40dd79af..da9782c6 100644
--- a/TelepathyQt/account-set.h
+++ b/TelepathyQt/account-set.h
@@ -51,7 +51,7 @@ public:
             const AccountFilterConstPtr &filter);
     AccountSet(const AccountManagerPtr &accountManager,
             const QVariantMap &filter);
-    virtual ~AccountSet();
+    ~AccountSet() override;
 
     AccountManagerPtr accountManager() const;
 
diff --git a/TelepathyQt/account.h b/TelepathyQt/account.h
index 24db4e3c..7563e882 100644
--- a/TelepathyQt/account.h
+++ b/TelepathyQt/account.h
@@ -119,7 +119,7 @@ public:
             const ChannelFactoryConstPtr &channelFactory,
             const ContactFactoryConstPtr &contactFactory =
                 ContactFactory::create());
-    virtual ~Account();
+    ~Account() override;
 
     ConnectionFactoryConstPtr connectionFactory() const;
     ChannelFactoryConstPtr channelFactory() const;
diff --git a/TelepathyQt/base-call-internal.h b/TelepathyQt/base-call-internal.h
index 95ba637f..3fff0319 100644
--- a/TelepathyQt/base-call-internal.h
+++ b/TelepathyQt/base-call-internal.h
@@ -43,7 +43,7 @@ class TP_QT_NO_EXPORT BaseCallContent::Adaptee : public QObject
 
 public:
     Adaptee(const QDBusConnection &dbusConnection, BaseCallContent *content);
-    ~Adaptee();
+    ~Adaptee() override;
     QStringList interfaces() const;
 
     QString name() const {
@@ -83,7 +83,7 @@ class TP_QT_NO_EXPORT BaseCallMuteInterface::Adaptee : public QObject
 
 public:
     Adaptee(BaseCallMuteInterface *content);
-    ~Adaptee();
+    ~Adaptee() override;
     QStringList interfaces() const;
 
     uint localMuteState() const {
@@ -109,7 +109,7 @@ class TP_QT_NO_EXPORT BaseCallContentDTMFInterface::Adaptee : public QObject
 
 public:
     Adaptee(BaseCallContentDTMFInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
     QStringList interfaces() const;
 
     bool currentlySendingTones() const {
diff --git a/TelepathyQt/base-call.h b/TelepathyQt/base-call.h
index 81144c57..84308f25 100644
--- a/TelepathyQt/base-call.h
+++ b/TelepathyQt/base-call.h
@@ -49,7 +49,7 @@ class TP_QT_EXPORT AbstractCallContentInterface : public AbstractDBusServiceInte
 
 public:
     AbstractCallContentInterface(const QString &interfaceName);
-    virtual ~AbstractCallContentInterface();
+    ~AbstractCallContentInterface() override;
 
 private:
     friend class BaseCallContent;
@@ -73,8 +73,8 @@ public:
         return BaseCallContentPtr(new BaseCallContent(dbusConnection, channel, name, type, direction));
     }
 
-    virtual ~BaseCallContent();
-    QVariantMap immutableProperties() const;
+    ~BaseCallContent() override;
+    QVariantMap immutableProperties() const override;
     bool registerObject(DBusError *error = NULL);
     virtual QString uniqueName() const;
 
@@ -93,8 +93,8 @@ protected:
                     const Tp::MediaStreamType &type,
                     const Tp::MediaStreamDirection &direction);
 
-    virtual bool registerObject(const QString &busName, const QString &objectPath,
-                                DBusError *error);
+    bool registerObject(const QString &busName, const QString &objectPath,
+                                DBusError *error) override;
     void remove();
 
 private:
@@ -119,7 +119,7 @@ public:
         return SharedPtr<BaseCallMuteInterfaceSubclass>(
                    new BaseCallMuteInterfaceSubclass());
     }
-    virtual ~BaseCallMuteInterface();
+    ~BaseCallMuteInterface() override;
 
     Tp::LocalMuteState localMuteState() const;
     void setMuteState(const Tp::LocalMuteState &state);
@@ -130,7 +130,7 @@ Q_SIGNALS:
     void muteStateChanged(const Tp::LocalMuteState &state);
 private:
     BaseCallMuteInterface();
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -153,7 +153,7 @@ public:
         return SharedPtr<BaseCallContentDTMFInterfaceSubclass>(
                    new BaseCallContentDTMFInterfaceSubclass());
     }
-    virtual ~BaseCallContentDTMFInterface();
+    ~BaseCallContentDTMFInterface() override;
 
     bool currentlySendingTones() const;
     void setCurrentlySendingTones(bool sendingTones);
@@ -172,7 +172,7 @@ Q_SIGNALS:
 
 private:
     BaseCallContentDTMFInterface();
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
diff --git a/TelepathyQt/base-channel-internal.h b/TelepathyQt/base-channel-internal.h
index 600c52f0..bdae07d6 100644
--- a/TelepathyQt/base-channel-internal.h
+++ b/TelepathyQt/base-channel-internal.h
@@ -45,7 +45,7 @@ class TP_QT_NO_EXPORT BaseChannel::Adaptee : public QObject
     Q_PROPERTY(QString initiatorID READ initiatorID)
 public:
     Adaptee(const QDBusConnection &dbusConnection, BaseChannel *cm);
-    ~Adaptee();
+    ~Adaptee() override;
 
     QString channelType() const {
         return mChannel->channelType();
@@ -98,7 +98,7 @@ class TP_QT_NO_EXPORT BaseChannelTextType::Adaptee : public QObject
     Q_OBJECT
 public:
     Adaptee(BaseChannelTextType *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
 public slots:
     void acknowledgePendingMessages(const Tp::UIntList &IDs, const Tp::Service::ChannelTypeTextAdaptor::AcknowledgePendingMessagesContextPtr &context);
@@ -126,7 +126,7 @@ class TP_QT_NO_EXPORT BaseChannelMessagesInterface::Adaptee : public QObject
     Q_PROPERTY(uint deliveryReportingSupport READ deliveryReportingSupport)
 public:
     Adaptee(BaseChannelMessagesInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
     QStringList supportedContentTypes() {
         return mInterface->supportedContentTypes();
@@ -176,7 +176,7 @@ class TP_QT_NO_EXPORT BaseChannelFileTransferType::Adaptee : public QObject
 
 public:
     Adaptee(BaseChannelFileTransferType *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
     uint state() const;
     QString contentType() const;
@@ -218,7 +218,7 @@ class TP_QT_NO_EXPORT BaseChannelRoomListType::Adaptee : public QObject
 
 public:
     Adaptee(BaseChannelRoomListType *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
     QString server() const;
 
@@ -244,7 +244,7 @@ class TP_QT_NO_EXPORT BaseChannelServerAuthenticationType::Adaptee : public QObj
     Q_PROPERTY(QString authenticationMethod READ authenticationMethod)
 public:
     Adaptee(BaseChannelServerAuthenticationType *interface);
-    ~Adaptee();
+    ~Adaptee() override;
     QString authenticationMethod() const;
 public:
     BaseChannelServerAuthenticationType *mInterface;
@@ -259,7 +259,7 @@ class TP_QT_NO_EXPORT BaseChannelCaptchaAuthenticationInterface::Adaptee : publi
     Q_PROPERTY(QVariantMap captchaErrorDetails READ captchaErrorDetails)
 public:
     Adaptee(BaseChannelCaptchaAuthenticationInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
     bool canRetryCaptcha() const;
     uint captchaStatus() const;
     QString captchaError() const;
@@ -289,7 +289,7 @@ class TP_QT_NO_EXPORT BaseChannelSASLAuthenticationInterface::Adaptee : public Q
 
 public:
     Adaptee(BaseChannelSASLAuthenticationInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
     QStringList availableMechanisms() const;
     bool hasInitialData() const;
@@ -330,7 +330,7 @@ class TP_QT_NO_EXPORT BaseChannelSecurableInterface::Adaptee : public QObject
 
 public:
     Adaptee(BaseChannelSecurableInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
     bool encrypted() const;
     bool verified() const;
@@ -346,7 +346,7 @@ class TP_QT_NO_EXPORT BaseChannelChatStateInterface::Adaptee : public QObject
 
 public:
     Adaptee(BaseChannelChatStateInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
     Tp::ChatStateMap chatStates() const;
 
@@ -374,7 +374,7 @@ class TP_QT_NO_EXPORT BaseChannelGroupInterface::Adaptee : public QObject
 
 public:
     Adaptee(BaseChannelGroupInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
     uint groupFlags() const;
     Tp::HandleOwnerMap handleOwners() const;
@@ -416,7 +416,7 @@ class TP_QT_NO_EXPORT BaseChannelRoomInterface::Adaptee : public QObject
 
 public:
     Adaptee(BaseChannelRoomInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
     QString roomName() const;
     QString server() const;
@@ -448,7 +448,7 @@ class TP_QT_NO_EXPORT BaseChannelRoomConfigInterface::Adaptee : public QObject
 
 public:
     Adaptee(BaseChannelRoomConfigInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
     bool anonymous() const;
     bool inviteOnly() const;
@@ -493,7 +493,7 @@ class TP_QT_NO_EXPORT BaseChannelCallType::Adaptee : public QObject
 
 public:
     Adaptee(BaseChannelCallType *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
     Tp::ObjectPathList contents() const {
         return mInterface->contents();
@@ -575,7 +575,7 @@ class TP_QT_NO_EXPORT BaseChannelSMSInterface::Adaptee : public QObject
     Q_PROPERTY(bool smsChannel READ smsChannel)
 public:
     Adaptee(BaseChannelSMSInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
     bool flash() {
         return mInterface->flash();
@@ -598,7 +598,7 @@ class TP_QT_NO_EXPORT BaseChannelHoldInterface::Adaptee : public QObject
     Q_OBJECT
 public:
     Adaptee(BaseChannelHoldInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
 public slots:
     void getHoldState(const Tp::Service::ChannelInterfaceHoldAdaptor::GetHoldStateContextPtr &context);
@@ -621,7 +621,7 @@ class TP_QT_NO_EXPORT BaseChannelConferenceInterface::Adaptee : public QObject
     Q_PROPERTY(ChannelOriginatorMap originalChannels READ originalChannels)
 public:
     Adaptee(BaseChannelConferenceInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
     Tp::ObjectPathList channels() const {
         return mInterface->channels();
     }
@@ -654,7 +654,7 @@ class TP_QT_NO_EXPORT BaseChannelMergeableConferenceInterface::Adaptee : public
     Q_OBJECT
 public:
     Adaptee(BaseChannelMergeableConferenceInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
 public slots:
     void merge(const QDBusObjectPath &channel, const Tp::Service::ChannelInterfaceMergeableConferenceAdaptor::MergeContextPtr &context);
@@ -668,7 +668,7 @@ class TP_QT_NO_EXPORT BaseChannelSplittableInterface::Adaptee : public QObject
     Q_OBJECT
 public:
     Adaptee(BaseChannelSplittableInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
 public slots:
     void split(const Tp::Service::ChannelInterfaceSplittableAdaptor::SplitContextPtr &context);
diff --git a/TelepathyQt/base-channel.h b/TelepathyQt/base-channel.h
index 187b7be9..543f8bd8 100644
--- a/TelepathyQt/base-channel.h
+++ b/TelepathyQt/base-channel.h
@@ -51,9 +51,9 @@ public:
                                               channelType, targetHandleType, targetHandle));
     }
 
-    virtual ~BaseChannel();
+    ~BaseChannel() override;
 
-    QVariantMap immutableProperties() const;
+    QVariantMap immutableProperties() const override;
     bool registerObject(DBusError *error = NULL);
     virtual QString uniqueName() const;
 
@@ -84,8 +84,8 @@ Q_SIGNALS:
 protected:
     BaseChannel(const QDBusConnection &dbusConnection, BaseConnection *connection,
                 const QString &channelType, uint targetHandleType, uint targetHandle);
-    virtual bool registerObject(const QString &busName, const QString &objectPath,
-                                DBusError *error);
+    bool registerObject(const QString &busName, const QString &objectPath,
+                                DBusError *error) override;
 private:
     class Adaptee;
     friend class Adaptee;
@@ -101,7 +101,7 @@ class TP_QT_EXPORT AbstractChannelInterface : public AbstractDBusServiceInterfac
 
 public:
     AbstractChannelInterface(const QString &interfaceName);
-    virtual ~AbstractChannelInterface();
+    ~AbstractChannelInterface() override;
 
 protected:
     virtual void close();
@@ -131,7 +131,7 @@ public:
                    new BaseChannelTextTypeSubclass(channel));
     }
 
-    virtual ~BaseChannelTextType();
+    ~BaseChannelTextType() override;
 
     typedef Callback1<void, QString> MessageAcknowledgedCallback;
     void setMessageAcknowledgedCallback(const MessageAcknowledgedCallback &cb);
@@ -150,7 +150,7 @@ protected:
     void removePendingMessages(const Tp::UIntList &IDs);
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -181,9 +181,9 @@ public:
         return SharedPtr<BaseChannelMessagesInterfaceSubclass>(
                    new BaseChannelMessagesInterfaceSubclass());
     }
-    virtual ~BaseChannelMessagesInterface();
+    ~BaseChannelMessagesInterface() override;
 
-    QVariantMap immutableProperties() const;
+    QVariantMap immutableProperties() const override;
 
     QStringList supportedContentTypes();
     Tp::UIntList messageTypes();
@@ -206,7 +206,7 @@ private:
                                  Tp::UIntList messageTypes,
                                  uint messagePartSupportFlags,
                                  uint deliveryReportingSupport);
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -237,9 +237,9 @@ public:
                 new BaseChannelFileTransferTypeSubclass(request));
     }
 
-    virtual ~BaseChannelFileTransferType();
+    ~BaseChannelFileTransferType() override;
 
-    QVariantMap immutableProperties() const;
+    QVariantMap immutableProperties() const override;
     Direction direction() const;
 
     QString contentType() const;
@@ -278,7 +278,7 @@ protected:
 
     void setClientSocket(QIODevice *socket);
 
-    void close(); // Add Q_DECL_OVERRIDE in Qt5
+    void close() override; // Add Q_DECL_OVERRIDE in Qt5
 
 private Q_SLOTS:
     TP_QT_NO_EXPORT void onSocketConnection();
@@ -289,7 +289,7 @@ private:
     TP_QT_NO_EXPORT void setUri(const QString &uri);
     TP_QT_NO_EXPORT void tryToOpenAndTransfer();
 
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -315,9 +315,9 @@ public:
                 new BaseChannelRoomListTypeSubclass(server));
     }
 
-    virtual ~BaseChannelRoomListType();
+    ~BaseChannelRoomListType() override;
 
-    QVariantMap immutableProperties() const;
+    QVariantMap immutableProperties() const override;
 
     QString server() const;
 
@@ -338,7 +338,7 @@ protected:
     BaseChannelRoomListType(const QString &server);
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -361,13 +361,13 @@ public:
         return SharedPtr<BaseChannelServerAuthenticationTypeSubclass>(
                    new BaseChannelServerAuthenticationTypeSubclass(authenticationMethod));
     }
-    virtual ~BaseChannelServerAuthenticationType();
+    ~BaseChannelServerAuthenticationType() override;
 
-    QVariantMap immutableProperties() const;
+    QVariantMap immutableProperties() const override;
 private Q_SLOTS:
 private:
     BaseChannelServerAuthenticationType(const QString &authenticationMethod);
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -390,9 +390,9 @@ public:
         return SharedPtr<BaseChannelCaptchaAuthenticationInterfaceSubclass>(
                    new BaseChannelCaptchaAuthenticationInterfaceSubclass(canRetryCaptcha));
     }
-    virtual ~BaseChannelCaptchaAuthenticationInterface();
+    ~BaseChannelCaptchaAuthenticationInterface() override;
 
-    QVariantMap immutableProperties() const;
+    QVariantMap immutableProperties() const override;
 
     typedef Callback4<void, Tp::CaptchaInfoList&, uint&, QString&, DBusError*> GetCaptchasCallback;
     void setGetCaptchasCallback(const GetCaptchasCallback &cb);
@@ -412,7 +412,7 @@ public:
 private Q_SLOTS:
 private:
     BaseChannelCaptchaAuthenticationInterface(bool canRetryCaptcha);
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -462,9 +462,9 @@ public:
                                                                    maySaveResponse));
     }
 
-    virtual ~BaseChannelSASLAuthenticationInterface();
+    ~BaseChannelSASLAuthenticationInterface() override;
 
-    QVariantMap immutableProperties() const;
+    QVariantMap immutableProperties() const override;
 
     QStringList availableMechanisms() const;
     bool hasInitialData() const;
@@ -515,7 +515,7 @@ protected:
                                            bool maySaveResponse);
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -541,9 +541,9 @@ public:
                 new BaseChannelSecurableInterfaceSubclass());
     }
 
-    virtual ~BaseChannelSecurableInterface();
+    ~BaseChannelSecurableInterface() override;
 
-    QVariantMap immutableProperties() const;
+    QVariantMap immutableProperties() const override;
 
     bool encrypted() const;
     void setEncrypted(bool encrypted);
@@ -555,7 +555,7 @@ protected:
     BaseChannelSecurableInterface();
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -581,7 +581,7 @@ public:
                 new BaseChannelChatStateInterfaceSubclass());
     }
 
-    virtual ~BaseChannelChatStateInterface();
+    ~BaseChannelChatStateInterface() override;
 
     Tp::ChatStateMap chatStates() const;
     void setChatStates(const Tp::ChatStateMap &chatStates);
@@ -596,7 +596,7 @@ protected:
     BaseChannelChatStateInterface();
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -622,7 +622,7 @@ public:
                 new BaseChannelGroupInterfaceSubclass());
     }
 
-    virtual ~BaseChannelGroupInterface();
+    ~BaseChannelGroupInterface() override;
 
     Tp::ChannelGroupFlags groupFlags() const;
     void setGroupFlags(const Tp::ChannelGroupFlags &flags);
@@ -655,10 +655,10 @@ public:
 
 protected:
     BaseChannelGroupInterface();
-    void setBaseChannel(BaseChannel *channel);
+    void setBaseChannel(BaseChannel *channel) override;
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -700,9 +700,9 @@ public:
                                                      creationTimestamp));
     }
 
-    virtual ~BaseChannelRoomInterface();
+    ~BaseChannelRoomInterface() override;
 
-    QVariantMap immutableProperties() const;
+    QVariantMap immutableProperties() const override;
 
     QString roomName() const;
     QString server() const;
@@ -718,7 +718,7 @@ protected:
                              const QDateTime &creationTimestamp);
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -744,7 +744,7 @@ public:
                 new BaseChannelRoomConfigInterfaceSubclass());
     }
 
-    virtual ~BaseChannelRoomConfigInterface();
+    ~BaseChannelRoomConfigInterface() override;
 
     bool anonymous() const;
     void setAnonymous(bool anonymous);
@@ -796,7 +796,7 @@ protected:
     BaseChannelRoomConfigInterface();
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -852,9 +852,9 @@ public:
     typedef Callback2<bool, const QVariantMap&, DBusError*> EnsureChannelCallback;
     EnsureChannelCallback ensureChannel;
 
-    virtual ~BaseChannelCallType();
+    ~BaseChannelCallType() override;
 
-    QVariantMap immutableProperties() const;
+    QVariantMap immutableProperties() const override;
 
     Tp::ObjectPathList contents();
     QVariantMap callStateDetails();
@@ -904,7 +904,7 @@ protected:
                         bool mutableContents = false);
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -927,7 +927,7 @@ public:
         return SharedPtr<BaseChannelHoldInterfaceSubclass>(
                    new BaseChannelHoldInterfaceSubclass());
     }
-    virtual ~BaseChannelHoldInterface();
+    ~BaseChannelHoldInterface() override;
 
     Tp::LocalHoldState getHoldState() const;
     Tp::LocalHoldStateReason getHoldReason() const;
@@ -939,7 +939,7 @@ Q_SIGNALS:
     void holdStateChanged(const Tp::LocalHoldState &state, const Tp::LocalHoldStateReason &reason);
 private:
     BaseChannelHoldInterface();
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -962,7 +962,7 @@ public:
         return SharedPtr<BaseChannelMergeableConferenceInterfaceSubclass>(
                    new BaseChannelMergeableConferenceInterfaceSubclass());
     }
-    virtual ~BaseChannelMergeableConferenceInterface();
+    ~BaseChannelMergeableConferenceInterface() override;
 
     void merge(const QDBusObjectPath &channel);
 
@@ -970,7 +970,7 @@ public:
     void setMergeCallback(const MergeCallback &cb);
 private:
     BaseChannelMergeableConferenceInterface();
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -993,7 +993,7 @@ public:
         return SharedPtr<BaseChannelSplittableInterfaceSubclass>(
                    new BaseChannelSplittableInterfaceSubclass());
     }
-    virtual ~BaseChannelSplittableInterface();
+    ~BaseChannelSplittableInterface() override;
 
     void split();
 
@@ -1001,7 +1001,7 @@ public:
     void setSplitCallback(const SplitCallback &cb);
 private:
     BaseChannelSplittableInterface();
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -1032,9 +1032,9 @@ public:
         return SharedPtr<BaseChannelConferenceInterfaceSubclass>(
                    new BaseChannelConferenceInterfaceSubclass(initialChannels, initialInviteeHandles, initialInviteeIDs, invitationMessage, originalChannels));
     }
-    virtual ~BaseChannelConferenceInterface();
+    ~BaseChannelConferenceInterface() override;
 
-    QVariantMap immutableProperties() const;
+    QVariantMap immutableProperties() const override;
     Tp::ObjectPathList channels() const;
     Tp::ObjectPathList initialChannels() const;
     Tp::UIntList initialInviteeHandles() const;
@@ -1047,7 +1047,7 @@ public:
 
 private:
     BaseChannelConferenceInterface(Tp::ObjectPathList initialChannels, Tp::UIntList initialInviteeHandles, QStringList initialInviteeIDs, QString invitationMessage, ChannelOriginatorMap originalChannels);
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -1070,9 +1070,9 @@ public:
         return SharedPtr<BaseChannelSMSInterfaceSubclass>(
                    new BaseChannelSMSInterfaceSubclass(flash, smsChannel));
     }
-    virtual ~BaseChannelSMSInterface();
+    ~BaseChannelSMSInterface() override;
 
-    QVariantMap immutableProperties() const;
+    QVariantMap immutableProperties() const override;
 
     typedef Callback2<void, const Tp::MessagePartList &, DBusError*> GetSMSLengthCallback;
     void setGetSMSLengthCallback(const GetSMSLengthCallback &cb);
@@ -1085,7 +1085,7 @@ Q_SIGNALS:
 
 private:
     BaseChannelSMSInterface(bool flash, bool smsChannel);
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
diff --git a/TelepathyQt/base-connection-internal.h b/TelepathyQt/base-connection-internal.h
index 841d7255..36439458 100644
--- a/TelepathyQt/base-connection-internal.h
+++ b/TelepathyQt/base-connection-internal.h
@@ -41,7 +41,7 @@ class TP_QT_NO_EXPORT BaseConnection::Adaptee : public QObject
 
 public:
     Adaptee(const QDBusConnection &dbusConnection, BaseConnection *connection);
-    ~Adaptee();
+    ~Adaptee() override;
 
     QStringList interfaces() const;
     uint selfHandle() const;
@@ -100,7 +100,7 @@ class TP_QT_NO_EXPORT BaseConnectionRequestsInterface::Adaptee : public QObject
 
 public:
     Adaptee(BaseConnectionRequestsInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
     Tp::ChannelDetailsList channels() const;
     Tp::RequestableChannelClassList requestableChannelClasses() const {
         debug() << "BaseConnectionRequestsInterface::requestableChannelClasses";
@@ -125,7 +125,7 @@ class TP_QT_NO_EXPORT BaseConnectionContactsInterface::Adaptee : public QObject
     Q_PROPERTY(QStringList contactAttributeInterfaces READ contactAttributeInterfaces)
 public:
     Adaptee(BaseConnectionContactsInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
     QStringList contactAttributeInterfaces() const;
 
 private Q_SLOTS:
@@ -145,7 +145,7 @@ class TP_QT_NO_EXPORT BaseConnectionSimplePresenceInterface::Adaptee : public QO
     Q_PROPERTY(uint maximumStatusMessageLength READ maximumStatusMessageLength)
 public:
     Adaptee(BaseConnectionSimplePresenceInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
     Tp::SimpleStatusSpecMap statuses() const;
     int maximumStatusMessageLength() const;
 
@@ -172,7 +172,7 @@ class TP_QT_NO_EXPORT BaseConnectionContactListInterface::Adaptee : public QObje
 
 public:
     Adaptee(BaseConnectionContactListInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
     uint contactListState() const;
     bool contactListPersists() const;
@@ -213,7 +213,7 @@ class TP_QT_NO_EXPORT BaseConnectionContactGroupsInterface::Adaptee : public QOb
 
 public:
     Adaptee(BaseConnectionContactGroupsInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
     bool disjointGroups() const;
     uint groupStorage() const;
@@ -251,7 +251,7 @@ class TP_QT_NO_EXPORT BaseConnectionContactInfoInterface::Adaptee : public QObje
 
 public:
     Adaptee(BaseConnectionContactInfoInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
     uint contactInfoFlags() const;
     Tp::FieldSpecs supportedFields() const;
@@ -279,7 +279,7 @@ class TP_QT_NO_EXPORT BaseConnectionAddressingInterface::Adaptee : public QObjec
 
 public:
     Adaptee(BaseConnectionAddressingInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
 
 private Q_SLOTS:
@@ -297,7 +297,7 @@ class TP_QT_NO_EXPORT BaseConnectionAliasingInterface::Adaptee : public QObject
 
 public:
     Adaptee(BaseConnectionAliasingInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
 private Q_SLOTS:
     void getAliasFlags(
@@ -330,7 +330,7 @@ class TP_QT_NO_EXPORT BaseConnectionAvatarsInterface::Adaptee : public QObject
 
 public:
     Adaptee(BaseConnectionAvatarsInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
     QStringList supportedAvatarMimeTypes() const;
     uint minimumAvatarHeight() const;
@@ -365,7 +365,7 @@ class TP_QT_NO_EXPORT BaseConnectionClientTypesInterface::Adaptee : public QObje
 
 public:
     Adaptee(BaseConnectionClientTypesInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
 private Q_SLOTS:
     void getClientTypes(const Tp::UIntList &contacts,
@@ -386,7 +386,7 @@ class TP_QT_NO_EXPORT BaseConnectionContactCapabilitiesInterface::Adaptee : publ
 
 public:
     Adaptee(BaseConnectionContactCapabilitiesInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
 private Q_SLOTS:
     void updateCapabilities(const Tp::HandlerCapabilitiesList &handlerCapabilities,
diff --git a/TelepathyQt/base-connection-manager-internal.h b/TelepathyQt/base-connection-manager-internal.h
index 538accd9..03025ce2 100644
--- a/TelepathyQt/base-connection-manager-internal.h
+++ b/TelepathyQt/base-connection-manager-internal.h
@@ -42,7 +42,7 @@ class TP_QT_NO_EXPORT BaseConnectionManager::Adaptee : public QObject
 
 public:
     Adaptee(const QDBusConnection &dbusConnection, BaseConnectionManager *cm);
-    ~Adaptee();
+    ~Adaptee() override;
 
     QStringList interfaces() const;
     Tp::ProtocolPropertiesMap protocols() const;
diff --git a/TelepathyQt/base-connection-manager.h b/TelepathyQt/base-connection-manager.h
index 3695d4e3..ea7087e0 100644
--- a/TelepathyQt/base-connection-manager.h
+++ b/TelepathyQt/base-connection-manager.h
@@ -68,11 +68,11 @@ public:
                     dbusConnection, name));
     }
 
-    virtual ~BaseConnectionManager();
+    ~BaseConnectionManager() override;
 
     QString name() const;
 
-    QVariantMap immutableProperties() const;
+    QVariantMap immutableProperties() const override;
 
     QList<BaseProtocolPtr> protocols() const;
     BaseProtocolPtr protocol(const QString &protocolName) const;
@@ -89,8 +89,8 @@ Q_SIGNALS:
 protected:
     BaseConnectionManager(const QDBusConnection &dbusConnection, const QString &name);
 
-    virtual bool registerObject(const QString &busName, const QString &objectPath,
-            DBusError *error);
+    bool registerObject(const QString &busName, const QString &objectPath,
+            DBusError *error) override;
 
 private Q_SLOTS:
     TP_QT_NO_EXPORT void removeConnection();
diff --git a/TelepathyQt/base-connection.h b/TelepathyQt/base-connection.h
index 05566c50..c1e87148 100644
--- a/TelepathyQt/base-connection.h
+++ b/TelepathyQt/base-connection.h
@@ -63,12 +63,12 @@ public:
                     dbusConnection, cmName, protocolName, parameters));
     }
 
-    virtual ~BaseConnection();
+    ~BaseConnection() override;
 
     QString cmName() const;
     QString protocolName() const;
     QVariantMap parameters() const;
-    QVariantMap immutableProperties() const;
+    QVariantMap immutableProperties() const override;
 
     uint selfHandle() const;
     void setSelfHandle(uint selfHandle);
@@ -122,8 +122,8 @@ protected:
                    const QString &cmName, const QString &protocolName,
                    const QVariantMap &parameters);
 
-    virtual bool registerObject(const QString &busName, const QString &objectPath,
-                                DBusError *error);
+    bool registerObject(const QString &busName, const QString &objectPath,
+                                DBusError *error) override;
 
     virtual bool matchChannel(const Tp::BaseChannelPtr &channel, const QVariantMap &request, Tp::DBusError *error);
 
@@ -142,7 +142,7 @@ class TP_QT_EXPORT AbstractConnectionInterface : public AbstractDBusServiceInter
 
 public:
     AbstractConnectionInterface(const QString &interfaceName);
-    virtual ~AbstractConnectionInterface();
+    ~AbstractConnectionInterface() override;
 
 protected:
     virtual void setBaseConnection(BaseConnection *connection);
@@ -170,9 +170,9 @@ public:
                    new BaseConnectionRequestsInterfaceSubclass(connection));
     }
 
-    virtual ~BaseConnectionRequestsInterface();
+    ~BaseConnectionRequestsInterface() override;
 
-    QVariantMap immutableProperties() const;
+    QVariantMap immutableProperties() const override;
 
     Tp::RequestableChannelClassList requestableChannelClasses;
     void ensureChannel(const QVariantMap &request, bool &yours,
@@ -188,7 +188,7 @@ protected:
     BaseConnectionRequestsInterface(BaseConnection* connection);
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -214,9 +214,9 @@ public:
                 new BaseConnectionContactsInterfaceSubclass());
     }
 
-    virtual ~BaseConnectionContactsInterface();
+    ~BaseConnectionContactsInterface() override;
 
-    QVariantMap immutableProperties() const;
+    QVariantMap immutableProperties() const override;
 
     QStringList contactAttributeInterfaces() const;
     void setContactAttributeInterfaces(const QStringList &contactAttributeInterfaces);
@@ -229,10 +229,10 @@ public:
 
 protected:
     BaseConnectionContactsInterface();
-    void setBaseConnection(BaseConnection *connection);
+    void setBaseConnection(BaseConnection *connection) override;
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -258,7 +258,7 @@ public:
                 new BaseConnectionSimplePresenceInterfaceSubclass());
     }
 
-    virtual ~BaseConnectionSimplePresenceInterface();
+    ~BaseConnectionSimplePresenceInterface() override;
 
     Tp::SimpleStatusSpecMap statuses() const;
     void setStatuses(const Tp::SimpleStatusSpecMap &statuses);
@@ -277,7 +277,7 @@ protected:
     BaseConnectionSimplePresenceInterface();
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -303,7 +303,7 @@ public:
                 new BaseConnectionContactListInterfaceSubclass());
     }
 
-    virtual ~BaseConnectionContactListInterface();
+    ~BaseConnectionContactListInterface() override;
 
     uint contactListState() const;
     void setContactListState(uint contactListState);
@@ -354,7 +354,7 @@ protected:
     BaseConnectionContactListInterface();
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -380,7 +380,7 @@ public:
                 new BaseConnectionContactGroupsInterfaceSubclass());
     }
 
-    virtual ~BaseConnectionContactGroupsInterface();
+    ~BaseConnectionContactGroupsInterface() override;
 
     bool disjointGroups() const;
     void setDisjointGroups(bool disjointGroups);
@@ -424,7 +424,7 @@ protected:
     BaseConnectionContactGroupsInterface();
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -450,7 +450,7 @@ public:
                 new BaseConnectionContactInfoInterfaceSubclass());
     }
 
-    virtual ~BaseConnectionContactInfoInterface();
+    ~BaseConnectionContactInfoInterface() override;
 
     Tp::ContactInfoFlags contactInfoFlags() const;
     void setContactInfoFlags(const Tp::ContactInfoFlags &contactInfoFlags);
@@ -480,7 +480,7 @@ protected:
     BaseConnectionContactInfoInterface();
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -504,7 +504,7 @@ public:
                    new BaseConnectionAddressingInterfaceSubclass());
     }
 
-    virtual ~BaseConnectionAddressingInterface();
+    ~BaseConnectionAddressingInterface() override;
 
     typedef Callback6 < void, const QString&, const QStringList&, const QStringList&,
             Tp::AddressingNormalizationMap&, Tp::ContactAttributesMap&, DBusError* > GetContactsByVCardFieldCallback;
@@ -518,7 +518,7 @@ protected:
     BaseConnectionAddressingInterface();
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -544,7 +544,7 @@ public:
                 new BaseConnectionAliasingInterfaceSubclass());
     }
 
-    virtual ~BaseConnectionAliasingInterface();
+    ~BaseConnectionAliasingInterface() override;
 
     typedef Callback1<Tp::ConnectionAliasFlags, DBusError*> GetAliasFlagsCallback;
     void setGetAliasFlagsCallback(const GetAliasFlagsCallback &cb);
@@ -568,7 +568,7 @@ protected:
     BaseConnectionAliasingInterface();
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -594,7 +594,7 @@ public:
                 new BaseConnectionAvatarsInterfaceSubclass());
     }
 
-    virtual ~BaseConnectionAvatarsInterface();
+    ~BaseConnectionAvatarsInterface() override;
 
     AvatarSpec avatarDetails() const;
     void setAvatarDetails(const AvatarSpec &spec);
@@ -622,7 +622,7 @@ protected:
     BaseConnectionAvatarsInterface();
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -648,7 +648,7 @@ public:
                 new BaseConnectionClientTypesInterfaceSubclass());
     }
 
-    virtual ~BaseConnectionClientTypesInterface();
+    ~BaseConnectionClientTypesInterface() override;
 
     typedef Callback2<Tp::ContactClientTypes, const Tp::UIntList &, DBusError*> GetClientTypesCallback;
     void setGetClientTypesCallback(const GetClientTypesCallback &cb);
@@ -664,7 +664,7 @@ protected:
     BaseConnectionClientTypesInterface();
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -690,7 +690,7 @@ public:
                 new BaseConnectionContactCapabilitiesInterfaceSubclass());
     }
 
-    virtual ~BaseConnectionContactCapabilitiesInterface();
+    ~BaseConnectionContactCapabilitiesInterface() override;
 
     typedef Callback2<void, const Tp::HandlerCapabilitiesList &, DBusError*> UpdateCapabilitiesCallback;
     void setUpdateCapabilitiesCallback(const UpdateCapabilitiesCallback &cb);
@@ -706,7 +706,7 @@ protected:
     BaseConnectionContactCapabilitiesInterface();
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
diff --git a/TelepathyQt/base-debug.h b/TelepathyQt/base-debug.h
index 0909a873..9461a44f 100644
--- a/TelepathyQt/base-debug.h
+++ b/TelepathyQt/base-debug.h
@@ -57,7 +57,7 @@ public Q_SLOTS:
     void newDebugMessage(const QString &domain, DebugLevel level, const QString &message);
     void newDebugMessage(double time, const QString &domain, DebugLevel level, const QString &message);
 
-    QVariantMap immutableProperties() const;
+    QVariantMap immutableProperties() const override;
 
     bool registerObject(const QString &busName, DBusError *error = NULL);
 
diff --git a/TelepathyQt/base-protocol-internal.h b/TelepathyQt/base-protocol-internal.h
index ae622fd3..85069761 100644
--- a/TelepathyQt/base-protocol-internal.h
+++ b/TelepathyQt/base-protocol-internal.h
@@ -48,7 +48,7 @@ class TP_QT_NO_EXPORT BaseProtocol::Adaptee : public QObject
 
 public:
     Adaptee(const QDBusConnection &dbusConnection, BaseProtocol *protocol);
-    ~Adaptee();
+    ~Adaptee() override;
 
     QStringList interfaces() const;
     QStringList connectionInterfaces() const;
@@ -77,7 +77,7 @@ class TP_QT_NO_EXPORT BaseProtocolAddressingInterface::Adaptee : public QObject
 
 public:
     Adaptee(BaseProtocolAddressingInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
     QStringList addressableVCardFields() const;
     QStringList addressableURISchemes() const;
@@ -106,7 +106,7 @@ class TP_QT_NO_EXPORT BaseProtocolAvatarsInterface::Adaptee : public QObject
 
 public:
     Adaptee(BaseProtocolAvatarsInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
     QStringList supportedAvatarMIMETypes() const;
     uint minimumAvatarHeight() const;
@@ -128,7 +128,7 @@ class TP_QT_NO_EXPORT BaseProtocolPresenceInterface::Adaptee : public QObject
 
 public:
     Adaptee(BaseProtocolPresenceInterface *interface);
-    ~Adaptee();
+    ~Adaptee() override;
 
     SimpleStatusSpecMap statuses() const;
 
diff --git a/TelepathyQt/base-protocol.h b/TelepathyQt/base-protocol.h
index 6a3d3f9b..4817b37a 100644
--- a/TelepathyQt/base-protocol.h
+++ b/TelepathyQt/base-protocol.h
@@ -71,11 +71,11 @@ public:
         return SharedPtr<BaseProtocolSubclass>(new BaseProtocolSubclass(dbusConnection, name));
     }
 
-    virtual ~BaseProtocol();
+    ~BaseProtocol() override;
 
     QString name() const;
 
-    QVariantMap immutableProperties() const;
+    QVariantMap immutableProperties() const override;
 
     // Proto
     QStringList connectionInterfaces() const;
@@ -118,8 +118,8 @@ public:
 protected:
     BaseProtocol(const QDBusConnection &dbusConnection, const QString &name);
 
-    virtual bool registerObject(const QString &busName, const QString &objectPath,
-            DBusError *error);
+    bool registerObject(const QString &busName, const QString &objectPath,
+            DBusError *error) override;
 
 private:
     friend class BaseConnectionManager;
@@ -137,7 +137,7 @@ class TP_QT_EXPORT AbstractProtocolInterface : public AbstractDBusServiceInterfa
 
 public:
     AbstractProtocolInterface(const QString &interfaceName);
-    virtual ~AbstractProtocolInterface();
+    ~AbstractProtocolInterface() override;
 
 private:
     friend class BaseProtocol;
@@ -164,7 +164,7 @@ public:
                 new BaseProtocolAddressingInterfaceSubclass());
     }
 
-    virtual ~BaseProtocolAddressingInterface();
+    ~BaseProtocolAddressingInterface() override;
 
     QStringList addressableVCardFields() const;
     void setAddressableVCardFields(const QStringList &vcardFields);
@@ -184,7 +184,7 @@ protected:
     BaseProtocolAddressingInterface();
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -210,9 +210,9 @@ public:
                 new BaseProtocolAvatarsInterfaceSubclass());
     }
 
-    virtual ~BaseProtocolAvatarsInterface();
+    ~BaseProtocolAvatarsInterface() override;
 
-    QVariantMap immutableProperties() const;
+    QVariantMap immutableProperties() const override;
 
     AvatarSpec avatarDetails() const;
     void setAvatarDetails(const AvatarSpec &spec);
@@ -221,7 +221,7 @@ protected:
     BaseProtocolAvatarsInterface();
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
@@ -247,9 +247,9 @@ public:
                 new BaseProtocolPresenceInterfaceSubclass());
     }
 
-    virtual ~BaseProtocolPresenceInterface();
+    ~BaseProtocolPresenceInterface() override;
 
-    QVariantMap immutableProperties() const;
+    QVariantMap immutableProperties() const override;
 
     PresenceSpecList statuses() const;
     void setStatuses(const PresenceSpecList &statuses);
@@ -258,7 +258,7 @@ protected:
     BaseProtocolPresenceInterface();
 
 private:
-    void createAdaptor();
+    void createAdaptor() override;
 
     class Adaptee;
     friend class Adaptee;
diff --git a/TelepathyQt/call-channel.h b/TelepathyQt/call-channel.h
index aebb0ba1..4cb1e26f 100644
--- a/TelepathyQt/call-channel.h
+++ b/TelepathyQt/call-channel.h
@@ -47,7 +47,7 @@ public:
     static CallChannelPtr create(const ConnectionPtr &connection,
             const QString &objectPath, const QVariantMap &immutableProperties);
 
-    virtual ~CallChannel();
+    ~CallChannel() override;
 
     bool handlerStreamingRequired() const;
     StreamTransportType initialTransportType() const;
diff --git a/TelepathyQt/call-content.h b/TelepathyQt/call-content.h
index 369b286b..80e65498 100644
--- a/TelepathyQt/call-content.h
+++ b/TelepathyQt/call-content.h
@@ -43,7 +43,7 @@ class TP_QT_EXPORT CallContent : public StatefulDBusProxy,
     Q_DISABLE_COPY(CallContent)
 
 public:
-    ~CallContent();
+    ~CallContent() override;
 
     CallChannelPtr channel() const;
 
@@ -89,7 +89,7 @@ class TP_QT_EXPORT PendingCallContent : public PendingOperation
     Q_DISABLE_COPY(PendingCallContent)
 
 public:
-    ~PendingCallContent();
+    ~PendingCallContent() override;
 
     CallContentPtr content() const;
 
diff --git a/TelepathyQt/call-stream.h b/TelepathyQt/call-stream.h
index ff62b7c4..e14fc145 100644
--- a/TelepathyQt/call-stream.h
+++ b/TelepathyQt/call-stream.h
@@ -48,7 +48,7 @@ class TP_QT_EXPORT CallStream : public StatefulDBusProxy,
     Q_DISABLE_COPY(CallStream)
 
 public:
-    ~CallStream();
+    ~CallStream() override;
 
     CallContentPtr content() const;
 
diff --git a/TelepathyQt/callbacks.h b/TelepathyQt/callbacks.h
index 18dd8048..08b508a9 100644
--- a/TelepathyQt/callbacks.h
+++ b/TelepathyQt/callbacks.h
@@ -55,9 +55,9 @@ struct BaseFunctorCaller : public AbstractFunctorCaller
     BaseFunctorCaller(const Functor &functor, AbstractFunctorCaller::HookType invokeMethodHook)
         : AbstractFunctorCaller(invokeMethodHook),
           functor(functor) {}
-    virtual ~BaseFunctorCaller() {}
+    ~BaseFunctorCaller() override {}
 
-    virtual AbstractFunctorCaller *clone() const { return new T(functor); }
+    AbstractFunctorCaller *clone() const override { return new T(functor); }
 
     Functor functor;
 };
diff --git a/TelepathyQt/captcha-authentication-internal.h b/TelepathyQt/captcha-authentication-internal.h
index f5b781d6..0eeb55ea 100644
--- a/TelepathyQt/captcha-authentication-internal.h
+++ b/TelepathyQt/captcha-authentication-internal.h
@@ -39,7 +39,7 @@ class TP_QT_NO_EXPORT PendingCaptchaAnswer : public PendingOperation
 public:
     PendingCaptchaAnswer(const QDBusPendingCall &call,
             const CaptchaAuthenticationPtr &object);
-    ~PendingCaptchaAnswer();
+    ~PendingCaptchaAnswer() override;
 
 private Q_SLOTS:
     void onCaptchaStatusChanged(Tp::CaptchaStatus status);
@@ -63,7 +63,7 @@ class TP_QT_NO_EXPORT PendingCaptchaCancel : public PendingOperation
 public:
     PendingCaptchaCancel(const QDBusPendingCall &call,
             const CaptchaAuthenticationPtr &object);
-    ~PendingCaptchaCancel();
+    ~PendingCaptchaCancel() override;
 
 private Q_SLOTS:
     void onCancelFinished();
diff --git a/TelepathyQt/captcha-authentication.h b/TelepathyQt/captcha-authentication.h
index 15bd8231..ecc03a8d 100644
--- a/TelepathyQt/captcha-authentication.h
+++ b/TelepathyQt/captcha-authentication.h
@@ -61,7 +61,7 @@ public:
     };
     Q_DECLARE_FLAGS(ChallengeTypes, ChallengeType)
 
-    virtual ~CaptchaAuthentication();
+    ~CaptchaAuthentication() override;
 
     ChannelPtr channel() const;
 
diff --git a/TelepathyQt/channel-dispatch-operation-internal.h b/TelepathyQt/channel-dispatch-operation-internal.h
index 7eef7253..03863f17 100644
--- a/TelepathyQt/channel-dispatch-operation-internal.h
+++ b/TelepathyQt/channel-dispatch-operation-internal.h
@@ -36,7 +36,7 @@ class TP_QT_NO_EXPORT ChannelDispatchOperation::PendingClaim : public PendingOpe
 public:
     PendingClaim(const ChannelDispatchOperationPtr &op,
             const AbstractClientHandlerPtr &handler = AbstractClientHandlerPtr());
-    ~PendingClaim();
+    ~PendingClaim() override;
 
 private Q_SLOTS:
     TP_QT_NO_EXPORT void onClaimFinished(Tp::PendingOperation *op);
diff --git a/TelepathyQt/channel-dispatch-operation.h b/TelepathyQt/channel-dispatch-operation.h
index 9d319d23..cd4b3cf5 100644
--- a/TelepathyQt/channel-dispatch-operation.h
+++ b/TelepathyQt/channel-dispatch-operation.h
@@ -63,7 +63,7 @@ public:
             const ConnectionFactoryConstPtr &connectionFactory,
             const ChannelFactoryConstPtr &channelFactory,
             const ContactFactoryConstPtr &contactFactory);
-    virtual ~ChannelDispatchOperation();
+    ~ChannelDispatchOperation() override;
 
     ConnectionPtr connection() const;
 
diff --git a/TelepathyQt/channel-factory.h b/TelepathyQt/channel-factory.h
index 86038d91..711b60d2 100644
--- a/TelepathyQt/channel-factory.h
+++ b/TelepathyQt/channel-factory.h
@@ -52,7 +52,7 @@ public:
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
     struct TP_QT_EXPORT Constructor : public RefCounted
     {
-        virtual ~Constructor() {}
+        ~Constructor() override {}
 
         virtual ChannelPtr construct(const ConnectionPtr &conn, const QString &objectPath,
                 const QVariantMap &immutableProperties) const = 0;
@@ -63,7 +63,7 @@ public:
 
     static ChannelFactoryPtr create(const QDBusConnection &bus);
 
-    virtual ~ChannelFactory();
+    ~ChannelFactory() override;
 
     Features featuresForTextChats(const QVariantMap &additionalProps = QVariantMap()) const;
     void addFeaturesForTextChats(const Features &features,
@@ -374,19 +374,19 @@ protected:
             return ConstructorPtr(new SubclassCtor<Subclass>());
         }
 
-        virtual ~SubclassCtor() {}
+        ~SubclassCtor() override {}
 
         ChannelPtr construct(const ConnectionPtr &conn, const QString &objectPath,
-                const QVariantMap &immutableProperties) const
+                const QVariantMap &immutableProperties) const override
         {
             return Subclass::create(conn, objectPath, immutableProperties);
         }
     };
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
-    virtual QString finalBusNameFrom(const QString &uniqueOrWellKnown) const;
+    QString finalBusNameFrom(const QString &uniqueOrWellKnown) const override;
     // Nothing we'd like to prepare()
-    virtual Features featuresFor(const DBusProxyPtr &proxy) const;
+    Features featuresFor(const DBusProxyPtr &proxy) const override;
 
 private:
     struct Private;
diff --git a/TelepathyQt/channel-request.h b/TelepathyQt/channel-request.h
index c0eb7b2b..f597db6c 100644
--- a/TelepathyQt/channel-request.h
+++ b/TelepathyQt/channel-request.h
@@ -68,7 +68,7 @@ public:
     static ChannelRequestPtr create(const AccountPtr &account,
             const QString &objectPath, const QVariantMap &immutableProperties);
 
-    virtual ~ChannelRequest();
+    ~ChannelRequest() override;
 
     AccountPtr account() const;
     QDateTime userActionTime() const;
diff --git a/TelepathyQt/channel.h b/TelepathyQt/channel.h
index 8103a24a..59855606 100644
--- a/TelepathyQt/channel.h
+++ b/TelepathyQt/channel.h
@@ -61,7 +61,7 @@ public:
     static ChannelPtr create(const ConnectionPtr &connection,
             const QString &objectPath, const QVariantMap &immutableProperties);
 
-    virtual ~Channel();
+    ~Channel() override;
 
     ConnectionPtr connection() const;
 
diff --git a/TelepathyQt/client-registrar-internal.h b/TelepathyQt/client-registrar-internal.h
index 3f0b4ec3..2866b0fc 100644
--- a/TelepathyQt/client-registrar-internal.h
+++ b/TelepathyQt/client-registrar-internal.h
@@ -52,7 +52,7 @@ class TP_QT_NO_EXPORT ClientAdaptor : public QDBusAbstractAdaptor
 
 public:
     ClientAdaptor(ClientRegistrar *registrar, const QStringList &interfaces, QObject *parent);
-    virtual ~ClientAdaptor();
+    ~ClientAdaptor() override;
 
     inline const ClientRegistrar *registrar() const
     {
@@ -96,7 +96,7 @@ public:
     ClientObserverAdaptor(ClientRegistrar *registrar,
             AbstractClientObserver *client,
             QObject *parent);
-    virtual ~ClientObserverAdaptor();
+    ~ClientObserverAdaptor() override;
 
     inline const ClientRegistrar *registrar() const
     {
@@ -170,7 +170,7 @@ public:
     ClientApproverAdaptor(ClientRegistrar *registrar,
             AbstractClientApprover *client,
             QObject *parent);
-    virtual ~ClientApproverAdaptor();
+    ~ClientApproverAdaptor() override;
 
     inline const ClientRegistrar *registrar() const
     {
@@ -242,7 +242,7 @@ public:
     ClientHandlerAdaptor(ClientRegistrar *registrar,
             AbstractClientHandler *client,
             QObject *parent);
-    virtual ~ClientHandlerAdaptor();
+    ~ClientHandlerAdaptor() override;
 
     inline const ClientRegistrar *registrar() const
     {
@@ -333,7 +333,7 @@ public:
     ClientHandlerRequestsAdaptor(ClientRegistrar *registrar,
             AbstractClientHandler *client,
             QObject *parent);
-    virtual ~ClientHandlerRequestsAdaptor();
+    ~ClientHandlerRequestsAdaptor() override;
 
     inline const ClientRegistrar *registrar() const
     {
diff --git a/TelepathyQt/client-registrar.cpp b/TelepathyQt/client-registrar.cpp
index 3160fc93..e38d7d21 100644
--- a/TelepathyQt/client-registrar.cpp
+++ b/TelepathyQt/client-registrar.cpp
@@ -72,7 +72,7 @@ private:
     {
     }
 
-    void onFinished()
+    void onFinished() override
     {
         if (mFinishedCb) {
             mFinishedCb(MethodInvocationContextPtr<>(this), mChannels, mFinishedCbData);
diff --git a/TelepathyQt/client-registrar.h b/TelepathyQt/client-registrar.h
index 631dd454..9af4f8fb 100644
--- a/TelepathyQt/client-registrar.h
+++ b/TelepathyQt/client-registrar.h
@@ -63,7 +63,7 @@ public:
             const ContactFactoryConstPtr &contactFactory);
     static ClientRegistrarPtr create(const AccountManagerPtr &accountManager);
 
-    ~ClientRegistrar();
+    ~ClientRegistrar() override;
 
     QDBusConnection dbusConnection() const;
 
diff --git a/TelepathyQt/connection-capabilities.h b/TelepathyQt/connection-capabilities.h
index 1c9bf1a5..6fc261fb 100644
--- a/TelepathyQt/connection-capabilities.h
+++ b/TelepathyQt/connection-capabilities.h
@@ -39,7 +39,7 @@ class TP_QT_EXPORT ConnectionCapabilities : public CapabilitiesBase
 {
 public:
     ConnectionCapabilities();
-    virtual ~ConnectionCapabilities();
+    ~ConnectionCapabilities() override;
 
     bool textChatrooms() const;
 
diff --git a/TelepathyQt/connection-factory.h b/TelepathyQt/connection-factory.h
index 70f3b503..c434c33c 100644
--- a/TelepathyQt/connection-factory.h
+++ b/TelepathyQt/connection-factory.h
@@ -52,7 +52,7 @@ public:
     static ConnectionFactoryPtr create(const QDBusConnection &bus,
             const Features &features = Features());
 
-    virtual ~ConnectionFactory();
+    ~ConnectionFactory() override;
 
     PendingReady *proxy(const QString &busName, const QString &objectPath,
             const ChannelFactoryConstPtr &chanFactory,
@@ -64,7 +64,7 @@ protected:
     virtual ConnectionPtr construct(const QString &busName, const QString &objectPath,
             const ChannelFactoryConstPtr &chanFactory,
             const ContactFactoryConstPtr &contactFactory) const;
-    virtual QString finalBusNameFrom(const QString &uniqueOrWellKnown) const;
+    QString finalBusNameFrom(const QString &uniqueOrWellKnown) const override;
     // Nothing we'd like to prepare()
     // Fixed features
 
diff --git a/TelepathyQt/connection-lowlevel.h b/TelepathyQt/connection-lowlevel.h
index 63a3429f..536985e8 100644
--- a/TelepathyQt/connection-lowlevel.h
+++ b/TelepathyQt/connection-lowlevel.h
@@ -46,7 +46,7 @@ class TP_QT_EXPORT ConnectionLowlevel : public QObject, public RefCounted
     Q_DISABLE_COPY(ConnectionLowlevel)
 
 public:
-    ~ConnectionLowlevel();
+    ~ConnectionLowlevel() override;
 
     bool isValid() const;
     ConnectionPtr connection() const;
diff --git a/TelepathyQt/connection-manager-internal.h b/TelepathyQt/connection-manager-internal.h
index 952a748d..c0fe2c3b 100644
--- a/TelepathyQt/connection-manager-internal.h
+++ b/TelepathyQt/connection-manager-internal.h
@@ -97,7 +97,7 @@ class TP_QT_NO_EXPORT ConnectionManager::Private::PendingNames : public PendingS
 
 public:
     PendingNames(const QDBusConnection &bus);
-    ~PendingNames() {};
+    ~PendingNames() override {};
 
 private Q_SLOTS:
     void onCallFinished(QDBusPendingCallWatcher *);
@@ -123,7 +123,7 @@ public:
     ProtocolWrapper(const ConnectionManagerPtr &cm,
             const QString &objectPath,
             const QString &name, const QVariantMap &props);
-    ~ProtocolWrapper();
+    ~ProtocolWrapper() override;
 
     ProtocolInfo info() const { return mInfo; }
 
diff --git a/TelepathyQt/connection-manager-lowlevel.h b/TelepathyQt/connection-manager-lowlevel.h
index 69c67330..f0286c64 100644
--- a/TelepathyQt/connection-manager-lowlevel.h
+++ b/TelepathyQt/connection-manager-lowlevel.h
@@ -41,7 +41,7 @@ class TP_QT_EXPORT ConnectionManagerLowlevel : public QObject, public RefCounted
     Q_DISABLE_COPY(ConnectionManagerLowlevel)
 
 public:
-    ~ConnectionManagerLowlevel();
+    ~ConnectionManagerLowlevel() override;
 
     bool isValid() const;
     ConnectionManagerPtr connectionManager() const;
diff --git a/TelepathyQt/connection-manager.h b/TelepathyQt/connection-manager.h
index 598535ba..56d4fd45 100644
--- a/TelepathyQt/connection-manager.h
+++ b/TelepathyQt/connection-manager.h
@@ -77,7 +77,7 @@ public:
             const ContactFactoryConstPtr &contactFactory =
                 ContactFactory::create());
 
-    virtual ~ConnectionManager();
+    ~ConnectionManager() override;
 
     QString name() const;
 
diff --git a/TelepathyQt/connection.h b/TelepathyQt/connection.h
index 0f8f52fc..2cd18c76 100644
--- a/TelepathyQt/connection.h
+++ b/TelepathyQt/connection.h
@@ -82,7 +82,7 @@ public:
             const ChannelFactoryConstPtr &channelFactory,
             const ContactFactoryConstPtr &contactFactory);
 
-    virtual ~Connection();
+    ~Connection() override;
 
     ChannelFactoryConstPtr channelFactory() const;
     ContactFactoryConstPtr contactFactory() const;
diff --git a/TelepathyQt/contact-capabilities.h b/TelepathyQt/contact-capabilities.h
index d2c0f672..8499fe6c 100644
--- a/TelepathyQt/contact-capabilities.h
+++ b/TelepathyQt/contact-capabilities.h
@@ -39,7 +39,7 @@ class TP_QT_EXPORT ContactCapabilities : public CapabilitiesBase
 {
 public:
     ContactCapabilities();
-    virtual ~ContactCapabilities();
+    ~ContactCapabilities() override;
 
     bool dbusTubes(const QString &serviceName) const;
     QStringList dbusTubeServices() const;
diff --git a/TelepathyQt/contact-factory.h b/TelepathyQt/contact-factory.h
index d8355f2a..c8a48706 100644
--- a/TelepathyQt/contact-factory.h
+++ b/TelepathyQt/contact-factory.h
@@ -48,7 +48,7 @@ class TP_QT_EXPORT ContactFactory : public RefCounted
 public:
     static ContactFactoryPtr create(const Features &features = Features());
 
-    virtual ~ContactFactory();
+    ~ContactFactory() override;
 
     Features features() const;
 
diff --git a/TelepathyQt/contact-manager-internal.h b/TelepathyQt/contact-manager-internal.h
index 96329645..44ae8aa2 100644
--- a/TelepathyQt/contact-manager-internal.h
+++ b/TelepathyQt/contact-manager-internal.h
@@ -43,7 +43,7 @@ class TP_QT_NO_EXPORT ContactManager::Roster : public QObject
 
 public:
     Roster(ContactManager *manager);
-    virtual ~Roster();
+    ~Roster() override;
 
     ContactListState state() const;
 
@@ -341,7 +341,7 @@ class TP_QT_NO_EXPORT ContactManager::Roster::ModifyFinishOp : public PendingOpe
 
 public:
     ModifyFinishOp(const ConnectionPtr &conn);
-    ~ModifyFinishOp() {};
+    ~ModifyFinishOp() override {};
 
     void setError(const QString &errorName, const QString &errorMessage);
     void finish();
@@ -356,7 +356,7 @@ class TP_QT_NO_EXPORT ContactManager::Roster::RemoveGroupOp : public PendingOper
 
 public:
     RemoveGroupOp(const ChannelPtr &channel);
-    ~RemoveGroupOp() {};
+    ~RemoveGroupOp() override {};
 
 private Q_SLOTS:
     void onContactsRemoved(Tp::PendingOperation *);
@@ -369,7 +369,7 @@ class TP_QT_NO_EXPORT ContactManager::PendingRefreshContactInfo : public Pending
 
 public:
     PendingRefreshContactInfo(const ConnectionPtr &conn);
-    ~PendingRefreshContactInfo();
+    ~PendingRefreshContactInfo() override;
 
     void addContact(Contact *contact);
 
diff --git a/TelepathyQt/contact-manager.h b/TelepathyQt/contact-manager.h
index 3d703bc2..c6aff876 100644
--- a/TelepathyQt/contact-manager.h
+++ b/TelepathyQt/contact-manager.h
@@ -53,7 +53,7 @@ class TP_QT_EXPORT ContactManager : public Object
     Q_DISABLE_COPY(ContactManager)
 
 public:
-    virtual ~ContactManager();
+    ~ContactManager() override;
 
     ConnectionPtr connection() const;
 
diff --git a/TelepathyQt/contact-messenger.h b/TelepathyQt/contact-messenger.h
index 41b93b87..33fc8c57 100644
--- a/TelepathyQt/contact-messenger.h
+++ b/TelepathyQt/contact-messenger.h
@@ -46,7 +46,7 @@ public:
     static ContactMessengerPtr create(const AccountPtr &account, const ContactPtr &contact);
     static ContactMessengerPtr create(const AccountPtr &account, const QString &contactIdentifier);
 
-    virtual ~ContactMessenger();
+    ~ContactMessenger() override;
 
     AccountPtr account() const;
     QString contactIdentifier() const;
diff --git a/TelepathyQt/contact-search-channel.h b/TelepathyQt/contact-search-channel.h
index 29c8424c..cc0e1dcb 100644
--- a/TelepathyQt/contact-search-channel.h
+++ b/TelepathyQt/contact-search-channel.h
@@ -73,7 +73,7 @@ public:
     static ContactSearchChannelPtr create(const ConnectionPtr &connection,
             const QString &objectPath, const QVariantMap &immutableProperties);
 
-    virtual ~ContactSearchChannel();
+    ~ContactSearchChannel() override;
 
     ChannelContactSearchState searchState() const;
     uint limit() const;
diff --git a/TelepathyQt/contact.h b/TelepathyQt/contact.h
index dd26a0ea..aabddd31 100644
--- a/TelepathyQt/contact.h
+++ b/TelepathyQt/contact.h
@@ -92,7 +92,7 @@ public:
         QSharedDataPointer<Private> mPriv;
     };
 
-    ~Contact();
+    ~Contact() override;
 
     ContactManagerPtr manager() const;
 
diff --git a/TelepathyQt/dbus-object.h b/TelepathyQt/dbus-object.h
index 398d1ab9..6a9cbd1d 100644
--- a/TelepathyQt/dbus-object.h
+++ b/TelepathyQt/dbus-object.h
@@ -43,7 +43,7 @@ class TP_QT_EXPORT DBusObject : public QObject
 
 public:
     DBusObject(const QDBusConnection &dbusConnection, QObject *parent = 0);
-    virtual ~DBusObject();
+    ~DBusObject() override;
 
     QString objectPath() const;
     QDBusConnection dbusConnection() const;
diff --git a/TelepathyQt/dbus-proxy-factory-internal.h b/TelepathyQt/dbus-proxy-factory-internal.h
index 7596d784..e9bff396 100644
--- a/TelepathyQt/dbus-proxy-factory-internal.h
+++ b/TelepathyQt/dbus-proxy-factory-internal.h
@@ -43,7 +43,7 @@ public:
     typedef QPair<QString /* serviceName */, QString /* objectPath */> Key;
 
     Cache();
-    ~Cache();
+    ~Cache() override;
 
     DBusProxyPtr get(const Key &key) const;
     void put(const DBusProxyPtr &proxy);
diff --git a/TelepathyQt/dbus-proxy-factory.h b/TelepathyQt/dbus-proxy-factory.h
index 1a7eaea7..ad0b0672 100644
--- a/TelepathyQt/dbus-proxy-factory.h
+++ b/TelepathyQt/dbus-proxy-factory.h
@@ -51,7 +51,7 @@ class TP_QT_EXPORT DBusProxyFactory : public QObject, public RefCounted
     Q_DISABLE_COPY(DBusProxyFactory)
 
 public:
-    virtual ~DBusProxyFactory();
+    ~DBusProxyFactory() override;
 
     const QDBusConnection &dbusConnection() const;
 
diff --git a/TelepathyQt/dbus-proxy.h b/TelepathyQt/dbus-proxy.h
index 0121d722..8a2deab6 100644
--- a/TelepathyQt/dbus-proxy.h
+++ b/TelepathyQt/dbus-proxy.h
@@ -47,7 +47,7 @@ class TP_QT_EXPORT DBusProxy : public Object, public ReadyObject
 public:
     DBusProxy(const QDBusConnection &dbusConnection, const QString &busName,
             const QString &objectPath, const Feature &featureCore);
-    virtual ~DBusProxy();
+    ~DBusProxy() override;
 
     QDBusConnection dbusConnection() const;
     QString busName() const;
@@ -85,7 +85,7 @@ class TP_QT_EXPORT StatelessDBusProxy : public DBusProxy
 public:
     StatelessDBusProxy(const QDBusConnection &dbusConnection,
         const QString &busName, const QString &objectPath, const Feature &featureCore);
-    virtual ~StatelessDBusProxy();
+    ~StatelessDBusProxy() override;
 
 private:
     struct Private;
@@ -101,7 +101,7 @@ class TP_QT_EXPORT StatefulDBusProxy : public DBusProxy
 public:
     StatefulDBusProxy(const QDBusConnection &dbusConnection,
         const QString &busName, const QString &objectPath, const Feature &featureCore);
-    virtual ~StatefulDBusProxy();
+    ~StatefulDBusProxy() override;
 
     static QString uniqueNameFrom(const QDBusConnection &bus, const QString &wellKnownOrUnique);
     static QString uniqueNameFrom(const QDBusConnection &bus, const QString &wellKnownOrUnique,
diff --git a/TelepathyQt/dbus-service.h b/TelepathyQt/dbus-service.h
index 0dfe121e..e95f3525 100644
--- a/TelepathyQt/dbus-service.h
+++ b/TelepathyQt/dbus-service.h
@@ -50,7 +50,7 @@ class TP_QT_EXPORT DBusService : public Object
 
 public:
     DBusService(const QDBusConnection &dbusConnection);
-    virtual ~DBusService();
+    ~DBusService() override;
 
     virtual QVariantMap immutableProperties() const = 0;
 
@@ -77,7 +77,7 @@ class TP_QT_EXPORT AbstractDBusServiceInterface : public Object
 
 public:
     AbstractDBusServiceInterface(const QString &interfaceName);
-    virtual ~AbstractDBusServiceInterface();
+    ~AbstractDBusServiceInterface() override;
 
     QString interfaceName() const;
 
diff --git a/TelepathyQt/dbus-tube-channel.h b/TelepathyQt/dbus-tube-channel.h
index 3ecf8318..d0a96173 100644
--- a/TelepathyQt/dbus-tube-channel.h
+++ b/TelepathyQt/dbus-tube-channel.h
@@ -43,7 +43,7 @@ public:
     static DBusTubeChannelPtr create(const ConnectionPtr &connection,
             const QString &objectPath, const QVariantMap &immutableProperties);
 
-    virtual ~DBusTubeChannel();
+    ~DBusTubeChannel() override;
 
     QString serviceName() const;
 
diff --git a/TelepathyQt/debug-receiver.h b/TelepathyQt/debug-receiver.h
index bd44b6fe..e1073c65 100644
--- a/TelepathyQt/debug-receiver.h
+++ b/TelepathyQt/debug-receiver.h
@@ -46,7 +46,7 @@ public:
 
     static DebugReceiverPtr create(const QString &busName,
             const QDBusConnection &bus = QDBusConnection::sessionBus());
-    virtual ~DebugReceiver();
+    ~DebugReceiver() override;
 
     PendingDebugMessageList *fetchMessages();
     PendingOperation *setMonitoringEnabled(bool enabled);
diff --git a/TelepathyQt/fake-handler-manager-internal.h b/TelepathyQt/fake-handler-manager-internal.h
index 356bac95..637304b3 100644
--- a/TelepathyQt/fake-handler-manager-internal.h
+++ b/TelepathyQt/fake-handler-manager-internal.h
@@ -40,7 +40,7 @@ class FakeHandler : public QObject
 
 public:
     FakeHandler(const QDBusConnection &bus);
-    ~FakeHandler();
+    ~FakeHandler() override;
 
     QDBusConnection dbusConnection() const { return mBus; }
     ObjectPathList handledChannels() const;
@@ -66,7 +66,7 @@ class FakeHandlerManager : public QObject
 public:
     static FakeHandlerManager *instance();
 
-    ~FakeHandlerManager();
+    ~FakeHandlerManager() override;
 
     ObjectPathList handledChannels(const QDBusConnection &bus) const;
     void registerClientRegistrar(const ClientRegistrarPtr &cr);
diff --git a/TelepathyQt/file-transfer-channel.h b/TelepathyQt/file-transfer-channel.h
index a904b840..cad57d2c 100644
--- a/TelepathyQt/file-transfer-channel.h
+++ b/TelepathyQt/file-transfer-channel.h
@@ -43,7 +43,7 @@ public:
     static FileTransferChannelPtr create(const ConnectionPtr &connection,
             const QString &objectPath, const QVariantMap &immutableProperties);
 
-    virtual ~FileTransferChannel();
+    ~FileTransferChannel() override;
 
     FileTransferState state() const;
     FileTransferStateChangeReason stateReason() const;
diff --git a/TelepathyQt/filter.h b/TelepathyQt/filter.h
index 33a5a8ca..db7cf0d0 100644
--- a/TelepathyQt/filter.h
+++ b/TelepathyQt/filter.h
@@ -39,7 +39,7 @@ class Filter : public RefCounted
     Q_DISABLE_COPY(Filter)
 
 public:
-    virtual ~Filter() {}
+    ~Filter() override {}
 
     virtual bool isValid() const { return false; }
 
diff --git a/TelepathyQt/fixed-feature-factory.h b/TelepathyQt/fixed-feature-factory.h
index 62672c7c..43c2ed88 100644
--- a/TelepathyQt/fixed-feature-factory.h
+++ b/TelepathyQt/fixed-feature-factory.h
@@ -46,7 +46,7 @@ class TP_QT_EXPORT FixedFeatureFactory : public DBusProxyFactory
     Q_DISABLE_COPY(FixedFeatureFactory)
 
 public:
-    virtual ~FixedFeatureFactory();
+    ~FixedFeatureFactory() override;
 
     Features features() const;
 
@@ -56,7 +56,7 @@ public:
 protected:
     FixedFeatureFactory(const QDBusConnection &bus);
 
-    virtual Features featuresFor(const DBusProxyPtr &proxy) const;
+    Features featuresFor(const DBusProxyPtr &proxy) const override;
 
 private:
     struct Private;
diff --git a/TelepathyQt/generic-capability-filter.h b/TelepathyQt/generic-capability-filter.h
index ece57895..0ce2c801 100644
--- a/TelepathyQt/generic-capability-filter.h
+++ b/TelepathyQt/generic-capability-filter.h
@@ -45,11 +45,11 @@ public:
                     rccSpecs));
     }
 
-    inline virtual ~GenericCapabilityFilter() { }
+    inline ~GenericCapabilityFilter() override { }
 
-    inline virtual bool isValid() const { return true; }
+    inline bool isValid() const override { return true; }
 
-    inline virtual bool matches(const SharedPtr<T> &t) const
+    inline bool matches(const SharedPtr<T> &t) const override
     {
         bool supportedRcc;
         RequestableChannelClassSpecList objectRccSpecs = t->capabilities().allClassSpecs();
diff --git a/TelepathyQt/generic-property-filter.h b/TelepathyQt/generic-property-filter.h
index ac56b595..01299e3c 100644
--- a/TelepathyQt/generic-property-filter.h
+++ b/TelepathyQt/generic-property-filter.h
@@ -37,11 +37,11 @@ template <class T>
 class GenericPropertyFilter : public Filter<T>
 {
 public:
-    inline virtual ~GenericPropertyFilter() { }
+    inline ~GenericPropertyFilter() override { }
 
-    inline virtual bool isValid() const { return true; }
+    inline bool isValid() const override { return true; }
 
-    inline virtual bool matches(const SharedPtr<T> &t) const
+    inline bool matches(const SharedPtr<T> &t) const override
     {
         for (QVariantMap::const_iterator i = mFilter.constBegin();
                 i != mFilter.constEnd(); ++i) {
diff --git a/TelepathyQt/handled-channel-notifier.h b/TelepathyQt/handled-channel-notifier.h
index 6474031e..c6b5fe7b 100644
--- a/TelepathyQt/handled-channel-notifier.h
+++ b/TelepathyQt/handled-channel-notifier.h
@@ -44,7 +44,7 @@ class TP_QT_EXPORT HandledChannelNotifier : public QObject
     Q_DISABLE_COPY(HandledChannelNotifier)
 
 public:
-    ~HandledChannelNotifier();
+    ~HandledChannelNotifier() override;
 
     ChannelPtr channel() const;
 
@@ -53,7 +53,7 @@ Q_SIGNALS:
 
 protected:
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    void connectNotify(const QMetaMethod &signal);
+    void connectNotify(const QMetaMethod &signal) override;
 #else
     void connectNotify(const char *signal);
 #endif
diff --git a/TelepathyQt/incoming-dbus-tube-channel.h b/TelepathyQt/incoming-dbus-tube-channel.h
index 9de7652c..20a087ac 100644
--- a/TelepathyQt/incoming-dbus-tube-channel.h
+++ b/TelepathyQt/incoming-dbus-tube-channel.h
@@ -41,7 +41,7 @@ public:
     static IncomingDBusTubeChannelPtr create(const ConnectionPtr &connection,
             const QString &objectPath, const QVariantMap &immutableProperties);
 
-    virtual ~IncomingDBusTubeChannel();
+    ~IncomingDBusTubeChannel() override;
 
     PendingDBusTubeConnection *acceptTube(bool allowOtherUsers = false);
 
diff --git a/TelepathyQt/incoming-file-transfer-channel.h b/TelepathyQt/incoming-file-transfer-channel.h
index 01937d3f..b5e54123 100644
--- a/TelepathyQt/incoming-file-transfer-channel.h
+++ b/TelepathyQt/incoming-file-transfer-channel.h
@@ -45,7 +45,7 @@ public:
     static IncomingFileTransferChannelPtr create(const ConnectionPtr &connection,
             const QString &objectPath, const QVariantMap &immutableProperties);
 
-    virtual ~IncomingFileTransferChannel();
+    ~IncomingFileTransferChannel() override;
 
     PendingOperation *setUri(const QString& uri);
     PendingOperation *acceptFile(qulonglong offset, QIODevice *output);
@@ -68,8 +68,8 @@ private Q_SLOTS:
     TP_QT_NO_EXPORT void doTransfer();
 
 private:
-    TP_QT_NO_EXPORT void connectToHost();
-    TP_QT_NO_EXPORT void setFinished();
+    TP_QT_NO_EXPORT void connectToHost() override;
+    TP_QT_NO_EXPORT void setFinished() override;
 
     struct Private;
     friend struct Private;
diff --git a/TelepathyQt/incoming-stream-tube-channel.h b/TelepathyQt/incoming-stream-tube-channel.h
index edb24367..d7ef2f82 100644
--- a/TelepathyQt/incoming-stream-tube-channel.h
+++ b/TelepathyQt/incoming-stream-tube-channel.h
@@ -48,7 +48,7 @@ public:
     static IncomingStreamTubeChannelPtr create(const ConnectionPtr &connection,
             const QString &objectPath, const QVariantMap &immutableProperties);
 
-    virtual ~IncomingStreamTubeChannel();
+    ~IncomingStreamTubeChannel() override;
 
     PendingStreamTubeConnection *acceptTubeAsTcpSocket();
     PendingStreamTubeConnection *acceptTubeAsTcpSocket(const QHostAddress &allowedAddress,
diff --git a/TelepathyQt/io-device.h b/TelepathyQt/io-device.h
index 8cf1b5b4..60c637a6 100644
--- a/TelepathyQt/io-device.h
+++ b/TelepathyQt/io-device.h
@@ -39,13 +39,13 @@ class TP_QT_EXPORT IODevice : public QIODevice
     Q_OBJECT
 public:
     explicit IODevice(QObject *parent = 0);
-    ~IODevice();
-    bool isSequential() const;
-    qint64 bytesAvailable() const;
+    ~IODevice() override;
+    bool isSequential() const override;
+    qint64 bytesAvailable() const override;
 
 protected:
-    qint64 readData(char *data, qint64 maxSize);
-    qint64 writeData(const char *data, qint64 maxSize);
+    qint64 readData(char *data, qint64 maxSize) override;
+    qint64 writeData(const char *data, qint64 maxSize) override;
 
 private:
     struct Private;
diff --git a/TelepathyQt/method-invocation-context.h b/TelepathyQt/method-invocation-context.h
index 7b0978a9..f5581ae3 100644
--- a/TelepathyQt/method-invocation-context.h
+++ b/TelepathyQt/method-invocation-context.h
@@ -97,7 +97,7 @@ public:
         mMessage.setDelayedReply(true);
     }
 
-    virtual ~MethodInvocationContext()
+    ~MethodInvocationContext() override
     {
         if (!mFinished) {
             setFinishedWithError(QString(), QString());
diff --git a/TelepathyQt/object.h b/TelepathyQt/object.h
index 7e24fb88..c69a5e4c 100644
--- a/TelepathyQt/object.h
+++ b/TelepathyQt/object.h
@@ -42,7 +42,7 @@ class TP_QT_EXPORT Object : public QObject, public RefCounted
     Q_DISABLE_COPY(Object)
 
 public:
-    virtual ~Object();
+    ~Object() override;
 
 Q_SIGNALS:
     void propertyChanged(const QString &propertyName);
diff --git a/TelepathyQt/outgoing-dbus-tube-channel.h b/TelepathyQt/outgoing-dbus-tube-channel.h
index 89b6c78b..3f1feedd 100644
--- a/TelepathyQt/outgoing-dbus-tube-channel.h
+++ b/TelepathyQt/outgoing-dbus-tube-channel.h
@@ -41,7 +41,7 @@ public:
     static OutgoingDBusTubeChannelPtr create(const ConnectionPtr &connection,
             const QString &objectPath, const QVariantMap &immutableProperties);
 
-    virtual ~OutgoingDBusTubeChannel();
+    ~OutgoingDBusTubeChannel() override;
 
     PendingDBusTubeConnection *offerTube(const QVariantMap &parameters, bool allowOtherUsers = false);
 
diff --git a/TelepathyQt/outgoing-file-transfer-channel.h b/TelepathyQt/outgoing-file-transfer-channel.h
index 37daa842..5c1c47e0 100644
--- a/TelepathyQt/outgoing-file-transfer-channel.h
+++ b/TelepathyQt/outgoing-file-transfer-channel.h
@@ -45,7 +45,7 @@ public:
     static OutgoingFileTransferChannelPtr create(const ConnectionPtr &connection,
             const QString &objectPath, const QVariantMap &immutableProperties);
 
-    virtual ~OutgoingFileTransferChannel();
+    ~OutgoingFileTransferChannel() override;
 
     PendingOperation *provideFile(QIODevice *input);
 
@@ -65,8 +65,8 @@ private Q_SLOTS:
     TP_QT_NO_EXPORT void doTransfer();
 
 private:
-    TP_QT_NO_EXPORT void connectToHost();
-    TP_QT_NO_EXPORT void setFinished();
+    TP_QT_NO_EXPORT void connectToHost() override;
+    TP_QT_NO_EXPORT void setFinished() override;
 
     struct Private;
     friend struct Private;
diff --git a/TelepathyQt/outgoing-stream-tube-channel-internal.h b/TelepathyQt/outgoing-stream-tube-channel-internal.h
index 1480d9d3..22438c08 100644
--- a/TelepathyQt/outgoing-stream-tube-channel-internal.h
+++ b/TelepathyQt/outgoing-stream-tube-channel-internal.h
@@ -39,7 +39,7 @@ public:
     PendingOpenTube(PendingVoid *offerOperation,
             const QVariantMap &parameters,
             const OutgoingStreamTubeChannelPtr &object);
-    ~PendingOpenTube();
+    ~PendingOpenTube() override;
 
 private Q_SLOTS:
     void onTubeStateChanged(Tp::TubeChannelState state);
@@ -58,7 +58,7 @@ class TP_QT_NO_EXPORT QueuedContactFactory : public QObject
 
 public:
     QueuedContactFactory(ContactManagerPtr contactManager, QObject* parent = 0);
-    ~QueuedContactFactory();
+    ~QueuedContactFactory() override;
 
     QUuid appendNewRequest(const UIntList &handles);
 
diff --git a/TelepathyQt/outgoing-stream-tube-channel.h b/TelepathyQt/outgoing-stream-tube-channel.h
index 0a89a97b..a0d75d4e 100644
--- a/TelepathyQt/outgoing-stream-tube-channel.h
+++ b/TelepathyQt/outgoing-stream-tube-channel.h
@@ -47,7 +47,7 @@ public:
     static OutgoingStreamTubeChannelPtr create(const ConnectionPtr &connection,
             const QString &objectPath, const QVariantMap &immutableProperties);
 
-    virtual ~OutgoingStreamTubeChannel();
+    ~OutgoingStreamTubeChannel() override;
 
     PendingOperation *offerTcpSocket(const QHostAddress &address, quint16 port,
             const QVariantMap &parameters = QVariantMap());
diff --git a/TelepathyQt/pending-account.h b/TelepathyQt/pending-account.h
index 788d3464..8ca39234 100644
--- a/TelepathyQt/pending-account.h
+++ b/TelepathyQt/pending-account.h
@@ -46,7 +46,7 @@ class TP_QT_EXPORT PendingAccount : public PendingOperation
     Q_DISABLE_COPY(PendingAccount);
 
 public:
-    ~PendingAccount();
+    ~PendingAccount() override;
 
     AccountManagerPtr manager() const;
 
diff --git a/TelepathyQt/pending-captchas.h b/TelepathyQt/pending-captchas.h
index a9d5637f..1f71e2ba 100644
--- a/TelepathyQt/pending-captchas.h
+++ b/TelepathyQt/pending-captchas.h
@@ -44,7 +44,7 @@ class TP_QT_EXPORT PendingCaptchas : public PendingOperation
     Q_DISABLE_COPY(PendingCaptchas)
 
 public:
-    virtual ~PendingCaptchas();
+    ~PendingCaptchas() override;
 
     Captcha captcha() const;
     QList<Captcha> captchaList() const;
diff --git a/TelepathyQt/pending-channel-request-internal.h b/TelepathyQt/pending-channel-request-internal.h
index 076e2b22..c67236ef 100644
--- a/TelepathyQt/pending-channel-request-internal.h
+++ b/TelepathyQt/pending-channel-request-internal.h
@@ -41,7 +41,7 @@ public:
     {
     }
 
-    ~PendingChannelRequestCancelOperation()
+    ~PendingChannelRequestCancelOperation() override
     {
     }
 
diff --git a/TelepathyQt/pending-channel-request.h b/TelepathyQt/pending-channel-request.h
index 1c62c21c..9e791695 100644
--- a/TelepathyQt/pending-channel-request.h
+++ b/TelepathyQt/pending-channel-request.h
@@ -49,7 +49,7 @@ class TP_QT_EXPORT PendingChannelRequest : public PendingOperation
     Q_DISABLE_COPY(PendingChannelRequest)
 
 public:
-    ~PendingChannelRequest();
+    ~PendingChannelRequest() override;
 
     AccountPtr account() const;
 
diff --git a/TelepathyQt/pending-channel.cpp b/TelepathyQt/pending-channel.cpp
index 74ddee4d..8e6db33b 100644
--- a/TelepathyQt/pending-channel.cpp
+++ b/TelepathyQt/pending-channel.cpp
@@ -70,7 +70,7 @@ public:
         return AccountFactoryPtr(new FakeAccountFactory(account));
     }
 
-    ~FakeAccountFactory() { }
+    ~FakeAccountFactory() override { }
 
     AccountPtr account() const { return mAccount; }
 
@@ -78,7 +78,7 @@ protected:
     AccountPtr construct(const QString &busName, const QString &objectPath,
             const ConnectionFactoryConstPtr &connFactory,
             const ChannelFactoryConstPtr &chanFactory,
-            const ContactFactoryConstPtr &contactFactory) const
+            const ContactFactoryConstPtr &contactFactory) const override
     {
         if (mAccount->objectPath() != objectPath) {
             warning() << "Account received by the fake factory is different from original account";
diff --git a/TelepathyQt/pending-channel.h b/TelepathyQt/pending-channel.h
index 2480e431..ce8be47e 100644
--- a/TelepathyQt/pending-channel.h
+++ b/TelepathyQt/pending-channel.h
@@ -47,7 +47,7 @@ class TP_QT_EXPORT PendingChannel : public PendingOperation
     Q_DISABLE_COPY(PendingChannel)
 
 public:
-    ~PendingChannel();
+    ~PendingChannel() override;
 
     ConnectionPtr connection() const;
 
diff --git a/TelepathyQt/pending-connection.h b/TelepathyQt/pending-connection.h
index 1f9c6c09..25f1e30d 100644
--- a/TelepathyQt/pending-connection.h
+++ b/TelepathyQt/pending-connection.h
@@ -46,7 +46,7 @@ class TP_QT_EXPORT PendingConnection : public PendingOperation
     Q_DISABLE_COPY(PendingConnection);
 
 public:
-    ~PendingConnection();
+    ~PendingConnection() override;
 
     ConnectionManagerPtr manager() const;
 
diff --git a/TelepathyQt/pending-contact-attributes.h b/TelepathyQt/pending-contact-attributes.h
index 2f1fa14a..fd410386 100644
--- a/TelepathyQt/pending-contact-attributes.h
+++ b/TelepathyQt/pending-contact-attributes.h
@@ -43,7 +43,7 @@ class TP_QT_EXPORT PendingContactAttributes : public PendingOperation
     Q_DISABLE_COPY(PendingContactAttributes)
 
 public:
-    ~PendingContactAttributes();
+    ~PendingContactAttributes() override;
 
     ConnectionPtr connection() const;
 
diff --git a/TelepathyQt/pending-contact-info.h b/TelepathyQt/pending-contact-info.h
index 15e0686e..7318808d 100644
--- a/TelepathyQt/pending-contact-info.h
+++ b/TelepathyQt/pending-contact-info.h
@@ -42,7 +42,7 @@ class TP_QT_EXPORT PendingContactInfo : public PendingOperation
     Q_DISABLE_COPY(PendingContactInfo);
 
 public:
-    ~PendingContactInfo();
+    ~PendingContactInfo() override;
 
     ContactPtr contact() const;
 
diff --git a/TelepathyQt/pending-contacts-internal.h b/TelepathyQt/pending-contacts-internal.h
index 75d97af9..7c9c5485 100644
--- a/TelepathyQt/pending-contacts-internal.h
+++ b/TelepathyQt/pending-contacts-internal.h
@@ -41,7 +41,7 @@ public:
     PendingAddressingGetContacts(const ConnectionPtr &connection,
             const QStringList &uris,
             const QStringList &interfaces);
-    ~PendingAddressingGetContacts();
+    ~PendingAddressingGetContacts() override;
 
     UIntList validHandles() const { return mValidHandles; }
 
diff --git a/TelepathyQt/pending-contacts.h b/TelepathyQt/pending-contacts.h
index 9b5cdbd4..e595409b 100644
--- a/TelepathyQt/pending-contacts.h
+++ b/TelepathyQt/pending-contacts.h
@@ -49,7 +49,7 @@ class TP_QT_EXPORT PendingContacts : public PendingOperation
     Q_DISABLE_COPY(PendingContacts);
 
 public:
-    ~PendingContacts();
+    ~PendingContacts() override;
 
     ContactManagerPtr manager() const;
     Features features() const;
diff --git a/TelepathyQt/pending-dbus-tube-connection.h b/TelepathyQt/pending-dbus-tube-connection.h
index f5412d93..5ee7c23d 100644
--- a/TelepathyQt/pending-dbus-tube-connection.h
+++ b/TelepathyQt/pending-dbus-tube-connection.h
@@ -39,7 +39,7 @@ class TP_QT_EXPORT PendingDBusTubeConnection : public PendingOperation
     Q_DISABLE_COPY(PendingDBusTubeConnection)
 
 public:
-    virtual ~PendingDBusTubeConnection();
+    ~PendingDBusTubeConnection() override;
 
     QString address() const;
 
diff --git a/TelepathyQt/pending-debug-message-list.h b/TelepathyQt/pending-debug-message-list.h
index 281b67f9..a2c6e2eb 100644
--- a/TelepathyQt/pending-debug-message-list.h
+++ b/TelepathyQt/pending-debug-message-list.h
@@ -37,7 +37,7 @@ class TP_QT_EXPORT PendingDebugMessageList : public Tp::PendingOperation
     Q_DISABLE_COPY(PendingDebugMessageList)
 
 public:
-    virtual ~PendingDebugMessageList();
+    ~PendingDebugMessageList() override;
 
     DebugMessageList result() const;
 
diff --git a/TelepathyQt/pending-handles.h b/TelepathyQt/pending-handles.h
index 4a5dc0c2..c3406010 100644
--- a/TelepathyQt/pending-handles.h
+++ b/TelepathyQt/pending-handles.h
@@ -49,7 +49,7 @@ class TP_QT_EXPORT PendingHandles : public PendingOperation
     Q_DISABLE_COPY(PendingHandles)
 
 public:
-    ~PendingHandles();
+    ~PendingHandles() override;
 
     ConnectionPtr connection() const;
 
diff --git a/TelepathyQt/pending-operation.h b/TelepathyQt/pending-operation.h
index 89eb77de..6331b0bf 100644
--- a/TelepathyQt/pending-operation.h
+++ b/TelepathyQt/pending-operation.h
@@ -48,7 +48,7 @@ class TP_QT_EXPORT PendingOperation : public QObject
     Q_DISABLE_COPY(PendingOperation)
 
 public:
-    virtual ~PendingOperation();
+    ~PendingOperation() override;
 
     bool isFinished() const;
 
diff --git a/TelepathyQt/pending-ready.h b/TelepathyQt/pending-ready.h
index 7d0627ae..c1a097a1 100644
--- a/TelepathyQt/pending-ready.h
+++ b/TelepathyQt/pending-ready.h
@@ -43,7 +43,7 @@ class TP_QT_EXPORT PendingReady: public PendingOperation
     Q_DISABLE_COPY(PendingReady);
 
 public:
-    ~PendingReady();
+    ~PendingReady() override;
 
     DBusProxyPtr proxy() const;
 
diff --git a/TelepathyQt/pending-send-message.h b/TelepathyQt/pending-send-message.h
index fb9a8a3a..585fb2b1 100644
--- a/TelepathyQt/pending-send-message.h
+++ b/TelepathyQt/pending-send-message.h
@@ -44,7 +44,7 @@ class TP_QT_EXPORT PendingSendMessage : public PendingOperation
     Q_DISABLE_COPY(PendingSendMessage)
 
 public:
-    ~PendingSendMessage();
+    ~PendingSendMessage() override;
 
     TextChannelPtr channel() const;
 
diff --git a/TelepathyQt/pending-stream-tube-connection.h b/TelepathyQt/pending-stream-tube-connection.h
index 2796e906..e27e3fae 100644
--- a/TelepathyQt/pending-stream-tube-connection.h
+++ b/TelepathyQt/pending-stream-tube-connection.h
@@ -46,7 +46,7 @@ class TP_QT_EXPORT PendingStreamTubeConnection : public PendingOperation
     Q_DISABLE_COPY(PendingStreamTubeConnection)
 
 public:
-    virtual ~PendingStreamTubeConnection();
+    ~PendingStreamTubeConnection() override;
 
     SocketAddressType addressType() const;
 
diff --git a/TelepathyQt/pending-string-list.h b/TelepathyQt/pending-string-list.h
index ddd29871..7e7fa319 100644
--- a/TelepathyQt/pending-string-list.h
+++ b/TelepathyQt/pending-string-list.h
@@ -42,7 +42,7 @@ class TP_QT_EXPORT PendingStringList : public PendingOperation
 public:
     PendingStringList(const SharedPtr<RefCounted> &object);
     PendingStringList(QDBusPendingCall call, const SharedPtr<RefCounted> &object);
-    ~PendingStringList();
+    ~PendingStringList() override;
 
     QStringList result() const;
 
diff --git a/TelepathyQt/pending-string.h b/TelepathyQt/pending-string.h
index 4bddc56a..078e4bff 100644
--- a/TelepathyQt/pending-string.h
+++ b/TelepathyQt/pending-string.h
@@ -41,7 +41,7 @@ class TP_QT_EXPORT PendingString : public PendingOperation
 
 public:
     PendingString(QDBusPendingCall call, const SharedPtr<RefCounted> &object);
-    ~PendingString();
+    ~PendingString() override;
 
     QString result() const;
 
diff --git a/TelepathyQt/pending-variant-map.h b/TelepathyQt/pending-variant-map.h
index 035c2a87..1ccd8e1c 100644
--- a/TelepathyQt/pending-variant-map.h
+++ b/TelepathyQt/pending-variant-map.h
@@ -42,7 +42,7 @@ class TP_QT_EXPORT PendingVariantMap : public PendingOperation
 
 public:
     PendingVariantMap(QDBusPendingCall call, const SharedPtr<RefCounted> &object);
-    ~PendingVariantMap();
+    ~PendingVariantMap() override;
 
     QVariantMap result() const;
 
diff --git a/TelepathyQt/pending-variant.h b/TelepathyQt/pending-variant.h
index 0a4ff868..962a35a1 100644
--- a/TelepathyQt/pending-variant.h
+++ b/TelepathyQt/pending-variant.h
@@ -42,7 +42,7 @@ class TP_QT_EXPORT PendingVariant : public PendingOperation
 
 public:
     PendingVariant(QDBusPendingCall call, const SharedPtr<RefCounted> &object);
-    ~PendingVariant();
+    ~PendingVariant() override;
 
     QVariant result() const;
 
diff --git a/TelepathyQt/profile-manager.h b/TelepathyQt/profile-manager.h
index c5566339..28098e22 100644
--- a/TelepathyQt/profile-manager.h
+++ b/TelepathyQt/profile-manager.h
@@ -51,7 +51,7 @@ public:
 
     static ProfileManagerPtr create(const QDBusConnection &bus = QDBusConnection::sessionBus());
 
-    ~ProfileManager();
+    ~ProfileManager() override;
 
     QList<ProfilePtr> profiles() const;
     QList<ProfilePtr> profilesForCM(const QString &cmName) const;
diff --git a/TelepathyQt/profile.cpp b/TelepathyQt/profile.cpp
index 2fd8f642..073e0cc3 100644
--- a/TelepathyQt/profile.cpp
+++ b/TelepathyQt/profile.cpp
@@ -104,12 +104,12 @@ public:
     XmlHandler(const QString &serviceName, bool allowNonIMType, Profile::Private::Data *outputData);
 
     bool startElement(const QString &namespaceURI, const QString &localName,
-            const QString &qName, const QXmlAttributes &attributes);
+            const QString &qName, const QXmlAttributes &attributes) override;
     bool endElement(const QString &namespaceURI, const QString &localName,
-            const QString &qName);
-    bool characters(const QString &str);
-    bool fatalError(const QXmlParseException &exception);
-    QString errorString() const;
+            const QString &qName) override;
+    bool characters(const QString &str) override;
+    bool fatalError(const QXmlParseException &exception) override;
+    QString errorString() const override;
 
 private:
     bool attributeValueAsBoolean(const QXmlAttributes &attributes,
diff --git a/TelepathyQt/profile.h b/TelepathyQt/profile.h
index 916db28f..7c448ac2 100644
--- a/TelepathyQt/profile.h
+++ b/TelepathyQt/profile.h
@@ -48,7 +48,7 @@ public:
     static ProfilePtr createForServiceName(const QString &serviceName);
     static ProfilePtr createForFileName(const QString &fileName);
 
-    ~Profile();
+    ~Profile() override;
 
     QString serviceName() const;
 
diff --git a/TelepathyQt/readiness-helper.h b/TelepathyQt/readiness-helper.h
index fea4538a..51336144 100644
--- a/TelepathyQt/readiness-helper.h
+++ b/TelepathyQt/readiness-helper.h
@@ -84,7 +84,7 @@ public:
             uint currentStatus = 0,
             const Introspectables &introspectables = Introspectables(),
             QObject *parent = 0);
-    ~ReadinessHelper();
+    ~ReadinessHelper() override;
 
     void addIntrospectables(const Introspectables &introspectables);
 
diff --git a/TelepathyQt/request-temporary-handler-internal.h b/TelepathyQt/request-temporary-handler-internal.h
index 42f3f36d..3e53158f 100644
--- a/TelepathyQt/request-temporary-handler-internal.h
+++ b/TelepathyQt/request-temporary-handler-internal.h
@@ -37,7 +37,7 @@ class TP_QT_NO_EXPORT RequestTemporaryHandler : public QObject, public AbstractC
 public:
     static SharedPtr<RequestTemporaryHandler> create(const AccountPtr &account);
 
-    ~RequestTemporaryHandler();
+    ~RequestTemporaryHandler() override;
 
     AccountPtr account() const { return mAccount; }
     ChannelPtr channel() const { return ChannelPtr(mChannel); }
@@ -50,7 +50,7 @@ public:
      * first. Though if the CD isn't confused it shouldn't really matter - our filter
      * is empty anyway.
      */
-    bool bypassApproval() const { return false; }
+    bool bypassApproval() const override { return false; }
 
     void handleChannels(const MethodInvocationContextPtr<> &context,
             const AccountPtr &account,
@@ -58,7 +58,7 @@ public:
             const QList<ChannelPtr> &channels,
             const QList<ChannelRequestPtr> &requestsSatisfied,
             const QDateTime &userActionTime,
-            const HandlerInfo &handlerInfo);
+            const HandlerInfo &handlerInfo) override;
 
     void setQueueChannelReceived(bool queue);
 
diff --git a/TelepathyQt/room-list-channel.h b/TelepathyQt/room-list-channel.h
index 1c9a47a6..0ee55e71 100644
--- a/TelepathyQt/room-list-channel.h
+++ b/TelepathyQt/room-list-channel.h
@@ -41,7 +41,7 @@ public:
     static RoomListChannelPtr create(const ConnectionPtr &connection,
             const QString &objectPath, const QVariantMap &immutableProperties);
 
-    virtual ~RoomListChannel();
+    ~RoomListChannel() override;
 
 protected:
     RoomListChannel(const ConnectionPtr &connection, const QString &objectPath,
diff --git a/TelepathyQt/server-authentication-channel.h b/TelepathyQt/server-authentication-channel.h
index f6a97ec2..d6bdff01 100644
--- a/TelepathyQt/server-authentication-channel.h
+++ b/TelepathyQt/server-authentication-channel.h
@@ -43,7 +43,7 @@ public:
     static ServerAuthenticationChannelPtr create(const ConnectionPtr &connection,
             const QString &objectPath, const QVariantMap &immutableProperties);
 
-    virtual ~ServerAuthenticationChannel();
+    ~ServerAuthenticationChannel() override;
 
     CaptchaAuthenticationPtr captchaAuthentication() const;
 
diff --git a/TelepathyQt/simple-call-observer.h b/TelepathyQt/simple-call-observer.h
index e9464086..af830a59 100644
--- a/TelepathyQt/simple-call-observer.h
+++ b/TelepathyQt/simple-call-observer.h
@@ -57,7 +57,7 @@ public:
             const QString &contactIdentifier,
             CallDirection direction = CallDirectionBoth);
 
-    virtual ~SimpleCallObserver();
+    ~SimpleCallObserver() override;
 
     AccountPtr account() const;
     QString contactIdentifier() const;
diff --git a/TelepathyQt/simple-observer-internal.h b/TelepathyQt/simple-observer-internal.h
index 82ceb3dd..91e029ae 100644
--- a/TelepathyQt/simple-observer-internal.h
+++ b/TelepathyQt/simple-observer-internal.h
@@ -83,7 +83,7 @@ public:
         return SharedPtr<FakeAccountFactory>(new FakeAccountFactory(bus));
     }
 
-    ~FakeAccountFactory() { }
+    ~FakeAccountFactory() override { }
 
 private:
     friend class Observer;
@@ -96,7 +96,7 @@ private:
     AccountPtr construct(const QString &busName, const QString &objectPath,
             const ConnectionFactoryConstPtr &connFactory,
             const ChannelFactoryConstPtr &chanFactory,
-            const ContactFactoryConstPtr &contactFactory) const
+            const ContactFactoryConstPtr &contactFactory) const override
     {
         if (mAccounts.contains(objectPath)) {
             return mAccounts.value(objectPath);
@@ -142,7 +142,7 @@ public:
              const SharedPtr<FakeAccountFactory> &fakeAccountFactory,
              const ChannelClassSpecList &channelFilter,
              const QString &observerName);
-    ~Observer();
+    ~Observer() override;
 
     WeakPtr<ClientRegistrar> clientRegistrar() const { return mCr; }
     SharedPtr<FakeAccountFactory> fakeAccountFactory() const { return mFakeAccountFactory; }
@@ -171,7 +171,7 @@ public:
             const QList<ChannelPtr> &channels,
             const ChannelDispatchOperationPtr &dispatchOperation,
             const QList<ChannelRequestPtr> &requestsSatisfied,
-            const ObserverInfo &observerInfo);
+            const ObserverInfo &observerInfo) override;
 
 Q_SIGNALS:
     void newChannels(const Tp::AccountPtr &channelsAccount, const QList<Tp::ChannelPtr> &channels);
@@ -205,7 +205,7 @@ class TP_QT_NO_EXPORT SimpleObserver::Private::ChannelWrapper :
 public:
     ChannelWrapper(const AccountPtr &channelAccount, const ChannelPtr &channel,
             const Features &extraChannelFeatures, QObject *parent);
-    ~ChannelWrapper() { }
+    ~ChannelWrapper() override { }
 
     AccountPtr channelAccount() const { return mChannelAccount; }
     ChannelPtr channel() const { return mChannel; }
diff --git a/TelepathyQt/simple-observer.h b/TelepathyQt/simple-observer.h
index e460d747..fd07094a 100644
--- a/TelepathyQt/simple-observer.h
+++ b/TelepathyQt/simple-observer.h
@@ -55,7 +55,7 @@ public:
             const QList<ChannelClassFeatures> &extraChannelFeatures =
                 QList<ChannelClassFeatures>());
 
-    virtual ~SimpleObserver();
+    ~SimpleObserver() override;
 
     AccountPtr account() const;
     ChannelClassSpecList channelFilter() const;
diff --git a/TelepathyQt/simple-pending-operations.h b/TelepathyQt/simple-pending-operations.h
index dce87852..429825ee 100644
--- a/TelepathyQt/simple-pending-operations.h
+++ b/TelepathyQt/simple-pending-operations.h
@@ -94,7 +94,7 @@ public:
     PendingComposite(const QList<PendingOperation*> &operations, const SharedPtr<RefCounted> &object);
     PendingComposite(const QList<PendingOperation*> &operations, bool failOnFirstError,
             const SharedPtr<RefCounted> &object);
-    ~PendingComposite();
+    ~PendingComposite() override override;
 
 private Q_SLOTS:
     TP_QT_NO_EXPORT void onOperationFinished(Tp::PendingOperation *);
diff --git a/TelepathyQt/simple-stream-tube-handler.h b/TelepathyQt/simple-stream-tube-handler.h
index d5b78dcb..961be367 100644
--- a/TelepathyQt/simple-stream-tube-handler.h
+++ b/TelepathyQt/simple-stream-tube-handler.h
@@ -52,14 +52,14 @@ public:
             bool requested,
             bool monitorConnections,
             bool bypassApproval = false);
-    ~SimpleStreamTubeHandler();
+    ~SimpleStreamTubeHandler() override;
 
     bool monitorsConnections() const
     {
         return mMonitorConnections;
     }
 
-    bool bypassApproval() const
+    bool bypassApproval() const override
     {
         return mBypassApproval;
     }
@@ -70,7 +70,7 @@ public:
             const QList<ChannelPtr> &channels,
             const QList<ChannelRequestPtr> &requestsSatisfied,
             const QDateTime &userActionTime,
-            const HandlerInfo &handlerInfo);
+            const HandlerInfo &handlerInfo) override;
 
 Q_SIGNALS:
     void invokedForTube(
diff --git a/TelepathyQt/simple-text-observer-internal.h b/TelepathyQt/simple-text-observer-internal.h
index 91b5e1d9..b5203af8 100644
--- a/TelepathyQt/simple-text-observer-internal.h
+++ b/TelepathyQt/simple-text-observer-internal.h
@@ -51,7 +51,7 @@ class TP_QT_NO_EXPORT SimpleTextObserver::Private::TextChannelWrapper :
 
 public:
     TextChannelWrapper(const Tp::TextChannelPtr &channel);
-    ~TextChannelWrapper() { }
+    ~TextChannelWrapper() override { }
 
 Q_SIGNALS:
     void channelMessageSent(const Tp::Message &message, Tp::MessageSendingFlags flags,
diff --git a/TelepathyQt/simple-text-observer.h b/TelepathyQt/simple-text-observer.h
index 87b16736..0c0ee211 100644
--- a/TelepathyQt/simple-text-observer.h
+++ b/TelepathyQt/simple-text-observer.h
@@ -47,7 +47,7 @@ public:
     static SimpleTextObserverPtr create(const AccountPtr &account,
             const QString &contactIdentifier);
 
-    virtual ~SimpleTextObserver();
+    ~SimpleTextObserver() override;
 
     AccountPtr account() const;
     QString contactIdentifier() const;
diff --git a/TelepathyQt/stream-tube-channel.h b/TelepathyQt/stream-tube-channel.h
index 1f3b6f7d..83f6fa1e 100644
--- a/TelepathyQt/stream-tube-channel.h
+++ b/TelepathyQt/stream-tube-channel.h
@@ -45,7 +45,7 @@ public:
     static StreamTubeChannelPtr create(const ConnectionPtr &connection,
             const QString &objectPath, const QVariantMap &immutableProperties);
 
-    virtual ~StreamTubeChannel();
+    ~StreamTubeChannel() override;
 
     QString service() const;
 
diff --git a/TelepathyQt/stream-tube-client-internal.h b/TelepathyQt/stream-tube-client-internal.h
index b190e816..1d659583 100644
--- a/TelepathyQt/stream-tube-client-internal.h
+++ b/TelepathyQt/stream-tube-client-internal.h
@@ -39,7 +39,7 @@ public:
             const QHostAddress &sourceAddress, quint16 sourcePort, StreamTubeClient *parent);
     TubeWrapper(const AccountPtr &acc, const IncomingStreamTubeChannelPtr &tube,
             bool requireCredentials, StreamTubeClient *parent);
-    ~TubeWrapper() { }
+    ~TubeWrapper() override { }
 
     AccountPtr mAcc;
     IncomingStreamTubeChannelPtr mTube;
diff --git a/TelepathyQt/stream-tube-client.h b/TelepathyQt/stream-tube-client.h
index 3d3f32ac..7578873e 100644
--- a/TelepathyQt/stream-tube-client.h
+++ b/TelepathyQt/stream-tube-client.h
@@ -127,7 +127,7 @@ public:
             bool monitorConnections = false,
             bool bypassApproval = false);
 
-    virtual ~StreamTubeClient();
+    ~StreamTubeClient() override;
 
     ClientRegistrarPtr registrar() const;
     QString clientName() const;
diff --git a/TelepathyQt/stream-tube-server-internal.h b/TelepathyQt/stream-tube-server-internal.h
index 224f4b1e..c2a66184 100644
--- a/TelepathyQt/stream-tube-server-internal.h
+++ b/TelepathyQt/stream-tube-server-internal.h
@@ -36,7 +36,7 @@ public:
     TubeWrapper(const AccountPtr &acc, const OutgoingStreamTubeChannelPtr &tube,
             const QHostAddress &exportedAddr, quint16 exportedPort, const QVariantMap &params,
             StreamTubeServer *parent);
-    ~TubeWrapper() { }
+    ~TubeWrapper() override { }
 
     AccountPtr mAcc;
     OutgoingStreamTubeChannelPtr mTube;
diff --git a/TelepathyQt/stream-tube-server.cpp b/TelepathyQt/stream-tube-server.cpp
index 8aaaff4b..66e6ac99 100644
--- a/TelepathyQt/stream-tube-server.cpp
+++ b/TelepathyQt/stream-tube-server.cpp
@@ -90,7 +90,7 @@ public:
     FixedParametersGenerator(const QVariantMap &params) : mParams(params) {}
 
     QVariantMap nextParameters(const AccountPtr &, const OutgoingStreamTubeChannelPtr &,
-            const ChannelRequestHints &)
+            const ChannelRequestHints &) override
     {
         return mParams;
     }
diff --git a/TelepathyQt/stream-tube-server.h b/TelepathyQt/stream-tube-server.h
index 670b4a5f..652d160e 100644
--- a/TelepathyQt/stream-tube-server.h
+++ b/TelepathyQt/stream-tube-server.h
@@ -154,7 +154,7 @@ public:
             const QString &clientName = QString(),
             bool monitorConnections = false);
 
-    virtual ~StreamTubeServer();
+    ~StreamTubeServer() override;
 
     ClientRegistrarPtr registrar() const;
     QString clientName() const;
diff --git a/TelepathyQt/streamed-media-channel.h b/TelepathyQt/streamed-media-channel.h
index ca7bbf38..96329910 100644
--- a/TelepathyQt/streamed-media-channel.h
+++ b/TelepathyQt/streamed-media-channel.h
@@ -46,7 +46,7 @@ class TP_QT_EXPORT_DEPRECATED PendingStreamedMediaStreams : public PendingOperat
     Q_DISABLE_COPY(PendingStreamedMediaStreams)
 
 public:
-    ~PendingStreamedMediaStreams();
+    ~PendingStreamedMediaStreams() override;
 
     StreamedMediaChannelPtr channel() const;
 
@@ -82,7 +82,7 @@ public:
         SendingStateSending = 2
     };
 
-    ~StreamedMediaStream();
+    ~StreamedMediaStream() override;
 
     StreamedMediaChannelPtr channel() const;
 
@@ -156,7 +156,7 @@ public:
     static StreamedMediaChannelPtr create(const ConnectionPtr &connection,
             const QString &objectPath, const QVariantMap &immutableProperties);
 
-    virtual ~StreamedMediaChannel();
+    ~StreamedMediaChannel() override;
 
     bool awaitingLocalAnswer() const;
     bool awaitingRemoteAnswer() const;
diff --git a/TelepathyQt/text-channel.h b/TelepathyQt/text-channel.h
index 075a0509..c2b872ba 100644
--- a/TelepathyQt/text-channel.h
+++ b/TelepathyQt/text-channel.h
@@ -52,7 +52,7 @@ public:
     static TextChannelPtr create(const ConnectionPtr &connection,
             const QString &objectPath, const QVariantMap &immutableProperties);
 
-    virtual ~TextChannel();
+    ~TextChannel() override;
 
     bool hasMessagesInterface() const;
     bool hasChatStateInterface() const;
diff --git a/TelepathyQt/tube-channel.h b/TelepathyQt/tube-channel.h
index c69224e0..5f3e0d1f 100644
--- a/TelepathyQt/tube-channel.h
+++ b/TelepathyQt/tube-channel.h
@@ -42,7 +42,7 @@ public:
     static TubeChannelPtr create(const ConnectionPtr &connection,
             const QString &objectPath, const QVariantMap &immutableProperties);
 
-    virtual ~TubeChannel();
+    ~TubeChannel() override;
 
     TubeChannelState state() const;
 
diff --git a/examples/accounts/account-item.h b/examples/accounts/account-item.h
index 07b72049..340d473e 100644
--- a/examples/accounts/account-item.h
+++ b/examples/accounts/account-item.h
@@ -59,7 +59,7 @@ public:
     Q_ENUMS(Columns)
 
     AccountItem(Tp::AccountPtr acc, QTableWidget *table, int row, QObject *parent = 0);
-    virtual ~AccountItem();
+    ~AccountItem() override;
 
     int row() const { return mRow; }
 
diff --git a/examples/accounts/accounts-window.h b/examples/accounts/accounts-window.h
index e47e67cd..6d51f2a6 100644
--- a/examples/accounts/accounts-window.h
+++ b/examples/accounts/accounts-window.h
@@ -39,7 +39,7 @@ class AccountsWindow : public QMainWindow
 
 public:
     AccountsWindow(QWidget *parent = 0);
-    virtual ~AccountsWindow();
+    ~AccountsWindow() override;
 
 private Q_SLOTS:
     void onAMReady(Tp::PendingOperation *);
diff --git a/examples/cm/protocol.h b/examples/cm/protocol.h
index 7f263cfa..d8809da0 100644
--- a/examples/cm/protocol.h
+++ b/examples/cm/protocol.h
@@ -32,7 +32,7 @@ class Protocol : public Tp::BaseProtocol
 
 public:
     Protocol(const QDBusConnection &dbusConnection, const QString &name);
-    virtual ~Protocol();
+    ~Protocol() override;
 
 private:
     Tp::BaseConnectionPtr createConnection(const QVariantMap &parameters, Tp::DBusError *error);
diff --git a/examples/contact-messenger/sender.h b/examples/contact-messenger/sender.h
index 2aae0b5e..92d6159d 100644
--- a/examples/contact-messenger/sender.h
+++ b/examples/contact-messenger/sender.h
@@ -39,7 +39,7 @@ class Sender : public QObject
 
 public:
     Sender(const QString &accountPath, const QString &contactIdentifier, const QString &message);
-    ~Sender();
+    ~Sender() override;
 
 private Q_SLOTS:
     void onSendMessageFinished(Tp::PendingOperation *op);
diff --git a/examples/file-transfer/file-receiver-handler.h b/examples/file-transfer/file-receiver-handler.h
index 01091dd9..77e49427 100644
--- a/examples/file-transfer/file-receiver-handler.h
+++ b/examples/file-transfer/file-receiver-handler.h
@@ -40,9 +40,9 @@ public:
         return SharedPtr<FileReceiverHandler>(new FileReceiverHandler());
     }
 
-    ~FileReceiverHandler();
+    ~FileReceiverHandler() override;
 
-    bool bypassApproval() const;
+    bool bypassApproval() const override;
 
     void handleChannels(const MethodInvocationContextPtr<> &context,
             const AccountPtr &account,
@@ -50,7 +50,7 @@ public:
             const QList<ChannelPtr> &channels,
             const QList<ChannelRequestPtr> &requestsSatisfied,
             const QDateTime &userActionTime,
-            const HandlerInfo &handlerInfo);
+            const HandlerInfo &handlerInfo) override;
 
 private Q_SLOTS:
     void onReceiveFinished(Tp::PendingOperation *op);
diff --git a/examples/file-transfer/file-receiver.h b/examples/file-transfer/file-receiver.h
index e79b6dd1..2d6e36e9 100644
--- a/examples/file-transfer/file-receiver.h
+++ b/examples/file-transfer/file-receiver.h
@@ -36,7 +36,7 @@ class FileReceiver : public QObject
 
 public:
     FileReceiver(QObject *parent);
-    ~FileReceiver();
+    ~FileReceiver() override;
 
 private:
     ClientRegistrarPtr mCR;
diff --git a/examples/file-transfer/file-sender.h b/examples/file-transfer/file-sender.h
index f6d455ab..bfff1c97 100644
--- a/examples/file-transfer/file-sender.h
+++ b/examples/file-transfer/file-sender.h
@@ -40,7 +40,7 @@ class FileSender : public QObject
 public:
     FileSender(const QString &accountName, const QString &receiverID,
             const QString &filePath, QObject *parent);
-    ~FileSender();
+    ~FileSender() override;
 
 private Q_SLOTS:
     void onAMReady(Tp::PendingOperation *op);
diff --git a/examples/file-transfer/pending-file-receive.h b/examples/file-transfer/pending-file-receive.h
index 14f64c0c..748b59c4 100644
--- a/examples/file-transfer/pending-file-receive.h
+++ b/examples/file-transfer/pending-file-receive.h
@@ -37,7 +37,7 @@ class PendingFileReceive : public PendingFileTransfer
 
 public:
     PendingFileReceive(const IncomingFileTransferChannelPtr &chan, const SharedPtr<RefCounted> &object);
-    ~PendingFileReceive();
+    ~PendingFileReceive() override;
 
 private Q_SLOTS:
     void onTransferStateChanged(Tp::FileTransferState state,
diff --git a/examples/file-transfer/pending-file-send.h b/examples/file-transfer/pending-file-send.h
index 40edcf73..d38d3caf 100644
--- a/examples/file-transfer/pending-file-send.h
+++ b/examples/file-transfer/pending-file-send.h
@@ -37,7 +37,7 @@ class PendingFileSend : public PendingFileTransfer
 
 public:
     PendingFileSend(const OutgoingFileTransferChannelPtr &chan, const SharedPtr<RefCounted> &object);
-    ~PendingFileSend();
+    ~PendingFileSend() override;
 
 private Q_SLOTS:
     void onTransferStateChanged(Tp::FileTransferState state,
diff --git a/examples/file-transfer/pending-file-transfer.h b/examples/file-transfer/pending-file-transfer.h
index d1481969..1cf56b39 100644
--- a/examples/file-transfer/pending-file-transfer.h
+++ b/examples/file-transfer/pending-file-transfer.h
@@ -36,7 +36,7 @@ class PendingFileTransfer : public PendingOperation
 public:
     PendingFileTransfer(const FileTransferChannelPtr &chan,
             const SharedPtr<RefCounted> &object);
-    ~PendingFileTransfer();
+    ~PendingFileTransfer() override;
 
     FileTransferChannelPtr channel() const { return mChannel; }
 
diff --git a/examples/protocols/cm-wrapper.h b/examples/protocols/cm-wrapper.h
index 63867ca0..ab0e5dd2 100644
--- a/examples/protocols/cm-wrapper.h
+++ b/examples/protocols/cm-wrapper.h
@@ -42,7 +42,7 @@ class CMWrapper : public QObject
 
 public:
    CMWrapper(const QString &cmName, QObject *parent = 0);
-   ~CMWrapper();
+   ~CMWrapper() override;
 
    ConnectionManagerPtr cm() const;
 
diff --git a/examples/protocols/protocols.h b/examples/protocols/protocols.h
index bef2c086..d145092d 100644
--- a/examples/protocols/protocols.h
+++ b/examples/protocols/protocols.h
@@ -43,7 +43,7 @@ class Protocols : public QObject
 
 public:
    Protocols();
-   ~Protocols();
+   ~Protocols() override;
 
 private Q_SLOTS:
     void onListNamesFinished(Tp::PendingOperation *op);
diff --git a/examples/roster/roster-item.h b/examples/roster/roster-item.h
index af047ce6..ee8c071b 100644
--- a/examples/roster/roster-item.h
+++ b/examples/roster/roster-item.h
@@ -35,7 +35,7 @@ class RosterItem : public QObject, public QListWidgetItem
 public:
     RosterItem(const Tp::ContactPtr &contact,
             QListWidget *parent = 0);
-    ~RosterItem();
+    ~RosterItem() override;
 
     Tp::ContactPtr contact() const { return mContact; }
 
diff --git a/examples/roster/roster-widget.h b/examples/roster/roster-widget.h
index 7dc52958..ac2f3639 100644
--- a/examples/roster/roster-widget.h
+++ b/examples/roster/roster-widget.h
@@ -47,7 +47,7 @@ class RosterWidget : public QWidget
 
 public:
     RosterWidget(QWidget *parent = 0);
-    virtual ~RosterWidget();
+    ~RosterWidget() override;
 
     Tp::ConnectionPtr connection() const { return mConn; }
     void setConnection(const Tp::ConnectionPtr &conn);
diff --git a/examples/roster/roster-window.h b/examples/roster/roster-window.h
index adc75179..3a1a2e51 100644
--- a/examples/roster/roster-window.h
+++ b/examples/roster/roster-window.h
@@ -39,7 +39,7 @@ class RosterWindow : public QMainWindow
 
 public:
     RosterWindow(const QString &accountName, QWidget *parent = 0);
-    virtual ~RosterWindow();
+    ~RosterWindow() override;
 
 private Q_SLOTS:
     void onAccountReady(Tp::PendingOperation *op);
diff --git a/examples/stream-tubes/tube-initiator.h b/examples/stream-tubes/tube-initiator.h
index 5cc68487..7c49579e 100644
--- a/examples/stream-tubes/tube-initiator.h
+++ b/examples/stream-tubes/tube-initiator.h
@@ -45,7 +45,7 @@ class TubeInitiator : public QObject
 
 public:
    TubeInitiator(const QString &accountName, const QString &receiver, QObject *parent);
-   ~TubeInitiator();
+   ~TubeInitiator() override;
 
 private Q_SLOTS:
     void onAccountReady(Tp::PendingOperation *op);
diff --git a/examples/stream-tubes/tube-receiver.h b/examples/stream-tubes/tube-receiver.h
index 434bba5b..f5571be6 100644
--- a/examples/stream-tubes/tube-receiver.h
+++ b/examples/stream-tubes/tube-receiver.h
@@ -39,7 +39,7 @@ class TubeReceiver : public QObject
 
 public:
    TubeReceiver(QObject *parent);
-   ~TubeReceiver();
+   ~TubeReceiver() override;
 
 private Q_SLOTS:
     void onTubeAccepted(const QString &listenAddress);
diff --git a/tests/dbus/account-connection-factory.cpp b/tests/dbus/account-connection-factory.cpp
index 2f734205..419d3fb3 100644
--- a/tests/dbus/account-connection-factory.cpp
+++ b/tests/dbus/account-connection-factory.cpp
@@ -40,7 +40,7 @@ public:
     {
     }
 
-    virtual ~AccountAdaptor()
+    ~AccountAdaptor() override
     {
     }
 
diff --git a/tests/dbus/base-filetransfer.cpp b/tests/dbus/base-filetransfer.cpp
index c43bd119..1228fcdd 100644
--- a/tests/dbus/base-filetransfer.cpp
+++ b/tests/dbus/base-filetransfer.cpp
@@ -183,7 +183,7 @@ public:
 
         setSelfContact(1, QLatin1String("selfContact"));
     }
-    virtual ~Connection() { }
+    ~Connection() override { }
 
     Tp::BaseChannelPtr receiveFile(const Tp::FileTransferChannelCreationProperties &properties, uint initiatorHandle)
     {
diff --git a/tests/dbus/cm-protocol.cpp b/tests/dbus/cm-protocol.cpp
index b84c560c..2b291d1b 100644
--- a/tests/dbus/cm-protocol.cpp
+++ b/tests/dbus/cm-protocol.cpp
@@ -50,7 +50,7 @@ public:
     {
     }
 
-    virtual ~ConnectionManagerAdaptor()
+    ~ConnectionManagerAdaptor() override
     {
     }
 
@@ -116,7 +116,7 @@ public:
         mIcon = QLatin1String("icon-adaptor");
     }
 
-    virtual ~ProtocolAdaptor()
+    ~ProtocolAdaptor() override
     {
     }
 
@@ -214,7 +214,7 @@ public:
         mUris << QLatin1String("adaptor");
     }
 
-    virtual ~ProtocolAddressingAdaptor()
+    ~ProtocolAddressingAdaptor() override
     {
     }
 
@@ -291,7 +291,7 @@ public:
         mMaximumAvatarBytes = 4096;
     }
 
-    virtual ~ProtocolAvatarsAdaptor()
+    ~ProtocolAvatarsAdaptor() override
     {
     }
 
@@ -400,7 +400,7 @@ public:
         mStatuses.insert(QLatin1String("available"), spec);
     }
 
-    virtual ~ProtocolPresenceAdaptor()
+    ~ProtocolPresenceAdaptor() override
     {
     }
 
diff --git a/tests/dbus/contact-messenger.cpp b/tests/dbus/contact-messenger.cpp
index 93ba0239..2da59044 100644
--- a/tests/dbus/contact-messenger.cpp
+++ b/tests/dbus/contact-messenger.cpp
@@ -66,7 +66,7 @@ public:
     }
 
 
-    virtual ~CDMessagesAdaptor()
+    ~CDMessagesAdaptor() override
     {
     }
 
@@ -110,7 +110,7 @@ public:
     {
     }
 
-    virtual ~AccountAdaptor()
+    ~AccountAdaptor() override
     {
     }
 
@@ -154,7 +154,7 @@ public:
     {
     }
 
-    ~Dispatcher()
+    ~Dispatcher() override
     {
     }
 };
diff --git a/tests/dbus/simple-observer.cpp b/tests/dbus/simple-observer.cpp
index fd54295b..c656b421 100644
--- a/tests/dbus/simple-observer.cpp
+++ b/tests/dbus/simple-observer.cpp
@@ -86,7 +86,7 @@ public:
     {
     }
 
-    virtual ~AccountAdaptor()
+    ~AccountAdaptor() override
     {
     }
 
@@ -130,7 +130,7 @@ public:
     {
     }
 
-    ~Dispatcher()
+    ~Dispatcher() override
     {
     }
 };
diff --git a/tests/dbus/stream-tube-handlers.cpp b/tests/dbus/stream-tube-handlers.cpp
index 6bb11d62..af39bf76 100644
--- a/tests/dbus/stream-tube-handlers.cpp
+++ b/tests/dbus/stream-tube-handlers.cpp
@@ -88,7 +88,7 @@ public:
     {
     }
 
-    virtual ~ChannelRequestAdaptor()
+    ~ChannelRequestAdaptor() override
     {
     }
 
@@ -784,7 +784,7 @@ void TestStreamTubeHandlers::testRegistration()
         CookieGenerator() : serial(0) {}
 
         QVariantMap nextParameters(const AccountPtr &account, const OutgoingStreamTubeChannelPtr &tube,
-                const ChannelRequestHints &hints)
+                const ChannelRequestHints &hints) override
         {
             QVariantMap params;
             params.insert(QLatin1String("cookie-y"),
@@ -1342,7 +1342,7 @@ void TestStreamTubeHandlers::testClientBasicTcp()
             FakeGenerator() : port(0) {}
 
             QPair<QHostAddress, quint16> nextSourceAddress(const AccountPtr &account,
-                    const IncomingStreamTubeChannelPtr &tube) {
+                    const IncomingStreamTubeChannelPtr &tube) override {
                 return qMakePair(QHostAddress(QHostAddress::LocalHost), ++port);
             }
 
@@ -1436,7 +1436,7 @@ void TestStreamTubeHandlers::testClientTcpGeneratorIgnore()
     {
         public:
             QPair<QHostAddress, quint16> nextSourceAddress(const AccountPtr &account,
-                    const IncomingStreamTubeChannelPtr &tube) {
+                    const IncomingStreamTubeChannelPtr &tube) override {
                 return qMakePair(QHostAddress(QHostAddress::LocalHost), quint16(1111));
             }
     } gen;
diff --git a/tests/dbus/types.cpp b/tests/dbus/types.cpp
index 8e4acba8..7b2d9336 100644
--- a/tests/dbus/types.cpp
+++ b/tests/dbus/types.cpp
@@ -23,7 +23,7 @@ class TubeAdaptor : public QDBusAbstractAdaptor
 
 public:
     TubeAdaptor(QObject *parent) : QDBusAbstractAdaptor(parent) {}
-    ~TubeAdaptor() {}
+    ~TubeAdaptor() override {}
 
 public: // Properties
     inline QVariantMap Parameters() const
diff --git a/tests/lib/glib-helpers/test-conn-helper.h b/tests/lib/glib-helpers/test-conn-helper.h
index a40b3609..70d55449 100644
--- a/tests/lib/glib-helpers/test-conn-helper.h
+++ b/tests/lib/glib-helpers/test-conn-helper.h
@@ -34,7 +34,7 @@ public:
             const Tp::ContactFactoryConstPtr &contactFactory,
             GType gType, const char *firstPropertyName, ...);
 
-    virtual ~TestConnHelper();
+    ~TestConnHelper() override;
 
     GObject *service() const { return mService; }
     Tp::ConnectionPtr client() const { return mClient; }
diff --git a/tests/lib/test-thread-helper.h b/tests/lib/test-thread-helper.h
index 3d483ed7..0674f1cd 100644
--- a/tests/lib/test-thread-helper.h
+++ b/tests/lib/test-thread-helper.h
@@ -24,7 +24,7 @@ public:
     typedef Tp::Callback1<void, Context&> Callback;
     Callback mCallback;
 
-    virtual void executeCallback()
+    void executeCallback() override
     {
         Q_ASSERT(mCallback.isValid());
         Q_ASSERT(QThread::currentThread() != QCoreApplication::instance()->thread());
diff --git a/tests/lib/test.h b/tests/lib/test.h
index 15e5f83f..3edb4107 100644
--- a/tests/lib/test.h
+++ b/tests/lib/test.h
@@ -21,7 +21,7 @@ public:
 
     Test(QObject *parent = 0);
 
-    virtual ~Test();
+    ~Test() override;
 
     QEventLoop *mLoop;
     void processDBusQueue(Tp::DBusProxy *proxy);
diff --git a/tests/ptr.cpp b/tests/ptr.cpp
index e0ddfe93..4707ff7f 100644
--- a/tests/ptr.cpp
+++ b/tests/ptr.cpp
@@ -244,7 +244,7 @@ class Thread : public QThread
 public:
     Thread(const DataPtr &ptr, QObject *parent = 0) : QThread(parent), mPtr(ptr) {}
 
-    void run()
+    void run() override
     {
         QVERIFY(!mPtr.isNull());
         for (int i = 0; i < 200; ++i) {