From 7f702d3bffd7b8a224468469ba186d9eba4349f7 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Sun, 18 Jan 2015 06:31:55 -0800 Subject: [PATCH] Removed loadRSSDKFile() from Menu --- interface/src/Menu.cpp | 7 ++----- interface/src/Menu.h | 1 - interface/src/devices/RealSense.h | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 499b26bcd8..0ad776eb2c 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -440,7 +440,8 @@ Menu::Menu() { #ifdef HAVE_RSSDK QMenu* realSenseOptionsMenu = handOptionsMenu->addMenu("RealSense"); - addActionToQMenuAndActionHash(realSenseOptionsMenu, MenuOption::LoadRSSDKFile, 0, this, SLOT(loadRSSDKFile())); + addActionToQMenuAndActionHash(realSenseOptionsMenu, MenuOption::LoadRSSDKFile, 0, + RealSense::getInstance(), SLOT(loadRSSDKFile())); #endif QMenu* networkMenu = developerMenu->addMenu("Network"); @@ -1095,10 +1096,6 @@ void Menu::displayNameLocationResponse(const QString& errorString) { } } -void Menu::loadRSSDKFile() { - RealSense::getInstance()->loadRSSDKFile(); -} - void Menu::runTests() { runTimingTests(); } diff --git a/interface/src/Menu.h b/interface/src/Menu.h index d7d590a3f6..27da7d247b 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -148,7 +148,6 @@ private slots: void changePrivateKey(); void runTests(); void displayNameLocationResponse(const QString& errorString); - void loadRSSDKFile(); private: #if defined(Q_OS_MAC) || defined(Q_OS_WIN) diff --git a/interface/src/devices/RealSense.h b/interface/src/devices/RealSense.h index 4a43a1e117..20111365d0 100644 --- a/interface/src/devices/RealSense.h +++ b/interface/src/devices/RealSense.h @@ -40,6 +40,7 @@ public: virtual void update(); +public slots: void loadRSSDKFile(); protected: