From 2d5f84b4bf85a3ebbd57a7cd97e534141588d0e9 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Wed, 18 Apr 2018 11:15:53 +0300
Subject: [PATCH] Refactoring. Don't use old slot style in QTimer::singleShot.

--HG--
branch : develop
---
 src/app/tape/main.cpp              | 4 ++++
 src/app/valentina/main.cpp         | 4 ++++
 src/libs/qmuparser/qmuparsertest.h | 2 +-
 src/libs/vwidgets/vwidgetpopup.cpp | 4 ++++
 src/test/ParserTest/main.cpp       | 4 ++++
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/app/tape/main.cpp b/src/app/tape/main.cpp
index ce17a51db..ce377ecb6 100644
--- a/src/app/tape/main.cpp
+++ b/src/app/tape/main.cpp
@@ -54,7 +54,11 @@ int main(int argc, char *argv[])
     MApplication app(argc, argv);
     app.InitOptions();
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+    QTimer::singleShot(0, &app, &MApplication::ProcessCMD);
+#else
     QTimer::singleShot(0, &app, SLOT(ProcessCMD()));
+#endif
 
     return app.exec();
 }
diff --git a/src/app/valentina/main.cpp b/src/app/valentina/main.cpp
index a88d509af..36f45740a 100644
--- a/src/app/valentina/main.cpp
+++ b/src/app/valentina/main.cpp
@@ -90,7 +90,11 @@ int main(int argc, char *argv[])
         msec = 15; // set delay for correct the first fitbest zoom
     }
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+    QTimer::singleShot(msec, &w, &MainWindow::ProcessCMD);
+#else
     QTimer::singleShot(msec, &w, SLOT(ProcessCMD()));
+#endif
 
     return app.exec();
 }
diff --git a/src/libs/qmuparser/qmuparsertest.h b/src/libs/qmuparser/qmuparsertest.h
index 28f77cab7..b6e3279d4 100644
--- a/src/libs/qmuparser/qmuparsertest.h
+++ b/src/libs/qmuparser/qmuparsertest.h
@@ -62,7 +62,7 @@ public:
 
     explicit QmuParserTester(QObject *parent = nullptr);
 
-private slots:
+public slots:
     void Run();
 
 private:
diff --git a/src/libs/vwidgets/vwidgetpopup.cpp b/src/libs/vwidgets/vwidgetpopup.cpp
index bdabffd21..d8126adde 100644
--- a/src/libs/vwidgets/vwidgetpopup.cpp
+++ b/src/libs/vwidgets/vwidgetpopup.cpp
@@ -135,6 +135,10 @@ void VWidgetPopup::Show(QPoint coord)
 
     if (lifeTime > 0)
     {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+        QTimer::singleShot(lifeTime, this, &QWidget::close);
+#else
         QTimer::singleShot(lifeTime, this, SLOT(close()));
+#endif
     }
 }
diff --git a/src/test/ParserTest/main.cpp b/src/test/ParserTest/main.cpp
index 0a1ef61eb..e69460db0 100644
--- a/src/test/ParserTest/main.cpp
+++ b/src/test/ParserTest/main.cpp
@@ -60,6 +60,10 @@ int main(int argc, char *argv[])
     QCoreApplication a(argc, argv);
     qInstallMessageHandler(testMessageOutput);
     qmu::Test::QmuParserTester pt;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+    QTimer::singleShot(0, &pt, &qmu::Test::QmuParserTester::Run);
+#else
     QTimer::singleShot(0, &pt, SLOT(Run()));
+#endif
     return a.exec();
 }