aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Fleischer <calcurse@cryptocrack.de>2012-06-27 10:02:40 +0200
committerLukas Fleischer <calcurse@cryptocrack.de>2012-06-30 14:34:36 +0200
commit81d97315c7dad26edf1dcfba849d57c3299e0f6b (patch)
tree9986d243eca4edeaf06a0b4a0c4c24e19715fdfb
parent57c4f9d8ea3bf760eac418fa31b5c0ff72e786fb (diff)
downloadcalcurse-81d97315c7dad26edf1dcfba849d57c3299e0f6b.tar.gz
calcurse-81d97315c7dad26edf1dcfba849d57c3299e0f6b.zip
Remove unneeded parameter/return value
The item type parameter/return value no longer needs to be passed/returned to interact_day_item_{paste,cut}(), since the type descriptor is saved when cutting an item now. Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
-rw-r--r--src/calcurse.c6
-rw-r--r--src/calcurse.h4
-rw-r--r--src/interaction.c9
3 files changed, 7 insertions, 12 deletions
diff --git a/src/calcurse.c b/src/calcurse.c
index ed28a30..b868877 100644
--- a/src/calcurse.c
+++ b/src/calcurse.c
@@ -64,7 +64,6 @@ int main(int argc, char **argv)
{
struct day_items_nb inday;
int no_data_file = 1;
- int cut_item = 0;
int count;
#if ENABLE_NLS
@@ -287,7 +286,7 @@ int main(int argc, char **argv)
case KEY_GENERIC_CUT:
if (wins_slctd() == APP && apoint_hilt() != 0) {
- cut_item = interact_day_item_cut(&inday.nb_events, &inday.nb_apoints);
+ interact_day_item_cut(&inday.nb_events, &inday.nb_apoints);
inday = do_storage(0);
wins_update(FLAG_CAL | FLAG_APP);
}
@@ -295,8 +294,7 @@ int main(int argc, char **argv)
case KEY_GENERIC_PASTE:
if (wins_slctd() == APP) {
- interact_day_item_paste(&inday.nb_events, &inday.nb_apoints, cut_item);
- cut_item = 0;
+ interact_day_item_paste(&inday.nb_events, &inday.nb_apoints);
inday = do_storage(0);
wins_update(FLAG_CAL | FLAG_APP);
}
diff --git a/src/calcurse.h b/src/calcurse.h
index 4cdfe35..b21cd95 100644
--- a/src/calcurse.h
+++ b/src/calcurse.h
@@ -717,8 +717,8 @@ void interact_day_item_edit(void);
void interact_day_item_pipe(void);
void interact_day_item_repeat(void);
void interact_day_item_cut_free();
-int interact_day_item_cut(unsigned *, unsigned *);
-void interact_day_item_paste(unsigned *, unsigned *, int);
+void interact_day_item_cut(unsigned *, unsigned *);
+void interact_day_item_paste(unsigned *, unsigned *);
void interact_todo_add(void);
void interact_todo_delete(void);
void interact_todo_edit(void);
diff --git a/src/interaction.c b/src/interaction.c
index 103cdf0..8f3ffdb 100644
--- a/src/interaction.c
+++ b/src/interaction.c
@@ -883,13 +883,13 @@ void interact_day_item_cut_free(void)
}
/* Cut an item, so that it can be pasted somewhere else later. */
-int interact_day_item_cut(unsigned *nb_events, unsigned *nb_apoints)
+void interact_day_item_cut(unsigned *nb_events, unsigned *nb_apoints)
{
const int NBITEMS = *nb_apoints + *nb_events;
int to_be_removed;
if (NBITEMS == 0)
- return 0;
+ return;
interact_day_item_cut_free();
struct day_item *p = day_cut_item(calendar_get_slctd_day_sec(),
@@ -913,13 +913,10 @@ int interact_day_item_cut(unsigned *nb_events, unsigned *nb_apoints)
apad.first_onscreen = apad.first_onscreen - to_be_removed;
if (NBITEMS == 1)
apoint_hilt_set(0);
-
- return p->type;
}
/* Paste a previously cut item. */
-void interact_day_item_paste(unsigned *nb_events, unsigned *nb_apoints,
- int cut_item_type)
+void interact_day_item_paste(unsigned *nb_events, unsigned *nb_apoints)
{
int item_type;