i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* style cleanup, new style casts, license header updates

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24113 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexandre Deckner
2008-02-25 13:36:46 +00:00
parent 4d49ac789d
commit ad93c2f5eb
10 changed files with 435 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/keymap/Keymap.cpp
+8 -14
View File
@@ -1,17 +1,11 @@
// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
//
// Copyright (c) 2004, Haiku
//
// This software is part of the Haiku distribution and is covered
// by the Haiku license.
//
//
// File: Keymap.cpp
// Author: Sandor Vroemisse, Jérôme Duval
// Description: Keymap Preferences
// Created : July 12, 2004
//
// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
/*
* Copyright 2004-2008 Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* Sandor Vroemisse
* Jérôme Duval
*/
#include "Keymap.h"
#include <stdio.h>
src/preferences/keymap/Keymap.h
+7 -14
View File
@@ -1,17 +1,10 @@
// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
//
// Copyright (c) 2004, Haiku
//
// This software is part of the Haiku distribution and is covered
// by the Haiku license.
//
//
// File: Keymap.h
// Author: Jérôme Duval
// Description: Keymap Preferences
// Created : July 12, 2004
//
// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
/*
* Copyright 2004-2008 Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* Jérôme Duval
*/
#ifndef KEYMAP_H
#define KEYMAP_H
src/preferences/keymap/KeymapApplication.cpp
+2 -3
View File
@@ -1,13 +1,12 @@
/*
* Copyright 2004-2006, Haiku. All rights reserved.
* Copyright 2004-2006 Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors in chronological order:
* Authors:
* Sandor Vroemisse
* Jérôme Duval
*/
#include "KeymapApplication.h"
src/preferences/keymap/KeymapApplication.h
+3 -2
View File
@@ -1,11 +1,12 @@
/*
* Copyright 2004-2006, Haiku. All rights reserved.
* Copyright 2004-2006 Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors in chronological order:
* Authors:
* Sandor Vroemisse
* Jérôme Duval
*/
#ifndef KEYMAP_APPLICATION_H
#define KEYMAP_APPLICATION_H
src/preferences/keymap/KeymapListItem.cpp
+8 -14
View File
@@ -1,17 +1,11 @@
// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
//
// Copyright (c) 2004, Haiku
//
// This software is part of the Haiku distribution and is covered
// by the Haiku license.
//
//
// File: KeymapListItem.cpp
// Author: Sandor Vroemisse, Jérôme Duval
// Description: Keymap Preferences
// Created : July 12, 2004
//
// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
/*
* Copyright 2004-2006 Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* Sandor Vroemisse
* Jérôme Duval
*/
/*
* A BStringItem modified such that it holds
src/preferences/keymap/KeymapListItem.h
+8 -14
View File
@@ -1,17 +1,11 @@
// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
//
// Copyright (c) 2004, Haiku
//
// This software is part of the Haiku distribution and is covered
// by the Haiku license.
//
//
// File: KeymapListItem.h
// Author: Sandor Vroemisse, Jérôme Duval
// Description: Keymap Preferences
// Created : July 12, 2004
//
// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
/*
* Copyright 2004-2006 Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* Sandor Vroemisse
* Jérôme Duval
*/
/*
* A BStringItem modified such that it holds
src/preferences/keymap/KeymapTextView.cpp
+7 -14
View File
@@ -1,17 +1,10 @@
// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
//
// Copyright (c) 2004, Haiku
//
// This software is part of the Haiku distribution and is covered
// by the Haiku license.
//
//
// File: KeymapTextView.cpp
// Author: Jérôme Duval
// Description: Keymap Preferences
// Created : July 14, 2004
//
// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
/*
* Copyright 2004-2006 Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* Jérôme Duval
*/
#include "KeymapTextView.h"
src/preferences/keymap/KeymapTextView.h
+7 -14
View File
@@ -1,17 +1,10 @@
// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
//
// Copyright (c) 2004, Haiku
//
// This software is part of the Haiku distribution and is covered
// by the Haiku license.
//
//
// File: KeymapTextView.h
// Author: Jérôme Duval
// Description: Keymap Preferences
// Created : July 14, 2004
//
// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
/*
* Copyright 2004-2006 Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* Jérôme Duval
*/
#ifndef KEYMAPTEXTVIEW_H
#define KEYMAPTEXTVIEW_H
src/preferences/keymap/KeymapWindow.cpp
+56 -42
View File
@@ -1,17 +1,12 @@
// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
//
// Copyright (c) 2004, Haiku
//
// This software is part of the Haiku distribution and is covered
// by the Haiku license.
//
//
// File: KeymapWindow.cpp
// Author: Sandor Vroemisse, Jérôme Duval
// Description: Keymap Preferences
// Created : July 12, 2004
//
// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
/*
* Copyright 2004-2008 Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* Sandor Vroemisse
* Jérôme Duval
* Alexandre Deckner, [email protected]
*/
#include <Alert.h>
#include <Application.h>
@@ -84,8 +79,8 @@ KeymapWindow::KeymapWindow()
placeholderView->AddChild(fUseButton);
// The 'Revert' button
fRevertButton = new BButton(BRect(442,200, 515,220), "revertButton", "Revert",
new BMessage( REVERT ));
fRevertButton = new BButton(BRect(442, 200, 515, 220), "revertButton",
"Revert", new BMessage(REVERT));
placeholderView->AddChild(fRevertButton);
BPath path;
@@ -213,7 +208,7 @@ KeymapWindow::AddMaps(BView *placeholderView)
bounds = BRect(13, 130, 103, 200);
fUserListView = new BListView(bounds, "userList");
// '(Current)'
KeymapListItem *currentKeymapItem = (KeymapListItem*)fUserListView->FirstItem();
KeymapListItem *currentKeymapItem = static_cast<KeymapListItem*>(fUserListView->FirstItem());
if (currentKeymapItem != NULL)
fUserListView->AddItem(currentKeymapItem);
// Saved keymaps
@@ -298,7 +293,7 @@ KeymapWindow::MessageReceived( BMessage* message )
case SYSTEM_MAP_SELECTED:
{
KeymapListItem *keymapListItem =
(KeymapListItem*)fSystemListView->ItemAt(fSystemListView->CurrentSelection());
static_cast<KeymapListItem*>(fSystemListView->ItemAt(fSystemListView->CurrentSelection()));
if (keymapListItem) {
fCurrentMap.Load(keymapListItem->KeymapEntry());
fMapView->Invalidate();
@@ -311,7 +306,7 @@ KeymapWindow::MessageReceived( BMessage* message )
case USER_MAP_SELECTED:
{
KeymapListItem *keymapListItem =
(KeymapListItem*)fUserListView->ItemAt(fUserListView->CurrentSelection());
static_cast<KeymapListItem*>(fUserListView->ItemAt(fUserListView->CurrentSelection()));
if (keymapListItem) {
fCurrentMap.Load(keymapListItem->KeymapEntry());
fMapView->Invalidate();
@@ -360,7 +355,7 @@ void
KeymapWindow::FillSystemMaps()
{
BListItem *item;
while ((item = fSystemListView->RemoveItem((int32)0)))
while ((item = fSystemListView->RemoveItem(static_cast<int32>(0))))
delete item;
BPath path;
@@ -383,7 +378,7 @@ void
KeymapWindow::FillUserMaps()
{
BListItem *item;
while ((item = fUserListView->RemoveItem((int32)0)))
while ((item = fUserListView->RemoveItem(static_cast<int32>(0))))
delete item;
BPath path;
@@ -1047,12 +1042,15 @@ MapView::_DrawBackground(){
fOffscreenView->StrokeLine(r.LeftBottom(), r.LeftTop());
fOffscreenView->StrokeLine(r.RightTop());
fOffscreenView->SetHighColor(80, 80, 80);
fOffscreenView->StrokeLine(r.LeftBottom()+BPoint(1,0), r.LeftTop()+BPoint(1,1));
fOffscreenView->StrokeLine(r.LeftBottom() + BPoint(1, 0),
r.LeftTop() + BPoint(1, 1));
fOffscreenView->StrokeLine(r.RightTop() + BPoint(0,1));
fOffscreenView->SetHighColor(136, 136, 136);
fOffscreenView->StrokeLine(r.LeftBottom()+BPoint(2,-1), r.LeftTop()+BPoint(2,2));
fOffscreenView->StrokeLine(r.LeftBottom() + BPoint(2, -1),
r.LeftTop() + BPoint(2, 2));
fOffscreenView->StrokeLine(r.RightTop()+BPoint(0, 2));
fOffscreenView->StrokeLine(r.LeftBottom()+BPoint(1,0), r.LeftBottom()+BPoint(1,0));
fOffscreenView->StrokeLine(r.LeftBottom()+BPoint(1, 0),
r.LeftBottom() + BPoint(1, 0));
fOffscreenView->SetHighColor(255, 255, 255);
fOffscreenView->StrokeLine(r.RightTop() + BPoint(0, 1), r.RightBottom());
fOffscreenView->StrokeLine(r.LeftBottom() + BPoint(2, 0));
@@ -1106,7 +1104,8 @@ MapView::_DrawLocksBackground()
fOffscreenView->StrokeLine(lightRect.LeftBottom(), lightRect.RightBottom());
fOffscreenView->StrokeLine(lightRect.RightTop());
fOffscreenView->SetHighColor(255, 255, 255);
fOffscreenView->StrokeLine(BPoint(lightRect.right-1, lightRect.top), lightRect.LeftTop());
fOffscreenView->StrokeLine(BPoint(lightRect.right - 1, lightRect.top),
lightRect.LeftTop());
fOffscreenView->StrokeLine(BPoint(lightRect.left, lightRect.bottom - 1));
fOffscreenView->SetHighColor(0, 55, 0);
fOffscreenView->FillRect(lightRect.InsetByCopy(1, 1));
@@ -1118,7 +1117,8 @@ MapView::_DrawLocksBackground()
fOffscreenView->StrokeLine(lightRect.LeftBottom(), lightRect.RightBottom());
fOffscreenView->StrokeLine(lightRect.RightTop());
fOffscreenView->SetHighColor(255, 255, 255);
fOffscreenView->StrokeLine(BPoint(lightRect.right-1, lightRect.top), lightRect.LeftTop());
fOffscreenView->StrokeLine(BPoint(lightRect.right - 1, lightRect.top),
lightRect.LeftTop());
fOffscreenView->StrokeLine(BPoint(lightRect.left, lightRect.bottom - 1));
fOffscreenView->SetHighColor(0, 55, 0);
fOffscreenView->FillRect(lightRect.InsetByCopy(1, 1));
@@ -1130,7 +1130,8 @@ MapView::_DrawLocksBackground()
fOffscreenView->StrokeLine(lightRect.LeftBottom(), lightRect.RightBottom());
fOffscreenView->StrokeLine(lightRect.RightTop());
fOffscreenView->SetHighColor(255, 255, 255);
fOffscreenView->StrokeLine(BPoint(lightRect.right-1, lightRect.top), lightRect.LeftTop());
fOffscreenView->StrokeLine(BPoint(lightRect.right - 1, lightRect.top),
lightRect.LeftTop());
fOffscreenView->StrokeLine(BPoint(lightRect.left, lightRect.bottom - 1));
fOffscreenView->SetHighColor(0, 55, 0);
fOffscreenView->FillRect(lightRect.InsetByCopy(1, 1));
@@ -1191,7 +1192,8 @@ MapView::_DrawKeysBackground()
bool vertical = fKeysVertical[keyCode];
int32 deadKey = fCurrentMap->IsDeadKey(keyCode, fOldKeyInfo.modifiers);
bool secondDeadKey = fCurrentMap->IsDeadSecondKey(keyCode, fOldKeyInfo.modifiers, fActiveDeadKey);
bool secondDeadKey = fCurrentMap->IsDeadSecondKey(keyCode,
fOldKeyInfo.modifiers, fActiveDeadKey);
r.InsetBySelf(1, 1);
if (!secondDeadKey && deadKey == 0) {
@@ -1200,14 +1202,19 @@ MapView::_DrawKeysBackground()
fOffscreenView->BeginLineArray(14);
rgb_color color1 = {200, 200, 200};
fOffscreenView->AddLine(BPoint(r.left, r.bottom-1), r.LeftTop(), color1);
fOffscreenView->AddLine(r.LeftTop(), BPoint(r.left+3, r.top), color1);
fOffscreenView->AddLine(BPoint(r.left, r.bottom - 1), r.LeftTop(),
color1);
fOffscreenView->AddLine(r.LeftTop(), BPoint(r.left+3, r.top),
color1);
rgb_color color2 = {184, 184, 184};
fOffscreenView->AddLine(BPoint(r.left+3, r.top), BPoint(r.left+6, r.top), color2);
fOffscreenView->AddLine(BPoint(r.left + 3, r.top),
BPoint(r.left + 6, r.top), color2);
rgb_color color3 = {168, 168, 168};
fOffscreenView->AddLine(BPoint(r.left+6, r.top), BPoint(r.left+9, r.top), color3);
fOffscreenView->AddLine(BPoint(r.left + 6, r.top),
BPoint(r.left + 9, r.top), color3);
rgb_color color4 = {152, 152, 152};
fOffscreenView->AddLine(BPoint(r.left+9, r.top), BPoint(r.right-1, r.top), color4);
fOffscreenView->AddLine(BPoint(r.left + 9, r.top),
BPoint(r.right - 1, r.top), color4);
r.InsetBySelf(1,1);
fOffscreenView->SetHighColor(255, 255, 255);
@@ -1218,14 +1225,21 @@ MapView::_DrawKeysBackground()
rgb_color color5 = {160, 160, 160};
fOffscreenView->AddLine(r.LeftBottom(), r.LeftBottom(), color5);
rgb_color color7 = {64, 64, 64};
fOffscreenView->AddLine(r.RightBottom(), BPoint(r.right, r.bottom-1), color7);
fOffscreenView->AddLine(BPoint(r.right, r.bottom-1), BPoint(r.right, r.top-1), color6);
fOffscreenView->AddLine(BPoint(r.right, r.top-1), r.RightTop(), color5);
fOffscreenView->AddLine(r.RightBottom(),
BPoint(r.right, r.bottom - 1), color7);
fOffscreenView->AddLine(BPoint(r.right, r.bottom - 1),
BPoint(r.right, r.top - 1), color6);
fOffscreenView->AddLine(BPoint(r.right, r.top - 1), r.RightTop(),
color5);
rgb_color color8 = {255, 255, 255};
fOffscreenView->AddLine(BPoint(r.left+1, r.bottom-1), BPoint(r.left+2, r.bottom-1), color8);
fOffscreenView->AddLine(BPoint(r.left+2, r.bottom-1), BPoint(r.right-1, r.bottom-1), color1);
fOffscreenView->AddLine(BPoint(r.right-1, r.bottom-1), BPoint(r.right-1, r.bottom-2), color5);
fOffscreenView->AddLine(BPoint(r.right-1, r.bottom-2), BPoint(r.right-1, r.top+1), color1);
fOffscreenView->AddLine(BPoint(r.left + 1, r.bottom - 1),
BPoint(r.left + 2, r.bottom - 1), color8);
fOffscreenView->AddLine(BPoint(r.left + 2, r.bottom - 1),
BPoint(r.right - 1, r.bottom - 1), color1);
fOffscreenView->AddLine(BPoint(r.right - 1, r.bottom - 1),
BPoint(r.right - 1, r.bottom - 2), color5);
fOffscreenView->AddLine(BPoint(r.right - 1, r.bottom - 2),
BPoint(r.right - 1, r.top + 1), color1);
fOffscreenView->EndLineArray();
}
@@ -1423,8 +1437,8 @@ MapView::MessageReceived(BMessage *msg)
const uint8 *states;
ssize_t size;
if ((msg->FindData("states", B_UINT8_TYPE, (const void **)&states, &size)!=B_OK)
|| (msg->FindInt32("modifiers", (int32 *)&info.modifiers)!=B_OK))
if ((msg->FindData("states", B_UINT8_TYPE, reinterpret_cast<const void **>(&states), &size) != B_OK)
|| (msg->FindInt32("modifiers", reinterpret_cast<int32 *>(&info.modifiers)) != B_OK))
break;
if (fOldKeyInfo.modifiers != info.modifiers) {
src/preferences/keymap/KeymapWindow.h
+9 -14
View File
@@ -1,17 +1,12 @@
// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
//
// Copyright (c) 2004, Haiku
//
// This software is part of the Haiku distribution and is covered
// by the Haiku license.
//
//
// File: KeymapWindow.h
// Author: Sandor Vroemisse, Jérôme Duval
// Description: Keymap Preferences
// Created : July 12, 2004
//
// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
/*
* Copyright 2004-2008 Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* Sandor Vroemisse
* Jérôme Duval
* Alexandre Deckner, [email protected]
*/
#ifndef KEYMAP_WINDOW_H
#define KEYMAP_WINDOW_H