summaryrefslogtreecommitdiff
path: root/src/widget
diff options
context:
space:
mode:
Diffstat (limited to 'src/widget')
-rw-r--r--src/widget/widget_button.c8
-rw-r--r--src/widget/widget_buttonimage.c8
-rw-r--r--src/widget/widget_choicegroup.c8
-rw-r--r--src/widget/widget_textfield.c8
4 files changed, 16 insertions, 16 deletions
diff --git a/src/widget/widget_button.c b/src/widget/widget_button.c
index c2afcad..ca1573a 100644
--- a/src/widget/widget_button.c
+++ b/src/widget/widget_button.c
@@ -61,7 +61,7 @@ void drawWidgetButton(widget_t * widget)
void eventWidgetButton(widget_t * widget)
{
widget_button_t *p;
- static int time = 0;
+ static int my_time = 0;
int x, y;
assert(widget != NULL);
@@ -69,8 +69,8 @@ void eventWidgetButton(widget_t * widget)
p = (widget_button_t *) widget->private_data;
- if (time > 0) {
- time--;
+ if (my_time > 0) {
+ my_time--;
return;
}
@@ -79,7 +79,7 @@ void eventWidgetButton(widget_t * widget)
if (x >= widget->x && x <= widget->x + WIDGET_BUTTON_WIDTH &&
y >= widget->y && y <= widget->y + WIDGET_BUTTON_HEIGHT &&
isMouseClicked()) {
- time = WIDGET_BUTTON_TIME;
+ my_time = WIDGET_BUTTON_TIME;
DEBUG_MSG(_("Event caught\n"));
diff --git a/src/widget/widget_buttonimage.c b/src/widget/widget_buttonimage.c
index dd20e62..a896142 100644
--- a/src/widget/widget_buttonimage.c
+++ b/src/widget/widget_buttonimage.c
@@ -49,7 +49,7 @@ void drawWidgetButtonimage(widget_t * widget)
void eventWidgetButtonimage(widget_t * widget)
{
widget_buttonimage_t *p;
- static int time = 0;
+ static int my_time = 0;
int x, y;
assert(widget != NULL);
@@ -57,8 +57,8 @@ void eventWidgetButtonimage(widget_t * widget)
p = (widget_buttonimage_t *) widget->private_data;
- if (time > 0) {
- time--;
+ if (my_time > 0) {
+ my_time--;
return;
}
@@ -66,7 +66,7 @@ void eventWidgetButtonimage(widget_t * widget)
if (x >= widget->x && x <= widget->x + p->w &&
y >= widget->y && y <= widget->y + p->h && isMouseClicked()) {
- time = WIDGET_BUTTONIMAGE_TIME;
+ my_time = WIDGET_BUTTONIMAGE_TIME;
p->active = 1;
p->fce_event(widget);
}
diff --git a/src/widget/widget_choicegroup.c b/src/widget/widget_choicegroup.c
index 1045f81..5173164 100644
--- a/src/widget/widget_choicegroup.c
+++ b/src/widget/widget_choicegroup.c
@@ -132,15 +132,15 @@ void eventWidgetChoicegroup(widget_t * widget)
void destroyWidgetChoicegroup(widget_t * widget)
{
widget_choicegroup_t *p;
- int index;
+ int my_index;
assert(widget != NULL);
assert(widget->type == WIDGET_TYPE_CHOICE);
p = (widget_choicegroup_t *) widget->private_data;
- index = searchListItem(p->list, widget);
- assert(index != -1);
- delList(p->list, index);
+ my_index = searchListItem(p->list, widget);
+ assert(my_index != -1);
+ delList(p->list, my_index);
free(p);
destroyWidget(widget);
diff --git a/src/widget/widget_textfield.c b/src/widget/widget_textfield.c
index 6a8824a..94fef18 100644
--- a/src/widget/widget_textfield.c
+++ b/src/widget/widget_textfield.c
@@ -383,11 +383,11 @@ static void readKey(widget_textfield_t * p)
p->text[len] = c;
if (mapa[SDLK_LSHIFT] == SDL_PRESSED || mapa[SDLK_RSHIFT] == SDL_PRESSED) {
- int i;
+ int j;
- for (i = 0; i < len_shift_map; i += 2) {
- if (c == shift_map[i]) {
- p->text[len] = shift_map[i + 1];
+ for (j = 0; j < len_shift_map; j += 2) {
+ if (c == shift_map[j]) {
+ p->text[len] = shift_map[j + 1];
}
}