diff options
author | Christian Göttsche <cgzones@googlemail.com> | 2020-10-05 13:19:50 +0200 |
---|---|---|
committer | cgzones <cgzones@googlemail.com> | 2020-10-07 13:01:53 +0200 |
commit | ba282cfe193719f4fe030ebdcd80519ae19ffca2 (patch) | |
tree | cef89de747bb4312f7d5903f19f73ee04503e5ec | |
parent | 08d85e61435e43ade490ecef16437f93c0d88bed (diff) |
Mark Object instances const
76 files changed, 111 insertions, 111 deletions
diff --git a/AffinityPanel.c b/AffinityPanel.c index 6c64b14b..127623c6 100644 --- a/AffinityPanel.c +++ b/AffinityPanel.c @@ -319,7 +319,7 @@ static MaskItem *AffinityPanel_buildTopology(AffinityPanel* this, hwloc_obj_t ob #endif -PanelClass AffinityPanel_class = { +const PanelClass AffinityPanel_class = { .super = { .extends = Class(Panel), .delete = AffinityPanel_delete diff --git a/AffinityPanel.h b/AffinityPanel.h index 37c7e5d9..fdefeae4 100644 --- a/AffinityPanel.h +++ b/AffinityPanel.h @@ -11,7 +11,7 @@ in the source distribution for its full text. #include "Affinity.h" #include "ProcessList.h" -extern PanelClass AffinityPanel_class; +extern const PanelClass AffinityPanel_class; Panel* AffinityPanel_new(ProcessList* pl, Affinity* affinity, int* width); diff --git a/AvailableColumnsPanel.c b/AvailableColumnsPanel.c index fd247af0..dcfbb3e2 100644 --- a/AvailableColumnsPanel.c +++ b/AvailableColumnsPanel.c @@ -57,7 +57,7 @@ static HandlerResult AvailableColumnsPanel_eventHandler(Panel* super, int ch) { return result; } -PanelClass AvailableColumnsPanel_class = { +const PanelClass AvailableColumnsPanel_class = { .super = { .extends = Class(Panel), .delete = AvailableColumnsPanel_delete diff --git a/AvailableColumnsPanel.h b/AvailableColumnsPanel.h index dd011755..8672eb9e 100644 --- a/AvailableColumnsPanel.h +++ b/AvailableColumnsPanel.h @@ -14,7 +14,7 @@ typedef struct AvailableColumnsPanel_ { Panel* columns; } AvailableColumnsPanel; -extern PanelClass AvailableColumnsPanel_class; +extern const PanelClass AvailableColumnsPanel_class; AvailableColumnsPanel* AvailableColumnsPanel_new(Panel* columns); diff --git a/AvailableMetersPanel.c b/AvailableMetersPanel.c index f5e59218..812d1f3d 100644 --- a/AvailableMetersPanel.c +++ b/AvailableMetersPanel.c @@ -24,7 +24,7 @@ static void AvailableMetersPanel_delete(Object* object) { free(this); } -static inline void AvailableMetersPanel_addMeter(Header* header, Panel* panel, MeterClass* type, int param, int column) { +static inline void AvailableMetersPanel_addMeter(Header* header, Panel* panel, const MeterClass* type, int param, int column) { Meter* meter = Header_addMeterByClass(header, type, param, column); Panel_add(panel, (Object*) Meter_toListItem(meter, false)); Panel_setSelected(panel, Panel_size(panel) - 1); @@ -77,7 +77,7 @@ static HandlerResult AvailableMetersPanel_eventHandler(Panel* super, int ch) { return result; } -PanelClass AvailableMetersPanel_class = { +const PanelClass AvailableMetersPanel_class = { .super = { .extends = Class(Panel), .delete = AvailableMetersPanel_delete @@ -101,13 +101,13 @@ AvailableMetersPanel* AvailableMetersPanel_new(Settings* settings, Header* heade // Platform_meterTypes[0] should be always (&CPUMeter_class), which we will // handle separately in the code below. for (int i = 1; Platform_meterTypes[i]; i++) { - MeterClass* type = Platform_meterTypes[i]; + const MeterClass* type = Platform_meterTypes[i]; assert(type != &CPUMeter_class); const char* label = type->description ? type->description : type->uiName; Panel_add(super, (Object*) ListItem_new(label, i << 16)); } // Handle (&CPUMeter_class) - MeterClass* type = &CPUMeter_class; + const MeterClass* type = &CPUMeter_class; int cpus = pl->cpuCount; if (cpus > 1) { Panel_add(super, (Object*) ListItem_new("CPU average", 0)); diff --git a/AvailableMetersPanel.h b/AvailableMetersPanel.h index f4f18dac..f168869d 100644 --- a/AvailableMetersPanel.h +++ b/AvailableMetersPanel.h @@ -22,7 +22,7 @@ typedef struct AvailableMetersPanel_ { Panel* rightPanel; } AvailableMetersPanel; -extern PanelClass AvailableMetersPanel_class; +extern const PanelClass AvailableMetersPanel_class; AvailableMetersPanel* AvailableMetersPanel_new(Settings* settings, Header* header, Panel* leftMeters, Panel* rightMeters, ScreenManager* scr, ProcessList* pl); diff --git a/BatteryMeter.c b/BatteryMeter.c index 4f119e1f..060b125c 100644 --- a/BatteryMeter.c +++ b/BatteryMeter.c @@ -58,7 +58,7 @@ static void BatteryMeter_updateValues(Meter * this, char *buffer, int len) { } } -MeterClass BatteryMeter_class = { +const MeterClass BatteryMeter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete diff --git a/BatteryMeter.h b/BatteryMeter.h index 8f9441cc..b6e8c520 100644 --- a/BatteryMeter.h +++ b/BatteryMeter.h @@ -17,6 +17,6 @@ typedef enum ACPresence_ { AC_ERROR } ACPresence; -extern MeterClass BatteryMeter_class; +extern const MeterClass BatteryMeter_class; #endif @@ -246,7 +246,7 @@ static void SingleColCPUsMeter_draw(Meter* this, int x, int y, int w) { } -MeterClass CPUMeter_class = { +const MeterClass CPUMeter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete, @@ -263,7 +263,7 @@ MeterClass CPUMeter_class = { .init = CPUMeter_init }; -MeterClass AllCPUsMeter_class = { +const MeterClass AllCPUsMeter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete, @@ -282,7 +282,7 @@ MeterClass AllCPUsMeter_class = { .done = AllCPUsMeter_done }; -MeterClass AllCPUs2Meter_class = { +const MeterClass AllCPUs2Meter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete, @@ -301,7 +301,7 @@ MeterClass AllCPUs2Meter_class = { .done = AllCPUsMeter_done }; -MeterClass LeftCPUsMeter_class = { +const MeterClass LeftCPUsMeter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete, @@ -320,7 +320,7 @@ MeterClass LeftCPUsMeter_class = { .done = AllCPUsMeter_done }; -MeterClass RightCPUsMeter_class = { +const MeterClass RightCPUsMeter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete, @@ -339,7 +339,7 @@ MeterClass RightCPUsMeter_class = { .done = AllCPUsMeter_done }; -MeterClass LeftCPUs2Meter_class = { +const MeterClass LeftCPUs2Meter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete, @@ -358,7 +358,7 @@ MeterClass LeftCPUs2Meter_class = { .done = AllCPUsMeter_done }; -MeterClass RightCPUs2Meter_class = { +const MeterClass RightCPUs2Meter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete, @@ -377,7 +377,7 @@ MeterClass RightCPUs2Meter_class = { .done = AllCPUsMeter_done }; -MeterClass AllCPUs4Meter_class = { +const MeterClass AllCPUs4Meter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete, @@ -396,7 +396,7 @@ MeterClass AllCPUs4Meter_class = { .done = AllCPUsMeter_done }; -MeterClass LeftCPUs4Meter_class = { +const MeterClass LeftCPUs4Meter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete, @@ -415,7 +415,7 @@ MeterClass LeftCPUs4Meter_class = { .done = AllCPUsMeter_done }; -MeterClass RightCPUs4Meter_class = { +const MeterClass RightCPUs4Meter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete, @@ -434,7 +434,7 @@ MeterClass RightCPUs4Meter_class = { .done = AllCPUsMeter_done }; -MeterClass AllCPUs8Meter_class = { +const MeterClass AllCPUs8Meter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete, @@ -453,7 +453,7 @@ MeterClass AllCPUs8Meter_class = { .done = AllCPUsMeter_done }; -MeterClass LeftCPUs8Meter_class = { +const MeterClass LeftCPUs8Meter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete, @@ -472,7 +472,7 @@ MeterClass LeftCPUs8Meter_class = { .done = AllCPUsMeter_done }; -MeterClass RightCPUs8Meter_class = { +const MeterClass RightCPUs8Meter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete, @@ -22,30 +22,30 @@ typedef enum { CPU_METER_ITEMCOUNT = 9, // number of entries in this enum } CPUMeterValues; -extern MeterClass CPUMeter_class; +extern const MeterClass CPUMeter_class; -extern MeterClass AllCPUsMeter_class; +extern const MeterClass AllCPUsMeter_class; -extern MeterClass AllCPUs2Meter_class; +extern const MeterClass AllCPUs2Meter_class; -extern MeterClass LeftCPUsMeter_class; +extern const MeterClass LeftCPUsMeter_class; -extern MeterClass RightCPUsMeter_class; +extern const MeterClass RightCPUsMeter_class; -extern MeterClass LeftCPUs2Meter_class; +extern const MeterClass LeftCPUs2Meter_class; -extern MeterClass RightCPUs2Meter_class; +extern const MeterClass RightCPUs2Meter_class; -extern MeterClass AllCPUs4Meter_class; +extern const MeterClass AllCPUs4Meter_class; -extern MeterClass LeftCPUs4Meter_class; +extern const MeterClass LeftCPUs4Meter_class; -extern MeterClass RightCPUs4Meter_class; +extern const MeterClass RightCPUs4Meter_class; -extern MeterClass AllCPUs8Meter_class; +extern const MeterClass AllCPUs8Meter_class; -extern MeterClass LeftCPUs8Meter_class; +extern const MeterClass LeftCPUs8Meter_class; -extern MeterClass RightCPUs8Meter_class; +extern const MeterClass RightCPUs8Meter_class; #endif diff --git a/CategoriesPanel.c b/CategoriesPanel.c index b09a015f..8adf14f6 100644 --- a/CategoriesPanel.c +++ b/CategoriesPanel.c @@ -109,7 +109,7 @@ static HandlerResult CategoriesPanel_eventHandler(Panel* super, int ch) { return result; } -PanelClass CategoriesPanel_class = { +const PanelClass CategoriesPanel_class = { .super = { .extends = Class(Panel), .delete = CategoriesPanel_delete diff --git a/CategoriesPanel.h b/CategoriesPanel.h index 891d7711..1f17bd2e 100644 --- a/CategoriesPanel.h +++ b/CategoriesPanel.h @@ -23,7 +23,7 @@ typedef struct CategoriesPanel_ { void CategoriesPanel_makeMetersPage(CategoriesPanel* this); -extern PanelClass CategoriesPanel_class; +extern const PanelClass CategoriesPanel_class; CategoriesPanel* CategoriesPanel_new(ScreenManager* scr, Settings* settings, Header* header, ProcessList* pl); diff --git a/CheckItem.c b/CheckItem.c index f6d5bb91..09e42ee6 100644 --- a/CheckItem.c +++ b/CheckItem.c @@ -33,7 +33,7 @@ static void CheckItem_display(Object* cast, RichString* out) { RichString_append(out, CRT_colors[CHECK_TEXT], this->text); } -ObjectClass CheckItem_class = { +const ObjectClass CheckItem_class = { .display = CheckItem_display, .delete = CheckItem_delete }; diff --git a/CheckItem.h b/CheckItem.h index 71483526..168efdcc 100644 --- a/CheckItem.h +++ b/CheckItem.h @@ -16,7 +16,7 @@ typedef struct CheckItem_ { bool value; } CheckItem; -extern ObjectClass CheckItem_class; +extern const ObjectClass CheckItem_class; CheckItem* CheckItem_newByRef(char* text, bool* ref); diff --git a/ClockMeter.c b/ClockMeter.c index d309852f..51fbed63 100644 --- a/ClockMeter.c +++ b/ClockMeter.c @@ -24,7 +24,7 @@ static void ClockMeter_updateValues(Meter* this, char* buffer, int size) { strftime(buffer, size, "%H:%M:%S", lt); } -MeterClass ClockMeter_class = { +const MeterClass ClockMeter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete diff --git a/ClockMeter.h b/ClockMeter.h index e431e367..ecd4b6a9 100644 --- a/ClockMeter.h +++ b/ClockMeter.h @@ -9,6 +9,6 @@ in the source distribution for its full text. #include "Meter.h" -extern MeterClass ClockMeter_class; +extern const MeterClass ClockMeter_class; #endif diff --git a/ColorsPanel.c b/ColorsPanel.c index 36cd85bd..75d3e654 100644 --- a/ColorsPanel.c +++ b/ColorsPanel.c @@ -76,7 +76,7 @@ static HandlerResult ColorsPanel_eventHandler(Panel* super, int ch) { return result; } -PanelClass ColorsPanel_class = { +const PanelClass ColorsPanel_class = { .super = { .extends = Class(Panel), .delete = ColorsPanel_delete diff --git a/ColorsPanel.h b/ColorsPanel.h index 0f69e8f7..f63ca356 100644 --- a/ColorsPanel.h +++ b/ColorsPanel.h @@ -18,7 +18,7 @@ typedef struct ColorsPanel_ { ScreenManager* scr; } ColorsPanel; -extern PanelClass ColorsPanel_class; +extern const PanelClass ColorsPanel_class; ColorsPanel* ColorsPanel_new(Settings* settings, ScreenManager* scr); diff --git a/ColumnsPanel.c b/ColumnsPanel.c index 8328d15e..e4fe4fc1 100644 --- a/ColumnsPanel.c +++ b/ColumnsPanel.c @@ -105,7 +105,7 @@ static HandlerResult ColumnsPanel_eventHandler(Panel* super, int ch) { return result; } -PanelClass ColumnsPanel_class = { +const PanelClass ColumnsPanel_class = { .super = { .extends = Class(Panel), .delete = ColumnsPanel_delete diff --git a/ColumnsPanel.h b/ColumnsPanel.h index a35036f1..e8acbb23 100644 --- a/ColumnsPanel.h +++ b/ColumnsPanel.h @@ -17,7 +17,7 @@ typedef struct ColumnsPanel_ { bool moving; } ColumnsPanel; -extern PanelClass ColumnsPanel_class; +extern const PanelClass ColumnsPanel_class; ColumnsPanel* ColumnsPanel_new(Settings* settings); diff --git a/CommandScreen.c b/CommandScreen.c index bc71e09f..58ed8840 100644 --- a/CommandScreen.c +++ b/CommandScreen.c @@ -48,7 +48,7 @@ static void CommandScreen_draw(InfoScreen* this) { InfoScreen_drawTitled(this, "Command of process %d - %s", this->process->pid, this->process->comm); } -InfoScreenClass CommandScreen_class = { +const InfoScreenClass CommandScreen_class = { .super = { .extends = Class(Object), .delete = CommandScreen_delete diff --git a/CommandScreen.h b/CommandScreen.h index a1604a3e..4f3ce947 100644 --- a/CommandScreen.h +++ b/CommandScreen.h @@ -7,7 +7,7 @@ typedef struct CommandScreen_ { InfoScreen super; } CommandScreen; -extern InfoScreenClass CommandScreen_class; +extern const InfoScreenClass CommandScreen_class; CommandScreen* CommandScreen_new(Process* process); diff --git a/DateMeter.c b/DateMeter.c index e130159a..6ea108e1 100644 --- a/DateMeter.c +++ b/DateMeter.c @@ -31,7 +31,7 @@ static void DateMeter_updateValues(Meter* this, char* buffer, int size) { strftime(buffer, size, "%F", lt); } -MeterClass DateMeter_class = { +const MeterClass DateMeter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete diff --git a/DateMeter.h b/DateMeter.h index 44ed24da..63455767 100644 --- a/DateMeter.h +++ b/DateMeter.h @@ -9,6 +9,6 @@ in the source distribution for its full text. #include "Meter.h" -extern MeterClass DateMeter_class; +extern const MeterClass DateMeter_class; #endif diff --git a/DateTimeMeter.c b/DateTimeMeter.c index 32dd5d1a..f3c877b3 100644 --- a/DateTimeMeter.c +++ b/DateTimeMeter.c @@ -31,7 +31,7 @@ static void DateTimeMeter_updateValues(Meter* this, char* buffer, int size) { strftime(buffer, size, "%F %H:%M:%S", lt); } -MeterClass DateTimeMeter_class = { +const MeterClass DateTimeMeter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete diff --git a/DateTimeMeter.h b/DateTimeMeter.h index ef25264c..6cb73c24 100644 --- a/DateTimeMeter.h +++ b/DateTimeMeter.h @@ -9,6 +9,6 @@ in the source distribution for its full text. #include "Meter.h" |