diff --git a/3rdparty/singleapplication/singleapplication.cpp b/3rdparty/singleapplication/singleapplication.cpp
index 3634199b6..be1e7d833 100644
--- a/3rdparty/singleapplication/singleapplication.cpp
+++ b/3rdparty/singleapplication/singleapplication.cpp
@@ -59,7 +59,7 @@
  * @param {bool} allowSecondaryInstances
  */
 SingleApplication::SingleApplication(int &argc, char *argv[], bool allowSecondary, Options options, int timeout)
-  : app_t(argc, argv), d_ptr(new SingleApplicationPrivate(this)) {
+    : app_t(argc, argv), d_ptr(new SingleApplicationPrivate(this)) {
 
   Q_D(SingleApplication);
 
@@ -88,7 +88,7 @@ SingleApplication::SingleApplication(int &argc, char *argv[], bool allowSecondar
   }
   else {
     // Attempt to attach to the memory segment
-    if (! d->memory->attach()) {
+    if (!d->memory->attach()) {
       qCritical() << "SingleApplication: Unable to attach to shared memory block.";
       qCritical() << d->memory->errorString();
       delete d;
@@ -96,7 +96,7 @@ SingleApplication::SingleApplication(int &argc, char *argv[], bool allowSecondar
     }
   }
 
-  InstancesInfo* inst = static_cast<InstancesInfo*>(d->memory->data());
+  InstancesInfo *inst = static_cast<InstancesInfo *>(d->memory->data());
   QElapsedTimer time;
   time.start();
 
@@ -118,7 +118,7 @@ SingleApplication::SingleApplication(int &argc, char *argv[], bool allowSecondar
     QThread::sleep(QRandomGenerator::global()->bounded(8u, 18u));
 #else
     qsrand(QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max());
-    QThread::sleep(8 + static_cast<unsigned long>(static_cast <float>(qrand()) / RAND_MAX * 10));
+    QThread::sleep(8 + static_cast<unsigned long>(static_cast<float>(qrand()) / RAND_MAX * 10));
 #endif
   }
 
@@ -148,7 +148,6 @@ SingleApplication::SingleApplication(int &argc, char *argv[], bool allowSecondar
   delete d;
 
   ::exit(EXIT_SUCCESS);
-
 }
 
 /**
@@ -193,5 +192,4 @@ bool SingleApplication::sendMessage(QByteArray message, int timeout) {
   bool dataWritten = d->socket->waitForBytesWritten(timeout);
   d->socket->flush();
   return dataWritten;
-
 }
diff --git a/3rdparty/singleapplication/singleapplication.h b/3rdparty/singleapplication/singleapplication.h
index f1b77e8e9..dbbdac1ce 100644
--- a/3rdparty/singleapplication/singleapplication.h
+++ b/3rdparty/singleapplication/singleapplication.h
@@ -51,7 +51,7 @@ class SingleApplication : public QApplication {
 
   typedef QApplication app_t;
 
-public:
+ public:
   /**
    * @brief Mode of operation of SingleApplication.
    * Whether the block should be user-wide or system-wide and whether the
@@ -63,11 +63,11 @@ public:
    * @enum
    */
   enum Mode {
-    User                   = 1 << 0,
-    System                 = 1 << 1,
-    SecondaryNotification  = 1 << 2,
-    ExcludeAppVersion      = 1 << 3,
-    ExcludeAppPath         = 1 << 4
+    User = 1 << 0,
+    System = 1 << 1,
+    SecondaryNotification = 1 << 2,
+    ExcludeAppVersion = 1 << 3,
+    ExcludeAppPath = 1 << 4
   };
   Q_DECLARE_FLAGS(Options, Mode)
 
@@ -91,7 +91,7 @@ public:
    * Usually 4*timeout would be the worst case (fail) scenario.
    * @see See the corresponding QAPPLICATION_CLASS constructor for reference
    */
-  explicit SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000 );
+  explicit SingleApplication(int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000);
   ~SingleApplication() override;
 
   /**
@@ -125,18 +125,17 @@ public:
    * @note sendMessage() will return false if invoked from the primary
    * instance.
    */
-  bool sendMessage( QByteArray message, int timeout = 1000 );
+  bool sendMessage(QByteArray message, int timeout = 1000);
 
  signals:
   void instanceStarted();
-  void receivedMessage( quint32 instanceId, QByteArray message );
+  void receivedMessage(quint32 instanceId, QByteArray message);
 
  private:
   SingleApplicationPrivate *d_ptr;
   Q_DECLARE_PRIVATE(SingleApplication)
-
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(SingleApplication::Options)
 
-#endif // SINGLEAPPLICATION_H
+#endif  // SINGLEAPPLICATION_H
diff --git a/3rdparty/singleapplication/singleapplication_p.cpp b/3rdparty/singleapplication/singleapplication_p.cpp
index e87870570..489110069 100644
--- a/3rdparty/singleapplication/singleapplication_p.cpp
+++ b/3rdparty/singleapplication/singleapplication_p.cpp
@@ -62,12 +62,11 @@
 #endif
 
 SingleApplicationPrivate::SingleApplicationPrivate(SingleApplication *_q_ptr)
-  : q_ptr(_q_ptr),
-    memory(nullptr),
-    socket(nullptr),
-    server(nullptr),
-    instanceNumber(-1)
-    {}
+    : q_ptr(_q_ptr),
+      memory(nullptr),
+      socket(nullptr),
+      server(nullptr),
+      instanceNumber(-1) {}
 
 SingleApplicationPrivate::~SingleApplicationPrivate() {
 
@@ -77,7 +76,7 @@ SingleApplicationPrivate::~SingleApplicationPrivate() {
   }
 
   memory->lock();
-  InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
+  InstancesInfo *inst = static_cast<InstancesInfo *>(memory->data());
   if (server != nullptr) {
     server->close();
     delete server;
@@ -88,7 +87,6 @@ SingleApplicationPrivate::~SingleApplicationPrivate() {
   memory->unlock();
 
   delete memory;
-
 }
 
 void SingleApplicationPrivate::genBlockServerName() {
@@ -115,17 +113,17 @@ void SingleApplicationPrivate::genBlockServerName() {
   if (options & SingleApplication::Mode::User) {
 #ifdef Q_OS_UNIX
     QByteArray username;
-#if defined(HAVE_GETEUID) && defined(HAVE_GETPWUID)
+#  if defined(HAVE_GETEUID) && defined(HAVE_GETPWUID)
     struct passwd *pw = getpwuid(geteuid());
     if (pw) {
       username = pw->pw_name;
     }
-#endif
+#  endif
     if (username.isEmpty()) username = qgetenv("USER");
     appData.addData(username);
 #endif
 #ifdef Q_OS_WIN
-    wchar_t username [ UNLEN + 1 ];
+    wchar_t username[UNLEN + 1];
     // Specifies size of the buffer on input
     DWORD usernameLength = UNLEN + 1;
     if (GetUserNameW(username, &usernameLength)) {
@@ -139,17 +137,15 @@ void SingleApplicationPrivate::genBlockServerName() {
 
   // Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with server naming requirements.
   blockServerName = appData.result().toBase64().replace("/", "_");
-
 }
 
 void SingleApplicationPrivate::initializeMemoryBlock() {
 
-  InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
+  InstancesInfo *inst = static_cast<InstancesInfo *>(memory->data());
   inst->primary = false;
   inst->secondary = 0;
   inst->primaryPid = -1;
   inst->checksum = blockChecksum();
-
 }
 
 void SingleApplicationPrivate::startPrimary() {
@@ -174,14 +170,13 @@ void SingleApplicationPrivate::startPrimary() {
   QObject::connect(server, &QLocalServer::newConnection, this, &SingleApplicationPrivate::slotConnectionEstablished);
 
   // Reset the number of connections
-  InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
+  InstancesInfo *inst = static_cast<InstancesInfo *>(memory->data());
 
   inst->primary = true;
   inst->primaryPid = q->applicationPid();
   inst->checksum = blockChecksum();
 
   instanceNumber = 0;
-
 }
 
 void SingleApplicationPrivate::startSecondary() {}
@@ -239,19 +234,17 @@ void SingleApplicationPrivate::connectToPrimary(const int msecs, const Connectio
     socket->flush();
     socket->waitForBytesWritten(msecs);
   }
-
 }
 
 quint16 SingleApplicationPrivate::blockChecksum() {
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  quint16 checksum = qChecksum(QByteArray(static_cast<const char*>(memory->constData()), offsetof(InstancesInfo, checksum)));
+  quint16 checksum = qChecksum(QByteArray(static_cast<const char *>(memory->constData()), offsetof(InstancesInfo, checksum)));
 #else
-  quint16 checksum = qChecksum(static_cast<const char*>(memory->constData()), offsetof(InstancesInfo, checksum));
+  quint16 checksum = qChecksum(static_cast<const char *>(memory->constData()), offsetof(InstancesInfo, checksum));
 #endif
 
   return checksum;
-
 }
 
 qint64 SingleApplicationPrivate::primaryPid() {
@@ -259,12 +252,11 @@ qint64 SingleApplicationPrivate::primaryPid() {
   qint64 pid;
 
   memory->lock();
-  InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
+  InstancesInfo *inst = static_cast<InstancesInfo *>(memory->data());
   pid = inst->primaryPid;
   memory->unlock();
 
   return pid;
-
 }
 
 /**
@@ -279,35 +271,31 @@ void SingleApplicationPrivate::slotConnectionEstablished() {
     [nextConnSocket, this]() {
       auto &info = connectionMap[nextConnSocket];
       Q_EMIT this->slotClientConnectionClosed(nextConnSocket, info.instanceId);
-    }
-  );
+    });
 
   QObject::connect(nextConnSocket, &QLocalSocket::disconnected,
-    [nextConnSocket, this](){
+    [nextConnSocket, this]() {
       connectionMap.remove(nextConnSocket);
       nextConnSocket->deleteLater();
-    }
-  );
+    });
 
   QObject::connect(nextConnSocket, &QLocalSocket::readyRead,
     [nextConnSocket, this]() {
       auto &info = connectionMap[nextConnSocket];
-      switch(info.stage) {
-      case StageHeader:
-        readInitMessageHeader(nextConnSocket);
-        break;
-      case StageBody:
-        readInitMessageBody(nextConnSocket);
-        break;
-      case StageConnected:
-        Q_EMIT this->slotDataAvailable(nextConnSocket, info.instanceId);
-        break;
-      default:
-        break;
+      switch (info.stage) {
+        case StageHeader:
+          readInitMessageHeader(nextConnSocket);
+          break;
+        case StageBody:
+          readInitMessageBody(nextConnSocket);
+          break;
+        case StageConnected:
+          Q_EMIT this->slotDataAvailable(nextConnSocket, info.instanceId);
+          break;
+        default:
+          break;
       };
-    }
-  );
-
+    });
 }
 
 void SingleApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
@@ -334,7 +322,6 @@ void SingleApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
   if (sock->bytesAvailable() >= static_cast<qint64>(msgLen)) {
     readInitMessageBody(sock);
   }
-
 }
 
 void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
@@ -397,19 +384,16 @@ void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
   if (sock->bytesAvailable() > 0) {
     Q_EMIT this->slotDataAvailable(sock, instanceId);
   }
-
 }
 
 void SingleApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, const quint32 instanceId) {
 
   Q_Q(SingleApplication);
   Q_EMIT q->receivedMessage(instanceId, dataSocket->readAll());
-
 }
 
 void SingleApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
 
   if (closedSocket->bytesAvailable() > 0)
     Q_EMIT slotDataAvailable(closedSocket, instanceId);
-
 }
diff --git a/3rdparty/singleapplication/singleapplication_p.h b/3rdparty/singleapplication/singleapplication_p.h
index 70e3fef2e..f3d080ecc 100644
--- a/3rdparty/singleapplication/singleapplication_p.h
+++ b/3rdparty/singleapplication/singleapplication_p.h
@@ -94,12 +94,12 @@ class SingleApplicationPrivate : public QObject {
   quint32 instanceNumber;
   QString blockServerName;
   SingleApplication::Options options;
-  QMap<QLocalSocket*, ConnectionInfo> connectionMap;
+  QMap<QLocalSocket *, ConnectionInfo> connectionMap;
 
  public slots:
   void slotConnectionEstablished();
-  void slotDataAvailable(QLocalSocket*, const quint32);
-  void slotClientConnectionClosed(QLocalSocket*, const quint32);
+  void slotDataAvailable(QLocalSocket *, const quint32);
+  void slotClientConnectionClosed(QLocalSocket *, const quint32);
 };
 
 #endif  // SINGLEAPPLICATION_P_H
diff --git a/3rdparty/singleapplication/singlecoreapplication.cpp b/3rdparty/singleapplication/singlecoreapplication.cpp
index b565423b8..7092c5dc5 100644
--- a/3rdparty/singleapplication/singlecoreapplication.cpp
+++ b/3rdparty/singleapplication/singlecoreapplication.cpp
@@ -59,7 +59,7 @@
  * @param {bool} allowSecondaryInstances
  */
 SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], bool allowSecondary, Options options, int timeout)
-  : app_t(argc, argv), d_ptr(new SingleCoreApplicationPrivate(this)) {
+    : app_t(argc, argv), d_ptr(new SingleCoreApplicationPrivate(this)) {
 
   Q_D(SingleCoreApplication);
 
@@ -96,7 +96,7 @@ SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], bool allow
     }
   }
 
-  InstancesInfo* inst = static_cast<InstancesInfo*>(d->memory->data());
+  InstancesInfo *inst = static_cast<InstancesInfo *>(d->memory->data());
   QElapsedTimer time;
   time.start();
 
@@ -104,7 +104,7 @@ SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], bool allow
   while (true) {
     d->memory->lock();
 
-    if(d->blockChecksum() == inst->checksum) break;
+    if (d->blockChecksum() == inst->checksum) break;
 
     if (time.elapsed() > 5000) {
       qWarning() << "SingleCoreApplication: Shared memory block has been in an inconsistent state from more than 5s. Assuming primary instance failure.";
@@ -118,7 +118,7 @@ SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], bool allow
     QThread::sleep(QRandomGenerator::global()->bounded(8u, 18u));
 #else
     qsrand(QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max());
-    QThread::sleep(8 + static_cast<unsigned long>(static_cast <float>(qrand()) / RAND_MAX * 10));
+    QThread::sleep(8 + static_cast<unsigned long>(static_cast<float>(qrand()) / RAND_MAX * 10));
 #endif
   }
 
@@ -134,7 +134,7 @@ SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], bool allow
     inst->checksum = d->blockChecksum();
     d->instanceNumber = inst->secondary;
     d->startSecondary();
-    if(d->options & Mode::SecondaryNotification) {
+    if (d->options & Mode::SecondaryNotification) {
       d->connectToPrimary(timeout, SingleCoreApplicationPrivate::SecondaryInstance);
     }
     d->memory->unlock();
@@ -148,7 +148,6 @@ SingleCoreApplication::SingleCoreApplication(int &argc, char *argv[], bool allow
   delete d;
 
   ::exit(EXIT_SUCCESS);
-
 }
 
 /**
@@ -184,7 +183,7 @@ bool SingleCoreApplication::sendMessage(QByteArray message, int timeout) {
   Q_D(SingleCoreApplication);
 
   // Nobody to connect to
-  if(isPrimary()) return false;
+  if (isPrimary()) return false;
 
   // Make sure the socket is connected
   d->connectToPrimary(timeout, SingleCoreApplicationPrivate::Reconnect);
@@ -193,5 +192,4 @@ bool SingleCoreApplication::sendMessage(QByteArray message, int timeout) {
   bool dataWritten = d->socket->waitForBytesWritten(timeout);
   d->socket->flush();
   return dataWritten;
-
 }
diff --git a/3rdparty/singleapplication/singlecoreapplication.h b/3rdparty/singleapplication/singlecoreapplication.h
index 2b27c1999..4ecf8b6bc 100644
--- a/3rdparty/singleapplication/singlecoreapplication.h
+++ b/3rdparty/singleapplication/singlecoreapplication.h
@@ -51,7 +51,7 @@ class SingleCoreApplication : public QCoreApplication {
 
   typedef QCoreApplication app_t;
 
-public:
+ public:
   /**
    * @brief Mode of operation of SingleCoreApplication.
    * Whether the block should be user-wide or system-wide and whether the
@@ -63,11 +63,11 @@ public:
    * @enum
    */
   enum Mode {
-    User                   = 1 << 0,
-    System                 = 1 << 1,
-    SecondaryNotification  = 1 << 2,
-    ExcludeAppVersion      = 1 << 3,
-    ExcludeAppPath         = 1 << 4
+    User = 1 << 0,
+    System = 1 << 1,
+    SecondaryNotification = 1 << 2,
+    ExcludeAppVersion = 1 << 3,
+    ExcludeAppPath = 1 << 4
   };
   Q_DECLARE_FLAGS(Options, Mode)
 
@@ -91,7 +91,7 @@ public:
    * Usually 4*timeout would be the worst case (fail) scenario.
    * @see See the corresponding QAPPLICATION_CLASS constructor for reference
    */
-  explicit SingleCoreApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000 );
+  explicit SingleCoreApplication(int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000);
   ~SingleCoreApplication() override;
 
   /**
@@ -125,17 +125,17 @@ public:
    * @note sendMessage() will return false if invoked from the primary
    * instance.
    */
-  bool sendMessage( QByteArray message, int timeout = 1000 );
+  bool sendMessage(QByteArray message, int timeout = 1000);
 
  signals:
   void instanceStarted();
-  void receivedMessage( quint32 instanceId, QByteArray message );
+  void receivedMessage(quint32 instanceId, QByteArray message);
 
-private:
+ private:
   SingleCoreApplicationPrivate *d_ptr;
   Q_DECLARE_PRIVATE(SingleCoreApplication)
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(SingleCoreApplication::Options)
 
-#endif // SINGLECOREAPPLICATION_H
+#endif  // SINGLECOREAPPLICATION_H
diff --git a/3rdparty/singleapplication/singlecoreapplication_p.cpp b/3rdparty/singleapplication/singlecoreapplication_p.cpp
index 16f95ea9f..97aacf116 100644
--- a/3rdparty/singleapplication/singlecoreapplication_p.cpp
+++ b/3rdparty/singleapplication/singlecoreapplication_p.cpp
@@ -62,12 +62,11 @@
 #endif
 
 SingleCoreApplicationPrivate::SingleCoreApplicationPrivate(SingleCoreApplication *_q_ptr)
-  : q_ptr(_q_ptr),
-    memory(nullptr),
-    socket(nullptr),
-    server(nullptr),
-    instanceNumber(-1)
-    {}
+    : q_ptr(_q_ptr),
+      memory(nullptr),
+      socket(nullptr),
+      server(nullptr),
+      instanceNumber(-1) {}
 
 SingleCoreApplicationPrivate::~SingleCoreApplicationPrivate() {
 
@@ -77,7 +76,7 @@ SingleCoreApplicationPrivate::~SingleCoreApplicationPrivate() {
   }
 
   memory->lock();
-  InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
+  InstancesInfo *inst = static_cast<InstancesInfo *>(memory->data());
   if (server != nullptr) {
     server->close();
     delete server;
@@ -88,7 +87,6 @@ SingleCoreApplicationPrivate::~SingleCoreApplicationPrivate() {
   memory->unlock();
 
   delete memory;
-
 }
 
 void SingleCoreApplicationPrivate::genBlockServerName() {
@@ -115,17 +113,17 @@ void SingleCoreApplicationPrivate::genBlockServerName() {
   if (options & SingleCoreApplication::Mode::User) {
 #ifdef Q_OS_UNIX
     QByteArray username;
-#if defined(HAVE_GETEUID) && defined(HAVE_GETPWUID)
+#  if defined(HAVE_GETEUID) && defined(HAVE_GETPWUID)
     struct passwd *pw = getpwuid(geteuid());
     if (pw) {
       username = pw->pw_name;
     }
-#endif
+#  endif
     if (username.isEmpty()) username = qgetenv("USER");
     appData.addData(username);
 #endif
 #ifdef Q_OS_WIN
-    wchar_t username [ UNLEN + 1 ];
+    wchar_t username[UNLEN + 1];
     // Specifies size of the buffer on input
     DWORD usernameLength = UNLEN + 1;
     if (GetUserNameW(username, &usernameLength)) {
@@ -139,17 +137,15 @@ void SingleCoreApplicationPrivate::genBlockServerName() {
 
   // Replace the backslash in RFC 2045 Base64 [a-zA-Z0-9+/=] to comply with server naming requirements.
   blockServerName = appData.result().toBase64().replace("/", "_");
-
 }
 
 void SingleCoreApplicationPrivate::initializeMemoryBlock() {
 
-  InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
+  InstancesInfo *inst = static_cast<InstancesInfo *>(memory->data());
   inst->primary = false;
   inst->secondary = 0;
   inst->primaryPid = -1;
   inst->checksum = blockChecksum();
-
 }
 
 void SingleCoreApplicationPrivate::startPrimary() {
@@ -174,14 +170,13 @@ void SingleCoreApplicationPrivate::startPrimary() {
   QObject::connect(server, &QLocalServer::newConnection, this, &SingleCoreApplicationPrivate::slotConnectionEstablished);
 
   // Reset the number of connections
-  InstancesInfo* inst = static_cast <InstancesInfo*>(memory->data());
+  InstancesInfo *inst = static_cast<InstancesInfo *>(memory->data());
 
   inst->primary = true;
   inst->primaryPid = q->applicationPid();
   inst->checksum = blockChecksum();
 
   instanceNumber = 0;
-
 }
 
 void SingleCoreApplicationPrivate::startSecondary() {}
@@ -239,19 +234,17 @@ void SingleCoreApplicationPrivate::connectToPrimary(const int msecs, const Conne
     socket->flush();
     socket->waitForBytesWritten(msecs);
   }
-
 }
 
 quint16 SingleCoreApplicationPrivate::blockChecksum() {
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  quint16 checksum = qChecksum(QByteArray(static_cast<const char*>(memory->constData()), offsetof(InstancesInfo, checksum)));
+  quint16 checksum = qChecksum(QByteArray(static_cast<const char *>(memory->constData()), offsetof(InstancesInfo, checksum)));
 #else
-  quint16 checksum = qChecksum(static_cast<const char*>(memory->constData()), offsetof(InstancesInfo, checksum));
+  quint16 checksum = qChecksum(static_cast<const char *>(memory->constData()), offsetof(InstancesInfo, checksum));
 #endif
 
   return checksum;
-
 }
 
 qint64 SingleCoreApplicationPrivate::primaryPid() {
@@ -259,12 +252,11 @@ qint64 SingleCoreApplicationPrivate::primaryPid() {
   qint64 pid;
 
   memory->lock();
-  InstancesInfo* inst = static_cast<InstancesInfo*>(memory->data());
+  InstancesInfo *inst = static_cast<InstancesInfo *>(memory->data());
   pid = inst->primaryPid;
   memory->unlock();
 
   return pid;
-
 }
 
 /**
@@ -279,35 +271,31 @@ void SingleCoreApplicationPrivate::slotConnectionEstablished() {
     [nextConnSocket, this]() {
       auto &info = connectionMap[nextConnSocket];
       Q_EMIT this->slotClientConnectionClosed(nextConnSocket, info.instanceId);
-    }
-  );
+    });
 
   QObject::connect(nextConnSocket, &QLocalSocket::disconnected,
-    [nextConnSocket, this](){
+    [nextConnSocket, this]() {
       connectionMap.remove(nextConnSocket);
       nextConnSocket->deleteLater();
-    }
-  );
+    });
 
   QObject::connect(nextConnSocket, &QLocalSocket::readyRead,
     [nextConnSocket, this]() {
       auto &info = connectionMap[nextConnSocket];
-      switch(info.stage) {
-      case StageHeader:
-        readInitMessageHeader(nextConnSocket);
-        break;
-      case StageBody:
-        readInitMessageBody(nextConnSocket);
-        break;
-      case StageConnected:
-        Q_EMIT this->slotDataAvailable(nextConnSocket, info.instanceId);
-        break;
-      default:
-        break;
+      switch (info.stage) {
+        case StageHeader:
+          readInitMessageHeader(nextConnSocket);
+          break;
+        case StageBody:
+          readInitMessageBody(nextConnSocket);
+          break;
+        case StageConnected:
+          Q_EMIT this->slotDataAvailable(nextConnSocket, info.instanceId);
+          break;
+        default:
+          break;
       };
-    }
-  );
-
+    });
 }
 
 void SingleCoreApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
@@ -334,7 +322,6 @@ void SingleCoreApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
   if (sock->bytesAvailable() >= static_cast<qint64>(msgLen)) {
     readInitMessageBody(sock);
   }
-
 }
 
 void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
@@ -397,19 +384,16 @@ void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
   if (sock->bytesAvailable() > 0) {
     Q_EMIT this->slotDataAvailable(sock, instanceId);
   }
-
 }
 
 void SingleCoreApplicationPrivate::slotDataAvailable(QLocalSocket *dataSocket, const quint32 instanceId) {
 
   Q_Q(SingleCoreApplication);
   Q_EMIT q->receivedMessage(instanceId, dataSocket->readAll());
-
 }
 
 void SingleCoreApplicationPrivate::slotClientConnectionClosed(QLocalSocket *closedSocket, const quint32 instanceId) {
 
   if (closedSocket->bytesAvailable() > 0)
     Q_EMIT slotDataAvailable(closedSocket, instanceId);
-
 }
diff --git a/3rdparty/singleapplication/singlecoreapplication_p.h b/3rdparty/singleapplication/singlecoreapplication_p.h
index bf313eaa0..ec0dfa9f7 100644
--- a/3rdparty/singleapplication/singlecoreapplication_p.h
+++ b/3rdparty/singleapplication/singlecoreapplication_p.h
@@ -94,12 +94,12 @@ class SingleCoreApplicationPrivate : public QObject {
   quint32 instanceNumber;
   QString blockServerName;
   SingleCoreApplication::Options options;
-  QMap<QLocalSocket*, ConnectionInfo> connectionMap;
+  QMap<QLocalSocket *, ConnectionInfo> connectionMap;
 
  public slots:
   void slotConnectionEstablished();
-  void slotDataAvailable(QLocalSocket*, const quint32);
-  void slotClientConnectionClosed(QLocalSocket*, const quint32);
+  void slotDataAvailable(QLocalSocket *, const quint32);
+  void slotClientConnectionClosed(QLocalSocket *, const quint32);
 };
 
 #endif  // SINGLECOREAPPLICATION_P_H