Clean up base/Version

base/version.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/version.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
-#include "base/utf_string_conversions.h"
 
-Version::Version() : is_valid_(false) {}
+Version::Version() {
+}
 
-Version::~Version() {}
+Version::Version(const std::string& version_str) {
+  InitFromString(version_str);
+}
 
-// static
+// TODO: remove this method.

[Evan Martin, 2011/06/06 23:35:13]

TODO(cpu) or file a bug :)

 Version* Version::GetVersionFromString(const std::string& version_str) {
   Version* vers = new Version();
   if (vers->InitFromString(version_str)) {
-    DCHECK(vers->is_valid_);
+    DCHECK(vers->IsValid());
     return vers;
   }
   delete vers;
   return NULL;
 }
 
+// TODO: remove this method.
 Version* Version::Clone() const {
-  DCHECK(is_valid_);
-  Version* copy = new Version();
-  copy->components_ = components_;
-  copy->is_valid_ = true;
-  return copy;
+  DCHECK(IsValid());
+  return new Version(*this);
+}
+
+bool Version::IsValid() const {
+  return (!components_.empty());
 }
 
 bool Version::Equals(const Version& that) const {
-  DCHECK(is_valid_);
-  DCHECK(that.is_valid_);
-  return CompareTo(that) == 0;
+  DCHECK(IsValid());
+  DCHECK(that.IsValid());
+  return (CompareTo(that) == 0);
 }
 
 int Version::CompareTo(const Version& other) const {
-  DCHECK(is_valid_);
-  DCHECK(other.is_valid_);
+  DCHECK(IsValid());
+  DCHECK(other.IsValid());
   size_t count = std::min(components_.size(), other.components_.size());
   for (size_t i = 0; i < count; ++i) {
     if (components_[i] > other.components_[i])
       return 1;
     if (components_[i] < other.components_[i])
       return -1;
   }
   if (components_.size() > other.components_.size()) {
     for (size_t i = count; i < components_.size(); ++i)
       if (components_[i] > 0)
         return 1;
   } else if (components_.size() < other.components_.size()) {
     for (size_t i = count; i < other.components_.size(); ++i)
       if (other.components_[i] > 0)
         return -1;
   }
   return 0;
 }
 
 const std::string Version::GetString() const {
-  DCHECK(is_valid_);
+  DCHECK(IsValid());
   std::string version_str;
   size_t count = components_.size();
   for (size_t i = 0; i < count - 1; ++i) {
     version_str.append(base::IntToString(components_[i]));
     version_str.append(".");
   }
   version_str.append(base::IntToString(components_[count - 1]));
   return version_str;
 }
 
 bool Version::InitFromString(const std::string& version_str) {
-  DCHECK(!is_valid_);
   std::vector<std::string> numbers;
   base::SplitString(version_str, '.', &numbers);
   if (numbers.empty())
     return false;
   for (std::vector<std::string>::iterator i = numbers.begin();
        i != numbers.end(); ++i) {
     int num;
     if (!base::StringToInt(*i, &num))
       return false;
     if (num < 0)
       return false;
     const uint16 max = 0xFFFF;
     if (num > max)
       return false;
     // This throws out things like +3, or 032.
     if (base::IntToString(num) != *i)
       return false;
     uint16 component = static_cast<uint16>(num);
     components_.push_back(component);
   }
-  is_valid_ = true;
   return true;
 }