Merge branch 'dev' into newlocallab

This commit is contained in:
Ingo Weyrich
2019-11-04 23:01:33 +01:00
395 changed files with 2523 additions and 2740 deletions

View File

@@ -16,15 +16,11 @@
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef __PROCEVENT__
#define __PROCEVENT__
#pragma once
namespace rtengine
{
// Aligned so the first entry starts on line 30
enum ProcEventCode {
EvPhotoLoaded = 0,
@@ -843,31 +839,11 @@ private:
};
inline bool operator==(ProcEvent a, ProcEvent b)
{
return int(a) == int(b);
}
inline bool operator==(ProcEvent a, ProcEventCode b)
{
return int(a) == int(b);
}
inline bool operator==(ProcEventCode a, ProcEvent b)
{
return int(a) == int(b);
}
inline bool operator!=(ProcEvent a, ProcEvent b)
{
return int(a) != int(b);
}
inline bool operator!=(ProcEvent a, ProcEventCode b)
{
return int(a) != int(b);
}
inline bool operator!=(ProcEventCode a, ProcEvent b)
{
return int(a) != int(b);
}
inline bool operator ==(ProcEvent a, ProcEvent b) { return int(a) == int(b); }
inline bool operator ==(ProcEvent a, ProcEventCode b) { return int(a) == int(b); }
inline bool operator ==(ProcEventCode a, ProcEvent b) { return int(a) == int(b); }
inline bool operator !=(ProcEvent a, ProcEvent b) { return int(a) != int(b); }
inline bool operator !=(ProcEvent a, ProcEventCode b) { return int(a) != int(b); }
inline bool operator !=(ProcEventCode a, ProcEvent b) { return int(a) != int(b); }
}
#endif