This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository evisum.
View the commit online.
commit d30d43094c8ab53fb13dcb6f2564bbe68d7d8269
Author: Alastair Poole <[email protected]>
AuthorDate: Mon Mar 30 01:49:22 2026 +0100
naming: try to be consistent
---
src/bin/ui/evisum_ui_cpu.c | 8 ++++----
src/bin/ui/evisum_ui_cpu.h | 4 ++--
src/bin/ui/visuals/cpu_bars.c | 10 +++++-----
src/bin/ui/visuals/cpu_bars.h | 2 +-
src/bin/ui/visuals/cpu_basic.c | 10 +++++-----
src/bin/ui/visuals/cpu_basic.h | 2 +-
src/bin/ui/visuals/cpu_default.c | 22 +++++++++++-----------
src/bin/ui/visuals/cpu_default.h | 2 +-
src/bin/ui/visuals/visuals.x | 6 +++---
9 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/bin/ui/evisum_ui_cpu.c b/src/bin/ui/evisum_ui_cpu.c
index 8190d73..5c8106a 100644
--- a/src/bin/ui/evisum_ui_cpu.c
+++ b/src/bin/ui/evisum_ui_cpu.c
@@ -9,7 +9,7 @@ static void
_evisum_ui_cpu_win_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) {
Evas_Coord w, h;
Evas_Event_Mouse_Move *ev;
- Ui_Cpu_Data *pd = data;
+ Evisum_Ui_Cpu_Data *pd = data;
ev = event_info;
evas_object_geometry_get(obj, NULL, NULL, &w, &h);
@@ -43,7 +43,7 @@ _evisum_ui_cpu_win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *even
static void
_evisum_ui_cpu_btn_menu_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) {
Evisum_Ui *ui;
- Ui_Cpu_Data *pd = data;
+ Evisum_Ui_Cpu_Data *pd = data;
ui = pd->ui;
if (!pd->menu) pd->menu = evisum_ui_main_menu_create(ui, ui->cpu.win, obj);
@@ -69,7 +69,7 @@ _evisum_ui_cpu_win_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, vo
static void
_evisum_ui_cpu_win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) {
- Ui_Cpu_Data *pd = data;
+ Evisum_Ui_Cpu_Data *pd = data;
Evisum_Ui *ui = pd->ui;
evisum_ui_config_save(ui);
@@ -111,7 +111,7 @@ evisum_ui_cpu_win_restart(Evisum_Ui *ui) {
void
evisum_ui_cpu_win_add(Evisum_Ui *ui) {
- Ui_Cpu_Data *pd;
+ Evisum_Ui_Cpu_Data *pd;
Evas_Object *win, *box, *scr, *btn, *ic, *bg;
Evas_Object *tb;
Elm_Layout *lay;
diff --git a/src/bin/ui/evisum_ui_cpu.h b/src/bin/ui/evisum_ui_cpu.h
index b205663..82b5d54 100644
--- a/src/bin/ui/evisum_ui_cpu.h
+++ b/src/bin/ui/evisum_ui_cpu.h
@@ -25,11 +25,11 @@ typedef struct {
void (*ext_free_cb)(void *);
void *ext;
-} Ui_Cpu_Data;
+} Evisum_Ui_Cpu_Data;
typedef struct {
const char *name;
- Ui_Cpu_Data *(*func)(Evas_Object *parent);
+ Evisum_Ui_Cpu_Data *(*func)(Evas_Object *parent);
} Evisum_Ui_Cpu_Visual;
void evisum_ui_cpu_win_add(Evisum_Ui *ui);
diff --git a/src/bin/ui/visuals/cpu_bars.c b/src/bin/ui/visuals/cpu_bars.c
index a1af7ce..a142159 100644
--- a/src/bin/ui/visuals/cpu_bars.c
+++ b/src/bin/ui/visuals/cpu_bars.c
@@ -53,7 +53,7 @@ _cpu_percent_colors_fill(Evas_Object *colors) {
static void
_core_times_main_cb(void *data, Ecore_Thread *thread) {
int ncpu;
- Ui_Cpu_Data *pd = data;
+ Evisum_Ui_Cpu_Data *pd = data;
Ext *ext = pd->ext;
ecore_thread_name_set(thread, "cpu");
@@ -78,7 +78,7 @@ _core_times_main_cb(void *data, Ecore_Thread *thread) {
static void
_core_times_feedback_cb(void *data, Ecore_Thread *thread EINA_UNUSED, void *msgdata) {
- Ui_Cpu_Data *pd;
+ Evisum_Ui_Cpu_Data *pd;
Core *cores;
Ext *ext;
Evas_Coord oh, ow, ox, oy;
@@ -128,15 +128,15 @@ _cb_free(void *data) {
free(ext);
}
-Ui_Cpu_Data *
-cpu_visual_bars(Evas_Object *parent_bx) {
+Evisum_Ui_Cpu_Data *
+evisum_ui_cpu_visual_bars(Evas_Object *parent_bx) {
Evas_Object *tb, *rec, *container, *fr, *legend_tbl, *colors, *lb, *bg, *desc_fr;
Ext *ext;
uint8_t text_r, text_g, text_b;
char text_hex[7];
int i;
- Ui_Cpu_Data *pd = calloc(1, sizeof(Ui_Cpu_Data));
+ Evisum_Ui_Cpu_Data *pd = calloc(1, sizeof(Evisum_Ui_Cpu_Data));
if (!pd) return NULL;
pd->ext = ext = calloc(1, sizeof(Ext));
diff --git a/src/bin/ui/visuals/cpu_bars.h b/src/bin/ui/visuals/cpu_bars.h
index 9fd5af6..11f91a7 100644
--- a/src/bin/ui/visuals/cpu_bars.h
+++ b/src/bin/ui/visuals/cpu_bars.h
@@ -3,6 +3,6 @@
#include "ui/evisum_ui_cpu.h"
-Ui_Cpu_Data *cpu_visual_bars(Evas_Object *parent);
+Evisum_Ui_Cpu_Data *evisum_ui_cpu_visual_bars(Evas_Object *parent);
#endif
diff --git a/src/bin/ui/visuals/cpu_basic.c b/src/bin/ui/visuals/cpu_basic.c
index 14bf883..57f72a8 100644
--- a/src/bin/ui/visuals/cpu_basic.c
+++ b/src/bin/ui/visuals/cpu_basic.c
@@ -22,7 +22,7 @@ typedef struct {
static void
_core_times_main_cb(void *data, Ecore_Thread *thread) {
int ncpu;
- Ui_Cpu_Data *pd = data;
+ Evisum_Ui_Cpu_Data *pd = data;
Ext *ext = pd->ext;
if (!system_cpu_frequency_min_max_get(&ext->freq_min, &ext->freq_max)) ext->cpu_freq = 1;
@@ -50,7 +50,7 @@ _core_times_main_cb(void *data, Ecore_Thread *thread) {
static void
_core_times_feedback_cb(void *data, Ecore_Thread *thread EINA_UNUSED, void *msgdata) {
- Ui_Cpu_Data *pd;
+ Evisum_Ui_Cpu_Data *pd;
Core *cores;
Ext *ext;
@@ -147,14 +147,14 @@ _cpu_percent_colors_fill(Evas_Object *colors) {
evas_object_image_data_update_add(colors, 0, 0, stride, 1);
}
-Ui_Cpu_Data *
-cpu_visual_basic(Evas_Object *parent_bx) {
+Evisum_Ui_Cpu_Data *
+evisum_ui_cpu_visual_basic(Evas_Object *parent_bx) {
Evas_Object *container, *grid, *fr, *legend_tbl, *colors, *lb, *bg, *desc_fr;
Ext *ext;
uint8_t text_r, text_g, text_b;
char text_hex[7];
- Ui_Cpu_Data *pd = calloc(1, sizeof(Ui_Cpu_Data));
+ Evisum_Ui_Cpu_Data *pd = calloc(1, sizeof(Evisum_Ui_Cpu_Data));
if (!pd) return NULL;
pd->ext = ext = calloc(1, sizeof(Ext));
diff --git a/src/bin/ui/visuals/cpu_basic.h b/src/bin/ui/visuals/cpu_basic.h
index 5d2ab4e..56e726f 100644
--- a/src/bin/ui/visuals/cpu_basic.h
+++ b/src/bin/ui/visuals/cpu_basic.h
@@ -3,6 +3,6 @@
#include "ui/evisum_ui_cpu.h"
-Ui_Cpu_Data *cpu_visual_basic(Evas_Object *parent);
+Evisum_Ui_Cpu_Data *evisum_ui_cpu_visual_basic(Evas_Object *parent);
#endif
diff --git a/src/bin/ui/visuals/cpu_default.c b/src/bin/ui/visuals/cpu_default.c
index 40ca4c4..22be273 100644
--- a/src/bin/ui/visuals/cpu_default.c
+++ b/src/bin/ui/visuals/cpu_default.c
@@ -45,7 +45,7 @@ typedef struct {
static void
_core_times_main_cb(void *data, Ecore_Thread *thread) {
- Ui_Cpu_Data *pd = data;
+ Evisum_Ui_Cpu_Data *pd = data;
int ncpu;
Ext *ext = pd->ext;
@@ -77,7 +77,7 @@ _core_times_main_cb(void *data, Ecore_Thread *thread) {
}
static void
-_update(Ui_Cpu_Data *pd, Core *cores) {
+_update(Evisum_Ui_Cpu_Data *pd, Core *cores) {
Evas_Object *obj;
unsigned int *pixels, *pix;
Evas_Coord x, y, w, h;
@@ -175,7 +175,7 @@ typedef struct {
} Explainer;
static void
-_explain(Ui_Cpu_Data *pd, Core *cores) {
+_explain(Evisum_Ui_Cpu_Data *pd, Core *cores) {
Eina_Strbuf *buf;
Explainer *exp;
Ext *ext;
@@ -213,7 +213,7 @@ _explain(Ui_Cpu_Data *pd, Core *cores) {
static void
_core_times_feedback_cb(void *data, Ecore_Thread *thread EINA_UNUSED, void *msgdata) {
- Ui_Cpu_Data *pd;
+ Evisum_Ui_Cpu_Data *pd;
Core *cores;
Ext *ext;
static Eina_Bool was_confused = 0;
@@ -247,7 +247,7 @@ _cb_free(void *data) {
static void
_check_changed_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) {
- Ui_Cpu_Data *pd = data;
+ Evisum_Ui_Cpu_Data *pd = data;
Ext *ext = pd->ext;
ext->show_cpufreq = elm_check_state_get(obj);
@@ -255,7 +255,7 @@ _check_changed_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev
static void
_temp_check_changed_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) {
- Ui_Cpu_Data *pd = data;
+ Evisum_Ui_Cpu_Data *pd = data;
Ext *ext = pd->ext;
ext->show_cputemp = elm_check_state_get(obj);
@@ -263,7 +263,7 @@ _temp_check_changed_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, voi
static void
_confused_check_changed_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) {
- Ui_Cpu_Data *pd = data;
+ Evisum_Ui_Cpu_Data *pd = data;
Ext *ext = pd->ext;
ext->confused = elm_check_state_get(obj);
@@ -291,8 +291,8 @@ _colors_fill(Evas_Object *colors) {
evas_object_image_data_update_add(colors, 0, 0, 101, 1);
}
-Ui_Cpu_Data *
-cpu_visual_default(Evas_Object *parent_box) {
+Evisum_Ui_Cpu_Data *
+evisum_ui_cpu_visual_default(Evas_Object *parent_box) {
Evas_Object *tbl, *tbl2, *box, *obj, *ic, *lb, *rec;
Evas_Object *fr, *bx, *hbx, *colors, *check, *desc_fr;
Ext *ext;
@@ -301,7 +301,7 @@ cpu_visual_default(Evas_Object *parent_box) {
char buf[128];
Eina_Bool show_icons = 1;
- Ui_Cpu_Data *pd = calloc(1, sizeof(Ui_Cpu_Data));
+ Evisum_Ui_Cpu_Data *pd = calloc(1, sizeof(Evisum_Ui_Cpu_Data));
if (!pd) return NULL;
pd->ext = ext = calloc(1, sizeof(Ext));
@@ -418,7 +418,7 @@ cpu_visual_default(Evas_Object *parent_box) {
ext->explainers = eina_list_append(ext->explainers, exp);
}
- // Callback to free anything extra we pass around via the ext pointer in (Ui_Cpu_Data *).
+ // Callback to free anything extra we pass around via the ext pointer in (Evisum_Ui_Cpu_Data *).
pd->ext_free_cb = _cb_free;
bx = elm_box_add(box);
diff --git a/src/bin/ui/visuals/cpu_default.h b/src/bin/ui/visuals/cpu_default.h
index 13ce1ec..9ca63dd 100644
--- a/src/bin/ui/visuals/cpu_default.h
+++ b/src/bin/ui/visuals/cpu_default.h
@@ -3,6 +3,6 @@
#include "ui/evisum_ui_cpu.h"
-Ui_Cpu_Data *cpu_visual_default(Evas_Object *parent);
+Evisum_Ui_Cpu_Data *evisum_ui_cpu_visual_default(Evas_Object *parent);
#endif
diff --git a/src/bin/ui/visuals/visuals.x b/src/bin/ui/visuals/visuals.x
index 8cb27b8..0cdc0d3 100644
--- a/src/bin/ui/visuals/visuals.x
+++ b/src/bin/ui/visuals/visuals.x
@@ -3,7 +3,7 @@
#include "cpu_bars.h"
Evisum_Ui_Cpu_Visual visualizations[] = {
- { .name = "default", .func = cpu_visual_default },
- { .name = "basic", .func = cpu_visual_basic },
- { .name = "bars", .func = cpu_visual_bars },
+ { .name = "default", .func = evisum_ui_cpu_visual_default },
+ { .name = "basic", .func = evisum_ui_cpu_visual_basic },
+ { .name = "bars", .func = evisum_ui_cpu_visual_bars },
};
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
