comparison main/MainWindow.cpp @ 2149:c476db6cf3eb

Seems to be some trouble with the function-pointer-based version of the connection here - recent-files menu isn't working on old systems with backward-compatible build - replace with an alternative mechanism again

 MainWindow::setupRecentFilesMenu()
 {
     m_recentFilesMenu->clear();
     vector<QString> files = m_recentFiles.getRecent();
     for (size_t i = 0; i < files.size(); ++i) {
-        /* F. Nicol patch 13 Aug. 2016 */
-        const QString& path = files[i];
+        QString path = files[i];
         QAction *action = new QAction(path, this);
-        connect(action, &QAction::triggered, [this, path] { openRecentFile(path);});
-        /* end of patch */
+        action->setObjectName(path);
+        connect(action, SIGNAL(triggered()), this, SLOT(openRecentFile()));
         if (i == 0) {
             action->setShortcut(tr("Ctrl+R"));
             m_keyReference->registerShortcut
                 (tr("Re-open"),
                  action->shortcut().toString(),

                               tr("<b>Audio required</b><p>Unable to load layer data from \"%1\" without an audio file.<br>Please load at least one audio file before importing annotations.").arg(text));
     }
 }
 
 void
-MainWindow::openRecentFile(const QString& path)
-{
-   /* F. Nicol patch 13 Aug. 2016 */
-#if 0
+MainWindow::openRecentFile()
+{
     QObject *obj = sender();
     QAction *action = dynamic_cast<QAction *>(obj);
     
     if (!action) {
         cerr << "WARNING: MainWindow::openRecentFile: sender is not an action"
-                  << endl;
+             << endl;
         return;
     }
 
-    QString path = action->text();
-#endif
-   /* End of F. Nicol patch 13 Aug. 2016 */
-
-    if (path == "") return;
+    QString path = action->objectName();
+
+    if (path == "") {
+        cerr << "WARNING: MainWindow::openRecentFile: action incorrectly named"
+             << endl;
+        return;
+    }
 
     FileOpenStatus status = openPath(path, ReplaceSession);
 
     if (status == FileOpenFailed) {
         emit hideSplash();