Skip to content
Snippets Groups Projects

fix: function invokes

Merged Burak Hançerli requested to merge fix-function-invokes into master
1 file
+ 5
15
Compare changes
  • Side-by-side
  • Inline
+ 5
15
@@ -147,9 +147,7 @@ void Backend::initDsManager()
@@ -147,9 +147,7 @@ void Backend::initDsManager()
this,
this,
[this](const QString &id, const QString &ipAddr) {
[this](const QString &id, const QString &ipAddr) {
if (id == m_lastProjectSenderId) {
if (id == m_lastProjectSenderId) {
QMetaObject::invokeMethod(m_projectManager.get(),
QMetaObject::invokeMethod(m_projectManager.get(), "stopProject");
"stopProject",
Qt::QueuedConnection);
}
}
});
});
@@ -179,7 +177,6 @@ void Backend::connectDesignStudio(const QString &ipAddr)
@@ -179,7 +177,6 @@ void Backend::connectDesignStudio(const QString &ipAddr)
{
{
QMetaObject::invokeMethod(m_dsManager.get(),
QMetaObject::invokeMethod(m_dsManager.get(),
"initDesignStudio",
"initDesignStudio",
Qt::QueuedConnection,
Q_ARG(QString, ipAddr),
Q_ARG(QString, ipAddr),
Q_ARG(QString, ""));
Q_ARG(QString, ""));
emit popupOpen("Connecting in the background...", 1500);
emit popupOpen("Connecting in the background...", 1500);
@@ -192,24 +189,17 @@ void Backend::runProject(const QString &id, const QByteArray &projectData)
@@ -192,24 +189,17 @@ void Backend::runProject(const QString &id, const QByteArray &projectData)
// we'll use this to notify the correct DS when the project started/stopped
// we'll use this to notify the correct DS when the project started/stopped
m_lastProjectSenderId = id;
m_lastProjectSenderId = id;
QMetaObject::invokeMethod(m_dsManager.get(),
QMetaObject::invokeMethod(m_dsManager.get(), "sendProjectRunning", Q_ARG(QString, id));
"sendProjectRunning",
Qt::QueuedConnection,
Q_ARG(QString, id));
bool retVal;
bool retVal;
QMetaObject::invokeMethod(m_projectManager.get(),
QMetaObject::invokeMethod(m_projectManager.get(),
"runProject",
"runProject",
Qt::QueuedConnection,
Q_RETURN_ARG(bool, retVal),
Q_ARG(QByteArray, projectData),
Q_ARG(QByteArray, projectData),
Q_ARG(bool, autoScaleProject()),
Q_ARG(bool, autoScaleProject()));
Q_RETURN_ARG(bool, retVal));
if (!retVal) {
if (!retVal) {
QMetaObject::invokeMethod(m_dsManager.get(),
QMetaObject::invokeMethod(m_dsManager.get(), "sendProjectStopped", Q_ARG(QString, id));
"sendProjectStopped",
Qt::QueuedConnection,
Q_ARG(QString, id));
}
}
emit popupClose();
emit popupClose();
}
}
Loading