From 80308b85d51371447f618388de50876193b0ee8c Mon Sep 17 00:00:00 2001
From: Mat Sutcliffe <oktal3700@gmail.com>
Date: Thu, 3 Jan 2019 01:59:48 +0000
Subject: [PATCH] Changed QOverload to qOverload.

---
 src/blackgui/components/rawfsdmessagescomponent.cpp | 2 +-
 src/blackgui/dockwidget.cpp                         | 2 +-
 src/blackmisc/network/networkutils.cpp              | 6 +++---
 src/blackmisc/simulation/modelconverterx.cpp        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/blackgui/components/rawfsdmessagescomponent.cpp b/src/blackgui/components/rawfsdmessagescomponent.cpp
index 9c295228b..6d56a7f3b 100644
--- a/src/blackgui/components/rawfsdmessagescomponent.cpp
+++ b/src/blackgui/components/rawfsdmessagescomponent.cpp
@@ -77,7 +77,7 @@ namespace BlackGui
 
             readSettings();
             // Connect them after settings are read. Otherwise they get called.
-            connect(ui->cb_FileWritingMode, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &CRawFsdMessagesComponent::changeFileWritingMode);
+            connect(ui->cb_FileWritingMode, qOverload<int>(&QComboBox::currentIndexChanged), this, &CRawFsdMessagesComponent::changeFileWritingMode);
         }
 
         void CRawFsdMessagesComponent::enableDisableRawFsdMessages()
diff --git a/src/blackgui/dockwidget.cpp b/src/blackgui/dockwidget.cpp
index 150f318c9..441110558 100644
--- a/src/blackgui/dockwidget.cpp
+++ b/src/blackgui/dockwidget.cpp
@@ -367,7 +367,7 @@ namespace BlackGui
             contextMenu->addAction(CIcons::tableSheet16(), frameless ? "Normal window" : "Frameless", this, &CDockWidget::toggleFrameless);
             contextMenu->addAction(CIcons::dockTop16(), "Always on top", this, &CDockWidget::windowAlwaysOnTop);
             contextMenu->addAction(CIcons::dockTop16(), "Not on top", this, &CDockWidget::windowNotAlwaysOnTop);
-            contextMenu->addAction(CIcons::refresh16(), "Redraw", this, QOverload<>::of(&CDockWidget::update));
+            contextMenu->addAction(CIcons::refresh16(), "Redraw", this, qOverload<>(&CDockWidget::update));
         }
         else
         {
diff --git a/src/blackmisc/network/networkutils.cpp b/src/blackmisc/network/networkutils.cpp
index 1a186614a..8a4749cb0 100644
--- a/src/blackmisc/network/networkutils.cpp
+++ b/src/blackmisc/network/networkutils.cpp
@@ -113,10 +113,10 @@ namespace BlackMisc
             if (timeoutMs < 0) { timeoutMs = getTimeoutMs(); } // external functions might call with -1
             QTcpSocket socket;
             QSignalMapper mapper;
-            QObject::connect(&socket, &QTcpSocket::connected, &mapper, QOverload<>::of(&QSignalMapper::map));
-            QObject::connect(&socket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error), &mapper, QOverload<>::of(&QSignalMapper::map));
+            QObject::connect(&socket, &QTcpSocket::connected, &mapper, qOverload<>(&QSignalMapper::map));
+            QObject::connect(&socket, qOverload<QAbstractSocket::SocketError>(&QTcpSocket::error), &mapper, qOverload<>(&QSignalMapper::map));
             mapper.setMapping(&socket, 0);
-            const bool timedOut = !CEventLoop::processEventsUntil(&mapper, QOverload<int>::of(&QSignalMapper::mapped), timeoutMs, [&]
+            const bool timedOut = !CEventLoop::processEventsUntil(&mapper, qOverload<int>(&QSignalMapper::mapped), timeoutMs, [&]
             {
                 socket.connectToHost(hostAddress, static_cast<quint16>(port));
             });
diff --git a/src/blackmisc/simulation/modelconverterx.cpp b/src/blackmisc/simulation/modelconverterx.cpp
index 656fba813..d807905b6 100644
--- a/src/blackmisc/simulation/modelconverterx.cpp
+++ b/src/blackmisc/simulation/modelconverterx.cpp
@@ -45,7 +45,7 @@ namespace BlackMisc
                 if (old->state() == QProcess::Running)
                 {
                     // if still running, terminate and then delete
-                    QObject::connect(old, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), old, &QObject::deleteLater);
+                    QObject::connect(old, qOverload<int, QProcess::ExitStatus>(&QProcess::finished), old, &QObject::deleteLater);
                     old->terminate();
                 }
                 else