[haiku-commits] haiku: hrev44475 - src/kits/interface
- From: leavengood@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 6 Aug 2012 00:08:59 +0200 (CEST)
hrev44475 adds 1 changeset to branch 'master'
old head: 7483c98dece8f3606fc5d3fd746c0544f7e4b6dd
new head: 57c5b09e1a3d0f36f94cbab11c96842d782b8eaf
----------------------------------------------------------------------------
57c5b09: Use be_control_look != NULL everywhere in the Interface Kit.
Should not be a functional change. It is not in the Haiku Coding Guidelines
but
I feel like 'if (object != NULL)' is generally preferred to 'if (object)',
plus
in this case of be_control_look that is the more common style.
[ Ryan Leavengood <leavengood@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev44475
Commit: 57c5b09e1a3d0f36f94cbab11c96842d782b8eaf
URL: http://cgit.haiku-os.org/haiku/commit/?id=57c5b09
Author: Ryan Leavengood <leavengood@xxxxxxxxx>
Date: Sun Aug 5 21:55:37 2012 UTC
----------------------------------------------------------------------------
7 files changed, 7 insertions(+), 7 deletions(-)
src/kits/interface/BMCPrivate.cpp | 2 +-
src/kits/interface/CheckBox.cpp | 2 +-
src/kits/interface/RadioButton.cpp | 2 +-
src/kits/interface/ScrollBar.cpp | 2 +-
src/kits/interface/Slider.cpp | 2 +-
src/kits/interface/StatusBar.cpp | 2 +-
src/kits/interface/TextInput.cpp | 2 +-
----------------------------------------------------------------------------
diff --git a/src/kits/interface/BMCPrivate.cpp
b/src/kits/interface/BMCPrivate.cpp
index ed27041..56c4efa 100644
--- a/src/kits/interface/BMCPrivate.cpp
+++ b/src/kits/interface/BMCPrivate.cpp
@@ -407,7 +407,7 @@ _BMCMenuBar_::_Init(bool setMaxContentWidth)
bottom--;
#endif
- if (be_control_look)
+ if (be_control_look != NULL)
left = right = be_control_look->DefaultLabelSpacing();
SetItemMargins(left, top, right + fShowPopUpMarker ? 10 : 0, bottom);
diff --git a/src/kits/interface/CheckBox.cpp b/src/kits/interface/CheckBox.cpp
index 2501327..cde4220 100644
--- a/src/kits/interface/CheckBox.cpp
+++ b/src/kits/interface/CheckBox.cpp
@@ -96,7 +96,7 @@ BCheckBox::Archive(BMessage *archive, bool deep) const
void
BCheckBox::Draw(BRect updateRect)
{
- if (be_control_look) {
+ if (be_control_look != NULL) {
rgb_color base = ui_color(B_PANEL_BACKGROUND_COLOR);
uint32 flags = be_control_look->Flags(this);
diff --git a/src/kits/interface/RadioButton.cpp
b/src/kits/interface/RadioButton.cpp
index 191d28e..e3b3cfb 100644
--- a/src/kits/interface/RadioButton.cpp
+++ b/src/kits/interface/RadioButton.cpp
@@ -89,7 +89,7 @@ BRadioButton::Draw(BRect updateRect)
font_height fontHeight;
GetFontHeight(&fontHeight);
- if (be_control_look) {
+ if (be_control_look != NULL) {
rgb_color base = ui_color(B_PANEL_BACKGROUND_COLOR);
uint32 flags = be_control_look->Flags(this);
diff --git a/src/kits/interface/ScrollBar.cpp b/src/kits/interface/ScrollBar.cpp
index a12fdd3..971c596 100644
--- a/src/kits/interface/ScrollBar.cpp
+++ b/src/kits/interface/ScrollBar.cpp
@@ -1081,7 +1081,7 @@ BScrollBar::Draw(BRect updateRect)
}
// fill the clickable surface of the thumb
- if (be_control_look) {
+ if (be_control_look != NULL) {
be_control_look->DrawButtonBackground(this, rect,
updateRect,
normal, 0, BControlLook::B_ALL_BORDERS,
fOrientation);
} else {
diff --git a/src/kits/interface/Slider.cpp b/src/kits/interface/Slider.cpp
index 063c52b..a91b973 100644
--- a/src/kits/interface/Slider.cpp
+++ b/src/kits/interface/Slider.cpp
@@ -1000,7 +1000,7 @@ BSlider::DrawHashMarks()
BRect frame = HashMarksFrame();
BView* view = OffscreenView();
- if (be_control_look) {
+ if (be_control_look != NULL) {
rgb_color base = ui_color(B_PANEL_BACKGROUND_COLOR);
uint32 flags = be_control_look->Flags(this);
be_control_look->DrawSliderHashMarks(view, frame, frame, base,
diff --git a/src/kits/interface/StatusBar.cpp b/src/kits/interface/StatusBar.cpp
index b17062f..d346f11 100644
--- a/src/kits/interface/StatusBar.cpp
+++ b/src/kits/interface/StatusBar.cpp
@@ -574,7 +574,7 @@ BStatusBar::SetTo(float value, const char* text, const
char* trailingText)
}
// TODO: Ask the BControlLook in the first place about dirty rect.
- if (be_control_look)
+ if (be_control_look != NULL)
update.InsetBy(-1, -1);
Invalidate(update);
diff --git a/src/kits/interface/TextInput.cpp b/src/kits/interface/TextInput.cpp
index c1d8ce1..9b1b570 100644
--- a/src/kits/interface/TextInput.cpp
+++ b/src/kits/interface/TextInput.cpp
@@ -174,7 +174,7 @@ _BTextInput_::AlignTextRect()
float vInset = max_c(1, floorf((textRect.Height() - LineHeight(0)) /
2.0));
float hInset = 2;
- if (be_control_look)
+ if (be_control_look != NULL)
hInset = be_control_look->DefaultLabelSpacing();
textRect.InsetBy(hInset, vInset);
Other related posts: