quiet gcc 5 warnings

assignment-client/src/octree/OctreeInboundPacketProcessor.cpp

@@ -153,7 +153,7 @@ void OctreeInboundPacketProcessor::processPacket(QSharedPointer<ReceivedMessage>
                 qDebug() << "    maxSize=" << maxSize;
                 qDebug("OctreeInboundPacketProcessor::processPacket() %hhu "
                        "payload=%p payloadLength=%lld editData=%p payloadPosition=%lld maxSize=%d",
-                        packetType, message->getRawMessage(), message->getSize(), editData,
+                       (int)packetType, message->getRawMessage(), message->getSize(), editData,
                         message->getPosition(), maxSize);
             }
 
@@ -191,7 +191,7 @@ void OctreeInboundPacketProcessor::processPacket(QSharedPointer<ReceivedMessage>
         if (debugProcessPacket) {
             qDebug("OctreeInboundPacketProcessor::processPacket() DONE LOOPING FOR %hhu "
                    "payload=%p payloadLength=%lld editData=%p payloadPosition=%lld",
-                    packetType, message->getRawMessage(), message->getSize(), editData, message->getPosition());
+                   (int)packetType, message->getRawMessage(), message->getSize(), editData, message->getPosition());
         }
 
         // Make sure our Node and NodeList knows we've heard from this node.
@@ -208,7 +208,7 @@ void OctreeInboundPacketProcessor::processPacket(QSharedPointer<ReceivedMessage>
         }
         trackInboundPacket(nodeUUID, sequence, transitTime, editsInPacket, processTime, lockWaitTime);
     } else {
-        qDebug("unknown packet ignored... packetType=%hhu", packetType);
+        qDebug("unknown packet ignored... packetType=%hhu", (int)packetType);
     }
 }
 

interface/src/Camera.h

@@ -29,6 +29,10 @@ enum CameraMode
 };
 
 Q_DECLARE_METATYPE(CameraMode);
+
+#if defined(__GNUC__) && !defined(__clang__)
+__attribute__((unused))
+#endif
 static int cameraModeId = qRegisterMetaType<CameraMode>();
 
 class Camera : public QObject {

interface/src/scripting/AssetMappingsScriptingInterface.cpp

@@ -196,7 +196,7 @@ bool AssetMappingModel::isKnownFolder(QString path) const {
     return false;
 }
 
-static int assetMappingModelMetatypeId = qRegisterMetaType<AssetMappingModel*>("AssetMappingModel*");
+int assetMappingModelMetatypeId = qRegisterMetaType<AssetMappingModel*>("AssetMappingModel*");
 
 void AssetMappingModel::refresh() {
     qDebug() << "Refreshing asset mapping model";

libraries/animation/src/AnimationCache.cpp

@@ -15,7 +15,7 @@
 #include "AnimationCache.h"
 #include "AnimationLogging.h"
 
-static int animationPointerMetaTypeId = qRegisterMetaType<AnimationPointer>();
+int animationPointerMetaTypeId = qRegisterMetaType<AnimationPointer>();
 
 AnimationCache::AnimationCache(QObject* parent) :
     ResourceCache(parent)

libraries/audio/src/SoundCache.cpp

@@ -14,7 +14,7 @@
 #include "AudioLogging.h"
 #include "SoundCache.h"
 
-static int soundPointerMetaTypeId = qRegisterMetaType<SharedSoundPointer>();
+int soundPointerMetaTypeId = qRegisterMetaType<SharedSoundPointer>();
 
 SoundCache::SoundCache(QObject* parent) :
     ResourceCache(parent)

libraries/controllers/src/controllers/UserInputMapper.cpp

@@ -336,10 +336,10 @@ QVector<QString> UserInputMapper::getActionNames() const {
     return result;
 }
 
-static int actionMetaTypeId = qRegisterMetaType<Action>();
-static int inputMetaTypeId = qRegisterMetaType<Input>();
-static int inputPairMetaTypeId = qRegisterMetaType<Input::NamedPair>();
-static int poseMetaTypeId = qRegisterMetaType<controller::Pose>("Pose");
+int actionMetaTypeId = qRegisterMetaType<Action>();
+int inputMetaTypeId = qRegisterMetaType<Input>();
+int inputPairMetaTypeId = qRegisterMetaType<Input::NamedPair>();
+int poseMetaTypeId = qRegisterMetaType<controller::Pose>("Pose");
 
 QScriptValue inputToScriptValue(QScriptEngine* engine, const Input& input);
 void inputFromScriptValue(const QScriptValue& object, Input& input);

libraries/entities/src/EntityTypes.h

@@ -69,7 +69,7 @@ private:
 /// named NameEntityItem and must of a static method called factory that takes an EnityItemID, and EntityItemProperties and return a newly
 /// constructed (heap allocated) instance of your type. e.g. The following prototype:
 //        static EntityItemPointer factory(const EntityItemID& entityID, const EntityItemProperties& properties);
-#define REGISTER_ENTITY_TYPE(x) static bool x##Registration = \
+#define REGISTER_ENTITY_TYPE(x) bool x##Registration = \
             EntityTypes::registerEntityType(EntityTypes::x, #x, x##EntityItem::factory);
 
 /// Macro for registering entity types with an overloaded factory. Like using the REGISTER_ENTITY_TYPE macro: Make sure to add

libraries/fbx/src/FBXReader.cpp

@@ -39,7 +39,7 @@
 
 using namespace std;
 
-static int FBXGeometryPointerMetaTypeId = qRegisterMetaType<FBXGeometry::Pointer>();
+int FBXGeometryPointerMetaTypeId = qRegisterMetaType<FBXGeometry::Pointer>();
 
 QStringList FBXGeometry::getJointNames() const {
     QStringList names;
@@ -130,9 +130,9 @@ QString FBXGeometry::getModelNameOfMesh(int meshIndex) const {
     return QString();
 }
 
-static int fbxGeometryMetaTypeId = qRegisterMetaType<FBXGeometry>();
-static int fbxAnimationFrameMetaTypeId = qRegisterMetaType<FBXAnimationFrame>();
-static int fbxAnimationFrameVectorMetaTypeId = qRegisterMetaType<QVector<FBXAnimationFrame> >();
+int fbxGeometryMetaTypeId = qRegisterMetaType<FBXGeometry>();
+int fbxAnimationFrameMetaTypeId = qRegisterMetaType<FBXAnimationFrame>();
+int fbxAnimationFrameVectorMetaTypeId = qRegisterMetaType<QVector<FBXAnimationFrame> >();
 
 
 glm::vec3 parseVec3(const QString& string) {

libraries/gl/src/gl/OffscreenQmlSurface.cpp

@@ -716,9 +716,9 @@ QQmlContext* OffscreenQmlSurface::getRootContext() {
 }
 
 Q_DECLARE_METATYPE(std::function<void()>);
-static auto VoidLambdaType = qRegisterMetaType<std::function<void()>>();
+auto VoidLambdaType = qRegisterMetaType<std::function<void()>>();
 Q_DECLARE_METATYPE(std::function<QVariant()>);
-static auto VariantLambdaType = qRegisterMetaType<std::function<QVariant()>>();
+auto VariantLambdaType = qRegisterMetaType<std::function<QVariant()>>();
 
 
 void OffscreenQmlSurface::executeOnUiThread(std::function<void()> function, bool blocking ) {

libraries/gpu-gl/src/gpu/gl/GLBackend.cpp

@@ -33,7 +33,7 @@ using namespace gpu::gl;
 
 
 static const QString DEBUG_FLAG("HIFI_ENABLE_OPENGL_45");
-static bool enableOpenGL45 = QProcessEnvironment::systemEnvironment().contains(DEBUG_FLAG);
+bool enableOpenGL45 = QProcessEnvironment::systemEnvironment().contains(DEBUG_FLAG);
 
 Backend* GLBackend::createBackend() {
 

libraries/gpu/src/gpu/Texture.cpp

@@ -22,7 +22,7 @@
 
 using namespace gpu;
 
-static int TexturePointerMetaTypeId = qRegisterMetaType<TexturePointer>();
+int TexturePointerMetaTypeId = qRegisterMetaType<TexturePointer>();
 
 std::atomic<uint32_t> Texture::_textureCPUCount{ 0 };
 std::atomic<Texture::Size> Texture::_textureCPUMemoryUsage{ 0 };

libraries/networking/src/HifiSockAddr.cpp

@@ -16,7 +16,7 @@
 #include "HifiSockAddr.h"
 #include "NetworkLogging.h"
 
-static int hifiSockAddrMetaTypeId = qRegisterMetaType<HifiSockAddr>();
+int hifiSockAddrMetaTypeId = qRegisterMetaType<HifiSockAddr>();
 
 HifiSockAddr::HifiSockAddr() :
     _address(),

libraries/networking/src/Node.cpp

@@ -22,9 +22,9 @@
 
 const QString UNKNOWN_NodeType_t_NAME = "Unknown";
 
-static int NodePtrMetaTypeId = qRegisterMetaType<Node*>("Node*");
-static int sharedPtrNodeMetaTypeId = qRegisterMetaType<QSharedPointer<Node>>("QSharedPointer<Node>");
-static int sharedNodePtrMetaTypeId = qRegisterMetaType<SharedNodePointer>("SharedNodePointer");
+int NodePtrMetaTypeId = qRegisterMetaType<Node*>("Node*");
+int sharedPtrNodeMetaTypeId = qRegisterMetaType<QSharedPointer<Node>>("QSharedPointer<Node>");
+int sharedNodePtrMetaTypeId = qRegisterMetaType<SharedNodePointer>("SharedNodePointer");
 
 namespace NodeType {
     QHash<NodeType_t, QString> TypeNameHash;

libraries/networking/src/ReceivedMessage.cpp

@@ -14,8 +14,8 @@
 
 #include "QSharedPointer"
 
-static int receivedMessageMetaTypeId = qRegisterMetaType<ReceivedMessage*>("ReceivedMessage*");
-static int sharedPtrReceivedMessageMetaTypeId = qRegisterMetaType<QSharedPointer<ReceivedMessage>>("QSharedPointer<ReceivedMessage>");
+int receivedMessageMetaTypeId = qRegisterMetaType<ReceivedMessage*>("ReceivedMessage*");
+int sharedPtrReceivedMessageMetaTypeId = qRegisterMetaType<QSharedPointer<ReceivedMessage>>("QSharedPointer<ReceivedMessage>");
 
 static const int HEAD_DATA_SIZE = 512;
 

libraries/networking/src/udt/Packet.cpp

@@ -19,7 +19,7 @@
 
 using namespace udt;
 
-static int packetMetaTypeId = qRegisterMetaType<Packet*>("Packet*");
+int packetMetaTypeId = qRegisterMetaType<Packet*>("Packet*");
 
 using Key = uint64_t;
 static const std::array<Key, 4> KEYS {{

libraries/networking/src/udt/PacketHeaders.cpp

@@ -18,7 +18,7 @@
 
 
 Q_DECLARE_METATYPE(PacketType);
-static int packetTypeMetaTypeId = qRegisterMetaType<PacketType>();
+int packetTypeMetaTypeId = qRegisterMetaType<PacketType>();
 
 const QSet<PacketType> NON_VERIFIED_PACKETS = QSet<PacketType>()
     << PacketType::NodeJsonStats << PacketType::EntityQuery

libraries/networking/src/udt/PacketList.cpp

@@ -15,7 +15,7 @@
 
 using namespace udt;
 
-static int packetListMetaTypeId = qRegisterMetaType<PacketList*>("PacketList*");
+int packetListMetaTypeId = qRegisterMetaType<PacketList*>("PacketList*");
 
 std::unique_ptr<PacketList> PacketList::create(PacketType packetType, QByteArray extendedHeader,
                                                bool isReliable, bool isOrdered) {

libraries/render-utils/src/Model.cpp

@@ -29,9 +29,9 @@
 
 using namespace std;
 
-static int nakedModelPointerTypeId = qRegisterMetaType<ModelPointer>();
-static int weakNetworkGeometryPointerTypeId = qRegisterMetaType<std::weak_ptr<NetworkGeometry> >();
-static int vec3VectorTypeId = qRegisterMetaType<QVector<glm::vec3> >();
+int nakedModelPointerTypeId = qRegisterMetaType<ModelPointer>();
+int weakNetworkGeometryPointerTypeId = qRegisterMetaType<std::weak_ptr<NetworkGeometry> >();
+int vec3VectorTypeId = qRegisterMetaType<QVector<glm::vec3> >();
 float Model::FAKE_DIMENSION_PLACEHOLDER = -1.0f;
 #define HTTP_INVALID_COM "http://invalid.com"
 

libraries/script-engine/src/ScriptEngine.cpp

@@ -65,7 +65,7 @@
 static const QString SCRIPT_EXCEPTION_FORMAT = "[UncaughtException] %1 in %2:%3";
 
 Q_DECLARE_METATYPE(QScriptEngine::FunctionSignature)
-static int functionSignatureMetaID = qRegisterMetaType<QScriptEngine::FunctionSignature>();
+int functionSignatureMetaID = qRegisterMetaType<QScriptEngine::FunctionSignature>();
 
 static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine){
     QString message = "";

libraries/shared/src/RegisteredMetaTypes.cpp

@@ -21,17 +21,17 @@
 
 #include "RegisteredMetaTypes.h"
 
-static int vec4MetaTypeId = qRegisterMetaType<glm::vec4>();
-static int vec3MetaTypeId = qRegisterMetaType<glm::vec3>();
-static int qVectorVec3MetaTypeId = qRegisterMetaType<QVector<glm::vec3>>();
-static int qVectorQuatMetaTypeId = qRegisterMetaType<QVector<glm::quat>>();
-static int qVectorBoolMetaTypeId = qRegisterMetaType<QVector<bool>>();
-static int vec2MetaTypeId = qRegisterMetaType<glm::vec2>();
-static int quatMetaTypeId = qRegisterMetaType<glm::quat>();
-static int xColorMetaTypeId = qRegisterMetaType<xColor>();
-static int pickRayMetaTypeId = qRegisterMetaType<PickRay>();
-static int collisionMetaTypeId = qRegisterMetaType<Collision>();
-static int qMapURLStringMetaTypeId = qRegisterMetaType<QMap<QUrl,QString>>();
+int vec4MetaTypeId = qRegisterMetaType<glm::vec4>();
+int vec3MetaTypeId = qRegisterMetaType<glm::vec3>();
+int qVectorVec3MetaTypeId = qRegisterMetaType<QVector<glm::vec3>>();
+int qVectorQuatMetaTypeId = qRegisterMetaType<QVector<glm::quat>>();
+int qVectorBoolMetaTypeId = qRegisterMetaType<QVector<bool>>();
+int vec2MetaTypeId = qRegisterMetaType<glm::vec2>();
+int quatMetaTypeId = qRegisterMetaType<glm::quat>();
+int xColorMetaTypeId = qRegisterMetaType<xColor>();
+int pickRayMetaTypeId = qRegisterMetaType<PickRay>();
+int collisionMetaTypeId = qRegisterMetaType<Collision>();
+int qMapURLStringMetaTypeId = qRegisterMetaType<QMap<QUrl,QString>>();
 
 void registerMetaTypes(QScriptEngine* engine) {
     qScriptRegisterMetaType(engine, mat4toScriptValue, mat4FromScriptValue);

libraries/shared/src/SimpleMovingAverage.h

@@ -57,7 +57,7 @@ public:
 
     void addSample(T sample) {
         if (numSamples > 0) {
-            average = (sample * WEIGHTING) + (average * ONE_MINUS_WEIGHTING);
+            average = ((float)sample * WEIGHTING) + ((float)average * ONE_MINUS_WEIGHTING);
         } else {
             average = sample;
         }

tests/render-utils/src/main.cpp

@@ -157,10 +157,6 @@ protected:
 //static const wchar_t* EXAMPLE_TEXT = L"\xC1y Hello 1.0\ny\xC1 line 2\n\xC1y";
 static const glm::uvec2 QUAD_OFFSET(10, 10);
 
-static const glm::vec3 COLORS[4] = { { 1.0, 1.0, 1.0 }, { 0.5, 1.0, 0.5 }, {
-        1.0, 0.5, 0.5 }, { 0.5, 0.5, 1.0 } };
-
-
 void testShaderBuild(const char* vs_src, const char * fs_src) {
     auto vs = gpu::Shader::createVertex(std::string(vs_src));
     auto fs = gpu::Shader::createPixel(std::string(fs_src));