Mercurial > hg > sonic-visualiser
diff main/MainWindow.h @ 903:6d3220e7ecef cxx11
Merge from default branch
author | Chris Cannam |
---|---|
date | Mon, 09 Feb 2015 10:31:07 +0000 |
parents | c62c3e4825ee |
children | 67540751da93 |
line wrap: on
line diff
--- a/main/MainWindow.h Mon Nov 17 15:31:08 2014 +0000 +++ b/main/MainWindow.h Mon Feb 09 10:31:07 2015 +0000 @@ -22,6 +22,7 @@ class Surveyer; class LayerTreeDialog; class ActivityLog; +class UnitConverter; class QFileSystemWatcher; class QScrollArea; @@ -136,6 +137,7 @@ virtual void showLayerTree(); virtual void showActivityLog(); + virtual void showUnitConverter(); virtual void mouseEnteredWidget(); virtual void mouseLeftWidget(); @@ -208,6 +210,7 @@ QPointer<LayerTreeDialog> m_layerTreeDialog; ActivityLog *m_activityLog; + UnitConverter *m_unitConverter; KeyReference *m_keyReference; QFileSystemWatcher *m_templateWatcher;