From 55f07d4daa76503530d96b9c20b53c59bcd5bcf9 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 12 Jan 2018 20:10:40 +0100 Subject: More loplugin:cstylecast: vcl auto-rewrite with "Enable loplugin:cstylecast for some more cases" plus solenv/clang-format/reformat-formatted-files Change-Id: I363c01a1ae9e863fca4fb4589829492d7280d711 --- include/vcl/bitmap.hxx | 4 +- include/vcl/bitmapaccess.hxx | 2 +- include/vcl/btndlg.hxx | 2 +- include/vcl/checksum.hxx | 2 +- include/vcl/commandevent.hxx | 6 +- include/vcl/cursor.hxx | 2 +- include/vcl/event.hxx | 6 +- include/vcl/field.hxx | 2 +- include/vcl/gdimtf.hxx | 2 +- include/vcl/graphicfilter.hxx | 4 +- include/vcl/image.hxx | 2 +- include/vcl/keycodes.hxx | 244 +++++++++++++++++------------------ include/vcl/mnemonic.hxx | 2 +- include/vcl/opengl/OpenGLContext.hxx | 2 +- include/vcl/prntypes.hxx | 2 +- include/vcl/salbtype.hxx | 58 ++++----- include/vcl/salgtype.hxx | 8 +- include/vcl/splitwin.hxx | 4 +- include/vcl/status.hxx | 6 +- include/vcl/tabctrl.hxx | 4 +- include/vcl/toolbox.hxx | 4 +- 21 files changed, 184 insertions(+), 184 deletions(-) (limited to 'include') diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index c4a5a3f56cbf..ec14ae52b59f 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -760,13 +760,13 @@ inline void Bitmap::SetPrefSize( const Size& rSize ) inline sal_uLong Bitmap::GetColorCount() const { - return( (sal_uLong)1 << (sal_uLong) GetBitCount() ); + return( sal_uLong(1) << static_cast(GetBitCount()) ); } inline sal_uLong Bitmap::GetSizeBytes() const { const Size aSizePix( GetSizePixel() ); - return( ( (sal_uLong) aSizePix.Width() * aSizePix.Height() * GetBitCount() ) >> 3 ); + return( ( static_cast(aSizePix.Width()) * aSizePix.Height() * GetBitCount() ) >> 3 ); } #endif // INCLUDED_VCL_BITMAP_HXX diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx index b7995f46943e..5ae64f8193cc 100644 --- a/include/vcl/bitmapaccess.hxx +++ b/include/vcl/bitmapaccess.hxx @@ -89,7 +89,7 @@ public: BitmapColor GetBestMatchingColor(const BitmapColor& rBitmapColor) { if (HasPalette()) - return BitmapColor((sal_uInt8) GetBestPaletteIndex(rBitmapColor)); + return BitmapColor(static_cast(GetBestPaletteIndex(rBitmapColor))); else return rBitmapColor; } diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx index 5c239d72fb8e..e6c54d3acca6 100644 --- a/include/vcl/btndlg.hxx +++ b/include/vcl/btndlg.hxx @@ -31,7 +31,7 @@ struct ImplBtnDlgItem; class PushButton; class Button; -#define BUTTONDIALOG_BUTTON_NOTFOUND ((sal_uInt16)0xFFFF) +#define BUTTONDIALOG_BUTTON_NOTFOUND (sal_uInt16(0xFFFF)) enum class ButtonDialogFlags { diff --git a/include/vcl/checksum.hxx b/include/vcl/checksum.hxx index 34817613e7e2..f934cb6ceb7e 100644 --- a/include/vcl/checksum.hxx +++ b/include/vcl/checksum.hxx @@ -76,7 +76,7 @@ inline BitmapChecksum vcl_get_checksum ( sal_uInt32 DatLen ) { - return (BitmapChecksum)(vcl_crc64( Checksum, Data, DatLen )); + return static_cast(vcl_crc64( Checksum, Data, DatLen )); } diff --git a/include/vcl/commandevent.hxx b/include/vcl/commandevent.hxx index 778348b3d1a3..6c752ffccaa4 100644 --- a/include/vcl/commandevent.hxx +++ b/include/vcl/commandevent.hxx @@ -55,8 +55,8 @@ namespace o3tl template<> struct typed_flags : is_typed_flags {}; } -#define EXTTEXTINPUT_CURSOR_INVISIBLE ((sal_uInt16)0x0001) -#define EXTTEXTINPUT_CURSOR_OVERWRITE ((sal_uInt16)0x0002) +#define EXTTEXTINPUT_CURSOR_INVISIBLE (sal_uInt16(0x0001)) +#define EXTTEXTINPUT_CURSOR_OVERWRITE (sal_uInt16(0x0002)) class VCL_DLLPUBLIC CommandEvent @@ -133,7 +133,7 @@ enum class CommandWheelMode }; // Magic value used in mnLines field in CommandWheelData -#define COMMAND_WHEEL_PAGESCROLL ((sal_uLong)0xFFFFFFFF) +#define COMMAND_WHEEL_PAGESCROLL (sal_uLong(0xFFFFFFFF)) class VCL_DLLPUBLIC CommandWheelData { diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx index 725724ee8024..b5c547f68463 100644 --- a/include/vcl/cursor.hxx +++ b/include/vcl/cursor.hxx @@ -31,7 +31,7 @@ struct ImplCursorData; namespace vcl { class Window; } // Cursor styles -#define CURSOR_SHADOW ((sal_uInt16)0x0001) +#define CURSOR_SHADOW (sal_uInt16(0x0001)) enum class CursorDirection { diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index 2c21dd52d8ab..050e7199cc45 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -105,9 +105,9 @@ namespace o3tl } // Mouse buttons -#define MOUSE_LEFT ((sal_uInt16)0x0001) -#define MOUSE_MIDDLE ((sal_uInt16)0x0002) -#define MOUSE_RIGHT ((sal_uInt16)0x0004) +#define MOUSE_LEFT (sal_uInt16(0x0001)) +#define MOUSE_MIDDLE (sal_uInt16(0x0002)) +#define MOUSE_RIGHT (sal_uInt16(0x0004)) class VCL_DLLPUBLIC MouseEvent diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index c4139bb7d2d7..be973f6d8bdf 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -87,7 +87,7 @@ public: }; -#define PATTERN_FORMAT_EMPTYLITERALS ((sal_uInt16)0x0001) +#define PATTERN_FORMAT_EMPTYLITERALS (sal_uInt16(0x0001)) class VCL_DLLPUBLIC PatternFormatter : public FormatterBase { diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index e9384607c218..6785a7b9e3c3 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -40,7 +40,7 @@ namespace tools { class Gradient; -#define GDI_METAFILE_END ((size_t)0xFFFFFFFF) +#define GDI_METAFILE_END (size_t(0xFFFFFFFF)) #define GDI_METAFILE_LABEL_NOTFOUND ((size_t)0xFFFFFFFF) enum class MtfConversion diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index 2c9ad85b96a0..e10afd1997d2 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -45,8 +45,8 @@ struct ConvertData; #define GRFILTER_OUTHINT_GREY 1 -#define GRFILTER_FORMAT_NOTFOUND ((sal_uInt16)0xFFFF) -#define GRFILTER_FORMAT_DONTKNOW ((sal_uInt16)0xFFFF) +#define GRFILTER_FORMAT_NOTFOUND (sal_uInt16(0xFFFF)) +#define GRFILTER_FORMAT_DONTKNOW (sal_uInt16(0xFFFF)) enum class GraphicFilterImportFlags { diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx index 4577bd8fbed1..526243bcf382 100644 --- a/include/vcl/image.hxx +++ b/include/vcl/image.hxx @@ -47,7 +47,7 @@ namespace vcl }; } -#define IMAGELIST_IMAGE_NOTFOUND ((sal_uInt16)0xFFFF) +#define IMAGELIST_IMAGE_NOTFOUND (sal_uInt16(0xFFFF)) class SAL_WARN_UNUSED VCL_DLLPUBLIC Image { diff --git a/include/vcl/keycodes.hxx b/include/vcl/keycodes.hxx index 8e31c4fe1f2b..a46373d55e68 100644 --- a/include/vcl/keycodes.hxx +++ b/include/vcl/keycodes.hxx @@ -24,140 +24,140 @@ #include #include -#define KEY_CODE_MASK ((sal_uInt16)0x0FFF) +#define KEY_CODE_MASK (sal_uInt16(0x0FFF)) // Modifier keys -#define KEY_SHIFT ((sal_uInt16)0x1000) -#define KEY_MOD1 ((sal_uInt16)0x2000) -#define KEY_MOD2 ((sal_uInt16)0x4000) -#define KEY_MOD3 ((sal_uInt16)0x8000) -#define KEY_MODIFIERS_MASK ((sal_uInt16)0xF000) +#define KEY_SHIFT (sal_uInt16(0x1000)) +#define KEY_MOD1 (sal_uInt16(0x2000)) +#define KEY_MOD2 (sal_uInt16(0x4000)) +#define KEY_MOD3 (sal_uInt16(0x8000)) +#define KEY_MODIFIERS_MASK (sal_uInt16(0xF000)) // Key groups -#define KEYGROUP_NUM ((sal_uInt16)css::awt::KeyGroup::NUM) -#define KEYGROUP_ALPHA ((sal_uInt16)css::awt::KeyGroup::ALPHA) -#define KEYGROUP_FKEYS ((sal_uInt16)css::awt::KeyGroup::FKEYS) -#define KEYGROUP_CURSOR ((sal_uInt16)css::awt::KeyGroup::CURSOR) -#define KEYGROUP_MISC ((sal_uInt16)css::awt::KeyGroup::MISC) -#define KEYGROUP_TYPE ((sal_uInt16)css::awt::KeyGroup::TYPE) +#define KEYGROUP_NUM (sal_uInt16(css::awt::KeyGroup::NUM)) +#define KEYGROUP_ALPHA (sal_uInt16(css::awt::KeyGroup::ALPHA)) +#define KEYGROUP_FKEYS (sal_uInt16(css::awt::KeyGroup::FKEYS)) +#define KEYGROUP_CURSOR (sal_uInt16(css::awt::KeyGroup::CURSOR)) +#define KEYGROUP_MISC (sal_uInt16(css::awt::KeyGroup::MISC)) +#define KEYGROUP_TYPE (sal_uInt16(css::awt::KeyGroup::TYPE)) // Key codes -#define KEY_0 ((sal_uInt16)css::awt::Key::NUM0) -#define KEY_1 ((sal_uInt16)css::awt::Key::NUM1) -#define KEY_2 ((sal_uInt16)css::awt::Key::NUM2) -#define KEY_3 ((sal_uInt16)css::awt::Key::NUM3) -#define KEY_4 ((sal_uInt16)css::awt::Key::NUM4) -#define KEY_5 ((sal_uInt16)css::awt::Key::NUM5) -#define KEY_6 ((sal_uInt16)css::awt::Key::NUM6) -#define KEY_7 ((sal_uInt16)css::awt::Key::NUM7) -#define KEY_8 ((sal_uInt16)css::awt::Key::NUM8) -#define KEY_9 ((sal_uInt16)css::awt::Key::NUM9) - -#define KEY_A ((sal_uInt16)css::awt::Key::A) -#define KEY_B ((sal_uInt16)css::awt::Key::B) -#define KEY_C ((sal_uInt16)css::awt::Key::C) -#define KEY_D ((sal_uInt16)css::awt::Key::D) -#define KEY_E ((sal_uInt16)css::awt::Key::E) -#define KEY_F ((sal_uInt16)css::awt::Key::F) -#define KEY_G ((sal_uInt16)css::awt::Key::G) -#define KEY_H ((sal_uInt16)css::awt::Key::H) -#define KEY_I ((sal_uInt16)css::awt::Key::I) -#define KEY_J ((sal_uInt16)css::awt::Key::J) -#define KEY_K ((sal_uInt16)css::awt::Key::K) -#define KEY_L ((sal_uInt16)css::awt::Key::L) -#define KEY_M ((sal_uInt16)css::awt::Key::M) -#define KEY_N ((sal_uInt16)css::awt::Key::N) -#define KEY_O ((sal_uInt16)css::awt::Key::O) -#define KEY_P ((sal_uInt16)css::awt::Key::P) -#define KEY_Q ((sal_uInt16)css::awt::Key::Q) -#define KEY_R ((sal_uInt16)css::awt::Key::R) -#define KEY_S ((sal_uInt16)css::awt::Key::S) -#define KEY_T ((sal_uInt16)css::awt::Key::T) -#define KEY_U ((sal_uInt16)css::awt::Key::U) -#define KEY_V ((sal_uInt16)css::awt::Key::V) -#define KEY_W ((sal_uInt16)css::awt::Key::W) -#define KEY_X ((sal_uInt16)css::awt::Key::X) -#define KEY_Y ((sal_uInt16)css::awt::Key::Y) -#define KEY_Z ((sal_uInt16)css::awt::Key::Z) - -#define KEY_F1 ((sal_uInt16)css::awt::Key::F1) -#define KEY_F2 ((sal_uInt16)css::awt::Key::F2) -#define KEY_F3 ((sal_uInt16)css::awt::Key::F3) -#define KEY_F4 ((sal_uInt16)css::awt::Key::F4) -#define KEY_F5 ((sal_uInt16)css::awt::Key::F5) -#define KEY_F6 ((sal_uInt16)css::awt::Key::F6) -#define KEY_F7 ((sal_uInt16)css::awt::Key::F7) -#define KEY_F8 ((sal_uInt16)css::awt::Key::F8) -#define KEY_F9 ((sal_uInt16)css::awt::Key::F9) -#define KEY_F10 ((sal_uInt16)css::awt::Key::F10) -#define KEY_F11 ((sal_uInt16)css::awt::Key::F11) -#define KEY_F12 ((sal_uInt16)css::awt::Key::F12) -#define KEY_F13 ((sal_uInt16)css::awt::Key::F13) -#define KEY_F14 ((sal_uInt16)css::awt::Key::F14) -#define KEY_F15 ((sal_uInt16)css::awt::Key::F15) -#define KEY_F16 ((sal_uInt16)css::awt::Key::F16) -#define KEY_F17 ((sal_uInt16)css::awt::Key::F17) +#define KEY_0 (sal_uInt16(css::awt::Key::NUM0)) +#define KEY_1 (sal_uInt16(css::awt::Key::NUM1)) +#define KEY_2 (sal_uInt16(css::awt::Key::NUM2)) +#define KEY_3 (sal_uInt16(css::awt::Key::NUM3)) +#define KEY_4 (sal_uInt16(css::awt::Key::NUM4)) +#define KEY_5 (sal_uInt16(css::awt::Key::NUM5)) +#define KEY_6 (sal_uInt16(css::awt::Key::NUM6)) +#define KEY_7 (sal_uInt16(css::awt::Key::NUM7)) +#define KEY_8 (sal_uInt16(css::awt::Key::NUM8)) +#define KEY_9 (sal_uInt16(css::awt::Key::NUM9)) + +#define KEY_A (sal_uInt16(css::awt::Key::A)) +#define KEY_B (sal_uInt16(css::awt::Key::B)) +#define KEY_C (sal_uInt16(css::awt::Key::C)) +#define KEY_D (sal_uInt16(css::awt::Key::D)) +#define KEY_E (sal_uInt16(css::awt::Key::E)) +#define KEY_F (sal_uInt16(css::awt::Key::F)) +#define KEY_G (sal_uInt16(css::awt::Key::G)) +#define KEY_H (sal_uInt16(css::awt::Key::H)) +#define KEY_I (sal_uInt16(css::awt::Key::I)) +#define KEY_J (sal_uInt16(css::awt::Key::J)) +#define KEY_K (sal_uInt16(css::awt::Key::K)) +#define KEY_L (sal_uInt16(css::awt::Key::L)) +#define KEY_M (sal_uInt16(css::awt::Key::M)) +#define KEY_N (sal_uInt16(css::awt::Key::N)) +#define KEY_O (sal_uInt16(css::awt::Key::O)) +#define KEY_P (sal_uInt16(css::awt::Key::P)) +#define KEY_Q (sal_uInt16(css::awt::Key::Q)) +#define KEY_R (sal_uInt16(css::awt::Key::R)) +#define KEY_S (sal_uInt16(css::awt::Key::S)) +#define KEY_T (sal_uInt16(css::awt::Key::T)) +#define KEY_U (sal_uInt16(css::awt::Key::U)) +#define KEY_V (sal_uInt16(css::awt::Key::V)) +#define KEY_W (sal_uInt16(css::awt::Key::W)) +#define KEY_X (sal_uInt16(css::awt::Key::X)) +#define KEY_Y (sal_uInt16(css::awt::Key::Y)) +#define KEY_Z (sal_uInt16(css::awt::Key::Z)) + +#define KEY_F1 (sal_uInt16(css::awt::Key::F1)) +#define KEY_F2 (sal_uInt16(css::awt::Key::F2)) +#define KEY_F3 (sal_uInt16(css::awt::Key::F3)) +#define KEY_F4 (sal_uInt16(css::awt::Key::F4)) +#define KEY_F5 (sal_uInt16(css::awt::Key::F5)) +#define KEY_F6 (sal_uInt16(css::awt::Key::F6)) +#define KEY_F7 (sal_uInt16(css::awt::Key::F7)) +#define KEY_F8 (sal_uInt16(css::awt::Key::F8)) +#define KEY_F9 (sal_uInt16(css::awt::Key::F9)) +#define KEY_F10 (sal_uInt16(css::awt::Key::F10)) +#define KEY_F11 (sal_uInt16(css::awt::Key::F11)) +#define KEY_F12 (sal_uInt16(css::awt::Key::F12)) +#define KEY_F13 (sal_uInt16(css::awt::Key::F13)) +#define KEY_F14 (sal_uInt16(css::awt::Key::F14)) +#define KEY_F15 (sal_uInt16(css::awt::Key::F15)) +#define KEY_F16 (sal_uInt16(css::awt::Key::F16)) +#define KEY_F17 (sal_uInt16(css::awt::Key::F17)) #define KEY_F18 ((sal_uInt16)css::awt::Key::F18) -#define KEY_F19 ((sal_uInt16)css::awt::Key::F19) +#define KEY_F19 (sal_uInt16(css::awt::Key::F19)) #define KEY_F20 ((sal_uInt16)css::awt::Key::F20) #define KEY_F21 ((sal_uInt16)css::awt::Key::F21) #define KEY_F22 ((sal_uInt16)css::awt::Key::F22) #define KEY_F23 ((sal_uInt16)css::awt::Key::F23) -#define KEY_F24 ((sal_uInt16)css::awt::Key::F24) +#define KEY_F24 (sal_uInt16(css::awt::Key::F24)) #define KEY_F25 ((sal_uInt16)css::awt::Key::F25) -#define KEY_F26 ((sal_uInt16)css::awt::Key::F26) - -#define KEY_DOWN ((sal_uInt16)css::awt::Key::DOWN) -#define KEY_UP ((sal_uInt16)css::awt::Key::UP) -#define KEY_LEFT ((sal_uInt16)css::awt::Key::LEFT) -#define KEY_RIGHT ((sal_uInt16)css::awt::Key::RIGHT) -#define KEY_HOME ((sal_uInt16)css::awt::Key::HOME) -#define KEY_END ((sal_uInt16)css::awt::Key::END) -#define KEY_PAGEUP ((sal_uInt16)css::awt::Key::PAGEUP) -#define KEY_PAGEDOWN ((sal_uInt16)css::awt::Key::PAGEDOWN) - -#define KEY_RETURN ((sal_uInt16)css::awt::Key::RETURN) -#define KEY_ESCAPE ((sal_uInt16)css::awt::Key::ESCAPE) -#define KEY_TAB ((sal_uInt16)css::awt::Key::TAB) -#define KEY_BACKSPACE ((sal_uInt16)css::awt::Key::BACKSPACE) -#define KEY_SPACE ((sal_uInt16)css::awt::Key::SPACE) -#define KEY_INSERT ((sal_uInt16)css::awt::Key::INSERT) -#define KEY_DELETE ((sal_uInt16)css::awt::Key::DELETE) - -#define KEY_ADD ((sal_uInt16)css::awt::Key::ADD) -#define KEY_SUBTRACT ((sal_uInt16)css::awt::Key::SUBTRACT) -#define KEY_MULTIPLY ((sal_uInt16)css::awt::Key::MULTIPLY) -#define KEY_DIVIDE ((sal_uInt16)css::awt::Key::DIVIDE) -#define KEY_POINT ((sal_uInt16)css::awt::Key::POINT) -#define KEY_COMMA ((sal_uInt16)css::awt::Key::COMMA) -#define KEY_LESS ((sal_uInt16)css::awt::Key::LESS) -#define KEY_GREATER ((sal_uInt16)css::awt::Key::GREATER) -#define KEY_EQUAL ((sal_uInt16)css::awt::Key::EQUAL) - -#define KEY_OPEN ((sal_uInt16)css::awt::Key::OPEN) -#define KEY_CUT ((sal_uInt16)css::awt::Key::CUT) -#define KEY_COPY ((sal_uInt16)css::awt::Key::COPY) -#define KEY_PASTE ((sal_uInt16)css::awt::Key::PASTE) -#define KEY_UNDO ((sal_uInt16)css::awt::Key::UNDO) -#define KEY_REPEAT ((sal_uInt16)css::awt::Key::REPEAT) -#define KEY_FIND ((sal_uInt16)css::awt::Key::FIND) -#define KEY_PROPERTIES ((sal_uInt16)css::awt::Key::PROPERTIES) -#define KEY_FRONT ((sal_uInt16)css::awt::Key::FRONT) -#define KEY_CONTEXTMENU ((sal_uInt16)css::awt::Key::CONTEXTMENU) -#define KEY_MENU ((sal_uInt16)css::awt::Key::MENU) -#define KEY_HELP ((sal_uInt16)css::awt::Key::HELP) -#define KEY_HANGUL_HANJA ((sal_uInt16)css::awt::Key::HANGUL_HANJA) -#define KEY_DECIMAL ((sal_uInt16)css::awt::Key::DECIMAL) -#define KEY_TILDE ((sal_uInt16)css::awt::Key::TILDE) -#define KEY_QUOTELEFT ((sal_uInt16)css::awt::Key::QUOTELEFT) -#define KEY_BRACKETLEFT ((sal_uInt16)css::awt::Key::BRACKETLEFT) -#define KEY_BRACKETRIGHT ((sal_uInt16)css::awt::Key::BRACKETRIGHT) -#define KEY_SEMICOLON ((sal_uInt16)css::awt::Key::SEMICOLON) -#define KEY_QUOTERIGHT ((sal_uInt16)css::awt::Key::QUOTERIGHT) - -#define KEY_CAPSLOCK ((sal_uInt16)css::awt::Key::CAPSLOCK) -#define KEY_NUMLOCK ((sal_uInt16)css::awt::Key::NUMLOCK) -#define KEY_SCROLLLOCK ((sal_uInt16)css::awt::Key::SCROLLLOCK) +#define KEY_F26 (sal_uInt16(css::awt::Key::F26)) + +#define KEY_DOWN (sal_uInt16(css::awt::Key::DOWN)) +#define KEY_UP (sal_uInt16(css::awt::Key::UP)) +#define KEY_LEFT (sal_uInt16(css::awt::Key::LEFT)) +#define KEY_RIGHT (sal_uInt16(css::awt::Key::RIGHT)) +#define KEY_HOME (sal_uInt16(css::awt::Key::HOME)) +#define KEY_END (sal_uInt16(css::awt::Key::END)) +#define KEY_PAGEUP (sal_uInt16(css::awt::Key::PAGEUP)) +#define KEY_PAGEDOWN (sal_uInt16(css::awt::Key::PAGEDOWN)) + +#define KEY_RETURN (sal_uInt16(css::awt::Key::RETURN)) +#define KEY_ESCAPE (sal_uInt16(css::awt::Key::ESCAPE)) +#define KEY_TAB (sal_uInt16(css::awt::Key::TAB)) +#define KEY_BACKSPACE (sal_uInt16(css::awt::Key::BACKSPACE)) +#define KEY_SPACE (sal_uInt16(css::awt::Key::SPACE)) +#define KEY_INSERT (sal_uInt16(css::awt::Key::INSERT)) +#define KEY_DELETE (sal_uInt16(css::awt::Key::DELETE)) + +#define KEY_ADD (sal_uInt16(css::awt::Key::ADD)) +#define KEY_SUBTRACT (sal_uInt16(css::awt::Key::SUBTRACT)) +#define KEY_MULTIPLY (sal_uInt16(css::awt::Key::MULTIPLY)) +#define KEY_DIVIDE (sal_uInt16(css::awt::Key::DIVIDE)) +#define KEY_POINT (sal_uInt16(css::awt::Key::POINT)) +#define KEY_COMMA (sal_uInt16(css::awt::Key::COMMA)) +#define KEY_LESS (sal_uInt16(css::awt::Key::LESS)) +#define KEY_GREATER (sal_uInt16(css::awt::Key::GREATER)) +#define KEY_EQUAL (sal_uInt16(css::awt::Key::EQUAL)) + +#define KEY_OPEN (sal_uInt16(css::awt::Key::OPEN)) +#define KEY_CUT (sal_uInt16(css::awt::Key::CUT)) +#define KEY_COPY (sal_uInt16(css::awt::Key::COPY)) +#define KEY_PASTE (sal_uInt16(css::awt::Key::PASTE)) +#define KEY_UNDO (sal_uInt16(css::awt::Key::UNDO)) +#define KEY_REPEAT (sal_uInt16(css::awt::Key::REPEAT)) +#define KEY_FIND (sal_uInt16(css::awt::Key::FIND)) +#define KEY_PROPERTIES (sal_uInt16(css::awt::Key::PROPERTIES)) +#define KEY_FRONT (sal_uInt16(css::awt::Key::FRONT)) +#define KEY_CONTEXTMENU (sal_uInt16(css::awt::Key::CONTEXTMENU)) +#define KEY_MENU (sal_uInt16(css::awt::Key::MENU)) +#define KEY_HELP (sal_uInt16(css::awt::Key::HELP)) +#define KEY_HANGUL_HANJA (sal_uInt16(css::awt::Key::HANGUL_HANJA)) +#define KEY_DECIMAL (sal_uInt16(css::awt::Key::DECIMAL)) +#define KEY_TILDE (sal_uInt16(css::awt::Key::TILDE)) +#define KEY_QUOTELEFT (sal_uInt16(css::awt::Key::QUOTELEFT)) +#define KEY_BRACKETLEFT (sal_uInt16(css::awt::Key::BRACKETLEFT)) +#define KEY_BRACKETRIGHT (sal_uInt16(css::awt::Key::BRACKETRIGHT)) +#define KEY_SEMICOLON (sal_uInt16(css::awt::Key::SEMICOLON)) +#define KEY_QUOTERIGHT (sal_uInt16(css::awt::Key::QUOTERIGHT)) + +#define KEY_CAPSLOCK (sal_uInt16(css::awt::Key::CAPSLOCK)) +#define KEY_NUMLOCK (sal_uInt16(css::awt::Key::NUMLOCK)) +#define KEY_SCROLLLOCK (sal_uInt16(css::awt::Key::SCROLLLOCK)) // extended Modifier-Keys (only used for modkey events) enum class ModKeyFlags { diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx index f6d1dc73b6b7..bf2591aff8f4 100644 --- a/include/vcl/mnemonic.hxx +++ b/include/vcl/mnemonic.hxx @@ -46,7 +46,7 @@ (MNEMONIC_RANGE_4_END-MNEMONIC_RANGE_4_START+1)) #define MNEMONIC_CHAR u'~' -#define MNEMONIC_INDEX_NOTFOUND ((sal_uInt16)0xFFFF) +#define MNEMONIC_INDEX_NOTFOUND (sal_uInt16(0xFFFF)) class VCL_DLLPUBLIC MnemonicGenerator diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index ad9ef72b824a..947384badda8 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -186,7 +186,7 @@ private: { size_t operator()( const rtl::OString& aDigest ) const { - return (size_t)( rtl_crc32( 0, aDigest.getStr(), aDigest.getLength() ) ); + return static_cast( rtl_crc32( 0, aDigest.getStr(), aDigest.getLength() ) ); } }; diff --git a/include/vcl/prntypes.hxx b/include/vcl/prntypes.hxx index 747f43190fcb..dc7bd64f449b 100644 --- a/include/vcl/prntypes.hxx +++ b/include/vcl/prntypes.hxx @@ -66,7 +66,7 @@ namespace o3tl template<> struct typed_flags : is_typed_flags {}; } -#define QUEUE_JOBS_DONTKNOW ((sal_uLong)0xFFFFFFFF) +#define QUEUE_JOBS_DONTKNOW (sal_uLong(0xFFFFFFFF)) enum class PrinterCapType diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx index 0f4e45733d0f..74ff7f41e48f 100644 --- a/include/vcl/salbtype.hxx +++ b/include/vcl/salbtype.hxx @@ -69,18 +69,18 @@ inline ScanlineFormat RemoveScanline(ScanlineFormat nFormat) { return nFormat & const sal_uInt8 _def_cR = static_cast( d_RS < 0 ? ( (d_nVal) & d_RM ) << -d_RS : ( (d_nVal) & d_RM ) >> d_RS ); \ const sal_uInt8 _def_cG = static_cast( d_GS < 0 ? ( (d_nVal) & d_GM ) << -d_GS : ( (d_nVal) & d_GM ) >> d_GS ); \ const sal_uInt8 _def_cB = static_cast( d_BS < 0 ? ( (d_nVal) & d_BM ) << -d_BS : ( (d_nVal) & d_BM ) >> d_BS ); \ -d_Col = BitmapColor( (sal_uInt8) ( _def_cR | ( ( _def_cR & maR.mnOr ) >> maR.mnOrShift ) ), \ - (sal_uInt8) ( _def_cG | ( ( _def_cG & maG.mnOr ) >> maG.mnOrShift ) ), \ - (sal_uInt8) ( _def_cB | ( ( _def_cB & maB.mnOr ) >> maB.mnOrShift ) ) ); +d_Col = BitmapColor( static_cast( _def_cR | ( ( _def_cR & maR.mnOr ) >> maR.mnOrShift ) ), \ + static_cast( _def_cG | ( ( _def_cG & maG.mnOr ) >> maG.mnOrShift ) ), \ + static_cast( _def_cB | ( ( _def_cB & maB.mnOr ) >> maB.mnOrShift ) ) ); #define COLOR_TO_MASK( d_rCol, d_RM, d_GM, d_BM, d_RS, d_GS, d_BS, d_ALPHA ) \ -( ( ( ( d_RS < 0 ) ? ( (sal_uInt32) (d_rCol).GetRed() >> -d_RS ) : \ - ( (sal_uInt32) (d_rCol).GetRed() << d_RS ) ) & d_RM ) | \ - ( ( ( d_GS < 0 ) ? ( (sal_uInt32) (d_rCol).GetGreen() >> -d_GS ) : \ - ( (sal_uInt32) (d_rCol).GetGreen() << d_GS ) ) & d_GM ) | \ - ( ( ( d_BS < 0 ) ? ( (sal_uInt32) (d_rCol).GetBlue() >> -d_BS ) : \ - ( (sal_uInt32) (d_rCol).GetBlue() << d_BS ) ) & d_BM ) | \ +( ( ( ( d_RS < 0 ) ? ( static_cast((d_rCol).GetRed()) >> -d_RS ) : \ + ( static_cast((d_rCol).GetRed()) << d_RS ) ) & d_RM ) | \ + ( ( ( d_GS < 0 ) ? ( static_cast((d_rCol).GetGreen()) >> -d_GS ) : \ + ( static_cast((d_rCol).GetGreen()) << d_GS ) ) & d_GM ) | \ + ( ( ( d_BS < 0 ) ? ( static_cast((d_rCol).GetBlue()) >> -d_BS ) : \ + ( static_cast((d_rCol).GetBlue()) << d_BS ) ) & d_BM ) | \ d_ALPHA ) @@ -135,8 +135,8 @@ public: template inline std::basic_ostream& operator <<(std::basic_ostream& rStream, const BitmapColor& rColor) { - return rStream << "mcBlueOrIndex: " << (int)rColor.GetBlueOrIndex() << ", mcGreen: " - << (int)rColor.GetGreen() << ", mcRed: " << (int)rColor.GetRed() << ", mbIndex: " << (int)rColor.IsIndex(); + return rStream << "mcBlueOrIndex: " << static_cast(rColor.GetBlueOrIndex()) << ", mcGreen: " + << static_cast(rColor.GetGreen()) << ", mcRed: " << static_cast(rColor.GetRed()) << ", mbIndex: " << static_cast(rColor.IsIndex()); } class Palette; @@ -521,52 +521,52 @@ inline void ColorMask::GetColorFor8Bit( BitmapColor& rColor, const sal_uInt8* pP inline void ColorMask::SetColorFor8Bit( const BitmapColor& rColor, sal_uInt8* pPixel ) const { - *pPixel = (sal_uInt8) COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, 0/*nAlphaChannel*/ ); + *pPixel = static_cast(COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, 0/*nAlphaChannel*/ )); } inline void ColorMask::GetColorFor16BitMSB( BitmapColor& rColor, const sal_uInt8* pPixel ) const { - const sal_uInt32 nVal = pPixel[ 1 ] | ( (sal_uInt32) pPixel[ 0 ] << 8 ); + const sal_uInt32 nVal = pPixel[ 1 ] | ( static_cast(pPixel[ 0 ]) << 8 ); MASK_TO_COLOR( nVal, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, rColor ); } inline void ColorMask::SetColorFor16BitMSB( const BitmapColor& rColor, sal_uInt8* pPixel ) const { - const sal_uInt16 nVal = (sal_uInt16)COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, 0/*nAlphaChannel*/ ); + const sal_uInt16 nVal = static_cast(COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, 0/*nAlphaChannel*/ )); - pPixel[ 0 ] = (sal_uInt8)(nVal >> 8); - pPixel[ 1 ] = (sal_uInt8) nVal; + pPixel[ 0 ] = static_cast(nVal >> 8); + pPixel[ 1 ] = static_cast(nVal); } inline void ColorMask::GetColorFor16BitLSB( BitmapColor& rColor, const sal_uInt8* pPixel ) const { - const sal_uInt32 nVal = pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8 ); + const sal_uInt32 nVal = pPixel[ 0 ] | ( static_cast(pPixel[ 1 ]) << 8 ); MASK_TO_COLOR( nVal, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, rColor ); } inline void ColorMask::SetColorFor16BitLSB( const BitmapColor& rColor, sal_uInt8* pPixel ) const { - const sal_uInt16 nVal = (sal_uInt16)COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, 0/*nAlphaChannel*/ ); + const sal_uInt16 nVal = static_cast(COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, 0/*nAlphaChannel*/ )); - pPixel[ 0 ] = (sal_uInt8) nVal; - pPixel[ 1 ] = (sal_uInt8)(nVal >> 8); + pPixel[ 0 ] = static_cast(nVal); + pPixel[ 1 ] = static_cast(nVal >> 8); } inline void ColorMask::GetColorFor32Bit( BitmapColor& rColor, const sal_uInt8* pPixel ) const { - const sal_uInt32 nVal = (sal_uInt32) pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8 ) | - ( (sal_uInt32) pPixel[ 2 ] << 16 ) | ( (sal_uInt32) pPixel[ 3 ] << 24 ); + const sal_uInt32 nVal = static_cast(pPixel[ 0 ]) | ( static_cast(pPixel[ 1 ]) << 8 ) | + ( static_cast(pPixel[ 2 ]) << 16 ) | ( static_cast(pPixel[ 3 ]) << 24 ); MASK_TO_COLOR( nVal, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, rColor ); } inline void ColorMask::GetColorAndAlphaFor32Bit( BitmapColor& rColor, sal_uInt8& rAlpha, const sal_uInt8* pPixel ) const { - const sal_uInt32 nVal = (sal_uInt32) pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8 ) | - ( (sal_uInt32) pPixel[ 2 ] << 16 ) | ( (sal_uInt32) pPixel[ 3 ] << 24 ); - rAlpha = (sal_uInt8)(nVal >> 24); + const sal_uInt32 nVal = static_cast(pPixel[ 0 ]) | ( static_cast(pPixel[ 1 ]) << 8 ) | + ( static_cast(pPixel[ 2 ]) << 16 ) | ( static_cast(pPixel[ 3 ]) << 24 ); + rAlpha = static_cast(nVal >> 24); MASK_TO_COLOR( nVal, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, rColor ); } @@ -574,10 +574,10 @@ inline void ColorMask::GetColorAndAlphaFor32Bit( BitmapColor& rColor, sal_uInt8& inline void ColorMask::SetColorFor32Bit( const BitmapColor& rColor, sal_uInt8* pPixel ) const { const sal_uInt32 nVal = COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, 0/*nAlphaChannel*/ ); - pPixel[ 0 ] = (sal_uInt8) nVal; - pPixel[ 1 ] = (sal_uInt8) ( nVal >> 8 ); - pPixel[ 2 ] = (sal_uInt8) ( nVal >> 16 ); - pPixel[ 3 ] = (sal_uInt8) ( nVal >> 24 ); + pPixel[ 0 ] = static_cast(nVal); + pPixel[ 1 ] = static_cast( nVal >> 8 ); + pPixel[ 2 ] = static_cast( nVal >> 16 ); + pPixel[ 3 ] = static_cast( nVal >> 24 ); } #endif // INCLUDED_VCL_SALBTYPE_HXX diff --git a/include/vcl/salgtype.hxx b/include/vcl/salgtype.hxx index df708b4fe196..51f81d6c737b 100644 --- a/include/vcl/salgtype.hxx +++ b/include/vcl/salgtype.hxx @@ -38,10 +38,10 @@ constexpr SalColor MAKE_SALCOLOR(sal_uInt8 r, sal_uInt8 g, sal_uInt8 b) { return sal_uInt32(b) | (sal_uInt32(g) << 8) | (sal_uInt32(r) << 16); } -#define SALCOLOR_RED( n ) ((sal_uInt8)((n)>>16)) -#define SALCOLOR_GREEN( n ) ((sal_uInt8)(((sal_uInt16)(n)) >> 8)) -#define SALCOLOR_BLUE( n ) ((sal_uInt8)(n)) -#define SALCOLOR_NONE (~(SalColor)0) +#define SALCOLOR_RED( n ) (static_cast((n)>>16)) +#define SALCOLOR_GREEN( n ) (static_cast((static_cast(n)) >> 8)) +#define SALCOLOR_BLUE( n ) (static_cast(n)) +#define SALCOLOR_NONE (~SalColor(0)) // must equal to class Point struct SalPoint diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index ad011c2fa627..d56000da2042 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -41,8 +41,8 @@ namespace o3tl template<> struct typed_flags : is_typed_flags {}; } -#define SPLITWINDOW_APPEND ((sal_uInt16)0xFFFF) -#define SPLITWINDOW_ITEM_NOTFOUND ((sal_uInt16)0xFFFF) +#define SPLITWINDOW_APPEND (sal_uInt16(0xFFFF)) +#define SPLITWINDOW_ITEM_NOTFOUND (sal_uInt16(0xFFFF)) class VCL_DLLPUBLIC SplitWindow : public DockingWindow { diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 362280e28de5..8ce894a87630 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -50,9 +50,9 @@ namespace o3tl template<> struct typed_flags : is_typed_flags {}; } -#define STATUSBAR_APPEND ((sal_uInt16)0xFFFF) -#define STATUSBAR_ITEM_NOTFOUND ((sal_uInt16)0xFFFF) -#define STATUSBAR_OFFSET ((long)5) +#define STATUSBAR_APPEND (sal_uInt16(0xFFFF)) +#define STATUSBAR_ITEM_NOTFOUND (sal_uInt16(0xFFFF)) +#define STATUSBAR_OFFSET (long(5)) class VCL_DLLPUBLIC StatusBar : public vcl::Window diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index 4b48874ab40e..660c89642c83 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -34,8 +34,8 @@ class PushButton; class ListBox; #ifndef TAB_APPEND -#define TAB_APPEND ((sal_uInt16)0xFFFF) -#define TAB_PAGE_NOTFOUND ((sal_uInt16)0xFFFF) +#define TAB_APPEND (sal_uInt16(0xFFFF)) +#define TAB_PAGE_NOTFOUND (sal_uInt16(0xFFFF)) #endif /* !TAB_APPEND */ #define TAB_OFFSET 3 diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 8a98542f8ba4..eeab33c30104 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -40,10 +40,10 @@ struct ImplToolBoxPrivateData; class ImplTrackRect; class PopupMenu; -#define TOOLBOX_STYLE_FLAT ((sal_uInt16)0x0004) +#define TOOLBOX_STYLE_FLAT (sal_uInt16(0x0004)) // item ids in the custom menu may not exceed this constant -#define TOOLBOX_MENUITEM_START ((sal_uInt16)0x1000) +#define TOOLBOX_MENUITEM_START (sal_uInt16(0x1000)) // defines for the menubutton enum class ToolBoxMenuType { -- cgit