fix warnings

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@892447 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp
index 59da5192eb8b25b743e17e1ffc355563bfe93e57..766797764ab025c66c8ee6d1fc228bb7529ef67e 100644 (file)
--- a/taglib/toolkit/tbytevector.cpp
+++ b/taglib/toolkit/tbytevector.cpp
@@ -147,12 +147,12 @@ namespace TagLib {
   public:
     ByteVectorMirror(const ByteVector &source) : v(source) {}
 
-    const char operator[](int index) const
+    char operator[](int index) const
     {
       return v[v.size() - index - 1];
     }
 
-    const char at(int index) const
+    char at(int index) const
     {
       return v.at(v.size() - index - 1);
     }

diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
index f209d726861bff1c537f408f7d0447d0aa500141..79b564fa61f58b7f52e876967bec2d08dea1d320 100644 (file)
--- a/taglib/toolkit/tstring.cpp
+++ b/taglib/toolkit/tstring.cpp
@@ -35,7 +35,7 @@ namespace TagLib {
 
   inline unsigned short byteSwap(unsigned short x)
   {
-    return ((x) >> 8) & 0xff | ((x) & 0xff) << 8;
+    return (((x) >> 8) & 0xff) | (((x) & 0xff) << 8);
   }
 
   inline unsigned short combine(unsigned char c1, unsigned char c2)