Mercurial > hg > svapp

diff framework/MainWindowBase.h @ 404:08a45e4cf1b1 tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update subrepos and merge from default branch
author Chris Cannam
date Tue, 02 Sep 2014 16:23:48 +0100
parents 71b21d6e66be
children 662aef012679 618d5816b04d
line wrap: on
line diff
--- a/framework/MainWindowBase.h	Fri Jul 18 13:25:11 2014 +0100
+++ b/framework/MainWindowBase.h	Tue Sep 02 16:23:48 2014 +0100
@@ -60,6 +60,8 @@
 class KeyReference;
 class Labeller;
 class ModelDataTableDialog;
+class QSignalMapper;
+class QShortcut;
 
 /**
  * The base class for the SV main window.  This includes everything to
@@ -428,6 +430,10 @@
     virtual void finaliseMenus();
     virtual void finaliseMenu(QMenu *);
 
+    // Only used on OS/X to work around a Qt/Cocoa bug, see finaliseMenus
+    QSignalMapper *m_menuShortcutMapper;
+    QList<QShortcut *> m_appShortcuts;
+
     virtual bool shouldCreateNewSessionForRDFAudio(bool *) { return true; }
 
     virtual void connectLayerEditDialog(ModelDataTableDialog *dialog);