History

Decouple Application and plugin definitions, cleanup container usage

Brad Davis committed 11 years ago

Commit 5515b9d1 parent a79095d43 files · +399 −370Browse files

Showing the changes to libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp (1 of 43 files). Show all

Unified · Split

libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp+6−6
@@ -71,10 +71,10 @@ bool ViveControllerManager::isSupported() const { · 70 unmodified lines
71#endif71#endif
72}72}
73 73
74void ViveControllerManager::activate(PluginContainer* container) {74void ViveControllerManager::activate() {
75#ifdef Q_OS_WIN75#ifdef Q_OS_WIN
76 container->addMenu(MENU_PATH);76 CONTAINER->addMenu(MENU_PATH);
77 container->addMenuItem(MENU_PATH, RENDER_CONTROLLERS,77 CONTAINER->addMenuItem(MENU_PATH, RENDER_CONTROLLERS,
78 [this] (bool clicked) { this->setRenderControllers(clicked); },78 [this] (bool clicked) { this->setRenderControllers(clicked); },
79 true, true);79 true, true);
80 80
@@ -135,10 +135,10 @@ void ViveControllerManager::activate(PluginContainer* container) { · 54 unmodified lines
135#endif135#endif
136}136}
137 137
138void ViveControllerManager::deactivate(PluginContainer* container) {138void ViveControllerManager::deactivate() {
139#ifdef Q_OS_WIN139#ifdef Q_OS_WIN
140 container->removeMenuItem(MENU_NAME, RENDER_CONTROLLERS);140 CONTAINER->removeMenuItem(MENU_NAME, RENDER_CONTROLLERS);
141 container->removeMenu(MENU_PATH);141 CONTAINER->removeMenu(MENU_PATH);
142 142
143 hmdRefCount--;143 hmdRefCount--;
144 144

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t