hrev46641 adds 1 changeset to branch 'master' old head: 7727da7d3dbe73479755107dbaa377d7a803876b new head: f6c5dbf81cf723abdbdae12fc4ec81c780ed2190 overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=f6c5dbf+%5E7727da7 ---------------------------------------------------------------------------- f6c5dbf: Some more code style corrections of Keymap. [ Humdinger <humdingerb@xxxxxxxxx> ] ---------------------------------------------------------------------------- Revision: hrev46641 Commit: f6c5dbf81cf723abdbdae12fc4ec81c780ed2190 URL: http://cgit.haiku-os.org/haiku/commit/?id=f6c5dbf Author: Humdinger <humdingerb@xxxxxxxxx> Date: Fri Jan 3 18:44:12 2014 UTC ---------------------------------------------------------------------------- 6 files changed, 13 insertions(+), 13 deletions(-) src/preferences/keymap/KeyboardLayout.cpp | 2 +- src/preferences/keymap/KeyboardLayoutView.cpp | 12 ++++++------ src/preferences/keymap/Keymap.cpp | 4 ++-- src/preferences/keymap/KeymapWindow.cpp | 4 ++-- src/preferences/keymap/KeymapWindow.h | 2 +- src/preferences/keymap/ModifierKeysWindow.cpp | 2 +- ---------------------------------------------------------------------------- diff --git a/src/preferences/keymap/KeyboardLayout.cpp b/src/preferences/keymap/KeyboardLayout.cpp index d294201..2a7fd0b 100644 --- a/src/preferences/keymap/KeyboardLayout.cpp +++ b/src/preferences/keymap/KeyboardLayout.cpp @@ -99,7 +99,7 @@ KeyboardLayout::DefaultKeySize() int32 KeyboardLayout::IndexForModifier(int32 modifier) { - switch(modifier) { + switch (modifier) { case B_CAPS_LOCK: return 58; case B_NUM_LOCK: diff --git a/src/preferences/keymap/KeyboardLayoutView.cpp b/src/preferences/keymap/KeyboardLayoutView.cpp index 5a8fa79..cce873e 100644 --- a/src/preferences/keymap/KeyboardLayoutView.cpp +++ b/src/preferences/keymap/KeyboardLayoutView.cpp @@ -659,12 +659,12 @@ KeyboardLayoutView::_DrawKey(BView* view, BRect updateRect, const Key* key, 0.0f, 0.0f, 4.0f, 4.0f, base, background, pressed ? BControlLook::B_ACTIVATED : 0, BControlLook::B_LEFT_BORDER | BControlLook::B_RIGHT_BORDER - | BControlLook::B_BOTTOM_BORDER); + | BControlLook::B_BOTTOM_BORDER); be_control_look->DrawButtonBackground(view, bottomRight, updateRect, 0.0f, 0.0f, 4.0f, 4.0f, base, pressed ? BControlLook::B_ACTIVATED : 0, BControlLook::B_LEFT_BORDER | BControlLook::B_RIGHT_BORDER - | BControlLook::B_BOTTOM_BORDER); + | BControlLook::B_BOTTOM_BORDER); // clip out the bottom left corner bottomLeft.right += 1; @@ -1073,10 +1073,10 @@ BRect KeyboardLayoutView::_FrameFor(BRect keyFrame) { BRect rect; - rect.left = ceilf(keyFrame.left * fFactor); - rect.top = ceilf(keyFrame.top * fFactor); - rect.right = floorf((keyFrame.Width()) * fFactor + rect.left - fGap - 1); - rect.bottom = floorf((keyFrame.Height()) * fFactor + rect.top - fGap - 1); + rect.left = ceilf(keyFrame.left * fFactor); + rect.top = ceilf(keyFrame.top * fFactor); + rect.right = floorf((keyFrame.Width()) * fFactor + rect.left - fGap - 1); + rect.bottom = floorf((keyFrame.Height()) * fFactor + rect.top - fGap - 1); rect.OffsetBy(fOffset); return rect; diff --git a/src/preferences/keymap/Keymap.cpp b/src/preferences/keymap/Keymap.cpp index 0816da3..1234e8f 100644 --- a/src/preferences/keymap/Keymap.cpp +++ b/src/preferences/keymap/Keymap.cpp @@ -28,7 +28,7 @@ static const uint32 kModifierKeys = B_SHIFT_KEY | B_CAPS_LOCK | B_CONTROL_KEY static void -print_key(char *chars, int32 offset, bool last = false) +print_key(char* chars, int32 offset, bool last = false) { int size = chars[offset++]; @@ -46,7 +46,7 @@ print_key(char *chars, int32 offset, bool last = false) default: { // 2-, 3-, or 4-byte UTF-8 character - char *str = new char[size + 1]; + char* str = new char[size + 1]; strncpy(str, &chars[offset], size); str[size] = 0; fputs(str, stdout); diff --git a/src/preferences/keymap/KeymapWindow.cpp b/src/preferences/keymap/KeymapWindow.cpp index 8e0be18..1712175 100644 --- a/src/preferences/keymap/KeymapWindow.cpp +++ b/src/preferences/keymap/KeymapWindow.cpp @@ -466,8 +466,8 @@ KeymapWindow::_CreateMenu() for (int32 i = 0; i < numFamilies; i++) { if (get_font_family(i, &family, &flags) == B_OK) { - BMenuItem* item = - new BMenuItem(family, new BMessage(kMsgMenuFontChanged)); + BMenuItem* item + = new BMenuItem(family, new BMessage(kMsgMenuFontChanged)); fFontMenu->AddItem(item); if (!strcmp(family, currentFamily)) diff --git a/src/preferences/keymap/KeymapWindow.h b/src/preferences/keymap/KeymapWindow.h index 5796fe6..1ef7dc5 100644 --- a/src/preferences/keymap/KeymapWindow.h +++ b/src/preferences/keymap/KeymapWindow.h @@ -63,7 +63,7 @@ protected: status_t _GetCurrentKeymap(entry_ref& ref); BString _GetActiveKeymapName(); - bool _SelectCurrentMap(BListView *list); + bool _SelectCurrentMap(BListView* list); void _SelectCurrentMap(); status_t _GetSettings(BFile& file, int mode) const; diff --git a/src/preferences/keymap/ModifierKeysWindow.cpp b/src/preferences/keymap/ModifierKeysWindow.cpp index caed056..5f2851f 100644 --- a/src/preferences/keymap/ModifierKeysWindow.cpp +++ b/src/preferences/keymap/ModifierKeysWindow.cpp @@ -729,7 +729,7 @@ ModifierKeysWindow::_DuplicateKeys() uint32 left = 0; uint32 right = 0; - switch(key) { + switch (key) { case MENU_ITEM_SHIFT: left = fCurrentMap->left_shift_key; right = fCurrentMap->right_shift_key;