1 files changed, 10 insertions, 10 deletions
diff --git a/tests/dbus/cm-protocol.cpp b/tests/dbus/cm-protocol.cpp
index 31d34c1c..2c9a2840 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
     {
     }
 
@@ -126,11 +126,11 @@ public:
         ret.insert(TP_QT_IFACE_PROTOCOL + QLatin1String(".Interfaces"),
                    mInterfaces);
         ret.insert(TP_QT_IFACE_PROTOCOL + QLatin1String(".Parameters"),
-                   qVariantFromValue(mParameters));
+                   QVariant::fromValue(mParameters));
         ret.insert(TP_QT_IFACE_PROTOCOL + QLatin1String(".ConnectionInterfaces"),
                    mConnInterfaces);
         ret.insert(TP_QT_IFACE_PROTOCOL + QLatin1String(".RequestableChannelClasses"),
-                   qVariantFromValue(mRCCs));
+                   QVariant::fromValue(mRCCs));
         ret.insert(TP_QT_IFACE_PROTOCOL + QLatin1String(".VCardField"),
                    mVCardField);
         ret.insert(TP_QT_IFACE_PROTOCOL + QLatin1String(".EnglishName"),
@@ -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
     {
     }
 
@@ -408,7 +408,7 @@ public:
     {
         QVariantMap ret;
         ret.insert(TP_QT_IFACE_PROTOCOL_INTERFACE_PRESENCE + QLatin1String(".Statuses"),
-                   qVariantFromValue(mStatuses));
+                   QVariant::fromValue(mStatuses));
         return ret;
     }
 
@@ -494,9 +494,9 @@ class TestCmProtocol : public Test
     Q_OBJECT
 
 public:
-    TestCmProtocol(QObject *parent = 0)
+    TestCmProtocol(QObject *parent = nullptr)
         : Test(parent),
-          mCM(0)
+          mCM(nullptr)
     {
     }