Merge pull request #6257 from sethalves/quiet-compiler

quiet compiler

libraries/animation/src/AnimVariant.cpp

@@ -44,7 +44,7 @@ QScriptValue AnimVariantMap::animVariantMapToScriptValue(QScriptEngine* engine,
                 break;
             default:
                 // Note that we don't do mat4 in Javascript currently, and there's not yet a reason to start now.
-                assert("AnimVariant::Type" == "valid");
+                assert(QString("AnimVariant::Type") == QString("valid"));
         }
     };
     if (useNames) { // copy only the requested names

libraries/controllers/src/controllers/UserInputMapper.cpp

@@ -74,7 +74,7 @@ void UserInputMapper::registerDevice(InputDevice::Pointer device) {
     }
     const auto& deviceID = device->_deviceID;
 
-    int numberOfType = recordDeviceOfType(device->getName());
+    recordDeviceOfType(device->getName());
 
     qCDebug(controllers) << "Registered input device <" << device->getName() << "> deviceID = " << deviceID;
     for (const auto& inputMapping : device->getAvailableInputs()) {
@@ -266,7 +266,7 @@ void UserInputMapper::update(float deltaTime) {
     }
 
     auto standardInputs = getStandardInputs();
-    if (_lastStandardStates.size() != standardInputs.size()) {
+    if ((int)_lastStandardStates.size() != standardInputs.size()) {
         _lastStandardStates.resize(standardInputs.size());
         for (auto& lastValue : _lastStandardStates) {
             lastValue = 0;

libraries/controllers/src/controllers/impl/Endpoint.h

@@ -40,7 +40,7 @@ namespace controller {
         virtual void apply(float value, const Pointer& source) = 0;
         virtual Pose pose() { return Pose(); }
         virtual void apply(const Pose& value, const Pointer& source) {}
-        virtual const bool isPose() { return _input.isPose(); }
+        virtual bool isPose() { return _input.isPose(); }
 
         virtual bool writeable() const { return true; }
         virtual bool readable() const { return true; }
@@ -54,6 +54,7 @@ namespace controller {
 
     class LambdaEndpoint : public Endpoint {
     public:
+        using Endpoint::apply;
         LambdaEndpoint(ReadLambda readLambda, WriteLambda writeLambda = [](float) {})
             : Endpoint(Input::INVALID_INPUT), _readLambda(readLambda), _writeLambda(writeLambda) { }
 

libraries/controllers/src/controllers/impl/conditionals/EndpointConditional.h

@@ -18,7 +18,7 @@ namespace controller {
 class EndpointConditional : public Conditional {
 public:
     EndpointConditional(Endpoint::Pointer endpoint) : _endpoint(endpoint) {}
-    virtual bool satisfied() override { return _endpoint && _endpoint->value() != 0.0; }
+    virtual bool satisfied() override { return _endpoint && _endpoint->value() != 0.0f; }
 private:
     Endpoint::Pointer _endpoint;
 };

libraries/controllers/src/controllers/impl/endpoints/AnyEndpoint.h

@@ -17,6 +17,7 @@ namespace controller {
 class AnyEndpoint : public Endpoint {
     friend class UserInputMapper;
 public:
+    using Endpoint::apply;
     AnyEndpoint(Endpoint::List children);
     virtual float value() override;
     virtual void apply(float newValue, const Endpoint::Pointer& source) override;

libraries/controllers/src/controllers/impl/endpoints/ArrayEndpoint.h

@@ -17,6 +17,7 @@ namespace controller {
 class ArrayEndpoint : public Endpoint {
     friend class UserInputMapper;
 public:
+    using Endpoint::apply;
     using Pointer = std::shared_ptr<ArrayEndpoint>;
     ArrayEndpoint() : Endpoint(Input::INVALID_INPUT) { }
 

libraries/controllers/src/controllers/impl/endpoints/CompositeEndpoint.h

@@ -15,6 +15,7 @@
 namespace controller {
     class CompositeEndpoint : public Endpoint, Endpoint::Pair {
     public:
+        using Endpoint::apply;
         CompositeEndpoint(Endpoint::Pointer first, Endpoint::Pointer second);
 
         virtual float value() override;

libraries/controllers/src/controllers/impl/endpoints/JSEndpoint.h

@@ -19,6 +19,7 @@ namespace controller {
 
 class JSEndpoint : public Endpoint {
 public:
+    using Endpoint::apply;
     JSEndpoint(const QJSValue& callable)
         : Endpoint(Input::INVALID_INPUT), _callable(callable) {
     }

libraries/controllers/src/controllers/impl/endpoints/ScriptEndpoint.h

@@ -19,6 +19,7 @@ namespace controller {
 class ScriptEndpoint : public Endpoint {
     Q_OBJECT;
 public:
+    using Endpoint::apply;
     ScriptEndpoint(const QScriptValue& callable)
         : Endpoint(Input::INVALID_INPUT), _callable(callable) {
     }

libraries/controllers/src/controllers/impl/endpoints/StandardEndpoint.h

@@ -32,7 +32,7 @@ public:
 
     virtual void apply(float value, const Pointer& source) override {
         // For standard endpoints, the first NON-ZERO write counts.
-        if (value != 0.0) {
+        if (value != 0.0f) {
             _written = true;
         }
         VirtualEndpoint::apply(value, source);

libraries/controllers/src/controllers/impl/filters/InvertFilter.h

@@ -17,6 +17,7 @@ namespace controller {
 class InvertFilter : public ScaleFilter {
     REGISTER_FILTER_CLASS(InvertFilter);
 public:
+    using ScaleFilter::parseParameters;
     InvertFilter() : ScaleFilter(-1.0f) {}
 
     virtual bool parseParameters(const QJsonArray& parameters) { return true; }