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
7171 #endif
7272 }
7373
74−void ViveControllerManager::activate(PluginContainer* container) {
74+void ViveControllerManager::activate() {
7575 #ifdef Q_OS_WIN
76− container->addMenu(MENU_PATH);
77− container->addMenuItem(MENU_PATH, RENDER_CONTROLLERS,
76+ CONTAINER->addMenu(MENU_PATH);
77+ CONTAINER->addMenuItem(MENU_PATH, RENDER_CONTROLLERS,
7878 [this] (bool clicked) { this->setRenderControllers(clicked); },
7979 true, true);
8080
@@ -135,10 +135,10 @@ void ViveControllerManager::activate(PluginContainer* container) { · 54 unmodified lines
135135 #endif
136136 }
137137
138−void ViveControllerManager::deactivate(PluginContainer* container) {
138+void ViveControllerManager::deactivate() {
139139 #ifdef Q_OS_WIN
140− container->removeMenuItem(MENU_NAME, RENDER_CONTROLLERS);
141− container->removeMenu(MENU_PATH);
140+ CONTAINER->removeMenuItem(MENU_NAME, RENDER_CONTROLLERS);
141+ CONTAINER->removeMenu(MENU_PATH);
142142
143143 hmdRefCount--;
144144

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