X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=1ee3f4e0d62b0142ac7e93d6db544d60545ecc90;hb=9f6af8bd3a6bc12f9b32b91cd2a173a8a7763f5c;hp=35b0da57b3c9d87c14396d50bff73c495976162f;hpb=2a032dcb6151bd8b019c88f6ef1db1a8c1e5b61e;p=pulseview.git

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 35b0da57..1ee3f4e0 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -18,9 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern "C" {
 #include <sigrokdecode.h>
-}
 
 #include <QAction>
 #include <QApplication>
@@ -37,7 +35,6 @@ extern "C" {
 #include "dialogs/about.h"
 #include "view/view.h"
 
-extern "C" {
 /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
@@ -45,14 +42,21 @@ extern "C" {
 #include <stdarg.h>
 #include <glib.h>
 #include <libsigrok/libsigrok.h>
-}
+
 
 namespace pv {
 
-MainWindow::MainWindow(QWidget *parent) :
+MainWindow::MainWindow(const char *open_file_name,
+	QWidget *parent) :
 	QMainWindow(parent)
 {
 	setup_ui();
+	if (open_file_name) {
+		const QString s(QString::fromUtf8(open_file_name));
+		QMetaObject::invokeMethod(this, "load_file",
+			Qt::QueuedConnection,
+			Q_ARG(QString, s));
+	}
 }
 
 void MainWindow::setup_ui()
@@ -178,12 +182,17 @@ void MainWindow::setup_ui()
 
 }
 
+void MainWindow::load_file(QString file_name)
+{
+	_session.load_file(file_name.toStdString());
+}
+
 void MainWindow::on_actionOpen_triggered()
 {
-	QString file_name = QFileDialog::getOpenFileName(
+	const QString file_name = QFileDialog::getOpenFileName(
 		this, tr("Open File"), "",
 		tr("Sigrok Sessions (*.sr)"));
-	_session.load_file(file_name.toStdString());
+	load_file(file_name);
 }
 
 void MainWindow::on_actionQuit_triggered()