diff --git a/src/app/single-application/SingleApplication.cpp b/src/app/single-application/SingleApplication.cpp
index b7945944d..807ae256e 100644
--- a/src/app/single-application/SingleApplication.cpp
+++ b/src/app/single-application/SingleApplication.cpp
@@ -330,34 +330,34 @@ void SingleApplicationPrivate::slotConnectionEstablished () {
   }
 
   QObject::connect(nextConnSocket, &QLocalSocket::aboutToClose, this, [nextConnSocket, instanceId, this]() {
-      Q_EMIT this->slotClientConnectionClosed(nextConnSocket, instanceId);
-    });
+    emit this->slotClientConnectionClosed(nextConnSocket, instanceId);
+  });
 
   QObject::connect(nextConnSocket, &QLocalSocket::readyRead, this, [nextConnSocket, instanceId, this]() {
-      Q_EMIT this->slotDataAvailable(nextConnSocket, instanceId);
-    });
+    emit this->slotDataAvailable(nextConnSocket, instanceId);
+  });
 
   if (connectionType == NewInstance || (
         connectionType == SecondaryInstance &&
         options & SingleApplication::Mode::SecondaryNotification
       )
   ) {
-    Q_EMIT q->instanceStarted();
+    emit q->instanceStarted();
   }
 
   if (nextConnSocket->bytesAvailable() > 0) {
-    Q_EMIT this->slotDataAvailable(nextConnSocket, instanceId);
+    emit this->slotDataAvailable(nextConnSocket, instanceId);
   }
 }
 
 void SingleApplicationPrivate::slotDataAvailable (QLocalSocket *dataSocket, quint32 instanceId) {
   Q_Q(SingleApplication);
-  Q_EMIT q->receivedMessage(instanceId, dataSocket->readAll());
+  emit q->receivedMessage(instanceId, dataSocket->readAll());
 }
 
 void SingleApplicationPrivate::slotClientConnectionClosed (QLocalSocket *closedSocket, quint32 instanceId) {
   if (closedSocket->bytesAvailable() > 0)
-    Q_EMIT slotDataAvailable(closedSocket, instanceId);
+    emit slotDataAvailable(closedSocket, instanceId);
   closedSocket->deleteLater();
 }
 
diff --git a/src/app/single-application/SingleApplication.hpp b/src/app/single-application/SingleApplication.hpp
index d4dab4d86..704922b9a 100644
--- a/src/app/single-application/SingleApplication.hpp
+++ b/src/app/single-application/SingleApplication.hpp
@@ -39,7 +39,7 @@ class SingleApplicationPrivate;
  * @see QCoreApplication
  */
 class SingleApplication : public QApplication {
-  Q_OBJECT
+  Q_OBJECT;
 
 public:
   /**
@@ -114,7 +114,7 @@ public:
 
   virtual void quit ();
 
-Q_SIGNALS:
+signals:
   void instanceStarted ();
   void receivedMessage (quint32 instanceId, QByteArray message);
 
diff --git a/src/app/single-application/SingleApplicationDBus.cpp b/src/app/single-application/SingleApplicationDBus.cpp
index e7cb2b455..fda510a21 100644
--- a/src/app/single-application/SingleApplicationDBus.cpp
+++ b/src/app/single-application/SingleApplicationDBus.cpp
@@ -31,7 +31,9 @@
 
 // =============================================================================
 
-const char *SERVICE_NAME = "org.linphone.SingleApplication";
+namespace {
+  constexpr char ServiceName[] = "org.linphone.SingleApplication";
+}
 
 SingleApplicationPrivate::SingleApplicationPrivate (SingleApplication *q_ptr)
   : QDBusAbstractAdaptor(q_ptr), q_ptr(q_ptr) {}
@@ -66,7 +68,7 @@ SingleApplication::SingleApplication (int &argc, char *argv[], bool allowSeconda
     ::exit(EXIT_FAILURE);
   }
 
-  if (d->getBus().registerService(SERVICE_NAME)) {
+  if (d->getBus().registerService(ServiceName)) {
     d->startPrimary();
     return;
   }
@@ -105,19 +107,19 @@ bool SingleApplication::sendMessage (QByteArray message, int timeout) {
 
   if (isPrimary()) return false;
 
-  QDBusInterface iface(SERVICE_NAME, "/", "", d->getBus());
+  QDBusInterface iface(ServiceName, "/", "", d->getBus());
   if (iface.isValid()) {
     iface.setTimeout(timeout);
-    QDBusMessage msg = iface.call(QDBus::Block, "messageReceived", instanceId(), message);
+    QDBusMessage msg = iface.call(QDBus::Block, "handleMessageReceived", instanceId(), message);
     return true;
   }
 
   return false;
 }
 
-void SingleApplicationPrivate::messageReceived (quint32 instanceId, QByteArray message) {
+void SingleApplicationPrivate::handleMessageReceived (quint32 instanceId, QByteArray message) {
   Q_Q(SingleApplication);
-  Q_EMIT q->receivedMessage(instanceId, message);
+  emit q->receivedMessage(instanceId, message);
 }
 
 void SingleApplication::quit () {
diff --git a/src/app/single-application/SingleApplicationDBusPrivate.hpp b/src/app/single-application/SingleApplicationDBusPrivate.hpp
index 5248e940c..d7c8d6fe7 100644
--- a/src/app/single-application/SingleApplicationDBusPrivate.hpp
+++ b/src/app/single-application/SingleApplicationDBusPrivate.hpp
@@ -50,8 +50,8 @@ public:
   SingleApplication::Options options;
   quint32 instanceNumber;
 
-public Q_SLOTS:
-  void messageReceived (quint32 instanceId, QByteArray message);
+private:
+  void handleMessageReceived (quint32 instanceId, QByteArray message);
 };
 
 #endif // SINGLE_APPLICATION_DBUS_PRIVATE_H_