From 387890d956a0925c8d673bcf7a79f2e313cc39be Mon Sep 17 00:00:00 2001
From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
Date: Sat, 16 Aug 2014 15:33:39 +0900
Subject: [PATCH] Small fixes in line breaking.

---
 taglib/toolkit/tbytevector.cpp | 11 ++++-------
 taglib/toolkit/tstring.cpp     | 14 +++++---------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp
index 3404ab39..5c5221f5 100644
--- a/taglib/toolkit/tbytevector.cpp
+++ b/taglib/toolkit/tbytevector.cpp
@@ -161,15 +161,12 @@ int findVector(
     lastOccurrence[static_cast<uchar>(*(patternBegin + i))] = patternSize - i - 1;
 
   TIterator it = dataBegin + patternSize - 1 + offset;
-  while(true)
-  {
+  while(true) {
     TIterator itBuffer = it;
     TIterator itPattern = patternBegin + patternSize - 1;
 
-    while(*itBuffer == *itPattern)
-    {
-      if(itPattern == patternBegin)
-      {
+    while(*itBuffer == *itPattern) {
+      if(itPattern == patternBegin) {
         if((itBuffer - dataBegin - offset) % byteAlign == 0)
           return (itBuffer - dataBegin);
         else
@@ -243,7 +240,7 @@ ByteVector fromNumber(T value, bool mostSignificantByteFirst)
 template <typename TFloat, typename TInt, Utils::ByteOrder ENDIAN>
 TFloat toFloat(const ByteVector &v, size_t offset)
 {
-  if (offset > v.size() - sizeof(TInt)) {
+  if(offset > v.size() - sizeof(TInt)) {
     debug("toFloat() - offset is out of range. Returning 0.");
     return 0.0;
   }
diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
index 5577feef..c51a25d6 100644
--- a/taglib/toolkit/tstring.cpp
+++ b/taglib/toolkit/tstring.cpp
@@ -347,16 +347,13 @@ int String::rfind(const String &s, int offset) const
 StringList String::split(const String &separator) const
 {
   StringList list;
-  for(int index = 0;;)
-  {
+  for(int index = 0;;) {
     int sep = find(separator, index);
-    if(sep < 0)
-    {
+    if(sep < 0) {
       list.append(substr(index, size() - index));
       break;
     }
-    else
-    {
+    else {
       list.append(substr(index, sep - index));
       index = sep + separator.size();
     }
@@ -619,8 +616,7 @@ bool String::operator==(const char *s) const
 {
   const wchar_t *p = toCWString();
 
-  while(*p != L'\0' || *s != '\0')
-  {
+  while(*p != L'\0' || *s != '\0') {
     if(*p++ != static_cast<uchar>(*s++))
       return false;
   }
@@ -634,7 +630,7 @@ bool String::operator!=(const char *s) const
 
 bool String::operator==(const wchar_t *s) const
 {
-  return (::wcscmp(toCWString(), s) == 0);
+  return (d->data == s);
 }
 
 bool String::operator!=(const wchar_t *s) const