have == always return bool, never int

git-svn-id: http://skia.googlecode.com/svn/trunk@1915 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 4e8365192772af6c0e98445f678f8a641c24a2bc..4cc75f7005f213d8fe598c71984e06c1fd063c04 100644 (file)
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -56,8 +56,8 @@ public:
 
     SkPaint& operator=(const SkPaint&);
 
-    SK_API friend int operator==(const SkPaint& a, const SkPaint& b);
-    friend int operator!=(const SkPaint& a, const SkPaint& b) {
+    SK_API friend bool operator==(const SkPaint& a, const SkPaint& b);
+    friend bool operator!=(const SkPaint& a, const SkPaint& b) {
         return !(a == b);
     }
 

diff --git a/include/core/SkRect.h b/include/core/SkRect.h
index 19ee12a59690a596a92148a1d95829a0d511103b..e57130a4581de0f3e08ab3656bebdc54f1a42a21 100644 (file)
--- a/include/core/SkRect.h
+++ b/include/core/SkRect.h
@@ -71,12 +71,12 @@ struct SK_API SkIRect {
     */
     int height() const { return fBottom - fTop; }
 
-    friend int operator==(const SkIRect& a, const SkIRect& b) {
+    friend bool operator==(const SkIRect& a, const SkIRect& b) {
         return !memcmp(&a, &b, sizeof(a));
     }
 
-    friend int operator!=(const SkIRect& a, const SkIRect& b) {
-        return memcmp(&a, &b, sizeof(a));
+    friend bool operator!=(const SkIRect& a, const SkIRect& b) {
+        return !(a == b);
     }
 
     bool is16Bit() const {

diff --git a/include/core/SkString.h b/include/core/SkString.h
index abfdd24ca52e88e089d7fe0a17dfe32413d7e60e..cb2ea5d809a496a6685568c0349c6c3620727d7e 100644 (file)
--- a/include/core/SkString.h
+++ b/include/core/SkString.h
@@ -89,19 +89,19 @@ public:
         return SkStrEndsWith(fRec->data(), suffix);
     }
 
-    friend int operator==(const SkString& a, const SkString& b) {
+    friend bool operator==(const SkString& a, const SkString& b) {
         return a.equals(b);
     }
-    friend int operator!=(const SkString& a, const SkString& b) {
+    friend bool operator!=(const SkString& a, const SkString& b) {
         return !a.equals(b);
     }
 
     // these methods edit the string
 
-    SkString&   operator=(const SkString&);
-    SkString&   operator=(const char text[]);
+    SkString& operator=(const SkString&);
+    SkString& operator=(const char text[]);
 
-    char*   writable_str();
+    char* writable_str();
     char& operator[](size_t n) { return this->writable_str()[n]; }
 
     void reset();

diff --git a/include/core/SkTDArray.h b/include/core/SkTDArray.h
index c64d773b077628da04a2763194dcd1a89b6120e5..d5795634c31166c4fd9695ee0fdb0daeda21b3f3 100644 (file)
--- a/include/core/SkTDArray.h
+++ b/include/core/SkTDArray.h
@@ -71,7 +71,7 @@ public:
         return *this;
     }
 
-    friend int operator==(const SkTDArray<T>& a, const SkTDArray<T>& b) {
+    friend bool operator==(const SkTDArray<T>& a, const SkTDArray<T>& b) {
         return  a.fCount == b.fCount &&
                 (a.fCount == 0 ||
                  !memcmp(a.fArray, b.fArray, a.fCount * sizeof(T)));

diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index dbb8ecaad8def16a914c10a4038d383eb1782499..d39a65044abd7f8c086e513257e536f0ae2618a1 100644 (file)
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -138,8 +138,8 @@ SkPaint& SkPaint::operator=(const SkPaint& src) {
     return *this;
 }
 
-int operator==(const SkPaint& a, const SkPaint& b) {
-    return memcmp(&a, &b, sizeof(a)) == 0;
+bool operator==(const SkPaint& a, const SkPaint& b) {
+    return !memcmp(&a, &b, sizeof(a));
 }
 
 void SkPaint::reset() {