[libhandy/wip/haecker-felix/flap-widget: 83/98] Remove != NULL from if
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libhandy/wip/haecker-felix/flap-widget: 83/98] Remove != NULL from if
- Date: Mon, 3 Aug 2020 16:27:56 +0000 (UTC)
commit bf2b7333a7c191f9650986fb555be0698746809c
Author: Felix Häcker <haeckerfelix gnome org>
Date: Tue Jul 28 18:20:28 2020 +0200
Remove != NULL from if
src/hdy-flap.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/src/hdy-flap.c b/src/hdy-flap.c
index 66731127..4479974c 100644
--- a/src/hdy-flap.c
+++ b/src/hdy-flap.c
@@ -300,8 +300,8 @@ hdy_flap_measure (GtkWidget *widget,
*natural_baseline = -1;
if (orientation == GTK_ORIENTATION_VERTICAL){
- if (content != NULL) gtk_widget_get_preferred_height (content, &content_min, &content_nat);
- if (self->flap != NULL) gtk_widget_get_preferred_height (self->flap, &flap_min, &flap_nat);
+ if (content) gtk_widget_get_preferred_height (content, &content_min, &content_nat);
+ if (self->flap) gtk_widget_get_preferred_height (self->flap, &flap_min, &flap_nat);
if (self->orientation == GTK_ORIENTATION_VERTICAL && self->flap_mode != HDY_FLAP_MODE_AUTO){
*minimum = MAX (content_min + adjust_for_overlay (self, flap_min), flap_min);
@@ -311,8 +311,8 @@ hdy_flap_measure (GtkWidget *widget,
}
if (orientation == GTK_ORIENTATION_HORIZONTAL){
- if (content != NULL) gtk_widget_get_preferred_width (content, &content_min, &content_nat);
- if (self->flap != NULL) gtk_widget_get_preferred_width (self->flap, &flap_min, &flap_nat);
+ if (content) gtk_widget_get_preferred_width (content, &content_min, &content_nat);
+ if (self->flap) gtk_widget_get_preferred_width (self->flap, &flap_min, &flap_nat);
if (self->orientation == GTK_ORIENTATION_HORIZONTAL && self->flap_mode != HDY_FLAP_MODE_AUTO){
*minimum = MAX (content_min + adjust_for_overlay (self, flap_min), flap_min);
@@ -332,7 +332,7 @@ get_flap_size (HdyFlap *self,
{
GtkRequisition flap_min_size, flap_nat_size;
- if (self->flap == NULL)
+ if (!self->flap)
return 0;
gtk_widget_get_preferred_size (hdy_flap_get_flap (self), &flap_min_size, &flap_nat_size);
@@ -414,7 +414,7 @@ allocate_content (HdyFlap *self,
GtkRequisition content_min, content_nat;
GtkAllocation alloc;
- if (self->flap != NULL) {
+ if (self->flap) {
gtk_widget_get_preferred_size (self->flap, &flap_min, &flap_nat);
} else {
flap_min.height = 0;
@@ -469,10 +469,10 @@ hdy_flap_size_allocate (GtkWidget *widget,
gtk_widget_set_allocation (widget, alloc);
- if (hdy_flap_get_flap (self) == NULL)
+ if (!hdy_flap_get_flap (self))
allocate_flap (self, alloc);
- if (content != NULL)
+ if (content)
allocate_content (self, alloc);
gtk_widget_set_clip (widget, alloc);
@@ -529,12 +529,12 @@ hdy_flap_forall (GtkContainer* base,
self = HDY_FLAP (base);
content = gtk_bin_get_child (GTK_BIN (self));
- if (content != NULL) {
+ if (content) {
callback (content, callback_target);
}
flap = hdy_flap_get_flap (self);
- if (flap != NULL) {
+ if (flap) {
callback (flap, callback_target);
}
}
@@ -547,7 +547,7 @@ hdy_flap_remove (GtkContainer* base,
GtkWidget* flap;
self = HDY_FLAP (base);
- g_return_if_fail (widget != NULL);
+ g_return_if_fail (widget);
flap = hdy_flap_get_flap (self);
if (widget == flap) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]