Fix command line arguments parsing (#1351)

IB-8576, Fixes #1350

Signed-off-by: Raul Metsma <[email protected]>

Author: metsma

client/Application.cpp

@@ -628,9 +628,11 @@ bool Application::event(QEvent *event)
 	case QEvent::FileOpen:
 	{
 		QString fileName = static_cast<QFileOpenEvent*>(event)->file().normalized(QString::NormalizationForm_C);
-		QMetaObject::invokeMethod(this, [fileName = std::move(fileName)] {
-			parseArgs({ fileName });
-		});
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
+		QMetaObject::invokeMethod(this, [&fileName] { parseArgs({fileName}); });
+#else
+		QMetaObject::invokeMethod(this, qOverload<QStringList>(&Application::parseArgs), QStringList(fileName));
+#endif
 		return true;
 	}
 #ifdef Q_OS_MAC
@@ -871,7 +873,7 @@ void Application::showClient(const QStringList &params, bool crypto, bool sign,
 {
 	if(sign)
 		sign = params.size() != 1 || !CONTAINER_EXT.contains(QFileInfo(params.value(0)).suffix(), Qt::CaseInsensitive);
-	QWidget *w = nullptr;
+	MainWindow *w = nullptr;
 	if(!newWindow && params.isEmpty())
 	{
 		// If no files selected (e.g. restoring minimized window), select first
@@ -921,8 +923,12 @@ void Application::showClient(const QStringList &params, bool crypto, bool sign,
 	w->show();
 	w->activateWindow();
 	w->raise();
-	if( !params.isEmpty() )
-		QMetaObject::invokeMethod(w, "open", Q_ARG(QStringList,params), Q_ARG(bool,crypto), Q_ARG(bool,sign));
+	if(!params.isEmpty())
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
+		QMetaObject::invokeMethod(w, [&] { w->open(params, crypto, sign); });
+#else
+		QMetaObject::invokeMethod(w, &MainWindow::open, params, crypto, sign);
+#endif
 }
 
 void Application::showWarning( const QString &msg, const digidoc::Exception &e )

client/MainWindow.cpp

@@ -614,20 +614,12 @@ void MainWindow::openFiles(const QStringList &files, bool addFile, bool forceCre
 		navigateToPage(page, content, create);
 }
 
-void MainWindow::open(const QStringList &params, bool crypto, bool sign)
+void MainWindow::open(const QStringList &files, bool crypto, bool sign)
 {
 	if (crypto && !sign)
 		selectPage(Pages::CryptoIntro);
 	else
 		selectPage(Pages::SignIntro);
-
-	QStringList files;
-	for(const auto &param: params)
-	{
-		if(QFileInfo(param).isFile())
-			files << param;
-	}
-
 	if(!files.isEmpty())
 		openFiles(files, false, sign);
 }

client/MainWindow.h

@@ -44,6 +44,7 @@ class MainWindow final : public QWidget
 	explicit MainWindow(QWidget *parent = nullptr);
 	~MainWindow() final;
 
+	void open(const QStringList &files, bool crypto, bool sign);
 	void showSettings(int page);
 
 protected:
@@ -71,7 +72,6 @@ class MainWindow final : public QWidget
 	void navigateToPage( ria::qdigidoc4::Pages page, const QStringList &files = QStringList(), bool create = true );
 	void onCryptoAction(int action, const QString &id, const QString &phone);
 	void onSignAction(int action, const QString &info1, const QString &info2);
-	void open(const QStringList &params, bool crypto, bool sign);
 	void openContainer(bool signature);
 	void openFiles(const QStringList &files, bool addFile = false, bool forceCreate = false);
 	void pageSelected(int page, bool checked = true);