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

gcc4 build fixes.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26091 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rene Gollent
2008-06-23 00:54:54 +00:00
parent 7f0e4c8577
commit 4079af86ca
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/bluetooth/CommandManager.cpp
+1
View File
@@ -10,6 +10,7 @@
#include <bluetooth/HCI/btHCI_command.h> #include <bluetooth/HCI/btHCI_command.h>
#include <malloc.h> #include <malloc.h>
#include <string.h>
#include "CommandManager.h" #include "CommandManager.h"
src/kits/bluetooth/UI/PincodeWindow.cpp
+11 -12
View File
@@ -42,7 +42,7 @@ namespace Bluetooth {
PincodeView::PincodeView(BRect rect) : BView(rect,"View", B_FOLLOW_NONE, B_WILL_DRAW ), fMessage(NULL) PincodeView::PincodeView(BRect rect) : BView(rect,"View", B_FOLLOW_NONE, B_WILL_DRAW ), fMessage(NULL)
{ {
BRect rect; BRect rect1;
BRect rect2; BRect rect2;
SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
@@ -51,28 +51,27 @@ PincodeView::PincodeView(BRect rect) : BView(rect,"View", B_FOLLOW_NONE, B_WILL_
fMessage->SetFont(be_bold_font); fMessage->SetFont(be_bold_font);
fMessage->ResizeToPreferred(); fMessage->ResizeToPreferred();
fMessage->MoveBy(20, 20); fMessage->MoveBy(20, 20);
rect = fMessage->Frame(); rect1 = fMessage->Frame();
fRemoteInfo = new BStringView(BRect(rect.left, rect.bottom + V_SEPARATION , 0 , 0), fRemoteInfo = new BStringView(BRect(rect1.left, rect1.bottom + V_SEPARATION , 0 , 0),
"bdaddr","BD_ADDR: ", B_FOLLOW_ALL_SIDES); "bdaddr","BD_ADDR: ", B_FOLLOW_ALL_SIDES);
fRemoteInfo->ResizeToPreferred(); fRemoteInfo->ResizeToPreferred();
rect = fRemoteInfo->Frame(); rect = fRemoteInfo->Frame();
// TODO: IT CANNOT BE MORE THAN 16 BYTES // TODO: IT CANNOT BE MORE THAN 16 BYTES
fPincodeText = new BTextControl(BRect(rect.left, rect.bottom + V_SEPARATION , 0, 0), fPincodeText = new BTextControl(BRect(rect1.left, rect1.bottom + V_SEPARATION , 0, 0),
"pincode TextControl","PIN code:", "", NULL); "pincode TextControl","PIN code:", "", NULL);
fPincodeText->ResizeToPreferred(); fPincodeText->ResizeToPreferred();
rect = fPincodeText->Frame(); rect1 = fPincodeText->Frame();
fAcceptButton = new BButton(BRect(rect.left , rect.bottom + V_SEPARATION ,0, 0 ), fAcceptButton = new BButton(BRect(rect1.left , rect1.bottom + V_SEPARATION ,0, 0 ),
"fAcceptButton","Pair",new BMessage(MSG_ACCEPT_BUTTON)); "fAcceptButton","Pair",new BMessage(MSG_ACCEPT_BUTTON));
fAcceptButton->ResizeToPreferred(); fAcceptButton->ResizeToPreferred();
rect = fAcceptButton->Frame(); rect1 = fAcceptButton->Frame();
fCancelButton = new BButton(BRect(rect.right + H_SEPARATION , rect.top , 0 , 0 ), fCancelButton = new BButton(BRect(rect1.right + H_SEPARATION , rect1.top , 0 , 0 ),
"fCancelButton","Cancel",new BMessage(MSG_CANCEL_BUTTON)); "fCancelButton","Cancel",new BMessage(MSG_CANCEL_BUTTON));
fCancelButton->ResizeToPreferred(); fCancelButton->ResizeToPreferred();
rect = fCancelButton->Frame();
this->AddChild(fMessage); this->AddChild(fMessage);
this->AddChild(fPincodeText); this->AddChild(fPincodeText);
@@ -82,9 +81,9 @@ PincodeView::PincodeView(BRect rect) : BView(rect,"View", B_FOLLOW_NONE, B_WILL_
this->AddChild(fRemoteInfo); this->AddChild(fRemoteInfo);
// Now resize the the view according all what we found here // Now resize the the view according all what we found here
rect = fMessage->Frame(); rect1 = fMessage->Frame();
rect2 = fCancelButton->Frame(); rect2 = fCancelButton->Frame();
ResizeTo(rect.right + 15 , rect2.bottom +15 ); ResizeTo(rect1.right + 15 , rect2.bottom +15 );
} }
@@ -132,7 +131,7 @@ void PincodeWindow::MessageReceived(BMessage *msg)
int8 bt_status = BT_ERROR; int8 bt_status = BT_ERROR;
void* command = buildPinCodeRequestReply(fRemoteDevice->GetBluetoothAddress(), strlen(fView->fPincodeText->Text()), void* command = buildPinCodeRequestReply(fRemoteDevice->GetBluetoothAddress(), strlen(fView->fPincodeText->Text()),
(char[16])fView->fPincodeText->Text(), &size); (char*)fView->fPincodeText->Text(), &size);
if (command == NULL) { if (command == NULL) {
break; break;