From 9dea20e06847f930920406e6de539db32e2644e0 Mon Sep 17 00:00:00 2001 From: Explorer09 Date: Wed, 4 May 2016 13:39:26 +0800 Subject: Rename Meter.setValues() functions to updateValues() Rationale (copied from htop issue #471): The function name "setValues" is misleading. For most OOP (object- oriented programming) contexts, setXXX functions mean they will change some member variables of an object into something specified in function arguments. But in the *Meter_setValues() case, the new values are not from the arguments, but from a hard-coded source. The caller is not supposed to change the values[] to anything it likes, but rather to "update" the values from the source. Hence, updateValues is a better name for this family of functions. --- Meter.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Meter.h') diff --git a/Meter.h b/Meter.h index 7b728eeb..d98c910e 100644 --- a/Meter.h +++ b/Meter.h @@ -24,7 +24,7 @@ typedef struct Meter_ Meter; typedef void(*Meter_Init)(Meter*); typedef void(*Meter_Done)(Meter*); typedef void(*Meter_UpdateMode)(Meter*, int); -typedef void(*Meter_SetValues)(Meter*, char*, int); +typedef void(*Meter_UpdateValues)(Meter*, char*, int); typedef void(*Meter_Draw)(Meter*, int, int, int); typedef struct MeterClass_ { @@ -33,7 +33,7 @@ typedef struct MeterClass_ { const Meter_Done done; const Meter_UpdateMode updateMode; const Meter_Draw draw; - const Meter_SetValues setValues; + const Meter_UpdateValues updateValues; const int defaultMode; const double total; const int* attributes; @@ -53,7 +53,8 @@ typedef struct MeterClass_ { #define Meter_updateMode(this_, m_) As_Meter(this_)->updateMode((Meter*)(this_), m_) #define Meter_drawFn(this_) As_Meter(this_)->draw #define Meter_doneFn(this_) As_Meter(this_)->done -#define Meter_setValues(this_, c_, i_) As_Meter(this_)->setValues((Meter*)(this_), c_, i_) +#define Meter_updateValues(this_, buf_, sz_) \ + As_Meter(this_)->updateValues((Meter*)(this_), buf_, sz_) #define Meter_defaultMode(this_) As_Meter(this_)->defaultMode #define Meter_getItems(this_) As_Meter(this_)->curItems #define Meter_setItems(this_, n_) As_Meter(this_)->curItems = (n_) -- cgit v1.2.3