From e989d7ad1d266391ccb14c80f3d754a4f81c3476 Mon Sep 17 00:00:00 2001
From: Scott Wheeler <wheeler@kde.org>
Date: Thu, 4 Dec 2008 12:37:36 +0000
Subject: [PATCH] fix warnings

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@892447 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 taglib/toolkit/tbytevector.cpp | 4 ++--
 taglib/toolkit/tstring.cpp     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp
index 59da5192..76679776 100644
--- 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 f209d726..79b564fa 100644
--- 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)