diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-01-10 20:51:02 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-11 10:26:32 +0000 |
| commit | 4a85f127b9804a48c1ae995c010ddcf9d22ee859 (patch) | |
| tree | 4ede67344ed9a6c523c7bf9f41d05d6ad854440d | |
| parent | 473a50faa626678f35fac9e25492349b5a5bd02d (diff) | |
C4805: unsafe mix of BOOL and bool
| -rw-r--r-- | vcl/inc/vcl/cmdevt.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/vcl/event.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/vcl/toolbox.hxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vcl/inc/vcl/cmdevt.hxx b/vcl/inc/vcl/cmdevt.hxx index 24508a3b3e2f..529dba50fb3d 100644 --- a/vcl/inc/vcl/cmdevt.hxx +++ b/vcl/inc/vcl/cmdevt.hxx @@ -158,7 +158,7 @@ public: USHORT GetModifier() const { return (mnCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2)); } - BOOL IsShift() const + bool IsShift() const { return ((mnCode & KEY_SHIFT) != 0); } BOOL IsMod1() const { return ((mnCode & KEY_MOD1) != 0); } @@ -279,7 +279,7 @@ public: CommandModKeyData(); CommandModKeyData( USHORT nCode ); - BOOL IsShift() const { return (mnCode & MODKEY_SHIFT) ? TRUE : FALSE; } + bool IsShift() const { return (mnCode & MODKEY_SHIFT) ? true : false; } BOOL IsMod1() const { return (mnCode & MODKEY_MOD1) ? TRUE : FALSE; } BOOL IsMod2() const { return (mnCode & MODKEY_MOD2) ? TRUE : FALSE; } BOOL IsMod3() const { return (mnCode & MODKEY_MOD3) ? TRUE : FALSE; } diff --git a/vcl/inc/vcl/event.hxx b/vcl/inc/vcl/event.hxx index ef4eb87a9b18..83902ad6b1af 100644 --- a/vcl/inc/vcl/event.hxx +++ b/vcl/inc/vcl/event.hxx @@ -168,7 +168,7 @@ public: USHORT GetModifier() const { return (mnCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2)); } - BOOL IsShift() const + bool IsShift() const { return ((mnCode & KEY_SHIFT) != 0); } BOOL IsMod1() const { return ((mnCode & KEY_MOD1) != 0); } diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx index 094e831af702..cc6018ddc812 100644 --- a/vcl/inc/vcl/toolbox.hxx +++ b/vcl/inc/vcl/toolbox.hxx @@ -606,7 +606,7 @@ public: void ExecuteCustomMenu(); // allow Click Handler to detect special key - BOOL IsShift() const { return mbIsShift; } + bool IsShift() const { return mbIsShift; } // allow Click Handler to distinguish between mouse and key input BOOL IsKeyEvent() const { return mbIsKeyEvent; } |