From d9b872d03c844b09c79e9647f668eef70b84fee6 Mon Sep 17 00:00:00 2001 From: Rob Gill Date: Wed, 23 Jan 2019 23:51:26 +1000 Subject: [PATCH] src/preferences Code formatting * No functional change code formatting changes only Change-Id: Id861adea9266a9ccbf9925d36e4a2bad85b640b7 Reviewed-on: https://review.haiku-os.org/c/895 Reviewed-by: waddlesplash --- .../appearance/LookAndFeelSettingsView.cpp | 2 +- src/preferences/bluetooth/InquiryPanel.cpp | 6 +++--- src/preferences/joysticks/CalibWin.cpp | 10 +++++----- src/preferences/joysticks/MessageWin.cpp | 16 ++++++++-------- src/preferences/network/InterfaceListItem.h | 10 +++++----- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/preferences/appearance/LookAndFeelSettingsView.cpp b/src/preferences/appearance/LookAndFeelSettingsView.cpp index 07ae697067..1dc2071667 100644 --- a/src/preferences/appearance/LookAndFeelSettingsView.cpp +++ b/src/preferences/appearance/LookAndFeelSettingsView.cpp @@ -113,7 +113,7 @@ LookAndFeelSettingsView::LookAndFeelSettingsView(const char* name) // control layout BLayoutBuilder::Grid<>(this, B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING) .Add(fDecorMenuField->CreateLabelLayoutItem(), 0, 0) - .Add(fDecorMenuField->CreateMenuBarLayoutItem(), 1, 0) + .Add(fDecorMenuField->CreateMenuBarLayoutItem(), 1, 0) .Add(fDecorInfoButton, 2, 0) .Add(scrollBarLabel, 0, 1) .Add(arrowStyleBox, 1, 1) diff --git a/src/preferences/bluetooth/InquiryPanel.cpp b/src/preferences/bluetooth/InquiryPanel.cpp index 3e2528617a..a1dd6b793e 100644 --- a/src/preferences/bluetooth/InquiryPanel.cpp +++ b/src/preferences/bluetooth/InquiryPanel.cpp @@ -281,10 +281,10 @@ InquiryPanel::MessageReceived(BMessage* message) ((DeviceListItem*)fRemoteList->ItemAt(retrievalIndex)) ->SetDevice((BluetoothDevice*) fDiscoveryAgent ->RetrieveDevices(0).ItemAt(retrievalIndex)); - fRemoteList->InvalidateItem(retrievalIndex); + fRemoteList->InvalidateItem(retrievalIndex); - retrievalIndex++; - labelPlaced = false; + retrievalIndex++; + labelPlaced = false; } BMessageRunner::StartSending(fMessenger, fRetrieveMessage, 500000, 1); diff --git a/src/preferences/joysticks/CalibWin.cpp b/src/preferences/joysticks/CalibWin.cpp index 1ecd17e6d0..b62415ce05 100644 --- a/src/preferences/joysticks/CalibWin.cpp +++ b/src/preferences/joysticks/CalibWin.cpp @@ -58,18 +58,18 @@ CalibWin::CalibWin(BRect frame,const char *title, window_look look, // Adding object fBox->AddChild(fStringView3); - + fView->AddChild(fButton3); fView->AddChild(fButton4); fView->AddChild(fBox); - + fView->AddChild(fStringView4); fView->AddChild(fStringView5); fView->AddChild(fStringView6); fView->AddChild(fStringView7); fView->AddChild(fStringView8); fView->AddChild(fStringView9); - + fView->AddChild(fButton5); fView->AddChild(fButton6); fView->AddChild(fButton7); @@ -78,8 +78,8 @@ CalibWin::CalibWin(BRect frame,const char *title, window_look look, fView->AddChild(fButton10); fView->AddChild(fButton11); fView->AddChild(fButton12); - - AddChild(fView); + + AddChild(fView); } diff --git a/src/preferences/joysticks/MessageWin.cpp b/src/preferences/joysticks/MessageWin.cpp index da74ee1b07..9e8c1ebcb9 100644 --- a/src/preferences/joysticks/MessageWin.cpp +++ b/src/preferences/joysticks/MessageWin.cpp @@ -24,9 +24,9 @@ MessageWin::MessageWin(BRect parentFrame, const char *title, fBox->SetViewUIColor(B_PANEL_BACKGROUND_COLOR); fBox->SetLowColor(fBox->ViewColor()); - // Rects for the text view - BRect outside(fBox->Bounds()); - outside.InsetBy(10, 10); + // Rects for the text view + BRect outside(fBox->Bounds()); + outside.InsetBy(10, 10); BRect insider(outside); insider.OffsetTo(B_ORIGIN); @@ -37,7 +37,7 @@ MessageWin::MessageWin(BRect parentFrame, const char *title, fBox->AddChild(fText); AddChild(fBox); - + /* Relocate the window to the center of what its being given */ ResizeTo(parentFrame.Width(), floor(parentFrame.Height() / 3)); MoveBy(0, floor(parentFrame.Height() / 2 - (parentFrame.Height()/3) / 2 )); @@ -47,10 +47,10 @@ MessageWin::MessageWin(BRect parentFrame, const char *title, void MessageWin::SetText(const char* str) { - Lock(); - fText->SetText(str); - fText->Flush(); - Unlock(); + Lock(); + fText->SetText(str); + fText->Flush(); + Unlock(); } diff --git a/src/preferences/network/InterfaceListItem.h b/src/preferences/network/InterfaceListItem.h index bdee0214e2..6fe25317d6 100644 --- a/src/preferences/network/InterfaceListItem.h +++ b/src/preferences/network/InterfaceListItem.h @@ -18,11 +18,11 @@ enum BNetworkInterfaceType { - B_NETWORK_INTERFACE_TYPE_WIFI = 'wifi', - B_NETWORK_INTERFACE_TYPE_ETHERNET = 'ethr', - B_NETWORK_INTERFACE_TYPE_DIAL_UP = 'dial', - B_NETWORK_INTERFACE_TYPE_VPN = 'nvpn', - B_NETWORK_INTERFACE_TYPE_OTHER = 'othe', + B_NETWORK_INTERFACE_TYPE_WIFI = 'wifi', + B_NETWORK_INTERFACE_TYPE_ETHERNET = 'ethr', + B_NETWORK_INTERFACE_TYPE_DIAL_UP = 'dial', + B_NETWORK_INTERFACE_TYPE_VPN = 'nvpn', + B_NETWORK_INTERFACE_TYPE_OTHER = 'othe', };