From: dooglus Date: Wed, 13 Feb 2008 01:57:55 +0000 (+0000) Subject: Write "operator()" instead of "operator ()", "operator&" instead of "operator &"... X-Git-Url: https://git.pterodactylus.net/?p=synfig.git;a=commitdiff_plain;h=d15c4522466bedfbe61620c401becae0931854f5 Write "operator()" instead of "operator ()", "operator&" instead of "operator &", etc., to make them easier to search for. Previously both forms were used. git-svn-id: http://svn.voria.com/code@1684 1f10aa63-cdf2-0310-b900-c93c546f37ac --- diff --git a/ETL/trunk/ETL/_handle.h b/ETL/trunk/ETL/_handle.h index 50d0da1..3f07503 100644 --- a/ETL/trunk/ETL/_handle.h +++ b/ETL/trunk/ETL/_handle.h @@ -362,8 +362,8 @@ public: using handle::unique; using handle::operator bool; using handle::get; - using handle::operator *; - using handle::operator ->; + using handle::operator*; + using handle::operator->; /* operator const handle&()const diff --git a/synfig-core/trunk/src/synfig/blur.cpp b/synfig-core/trunk/src/synfig/blur.cpp index 4fff029..392ef71 100644 --- a/synfig-core/trunk/src/synfig/blur.cpp +++ b/synfig-core/trunk/src/synfig/blur.cpp @@ -56,7 +56,7 @@ using namespace synfig; /* === P R O C E D U R E S ================================================= */ /* === M E T H O D S ======================================================= */ -Point Blur::operator ()(const Point &pos) const +Point Blur::operator()(const Point &pos) const { Point blurpos(pos); @@ -114,7 +114,7 @@ Point Blur::operator ()(const Point &pos) const return blurpos; } -Point Blur::operator ()(synfig::Real x, synfig::Real y) const +Point Blur::operator()(synfig::Real x, synfig::Real y) const { return (*this)(Point(x,y)); } @@ -449,9 +449,9 @@ static void GuassianBlur_1x3(etl::surface &surface) } //THE GOOD ONE!!!!!!!!! -bool Blur::operator ()(const Surface &surface, - const Vector &resolution, - Surface &out) const +bool Blur::operator()(const Surface &surface, + const Vector &resolution, + Surface &out) const { int w = surface.get_w(), h = surface.get_h(); @@ -846,9 +846,9 @@ bool Blur::operator ()(const Surface &surface, return true; } -bool Blur::operator ()(const etl::surface &surface, - const synfig::Vector &resolution, - etl::surface &out) const +bool Blur::operator()(const etl::surface &surface, + const synfig::Vector &resolution, + etl::surface &out) const { int w = surface.get_w(), h = surface.get_h(); diff --git a/synfig-core/trunk/src/synfig/blur.h b/synfig-core/trunk/src/synfig/blur.h index 25eef82..5d1c801 100644 --- a/synfig-core/trunk/src/synfig/blur.h +++ b/synfig-core/trunk/src/synfig/blur.h @@ -73,16 +73,16 @@ public: Blur(synfig::Real sx, synfig::Real sy, int t, synfig::ProgressCallback *callb = 0): size(sx,sy), type(t), cb(callb) {} //Parametric Blur - synfig::Point operator ()(const synfig::Point &p) const; - synfig::Point operator ()(synfig::Real x, synfig::Real y) const; + synfig::Point operator()(const synfig::Point &p) const; + synfig::Point operator()(synfig::Real x, synfig::Real y) const; //Surface based blur // input surface can be the same as output surface, // though both have to be the same size - bool operator ()(const synfig::Surface &surface, const synfig::Vector &resolution, synfig::Surface &out) const; + bool operator()(const synfig::Surface &surface, const synfig::Vector &resolution, synfig::Surface &out) const; - bool operator ()(const etl::surface &surface, const synfig::Vector &resolution, etl::surface &out) const; - //bool operator ()(const etl::surface &surface, const synfig::Vector &resolution, etl::surface &out) const; + bool operator()(const etl::surface &surface, const synfig::Vector &resolution, etl::surface &out) const; + //bool operator()(const etl::surface &surface, const synfig::Vector &resolution, etl::surface &out) const; }; /* === E N D =============================================================== */ diff --git a/synfig-core/trunk/src/synfig/curveset.cpp b/synfig-core/trunk/src/synfig/curveset.cpp index fc02b1c..e8bd7fa 100644 --- a/synfig-core/trunk/src/synfig/curveset.cpp +++ b/synfig-core/trunk/src/synfig/curveset.cpp @@ -104,7 +104,7 @@ struct ipoint }else return curveindex < rhs.curveindex; } - bool operator >(const ipoint &rhs) const + bool operator>(const ipoint &rhs) const { return rhs < *this; } @@ -446,17 +446,17 @@ void CurveSet::CleanUp(int /*curve*/) - only works with odd-even rule */ -CurveSet CurveSet::operator &(const CurveSet &/*rhs*/) const +CurveSet CurveSet::operator&(const CurveSet &/*rhs*/) const { return *this; } -CurveSet CurveSet::operator |(const CurveSet &/*rhs*/) const +CurveSet CurveSet::operator|(const CurveSet &/*rhs*/) const { return *this; } -CurveSet CurveSet::operator -(const CurveSet &/*rhs*/) const +CurveSet CurveSet::operator-(const CurveSet &/*rhs*/) const { return *this; } diff --git a/synfig-core/trunk/src/synfig/curveset.h b/synfig-core/trunk/src/synfig/curveset.h index ed867f5..a34976a 100644 --- a/synfig-core/trunk/src/synfig/curveset.h +++ b/synfig-core/trunk/src/synfig/curveset.h @@ -77,9 +77,9 @@ public: CleanUp(invert); } - CurveSet operator &(const CurveSet &rhs) const; //intersect - CurveSet operator |(const CurveSet &rhs) const; //union - CurveSet operator -(const CurveSet &rhs) const; //subtract + CurveSet operator&(const CurveSet &rhs) const; //intersect + CurveSet operator|(const CurveSet &rhs) const; //union + CurveSet operator-(const CurveSet &rhs) const; //subtract //Point containment diff --git a/synfig-core/trunk/src/synfig/layer_shape.cpp b/synfig-core/trunk/src/synfig/layer_shape.cpp index 539d715..e8f13a5 100644 --- a/synfig-core/trunk/src/synfig/layer_shape.cpp +++ b/synfig-core/trunk/src/synfig/layer_shape.cpp @@ -947,7 +947,7 @@ struct PenMark void setcover(Real c, Real a) { cover = c; area = a; } void addcover(Real c, Real a) { cover += c; area += a; } - bool operator < (const PenMark &rhs) const + bool operator<(const PenMark &rhs) const { return y == rhs.y ? x < rhs.x : y < rhs.y; } diff --git a/synfig-studio/trunk/src/synfigapp/blineconvert.cpp b/synfig-studio/trunk/src/synfigapp/blineconvert.cpp index 0d09467..957e667 100644 --- a/synfig-studio/trunk/src/synfigapp/blineconvert.cpp +++ b/synfig-studio/trunk/src/synfigapp/blineconvert.cpp @@ -390,7 +390,7 @@ synfigapp::BLineConverter::clear() } void -synfigapp::BLineConverter::operator () (std::list &out, const std::list &in,const std::list &in_w) +synfigapp::BLineConverter::operator()(std::list &out, const std::list &in,const std::list &in_w) { //Profiling information /*etl::clock::value_type initialprocess=0, curveval=0, breakeval=0, disteval=0; diff --git a/synfig-studio/trunk/src/synfigapp/blineconvert.h b/synfig-studio/trunk/src/synfigapp/blineconvert.h index c6f6fbd..74c98d4 100644 --- a/synfig-studio/trunk/src/synfigapp/blineconvert.h +++ b/synfig-studio/trunk/src/synfigapp/blineconvert.h @@ -57,7 +57,7 @@ public: :curind(o.curind), tangentscale(o.tangentscale), error(o.error) {} - const cpindex & operator = (const cpindex & rhs) + const cpindex & operator=(const cpindex & rhs) { curind = rhs.curind; tangentscale = rhs.tangentscale; @@ -65,7 +65,7 @@ public: return *this; } - bool operator < (const cpindex &rhs) const + bool operator<(const cpindex &rhs) const { return curind < rhs.curind; } @@ -106,7 +106,7 @@ public: BLineConverter(); static void EnforceMinWidth(std::list &bline, synfig::Real min_pressure); - void operator ()(std::list &out, const std::list &in,const std::list &in_w); + void operator()(std::list &out, const std::list &in,const std::list &in_w); }; }; // END of namespace synfigapp