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

Update subrepos and merge from default branch

 class OSCMessage;
 class MIDIInput;
 class KeyReference;
 class Labeller;
 class ModelDataTableDialog;
+class QSignalMapper;
+class QShortcut;
 
 /**
  * The base class for the SV main window.  This includes everything to
  * do with general document and pane stack management, but nothing
  * that involves user interaction -- this doesn't create the widget or

     // Call this after setting up the menu bar, to fix up single-key
     // shortcuts on OS/X
     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);
 
     virtual void toXml(QTextStream &stream, bool asTemplate);