Mark Object classes and Object class fields const

1 files changed, 9 insertions, 11 deletions

diff --git a/Meter.h b/Meter.h
index 07e66e0e..34f388f4 100644
--- a/Meter.h
+++ b/Meter.h
@@ -22,7 +22,7 @@ typedef void(*Meter_UpdateValues)(Meter*, char*, int);
 typedef void(*Meter_Draw)(Meter*, int, int, int);
 
 typedef struct MeterClass_ {
-   ObjectClass super;
+   const ObjectClass super;
    const Meter_Init init;
    const Meter_Done done;
    const Meter_UpdateMode updateMode;
@@ -30,16 +30,15 @@ typedef struct MeterClass_ {
    const Meter_UpdateValues updateValues;
    const int defaultMode;
    const double total;
-   const int* attributes;
-   const char* name;
-   const char* uiName;
-   const char* caption;
-   const char* description;
+   const int* const attributes;
+   const char* const name;
+   const char* const uiName;
+   const char* const caption;
+   const char* const description;
    const char maxItems;
-   char curItems;
 } MeterClass;
 
-#define As_Meter(this_)                ((MeterClass*)((this_)->super.klass))
+#define As_Meter(this_)                ((const MeterClass*)((this_)->super.klass))
 #define Meter_initFn(this_)            As_Meter(this_)->init
 #define Meter_init(this_)              As_Meter(this_)->init((Meter*)(this_))
 #define Meter_done(this_)              As_Meter(this_)->done((Meter*)(this_))
@@ -50,8 +49,6 @@ typedef struct MeterClass_ {
 #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_)
 #define Meter_attributes(this_)        As_Meter(this_)->attributes
 #define Meter_name(this_)              As_Meter(this_)->name
 #define Meter_uiName(this_)            As_Meter(this_)->uiName
@@ -66,6 +63,7 @@ struct Meter_ {
    void* drawData;
    int h;
    struct ProcessList_* pl;
+   char curItems;
    double* values;
    double total;
 };
@@ -92,7 +90,7 @@ typedef struct GraphData_ {
 
 extern MeterClass Meter_class;
 
-Meter* Meter_new(struct ProcessList_* pl, int param, MeterClass* type);
+Meter* Meter_new(struct ProcessList_* pl, int param, const MeterClass* type);
 
 int Meter_humanUnit(char* buffer, unsigned long int value, int size);