Mark several non-modified pointer variables const

This commit is contained in:
Christian Göttsche
2021-01-05 23:42:55 +01:00
committed by BenBE
parent 1b2d48bc9a
commit d72b0a682e
33 changed files with 97 additions and 100 deletions

View File

@ -42,7 +42,7 @@ void Header_delete(Header* this) {
void Header_populateFromSettings(Header* this) {
Header_forEachColumn(this, col) {
MeterColumnSettings* colSettings = &this->settings->columns[col];
const MeterColumnSettings* colSettings = &this->settings->columns[col];
for (int i = 0; i < colSettings->len; i++) {
Header_addMeterByName(this, colSettings->names[i], col);
if (colSettings->modes[i] != 0) {
@ -60,7 +60,7 @@ void Header_writeBackToSettings(const Header* this) {
String_freeArray(colSettings->names);
free(colSettings->modes);
Vector* vec = this->columns[col];
const Vector* vec = this->columns[col];
int len = Vector_size(vec);
colSettings->names = xCalloc(len + 1, sizeof(char*));
@ -68,7 +68,7 @@ void Header_writeBackToSettings(const Header* this) {
colSettings->len = len;
for (int i = 0; i < len; i++) {
Meter* meter = (Meter*) Vector_get(vec, i);
const Meter* meter = (Meter*) Vector_get(vec, i);
char* name;
if (meter->param) {
xAsprintf(&name, "%s(%d)", As_Meter(meter)->name, meter->param);
@ -81,7 +81,7 @@ void Header_writeBackToSettings(const Header* this) {
}
}
MeterModeId Header_addMeterByName(Header* this, char* name, int column) {
MeterModeId Header_addMeterByName(Header* this, const char* name, int column) {
Vector* meters = this->columns[column];
char* paren = strchr(name, '(');
@ -126,15 +126,15 @@ Meter* Header_addMeterByClass(Header* this, const MeterClass* type, int param, i
return meter;
}
int Header_size(Header* this, int column) {
Vector* meters = this->columns[column];
int Header_size(const Header* this, int column) {
const Vector* meters = this->columns[column];
return Vector_size(meters);
}
MeterModeId Header_readMeterMode(Header* this, int i, int column) {
Vector* meters = this->columns[column];
MeterModeId Header_readMeterMode(const Header* this, int i, int column) {
const Vector* meters = this->columns[column];
Meter* meter = (Meter*) Vector_get(meters, i);
const Meter* meter = (const Meter*) Vector_get(meters, i);
return meter->mode;
}
@ -175,10 +175,10 @@ int Header_calculateHeight(Header* this) {
int maxHeight = pad;
Header_forEachColumn(this, col) {
Vector* meters = this->columns[col];
const Vector* meters = this->columns[col];
int height = pad;
for (int i = 0; i < Vector_size(meters); i++) {
Meter* meter = (Meter*) Vector_get(meters, i);
const Meter* meter = (const Meter*) Vector_get(meters, i);
height += meter->h;
}
maxHeight = MAXIMUM(maxHeight, height);