Skip to content

Commit

Permalink
Fix job signal connections on Windows.
Browse files Browse the repository at this point in the history
  • Loading branch information
ddennedy committed Mar 27, 2015
1 parent 485e466 commit 714df96
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
6 changes: 3 additions & 3 deletions src/jobs/encodejob.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ EncodeJob::EncodeJob(const QString &name, const QString &xml)
{
QAction* action = new QAction(tr("Open"), this);
action->setToolTip(tr("Open the output file in the Shotcut player"));
connect(action, &QAction::triggered, this, &EncodeJob::onOpenTiggered);
connect(action, SIGNAL(triggered()), this, SLOT(onOpenTiggered()));
m_successActions << action;

action = new QAction(tr("Show In Folder"), this);
action->setToolTip(tr("Show In Folder"));
connect(action, &QAction::triggered, this, &EncodeJob::onShowFolderTriggered);
connect(action, SIGNAL(triggered()), this, SLOT(onShowFolderTriggered()));
m_successActions << action;

action = new QAction(tr("Measure Video Quality..."), this);
connect(action, &QAction::triggered, this, &EncodeJob::onVideoQualityTriggered);
connect(action, SIGNAL(triggered()), this, SLOT(onVideoQualityTriggered()));
m_successActions << action;
}

Expand Down
1 change: 1 addition & 0 deletions src/jobs/encodejob.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

class EncodeJob : public MeltJob
{
Q_OBJECT
public:
EncodeJob(const QString& name, const QString& xml);

Expand Down
2 changes: 1 addition & 1 deletion src/jobs/meltjob.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ MeltJob::MeltJob(const QString& name, const QString& xml)
{
QAction* action = new QAction(tr("View XML"), this);
action->setToolTip(tr("View the MLT XML for this job"));
connect(action, &QAction::triggered, this, &MeltJob::onViewXmlTriggered);
connect(action, SIGNAL(triggered()), this, SLOT(onViewXmlTriggered()));
m_standardActions << action;
}

Expand Down
1 change: 1 addition & 0 deletions src/jobs/meltjob.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

class MeltJob : public AbstractJob
{
Q_OBJECT
public:
MeltJob(const QString& name, const QString& xml);
virtual ~MeltJob();
Expand Down
6 changes: 3 additions & 3 deletions src/jobs/videoqualityjob.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ VideoQualityJob::VideoQualityJob(const QString& name, const QString& xmlPath,
{
QAction* action = new QAction(tr("Open"), this);
action->setToolTip(tr("Open original and encoded side-by-side in the Shotcut player"));
connect(action, &QAction::triggered, this, &VideoQualityJob::onOpenTiggered);
connect(action, SLOT(triggered()), this, SLOT(onOpenTiggered()));
m_successActions << action;

action = new QAction(tr("View Report"), this);
connect(action, &QAction::triggered, this, &VideoQualityJob::onViewReportTriggered);
connect(action, SIGNAL(triggered()), this, SLOT(onViewReportTriggered()));
m_successActions << action;

action = new QAction(tr("Show In Folder"), this);
connect(action, &QAction::triggered, this, &VideoQualityJob::onShowFolderTriggered);
connect(action, SIGNAL(triggered()), this, SLOT(onShowFolderTriggered()));
m_successActions << action;

setLabel(tr("Measure %1").arg(objectName()));
Expand Down

0 comments on commit 714df96

Please sign in to comment.