Showing the changes to interface/src/Menu.cpp (1 of 20 files). Show all
Unified · Split
| @@ -46,15 +46,8 @@ · 45 unmodified lines | |||
| 46 | 46 | ||
| 47 | #include "Menu.h" | 47 | #include "Menu.h" |
| 48 | 48 | ||
| 49 | // Fixme make static member of Menu | ||
| 50 | static const char* const MENU_PROPERTY_NAME = "com.highfidelity.Menu"; | ||
| 51 | |||
| 52 | void Menu::setInstance() { | ||
| 53 | globalInstance<Menu>(MENU_PROPERTY_NAME); | ||
| 54 | } | ||
| 55 | |||
| 56 | Menu* Menu::getInstance() { | 49 | Menu* Menu::getInstance() { |
| 57 | return static_cast<Menu*>(ui::Menu::getInstance()); | 50 | return static_cast<Menu*>(qApp->getWindow()->menuBar()); |
| 58 | } | 51 | } |
| 59 | 52 | ||
| 60 | Menu::Menu() { | 53 | Menu::Menu() { |