aboutsummaryrefslogtreecommitdiffstats
path: root/src/calcurse.c
diff options
context:
space:
mode:
authorLukas Fleischer <calcurse@cryptocrack.de>2012-06-26 13:11:31 +0200
committerLukas Fleischer <calcurse@cryptocrack.de>2012-06-30 14:34:35 +0200
commit8a85aaafa5905297398605eb890b00d22416eeb5 (patch)
tree16ac6b3f3ec8039d166fe3e116230231f7a54197 /src/calcurse.c
parent9ed7494f5e0b20c9a210520ba42fecd4ed51baf2 (diff)
downloadcalcurse-8a85aaafa5905297398605eb890b00d22416eeb5.tar.gz
calcurse-8a85aaafa5905297398605eb890b00d22416eeb5.zip
Rename interaction functions
Rename all interaction functions for the sake of consistency and add a "interact_" prefix. Also, mark day_erase_item() static since it is not used anywhere else. Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
Diffstat (limited to 'src/calcurse.c')
-rw-r--r--src/calcurse.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/calcurse.c b/src/calcurse.c
index 8a796ff..43d00fc 100644
--- a/src/calcurse.c
+++ b/src/calcurse.c
@@ -233,13 +233,13 @@ int main(int argc, char **argv)
break;
case KEY_GENERIC_ADD_APPT:
- apoint_add();
+ interact_day_item_add();
inday = do_storage(1);
wins_update(FLAG_CAL | FLAG_APP | FLAG_STA);
break;
case KEY_GENERIC_ADD_TODO:
- todo_new_item();
+ interact_todo_add();
if (todo_hilt() == 0 && todo_nb() == 1)
todo_hilt_increase(1);
wins_update(FLAG_TOD | FLAG_STA);
@@ -248,12 +248,12 @@ int main(int argc, char **argv)
case KEY_ADD_ITEM:
switch (wins_slctd()) {
case APP:
- apoint_add();
+ interact_day_item_add();
inday = do_storage(0);
wins_update(FLAG_CAL | FLAG_APP | FLAG_STA);
break;
case TOD:
- todo_new_item();
+ interact_todo_add();
if (todo_hilt() == 0 && todo_nb() == 1)
todo_hilt_increase(1);
wins_update(FLAG_TOD | FLAG_STA);
@@ -265,22 +265,22 @@ int main(int argc, char **argv)
case KEY_EDIT_ITEM:
if (wins_slctd() == APP && apoint_hilt() != 0) {
- day_edit_item();
+ interact_day_item_edit();
inday = do_storage(0);
wins_update(FLAG_CAL | FLAG_APP | FLAG_STA);
} else if (wins_slctd() == TOD && todo_hilt() != 0) {
- todo_edit_item();
+ interact_todo_edit();
wins_update(FLAG_TOD | FLAG_STA);
}
break;
case KEY_DEL_ITEM:
if (wins_slctd() == APP && apoint_hilt() != 0) {
- apoint_delete(&inday.nb_events, &inday.nb_apoints);
+ interact_day_item_delete(&inday.nb_events, &inday.nb_apoints);
inday = do_storage(0);
wins_update(FLAG_CAL | FLAG_APP | FLAG_STA);
} else if (wins_slctd() == TOD && todo_hilt() != 0) {
- todo_delete();
+ interact_todo_delete();
wins_update(FLAG_TOD | FLAG_STA);
}
break;
@@ -304,7 +304,7 @@ int main(int argc, char **argv)
case KEY_REPEAT_ITEM:
if (wins_slctd() == APP && apoint_hilt() != 0)
- recur_repeat_item();
+ interact_day_item_repeat();
inday = do_storage(0);
wins_update(FLAG_CAL | FLAG_APP | FLAG_STA);
break;
@@ -322,9 +322,9 @@ int main(int argc, char **argv)
case KEY_PIPE_ITEM:
if (wins_slctd() == APP && apoint_hilt() != 0)
- day_pipe_item();
+ interact_day_item_pipe();
else if (wins_slctd() == TOD && todo_hilt() != 0)
- todo_pipe_item();
+ interact_todo_pipe();
wins_update(FLAG_ALL);
break;