PR feedback

libraries/display-plugins/src/display-plugins/Logging.cpp

@@ -0,0 +1,11 @@
+//
+//  Created by Bradley Austin Davis 2015/10/11
+//  Copyright 2015 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "Logging.h"
+
+Q_LOGGING_CATEGORY(displayPlugins, "hifi.plugins.display")

libraries/display-plugins/src/display-plugins/Logging.h

@@ -0,0 +1,16 @@
+//
+//  Created by Bradley Austin Davis 2015/10/11
+//  Copyright 2015 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_DisplayPlugins_Logging_h
+#define hifi_DisplayPlugins_Logging_h
+
+#include <QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(displayPlugins)
+
+#endif

libraries/display-plugins/src/display-plugins/openvr/OpenVrHelpers.cpp

@@ -14,6 +14,8 @@
 #include <atomic>
 #include <mutex>
 
+#include "../Logging.h"
+
 using Mutex = std::mutex;
 using Lock = std::unique_lock<Mutex>;
 
@@ -28,13 +30,13 @@ vr::IVRSystem* acquireOpenVrSystem() {
     if (hmdPresent) {
         Lock lock(mutex);
         if (!activeHmd) {
-            qDebug() << "openvr: No vr::IVRSystem instance active, building";
+            qCDebug(displayPlugins) << "openvr: No vr::IVRSystem instance active, building";
             vr::HmdError eError = vr::HmdError_None;
             activeHmd = vr::VR_Init(&eError);
-            qDebug() << "openvr display: HMD is " << activeHmd << " error is " << eError;
+            qCDebug(displayPlugins) << "openvr display: HMD is " << activeHmd << " error is " << eError;
         }
         if (activeHmd) {
-            qDebug() << "openvr: incrementing refcount";
+            qCDebug(displayPlugins) << "openvr: incrementing refcount";
             ++refCount;
         }
     }

libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.h

@@ -64,12 +64,6 @@ public:
         TOUCH_BUTTON_PRESS = TOUCH_AXIS_Y_NEG + 1,
     };
 
-    KeyboardMouseDevice() {}
-
-    virtual ~KeyboardMouseDevice() {}
-
-    controller::InputDevice::Pointer getInputDevice() { return _inputDevice; }
-
     // Plugin functions
     virtual bool isSupported() const override { return true; }
     virtual bool isJointController() const override { return false; }
@@ -116,6 +110,10 @@ protected:
         friend class KeyboardMouseDevice;
     };
 
+public:
+    const std::shared_ptr<InputDevice>& getInputDevice() const { return _inputDevice; }
+
+protected:
     QPoint _lastCursor;
     QPoint _mousePressAt;
     glm::vec2 _lastTouch;

libraries/input-plugins/src/input-plugins/SixenseManager.h

@@ -47,9 +47,7 @@ const bool DEFAULT_INVERT_SIXENSE_MOUSE_BUTTONS = false;
 class SixenseManager : public InputPlugin {
     Q_OBJECT
 public:
-    SixenseManager() {}
-    virtual ~SixenseManager() {}
-    
+
     // Plugin functions
     virtual bool isSupported() const override;
     virtual bool isJointController() const override { return true; }

libraries/input-plugins/src/input-plugins/ViveControllerManager.h

@@ -31,8 +31,6 @@ namespace vr {
 class ViveControllerManager : public InputPlugin {
     Q_OBJECT
 public:
-    ViveControllerManager() {}
-    virtual ~ViveControllerManager() {}
 
     // Plugin functions
     virtual bool isSupported() const override;

tests/controllers/src/main.cpp

@@ -132,7 +132,7 @@ int main(int argc, char** argv) {
             inputPlugin->activate();
             auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
             if (name == KeyboardMouseDevice::NAME) {
-                userInputMapper->registerDevice(dynamic_cast<KeyboardMouseDevice*>(inputPlugin.get())->getInputDevice());
+                userInputMapper->registerDevice(std::dynamic_pointer_cast<KeyboardMouseDevice>(inputPlugin)->getInputDevice());
             }
             inputPlugin->pluginUpdate(0, false);
         }