nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dont use __ for variables.. its illegal. (thanks ppl for the patch.)

Browse source
This commit is contained in:
Dana Jansens 2002-08-22 01:03:08 +00:00
parent a04483857a
commit 4d0f46e554
1 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/Util.cc
View file

@ -61,53 +61,53 @@ extern "C" {
using std::string;
void Rect::setX(int __x) {
_x2 += __x - _x1;
_x1 = __x;
void Rect::setX(int x) {
_x2 += x - _x1;
_x1 = x;
}
void Rect::setY(int __y)
void Rect::setY(int y)
{
_y2 += __y - _y1;
_y1 = __y;
_y2 += y - _y1;
_y1 = y;
}
void Rect::setPos(int __x, int __y) {
_x2 += __x - _x1;
_x1 = __x;
_y2 += __y - _y1;
_y1 = __y;
void Rect::setPos(int x, int y) {
_x2 += x - _x1;
_x1 = x;
_y2 += y - _y1;
_y1 = y;
}
void Rect::setWidth(unsigned int __w) {
_x2 = __w + _x1 - 1;
void Rect::setWidth(unsigned int w) {
_x2 = w + _x1 - 1;
}
void Rect::setHeight(unsigned int __h) {
_y2 = __h + _y1 - 1;
void Rect::setHeight(unsigned int h) {
_y2 = h + _y1 - 1;
}
void Rect::setSize(unsigned int __w, unsigned int __h) {
_x2 = __w + _x1 - 1;
_y2 = __h + _y1 - 1;
void Rect::setSize(unsigned int w, unsigned int h) {
_x2 = w + _x1 - 1;
_y2 = h + _y1 - 1;
}
void Rect::setRect(int __x, int __y, unsigned int __w, unsigned int __h) {
*this = Rect(__x, __y, __w, __h);
void Rect::setRect(int x, int y, unsigned int w, unsigned int h) {
*this = Rect(x, y, w, h);
}
void Rect::setCoords(int __l, int __t, int __r, int __b) {
_x1 = __l;
_y1 = __t;
_x2 = __r;
_y2 = __b;
void Rect::setCoords(int l, int t, int r, int b) {
_x1 = l;
_y1 = t;
_x2 = r;
_y2 = b;
}
@ -141,9 +141,9 @@ bool Rect::intersects(const Rect &a) const {
}
bool Rect::contains(int __x, int __y) const {
return __x >= _x1 && __x <= _x2 &&
__y >= _y1 && __y <= _y2;
bool Rect::contains(int x, int y) const {
return x >= _x1 && x <= _x2 &&
y >= _y1 && y <= _y2;
}