diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-03-29 23:52:42 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-03-29 23:52:42 +0000 |
| commit | a168040d5a452544328a1e6ad35aaac351f94d44 (patch) | |
| tree | fae1ba829f543a473da281bd5fa6e4deabbf6912 /src/ui/control-manager.cpp | |
| parent | Removed function pointers from SPObject and subclasses. (diff) | |
| parent | Dutch translation update (diff) | |
| download | inkscape-a168040d5a452544328a1e6ad35aaac351f94d44.tar.gz inkscape-a168040d5a452544328a1e6ad35aaac351f94d44.zip | |
merged from trunk
(bzr r11608.1.56)
Diffstat (limited to 'src/ui/control-manager.cpp')
| -rw-r--r-- | src/ui/control-manager.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp index b14f27b8b..62e6ce3a3 100644 --- a/src/ui/control-manager.cpp +++ b/src/ui/control-manager.cpp @@ -31,29 +31,18 @@ namespace { std::map<Inkscape::ControlType, std::vector<int> > sizeTable; // Note: The following operator overloads are local to this file at the moment to discourage flag manipulation elsewhere. - +/* ControlFlags operator |(ControlFlags lhs, ControlFlags rhs) { return static_cast<ControlFlags>(static_cast<int>(lhs) | static_cast<int>(rhs)); } - -ControlFlags& operator |=(ControlFlags &lhs, ControlFlags rhs) -{ - lhs = lhs | rhs; - return lhs; -} +*/ ControlFlags operator &(ControlFlags lhs, ControlFlags rhs) { return static_cast<ControlFlags>(static_cast<int>(lhs) & static_cast<int>(rhs)); } -ControlFlags& operator &=(ControlFlags &lhs, ControlFlags rhs) -{ - lhs = lhs & rhs; - return lhs; -} - ControlFlags operator ^(ControlFlags lhs, ControlFlags rhs) { return static_cast<ControlFlags>(static_cast<int>(lhs) ^ static_cast<int>(rhs)); |