From 141b2ecf0aaaffd3f6ae9c9bd4ae0e4a1de814a7 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 10 Jul 2023 22:28:43 +0200 Subject: [PATCH] Qt6: fix possible build failure with Qt 6.5 Forum thread: https://forum.freecad.org/viewtopic.php?p=692199#p692199 --- src/Gui/DlgMacroExecuteImp.cpp | 2 -- src/Gui/DlgPreferencesImp.cpp | 2 -- src/Gui/MainWindow.cpp | 2 +- src/Gui/ProgressBar.cpp | 11 +++-------- src/Gui/ProgressDialog.cpp | 11 ++++------- src/Mod/PartDesign/Gui/TaskPipeParameters.cpp | 5 ++--- 6 files changed, 10 insertions(+), 23 deletions(-) diff --git a/src/Gui/DlgMacroExecuteImp.cpp b/src/Gui/DlgMacroExecuteImp.cpp index 069b4c55c2..a6b258d67e 100644 --- a/src/Gui/DlgMacroExecuteImp.cpp +++ b/src/Gui/DlgMacroExecuteImp.cpp @@ -620,7 +620,6 @@ Note: your changes will be applied when you next switch workbenches\n")); workbenchBox->setCurrentIndex(globalIdx); QMetaObject::invokeMethod(setupToolbarPage, "on_workbenchBox_activated", Qt::DirectConnection, - QGenericReturnArgument(), Q_ARG(int, globalIdx)); } else { Base::Console().Warning("Toolbar walkthrough: Unable to find Global workbench\n"); @@ -656,7 +655,6 @@ Note: your changes will be applied when you next switch workbenches\n")); categoryBox->setCurrentIndex(macrosIdx); QMetaObject::invokeMethod(setupToolbarPage, "on_categoryBox_activated", Qt::DirectConnection, - QGenericReturnArgument(), Q_ARG(int, macrosIdx)); } else { Base::Console().Warning("Toolbar walkthrough: Unable to find Macros in categoryBox\n"); diff --git a/src/Gui/DlgPreferencesImp.cpp b/src/Gui/DlgPreferencesImp.cpp index 78030622c5..bd5eca34b9 100644 --- a/src/Gui/DlgPreferencesImp.cpp +++ b/src/Gui/DlgPreferencesImp.cpp @@ -29,7 +29,6 @@ # include # include # include -# include # include # include # include @@ -546,7 +545,6 @@ void DlgPreferencesImp::resizeEvent(QResizeEvent* ev) int newHeight = std::min(height(), maxHeight); QMetaObject::invokeMethod(this, "resizeWindow", Qt::QueuedConnection, - QGenericReturnArgument(), Q_ARG(int, newWidth), Q_ARG(int, newHeight)); } diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index b2c7af1658..df19d2001f 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -1491,7 +1491,7 @@ void MainWindow::updateActions(bool delay) // the whole application in a weird state if (d->activityTimer->thread() != QThread::currentThread()) { QMetaObject::invokeMethod(d->activityTimer, "start", Qt::QueuedConnection, - QGenericReturnArgument(), Q_ARG(int, 150)); + Q_ARG(int, 150)); } else { d->activityTimer->start(150); diff --git a/src/Gui/ProgressBar.cpp b/src/Gui/ProgressBar.cpp index 82109e18f2..d8e5897756 100644 --- a/src/Gui/ProgressBar.cpp +++ b/src/Gui/ProgressBar.cpp @@ -24,7 +24,6 @@ #ifndef _PreComp_ # include # include -# include # include # include # include @@ -143,7 +142,7 @@ void SequencerBar::startStep() if (thr != currentThread) { d->guiThread = false; QMetaObject::invokeMethod(d->bar, "setRangeEx", Qt::QueuedConnection, - QGenericReturnArgument(), Q_ARG(int, 0), Q_ARG(int, (int)nTotalSteps)); + Q_ARG(int, 0), Q_ARG(int, (int)nTotalSteps)); d->progressTime.start(); d->checkAbortTime.start(); d->measureTime.start(); @@ -247,7 +246,7 @@ void SequencerBar::setValue(int step) d->progressTime.restart(); if (thr != currentThread) { QMetaObject::invokeMethod(d->bar, "setValueEx", Qt::/*Blocking*/QueuedConnection, - QGenericReturnArgument(), Q_ARG(int,d->bar->value()+1)); + Q_ARG(int,d->bar->value()+1)); } else { d->bar->setValueEx(d->bar->value()+1); @@ -262,7 +261,7 @@ void SequencerBar::setValue(int step) d->progressTime.restart(); if (thr != currentThread) { QMetaObject::invokeMethod(d->bar, "setValueEx", Qt::/*Blocking*/QueuedConnection, - QGenericReturnArgument(), Q_ARG(int,step)); + Q_ARG(int,step)); if (d->bar->isVisible()) showRemainingTime(); } @@ -301,7 +300,6 @@ void SequencerBar::showRemainingTime() if (thr != currentThread) { QMetaObject::invokeMethod(getMainWindow(), "showMessage", Qt::/*Blocking*/QueuedConnection, - QGenericReturnArgument(), Q_ARG(QString,status)); } else { @@ -320,11 +318,9 @@ void SequencerBar::resetData() QMetaObject::invokeMethod(d->bar, "aboutToHide", Qt::QueuedConnection); QMetaObject::invokeMethod(getMainWindow(), "showMessage", Qt::/*Blocking*/QueuedConnection, - QGenericReturnArgument(), Q_ARG(QString,QString())); QMetaObject::invokeMethod(getMainWindow(), "setPaneText", Qt::/*Blocking*/QueuedConnection, - QGenericReturnArgument(), Q_ARG(int,1), Q_ARG(QString,QString())); d->bar->leaveControlEvents(d->guiThread); @@ -363,7 +359,6 @@ void SequencerBar::setText (const char* pszTxt) if (thr != currentThread) { QMetaObject::invokeMethod(getMainWindow(), "showMessage", Qt::/*Blocking*/QueuedConnection, - QGenericReturnArgument(), Q_ARG(QString,d->text)); } else { diff --git a/src/Gui/ProgressDialog.cpp b/src/Gui/ProgressDialog.cpp index ea22e63352..7ad667e1d4 100644 --- a/src/Gui/ProgressDialog.cpp +++ b/src/Gui/ProgressDialog.cpp @@ -88,7 +88,7 @@ void SequencerDialog::startStep() if (thr != currentThread) { d->guiThread = false; QMetaObject::invokeMethod(d->dlg, "setRangeEx", Qt::QueuedConnection, - QGenericReturnArgument(), Q_ARG(int, 0), Q_ARG(int, (int)nTotalSteps)); + Q_ARG(int, 0), Q_ARG(int, (int)nTotalSteps)); d->dlg->setModal(false); if (nTotalSteps == 0) { d->progressTime.start(); @@ -96,7 +96,7 @@ void SequencerDialog::startStep() d->measureTime.start(); QMetaObject::invokeMethod(d->dlg, "setValueEx", Qt::QueuedConnection, - QGenericReturnArgument(), Q_ARG(int,0)); + Q_ARG(int,0)); QMetaObject::invokeMethod(d->dlg, "aboutToShow", Qt::QueuedConnection); } else { @@ -174,7 +174,7 @@ void SequencerDialog::setValue(int step) d->progressTime.restart(); if (thr != currentThread) { QMetaObject::invokeMethod(d->dlg, "setValueEx", Qt::/*Blocking*/QueuedConnection, - QGenericReturnArgument(), Q_ARG(int,d->dlg->value()+1)); + Q_ARG(int,d->dlg->value()+1)); } else { d->dlg->setValueEx(d->dlg->value()+1); @@ -185,7 +185,7 @@ void SequencerDialog::setValue(int step) else { if (thr != currentThread) { QMetaObject::invokeMethod(d->dlg, "setValueEx", Qt::/*Blocking*/QueuedConnection, - QGenericReturnArgument(), Q_ARG(int,step)); + Q_ARG(int,step)); if (d->dlg->isVisible()) showRemainingTime(); } @@ -222,7 +222,6 @@ void SequencerDialog::showRemainingTime() if (thr != currentThread) { QMetaObject::invokeMethod(d->dlg, "setLabelText", Qt::/*Blocking*/QueuedConnection, - QGenericReturnArgument(), Q_ARG(QString,status)); } else { @@ -241,7 +240,6 @@ void SequencerDialog::resetData() QMetaObject::invokeMethod(d->dlg, "hide", Qt::QueuedConnection); QMetaObject::invokeMethod(d->dlg, "setLabelText", Qt::/*Blocking*/QueuedConnection, - QGenericReturnArgument(), Q_ARG(QString,QString())); } else { @@ -279,7 +277,6 @@ void SequencerDialog::setText (const char* pszTxt) if (thr != currentThread) { QMetaObject::invokeMethod(d->dlg, "setLabelText", Qt::/*Blocking*/QueuedConnection, - QGenericReturnArgument(), Q_ARG(QString,d->text)); } else { diff --git a/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp b/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp index 8b8d8f1abe..489cd286a6 100644 --- a/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp @@ -24,7 +24,6 @@ #ifndef _PreComp_ # include -# include # include # include #endif @@ -591,7 +590,7 @@ TaskPipeOrientation::TaskPipeOrientation(ViewProviderPipe* PipeView, bool /*newO // should be called after panel has become visible QMetaObject::invokeMethod(this, "updateUI", Qt::QueuedConnection, - QGenericReturnArgument(), Q_ARG(int,pipe->Mode.getValue())); + Q_ARG(int,pipe->Mode.getValue())); this->blockSelection(false); } @@ -846,7 +845,7 @@ TaskPipeScaling::TaskPipeScaling(ViewProviderPipe* PipeView, bool /*newObj*/, QW // should be called after panel has become visible QMetaObject::invokeMethod(this, "updateUI", Qt::QueuedConnection, - QGenericReturnArgument(), Q_ARG(int,pipe->Transformation.getValue())); + Q_ARG(int,pipe->Transformation.getValue())); this->blockSelection(false); }