Commit e3720bcc authored by Oliver Bock's avatar Oliver Bock

Update deprecated QAction signals for 4.5 compliance

parent 781bb041
......@@ -61,28 +61,28 @@ PulsatingScience::PulsatingScience(QWidget *parent) : QMainWindow(parent)
connect(ui.pushRun, SIGNAL(clicked()),
ui.pulsarGlWidget, SLOT(runAnimation()));
connect(ui.actionRun, SIGNAL(activated()),
connect(ui.actionRun, SIGNAL(triggered()),
ui.pulsarGlWidget, SLOT(runAnimation()));
connect(ui.actionRun, SIGNAL(activated()),
connect(ui.actionRun, SIGNAL(triggered()),
this, SLOT(on_pushRun_clicked()));
connect(ui.pushPause, SIGNAL(clicked()),
ui.pulsarGlWidget, SLOT(pauseAnimation()));
connect(ui.actionPause, SIGNAL(activated()),
connect(ui.actionPause, SIGNAL(triggered()),
ui.pulsarGlWidget, SLOT(pauseAnimation()));
connect(ui.actionPause, SIGNAL(activated()),
connect(ui.actionPause, SIGNAL(triggered()),
this, SLOT(on_pushPause_clicked()));
connect(ui.pushStop, SIGNAL(clicked()),
ui.pulsarGlWidget, SLOT(stopAnimation()));
connect(ui.actionStop, SIGNAL(activated()),
connect(ui.actionStop, SIGNAL(triggered()),
ui.pulsarGlWidget, SLOT(stopAnimation()));
connect(ui.actionStop, SIGNAL(activated()),
connect(ui.actionStop, SIGNAL(triggered()),
this, SLOT(on_pushStop_clicked()));
connect(ui.actionPermanent_orbits, SIGNAL(toggled(bool)),
......@@ -311,19 +311,19 @@ void PulsatingScience::on_actionMenu_bar_toggled(bool checked)
// activate alternate shortcuts
m_runShortcut->setEnabled(true);
connect(m_runShortcut, SIGNAL(activated()), ui.pulsarGlWidget, SLOT(runAnimation()));
connect(m_runShortcut, SIGNAL(triggered()), ui.pulsarGlWidget, SLOT(runAnimation()));
m_pauseShortcut->setEnabled(true);
connect(m_pauseShortcut, SIGNAL(activated()), ui.pulsarGlWidget, SLOT(pauseAnimation()));
connect(m_pauseShortcut, SIGNAL(triggered()), ui.pulsarGlWidget, SLOT(pauseAnimation()));
m_stopShortcut->setEnabled(true);
connect(m_stopShortcut, SIGNAL(activated()), ui.pulsarGlWidget, SLOT(stopAnimation()));
connect(m_stopShortcut, SIGNAL(triggered()), ui.pulsarGlWidget, SLOT(stopAnimation()));
m_permanentOrbitsShortcut->setEnabled(true);
connect(m_permanentOrbitsShortcut, SIGNAL(activated()), this, SLOT(permanentOrbitsToggled()));
connect(m_permanentOrbitsShortcut, SIGNAL(triggered()), this, SLOT(permanentOrbitsToggled()));
m_rotationAxesShortcut->setEnabled(true);
connect(m_rotationAxesShortcut, SIGNAL(activated()), this, SLOT(rotationAxesToggled()));
connect(m_rotationAxesShortcut, SIGNAL(triggered()), this, SLOT(rotationAxesToggled()));
m_fullscreenShortcut->setEnabled(true);
connect(m_fullscreenShortcut, SIGNAL(activated()), this, SLOT(fullscreenToggled()));
connect(m_fullscreenShortcut, SIGNAL(triggered()), this, SLOT(fullscreenToggled()));
m_menuBarShortcut->setEnabled(true);
connect(m_menuBarShortcut, SIGNAL(activated()), this, SLOT(menuBarToggled()));
connect(m_menuBarShortcut, SIGNAL(triggered()), this, SLOT(menuBarToggled()));
}
}
......@@ -388,18 +388,18 @@ void PulsatingScience::on_dockAnimControl_topLevelChanged(bool topLevel) {
m_animControlFloating = topLevel;
}
void PulsatingScience::on_actionHelp_activated()
void PulsatingScience::on_actionHelp_triggered()
{
PulsatingScienceHelp help(this);
help.exec();
}
void PulsatingScience::on_actionWebsite_activated()
void PulsatingScience::on_actionWebsite_triggered()
{
QDesktopServices::openUrl(QUrl("http://www.aei.mpg.de"));
}
void PulsatingScience::on_actionAbout_activated()
void PulsatingScience::on_actionAbout_triggered()
{
QString content = "<b>%1</b><br>"
"%2<br><br>"
......
......@@ -68,9 +68,9 @@ public slots:
void on_dockAnimControl_visibilityChanged(bool visible);
void on_dockAnimControl_topLevelChanged(bool topLevel);
void on_actionHelp_activated();
void on_actionWebsite_activated();
void on_actionAbout_activated();
void on_actionHelp_triggered();
void on_actionWebsite_triggered();
void on_actionAbout_triggered();
void updatePulsarSemiMajorAxisValue(double value);
void toggleHiddenDemoMode();
......
......@@ -752,7 +752,7 @@
<connections>
<connection>
<sender>actionQuit</sender>
<signal>activated()</signal>
<signal>triggered()</signal>
<receiver>PulsatingScienceClass</receiver>
<slot>close()</slot>
<hints>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment