From e2ae85176f4d3565fda108eea0888f92a2325007 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 15 Aug 2013 15:41:25 -0700 Subject: [PATCH] make settings methods slots in Menu so they are accessible --- interface/src/Menu.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/interface/src/Menu.h b/interface/src/Menu.h index 94083fc8b9..f025cc96cc 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -49,16 +49,15 @@ public: ViewFrustumOffset getViewFrustumOffset() const { return _viewFrustumOffset; } VoxelStatsDialog* getVoxelStatsDialog() const { return _voxelStatsDialog; } - void loadSettings(QSettings* settings = NULL); - void saveSettings(QSettings* settings = NULL); - void importSettings(); - void exportSettings(); - void handleViewFrustumOffsetKeyModifier(int key); public slots: void bandwidthDetails(); void voxelStatsDetails(); + void loadSettings(QSettings* settings = NULL); + void saveSettings(QSettings* settings = NULL); + void importSettings(); + void exportSettings(); private slots: void editPreferences(); @@ -67,7 +66,7 @@ private slots: void cycleFrustumRenderMode(); void updateVoxelModeActions(); void chooseVoxelPaintColor(); - void runTests(); + void runTests(); private: static Menu* _instance;