[Libreoffice-commits] .: vcl/inc

[Caolán McNamara]

 vcl/inc/vcl/cmdevt.hxx  |    4 ++--
 vcl/inc/vcl/event.hxx   |    2 +-
 vcl/inc/vcl/toolbox.hxx |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f6bd36365d509f54cb4ece52a32f9401f9a07a66
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 10 20:51:02 2011 +0000

    C4805: unsafe mix of BOOL and bool

diff --git a/vcl/inc/vcl/cmdevt.hxx b/vcl/inc/vcl/cmdevt.hxx
index 02ffb79..b0a9545 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 64377b6..4a3c372 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 e6b2417..afede95 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; }