diff options
Diffstat (limited to 'experimental/tqtinterface/qt4/src/kernel/tqrect.h')
| -rw-r--r-- | experimental/tqtinterface/qt4/src/kernel/tqrect.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqrect.h b/experimental/tqtinterface/qt4/src/kernel/tqrect.h index e20897874..8d5dc2bde 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqrect.h +++ b/experimental/tqtinterface/qt4/src/kernel/tqrect.h @@ -66,10 +66,10 @@ public: void moveBy( int dx, int dy ) { translate(dx, dy); } - inline bool tqcontains( const TQPoint &p, bool proper=FALSE ) const { return contains(p, proper); } - inline bool tqcontains( int x, int y ) const { return contains(x, y); } - inline bool tqcontains( int x, int y, bool proper ) const { return contains(x, y, proper); } - inline bool tqcontains( const TQRect &r, bool proper=FALSE ) const { return contains(r, proper); } + inline bool contains( const TQPoint &p, bool proper=FALSE ) const { return contains(p, proper); } + inline bool contains( int x, int y ) const { return contains(x, y); } + inline bool contains( int x, int y, bool proper ) const { return contains(x, y, proper); } + inline bool contains( const TQRect &r, bool proper=FALSE ) const { return contains(r, proper); } inline void addCoords( int x1, int y1, int x2, int y2 ) { adjust(x1, y1, x2, y2); } @@ -172,10 +172,10 @@ public: TQRect& operator|=(const TQRect &r); TQRect& operator&=(const TQRect &r); - bool tqcontains( const TQPoint &p, bool proper=FALSE ) const; - bool tqcontains( int x, int y ) const; // inline methods, _don't_ merge these - bool tqcontains( int x, int y, bool proper ) const; - bool tqcontains( const TQRect &r, bool proper=FALSE ) const; + bool contains( const TQPoint &p, bool proper=FALSE ) const; + bool contains( int x, int y ) const; // inline methods, _don't_ merge these + bool contains( int x, int y, bool proper ) const; + bool contains( const TQRect &r, bool proper=FALSE ) const; TQRect unite( const TQRect &r ) const; TQRect intersect( const TQRect &r ) const; bool intersects( const TQRect &r ) const; @@ -305,7 +305,7 @@ inline int TQRect::height() const inline TQSize TQRect::size() const { return TQSize(x2-x1+1, y2-y1+1); } -inline bool TQRect::tqcontains( int x, int y, bool proper ) const +inline bool TQRect::contains( int x, int y, bool proper ) const { if ( proper ) return x > x1 && x < x2 && @@ -315,7 +315,7 @@ inline bool TQRect::tqcontains( int x, int y, bool proper ) const y >= y1 && y <= y2; } -inline bool TQRect::tqcontains( int x, int y ) const +inline bool TQRect::contains( int x, int y ) const { return x >= x1 && x <= x2 && y >= y1 && y <= y2; |