Clean up

Removed extra semicolon and resolved some compiler warnings

diff --git a/3rdparty/miniz/miniz.c b/3rdparty/miniz/miniz.c
index ee0ac99..4805823 100644 (file)
--- a/3rdparty/miniz/miniz.c
+++ b/3rdparty/miniz/miniz.c
@@ -750,11 +750,11 @@ typedef struct
   mz_int16 m_look_up[TINFL_FAST_LOOKUP_SIZE], m_tree[TINFL_MAX_HUFF_SYMBOLS_0 * 2];\r
 } tinfl_huff_table;\r
 \r
   mz_int16 m_look_up[TINFL_FAST_LOOKUP_SIZE], m_tree[TINFL_MAX_HUFF_SYMBOLS_0 * 2];\r
 } tinfl_huff_table;\r
 \r

-#if MINIZ_HAS_64BIT_REGISTERS\r
+#if defined MINIZ_HAS_64BIT_REGISTERS && MINIZ_HAS_64BIT_REGISTERS\r

   #define TINFL_USE_64BIT_BITBUF 1\r
 #endif\r
 \r
   #define TINFL_USE_64BIT_BITBUF 1\r
 #endif\r
 \r

-#if TINFL_USE_64BIT_BITBUF\r
+#if defined TINFL_USE_64BIT_BITBUF && TINFL_USE_64BIT_BITBUF\r

   typedef mz_uint64 tinfl_bit_buf_t;\r
   #define TINFL_BITBUF_SIZE (64)\r
 #else\r
   typedef mz_uint64 tinfl_bit_buf_t;\r
   #define TINFL_BITBUF_SIZE (64)\r
 #else\r

diff --git a/src/common/syncableobject.h b/src/common/syncableobject.h
index 08bd2e3..1275cc3 100644 (file)
--- a/src/common/syncableobject.h
+++ b/src/common/syncableobject.h
@@ -76,7 +76,7 @@ public:
 
     virtual bool isInitialized() const;
 
 
     virtual bool isInitialized() const;
 

-    virtual const QMetaObject *syncMetaObject() const { return metaObject(); };
+    virtual const QMetaObject *syncMetaObject() const { return metaObject(); }

 
     inline void setAllowClientUpdates(bool allow) { _allowClientUpdates = allow; }
     inline bool allowClientUpdates() const { return _allowClientUpdates; }
 
     inline void setAllowClientUpdates(bool allow) { _allowClientUpdates = allow; }
     inline bool allowClientUpdates() const { return _allowClientUpdates; }