startsWith() should be used to avoid bugs like: s.mid(0, 4) == "Foo".

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

diff --git a/mpc/mpcproperties.cpp b/mpc/mpcproperties.cpp
index fb61b244d072c8aa630b7777db7cdcada9ce6130..029de5b7b2d4eeeae5edc2b07d77d41c9910ec77 100644 (file)
--- a/mpc/mpcproperties.cpp
+++ b/mpc/mpcproperties.cpp
@@ -106,7 +106,7 @@ static const unsigned short sftable [4] = { 44100, 48000, 37800, 32000 };
 
 void MPC::Properties::read()
 {
-  if(d->data.mid(0, 3) != "MP+")
+  if(!d->data.startsWith("MP+"))
     return;
 
   d->version = d->data[3] & 15;

diff --git a/mpeg/id3v1/id3v1tag.cpp b/mpeg/id3v1/id3v1tag.cpp
index 624f56b891b66657ef275900b0a3b9f124f86624..b8777b90e54edc9e964a2e0ac4842c8ae79acb8b 100644 (file)
--- a/mpeg/id3v1/id3v1tag.cpp
+++ b/mpeg/id3v1/id3v1tag.cpp
@@ -196,7 +196,7 @@ void ID3v1::Tag::read()
     ByteVector data = d->file->readBlock(128);
 
     // some initial sanity checking
-    if(data.size() == 128 && data.mid(0, 3) == "TAG")
+    if(data.size() == 128 && data.startsWith("TAG"))
       parse(data);
     else
       debug("ID3v1 tag is not valid or could not be read at the specified offset.");

diff --git a/mpeg/xingheader.cpp b/mpeg/xingheader.cpp
index 5a09363552684ce25f6359ebebe2d8888d4b3acf..bd251dbb288951ae8e777f336a137da3c189003f 100644 (file)
--- a/mpeg/xingheader.cpp
+++ b/mpeg/xingheader.cpp
@@ -88,7 +88,7 @@ void MPEG::XingHeader::parse(const ByteVector &data)
 {
   // Check to see if a valid Xing header is available.
 
-  if(data.mid(0, 4) != "Xing")
+  if(!data.startsWith("Xing"))
     return;
 
   // If the XingHeader doesn't contain the number of frames and the total stream

diff --git a/ogg/oggpageheader.cpp b/ogg/oggpageheader.cpp
index 40fe92dcacf870e52ff018dc365dba2a4370e9e1..7da708a8b681d95e70b71746872dfe99ac5e76d1 100644 (file)
--- a/ogg/oggpageheader.cpp
+++ b/ogg/oggpageheader.cpp
@@ -238,7 +238,7 @@ void Ogg::PageHeader::read()
   // Sanity check -- make sure that we were in fact able to read as much data as
   // we asked for and that the page begins with "OggS".
 
-  if(data.size() != 27 || data.mid(0, 4) != "OggS") {
+  if(data.size() != 27 || !data.startsWith("OggS")) {
     debug("Ogg::PageHeader::read() -- error reading page header");
     return;
   }