summaryrefslogtreecommitdiff
path: root/libs/ui/Region.cpp
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2009-05-27 17:01:58 -0700
committer Mathias Agopian <mathias@google.com> 2009-05-27 17:01:58 -0700
commitbed9dd128dfbdc7d9dbca005078536dadc0b9359 (patch)
treeeabfee52c02276a81d270595d4d436e35a5da7fa /libs/ui/Region.cpp
parent4b8160fdfd3281d1d66c0cae9bb9c647b4333491 (diff)
make sure the Region code disallows constructs like "(a+b)=c;", which is somewhat meaningless.
Diffstat (limited to 'libs/ui/Region.cpp')
-rw-r--r--libs/ui/Region.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/libs/ui/Region.cpp b/libs/ui/Region.cpp
index 065ed5499f..2e6b241a31 100644
--- a/libs/ui/Region.cpp
+++ b/libs/ui/Region.cpp
@@ -156,16 +156,16 @@ Region& Region::translateSelf(int x, int y) {
// ----------------------------------------------------------------------------
-Region Region::merge(const Rect& rhs) const {
+const Region Region::merge(const Rect& rhs) const {
return operation(rhs, op_or);
}
-Region Region::intersect(const Rect& rhs) const {
+const Region Region::intersect(const Rect& rhs) const {
return operation(rhs, op_and);
}
-Region Region::subtract(const Rect& rhs) const {
+const Region Region::subtract(const Rect& rhs) const {
return operation(rhs, op_nand);
}
-Region Region::operation(const Rect& rhs, int op) const {
+const Region Region::operation(const Rect& rhs, int op) const {
Region result;
boolean_operation(op, result, *this, rhs);
return result;
@@ -173,22 +173,22 @@ Region Region::operation(const Rect& rhs, int op) const {
// ----------------------------------------------------------------------------
-Region Region::merge(const Region& rhs) const {
+const Region Region::merge(const Region& rhs) const {
return operation(rhs, op_or);
}
-Region Region::intersect(const Region& rhs) const {
+const Region Region::intersect(const Region& rhs) const {
return operation(rhs, op_and);
}
-Region Region::subtract(const Region& rhs) const {
+const Region Region::subtract(const Region& rhs) const {
return operation(rhs, op_nand);
}
-Region Region::operation(const Region& rhs, int op) const {
+const Region Region::operation(const Region& rhs, int op) const {
Region result;
boolean_operation(op, result, *this, rhs);
return result;
}
-Region Region::translate(int x, int y) const {
+const Region Region::translate(int x, int y) const {
Region result;
translate(result, *this, x, y);
return result;
@@ -213,16 +213,16 @@ Region& Region::operationSelf(const Region& rhs, int dx, int dy, int op) {
// ----------------------------------------------------------------------------
-Region Region::merge(const Region& rhs, int dx, int dy) const {
+const Region Region::merge(const Region& rhs, int dx, int dy) const {
return operation(rhs, dx, dy, op_or);
}
-Region Region::intersect(const Region& rhs, int dx, int dy) const {
+const Region Region::intersect(const Region& rhs, int dx, int dy) const {
return operation(rhs, dx, dy, op_and);
}
-Region Region::subtract(const Region& rhs, int dx, int dy) const {
+const Region Region::subtract(const Region& rhs, int dx, int dy) const {
return operation(rhs, dx, dy, op_nand);
}
-Region Region::operation(const Region& rhs, int dx, int dy, int op) const {
+const Region Region::operation(const Region& rhs, int dx, int dy, int op) const {
Region result;
boolean_operation(op, result, *this, rhs, dx, dy);
return result;