Fix clang 'overloaded-virtual' warnings.
This patch fixes the warning like the following:
../../src/animator/SkPaintParts.h:26:18: warning: 'SkPaintPart::add' hides overloaded virtual function [-Woverloaded-virtual]
virtual bool add() = 0;
^
../../src/animator/SkDisplayable.h:35:18: note: hidden overloaded virtual function 'SkDisplayable::add' declared here
virtual bool add(SkAnimateMaker& , SkDisplayable* child);
^
R=robertphillips@google.com,
Review URL: https://codereview.appspot.com/6843134
git-svn-id: http://skia.googlecode.com/svn/trunk@6642 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/animator/SkDisplayEvent.cpp b/src/animator/SkDisplayEvent.cpp
index 303e42c..52c874b 100644
--- a/src/animator/SkDisplayEvent.cpp
+++ b/src/animator/SkDisplayEvent.cpp
@@ -52,7 +52,7 @@
deleteMembers();
}
-bool SkDisplayEvent::add(SkAnimateMaker& , SkDisplayable* child) {
+bool SkDisplayEvent::addChild(SkAnimateMaker& , SkDisplayable* child) {
*fChildren.append() = child;
return true;
}
diff --git a/src/animator/SkDisplayEvent.h b/src/animator/SkDisplayEvent.h
index ef8ec68..5701da2 100644
--- a/src/animator/SkDisplayEvent.h
+++ b/src/animator/SkDisplayEvent.h
@@ -34,7 +34,7 @@
};
SkDisplayEvent();
virtual ~SkDisplayEvent();
- virtual bool add(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
+ virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
virtual bool contains(SkDisplayable*);
virtual SkDisplayable* contains(const SkString& );
#ifdef SK_DEBUG
diff --git a/src/animator/SkDisplayPost.cpp b/src/animator/SkDisplayPost.cpp
index 3c9fa19..a50d5cc 100644
--- a/src/animator/SkDisplayPost.cpp
+++ b/src/animator/SkDisplayPost.cpp
@@ -47,7 +47,7 @@
delete *part;
}
-bool SkPost::add(SkAnimateMaker& , SkDisplayable* child) {
+bool SkPost::addChild(SkAnimateMaker& , SkDisplayable* child) {
SkASSERT(child && child->isDataInput());
SkDataInput* part = (SkDataInput*) child;
*fParts.append() = part;
diff --git a/src/animator/SkDisplayPost.h b/src/animator/SkDisplayPost.h
index 57ae31c..cd22306 100644
--- a/src/animator/SkDisplayPost.h
+++ b/src/animator/SkDisplayPost.h
@@ -27,7 +27,7 @@
};
SkPost();
virtual ~SkPost();
- virtual bool add(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
+ virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
virtual bool childrenNeedDisposing() const;
virtual void dirty();
#ifdef SK_DUMP_ENABLED
diff --git a/src/animator/SkDisplayXMLParser.cpp b/src/animator/SkDisplayXMLParser.cpp
index 31be3da..515d33c 100644
--- a/src/animator/SkDisplayXMLParser.cpp
+++ b/src/animator/SkDisplayXMLParser.cpp
@@ -176,7 +176,7 @@
return true;
if (parentIndex > 0) {
SkDisplayable* parent = fParents[parentIndex - 1].fDisplayable;
- bool result = parent->add(fMaker, displayable);
+ bool result = parent->addChild(fMaker, displayable);
if (fMaker.hasError())
return true;
if (result == false) {
diff --git a/src/animator/SkDisplayable.cpp b/src/animator/SkDisplayable.cpp
index 753764b..ed2c626 100644
--- a/src/animator/SkDisplayable.cpp
+++ b/src/animator/SkDisplayable.cpp
@@ -39,7 +39,7 @@
#endif
}
-bool SkDisplayable::add(SkAnimateMaker& , SkDisplayable* child) {
+bool SkDisplayable::addChild(SkAnimateMaker& , SkDisplayable* child) {
return false;
}
diff --git a/src/animator/SkDisplayable.h b/src/animator/SkDisplayable.h
index 5fc2d3e..4fd47ab 100644
--- a/src/animator/SkDisplayable.h
+++ b/src/animator/SkDisplayable.h
@@ -32,7 +32,7 @@
SkDisplayable();
#endif
virtual ~SkDisplayable();
- virtual bool add(SkAnimateMaker& , SkDisplayable* child);
+ virtual bool addChild(SkAnimateMaker& , SkDisplayable* child);
virtual bool canContainDependents() const;
virtual bool childrenNeedDisposing() const;
virtual void clearBounder();
diff --git a/src/animator/SkDrawExtraPathEffect.cpp b/src/animator/SkDrawExtraPathEffect.cpp
index 65d9cba..ef6ef28 100644
--- a/src/animator/SkDrawExtraPathEffect.cpp
+++ b/src/animator/SkDrawExtraPathEffect.cpp
@@ -22,7 +22,7 @@
DECLARE_PRIVATE_MEMBER_INFO(DrawShapePathEffect);
SkDrawShapePathEffect();
virtual ~SkDrawShapePathEffect();
- virtual bool add(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE;
+ virtual bool addChild(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE;
virtual SkPathEffect* getPathEffect();
protected:
SkDrawable* addPath;
@@ -60,7 +60,7 @@
DECLARE_EXTRAS_MEMBER_INFO(SkDrawComposePathEffect);
SkDrawComposePathEffect(SkDisplayTypes );
virtual ~SkDrawComposePathEffect();
- virtual bool add(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE;
+ virtual bool addChild(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE;
virtual SkPathEffect* getPathEffect();
virtual bool isPaint() const;
private:
@@ -184,7 +184,7 @@
SkSafeUnref(fPathEffect);
}
-bool SkDrawShapePathEffect::add(SkAnimateMaker& , SkDisplayable* child) {
+bool SkDrawShapePathEffect::addChild(SkAnimateMaker& , SkDisplayable* child) {
path = (SkDrawPath*) child;
return true;
}
@@ -354,7 +354,7 @@
delete effect2;
}
-bool SkDrawComposePathEffect::add(SkAnimateMaker& , SkDisplayable* child) {
+bool SkDrawComposePathEffect::addChild(SkAnimateMaker& , SkDisplayable* child) {
if (effect1 == NULL)
effect1 = (SkDrawPathEffect*) child;
else
diff --git a/src/animator/SkDrawGradient.cpp b/src/animator/SkDrawGradient.cpp
index 2e751ca..44086e4 100644
--- a/src/animator/SkDrawGradient.cpp
+++ b/src/animator/SkDrawGradient.cpp
@@ -84,7 +84,7 @@
delete fUnitMapper;
}
-bool SkDrawGradient::add(SkAnimateMaker& , SkDisplayable* child) {
+bool SkDrawGradient::addChild(SkAnimateMaker& , SkDisplayable* child) {
SkASSERT(child);
if (child->isColor()) {
SkDrawColor* color = (SkDrawColor*) child;
diff --git a/src/animator/SkDrawGradient.h b/src/animator/SkDrawGradient.h
index d7fc694..7763c1f 100644
--- a/src/animator/SkDrawGradient.h
+++ b/src/animator/SkDrawGradient.h
@@ -20,7 +20,7 @@
DECLARE_PRIVATE_MEMBER_INFO(DrawGradient);
SkDrawGradient();
virtual ~SkDrawGradient();
- virtual bool add(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
+ virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
#ifdef SK_DUMP_ENABLED
virtual void dumpRest(SkAnimateMaker*);
#endif
diff --git a/src/animator/SkDrawGroup.cpp b/src/animator/SkDrawGroup.cpp
index 806da5e..ddd23d3 100644
--- a/src/animator/SkDrawGroup.cpp
+++ b/src/animator/SkDrawGroup.cpp
@@ -49,7 +49,7 @@
}
}
-bool SkGroup::add(SkAnimateMaker& , SkDisplayable* child) {
+bool SkGroup::addChild(SkAnimateMaker& , SkDisplayable* child) {
SkASSERT(child);
// SkASSERT(child->isDrawable());
*fChildren.append() = (SkDrawable*) child;
@@ -86,7 +86,7 @@
for (SkDrawable** ptr = fChildren.begin(); ptr < fChildren.end(); ptr++) {
SkDisplayable* displayable = (SkDisplayable*)*ptr;
SkDisplayable* deeperCopy = displayable->deepCopy(maker);
- ((SkGroup*)copy)->add(*maker, deeperCopy);
+ ((SkGroup*)copy)->addChild(*maker, deeperCopy);
}
return copy;
}
diff --git a/src/animator/SkDrawGroup.h b/src/animator/SkDrawGroup.h
index a63a50e..336040c 100644
--- a/src/animator/SkDrawGroup.h
+++ b/src/animator/SkDrawGroup.h
@@ -19,7 +19,7 @@
DECLARE_MEMBER_INFO(Group);
SkGroup();
virtual ~SkGroup();
- virtual bool add(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
+ virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
virtual bool contains(SkDisplayable* );
SkGroup* copy();
SkBool copySet(int index);
diff --git a/src/animator/SkDrawMatrix.cpp b/src/animator/SkDrawMatrix.cpp
index 1d7b3e0..62507ea 100644
--- a/src/animator/SkDrawMatrix.cpp
+++ b/src/animator/SkDrawMatrix.cpp
@@ -61,7 +61,7 @@
delete *part;
}
-bool SkDrawMatrix::add(SkAnimateMaker& maker, SkDisplayable* child) {
+bool SkDrawMatrix::addChild(SkAnimateMaker& maker, SkDisplayable* child) {
SkASSERT(child && child->isMatrixPart());
SkMatrixPart* part = (SkMatrixPart*) child;
*fParts.append() = part;
diff --git a/src/animator/SkDrawMatrix.h b/src/animator/SkDrawMatrix.h
index cb781e7..e3c389a 100644
--- a/src/animator/SkDrawMatrix.h
+++ b/src/animator/SkDrawMatrix.h
@@ -21,7 +21,7 @@
DECLARE_DRAW_MEMBER_INFO(Matrix);
SkDrawMatrix();
virtual ~SkDrawMatrix();
- virtual bool add(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
+ virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
virtual bool childrenNeedDisposing() const;
virtual void dirty();
virtual bool draw(SkAnimateMaker& );
diff --git a/src/animator/SkDrawPath.cpp b/src/animator/SkDrawPath.cpp
index 858db54..aaeeb0b 100644
--- a/src/animator/SkDrawPath.cpp
+++ b/src/animator/SkDrawPath.cpp
@@ -45,7 +45,7 @@
delete *part;
}
-bool SkDrawPath::add(SkAnimateMaker& maker, SkDisplayable* child) {
+bool SkDrawPath::addChild(SkAnimateMaker& maker, SkDisplayable* child) {
SkASSERT(child && child->isPathPart());
SkPathPart* part = (SkPathPart*) child;
*fParts.append() = part;
@@ -188,7 +188,7 @@
DEFINE_GET_MEMBER(SkPolyline);
-bool SkPolyline::add(SkAnimateMaker& , SkDisplayable*) {
+bool SkPolyline::addChild(SkAnimateMaker& , SkDisplayable*) {
return false;
}
diff --git a/src/animator/SkDrawPath.h b/src/animator/SkDrawPath.h
index 76e2e7e..9c4d305 100644
--- a/src/animator/SkDrawPath.h
+++ b/src/animator/SkDrawPath.h
@@ -19,7 +19,7 @@
DECLARE_DRAW_MEMBER_INFO(Path);
SkDrawPath();
virtual ~SkDrawPath();
- virtual bool add(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
+ virtual bool addChild(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
bool childHasID() { return SkToBool(fChildHasID); }
virtual bool childrenNeedDisposing() const;
virtual void dirty();
@@ -51,7 +51,7 @@
class SkPolyline : public SkDrawPath {
DECLARE_MEMBER_INFO(Polyline);
- virtual bool add(SkAnimateMaker& , SkDisplayable*) SK_OVERRIDE;
+ virtual bool addChild(SkAnimateMaker& , SkDisplayable*) SK_OVERRIDE;
virtual void onEndElement(SkAnimateMaker& );
protected:
SkTDScalarArray points;