diff --git a/swad_ID.c b/swad_ID.c index 5438d9b8..0191165d 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -519,7 +519,7 @@ void ID_ShowFormChangeMyID (bool IShouldFillInID) "%upx", Rec_RECORD_WIDTH); Box_BoxBegin (StrRecordWidth,Txt_ID, - Acc_PutLinkToRemoveMyAccount,(void *) &Gbl, + Acc_PutLinkToRemoveMyAccount,&Gbl, Hlp_PROFILE_Account,Box_NOT_CLOSABLE); /***** Show form to change ID *****/ diff --git a/swad_account.c b/swad_account.c index 75ae7a93..187d4444 100644 --- a/swad_account.c +++ b/swad_account.c @@ -556,7 +556,7 @@ void Acc_PutLinkToRemoveMyAccount (void *Args) if (Args) if (Acc_CheckIfICanEliminateAccount (Gbl.Usrs.Me.UsrDat.UsrCod)) Lay_PutContextualLinkOnlyIcon (ActReqRemMyAcc,NULL, - Acc_PutParamsToRemoveMyAccount,(void *) Gbl.Usrs.Me.UsrDat.EncryptedUsrCod, + Acc_PutParamsToRemoveMyAccount,Gbl.Usrs.Me.UsrDat.EncryptedUsrCod, "trash.svg", Txt_Remove_account); } @@ -980,7 +980,7 @@ static void Acc_AskIfRemoveOtherUsrAccount (void) /* Show form to request confirmation */ Frm_StartForm (ActRemUsrGbl); - Usr_PutParamOtherUsrCodEncrypted ((void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); Pwd_AskForConfirmationOnDangerousAction (); Btn_PutRemoveButton (Txt_Eliminate_user_account); Frm_EndForm (); diff --git a/swad_agenda.c b/swad_agenda.c index 2c762248..4f09e100 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -155,7 +155,7 @@ void Agd_ShowMyAgenda (void) /***** Begin box *****/ Box_BoxBegin ("100%",Txt_My_agenda, - Agd_PutIconsMyFullAgenda,(void *) &Gbl.Agenda, + Agd_PutIconsMyFullAgenda,&Gbl.Agenda, Hlp_PROFILE_Agenda,Box_NOT_CLOSABLE); /***** Put forms to choice which events to show *****/ @@ -361,12 +361,12 @@ void Agd_ShowUsrAgenda (void) if (ItsMe) Box_BoxBegin ("100%",Str_BuildStringStr (Txt_Public_agenda_USER, Gbl.Usrs.Me.UsrDat.FullName), - Agd_PutIconsMyPublicAgenda,(void *) Gbl.Usrs.Me.UsrDat.EncryptedUsrCod, + Agd_PutIconsMyPublicAgenda,Gbl.Usrs.Me.UsrDat.EncryptedUsrCod, Hlp_PROFILE_Agenda_public_agenda,Box_NOT_CLOSABLE); else Box_BoxBegin ("100%",Str_BuildStringStr (Txt_Public_agenda_USER, Gbl.Usrs.Other.UsrDat.FullName), - Agd_PutIconsOtherPublicAgenda,(void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod, + Agd_PutIconsOtherPublicAgenda,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod, Hlp_PROFILE_Agenda_public_agenda,Box_NOT_CLOSABLE); Str_FreeString (); @@ -595,7 +595,7 @@ static void Agd_WriteHeaderListEvents (Agd_AgendaType_t AgendaType) case Agd_ANOTHER_AGENDA_TODAY: case Agd_ANOTHER_AGENDA: Frm_StartForm (ActSeeUsrAgd); - Usr_PutParamOtherUsrCodEncrypted ((void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); Pag_PutHiddenParamPagNum (Pag_ANOTHER_AGENDA,Gbl.Agenda.CurrentPage); break; } @@ -654,7 +654,7 @@ static void Agd_PutIconToCreateNewEvent (void *Agenda) /***** Put form to create a new event *****/ Agd->AgdCodToEdit = -1L; Ico_PutContextualIconToAdd (ActFrmNewEvtMyAgd,NULL, - Agd_PutCurrentParamsMyAgenda,(void *) Agd, + Agd_PutCurrentParamsMyAgenda,Agd, Txt_New_event); } @@ -676,7 +676,7 @@ static void Agd_PutIconToShowQR (void) Gbl.Usrs.Me.UsrDat.Nickname); Gbl.QR.Str = URL; QR_PutLinkToPrintQRCode (ActPrnAgdQR, - QR_PutParamQRString,(void *) URL); + QR_PutParamQRString,URL); } static void Agd_PutIconsOtherPublicAgenda (void *EncryptedUsrCod) @@ -1518,7 +1518,7 @@ void Agd_RequestCreatOrEditEvent (void) Frm_StartForm (ActChgEvtMyAgd); Gbl.Agenda.AgdCodToEdit = AgdEvent.AgdCod; } - Agd_PutCurrentParamsMyAgenda ((void *) &Gbl.Agenda); + Agd_PutCurrentParamsMyAgenda (&Gbl.Agenda); /***** Begin box and table *****/ if (ItsANewEvent) diff --git a/swad_announcement.c b/swad_announcement.c index 38cdd464..8547bba5 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -308,18 +308,18 @@ static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status, { /***** Put form to remove announcement *****/ Ico_PutContextualIconToRemove (ActRemAnn, - Ann_PutParams,(void *) &AnnCod); + Ann_PutParams,&AnnCod); /***** Put form to change the status of the announcement *****/ switch (Status) { case Ann_ACTIVE_ANNOUNCEMENT: Ico_PutContextualIconToHide (ActHidAnn,NULL, - Ann_PutParams,(void *) &AnnCod); + Ann_PutParams,&AnnCod); break; case Ann_OBSOLETE_ANNOUNCEMENT: Ico_PutContextualIconToUnhide (ActRevAnn,NULL, - Ann_PutParams,(void *) &AnnCod); + Ann_PutParams,&AnnCod); break; } } @@ -355,7 +355,7 @@ static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status, else /***** Put form to mark announcement as seen *****/ Lay_PutContextualLinkIconText (ActAnnSee,NULL, - Ann_PutParams,(void *) &AnnCod, + Ann_PutParams,&AnnCod, "close.svg", Txt_Do_not_show_again); diff --git a/swad_assignment.c b/swad_assignment.c index deb6b209..982cd6b3 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -110,7 +110,7 @@ void Asg_SeeAssignments (void) { /***** Get parameters *****/ Asg_GetParamAsgOrder (); - Grp_GetParamWhichGrps (); + Grp_GetParamWhichGroups (); Gbl.Asgs.CurrentPage = Pag_GetParamPagNum (Pag_ASSIGNMENTS); /***** Show all the assignments *****/ @@ -140,7 +140,7 @@ static void Asg_ShowAllAssignments (void) /***** Begin box *****/ Box_BoxBegin ("100%",Txt_Assignments, - Asg_PutIconsListAssignments,(void *) &Gbl.Asgs, + Asg_PutIconsListAssignments,&Gbl.Asgs, Hlp_ASSESSMENT_Assignments,Box_NOT_CLOSABLE); /***** Select whether show only my groups or all groups *****/ @@ -148,7 +148,7 @@ static void Asg_ShowAllAssignments (void) { Set_StartSettingsHead (); Grp_ShowFormToSelWhichGrps (ActSeeAsg, - Asg_ParamsWhichGroupsToShow,(void *) &Gbl); + Asg_ParamsWhichGroupsToShow,&Gbl); Set_EndSettingsHead (); } @@ -183,7 +183,7 @@ static void Asg_ShowAllAssignments (void) /***** Button to create a new assignment *****/ if (Asg_CheckIfICanCreateAssignments ()) - Asg_PutButtonToCreateNewAsg ((void *) &Gbl.Asgs); + Asg_PutButtonToCreateNewAsg (&Gbl.Asgs); /***** End box *****/ Box_BoxEnd (); @@ -203,6 +203,7 @@ static void Asg_PutHeadForSeeing (bool PrintView) extern const char *Txt_Assignment; extern const char *Txt_Folder; Dat_StartEndTime_t Order; + Grp_WhichGroups_t WhichGroups; HTM_TR_Begin (NULL); @@ -216,7 +217,8 @@ static void Asg_PutHeadForSeeing (bool PrintView) if (!PrintView) { Frm_StartForm (ActSeeAsg); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); Pag_PutHiddenParamPagNum (Pag_ASSIGNMENTS,Gbl.Asgs.CurrentPage); Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); HTM_BUTTON_SUBMIT_Begin (Txt_START_END_TIME_HELP[Order],"BT_LINK TIT_TBL",NULL); @@ -527,7 +529,7 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg,bool PrintView) Str_Copy (Gbl.FileBrowser.FilFolLnk.Name,Asg->Folder, NAME_MAX); Gbl.FileBrowser.FilFolLnk.Type = Brw_IS_FOLDER; - Brw_PutImplicitParamsFileBrowser ((void *) &Gbl); + Brw_PutImplicitParamsFileBrowser (&Gbl); Ico_PutIconLink ("folder-open-yellow-plus.png", Txt_Upload_file_or_create_folder); Frm_EndForm (); @@ -590,26 +592,26 @@ static void Asg_PutFormsToRemEditOneAsg (const struct Assignment *Asg, case Rol_SYS_ADM: /***** Put form to remove assignment *****/ Ico_PutContextualIconToRemove (ActReqRemAsg, - Asg_PutParams,(void *) &Gbl.Asgs); + Asg_PutParams,&Gbl.Asgs); /***** Put form to hide/show assignment *****/ if (Asg->Hidden) Ico_PutContextualIconToUnhide (ActShoAsg,Anchor, - Asg_PutParams,(void *) &Gbl.Asgs); + Asg_PutParams,&Gbl.Asgs); else Ico_PutContextualIconToHide (ActHidAsg,Anchor, - Asg_PutParams,(void *) &Gbl.Asgs); + Asg_PutParams,&Gbl.Asgs); /***** Put form to edit assignment *****/ Ico_PutContextualIconToEdit (ActEdiOneAsg,NULL, - Asg_PutParams,(void *) &Gbl.Asgs); + Asg_PutParams,&Gbl.Asgs); /* falls through */ /* no break */ case Rol_STD: case Rol_NET: /***** Put form to print assignment *****/ Ico_PutContextualIconToPrint (ActPrnOneAsg, - Asg_PutParams,(void *) &Gbl.Asgs); + Asg_PutParams,&Gbl.Asgs); break; default: break; @@ -622,12 +624,15 @@ static void Asg_PutFormsToRemEditOneAsg (const struct Assignment *Asg, static void Asg_PutParams (void *Assignments) { + Grp_WhichGroups_t WhichGroups; + if (Assignments) { if (((struct Asg_Assignments *) Assignments)->AsgCodToEdit > 0) Asg_PutParamAsgCod (((struct Asg_Assignments *) Assignments)->AsgCodToEdit); Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); Pag_PutHiddenParamPagNum (Pag_ASSIGNMENTS,((struct Asg_Assignments *) Assignments)->CurrentPage); } } @@ -984,7 +989,7 @@ void Asg_ReqRemAssignment (void) /***** Get parameters *****/ Asg_GetParamAsgOrder (); - Grp_GetParamWhichGrps (); + Grp_GetParamWhichGroups (); Gbl.Asgs.CurrentPage = Pag_GetParamPagNum (Pag_ASSIGNMENTS); /***** Get assignment code *****/ @@ -997,7 +1002,7 @@ void Asg_ReqRemAssignment (void) /***** Show question and button to remove the assignment *****/ Gbl.Asgs.AsgCodToEdit = Asg.AsgCod; Ale_ShowAlertAndButton (ActRemAsg,NULL,NULL, - Asg_PutParams,(void *) &Gbl.Asgs, + Asg_PutParams,&Gbl.Asgs, Btn_REMOVE_BUTTON,Txt_Remove_assignment, Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_assignment_X, Asg.Title); @@ -1137,7 +1142,7 @@ void Asg_RequestCreatOrEditAsg (void) /***** Get parameters *****/ Asg_GetParamAsgOrder (); - Grp_GetParamWhichGrps (); + Grp_GetParamWhichGroups (); Gbl.Asgs.CurrentPage = Pag_GetParamPagNum (Pag_ASSIGNMENTS); /***** Get the code of the assignment *****/ @@ -1176,7 +1181,7 @@ void Asg_RequestCreatOrEditAsg (void) Frm_StartForm (ActChgAsg); Gbl.Asgs.AsgCodToEdit = Asg.AsgCod; } - Asg_PutParams ((void *) &Gbl.Asgs); + Asg_PutParams (&Gbl.Asgs); /***** Begin box and table *****/ if (ItsANewAssignment) diff --git a/swad_attendance.c b/swad_attendance.c index 5a613339..4ca4350b 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -164,7 +164,7 @@ void Att_SeeAttEvents (void) { /***** Get parameters *****/ Att_GetParamAttOrder (); - Grp_GetParamWhichGrps (); + Grp_GetParamWhichGroups (); Gbl.AttEvents.CurrentPage = Pag_GetParamPagNum (Pag_ATT_EVENTS); /***** Get list of attendance events *****/ @@ -187,8 +187,9 @@ static void Att_ShowAllAttEvents (void) extern const char *Txt_Event; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_No_events; - Dat_StartEndTime_t Order; struct Pagination Pagination; + Dat_StartEndTime_t Order; + Grp_WhichGroups_t WhichGroups; unsigned NumAttEvent; bool ICanEdit = (Gbl.Usrs.Me.Role.Logged == Rol_TCH || Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM); @@ -201,7 +202,7 @@ static void Att_ShowAllAttEvents (void) /***** Begin box *****/ Box_BoxBegin ("100%",Txt_Events, - Att_PutIconsInListOfAttEvents,(void *) &Gbl, + Att_PutIconsInListOfAttEvents,&Gbl, Hlp_USERS_Attendance,Box_NOT_CLOSABLE); /***** Select whether show only my groups or all groups *****/ @@ -209,7 +210,7 @@ static void Att_ShowAllAttEvents (void) { Set_StartSettingsHead (); Grp_ShowFormToSelWhichGrps (ActSeeAtt, - Att_ParamsWhichGroupsToShow,(void *) &Gbl); + Att_ParamsWhichGroupsToShow,&Gbl); Set_EndSettingsHead (); } @@ -232,7 +233,8 @@ static void Att_ShowAllAttEvents (void) HTM_TH_Begin (1,1,"LM"); Frm_StartForm (ActSeeAtt); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Gbl.AttEvents.CurrentPage); Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); HTM_BUTTON_SUBMIT_Begin (Txt_START_END_TIME_HELP[Order],"BT_LINK TIT_TBL",NULL); @@ -320,7 +322,7 @@ static void Att_PutIconsInListOfAttEvents (void *Args) case Rol_TCH: case Rol_SYS_ADM: Ico_PutContextualIconToShowAttendanceList (ActReqLstUsrAtt, - Att_PutParamsToListUsrsAttendance,(void *) &Gbl); + Att_PutParamsToListUsrsAttendance,&Gbl); break; default: break; @@ -328,7 +330,7 @@ static void Att_PutIconsInListOfAttEvents (void *Args) /***** Put icon to print my QR code *****/ QR_PutLinkToPrintQRCode (ActPrnUsrQR, - Usr_PutParamMyUsrCodEncrypted,(void *) Gbl.Usrs.Me.UsrDat.EncryptedUsrCod); + Usr_PutParamMyUsrCodEncrypted,Gbl.Usrs.Me.UsrDat.EncryptedUsrCod); } } @@ -342,7 +344,7 @@ static void Att_PutIconToCreateNewAttEvent (void) /***** Put icon to create a new attendance event *****/ Ico_PutContextualIconToAdd (ActFrmNewAtt,NULL, - Att_PutParamsToCreateNewAttEvent,(void *) &Gbl, + Att_PutParamsToCreateNewAttEvent,&Gbl, Txt_New_event); } @@ -355,7 +357,7 @@ static void Att_PutButtonToCreateNewAttEvent (void) extern const char *Txt_New_event; Frm_StartForm (ActFrmNewAtt); - Att_PutParamsToCreateNewAttEvent ((void *) &Gbl); + Att_PutParamsToCreateNewAttEvent (&Gbl); Btn_PutConfirmButton (Txt_New_event); Frm_EndForm (); } @@ -366,10 +368,13 @@ static void Att_PutButtonToCreateNewAttEvent (void) static void Att_PutParamsToCreateNewAttEvent (void *Args) { + Grp_WhichGroups_t WhichGroups; + if (Args) { Att_PutHiddenParamAttOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Gbl.AttEvents.CurrentPage); } } @@ -380,10 +385,13 @@ static void Att_PutParamsToCreateNewAttEvent (void *Args) static void Att_PutParamsToListUsrsAttendance (void *Args) { + Grp_WhichGroups_t WhichGroups; + if (Args) { Att_PutHiddenParamAttOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Gbl.AttEvents.CurrentPage); } } @@ -563,19 +571,19 @@ static void Att_PutFormsToRemEditOneAttEvent (const struct AttendanceEvent *Att, /***** Put form to remove attendance event *****/ Ico_PutContextualIconToRemove (ActReqRemAtt, - Att_PutParams,(void *) &Gbl); + Att_PutParams,&Gbl); /***** Put form to hide/show attendance event *****/ if (Att->Hidden) Ico_PutContextualIconToUnhide (ActShoAtt,Anchor, - Att_PutParams,(void *) &Gbl); + Att_PutParams,&Gbl); else Ico_PutContextualIconToHide (ActHidAtt,Anchor, - Att_PutParams,(void *) &Gbl); + Att_PutParams,&Gbl); /***** Put form to edit attendance event *****/ Ico_PutContextualIconToEdit (ActEdiOneAtt,NULL, - Att_PutParams,(void *) &Gbl); + Att_PutParams,&Gbl); } /*****************************************************************************/ @@ -584,11 +592,14 @@ static void Att_PutFormsToRemEditOneAttEvent (const struct AttendanceEvent *Att, static void Att_PutParams (void *Args) { + Grp_WhichGroups_t WhichGroups; + if (Args) { Att_PutParamAttCod (Gbl.AttEvents.AttCod); Att_PutHiddenParamAttOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Gbl.AttEvents.CurrentPage); } } @@ -877,10 +888,11 @@ void Att_AskRemAttEvent (void) extern const char *Txt_Do_you_really_want_to_remove_the_event_X; extern const char *Txt_Remove_event; struct AttendanceEvent Att; + Grp_WhichGroups_t WhichGroups; /***** Get parameters *****/ Att_GetParamAttOrder (); - Grp_GetParamWhichGrps (); + Grp_GetParamWhichGroups (); Gbl.AttEvents.CurrentPage = Pag_GetParamPagNum (Pag_ATT_EVENTS); /***** Get attendance event code *****/ @@ -894,7 +906,8 @@ void Att_AskRemAttEvent (void) Frm_StartForm (ActRemAtt); Att_PutParamAttCod (Att.AttCod); Att_PutHiddenParamAttOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Gbl.AttEvents.CurrentPage); /* Ask for confirmation of removing */ @@ -1037,6 +1050,7 @@ void Att_RequestCreatOrEditAttEvent (void) extern const char *Txt_Save_changes; struct AttendanceEvent Att; bool ItsANewAttEvent; + Grp_WhichGroups_t WhichGroups; char Description[Cns_MAX_BYTES_TEXT + 1]; static const Dat_SetHMS SetHMS[Dat_NUM_START_END_TIME] = { @@ -1046,7 +1060,7 @@ void Att_RequestCreatOrEditAttEvent (void) /***** Get parameters *****/ Att_GetParamAttOrder (); - Grp_GetParamWhichGrps (); + Grp_GetParamWhichGroups (); Gbl.AttEvents.CurrentPage = Pag_GetParamPagNum (Pag_ATT_EVENTS); /***** Get the code of the attendance event *****/ @@ -1085,7 +1099,8 @@ void Att_RequestCreatOrEditAttEvent (void) Att_PutParamAttCod (Att.AttCod); } Att_PutHiddenParamAttOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Gbl.AttEvents.CurrentPage); /***** Begin box and table *****/ @@ -1822,7 +1837,7 @@ void Att_SeeOneAttEvent (void) /***** Get parameters *****/ Att_GetParamAttOrder (); - Grp_GetParamWhichGrps (); + Grp_GetParamWhichGroups (); Gbl.AttEvents.CurrentPage = Pag_GetParamPagNum (Pag_ATT_EVENTS); /***** Begin box and table *****/ @@ -1942,7 +1957,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att) Hlp_USERS_Attendance,Box_NOT_CLOSABLE); /***** Form to select groups *****/ - Grp_ShowFormToSelectSeveralGroups (Att_PutParamSelectedAttCod,(void *) &Gbl, + Grp_ShowFormToSelectSeveralGroups (Att_PutParamSelectedAttCod,&Gbl, Grp_MY_GROUPS); /***** Start section with user list *****/ @@ -2711,7 +2726,7 @@ static void Att_ListOrPrintMyAttendanceCrs (void) /***** Begin box *****/ if (Att_TypeOfView == Att_VIEW_ONLY_ME) Box_BoxBegin (NULL,Txt_Attendance, - Att_PutIconsMyAttList,(void *) &Gbl, + Att_PutIconsMyAttList,&Gbl, Hlp_USERS_Attendance_attendance_list,Box_NOT_CLOSABLE); else Box_BoxBegin (NULL,Txt_Attendance, @@ -2808,7 +2823,7 @@ static void Att_ListOrPrintUsrsAttendanceCrs (void) /***** Begin box *****/ if (Att_TypeOfView == Att_VIEW_SEL_USR) Box_BoxBegin (NULL,Txt_Attendance_list, - Att_PutIconsStdsAttList,(void *) &Gbl, + Att_PutIconsStdsAttList,&Gbl, Hlp_USERS_Attendance_attendance_list,Box_NOT_CLOSABLE); else Box_BoxBegin (NULL,Txt_Attendance_list, @@ -2967,11 +2982,11 @@ static void Att_PutIconsMyAttList (void *Args) { /***** Put icon to print my assistance (as student) to several events *****/ Ico_PutContextualIconToPrint (ActPrnLstMyAtt, - Att_PutFormToPrintMyListParams,(void *) &Gbl); + Att_PutFormToPrintMyListParams,&Gbl); /***** Put icon to print my QR code *****/ QR_PutLinkToPrintQRCode (ActPrnUsrQR, - Usr_PutParamMyUsrCodEncrypted,(void *) Gbl.Usrs.Me.UsrDat.EncryptedUsrCod); + Usr_PutParamMyUsrCodEncrypted,Gbl.Usrs.Me.UsrDat.EncryptedUsrCod); } } @@ -2997,11 +3012,11 @@ static void Att_PutIconsStdsAttList (void *Args) { /***** Put icon to print assistance of students to several events *****/ Ico_PutContextualIconToPrint (ActPrnLstUsrAtt, - Att_PutParamsToPrintStdsList,(void *) &Gbl); + Att_PutParamsToPrintStdsList,&Gbl); /***** Put icon to print my QR code *****/ QR_PutLinkToPrintQRCode (ActPrnUsrQR, - Usr_PutParamMyUsrCodEncrypted,(void *) Gbl.Usrs.Me.UsrDat.EncryptedUsrCod); + Usr_PutParamMyUsrCodEncrypted,Gbl.Usrs.Me.UsrDat.EncryptedUsrCod); } } @@ -3061,12 +3076,12 @@ static void Att_ListEventsToSelect (void) { case Att_VIEW_ONLY_ME: Box_BoxBegin (NULL,Txt_Events, - Att_PutIconToViewAttEvents,(void *) &Gbl, + Att_PutIconToViewAttEvents,&Gbl, NULL,Box_NOT_CLOSABLE); break; case Att_VIEW_SEL_USR: Box_BoxBegin (NULL,Txt_Events, - Att_PutIconToEditAttEvents,(void *) &Gbl, + Att_PutIconToEditAttEvents,&Gbl, NULL,Box_NOT_CLOSABLE); break; case Att_PRNT_ONLY_ME: diff --git a/swad_banner.c b/swad_banner.c index bd42647a..272b3458 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -112,7 +112,7 @@ void Ban_SeeBanners (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Banners, - Ban_PutIconsListingBanners,(void *) &Gbl, + Ban_PutIconsListingBanners,&Gbl, Hlp_SYSTEM_Banners,Box_NOT_CLOSABLE); /***** Write all banners *****/ @@ -225,7 +225,7 @@ static void Ban_EditBannersInternal (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Banners, - Ban_PutIconsEditingBanners,(void *) &Gbl, + Ban_PutIconsEditingBanners,&Gbl, Hlp_SYSTEM_Banners_edit,Box_NOT_CLOSABLE); /***** Put a form to create a new banner *****/ @@ -432,17 +432,17 @@ static void Ban_ListBannersForEdition (void) HTM_TD_Begin ("class=\"BM\""); Ico_PutContextualIconToRemove (ActRemBan, - Ban_PutParamBanCodToEdit,(void *) &Gbl); + Ban_PutParamBanCodToEdit,&Gbl); HTM_TD_End (); /* Put icon to hide/show banner */ HTM_TD_Begin ("class=\"BM\""); if (Ban->Hidden) Ico_PutContextualIconToUnhide (ActShoBan,Anchor, - Ban_PutParamBanCodToEdit,(void *) &Gbl); + Ban_PutParamBanCodToEdit,&Gbl); else Ico_PutContextualIconToHide (ActHidBan,Anchor, - Ban_PutParamBanCodToEdit,(void *) &Gbl); + Ban_PutParamBanCodToEdit,&Gbl); HTM_TD_End (); /* Banner code */ @@ -457,7 +457,7 @@ static void Ban_ListBannersForEdition (void) /* Banner short name */ HTM_TD_Begin ("class=\"CM\""); Frm_StartForm (ActRenBanSho); - Ban_PutParamBanCodToEdit ((void *) &Gbl); + Ban_PutParamBanCodToEdit (&Gbl); HTM_INPUT_TEXT ("ShortName",Ban_MAX_CHARS_SHRT_NAME,Ban->ShrtName,true, "class=\"INPUT_SHORT_NAME\""); Frm_EndForm (); @@ -466,7 +466,7 @@ static void Ban_ListBannersForEdition (void) /* Banner full name */ HTM_TD_Begin ("class=\"CM\""); Frm_StartForm (ActRenBanFul); - Ban_PutParamBanCodToEdit ((void *) &Gbl); + Ban_PutParamBanCodToEdit (&Gbl); HTM_INPUT_TEXT ("FullName",Ban_MAX_CHARS_FULL_NAME,Ban->FullName,true, "class=\"INPUT_FULL_NAME\""); Frm_EndForm (); @@ -475,7 +475,7 @@ static void Ban_ListBannersForEdition (void) /* Banner image */ HTM_TD_Begin ("class=\"CM\""); Frm_StartForm (ActChgBanImg); - Ban_PutParamBanCodToEdit ((void *) &Gbl); + Ban_PutParamBanCodToEdit (&Gbl); HTM_INPUT_TEXT ("Img",Ban_MAX_CHARS_IMAGE,Ban->Img,true, "size=\"12\""); Frm_EndForm (); @@ -484,7 +484,7 @@ static void Ban_ListBannersForEdition (void) /* Banner WWW */ HTM_TD_Begin ("class=\"CM\""); Frm_StartForm (ActChgBanWWW); - Ban_PutParamBanCodToEdit ((void *) &Gbl); + Ban_PutParamBanCodToEdit (&Gbl); HTM_INPUT_URL ("WWW",Ban->WWW,true, "class=\"INPUT_WWW_NARROW\" required=\"required\""); Frm_EndForm (); diff --git a/swad_calendar.c b/swad_calendar.c index 10b6a344..36140486 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -82,7 +82,7 @@ void Cal_PutIconsToSelectFirstDayOfWeek (void) extern const char *Txt_Calendar; Box_BoxBegin (NULL,Txt_Calendar, - Cal_PutIconsFirstDayOfWeek,(void *) &Gbl, + Cal_PutIconsFirstDayOfWeek,&Gbl, Hlp_PROFILE_Settings_calendar,Box_NOT_CLOSABLE); Set_StartSettingsHead (); Cal_ShowFormToSelFirstDayOfWeek (ActChg1stDay, @@ -242,7 +242,7 @@ void Cal_DrawCurrentMonth (void) void Cal_ShowCalendar (void) { Cal_DrawCalendar (ActSeeCal,ActChgCal1stDay, - Cal_PutIconsCalendar,(void *) &Gbl, + Cal_PutIconsCalendar,&Gbl, false); } diff --git a/swad_centre.c b/swad_centre.c index 29e0ec09..167a09df 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -273,7 +273,7 @@ static void Ctr_ListCentres (void) /***** Begin box *****/ Box_BoxBegin (NULL,Str_BuildStringStr (Txt_Centres_of_INSTITUTION_X, Gbl.Hierarchy.Ins.FullName), - Ctr_PutIconsListingCentres,(void *) &Gbl, + Ctr_PutIconsListingCentres,&Gbl, Hlp_INSTITUTION_Centres,Box_NOT_CLOSABLE); Str_FreeString (); @@ -479,7 +479,7 @@ static void Ctr_EditCentresInternal (void) /***** Begin box *****/ Box_BoxBegin (NULL,Str_BuildStringStr (Txt_Centres_of_INSTITUTION_X, Gbl.Hierarchy.Ins.FullName), - Ctr_PutIconsEditingCentres,(void *) &Gbl, + Ctr_PutIconsEditingCentres,&Gbl, Hlp_INSTITUTION_Centres,Box_NOT_CLOSABLE); Str_FreeString (); @@ -1576,7 +1576,7 @@ static void Ctr_ShowAlertAndButtonToGoToCtr (void) { /***** Alert with button to go to centre *****/ Ale_ShowLastAlertAndButton (ActSeeDeg,NULL,NULL, - Ctr_PutParamGoToCtr,(void *) &Gbl, + Ctr_PutParamGoToCtr,&Gbl, Btn_CONFIRM_BUTTON, Hie_BuildGoToMsg (Ctr_EditingCtr->ShrtName)); Hie_FreeGoToMsg (); @@ -2189,7 +2189,7 @@ static void Ctr_FormToGoToMap (struct Centre *Ctr) { Ctr_EditingCtr = Ctr; // Used to pass parameter with the code of the centre Lay_PutContextualLinkOnlyIcon (ActSeeCtrInf,NULL, - Ctr_PutParamGoToCtr,(void *) &Gbl, + Ctr_PutParamGoToCtr,&Gbl, "map-marker-alt.svg", Txt_Map); } diff --git a/swad_centre_config.c b/swad_centre_config.c index 1801747d..b8ac6d62 100644 --- a/swad_centre_config.c +++ b/swad_centre_config.c @@ -160,7 +160,7 @@ static void CtrCfg_Configuration (bool PrintView) NULL,Box_NOT_CLOSABLE); else Box_BoxBegin (NULL,NULL, - CtrCfg_PutIconsCtrConfig,(void *) &Gbl, + CtrCfg_PutIconsCtrConfig,&Gbl, Hlp_CENTRE_Information,Box_NOT_CLOSABLE); /***** Title *****/ diff --git a/swad_changelog.h b/swad_changelog.h index 7c1c245d..b847dfd7 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -497,7 +497,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.155.2 (2020-03-26)" +#define Log_PLATFORM_VERSION "SWAD 19.155.3 (2020-03-27)" #define CSS_FILE "swad19.146.css" #define JS_FILE "swad19.153.js" /* @@ -526,8 +526,9 @@ Param // TODO: URGENT: Fix bug while playing match. - Version 19.155.2 Mar 25, 2020 Code refactoring in tests. (284414 lines) - Version 19.155.1 Mar 25, 2020 Code refactoring in tests. (284430 lines) + Version 19.155.3: Mar 27, 2020 Code refactoring in pass to parameters of functions. (284476 lines) + Version 19.155.2 Mar 26, 2020 Code refactoring in tests. (284414 lines) + Version 19.155.1 Mar 26, 2020 Code refactoring in tests. (284430 lines) Version 19.155: Mar 25, 2020 Big code refactoring in pass to parameters of functions. (284446 lines) Version 19.154: Mar 25, 2020 Code refactoring in tests. (283385 lines) Version 19.153: Mar 24, 2020 Code refactoring in tests. (283432 lines) diff --git a/swad_classroom.c b/swad_classroom.c index dd955088..196874f2 100644 --- a/swad_classroom.c +++ b/swad_classroom.c @@ -114,7 +114,7 @@ void Cla_SeeClassrooms (void) /***** Table head *****/ Box_BoxBegin (NULL,Txt_Classrooms, - Cla_PutIconsListingClassrooms,(void *) &Gbl, + Cla_PutIconsListingClassrooms,&Gbl, Hlp_CENTRE_Classrooms,Box_NOT_CLOSABLE); HTM_TABLE_BeginWideMarginPadding (2); HTM_TR_Begin (NULL); @@ -256,7 +256,7 @@ static void Cla_EditClassroomsInternal (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Classrooms, - Cla_PutIconsEditingClassrooms,(void *) &Gbl, + Cla_PutIconsEditingClassrooms,&Gbl, Hlp_CENTRE_Classrooms_edit,Box_NOT_CLOSABLE); /***** Put a form to create a new classroom *****/ diff --git a/swad_connected.c b/swad_connected.c index 1cef6b6e..1139dd17 100644 --- a/swad_connected.c +++ b/swad_connected.c @@ -106,7 +106,7 @@ void Con_ShowConnectedUsrs (void) Txt_Connected_users) < 0) Lay_NotEnoughMemoryExit (); Box_BoxBegin (NULL,Title, - Con_PutIconToUpdateConnected,(void *) &Gbl, + Con_PutIconToUpdateConnected,&Gbl, Hlp_USERS_Connected,Box_NOT_CLOSABLE); free (Title); Dat_WriteLocalDateHMSFromUTC ("connected_current_time",Gbl.StartExecutionTimeUTC, diff --git a/swad_cookie.c b/swad_cookie.c index ca674dc7..e151de9a 100644 --- a/swad_cookie.c +++ b/swad_cookie.c @@ -69,7 +69,7 @@ void Coo_EditMyPrefsOnCookies (void) /***** Begin box and table *****/ Box_BoxTableBegin (NULL,Txt_Cookies, - Coo_PutIconsCookies,(void *) &Gbl, + Coo_PutIconsCookies,&Gbl, Hlp_PROFILE_Settings_cookies,Box_NOT_CLOSABLE,2); /***** Edit my preference about cookies *****/ diff --git a/swad_country.c b/swad_country.c index d8343cc5..10fd7f2e 100644 --- a/swad_country.c +++ b/swad_country.c @@ -231,7 +231,7 @@ void Cty_ListCountries2 (void) /***** Begin box and table *****/ Box_BoxTableBegin (NULL,Txt_Countries, - Cty_PutIconsListingCountries,(void *) &Gbl, + Cty_PutIconsListingCountries,&Gbl, Hlp_SYSTEM_Countries,Box_NOT_CLOSABLE,2); /***** Write heading *****/ @@ -682,7 +682,7 @@ static void Cty_EditCountriesInternal (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Countries, - Cty_PutIconsEditingCountries,(void *) &Gbl, + Cty_PutIconsEditingCountries,&Gbl, Hlp_SYSTEM_Countries,Box_NOT_CLOSABLE); /***** Put a form to create a new country *****/ @@ -1582,7 +1582,7 @@ static void Cty_ShowAlertAndButtonToGoToCty (void) { /***** Alert with button to go to couuntry *****/ Ale_ShowLastAlertAndButton (ActSeeIns,NULL,NULL, - Cty_PutParamGoToCty,(void *) &Gbl, + Cty_PutParamGoToCty,&Gbl, Btn_CONFIRM_BUTTON, Hie_BuildGoToMsg (Cty_EditingCty->Name[Gbl.Prefs.Language])); Hie_FreeGoToMsg (); @@ -2103,7 +2103,7 @@ static void Cty_FormToGoToMap (struct Country *Cty) { Cty_EditingCty = Cty; // Used to pass parameter with the code of the country Lay_PutContextualLinkOnlyIcon (ActSeeCtyInf,NULL, - Cty_PutParamGoToCty,(void *) &Gbl, + Cty_PutParamGoToCty,&Gbl, "map-marker-alt.svg", Txt_Map); } diff --git a/swad_country_config.c b/swad_country_config.c index 9d3409ed..e854aba6 100644 --- a/swad_country_config.c +++ b/swad_country_config.c @@ -127,7 +127,7 @@ static void CtyCfg_Configuration (bool PrintView) NULL,Box_NOT_CLOSABLE); else Box_BoxBegin (NULL,NULL, - CtyCfg_PutIconToPrint,(void *) &Gbl, + CtyCfg_PutIconToPrint,&Gbl, Hlp_COUNTRY_Information,Box_NOT_CLOSABLE); /***** Title *****/ diff --git a/swad_course.c b/swad_course.c index c1782c0c..0aa6ab6c 100644 --- a/swad_course.c +++ b/swad_course.c @@ -177,7 +177,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_My_courses, - Crs_PutIconToSearchCourses,(void *) &Gbl, + Crs_PutIconToSearchCourses,&Gbl, Hlp_PROFILE_Courses,Box_NOT_CLOSABLE); HTM_UL_Begin ("class=\"LIST_TREE\""); @@ -802,7 +802,7 @@ static void Crs_ListCourses (void) /***** Begin box *****/ Box_BoxBegin (NULL,Str_BuildStringStr (Txt_Courses_of_DEGREE_X, Gbl.Hierarchy.Deg.ShrtName), - Crs_PutIconsListCourses,(void *) &Gbl, + Crs_PutIconsListCourses,&Gbl, Hlp_DEGREE_Courses,Box_NOT_CLOSABLE); Str_FreeString (); @@ -1019,7 +1019,7 @@ static void Crs_EditCoursesInternal (void) /***** Begin box *****/ Box_BoxBegin (NULL,Str_BuildStringStr (Txt_Courses_of_DEGREE_X, Gbl.Hierarchy.Deg.ShrtName), - Crs_PutIconsEditingCourses,(void *) &Gbl, + Crs_PutIconsEditingCourses,&Gbl, Hlp_DEGREE_Courses,Box_NOT_CLOSABLE); Str_FreeString (); @@ -2377,7 +2377,7 @@ static void Crs_PutIconToSearchCourses (void *Args) if (Args) /***** Put form to search / select courses *****/ Lay_PutContextualLinkOnlyIcon (ActReqSch,NULL, - Sch_PutLinkToSearchCoursesParams,(void *) &Gbl, + Sch_PutLinkToSearchCoursesParams,&Gbl, "search.svg", Txt_Search_courses); } diff --git a/swad_course_config.c b/swad_course_config.c index 35cf138a..a533ae55 100644 --- a/swad_course_config.c +++ b/swad_course_config.c @@ -118,7 +118,7 @@ void CrsCfg_Configuration (bool PrintView) NULL,Box_NOT_CLOSABLE); else Box_BoxBegin (NULL,NULL, - CrsCfg_PutIconToPrint,(void *) &Gbl, + CrsCfg_PutIconToPrint,&Gbl, Hlp_COURSE_Information,Box_NOT_CLOSABLE); /***** Title *****/ diff --git a/swad_date.c b/swad_date.c index c507e2ac..d1acfd95 100644 --- a/swad_date.c +++ b/swad_date.c @@ -109,7 +109,7 @@ void Dat_PutBoxToSelectDateFormat (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Dates, - Dat_PutIconsDateFormat,(void *) &Gbl, + Dat_PutIconsDateFormat,&Gbl, Hlp_PROFILE_Settings_dates,Box_NOT_CLOSABLE); /***** Form with list of options *****/ diff --git a/swad_degree.c b/swad_degree.c index 9c21cc9d..c2a253ca 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -767,7 +767,7 @@ static void Deg_ListDegrees (void) /***** Begin box *****/ Box_BoxBegin (NULL,Str_BuildStringStr (Txt_Degrees_of_CENTRE_X, Gbl.Hierarchy.Ctr.ShrtName), - Deg_PutIconsListingDegrees,(void *) &Gbl, + Deg_PutIconsListingDegrees,&Gbl, Hlp_CENTRE_Degrees,Box_NOT_CLOSABLE); Str_FreeString (); @@ -954,7 +954,7 @@ static void Deg_EditDegreesInternal (void) /***** Begin box *****/ Box_BoxBegin (NULL,Str_BuildStringStr (Txt_Degrees_of_CENTRE_X, Gbl.Hierarchy.Ctr.ShrtName), - Deg_PutIconsEditingDegrees,(void *) &Gbl, + Deg_PutIconsEditingDegrees,&Gbl, Hlp_CENTRE_Degrees,Box_NOT_CLOSABLE); Str_FreeString (); @@ -1811,7 +1811,7 @@ static void Deg_ShowAlertAndButtonToGoToDeg (void) { /***** Alert with button to go to degree *****/ Ale_ShowLastAlertAndButton (ActSeeCrs,NULL,NULL, - Deg_PutParamGoToDeg,(void *) &Gbl, + Deg_PutParamGoToDeg,&Gbl, Btn_CONFIRM_BUTTON, Hie_BuildGoToMsg (Deg_EditingDeg->ShrtName)); Hie_FreeGoToMsg (); diff --git a/swad_degree_config.c b/swad_degree_config.c index 4df3c51e..47ab2a3a 100644 --- a/swad_degree_config.c +++ b/swad_degree_config.c @@ -122,7 +122,7 @@ static void DegCfg_Configuration (bool PrintView) NULL,Box_NOT_CLOSABLE); else Box_BoxBegin (NULL,NULL, - DegCfg_PutIconsToPrintAndUpload,(void *) &Gbl, + DegCfg_PutIconsToPrintAndUpload,&Gbl, Hlp_DEGREE_Information,Box_NOT_CLOSABLE); /***** Title *****/ diff --git a/swad_degree_type.c b/swad_degree_type.c index ed3a4c4d..20a709d5 100644 --- a/swad_degree_type.c +++ b/swad_degree_type.c @@ -193,12 +193,12 @@ static void DT_ListDegreeTypes (Act_Action_t NextAction,DT_Order_t SelectedOrder { case ActSeeDegTyp: Box_BoxBegin (NULL,Txt_Types_of_degree, - DT_PutIconsListingDegTypes,(void *) &Gbl, + DT_PutIconsListingDegTypes,&Gbl, Hlp_CENTRE_DegreeTypes,Box_NOT_CLOSABLE); break; case ActSeeUseGbl: Box_BoxBegin (NULL,Txt_Types_of_degree, - DT_PutIconToEditDegTypes,(void *) &Gbl, + DT_PutIconToEditDegTypes,&Gbl, Hlp_ANALYTICS_Figures_types_of_degree,Box_NOT_CLOSABLE); break; default: // Bad call @@ -259,7 +259,7 @@ static void DT_EditDegreeTypesInternal (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Types_of_degree, - DT_PutIconsEditingDegreeTypes,(void *) &Gbl, + DT_PutIconsEditingDegreeTypes,&Gbl, Hlp_CENTRE_DegreeTypes_edit,Box_NOT_CLOSABLE); /***** Put a form to create a new degree type *****/ @@ -360,7 +360,7 @@ static void DT_PutIconsListingDegTypes (void *Args) if (Args) { /***** Put icon to edit degree types *****/ - DT_PutIconToEditDegTypes ((void *) &Gbl); + DT_PutIconToEditDegTypes (&Gbl); /***** Put icon to view degrees *****/ Deg_PutIconToViewDegrees (); @@ -524,7 +524,7 @@ static void DT_PutHeadDegreeTypesForSeeing (Act_Action_t NextAction,DT_Order_t S /* Begin form to change order */ Frm_StartForm (NextAction); if (NextAction == ActSeeUseGbl) - Fig_PutHiddenParamFigures ((void *) &Gbl); + Fig_PutHiddenParamFigures (&Gbl); Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); /* Link with the head of this column */ diff --git a/swad_department.c b/swad_department.c index 9025596e..0bcc2a7f 100644 --- a/swad_department.c +++ b/swad_department.c @@ -114,7 +114,7 @@ void Dpt_SeeDepts (void) if (Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM) Box_BoxTableBegin (NULL,Str_BuildStringStr (Txt_Departments_of_INSTITUTION_X, Gbl.Hierarchy.Ins.FullName), - Dpt_PutIconToEditDpts,(void *) &Gbl, + Dpt_PutIconToEditDpts,&Gbl, Hlp_INSTITUTION_Departments,Box_NOT_CLOSABLE,2); else Box_BoxTableBegin (NULL,Str_BuildStringStr (Txt_Departments_of_INSTITUTION_X, diff --git a/swad_enrolment.c b/swad_enrolment.c index d948dfda..d0d91874 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -2126,7 +2126,7 @@ void Enr_AskIfRejectSignUp (void) /* End alert */ Ale_ShowAlertAndButton2 (ActRejSignUp,NULL,NULL, - Usr_PutParamOtherUsrCodEncrypted,(void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod, + Usr_PutParamOtherUsrCodEncrypted,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod, Btn_REMOVE_BUTTON,Txt_Reject); } else @@ -3639,7 +3639,7 @@ static void Enr_ReqAddAdm (Hie_Level_t Scope,long Cod,const char *InsCtrDegName) /* End alert */ Ale_ShowAlertAndButton2 (Enr_ActNewAdm[Scope],NULL,NULL, - Usr_PutParamOtherUsrCodEncrypted,(void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod, + Usr_PutParamOtherUsrCodEncrypted,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod, Btn_CREATE_BUTTON,Txt_Register_user_IN_A_COURSE_OR_DEGREE); } } @@ -4206,7 +4206,7 @@ static void Enr_AskIfRemAdm (bool ItsMe,Hie_Level_t Scope, /* End alert */ Ale_ShowAlertAndButton2 (Enr_ActRemAdm[Scope],NULL,NULL, - Usr_PutParamOtherUsrCodEncrypted,(void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod, + Usr_PutParamOtherUsrCodEncrypted,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod, Btn_REMOVE_BUTTON, ItsMe ? Txt_Remove_me_as_an_administrator : Txt_Remove_USER_as_an_administrator); diff --git a/swad_exam.c b/swad_exam.c index da7467e2..016ee245 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -577,7 +577,7 @@ static void Exa_ListExamAnnouncements (Exa_TypeViewExamAnnouncement_t TypeViewEx /***** Begin box *****/ if (ICanEdit) Box_BoxBegin (NULL,Txt_Announcements_of_exams, - Exa_PutIconToCreateNewExamAnnouncement,(void *) &Gbl, + Exa_PutIconToCreateNewExamAnnouncement,&Gbl, Hlp_ASSESSMENT_Announcements,Box_NOT_CLOSABLE); else Box_BoxBegin (NULL,Txt_Announcements_of_exams, @@ -1010,7 +1010,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, /* Start highlighted box */ Box_BoxShadowBegin (Width,NULL, - FunctionToDrawContextualIcons,(void *) &Gbl, + FunctionToDrawContextualIcons,&Gbl, HelpLink); } else // Don't highlight diff --git a/swad_figure.c b/swad_figure.c index 8bef28a1..c81a589d 100644 --- a/swad_figure.c +++ b/swad_figure.c @@ -258,7 +258,7 @@ void Fig_PutIconToShowFigure (void) extern const char *Txt_Show_statistic; Lay_PutContextualLinkOnlyIcon (ActSeeUseGbl,NULL, - Fig_PutParamsToShowFigure,(void *) &Gbl, + Fig_PutParamsToShowFigure,&Gbl, "chart-pie.svg", Txt_Show_statistic); } @@ -276,7 +276,7 @@ static void Fig_PutParamsToShowFigure (void *Args) Gbl.Scope.Default = Hie_CRS; Sco_AdjustScope (); - Fig_PutHiddenParamFigures ((void *) &Gbl); + Fig_PutHiddenParamFigures (&Gbl); } } @@ -1040,7 +1040,7 @@ static void Fig_GetAndShowInstitutionsStats (void) /***** Form to select type of list used to display degree photos *****/ Usr_GetAndUpdatePrefsAboutUsrList (); - Usr_ShowFormsToSelectUsrListType (Fig_PutHiddenParamFigures,(void *) &Gbl); + Usr_ShowFormsToSelectUsrListType (Fig_PutHiddenParamFigures,&Gbl); /***** Institutions ordered by number of centres *****/ Fig_GetAndShowInssOrderedByNumCtrs (); diff --git a/swad_file_browser.c b/swad_file_browser.c index 53079373..8708b293 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -2337,11 +2337,11 @@ static void Brw_PutParamsFileBrowser (const char *PathInTree,const char *FilFolL { /***** Users selected *****/ Usr_PutHiddenParSelectedUsrsCods (&Gbl.Usrs.Selected); - Usr_PutParamOtherUsrCodEncrypted ((void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); } /***** If full tree selected? *****/ - Brw_PutHiddenParamFullTreeIfSelected ((void *) &Gbl); + Brw_PutHiddenParamFullTreeIfSelected (&Gbl); /***** Path and file *****/ if (PathInTree) @@ -3205,7 +3205,7 @@ static void Brw_ShowFileBrowsersAsgWrkCrs (void) /***** Begin box and table *****/ Box_BoxTableBegin ("100%",Txt_Assignments_and_other_works, - Brw_PutIconShowFigure,(void *) &Gbl, + Brw_PutIconShowFigure,&Gbl, Hlp_FILES_Homework_for_teachers,Box_NOT_CLOSABLE,0); /***** List the assignments and works of the selected users *****/ @@ -3295,7 +3295,7 @@ static void Brw_FormToChangeCrsGrpZone (void) /***** Begin form *****/ Frm_StartForm (Brw_ActChgZone[Gbl.FileBrowser.Type]); - Brw_PutHiddenParamFullTreeIfSelected ((void *) &Gbl); + Brw_PutHiddenParamFullTreeIfSelected (&Gbl); /***** List start *****/ HTM_UL_Begin ("class=\"LIST_LEFT\""); @@ -3683,7 +3683,7 @@ static void Brw_ShowFileBrowser (void) Gbl.FileBrowser.Id); HTM_SECTION_Begin (FileBrowserSectionId); Box_BoxBegin ("100%",Brw_TitleOfFileBrowser[Gbl.FileBrowser.Type], - Brw_PutIconsFileBrowser,(void *) &Gbl, + Brw_PutIconsFileBrowser,&Gbl, Brw_HelpOfFileBrowser[Gbl.FileBrowser.Type],Box_NOT_CLOSABLE); /***** Subtitle *****/ @@ -3732,11 +3732,11 @@ static void Brw_PutIconsFileBrowser (void *Args) break; case Brw_ICON_VIEW: Ico_PutContextualIconToView (Brw_ActFromAdmToSee[Gbl.FileBrowser.Type], - Brw_PutHiddenParamFullTreeIfSelected,(void *) &Gbl); + Brw_PutHiddenParamFullTreeIfSelected,&Gbl); break; case Brw_ICON_EDIT: Ico_PutContextualIconToEdit (Brw_ActFromSeeToAdm[Gbl.FileBrowser.Type],NULL, - Brw_PutHiddenParamFullTreeIfSelected,(void *) &Gbl); + Brw_PutHiddenParamFullTreeIfSelected,&Gbl); break; } @@ -3749,7 +3749,7 @@ static void Brw_PutIconsFileBrowser (void *Args) case Brw_ADMI_ASS_PRJ: break; default: - Brw_PutIconShowFigure ((void *) &Gbl); + Brw_PutIconShowFigure (&Gbl); break; } } @@ -3781,7 +3781,7 @@ static void Brw_PutButtonToShowEdit (void) if (Brw_ActFromAdmToSee[Gbl.FileBrowser.Type] != ActUnk) { Frm_StartForm (Brw_ActFromAdmToSee[Gbl.FileBrowser.Type]); - Brw_PutHiddenParamFullTreeIfSelected ((void *) &Gbl); + Brw_PutHiddenParamFullTreeIfSelected (&Gbl); Btn_PutConfirmButton (Txt_View); Frm_EndForm (); } @@ -3790,7 +3790,7 @@ static void Brw_PutButtonToShowEdit (void) if (Brw_ActFromSeeToAdm[Gbl.FileBrowser.Type] != ActUnk) { Frm_StartForm (Brw_ActFromSeeToAdm[Gbl.FileBrowser.Type]); - Brw_PutHiddenParamFullTreeIfSelected ((void *) &Gbl); + Brw_PutHiddenParamFullTreeIfSelected (&Gbl); Btn_PutConfirmButton (Txt_Edit); Frm_EndForm (); } @@ -5785,12 +5785,12 @@ static void Brw_PutIconRemove (void) case Brw_IS_LINK: /***** Form to remove a file or link *****/ Ico_PutContextualIconToRemove (Brw_ActAskRemoveFile[Gbl.FileBrowser.Type], - Brw_PutImplicitParamsFileBrowser,(void *) &Gbl); + Brw_PutImplicitParamsFileBrowser,&Gbl); break; case Brw_IS_FOLDER: /***** Form to remove a folder *****/ Ico_PutContextualIconToRemove (Brw_ActRemoveFolder[Gbl.FileBrowser.Type], - Brw_PutImplicitParamsFileBrowser,(void *) &Gbl); + Brw_PutImplicitParamsFileBrowser,&Gbl); break; default: break; @@ -5811,7 +5811,7 @@ static void Brw_PutIconCopy (void) /***** Form to copy into the clipboard *****/ Ico_PutContextualIconToCopy (Brw_ActCopy[Gbl.FileBrowser.Type], - Brw_PutImplicitParamsFileBrowser,(void *) &Gbl); + Brw_PutImplicitParamsFileBrowser,&Gbl); HTM_TD_End (); } @@ -5833,7 +5833,7 @@ static void Brw_PutIconPaste (unsigned Level) { /***** Form to paste the content of the clipboard *****/ Ico_PutContextualIconToPaste (Brw_ActPaste[Gbl.FileBrowser.Type], - Brw_PutImplicitParamsFileBrowser,(void *) &Gbl); + Brw_PutImplicitParamsFileBrowser,&Gbl); } else /* Icon to paste inactive */ @@ -5930,7 +5930,7 @@ static void Brw_PutIconToExpandFolder (const char *FileBrowserId,const char *Row Frm_StartFormAnchorOnSubmit (Brw_ActExpandFolder[Gbl.FileBrowser.Type], FileBrowserId, JavaScriptFuncToExpandFolder); // JavaScript function to unhide rows - Brw_PutImplicitParamsFileBrowser ((void *) &Gbl); + Brw_PutImplicitParamsFileBrowser (&Gbl); Ico_PutIconLink ("caret-right.svg",Txt_Expand); Frm_EndForm (); @@ -5961,7 +5961,7 @@ static void Brw_PutIconToContractFolder (const char *FileBrowserId,const char *R Frm_StartFormAnchorOnSubmit (Brw_ActContractFolder[Gbl.FileBrowser.Type], FileBrowserId, JavaScriptFuncToContractFolder); // JavaScript function to hide rows - Brw_PutImplicitParamsFileBrowser ((void *) &Gbl); + Brw_PutImplicitParamsFileBrowser (&Gbl); Ico_PutIconLink ("caret-down.svg",Txt_Contract); Frm_EndForm (); @@ -5977,7 +5977,7 @@ static void Brw_PutIconShow (const char *Anchor) { HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); Ico_PutContextualIconToUnhide (Brw_ActShow[Gbl.FileBrowser.Type],Anchor, - Brw_PutImplicitParamsFileBrowser,(void *) &Gbl); + Brw_PutImplicitParamsFileBrowser,&Gbl); HTM_TD_End (); } @@ -5989,7 +5989,7 @@ static void Brw_PutIconHide (const char *Anchor) { HTM_TD_Begin ("class=\"BM%u\"",Gbl.RowEvenOdd); Ico_PutContextualIconToHide (Brw_ActHide[Gbl.FileBrowser.Type],Anchor, - Brw_PutImplicitParamsFileBrowser,(void *) &Gbl); + Brw_PutImplicitParamsFileBrowser,&Gbl); HTM_TD_End (); } @@ -6134,7 +6134,7 @@ static void Brw_PutIconFolderWithPlus (const char *FileBrowserId,const char *Row /***** Form and icon *****/ Ico_PutContextualIconToCreateInFolder (Brw_ActFormCreate[Gbl.FileBrowser.Type], - Brw_PutImplicitParamsFileBrowser,(void *) &Gbl, + Brw_PutImplicitParamsFileBrowser,&Gbl, Open); /***** End container *****/ @@ -6253,7 +6253,7 @@ static void Brw_PutButtonToDownloadZIPOfAFolder (void) { /***** Form to zip and download folder *****/ Ico_PutContextualIconToZIP (Brw_ActZIPFolder[Gbl.FileBrowser.Type], - Brw_PutImplicitParamsFileBrowser,(void *) &Gbl); + Brw_PutImplicitParamsFileBrowser,&Gbl); } /*****************************************************************************/ @@ -6292,7 +6292,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic) if (Gbl.FileBrowser.ICanEditFileOrFolder) // Can I rename this folder? { Frm_StartForm (Brw_ActRenameFolder[Gbl.FileBrowser.Type]); - Brw_PutImplicitParamsFileBrowser ((void *) &Gbl); + Brw_PutImplicitParamsFileBrowser (&Gbl); } /***** Write name of the folder *****/ @@ -6339,7 +6339,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic) HTM_NBSP (); Frm_StartForm (Brw_ActDowFile[Gbl.FileBrowser.Type]); - Brw_PutImplicitParamsFileBrowser ((void *) &Gbl); + Brw_PutImplicitParamsFileBrowser (&Gbl); /* Link to the form and to the file */ if (asprintf (&Class,"BT_LINK FILENAME %s",Gbl.FileBrowser.TxtStyle) < 0) @@ -6566,7 +6566,7 @@ void Brw_AskRemFileFromTree (void) Gbl.FileBrowser.FilFolLnk.Name, FileNameToShow); Ale_ShowAlertAndButton (Brw_ActRemoveFile[Gbl.FileBrowser.Type],NULL,NULL, - Brw_PutImplicitParamsFileBrowser,(void *) &Gbl, + Brw_PutImplicitParamsFileBrowser,&Gbl, Btn_REMOVE_BUTTON, Gbl.FileBrowser.FilFolLnk.Type == Brw_IS_FILE ? Txt_Remove_file : Txt_Remove_link, @@ -6700,7 +6700,7 @@ static void Brw_AskConfirmRemoveFolderNotEmpty (void) /***** Show question and button to remove not empty folder *****/ Ale_ShowAlertAndButton (Brw_ActRemoveFolderNotEmpty[Gbl.FileBrowser.Type],NULL,NULL, - Brw_PutImplicitParamsFileBrowser,(void *) &Gbl, + Brw_PutImplicitParamsFileBrowser,&Gbl, Btn_REMOVE_BUTTON,Txt_Remove_folder, Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_folder_X, Gbl.FileBrowser.FilFolLnk.Name); @@ -8367,7 +8367,7 @@ static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1]) /***** Begin form *****/ Frm_StartForm (Brw_ActCreateFolder[Gbl.FileBrowser.Type]); - Brw_PutImplicitParamsFileBrowser ((void *) &Gbl); + Brw_PutImplicitParamsFileBrowser (&Gbl); /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Create_folder, @@ -8426,7 +8426,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow) Cfg_URL_ICON_PUBLIC); Par_PutHiddenParamLong (NULL,"act",Act_GetActCod (Brw_ActUploadFileDropzone[Gbl.FileBrowser.Type])); Par_PutHiddenParamString (NULL,"ses",Gbl.Session.Id); - Brw_PutImplicitParamsFileBrowser ((void *) &Gbl); + Brw_PutImplicitParamsFileBrowser (&Gbl); HTM_DIV_Begin ("class=\"dz-message\""); HTM_SPAN_Begin ("class=\"DAT_LIGHT\""); @@ -8475,7 +8475,7 @@ static void Brw_PutFormToUploadOneFileClassic (const char *FileNameToShow) /***** Form to upload one files using the classic way *****/ Frm_StartForm (Brw_ActUploadFileClassic[Gbl.FileBrowser.Type]); - Brw_PutImplicitParamsFileBrowser ((void *) &Gbl); + Brw_PutImplicitParamsFileBrowser (&Gbl); HTM_INPUT_FILE (Fil_NAME_OF_PARAM_FILENAME_ORG,"*",false,NULL); /* Button to send */ @@ -8498,7 +8498,7 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow) /***** Begin form *****/ Frm_StartForm (Brw_ActPaste[Gbl.FileBrowser.Type]); - Brw_PutImplicitParamsFileBrowser ((void *) &Gbl); + Brw_PutImplicitParamsFileBrowser (&Gbl); /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Paste, @@ -8532,7 +8532,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow) /***** Begin form *****/ Frm_StartForm (Brw_ActCreateLink[Gbl.FileBrowser.Type]); - Brw_PutImplicitParamsFileBrowser ((void *) &Gbl); + Brw_PutImplicitParamsFileBrowser (&Gbl); /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Create_link, @@ -9523,7 +9523,7 @@ void Brw_ShowFileMetadata (void) } Frm_StartForm (Brw_ActRecDatFile[Gbl.FileBrowser.Type]); - Brw_PutImplicitParamsFileBrowser ((void *) &Gbl); + Brw_PutImplicitParamsFileBrowser (&Gbl); } /***** Begin box and table *****/ @@ -10052,7 +10052,7 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL, Str_Copy (Gbl.FileBrowser.FilFolLnk.Name,FileMetadata->FilFolLnk.Name, NAME_MAX); Gbl.FileBrowser.FilFolLnk.Type = FileMetadata->FilFolLnk.Type; - Brw_PutImplicitParamsFileBrowser ((void *) &Gbl); + Brw_PutImplicitParamsFileBrowser (&Gbl); /* Link begin */ HTM_BUTTON_SUBMIT_Begin (Txt_Check_marks_in_the_file,"BT_LINK FILENAME_TXT",NULL); @@ -10103,7 +10103,7 @@ static void Brw_WriteSmallLinkToDownloadFile (const char *URL, Str_Copy (Gbl.FileBrowser.FilFolLnk.Name,FileMetadata->FilFolLnk.Name, NAME_MAX); Gbl.FileBrowser.FilFolLnk.Type = FileMetadata->FilFolLnk.Type; - Brw_PutImplicitParamsFileBrowser ((void *) &Gbl); + Brw_PutImplicitParamsFileBrowser (&Gbl); /* Link begin */ HTM_BUTTON_SUBMIT_Begin (Txt_Check_marks_in_the_file,"BT_LINK DAT",NULL); @@ -12099,7 +12099,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row) /* Parameters to go to file / folder */ if (FileMetadata.FilFolLnk.Type == Brw_IS_FOLDER) - Brw_PutImplicitParamsFileBrowser ((void *) &Gbl); + Brw_PutImplicitParamsFileBrowser (&Gbl); else Brw_PutParamsFileBrowser (NULL, // Not used NULL, // Not used @@ -12137,7 +12137,7 @@ static void Brw_PutLinkToAskRemOldFiles (void) extern const char *Txt_Remove_old_files; Lay_PutContextualLinkIconText (ActReqRemOldBrf,NULL, - Brw_PutHiddenParamFullTreeIfSelected,(void *) &Gbl, + Brw_PutHiddenParamFullTreeIfSelected,&Gbl, "trash.svg", Txt_Remove_old_files); } @@ -12160,7 +12160,7 @@ void Brw_AskRemoveOldFiles (void) /***** Begin form *****/ Frm_StartForm (ActRemOldBrf); - Brw_PutHiddenParamFullTreeIfSelected ((void *) &Gbl); + Brw_PutHiddenParamFullTreeIfSelected (&Gbl); /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Remove_old_files, diff --git a/swad_follow.c b/swad_follow.c index 076df2af..08d56b01 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -149,7 +149,7 @@ void Fol_SuggestUsrsToFollowMainZone (void) { /***** Begin box and table *****/ Box_BoxTableBegin ("560px",Txt_Who_to_follow, - Fol_PutIconsWhoToFollow,(void *) &Gbl, + Fol_PutIconsWhoToFollow,&Gbl, Hlp_START_Profiles_who_to_follow,Box_NOT_CLOSABLE,2); /***** Initialize structure with user's data *****/ @@ -1084,12 +1084,12 @@ static void Fol_RequestFollowUsrs (Act_Action_t NextAction) { if (NumNotFollowed == 1) Ale_ShowAlertAndButton (NextAction,NULL,NULL, - Fol_PutHiddenParSelectedUsrsCods,(void *) &Gbl, + Fol_PutHiddenParSelectedUsrsCods,&Gbl, Btn_CREATE_BUTTON,Txt_Follow, Ale_QUESTION,Txt_Do_you_want_to_follow_the_selected_user_whom_you_do_not_follow_yet); else Ale_ShowAlertAndButton (NextAction,NULL,NULL, - Fol_PutHiddenParSelectedUsrsCods,(void *) &Gbl, + Fol_PutHiddenParSelectedUsrsCods,&Gbl, Btn_CREATE_BUTTON,Txt_Follow, Ale_QUESTION,Txt_Do_you_want_to_follow_the_X_selected_users_whom_you_do_not_follow_yet, NumNotFollowed); @@ -1128,12 +1128,12 @@ static void Fol_RequestUnfollowUsrs (Act_Action_t NextAction) { if (NumFollowed == 1) Ale_ShowAlertAndButton (NextAction,NULL,NULL, - Fol_PutHiddenParSelectedUsrsCods,(void *) &Gbl, + Fol_PutHiddenParSelectedUsrsCods,&Gbl, Btn_CREATE_BUTTON,Txt_Unfollow, Ale_QUESTION,Txt_Do_you_want_to_stop_following_the_selected_user_whom_you_follow); else Ale_ShowAlertAndButton (NextAction,NULL,NULL, - Fol_PutHiddenParSelectedUsrsCods,(void *) &Gbl, + Fol_PutHiddenParSelectedUsrsCods,&Gbl, Btn_CREATE_BUTTON,Txt_Unfollow, Ale_QUESTION,Txt_Do_you_want_to_stop_following_the_X_selected_users_whom_you_follow, NumFollowed); diff --git a/swad_forum.c b/swad_forum.c index 1a0d6771..bb730436 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -986,7 +986,7 @@ static void For_ShowPostsOfAThread (Ale_AlertType_t AlertType,const char *Messag "%s: %s", Txt_Thread,Thr.Subject); Box_BoxBegin (NULL,FrameTitle, - For_PutIconNewPost,(void *) &Gbl, + For_PutIconNewPost,&Gbl, Hlp_MESSAGES_Forums_posts,Box_NOT_CLOSABLE); /***** Get posts of a thread from database *****/ @@ -1127,7 +1127,7 @@ static void For_PutIconNewPost (void *Args) if (Args) Ico_PutContextualIconToAdd (For_ActionsSeePstFor[Gbl.Forum.ForumSelected.Type], For_NEW_POST_SECTION_ID, - For_PutAllHiddenParamsNewPost,(void *) &Gbl, + For_PutAllHiddenParamsNewPost,&Gbl, Txt_New_post); } @@ -1561,7 +1561,7 @@ static void For_ShowForumList (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Forums, - For_PutIconsForums,(void *) &Gbl, + For_PutIconsForums,&Gbl, Hlp_MESSAGES_Forums,Box_NOT_CLOSABLE); /***** Put a form to select which forums *****/ @@ -2467,7 +2467,7 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted, "%s: %s", Txt_Forum,ForumName); Box_BoxBegin (NULL,FrameTitle, - For_PutIconNewThread,(void *) &Gbl, + For_PutIconNewThread,&Gbl, Hlp_MESSAGES_Forums_threads,Box_NOT_CLOSABLE); /***** List the threads *****/ @@ -2553,7 +2553,7 @@ static void For_PutIconNewThread (void *Args) if (Args) Ico_PutContextualIconToAdd (For_ActionsSeeFor[Gbl.Forum.ForumSelected.Type], For_NEW_THREAD_SECTION_ID, - For_PutAllHiddenParamsNewThread,(void *) &Gbl, + For_PutAllHiddenParamsNewThread,&Gbl, Txt_New_thread); } @@ -3817,13 +3817,13 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject) { Frm_StartFormAnchor (For_ActionsRecRepFor[Gbl.Forum.ForumSelected.Type], For_FORUM_POSTS_SECTION_ID); - For_PutAllHiddenParamsNewPost ((void *) &Gbl); + For_PutAllHiddenParamsNewPost (&Gbl); } else // Form to write the first post of a new thread { Frm_StartFormAnchor (For_ActionsRecThrFor[Gbl.Forum.ForumSelected.Type], For_FORUM_POSTS_SECTION_ID); - For_PutAllHiddenParamsNewThread ((void *) &Gbl); + For_PutAllHiddenParamsNewThread (&Gbl); } /***** Subject and content *****/ @@ -4107,14 +4107,14 @@ void For_RequestRemoveThread (void) if (Subject[0]) Ale_ShowAlertAndButton (For_ActionsDelThrFor[Gbl.Forum.ForumSelected.Type], For_FORUM_THREADS_SECTION_ID,NULL, - For_PutAllHiddenParamsRemThread,(void *) &Gbl, + For_PutAllHiddenParamsRemThread,&Gbl, Btn_REMOVE_BUTTON,Txt_Remove_thread, Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_entire_thread_X, Subject); else Ale_ShowAlertAndButton (For_ActionsDelThrFor[Gbl.Forum.ForumSelected.Type], For_FORUM_THREADS_SECTION_ID,NULL, - For_PutAllHiddenParamsRemThread,(void *) &Gbl, + For_PutAllHiddenParamsRemThread,&Gbl, Btn_REMOVE_BUTTON,Txt_Remove_thread, Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_entire_thread); HTM_SECTION_End (); diff --git a/swad_game.c b/swad_game.c index 44123fa4..b471b891 100644 --- a/swad_game.c +++ b/swad_game.c @@ -215,7 +215,7 @@ static void Gam_ListAllGames (void) /***** Begin box *****/ Box_BoxBegin ("100%",Txt_Games, - Gam_PutIconsListGames,(void *) &Gbl, + Gam_PutIconsListGames,&Gbl, Hlp_ASSESSMENT_Games,Box_NOT_CLOSABLE); /***** Write links to pages *****/ @@ -354,7 +354,7 @@ static void Gam_PutIconToCreateNewGame (void) extern const char *Txt_New_game; Ico_PutContextualIconToAdd (ActFrmNewGam,NULL, - Gam_PutParamsToCreateNewGame,(void *) &Gbl, + Gam_PutParamsToCreateNewGame,&Gbl, Txt_New_game); } @@ -367,7 +367,7 @@ static void Gam_PutButtonToCreateNewGame (void) extern const char *Txt_New_game; Frm_StartForm (ActFrmNewGam); - Gam_PutParamsToCreateNewGame ((void *) &Gbl); + Gam_PutParamsToCreateNewGame (&Gbl); Btn_PutConfirmButton (Txt_New_game); Frm_EndForm (); } @@ -426,7 +426,7 @@ void Gam_ShowOnlyOneGameBegin (struct Game *Game, /***** Begin box *****/ Gam_SetCurrentGamCod (Game->GamCod); Box_BoxBegin (NULL,Txt_Game, - Gam_PutIconToShowResultsOfGame,(void *) &Gbl, + Gam_PutIconToShowResultsOfGame,&Gbl, Hlp_ASSESSMENT_Games,Box_NOT_CLOSABLE); /***** Show game *****/ @@ -521,7 +521,7 @@ static void Gam_ShowOneGame (struct Game *Game,bool ShowOnlyThisGame) Gam_SetCurrentGamCod (Game->GamCod); // Used to pass parameter HTM_ARTICLE_Begin (Anchor); Frm_StartForm (ActSeeGam); - Gam_PutParams ((void *) &Gbl); + Gam_PutParams (&Gbl); HTM_BUTTON_SUBMIT_Begin (Txt_View_game, Game->Hidden ? "BT_LINK LT ASG_TITLE_LIGHT": "BT_LINK LT ASG_TITLE", @@ -552,7 +552,7 @@ static void Gam_ShowOneGame (struct Game *Game,bool ShowOnlyThisGame) Gam_SetCurrentGamCod (Game->GamCod); // Used to pass parameter Frm_StartForm (ActSeeGam); - Gam_PutParams ((void *) &Gbl); + Gam_PutParams (&Gbl); HTM_BUTTON_SUBMIT_Begin (Txt_Matches, Game->Hidden ? "BT_LINK LT ASG_TITLE_LIGHT" : "BT_LINK LT ASG_TITLE", @@ -620,13 +620,13 @@ static void Gam_PutIconToShowResultsOfGame (void *Args) { case Rol_STD: Ico_PutContextualIconToShowResults (ActSeeMyMchResGam,McR_RESULTS_BOX_ID, - Gam_PutParams,(void *) &Gbl); + Gam_PutParams,&Gbl); break; case Rol_NET: case Rol_TCH: case Rol_SYS_ADM: Ico_PutContextualIconToShowResults (ActSeeAllMchResGam,McR_RESULTS_BOX_ID, - Gam_PutParams,(void *) &Gbl); + Gam_PutParams,&Gbl); break; default: break; @@ -663,19 +663,19 @@ static void Gam_PutFormsToRemEditOneGame (const struct Game *Game, /***** Put icon to remove game *****/ Ico_PutContextualIconToRemove (ActReqRemGam, - Gam_PutParams,(void *) &Gbl); + Gam_PutParams,&Gbl); /***** Put icon to unhide/hide game *****/ if (Game->Hidden) Ico_PutContextualIconToUnhide (ActShoGam,Anchor, - Gam_PutParams,(void *) &Gbl); + Gam_PutParams,&Gbl); else Ico_PutContextualIconToHide (ActHidGam,Anchor, - Gam_PutParams,(void *) &Gbl); + Gam_PutParams,&Gbl); /***** Put icon to edit game *****/ Ico_PutContextualIconToEdit (ActEdiOneGam,NULL, - Gam_PutParams,(void *) &Gbl); + Gam_PutParams,&Gbl); } /*****************************************************************************/ @@ -700,7 +700,7 @@ static void Gam_PutParamsOneQst (void *Args) { if (Args) { - Gam_PutParams ((void *) &Gbl); + Gam_PutParams (&Gbl); Gam_PutParamQstInd (Gam_CurrentQstInd); } } @@ -711,11 +711,14 @@ static void Gam_PutParamsOneQst (void *Args) void Gam_PutParams (void *Args) { + Grp_WhichGroups_t WhichGroups; + if (Args) { Gam_PutParamCurrentGamCod (); Gam_PutHiddenParamOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); Pag_PutHiddenParamPagNum (Pag_GAMES,Gbl.Games.CurrentPage); } } @@ -1132,7 +1135,7 @@ void Gam_AskRemGame (void) /***** Show question and button to remove game *****/ Gam_SetCurrentGamCod (Game.GamCod); // Used to pass parameter Ale_ShowAlertAndButton (ActRemGam,NULL,NULL, - Gam_PutParams,(void *) &Gbl, + Gam_PutParams,&Gbl, Btn_REMOVE_BUTTON,Txt_Remove_game, Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_game_X, Game.Title); @@ -1349,7 +1352,7 @@ static void Gam_PutFormsEditionGame (struct Game *Game, Gam_SetCurrentGamCod (Game->GamCod); // Used to pass parameter Frm_StartForm (ItsANewGame ? ActNewGam : ActChgGam); - Gam_PutParams ((void *) &Gbl); + Gam_PutParams (&Gbl); /***** Begin box and table *****/ if (ItsANewGame) @@ -1864,7 +1867,7 @@ static void Gam_ListGameQuestions (struct Game *Game) Gam_SetCurrentGamCod (Game->GamCod); // Used to pass parameter if (ICanEditQuestions) Box_BoxBegin (NULL,Txt_Questions, - Gam_PutIconToAddNewQuestions,(void *) &Gbl, + Gam_PutIconToAddNewQuestions,&Gbl, Hlp_ASSESSMENT_Games_questions,Box_NOT_CLOSABLE); else Box_BoxBegin (NULL,Txt_Questions, @@ -1965,7 +1968,7 @@ static void Gam_ListOneOrMoreQuestionsForEdition (long GamCod,unsigned NumQsts, if (ICanEditQuestions) { Frm_StartForm (ActReqRemGamQst); - Gam_PutParams ((void *) &Gbl); + Gam_PutParams (&Gbl); Gam_PutParamQstInd (QstInd); Ico_PutIconRemove (); Frm_EndForm (); @@ -1977,7 +1980,7 @@ static void Gam_ListOneOrMoreQuestionsForEdition (long GamCod,unsigned NumQsts, if (ICanEditQuestions && QstInd > 1) { Lay_PutContextualLinkOnlyIcon (ActUp_GamQst,NULL, - Gam_PutParamsOneQst,(void *) &Gbl, + Gam_PutParamsOneQst,&Gbl, "arrow-up.svg", Str_BuildStringStr (Txt_Move_up_X, StrQstInd)); @@ -1990,7 +1993,7 @@ static void Gam_ListOneOrMoreQuestionsForEdition (long GamCod,unsigned NumQsts, if (ICanEditQuestions && QstInd < MaxQstInd) { Lay_PutContextualLinkOnlyIcon (ActDwnGamQst,NULL, - Gam_PutParamsOneQst,(void *) &Gbl, + Gam_PutParamsOneQst,&Gbl, "arrow-down.svg", Str_BuildStringStr (Txt_Move_down_X, StrQstInd)); @@ -2002,7 +2005,7 @@ static void Gam_ListOneOrMoreQuestionsForEdition (long GamCod,unsigned NumQsts, /* Put icon to edit the question */ if (ICanEditQuestions) Ico_PutContextualIconToEdit (ActEdiOneTstQst,NULL, - Tst_PutParamQstCod,(void *) &Question.QstCod); + Tst_PutParamQstCod,&Question.QstCod); HTM_TD_End (); @@ -2120,7 +2123,7 @@ static void Gam_PutIconToAddNewQuestions (void *Args) if (Args) /***** Put form to create a new question *****/ Ico_PutContextualIconToAdd (ActAddOneGamQst,NULL, - Gam_PutParams,(void *) &Gbl, + Gam_PutParams,&Gbl, Txt_Add_questions); } @@ -2133,7 +2136,7 @@ static void Gam_PutButtonToAddNewQuestions (void) extern const char *Txt_Add_questions; Frm_StartForm (ActAddOneGamQst); - Gam_PutParams ((void *) &Gbl); + Gam_PutParams (&Gbl); Btn_PutConfirmButton (Txt_Add_questions); Frm_EndForm (); } @@ -2282,7 +2285,7 @@ void Gam_RequestRemoveQst (void) Gam_SetCurrentGamCod (Game.GamCod); // Used to pass parameter Gam_CurrentQstInd = QstInd; Ale_ShowAlertAndButton (ActRemGamQst,NULL,NULL, - Gam_PutParamsOneQst,(void *) &Gbl, + Gam_PutParamsOneQst,&Gbl, Btn_REMOVE_BUTTON,Txt_Remove_question, Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_question_X, QstInd); @@ -2537,7 +2540,7 @@ void Gam_PutButtonNewMatch (long GamCod) Gam_SetCurrentGamCod (GamCod); // Used to pass parameter Frm_StartFormAnchor (ActReqNewMch,Mch_NEW_MATCH_SECTION_ID); - Gam_PutParams ((void *) &Gbl); + Gam_PutParams (&Gbl); Btn_PutConfirmButton (Txt_New_match); Frm_EndForm (); } diff --git a/swad_group.c b/swad_group.c index f98c1f12..8743d900 100644 --- a/swad_group.c +++ b/swad_group.c @@ -287,7 +287,7 @@ static void Grp_EditGroupTypes (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Types_of_group, - Grp_PutIconsEditingGroupTypes,(void *) &Gbl, + Grp_PutIconsEditingGroupTypes,&Gbl, Hlp_USERS_Groups,Box_NOT_CLOSABLE); /***** Put a form to create a new group type *****/ @@ -316,7 +316,7 @@ static void Grp_EditGroups (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Groups, - Grp_PutIconsEditingGroups,(void *) &Gbl, + Grp_PutIconsEditingGroups,&Gbl, Hlp_USERS_Groups,Box_NOT_CLOSABLE); /***** Put a form to create a new group *****/ @@ -383,7 +383,7 @@ void Grp_ShowFormToSelectSeveralGroups (void (*FuncParams) (void *Args),void *Ar Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM); if (ICanEdit) Box_BoxBegin (NULL,Txt_Groups, - Grp_PutIconToEditGroups,(void *) &Gbl, + Grp_PutIconToEditGroups,&Gbl, Hlp_USERS_Groups,Box_CLOSABLE); else Box_BoxBegin (NULL,Txt_Groups, @@ -1792,7 +1792,7 @@ void Grp_ShowLstGrpsToChgMyGrps (void) /***** Begin box *****/ if (ICanEdit) Box_BoxBegin (NULL,Txt_My_groups, - Grp_PutIconToEditGroups,(void *) &Gbl, + Grp_PutIconToEditGroups,&Gbl, Hlp_USERS_Groups,Box_NOT_CLOSABLE); else Box_BoxBegin (NULL,Txt_My_groups, @@ -3958,13 +3958,13 @@ static void Grp_AskConfirmRemGrpTypWithGrps (unsigned NumGrps) /***** Show question and button to remove type of group *****/ if (NumGrps == 1) Ale_ShowAlertAndButton (ActRemGrpTyp,Grp_GROUP_TYPES_SECTION_ID,NULL, - Grp_PutParamRemGrpTyp,(void *) &Gbl, + Grp_PutParamRemGrpTyp,&Gbl, Btn_REMOVE_BUTTON,Txt_Remove_type_of_group, Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_type_of_group_X_1_group_, Gbl.Crs.Grps.GrpTyp.GrpTypName); else Ale_ShowAlertAndButton (ActRemGrpTyp,Grp_GROUP_TYPES_SECTION_ID,NULL, - Grp_PutParamRemGrpTyp,(void *) &Gbl, + Grp_PutParamRemGrpTyp,&Gbl, Btn_REMOVE_BUTTON,Txt_Remove_type_of_group, Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_type_of_group_X_Y_groups_, Gbl.Crs.Grps.GrpTyp.GrpTypName,NumGrps); @@ -4011,19 +4011,19 @@ static void Grp_AskConfirmRemGrp (void) /***** Show question and button to remove group *****/ if (NumStds == 0) Ale_ShowAlertAndButton (ActRemGrp,Grp_GROUPS_SECTION_ID,NULL, - Grp_PutParamRemGrp,(void *) &Gbl, + Grp_PutParamRemGrp,&Gbl, Btn_REMOVE_BUTTON,Txt_Remove_group, Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_group_X, GrpDat.GrpName); else if (NumStds == 1) Ale_ShowAlertAndButton (ActRemGrp,Grp_GROUPS_SECTION_ID,NULL, - Grp_PutParamRemGrp,(void *) &Gbl, + Grp_PutParamRemGrp,&Gbl, Btn_REMOVE_BUTTON,Txt_Remove_group, Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_group_X_1_student_, GrpDat.GrpName); else Ale_ShowAlertAndButton (ActRemGrp,Grp_GROUPS_SECTION_ID,NULL, - Grp_PutParamRemGrp,(void *) &Gbl, + Grp_PutParamRemGrp,&Gbl, Btn_REMOVE_BUTTON,Txt_Remove_group, Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_group_X_Y_students_, GrpDat.GrpName,NumStds); @@ -4956,7 +4956,7 @@ void Grp_PutParamAllGroups (void) /************* Parameter to show only my groups or all groups ****************/ /*****************************************************************************/ -void Grp_PutParamWhichGrps (void *WhichGrps) +void Grp_PutParamWhichGroups (void *WhichGrps) { if (WhichGrps) if (*(Grp_WhichGroups_t *) WhichGrps != Grp_WHICH_GROUPS_DEFAULT) @@ -5017,7 +5017,7 @@ void Grp_ShowFormToSelWhichGrps (Act_Action_t Action, /************* Get whether to show only my groups or all groups **************/ /*****************************************************************************/ -Grp_WhichGroups_t Grp_GetParamWhichGrps (void) +Grp_WhichGroups_t Grp_GetParamWhichGroups (void) { static bool AlreadyGot = false; Grp_WhichGroups_t WhichGroupsDefault; diff --git a/swad_group.h b/swad_group.h index b4e93ce4..f559b908 100644 --- a/swad_group.h +++ b/swad_group.h @@ -216,11 +216,11 @@ void Grp_GetLstCodsGrpWanted (struct ListCodGrps *LstGrpsWanted); void Grp_FreeListCodGrp (struct ListCodGrps *LstGrps); void Grp_PutParamAllGroups (void); -void Grp_PutParamWhichGrps (void *WhichGrps); +void Grp_PutParamWhichGroups (void *WhichGrps); void Grp_PutParamWhichGrpsOnlyMyGrps (void); void Grp_PutParamWhichGrpsAllGrps (void); void Grp_ShowFormToSelWhichGrps (Act_Action_t Action, void (*FuncParams) (void *Args),void *Args); -Grp_WhichGroups_t Grp_GetParamWhichGrps (void); +Grp_WhichGroups_t Grp_GetParamWhichGroups (void); #endif diff --git a/swad_holiday.c b/swad_holiday.c index 1f549797..af8637b3 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -111,7 +111,7 @@ void Hld_SeeHolidays (void) /***** Table head *****/ Box_BoxBegin (NULL,Txt_Holidays, - Hld_PutIconsSeeHolidays,(void *) &Gbl, + Hld_PutIconsSeeHolidays,&Gbl, Hlp_INSTITUTION_Holidays,Box_NOT_CLOSABLE); if (Gbl.Hlds.Num) { @@ -231,7 +231,7 @@ static void Hld_PutIconsSeeHolidays (void *Args) NULL,NULL); /***** View calendar *****/ - Cal_PutIconToSeeCalendar ((void *) &Gbl); + Cal_PutIconToSeeCalendar (&Gbl); } } @@ -560,7 +560,7 @@ static void Hld_ListHolidaysForEdition (void) /***** Begin box and table *****/ Box_BoxTableBegin (NULL,Txt_Holidays, - Cal_PutIconToSeeCalendar,(void *) &Gbl, + Cal_PutIconToSeeCalendar,&Gbl, Hlp_INSTITUTION_Holidays_edit,Box_NOT_CLOSABLE,2); /***** Write heading *****/ diff --git a/swad_icon.c b/swad_icon.c index 9aaeab18..28d33191 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -117,7 +117,7 @@ void Ico_PutIconsToSelectIconSet (void) char Icon[PATH_MAX + 1]; Box_BoxBegin (NULL,Txt_Icons, - Ico_PutIconsIconSet,(void *) &Gbl, + Ico_PutIconsIconSet,&Gbl, Hlp_PROFILE_Settings_icons,Box_NOT_CLOSABLE); Set_StartSettingsHead (); Set_StartOneSettingSelector (); diff --git a/swad_indicator.c b/swad_indicator.c index 30b768d0..a0785126 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -566,7 +566,7 @@ static void Ind_PutButtonToConfirmIWantToSeeBigList (unsigned NumCrss) /***** Show alert and button to confirm that I want to see the big list *****/ Ale_ShowAlertAndButton (Gbl.Action.Act,NULL,NULL, - Ind_PutParamsConfirmIWantToSeeBigList,(void *) &Gbl, + Ind_PutParamsConfirmIWantToSeeBigList,&Gbl, Btn_CONFIRM_BUTTON,Txt_Show_anyway, Ale_WARNING,Txt_The_list_of_X_courses_is_too_large_to_be_displayed, NumCrss); diff --git a/swad_info.c b/swad_info.c index 91421b8a..6e0c4ac0 100644 --- a/swad_info.c +++ b/swad_info.c @@ -414,7 +414,7 @@ void Inf_ShowInfo (void) { if (ICanEdit) Box_BoxBegin ("100%",Txt_INFO_TITLE[Gbl.Crs.Info.Type], - Inf_PutIconToEditInfo,(void *) &Gbl, + Inf_PutIconToEditInfo,&Gbl, Help[Gbl.Crs.Info.Type],Box_NOT_CLOSABLE); else Box_BoxBegin ("100%",Txt_INFO_TITLE[Gbl.Crs.Info.Type], @@ -942,7 +942,7 @@ static void Inf_ShowPage (const char *URL) /***** Begin box *****/ if (ICanEdit) Box_BoxBegin (NULL,Txt_INFO_TITLE[Gbl.Crs.Info.Type], - Inf_PutIconToEditInfo,(void *) &Gbl, + Inf_PutIconToEditInfo,&Gbl, Help[Gbl.Crs.Info.Type],Box_NOT_CLOSABLE); else Box_BoxBegin (NULL,Txt_INFO_TITLE[Gbl.Crs.Info.Type], @@ -1030,7 +1030,7 @@ void Inf_FormsToSelSendInfo (void) /***** Form to choice between alternatives *****/ /* Begin box and table */ Box_BoxTableBegin (NULL,Txt_Source_of_information, - Inf_PutIconToViewInfo,(void *) &Gbl, + Inf_PutIconToViewInfo,&Gbl, HelpEdit[Gbl.Crs.Info.Type],Box_NOT_CLOSABLE,4); /* Options */ @@ -1691,7 +1691,7 @@ static bool Inf_CheckAndShowPlainTxt (void) /***** Begin box *****/ if (ICanEdit) Box_BoxBegin (NULL,Txt_INFO_TITLE[Gbl.Crs.Info.Type], - Inf_PutIconToEditInfo,(void *) &Gbl, + Inf_PutIconToEditInfo,&Gbl, Help[Gbl.Crs.Info.Type],Box_NOT_CLOSABLE); else Box_BoxBegin (NULL,Txt_INFO_TITLE[Gbl.Crs.Info.Type], @@ -1779,7 +1779,7 @@ static bool Inf_CheckAndShowRichTxt (void) /***** Begin box *****/ if (ICanEdit) Box_BoxBegin (NULL,Txt_INFO_TITLE[Gbl.Crs.Info.Type], - Inf_PutIconToEditInfo,(void *) &Gbl, + Inf_PutIconToEditInfo,&Gbl, Help[Gbl.Crs.Info.Type],Box_NOT_CLOSABLE); else Box_BoxBegin (NULL,Txt_INFO_TITLE[Gbl.Crs.Info.Type], diff --git a/swad_institution.c b/swad_institution.c index 3e5191dc..aeee95be 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -302,7 +302,7 @@ static void Ins_ListInstitutions (void) /***** Begin box *****/ Box_BoxBegin (NULL,Str_BuildStringStr (Txt_Institutions_of_COUNTRY_X, Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]), - Ins_PutIconsListingInstitutions,(void *) &Gbl, + Ins_PutIconsListingInstitutions,&Gbl, Hlp_COUNTRY_Institutions,Box_NOT_CLOSABLE); Str_FreeString (); @@ -565,7 +565,7 @@ static void Ins_EditInstitutionsInternal (void) /***** Begin box *****/ Box_BoxBegin (NULL,Str_BuildStringStr (Txt_Institutions_of_COUNTRY_X, Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]), - Ins_PutIconsEditingInstitutions,(void *) &Gbl, + Ins_PutIconsEditingInstitutions,&Gbl, Hlp_COUNTRY_Institutions,Box_NOT_CLOSABLE); Str_FreeString (); @@ -1680,7 +1680,7 @@ static void Ins_ShowAlertAndButtonToGoToIns (void) { /***** Alert with button to go to institution *****/ Ale_ShowLastAlertAndButton (ActSeeCtr,NULL,NULL, - Ins_PutParamGoToIns,(void *) &Gbl, + Ins_PutParamGoToIns,&Gbl, Btn_CONFIRM_BUTTON, Hie_BuildGoToMsg (Ins_EditingIns->ShrtName)); Hie_FreeGoToMsg (); @@ -2130,7 +2130,7 @@ static void Ins_FormToGoToMap (struct Instit *Ins) { Ins_EditingIns = Ins; // Used to pass parameter with the code of the institution Lay_PutContextualLinkOnlyIcon (ActSeeInsInf,NULL, - Ins_PutParamGoToIns,(void *) &Gbl, + Ins_PutParamGoToIns,&Gbl, "map-marker-alt.svg", Txt_Map); } diff --git a/swad_institution_config.c b/swad_institution_config.c index a8f75127..e6589132 100644 --- a/swad_institution_config.c +++ b/swad_institution_config.c @@ -132,7 +132,7 @@ static void InsCfg_Configuration (bool PrintView) NULL,Box_NOT_CLOSABLE); else Box_BoxBegin (NULL,NULL, - InsCfg_PutIconsToPrintAndUpload,(void *) &Gbl, + InsCfg_PutIconsToPrintAndUpload,&Gbl, Hlp_INSTITUTION_Information,Box_NOT_CLOSABLE); diff --git a/swad_language.c b/swad_language.c index f4d0cfc0..baba4c19 100644 --- a/swad_language.c +++ b/swad_language.c @@ -91,7 +91,7 @@ void Lan_PutBoxToSelectLanguage (void) extern const char *Txt_Language; Box_BoxBegin (NULL,Txt_Language, - Lan_PutIconsLanguage,(void *) &Gbl, + Lan_PutIconsLanguage,&Gbl, Hlp_PROFILE_Settings_language,Box_NOT_CLOSABLE); Lan_PutSelectorToSelectLanguage (); Box_BoxEnd (); @@ -153,7 +153,7 @@ void Lan_AskChangeLanguage (void) /***** Request confirmation *****/ Ale_ShowAlertAndButton (ActChgLan,NULL,NULL, - Lan_PutParamLanguage,(void *) &Gbl, + Lan_PutParamLanguage,&Gbl, Btn_CONFIRM_BUTTON, Txt_Switch_to_LANGUAGE[Gbl.Prefs.Language], Ale_QUESTION,Gbl.Usrs.Me.Logged ? Txt_Do_you_want_to_change_your_language_to_LANGUAGE[Gbl.Prefs.Language] : diff --git a/swad_link.c b/swad_link.c index 8543668c..8319bbf8 100644 --- a/swad_link.c +++ b/swad_link.c @@ -100,7 +100,7 @@ void Lnk_SeeLinks (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Links, - Lnk_PutIconsListingLinks,(void *) &Gbl, + Lnk_PutIconsListingLinks,&Gbl, Hlp_SYSTEM_Links,Box_NOT_CLOSABLE); /***** Write all links *****/ @@ -237,7 +237,7 @@ static void Lnk_EditLinksInternal (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Links, - Lnk_PutIconsEditingLinks,(void *) &Gbl, + Lnk_PutIconsEditingLinks,&Gbl, Hlp_SYSTEM_Links_edit,Box_NOT_CLOSABLE); /***** Put a form to create a new link *****/ diff --git a/swad_logo.c b/swad_logo.c index a4e0b5a9..df91c89b 100644 --- a/swad_logo.c +++ b/swad_logo.c @@ -302,7 +302,7 @@ void Lgo_RequestLogo (Hie_Level_t Scope) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Logo, - FunctionToDrawContextualIcons,(void *) &Gbl, + FunctionToDrawContextualIcons,&Gbl, NULL,Box_NOT_CLOSABLE); /***** Begin form to upload logo *****/ diff --git a/swad_mail.c b/swad_mail.c index 8a08d6dc..f785a840 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -124,7 +124,7 @@ void Mai_SeeMailDomains (void) /***** Begin box and table *****/ if (Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM) Box_BoxTableBegin (NULL,Txt_Email_domains_allowed_for_notifications, - Mai_PutIconToEditMailDomains,(void *) &Gbl, + Mai_PutIconToEditMailDomains,&Gbl, Hlp_START_Domains,Box_NOT_CLOSABLE,2); else Box_BoxTableBegin (NULL,Txt_Email_domains_allowed_for_notifications, @@ -1162,7 +1162,7 @@ void Mai_ShowFormChangeMyEmail (bool IMustFillInEmail,bool IShouldConfirmEmail) "%upx", Rec_RECORD_WIDTH); Box_BoxBegin (StrRecordWidth,Txt_Email, - Acc_PutLinkToRemoveMyAccount,(void *) &Gbl, + Acc_PutLinkToRemoveMyAccount,&Gbl, Hlp_PROFILE_Account,Box_NOT_CLOSABLE); /***** Show form to change email *****/ diff --git a/swad_mark.c b/swad_mark.c index a1d80b68..39a4dce7 100644 --- a/swad_mark.c +++ b/swad_mark.c @@ -127,7 +127,7 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (void) Gbl.RowEvenOdd); Frm_StartForm (Gbl.Crs.Grps.GrpCod > 0 ? ActChgNumRowHeaGrp : // Group zone ActChgNumRowHeaCrs); // Course zone - Brw_PutImplicitParamsFileBrowser ((void *) &Gbl); + Brw_PutImplicitParamsFileBrowser (&Gbl); HTM_LABEL_Begin (NULL); HTM_TxtF (" %s: ",Txt_TABLE_Header); snprintf (StrHeadOrFoot,sizeof (StrHeadOrFoot), @@ -146,7 +146,7 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (void) Gbl.RowEvenOdd); Frm_StartForm (Gbl.Crs.Grps.GrpCod > 0 ? ActChgNumRowFooGrp : // Group zone ActChgNumRowFooCrs); // Course zone - Brw_PutImplicitParamsFileBrowser ((void *) &Gbl); + Brw_PutImplicitParamsFileBrowser (&Gbl); HTM_LABEL_Begin (NULL); HTM_TxtF (" %s: ",Txt_TABLE_Footer); snprintf (StrHeadOrFoot,sizeof (StrHeadOrFoot), diff --git a/swad_match.c b/swad_match.c index 3b22f0f0..fb5e71c2 100644 --- a/swad_match.c +++ b/swad_match.c @@ -287,7 +287,7 @@ void Mch_ListMatches (struct Game *Game,bool PutFormNewMatch) /***** Begin box *****/ Gam_SetCurrentGamCod (Game->GamCod); // Used to pass parameter Box_BoxBegin ("100%",Txt_Matches, - Mch_PutIconsInListOfMatches,(void *) &Gbl, + Mch_PutIconsInListOfMatches,&Gbl, Hlp_ASSESSMENT_Games_matches,Box_NOT_CLOSABLE); /***** Select whether show only my groups or all groups *****/ @@ -295,7 +295,7 @@ void Mch_ListMatches (struct Game *Game,bool PutFormNewMatch) { Set_StartSettingsHead (); Grp_ShowFormToSelWhichGrps (ActSeeGam, - Gam_PutParams,(void *) &Gbl); + Gam_PutParams,&Gbl); Set_EndSettingsHead (); } @@ -414,7 +414,7 @@ static void Mch_PutIconToCreateNewMatch (void) /***** Put form to create a new match *****/ Ico_PutContextualIconToAdd (ActReqNewMch,Mch_NEW_MATCH_SECTION_ID, - Gam_PutParams,(void *) &Gbl, + Gam_PutParams,&Gbl, Txt_New_match); } @@ -560,7 +560,7 @@ static void Mch_ListOneOrMoreMatchesIcons (const struct Match *Match) Gam_SetCurrentGamCod (Match->GamCod); // Used to pass parameter Mch_SetCurrentMchCod (Match->MchCod); // Used to pass parameter Frm_StartForm (ActReqRemMch); - Mch_PutParamsEdit ((void *) &Gbl); + Mch_PutParamsEdit (&Gbl); Ico_PutIconRemove (); Frm_EndForm (); } @@ -625,7 +625,7 @@ static void Mch_ListOneOrMoreMatchesTitleGrps (const struct Match *Match) Mch_SetCurrentMchCod (Match->MchCod); // Used to pass parameter Frm_StartForm (Gbl.Usrs.Me.Role.Logged == Rol_STD ? ActJoiMch : ActResMch); - Mch_PutParamsPlay ((void *) &Gbl); + Mch_PutParamsPlay (&Gbl); HTM_BUTTON_SUBMIT_Begin (Gbl.Usrs.Me.Role.Logged == Rol_STD ? Txt_Play : Txt_Resume, "BT_LINK LT ASG_TITLE",NULL); @@ -739,7 +739,7 @@ static void Mch_ListOneOrMoreMatchesStatus (const struct Match *Match,unsigned N Lay_PutContextualLinkOnlyIcon (Gbl.Usrs.Me.Role.Logged == Rol_STD ? ActJoiMch : ActResMch, NULL, - Mch_PutParamsPlay,(void *) &Gbl, + Mch_PutParamsPlay,&Gbl, Match->Status.Showing == Mch_END ? "flag-checkered.svg" : "play.svg", Gbl.Usrs.Me.Role.Logged == Rol_STD ? Txt_Play : @@ -785,7 +785,7 @@ static void Mch_ListOneOrMoreMatchesResultStd (const struct Match *Match) Gam_SetCurrentGamCod (Match->GamCod); // Used to pass parameter Mch_SetCurrentMchCod (Match->MchCod); // Used to pass parameter Lay_PutContextualLinkOnlyIcon (ActSeeMyMchResMch,McR_RESULTS_BOX_ID, - Mch_PutParamsEdit,(void *) &Gbl, + Mch_PutParamsEdit,&Gbl, "trophy.svg", Txt_Results); } @@ -808,13 +808,13 @@ static void Mch_ListOneOrMoreMatchesResultTch (const struct Match *Match) /* Show match results */ Lay_PutContextualLinkOnlyIcon (ActSeeAllMchResMch,McR_RESULTS_BOX_ID, - Mch_PutParamsEdit,(void *) &Gbl, + Mch_PutParamsEdit,&Gbl, "trophy.svg", Txt_Results); /* I can edit visibility */ Lay_PutContextualLinkOnlyIcon (ActChgVisResMchUsr,NULL, - Mch_PutParamsEdit,(void *) &Gbl, + Mch_PutParamsEdit,&Gbl, Match->Status.ShowUsrResults ? "eye-green.svg" : "eye-slash-red.svg", Match->Status.ShowUsrResults ? Txt_Visible_results : @@ -982,7 +982,7 @@ void Mch_RequestRemoveMatch (void) Gam_SetCurrentGamCod (Match.GamCod); // Used to pass parameter Mch_SetCurrentMchCod (Match.MchCod); // Used to pass parameter Ale_ShowAlertAndButton (ActRemMch,NULL,NULL, - Mch_PutParamsEdit,(void *) &Gbl, + Mch_PutParamsEdit,&Gbl, Btn_REMOVE_BUTTON,Txt_Remove_match, Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_match_X, Match.Title); @@ -1167,8 +1167,8 @@ void Mch_PutParamsEdit (void *Args) { if (Args) { - Gam_PutParams ((void *) &Gbl); - Mch_PutParamsPlay ((void *) &Gbl); + Gam_PutParams (&Gbl); + Mch_PutParamsPlay (&Gbl); } } @@ -1207,7 +1207,7 @@ void Mch_GetAndCheckParameters (struct Game *Game,struct Match *Match) /* Get parameters of game */ if ((Game->GamCod = Gam_GetParams ()) == -1L) Lay_ShowErrorAndExit ("Code of game is missing."); - Grp_GetParamWhichGrps (); + Grp_GetParamWhichGroups (); Gam_GetDataOfGameByCod (Game); /* Get match code */ diff --git a/swad_match_result.c b/swad_match_result.c index a419bf23..6e5849ac 100644 --- a/swad_match_result.c +++ b/swad_match_result.c @@ -891,12 +891,12 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther, { case Usr_ME: Frm_StartForm (ActSeeOneMchResMe); - Mch_PutParamsEdit ((void *) &Gbl); + Mch_PutParamsEdit (&Gbl); break; case Usr_OTHER: Frm_StartForm (ActSeeOneMchResOth); - Mch_PutParamsEdit ((void *) &Gbl); - Usr_PutParamOtherUsrCodEncrypted ((void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + Mch_PutParamsEdit (&Gbl); + Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); break; } Ico_PutIconLink ("tasks.svg",Txt_Match_result); diff --git a/swad_menu.c b/swad_menu.c index 575c4cf6..9f0d8c26 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -276,7 +276,7 @@ void Mnu_PutIconsToSelectMenu (void) Mnu_Menu_t Menu; Box_BoxBegin (NULL,Txt_Menu, - Mnu_PutIconsMenu,(void *) &Gbl, + Mnu_PutIconsMenu,&Gbl, Hlp_PROFILE_Settings_menu,Box_NOT_CLOSABLE); Set_StartSettingsHead (); Set_StartOneSettingSelector (); diff --git a/swad_message.c b/swad_message.c index cfc8a71d..1f02ac0e 100644 --- a/swad_message.c +++ b/swad_message.c @@ -242,7 +242,7 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1]) if (GetUsrsInCrs) { /***** Form to select groups *****/ - Grp_ShowFormToSelectSeveralGroups (Msg_PutParamsWriteMsg,(void *) &Gbl, + Grp_ShowFormToSelectSeveralGroups (Msg_PutParamsWriteMsg,&Gbl, Grp_MY_GROUPS); /***** Start section with user list *****/ @@ -251,14 +251,14 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1]) if (NumUsrsInCrs) { /***** Form to select type of list used for select several users *****/ - Usr_ShowFormsToSelectUsrListType (Msg_PutParamsWriteMsg,(void *) &Gbl); + Usr_ShowFormsToSelectUsrListType (Msg_PutParamsWriteMsg,&Gbl); /***** Put link to register students *****/ Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs (); /***** Check if it's a big list *****/ ShowUsrsInCrs = Usr_GetIfShowBigList (NumUsrsInCrs, - Msg_PutParamsWriteMsg,(void *) &Gbl, + Msg_PutParamsWriteMsg,&Gbl, "CopyMessageToHiddenFields();"); if (ShowUsrsInCrs) @@ -283,7 +283,7 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1]) } if (Gbl.Usrs.Other.UsrDat.UsrCod > 0) { - Usr_PutParamOtherUsrCodEncrypted ((void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); if (Gbl.Msg.ShowOnlyOneRecipient) Par_PutHiddenParamChar ("ShowOnlyOneRecipient",'Y'); } @@ -388,7 +388,7 @@ static void Msg_PutParamsShowMorePotentialRecipients (void) Msg_PutHiddenParamMsgCod (Gbl.Msg.Reply.OriginalMsgCod); } if (Gbl.Usrs.Other.UsrDat.UsrCod > 0) - Usr_PutParamOtherUsrCodEncrypted ((void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); /***** Hidden params to send subject and content *****/ Msg_PutHiddenParamsSubjectAndContent (); @@ -412,7 +412,7 @@ static void Msg_PutParamsWriteMsg (void *Args) } if (Gbl.Usrs.Other.UsrDat.UsrCod > 0) { - Usr_PutParamOtherUsrCodEncrypted ((void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); if (Gbl.Msg.ShowOnlyOneRecipient) Par_PutHiddenParamChar ("ShowOnlyOneRecipient",'Y'); } @@ -921,7 +921,7 @@ void Msg_ReqDelAllRecMsgs (void) /* End alert */ Ale_ShowAlertAndButton2 (ActDelAllRcvMsg,NULL,NULL, - Msg_PutHiddenParamsMsgsFilters,(void *) &Gbl, + Msg_PutHiddenParamsMsgsFilters,&Gbl, Btn_REMOVE_BUTTON,Txt_Delete_messages_received); } @@ -960,7 +960,7 @@ void Msg_ReqDelAllSntMsgs (void) /* End alert */ Ale_ShowAlertAndButton2 (ActDelAllSntMsg,NULL,NULL, - Msg_PutHiddenParamsMsgsFilters,(void *) &Gbl, + Msg_PutHiddenParamsMsgsFilters,&Gbl, Btn_REMOVE_BUTTON,Txt_Delete_messages_sent); } @@ -1764,7 +1764,7 @@ static void Msg_ShowSentOrReceivedMessages (void) /***** Begin box with messages *****/ Msg_SetNumMsgsStr (&NumMsgsStr,NumUnreadMsgs); Box_BoxBegin ("97%",NumMsgsStr, - Msg_PutIconsListMsgs,(void *) &Gbl, + Msg_PutIconsListMsgs,&Gbl, Help[Gbl.Msg.TypeOfMessages],Box_NOT_CLOSABLE); free (NumMsgsStr); @@ -2523,7 +2523,7 @@ static void Msg_PutIconsListMsgs (void *Args) { /***** Put icon to remove messages *****/ Ico_PutContextualIconToRemove (ActionReqDelAllMsg[Gbl.Msg.TypeOfMessages], - Msg_PutHiddenParamsMsgsFilters,(void *) &Gbl); + Msg_PutHiddenParamsMsgsFilters,&Gbl); /***** Put icon to show a figure *****/ Gbl.Figures.FigureType = Fig_MESSAGES; @@ -2542,7 +2542,7 @@ static void Msg_PutHiddenParamsOneMsg (void *Args) Pag_PutHiddenParamPagNum (Msg_WhatPaginate[Gbl.Msg.TypeOfMessages], Gbl.Msg.CurrentPage); Msg_PutHiddenParamMsgCod (Gbl.Msg.MsgCod); - Msg_PutHiddenParamsMsgsFilters ((void *) &Gbl); + Msg_PutHiddenParamsMsgsFilters (&Gbl); } } @@ -3002,7 +3002,7 @@ static void Msg_ShowASentOrReceivedMessage (long MsgNum,long MsgCod) HTM_BR (); Gbl.Msg.MsgCod = MsgCod; // Message to be deleted Ico_PutContextualIconToRemove (ActionDelMsg[Gbl.Msg.TypeOfMessages], - Msg_PutHiddenParamsOneMsg,(void *) &Gbl); + Msg_PutHiddenParamsOneMsg,&Gbl); HTM_TD_End (); /***** Write message number *****/ @@ -3189,7 +3189,7 @@ static void Msg_WriteSentOrReceivedMsgSubject (long MsgCod,const char *Subject,b (Expanded ? ActConSntMsg : ActExpSntMsg)); Gbl.Msg.MsgCod = MsgCod; // Message to be contracted/expanded - Msg_PutHiddenParamsOneMsg ((void *) &Gbl); + Msg_PutHiddenParamsOneMsg (&Gbl); HTM_BUTTON_SUBMIT_Begin (Expanded ? Txt_Hide_message : Txt_See_message, Open ? "BT_LINK LT MSG_TIT" : @@ -3597,7 +3597,7 @@ static void Msg_WriteMsgTo (long MsgCod) HTM_TD_Begin ("colspan=\"3\" class=\"AUTHOR_TXT LM\""); Frm_StartForm (ActionSee[Gbl.Msg.TypeOfMessages]); Gbl.Msg.MsgCod = MsgCod; // Message to be expanded with all recipients visible - Msg_PutHiddenParamsOneMsg ((void *) &Gbl); + Msg_PutHiddenParamsOneMsg (&Gbl); Par_PutHiddenParamChar ("SeeAllRcpts",'Y'); HTM_BUTTON_SUBMIT_Begin (Txt_View_all_recipients,"BT_LINK AUTHOR_TXT",NULL); HTM_TxtF (Txt_and_X_other_recipients, @@ -3697,7 +3697,7 @@ static void Msg_PutFormToBanSender (struct UsrData *UsrDat) Pag_PutHiddenParamPagNum (Msg_WhatPaginate[Gbl.Msg.TypeOfMessages], Gbl.Msg.CurrentPage); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - Msg_PutHiddenParamsMsgsFilters ((void *) &Gbl); + Msg_PutHiddenParamsMsgsFilters (&Gbl); Ico_PutIconLink ("unlock.svg",Txt_Sender_permitted_click_to_ban_him); Frm_EndForm (); } @@ -3714,7 +3714,7 @@ static void Msg_PutFormToUnbanSender (struct UsrData *UsrDat) Pag_PutHiddenParamPagNum (Msg_WhatPaginate[Gbl.Msg.TypeOfMessages], Gbl.Msg.CurrentPage); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - Msg_PutHiddenParamsMsgsFilters ((void *) &Gbl); + Msg_PutHiddenParamsMsgsFilters (&Gbl); Ico_PutIconLink ("lock.svg",Txt_Sender_banned_click_to_unban_him); Frm_EndForm (); } diff --git a/swad_network.c b/swad_network.c index 726a384f..c82ccfa1 100644 --- a/swad_network.c +++ b/swad_network.c @@ -287,7 +287,7 @@ void Net_ShowFormMyWebsAndSocialNets (void) "%upx", Rec_RECORD_WIDTH); Box_BoxBegin (StrRecordWidth,Txt_Webs_social_networks, - Net_PutIconsWebsSocialNetworks,(void *) &Gbl, + Net_PutIconsWebsSocialNetworks,&Gbl, Hlp_PROFILE_Webs,Box_NOT_CLOSABLE); /***** Begin table *****/ diff --git a/swad_nickname.c b/swad_nickname.c index 2f466500..abf53fe7 100644 --- a/swad_nickname.c +++ b/swad_nickname.c @@ -248,7 +248,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its "%upx", Rec_RECORD_WIDTH); Box_BoxBegin (StrRecordWidth,Txt_Nickname, - Acc_PutLinkToRemoveMyAccount,(void *) &Gbl, + Acc_PutLinkToRemoveMyAccount,&Gbl, Hlp_PROFILE_Account,Box_NOT_CLOSABLE); /***** Show possible alerts *****/ @@ -325,7 +325,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its /* Link to QR code */ if (NumNick == 1 && UsrDat->Nickname[0]) QR_PutLinkToPrintQRCode (ActPrnUsrQR, - Usr_PutParamMyUsrCodEncrypted,(void *) Gbl.Usrs.Me.UsrDat.EncryptedUsrCod); + Usr_PutParamMyUsrCodEncrypted,Gbl.Usrs.Me.UsrDat.EncryptedUsrCod); /* Form to change the nickname */ if (NumNick > 1) diff --git a/swad_notice.c b/swad_notice.c index a3966e4c..6aa0d17a 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -305,7 +305,7 @@ void Not_RequestRemNotice (void) /* End alert */ Not_SetNotCodToEdit (NotCod); // To be used as parameter Ale_ShowAlertAndButton2 (ActRemNot,NULL,NULL, - Not_PutParams,(void *) &Gbl, + Not_PutParams,&Gbl, Btn_REMOVE_BUTTON,Txt_Remove); /***** Show all notices *****/ @@ -414,7 +414,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing,long HighlightNotCod) "%upx", Not_ContainerWidth[Not_LIST_FULL_NOTICES] + 50); Box_BoxBegin (StrWidth,Txt_Notices, - Not_PutIconsListNotices,(void *) &Gbl, + Not_PutIconsListNotices,&Gbl, Hlp_MESSAGES_Notices,Box_NOT_CLOSABLE); if (!NumNotices) Ale_ShowAlert (Ale_INFO,Txt_No_notices); @@ -672,18 +672,18 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing, /***** Put form to remove announcement *****/ Ico_PutContextualIconToRemove (ActReqRemNot, - Not_PutParams,(void *) &Gbl); + Not_PutParams,&Gbl); /***** Put form to change the status of the notice *****/ switch (Status) { case Not_ACTIVE_NOTICE: Ico_PutContextualIconToHide (ActHidNot,NULL, - Not_PutParams,(void *) &Gbl); + Not_PutParams,&Gbl); break; case Not_OBSOLETE_NOTICE: Ico_PutContextualIconToUnhide (ActRevNot,NULL, - Not_PutParams,(void *) &Gbl); + Not_PutParams,&Gbl); break; } Frm_EndForm (); @@ -725,7 +725,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing, HTM_DIV_Begin ("class=\"CM\""); Not_SetNotCodToEdit (NotCod); // To be used as parameter Lay_PutContextualLinkOnlyIcon (ActSeeOneNot,Anchor, - Not_PutParams,(void *) &Gbl, + Not_PutParams,&Gbl, "ellipsis-h.svg", Txt_See_full_notice); HTM_DIV_End (); diff --git a/swad_notification.c b/swad_notification.c index 6b3047c2..368ea974 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -369,7 +369,7 @@ void Ntf_ShowMyNotifications (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Notifications, - Ntf_PutIconsNotif,(void *) &Gbl, + Ntf_PutIconsNotif,&Gbl, Hlp_START_Notifications,Box_NOT_CLOSABLE); /***** List my notifications *****/ @@ -1902,7 +1902,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Notifications, - Ntf_PutIconsNotif,(void *) &Gbl, + Ntf_PutIconsNotif,&Gbl, Hlp_PROFILE_Settings_notifications,Box_NOT_CLOSABLE); /***** Begin form *****/ diff --git a/swad_pagination.c b/swad_pagination.c index a2cc0042..77150b56 100644 --- a/swad_pagination.c +++ b/swad_pagination.c @@ -154,6 +154,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, { extern const char *Txt_Page_X_of_Y; extern const char *Txt_FORUM_Post_banned; + Grp_WhichGroups_t WhichGroups; unsigned NumPage; char *ClassLink; char *Title; @@ -170,7 +171,8 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Frm_StartFormAnchor (ActSeeAsg,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,1); Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_PROJECTS: Frm_StartFormAnchor (ActSeePrj,Pagination->Anchor); @@ -183,19 +185,22 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Frm_StartFormAnchor (ActSeeAllGam,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,1); Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_SURVEYS: Frm_StartFormAnchor (ActSeeAllSvy,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,1); Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_ATT_EVENTS: Frm_StartFormAnchor (ActSeeAtt,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,1); Att_PutHiddenParamAttOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_THREADS_FORUM: Frm_StartFormAnchor (For_ActionsSeeFor[Gbl.Forum.ForumSelected.Type], @@ -222,12 +227,12 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, case Pag_MESSAGES_RECEIVED: Frm_StartFormAnchor (ActSeeRcvMsg,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,1); - Msg_PutHiddenParamsMsgsFilters ((void *) &Gbl); + Msg_PutHiddenParamsMsgsFilters (&Gbl); break; case Pag_MESSAGES_SENT: Frm_StartFormAnchor (ActSeeSntMsg,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,1); - Msg_PutHiddenParamsMsgsFilters ((void *) &Gbl); + Msg_PutHiddenParamsMsgsFilters (&Gbl); break; case Pag_MY_AGENDA: Frm_StartFormAnchor (ActSeeMyAgd,Pagination->Anchor); @@ -242,7 +247,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Frm_StartFormAnchor (ActSeeUsrAgd,Pagination->Anchor); Agd_PutHiddenParamEventsOrder (); Pag_PutHiddenParamPagNum (WhatPaginate,1); - Usr_PutParamOtherUsrCodEncrypted ((void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); break; } if (asprintf (&ClassLink,"BT_LINK LT %s",ClassTxt) < 0) @@ -284,7 +289,8 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Frm_StartFormAnchor (ActSeeAsg,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,1); Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_PROJECTS: Frm_StartFormAnchor (ActSeePrj,Pagination->Anchor); @@ -297,19 +303,22 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Frm_StartFormAnchor (ActSeeAllGam,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,1); Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_SURVEYS: Frm_StartFormAnchor (ActSeeAllSvy,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,1); Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_ATT_EVENTS: Frm_StartFormAnchor (ActSeeAtt,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,1); Att_PutHiddenParamAttOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_THREADS_FORUM: Frm_StartFormAnchor (For_ActionsSeeFor[Gbl.Forum.ForumSelected.Type], @@ -336,12 +345,12 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, case Pag_MESSAGES_RECEIVED: Frm_StartFormAnchor (ActSeeRcvMsg,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,1); - Msg_PutHiddenParamsMsgsFilters ((void *) &Gbl); + Msg_PutHiddenParamsMsgsFilters (&Gbl); break; case Pag_MESSAGES_SENT: Frm_StartFormAnchor (ActSeeSntMsg,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,1); - Msg_PutHiddenParamsMsgsFilters ((void *) &Gbl); + Msg_PutHiddenParamsMsgsFilters (&Gbl); break; case Pag_MY_AGENDA: Frm_StartFormAnchor (ActSeeMyAgd,Pagination->Anchor); @@ -356,7 +365,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Frm_StartFormAnchor (ActSeeUsrAgd,Pagination->Anchor); Agd_PutHiddenParamEventsOrder (); Pag_PutHiddenParamPagNum (WhatPaginate,1); - Usr_PutParamOtherUsrCodEncrypted ((void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); break; } if (asprintf (&Title,Txt_Page_X_of_Y,1,Pagination->NumPags) < 0) @@ -384,7 +393,8 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Frm_StartFormAnchor (ActSeeAsg,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->LeftPage); Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_PROJECTS: Frm_StartFormAnchor (ActSeePrj,Pagination->Anchor); @@ -397,19 +407,22 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Frm_StartFormAnchor (ActSeeAllGam,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->LeftPage); Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_SURVEYS: Frm_StartFormAnchor (ActSeeAllSvy,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->LeftPage); Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_ATT_EVENTS: Frm_StartFormAnchor (ActSeeAtt,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->LeftPage); Att_PutHiddenParamAttOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_THREADS_FORUM: Frm_StartFormAnchor (For_ActionsSeeFor[Gbl.Forum.ForumSelected.Type], @@ -436,12 +449,12 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, case Pag_MESSAGES_RECEIVED: Frm_StartFormAnchor (ActSeeRcvMsg,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->LeftPage); - Msg_PutHiddenParamsMsgsFilters ((void *) &Gbl); + Msg_PutHiddenParamsMsgsFilters (&Gbl); break; case Pag_MESSAGES_SENT: Frm_StartFormAnchor (ActSeeSntMsg,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->LeftPage); - Msg_PutHiddenParamsMsgsFilters ((void *) &Gbl); + Msg_PutHiddenParamsMsgsFilters (&Gbl); break; case Pag_MY_AGENDA: Frm_StartFormAnchor (ActSeeMyAgd,Pagination->Anchor); @@ -456,7 +469,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Frm_StartFormAnchor (ActSeeUsrAgd,Pagination->Anchor); Agd_PutHiddenParamEventsOrder (); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->LeftPage); - Usr_PutParamOtherUsrCodEncrypted ((void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); break; } if (asprintf (&Title,Txt_Page_X_of_Y, @@ -496,7 +509,8 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Frm_StartFormAnchor (ActSeeAsg,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,NumPage); Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_PROJECTS: Frm_StartFormAnchor (ActSeePrj,Pagination->Anchor); @@ -509,19 +523,22 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Frm_StartFormAnchor (ActSeeAllGam,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,NumPage); Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_SURVEYS: Frm_StartFormAnchor (ActSeeAllSvy,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,NumPage); Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_ATT_EVENTS: Frm_StartFormAnchor (ActSeeAtt,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,NumPage); Att_PutHiddenParamAttOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_THREADS_FORUM: Frm_StartFormAnchor (For_ActionsSeeFor[Gbl.Forum.ForumSelected.Type], @@ -548,12 +565,12 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, case Pag_MESSAGES_RECEIVED: Frm_StartFormAnchor (ActSeeRcvMsg,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,NumPage); - Msg_PutHiddenParamsMsgsFilters ((void *) &Gbl); + Msg_PutHiddenParamsMsgsFilters (&Gbl); break; case Pag_MESSAGES_SENT: Frm_StartFormAnchor (ActSeeSntMsg,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,NumPage); - Msg_PutHiddenParamsMsgsFilters ((void *) &Gbl); + Msg_PutHiddenParamsMsgsFilters (&Gbl); break; case Pag_MY_AGENDA: Frm_StartFormAnchor (ActSeeMyAgd,Pagination->Anchor); @@ -568,7 +585,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Frm_StartFormAnchor (ActSeeUsrAgd,Pagination->Anchor); Agd_PutHiddenParamEventsOrder (); Pag_PutHiddenParamPagNum (WhatPaginate,NumPage); - Usr_PutParamOtherUsrCodEncrypted ((void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); break; } HTM_BUTTON_SUBMIT_Begin (Title,ClassLink,NULL); @@ -595,7 +612,8 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Frm_StartFormAnchor (ActSeeAsg,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->RightPage); Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_PROJECTS: Frm_StartFormAnchor (ActSeePrj,Pagination->Anchor); @@ -608,19 +626,22 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Frm_StartFormAnchor (ActSeeAllGam,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->RightPage); Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_SURVEYS: Frm_StartFormAnchor (ActSeeAllSvy,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->RightPage); Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_ATT_EVENTS: Frm_StartFormAnchor (ActSeeAtt,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->RightPage); Att_PutHiddenParamAttOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_THREADS_FORUM: Frm_StartFormAnchor (For_ActionsSeeFor[Gbl.Forum.ForumSelected.Type], @@ -647,12 +668,12 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, case Pag_MESSAGES_RECEIVED: Frm_StartFormAnchor (ActSeeRcvMsg,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->RightPage); - Msg_PutHiddenParamsMsgsFilters ((void *) &Gbl); + Msg_PutHiddenParamsMsgsFilters (&Gbl); break; case Pag_MESSAGES_SENT: Frm_StartFormAnchor (ActSeeSntMsg,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->RightPage); - Msg_PutHiddenParamsMsgsFilters ((void *) &Gbl); + Msg_PutHiddenParamsMsgsFilters (&Gbl); break; case Pag_MY_AGENDA: Frm_StartFormAnchor (ActSeeMyAgd,Pagination->Anchor); @@ -667,7 +688,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Frm_StartFormAnchor (ActSeeUsrAgd,Pagination->Anchor); Agd_PutHiddenParamEventsOrder (); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->RightPage); - Usr_PutParamOtherUsrCodEncrypted ((void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); break; } if (asprintf (&Title,Txt_Page_X_of_Y, @@ -695,7 +716,8 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Frm_StartFormAnchor (ActSeeAsg,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->NumPags); Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_PROJECTS: Frm_StartFormAnchor (ActSeePrj,Pagination->Anchor); @@ -708,19 +730,22 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Frm_StartFormAnchor (ActSeeAllGam,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->NumPags); Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_SURVEYS: Frm_StartFormAnchor (ActSeeAllSvy,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->NumPags); Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_ATT_EVENTS: Frm_StartFormAnchor (ActSeeAtt,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->NumPags); Att_PutHiddenParamAttOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); break; case Pag_THREADS_FORUM: Frm_StartFormAnchor (For_ActionsSeeFor[Gbl.Forum.ForumSelected.Type], @@ -747,12 +772,12 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, case Pag_MESSAGES_RECEIVED: Frm_StartFormAnchor (ActSeeRcvMsg,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->NumPags); - Msg_PutHiddenParamsMsgsFilters ((void *) &Gbl); + Msg_PutHiddenParamsMsgsFilters (&Gbl); break; case Pag_MESSAGES_SENT: Frm_StartFormAnchor (ActSeeSntMsg,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->NumPags); - Msg_PutHiddenParamsMsgsFilters ((void *) &Gbl); + Msg_PutHiddenParamsMsgsFilters (&Gbl); break; case Pag_MY_AGENDA: Frm_StartFormAnchor (ActSeeMyAgd,Pagination->Anchor); @@ -767,7 +792,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Frm_StartFormAnchor (ActSeeUsrAgd,Pagination->Anchor); Agd_PutHiddenParamEventsOrder (); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->NumPags); - Usr_PutParamOtherUsrCodEncrypted ((void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); break; } if (asprintf (&Title,Txt_Page_X_of_Y, diff --git a/swad_password.c b/swad_password.c index 2482191c..066e12c2 100644 --- a/swad_password.c +++ b/swad_password.c @@ -248,7 +248,7 @@ void Pwd_PutLinkToSendNewPasswd (void) extern const char *Txt_Forgotten_password; Lay_PutContextualLinkIconText (ActReqSndNewPwd,NULL, - Pwd_PutLinkToSendNewPasswdParams,(void *) &Gbl, + Pwd_PutLinkToSendNewPasswdParams,&Gbl, "key.svg", Txt_Forgotten_password); } @@ -824,7 +824,7 @@ void Pwd_ShowFormChgOtherUsrPwd (void) break; } Frm_StartFormAnchor (NextAction,Pwd_PASSWORD_SECTION_ID); - Usr_PutParamOtherUsrCodEncrypted ((void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); /* New password */ HTM_TABLE_BeginWidePadding (2); diff --git a/swad_photo.c b/swad_photo.c index 2cf6bce1..cc613856 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -262,7 +262,7 @@ static void Pho_PutIconToRequestRemoveOtherUsrPhoto (void *Args) break; } Lay_PutContextualLinkOnlyIcon (NextAction,NULL, - Usr_PutParamOtherUsrCodEncrypted,(void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod, + Usr_PutParamOtherUsrCodEncrypted,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod, "trash.svg", Txt_Remove_photo); } @@ -313,7 +313,7 @@ static void Pho_ReqPhoto (const struct UsrData *UsrDat) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Photo, ItsMe ? Pho_PutIconToRequestRemoveMyPhoto : - Pho_PutIconToRequestRemoveOtherUsrPhoto,(void *) &Gbl, + Pho_PutIconToRequestRemoveOtherUsrPhoto,&Gbl, Hlp_PROFILE_Photo,Box_NOT_CLOSABLE); /***** Begin form *****/ @@ -523,7 +523,7 @@ void Pho_ReqRemoveUsrPhoto (void) break; } Ale_ShowAlertAndButton2 (NextAction,NULL,NULL, - Usr_PutParamOtherUsrCodEncrypted,(void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod, + Usr_PutParamOtherUsrCodEncrypted,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod, Btn_REMOVE_BUTTON,Txt_Remove_photo); } else @@ -1731,7 +1731,7 @@ void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint) case Pho_DEGREES_SEE: /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Degrees, - Pho_PutIconToPrintDegreeStats,(void *) &Gbl, + Pho_PutIconToPrintDegreeStats,&Gbl, Hlp_ANALYTICS_Degrees,Box_NOT_CLOSABLE); HTM_TABLE_BeginCenterPadding (2); @@ -1994,7 +1994,7 @@ static void Pho_PutIconToPrintDegreeStats (void *Args) { if (Args) Ico_PutContextualIconToPrint (ActPrnPhoDeg, - Pho_PutLinkToPrintViewOfDegreeStatsParams,(void *) &Gbl); + Pho_PutLinkToPrintViewOfDegreeStatsParams,&Gbl); } static void Pho_PutLinkToPrintViewOfDegreeStatsParams (void *Args) @@ -2159,7 +2159,7 @@ static void Pho_ShowOrPrintClassPhotoDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrin { /***** Form to select type of list used to display degree photos *****/ if (SeeOrPrint == Pho_DEGREES_SEE) - Usr_ShowFormsToSelectUsrListType (Pho_PutParamsDegPhoto,(void *) &Gbl); + Usr_ShowFormsToSelectUsrListType (Pho_PutParamsDegPhoto,&Gbl); HTM_TABLE_BeginCenter (); /***** Get and print degrees *****/ @@ -2240,7 +2240,7 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint) /***** Class photo start *****/ if (SeeOrPrint == Pho_DEGREES_SEE) /***** Form to select type of list used to display degree photos *****/ - Usr_ShowFormsToSelectUsrListType (Pho_PutParamsDegPhoto,(void *) &Gbl); + Usr_ShowFormsToSelectUsrListType (Pho_PutParamsDegPhoto,&Gbl); /***** Write heading *****/ HTM_TABLE_BeginCenterPadding (2); diff --git a/swad_place.c b/swad_place.c index 9bcb14ed..535d392d 100644 --- a/swad_place.c +++ b/swad_place.c @@ -112,7 +112,7 @@ void Plc_SeePlaces (void) /***** Table head *****/ Box_BoxBegin (NULL,Txt_Places, - Plc_PutIconsListingPlaces,(void *) &Gbl, + Plc_PutIconsListingPlaces,&Gbl, Hlp_INSTITUTION_Places,Box_NOT_CLOSABLE); HTM_TABLE_BeginWideMarginPadding (2); HTM_TR_Begin (NULL); @@ -287,7 +287,7 @@ static void Plc_EditPlacesInternal (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Places, - Plc_PutIconsEditingPlaces,(void *) &Gbl, + Plc_PutIconsEditingPlaces,&Gbl, Hlp_INSTITUTION_Places_edit,Box_NOT_CLOSABLE); /***** Put a form to create a new place *****/ @@ -330,7 +330,7 @@ void Plc_PutIconToViewPlaces (void) extern const char *Txt_Places; Lay_PutContextualLinkOnlyIcon (ActSeePlc,NULL, - Ins_PutParamCurrentInsCod,(void *) &Gbl, + Ins_PutParamCurrentInsCod,&Gbl, "map-marker-alt.svg", Txt_Places); } diff --git a/swad_plugin.c b/swad_plugin.c index c7e93520..2717da7a 100644 --- a/swad_plugin.c +++ b/swad_plugin.c @@ -109,7 +109,7 @@ void Plg_ListPlugins (void) /***** Begin box and table *****/ if (Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM) Box_BoxTableBegin (NULL,Txt_Plugins, - Plg_PutIconToEditPlugins,(void *) &Gbl, + Plg_PutIconToEditPlugins,&Gbl, NULL,Box_NOT_CLOSABLE,2); else Box_BoxTableBegin (NULL,Txt_Plugins, diff --git a/swad_privacy.c b/swad_privacy.c index 72916882..fb0f8262 100644 --- a/swad_privacy.c +++ b/swad_privacy.c @@ -98,7 +98,7 @@ void Pri_EditMyPrivacy (void) /***** Begin box and table *****/ Box_BoxTableBegin (NULL,Txt_Privacy, - Pri_PutIconsPrivacy,(void *) &Gbl, + Pri_PutIconsPrivacy,&Gbl, Hlp_PROFILE_Settings_privacy,Box_NOT_CLOSABLE,2); /***** Edit photo visibility *****/ diff --git a/swad_profile.c b/swad_profile.c index 2a3b6832..9f393b29 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -157,7 +157,7 @@ void Prf_PutLinkMyPublicProfile (void) extern const char *Txt_My_public_profile; Lay_PutContextualLinkIconText (ActSeeOthPubPrf,NULL, - Usr_PutParamMyUsrCodEncrypted,(void *) Gbl.Usrs.Me.UsrDat.EncryptedUsrCod, + Usr_PutParamMyUsrCodEncrypted,Gbl.Usrs.Me.UsrDat.EncryptedUsrCod, "user.svg", Txt_My_public_profile); } diff --git a/swad_program.c b/swad_program.c index e4d6bd56..994c3755 100644 --- a/swad_program.c +++ b/swad_program.c @@ -271,7 +271,7 @@ static void Prg_ShowAllItems (Prg_CreateOrChangeItem_t CreateOrChangeItem, /***** Begin box *****/ Box_BoxBegin ("100%",Txt_Course_program, - Prg_PutIconsListItems,(void *) &Gbl, + Prg_PutIconsListItems,&Gbl, Hlp_COURSE_Program,Box_NOT_CLOSABLE); /***** Table *****/ @@ -392,7 +392,7 @@ static void Prg_PutIconToCreateNewItem (void) /***** Put form to create a new program item *****/ Prg_SetCurrentItmCod (-1L); Ico_PutContextualIconToAdd (ActFrmNewPrgItm,"item_form", - Prg_PutParams,(void *) &Gbl, + Prg_PutParams,&Gbl, Txt_New_item); } @@ -406,7 +406,7 @@ static void Prg_PutButtonToCreateNewItem (void) Prg_SetCurrentItmCod (-1L); Frm_StartFormAnchor (ActFrmNewPrgItm,"item_form"); - Prg_PutParams ((void *) &Gbl); + Prg_PutParams (&Gbl); Btn_PutConfirmButton (Txt_New_item); Frm_EndForm (); } @@ -798,23 +798,23 @@ static void Prg_PutFormsToRemEditOneItem (unsigned NumItem, case Rol_SYS_ADM: /***** Put form to remove program item *****/ Ico_PutContextualIconToRemove (ActReqRemPrgItm, - Prg_PutParams,(void *) &Gbl); + Prg_PutParams,&Gbl); /***** Put form to hide/show program item *****/ if (Item->Hierarchy.Hidden) Ico_PutContextualIconToUnhide (ActShoPrgItm,"prg_highlighted", - Prg_PutParams,(void *) &Gbl); + Prg_PutParams,&Gbl); else Ico_PutContextualIconToHide (ActHidPrgItm,"prg_highlighted", - Prg_PutParams,(void *) &Gbl); + Prg_PutParams,&Gbl); /***** Put form to edit program item *****/ Ico_PutContextualIconToEdit (ActFrmChgPrgItm,"item_form", - Prg_PutParams,(void *) &Gbl); + Prg_PutParams,&Gbl); /***** Put form to add a new child item inside this item *****/ Ico_PutContextualIconToAdd (ActFrmNewPrgItm,"item_form", - Prg_PutParams,(void *) &Gbl, + Prg_PutParams,&Gbl, Txt_New_item); HTM_BR (); @@ -823,7 +823,7 @@ static void Prg_PutFormsToRemEditOneItem (unsigned NumItem, if (Prg_CheckIfMoveUpIsAllowed (NumItem)) { Lay_PutContextualLinkOnlyIcon (ActUp_PrgItm,"prg_highlighted", - Prg_PutParams,(void *) &Gbl, + Prg_PutParams,&Gbl, "arrow-up.svg", Str_BuildStringStr (Txt_Move_up_X, StrItemIndex)); @@ -836,7 +836,7 @@ static void Prg_PutFormsToRemEditOneItem (unsigned NumItem, if (Prg_CheckIfMoveDownIsAllowed (NumItem)) { Lay_PutContextualLinkOnlyIcon (ActDwnPrgItm,"prg_highlighted", - Prg_PutParams,(void *) &Gbl, + Prg_PutParams,&Gbl, "arrow-down.svg", Str_BuildStringStr (Txt_Move_down_X, StrItemIndex)); @@ -849,7 +849,7 @@ static void Prg_PutFormsToRemEditOneItem (unsigned NumItem, if (Prg_CheckIfMoveLeftIsAllowed (NumItem)) { Lay_PutContextualLinkOnlyIcon (ActLftPrgItm,"prg_highlighted", - Prg_PutParams,(void *) &Gbl, + Prg_PutParams,&Gbl, "arrow-left.svg", Str_BuildStringStr (Txt_Increase_level_of_X, StrItemIndex)); @@ -862,7 +862,7 @@ static void Prg_PutFormsToRemEditOneItem (unsigned NumItem, if (Prg_CheckIfMoveRightIsAllowed (NumItem)) { Lay_PutContextualLinkOnlyIcon (ActRgtPrgItm,"prg_highlighted", - Prg_PutParams,(void *) &Gbl, + Prg_PutParams,&Gbl, "arrow-right.svg", Str_BuildStringStr (Txt_Decrease_level_of_X, StrItemIndex)); @@ -1287,7 +1287,7 @@ void Prg_ReqRemItem (void) /***** Show question and button to remove the program item *****/ Prg_SetCurrentItmCod (Item.Hierarchy.ItmCod); Ale_ShowAlertAndButton (ActRemPrgItm,NULL,NULL, - Prg_PutParams,(void *) &Gbl, + Prg_PutParams,&Gbl, Btn_REMOVE_BUTTON,Txt_Remove_item, Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_item_X, Item.Title); diff --git a/swad_project.c b/swad_project.c index 3d6e7950..06932380 100644 --- a/swad_project.c +++ b/swad_project.c @@ -275,7 +275,7 @@ static void Prj_ReqUsrsToSelect (void) /***** List users to select some of them *****/ Usr_PutFormToSelectUsrsToGoToAct (&Gbl.Usrs.Selected, ActSeePrj, - Prj_PutCurrentParams,(void *) &Gbl, + Prj_PutCurrentParams,&Gbl, Txt_Projects, Hlp_ASSESSMENT_Projects, Txt_View_projects, @@ -400,7 +400,7 @@ static void Prj_ShowPrjsInCurrentPage (void) /***** Begin box *****/ Box_BoxBegin ("100%",Txt_Projects, - Prj_PutIconsListProjects,(void *) &Gbl, + Prj_PutIconsListProjects,&Gbl, Hlp_ASSESSMENT_Projects,Box_NOT_CLOSABLE); /***** Put forms to choice which projects to show *****/ @@ -737,7 +737,7 @@ void Prj_PutParams (struct Prj_Filter *Filter, /***** Put another user's code *****/ if (Gbl.Usrs.Other.UsrDat.UsrCod > 0) - Usr_PutParamOtherUsrCodEncrypted ((void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); /***** Put selected users' codes *****/ if (Filter->Who == Usr_WHO_SELECTED) @@ -1031,7 +1031,7 @@ static void Prj_PutIconToCreateNewPrj (void) /***** Put form to create a new project *****/ Gbl.Prjs.PrjCod = -1L; Ico_PutContextualIconToAdd (ActFrmNewPrj,NULL, - Prj_PutCurrentParams,(void *) &Gbl, + Prj_PutCurrentParams,&Gbl, Txt_New_project); } @@ -1045,7 +1045,7 @@ static void Prj_PutButtonToCreateNewPrj (void) Gbl.Prjs.PrjCod = -1L; Frm_StartForm (ActFrmNewPrj); - Prj_PutCurrentParams ((void *) &Gbl); + Prj_PutCurrentParams (&Gbl); Btn_PutConfirmButton (Txt_New_project); Frm_EndForm (); } @@ -1059,7 +1059,7 @@ static void Prj_PutIconToShowAllData (void) extern const char *Txt_Show_all_data_in_a_table; Lay_PutContextualLinkOnlyIcon (ActSeeTblAllPrj,NULL, - Prj_PutCurrentParams,(void *) &Gbl, + Prj_PutCurrentParams,&Gbl, "table.svg", Txt_Show_all_data_in_a_table); } @@ -1266,7 +1266,7 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj, if (ICanViewProjectFiles) { Frm_StartForm (ActAdmDocPrj); - Prj_PutCurrentParams ((void *) &Gbl); + Prj_PutCurrentParams (&Gbl); HTM_BUTTON_SUBMIT_Begin (Txt_Project_files,ClassLink,NULL); HTM_Txt (Prj->Title); HTM_BUTTON_End (); @@ -2039,7 +2039,7 @@ static void Prj_ShowOneProjectMembersWithARole (const struct Project *Prj, { HTM_TD_Begin ("class=\"PRJ_MEMBER_ICO\""); Lay_PutContextualLinkOnlyIcon (ActionReqRemUsr[RoleInProject],NULL, - Prj_PutCurrentParams,(void *) &Gbl, + Prj_PutCurrentParams,&Gbl, "trash.svg", Txt_Remove); HTM_TD_End (); @@ -2071,7 +2071,7 @@ static void Prj_ShowOneProjectMembersWithARole (const struct Project *Prj, HTM_TD_Begin ("class=\"PRJ_MEMBER_ICO\""); Gbl.Prjs.PrjCod = Prj->PrjCod; // Used to pass project code as a parameter Ico_PutContextualIconToAdd (ActionReqAddUsr[RoleInProject],NULL, - Prj_PutCurrentParams,(void *) &Gbl, + Prj_PutCurrentParams,&Gbl, Str_BuildStringStr (Txt_Add_USERS, Txt_PROJECT_ROLES_PLURAL_abc[RoleInProject])); Str_FreeString (); @@ -2299,7 +2299,7 @@ static void Prj_ReqAddUsrs (Prj_RoleInProject_t RoleInProject) Lay_NotEnoughMemoryExit (); Usr_PutFormToSelectUsrsToGoToAct (&Prj_MembersToAdd, ActionAddUsr[RoleInProject], - Prj_PutCurrentParams,(void *) &Gbl, + Prj_PutCurrentParams,&Gbl, TxtButton, Hlp_ASSESSMENT_Projects_add_user, TxtButton, @@ -2472,7 +2472,7 @@ static void Prj_ReqRemUsrFromPrj (Prj_RoleInProject_t RoleInProject) /* Show form to request confirmation */ Frm_StartForm (ActionRemUsr[RoleInProject]); Gbl.Prjs.PrjCod = Prj.PrjCod; - Prj_PutCurrentParams ((void *) &Gbl); + Prj_PutCurrentParams (&Gbl); Btn_PutRemoveButton (Str_BuildStringStr (Txt_Remove_USER_from_this_project, Txt_PROJECT_ROLES_SINGUL_abc[RoleInProject][Gbl.Usrs.Other.UsrDat.Sex])); Str_FreeString (); @@ -2607,34 +2607,34 @@ static void Prj_PutFormsToRemEditOnePrj (const struct Project *Prj, { /***** Put form to remove project *****/ Ico_PutContextualIconToRemove (ActReqRemPrj, - Prj_PutCurrentParams,(void *) &Gbl); + Prj_PutCurrentParams,&Gbl); /***** Put form to hide/show project *****/ switch (Prj->Hidden) { case Prj_HIDDEN: Ico_PutContextualIconToUnhide (ActShoPrj,Anchor, - Prj_PutCurrentParams,(void *) &Gbl); + Prj_PutCurrentParams,&Gbl); break; case Prj_VISIBL: Ico_PutContextualIconToHide (ActHidPrj,Anchor, - Prj_PutCurrentParams,(void *) &Gbl); + Prj_PutCurrentParams,&Gbl); break; } /***** Put form to edit project *****/ Ico_PutContextualIconToEdit (ActEdiOnePrj,NULL, - Prj_PutCurrentParams,(void *) &Gbl); + Prj_PutCurrentParams,&Gbl); } /***** Put form to admin project documents *****/ if (ICanViewProjectFiles) Ico_PutContextualIconToViewFiles (ActAdmDocPrj, - Prj_PutCurrentParams,(void *) &Gbl); + Prj_PutCurrentParams,&Gbl); /***** Put form to print project *****/ Ico_PutContextualIconToPrint (ActPrnOnePrj, - Prj_PutCurrentParams,(void *) &Gbl); + Prj_PutCurrentParams,&Gbl); /***** Locked/unlocked project edition *****/ if (Prj_CheckIfICanConfigAllProjects ()) @@ -3215,7 +3215,7 @@ void Prj_ReqRemProject (void) /***** Show question and button to remove the project *****/ Gbl.Prjs.PrjCod = Prj.PrjCod; Ale_ShowAlertAndButton (ActRemPrj,NULL,NULL, - Prj_PutCurrentParams,(void *) &Gbl, + Prj_PutCurrentParams,&Gbl, Btn_REMOVE_BUTTON,Txt_Remove_project, Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_project_X, Prj.Title); @@ -3483,7 +3483,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject) /* Start data form */ Frm_StartForm (ItsANewProject ? ActNewPrj : ActChgPrj); - Prj_PutCurrentParams ((void *) &Gbl); + Prj_PutCurrentParams (&Gbl); /* Begin box and table */ Box_BoxTableBegin (NULL,Txt_Data, @@ -3926,7 +3926,7 @@ void Prj_ShowFormConfig (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Configure_projects, - Prj_PutIconsListProjects,(void *) &Gbl, + Prj_PutIconsListProjects,&Gbl, Hlp_ASSESSMENT_Projects,Box_NOT_CLOSABLE); /***** Begin form *****/ @@ -4049,13 +4049,13 @@ static void Prj_PutIconsToLockUnlockAllProjects (void) /***** Put icon to lock all projects *****/ Lay_PutContextualLinkOnlyIcon (ActReqLckAllPrj,NULL, - Prj_PutCurrentParams,(void *) &Gbl, + Prj_PutCurrentParams,&Gbl, "lock.svg", Txt_Lock_editing); /***** Put icon to unlock all projects *****/ Lay_PutContextualLinkOnlyIcon (ActReqUnlAllPrj,NULL, - Prj_PutCurrentParams,(void *) &Gbl, + Prj_PutCurrentParams,&Gbl, "unlock.svg", Txt_Unlock_editing); } @@ -4082,7 +4082,7 @@ void Prj_ReqLockSelectedPrjsEdition (void) /* Show question and button */ if (Gbl.Prjs.Num) Ale_ShowAlertAndButton (ActLckAllPrj,NULL,NULL, - Prj_PutCurrentParams,(void *) &Gbl, + Prj_PutCurrentParams,&Gbl, Btn_REMOVE_BUTTON,Txt_Lock_editing, Ale_QUESTION,Txt_Do_you_want_to_lock_the_editing_of_the_X_selected_projects, Gbl.Prjs.Num); @@ -4117,7 +4117,7 @@ void Prj_ReqUnloSelectedPrjsEdition (void) /* Show question and button */ if (Gbl.Prjs.Num) Ale_ShowAlertAndButton (ActUnlAllPrj,NULL,NULL, - Prj_PutCurrentParams,(void *) &Gbl, + Prj_PutCurrentParams,&Gbl, Btn_CREATE_BUTTON,Txt_Unlock_editing, Ale_QUESTION,Txt_Do_you_want_to_unlock_the_editing_of_the_X_selected_projects, Gbl.Prjs.Num); diff --git a/swad_record.c b/swad_record.c index 7ee79617..6c933ef5 100644 --- a/swad_record.c +++ b/swad_record.c @@ -608,7 +608,7 @@ void Rec_AskConfirmRemFieldWithRecords (unsigned NumRecords) /***** Show question and button to remove my photo *****/ Ale_ShowAlertAndButton (ActRemFie,NULL,NULL, - Rec_PutParamFielCod,(void *) &Gbl, + Rec_PutParamFielCod,&Gbl, Btn_REMOVE_BUTTON,Txt_Remove_record_field, Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_field_X_from_the_records_of_Y_Z_, Gbl.Crs.Records.Field.Name,Gbl.Hierarchy.Crs.FullName, @@ -1522,7 +1522,7 @@ static void Rec_WriteFormShowOfficeHoursSeveralTchs (bool ShowOfficeHours) static void Rec_PutParamsShowOfficeHoursOneTch (void) { - Usr_PutParamOtherUsrCodEncrypted ((void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); Par_PutHiddenParamChar ("ParamOfficeHours",'Y'); } @@ -2219,7 +2219,7 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView, Rec_RecordHelp[TypeOfView],Box_NOT_CLOSABLE,2); else Box_BoxTableBegin (StrRecordWidth,NULL, - Rec_PutIconsCommands,(void *) &Gbl, + Rec_PutIconsCommands,&Gbl, Rec_RecordHelp[TypeOfView],Box_NOT_CLOSABLE,2); /***** Institution and user's photo *****/ @@ -2527,12 +2527,12 @@ static void Rec_PutIconsCommands (void *Args) { if (ItsMe) Lay_PutContextualLinkOnlyIcon (ActSeeMyTstRes,NULL, - Rec_PutParamsMyTsts,(void *) &Gbl, + Rec_PutParamsMyTsts,&Gbl, "check.svg", Txt_View_test_results); else // Not me Lay_PutContextualLinkOnlyIcon (ActSeeUsrTstRes,NULL, - Rec_PutParamsStdTsts,(void *) &Gbl, + Rec_PutParamsStdTsts,&Gbl, "check.svg", Txt_View_test_results); } @@ -2547,7 +2547,7 @@ static void Rec_PutIconsCommands (void *Args) Txt_View_homework); else // Not me, I am not a student in current course Lay_PutContextualLinkOnlyIcon (ActAdmAsgWrkCrs,NULL, - Rec_PutParamsWorks,(void *) &Gbl, + Rec_PutParamsWorks,&Gbl, "folder-open.svg", Txt_View_homework); } @@ -2562,7 +2562,7 @@ static void Rec_PutIconsCommands (void *Args) Txt_View_attendance); else // Not me Lay_PutContextualLinkOnlyIcon (ActSeeLstUsrAtt,NULL, - Rec_PutParamsStudent,(void *) &Gbl, + Rec_PutParamsStudent,&Gbl, "calendar-check.svg", Txt_View_attendance); } @@ -2578,7 +2578,7 @@ static void Rec_PutIconsCommands (void *Args) Gbl.Record.UsrDat->UsrCod); // To: if (!RecipientHasBannedMe) Lay_PutContextualLinkOnlyIcon (ActReqMsgUsr,NULL, - Rec_PutParamsMsgUsr,(void *) &Gbl, + Rec_PutParamsMsgUsr,&Gbl, "envelope.svg", Txt_Write_a_message); @@ -2630,7 +2630,7 @@ static void Rec_PutParamsStdTsts (void *Args) { if (Args) { - Rec_PutParamsStudent ((void *) &Gbl); + Rec_PutParamsStudent (&Gbl); Dat_SetIniEndDates (); Dat_WriteParamsIniEndDates (); } @@ -2640,10 +2640,10 @@ static void Rec_PutParamsWorks (void *Args) { if (Args) { - Rec_PutParamsStudent ((void *) &Gbl); + Rec_PutParamsStudent (&Gbl); Par_PutHiddenParamChar ("FullTree",'Y'); // By default, show all files Gbl.FileBrowser.FullTree = true; - Brw_PutHiddenParamFullTreeIfSelected ((void *) &Gbl); + Brw_PutHiddenParamFullTreeIfSelected (&Gbl); } } diff --git a/swad_search.c b/swad_search.c index 3f4aabe2..cb38118f 100644 --- a/swad_search.c +++ b/swad_search.c @@ -136,7 +136,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Hie /***** Begin box *****/ HTM_DIV_Begin ("class=\"CM\""); Box_BoxBegin (NULL,Txt_Search, - Crs_PutIconToSelectMyCourses,(void *) &Gbl, + Crs_PutIconToSelectMyCourses,&Gbl, Hlp_START_Search,Box_NOT_CLOSABLE); /***** Begin form *****/ diff --git a/swad_setting.c b/swad_setting.c index 08c6abf7..5b7c2c40 100644 --- a/swad_setting.c +++ b/swad_setting.c @@ -249,7 +249,7 @@ static void Set_PutIconsToSelectSideCols (void) char Icon[32 + 1]; Box_BoxBegin (NULL,Txt_Columns, - Set_PutIconsSideColumns,(void *) &Gbl, + Set_PutIconsSideColumns,&Gbl, Hlp_PROFILE_Settings_columns,Box_NOT_CLOSABLE); Set_StartSettingsHead (); Set_StartOneSettingSelector (); diff --git a/swad_survey.c b/swad_survey.c index 695b107f..39bd2467 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -179,7 +179,7 @@ void Svy_SeeAllSurveys (void) { /***** Get parameters *****/ Svy_GetParamSvyOrder (); - Grp_GetParamWhichGrps (); + Grp_GetParamWhichGroups (); Gbl.Svys.CurrentPage = Pag_GetParamPagNum (Pag_SURVEYS); /***** Show all surveys *****/ @@ -200,6 +200,7 @@ static void Svy_ListAllSurveys (void) extern const char *Txt_Status; extern const char *Txt_No_surveys; Svy_Order_t Order; + Grp_WhichGroups_t WhichGroups; struct Pagination Pagination; unsigned NumSvy; @@ -218,7 +219,7 @@ static void Svy_ListAllSurveys (void) /***** Begin box *****/ Box_BoxBegin ("100%",Txt_Surveys, - Svy_PutIconsListSurveys,(void *) &Gbl, + Svy_PutIconsListSurveys,&Gbl, Hlp_ASSESSMENT_Surveys,Box_NOT_CLOSABLE); /***** Select whether show only my groups or all groups *****/ @@ -226,7 +227,7 @@ static void Svy_ListAllSurveys (void) { Set_StartSettingsHead (); Grp_ShowFormToSelWhichGrps (ActSeeAllSvy, - Svy_ParamsWhichGroupsToShow,(void *) &Gbl); + Svy_ParamsWhichGroupsToShow,&Gbl); Set_EndSettingsHead (); } @@ -251,7 +252,8 @@ static void Svy_ListAllSurveys (void) /* Form to change order */ Frm_StartForm (ActSeeAllSvy); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); Pag_PutHiddenParamPagNum (Pag_SURVEYS,Gbl.Svys.CurrentPage); Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); HTM_BUTTON_SUBMIT_Begin (Txt_START_END_TIME_HELP[Order], @@ -347,7 +349,7 @@ static void Svy_PutIconToCreateNewSvy (void) extern const char *Txt_New_survey; Ico_PutContextualIconToAdd (ActFrmNewSvy,NULL, - Svy_PutParamsToCreateNewSvy,(void *) &Gbl, + Svy_PutParamsToCreateNewSvy,&Gbl, Txt_New_survey); } @@ -360,7 +362,7 @@ static void Svy_PutButtonToCreateNewSvy (void) extern const char *Txt_New_survey; Frm_StartForm (ActFrmNewSvy); - Svy_PutParamsToCreateNewSvy ((void *) &Gbl); + Svy_PutParamsToCreateNewSvy (&Gbl); Btn_PutConfirmButton (Txt_New_survey); Frm_EndForm (); } @@ -371,10 +373,13 @@ static void Svy_PutButtonToCreateNewSvy (void) static void Svy_PutParamsToCreateNewSvy (void *Args) { + Grp_WhichGroups_t WhichGroups; + if (Args) { Svy_PutHiddenParamSvyOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); Pag_PutHiddenParamPagNum (Pag_SURVEYS,Gbl.Svys.CurrentPage); } } @@ -402,7 +407,7 @@ void Svy_SeeOneSurvey (void) /***** Get parameters *****/ Svy_GetParamSvyOrder (); - Grp_GetParamWhichGrps (); + Grp_GetParamWhichGroups (); Gbl.Svys.CurrentPage = Pag_GetParamPagNum (Pag_SURVEYS); /***** Get survey code *****/ @@ -436,6 +441,7 @@ static void Svy_ShowOneSurvey (long SvyCod,bool ShowOnlyThisSvyComplete) char *Anchor = NULL; static unsigned UniqueId = 0; char *Id; + Grp_WhichGroups_t WhichGroups; struct Survey Svy; char Txt[Cns_MAX_BYTES_TEXT + 1]; @@ -526,7 +532,8 @@ static void Svy_ShowOneSurvey (long SvyCod,bool ShowOnlyThisSvyComplete) Frm_StartForm (ActSeeSvy); Svy_PutParamSvyCod (SvyCod); Svy_PutHiddenParamSvyOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); Pag_PutHiddenParamPagNum (Pag_SURVEYS,Gbl.Svys.CurrentPage); HTM_BUTTON_SUBMIT_Begin (Txt_View_survey, Svy.Status.Visible ? "BT_LINK LT ASG_TITLE" : @@ -567,7 +574,8 @@ static void Svy_ShowOneSurvey (long SvyCod,bool ShowOnlyThisSvyComplete) Frm_StartForm (ActSeeSvy); Svy_PutParamSvyCod (Svy.SvyCod); Svy_PutHiddenParamSvyOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); Pag_PutHiddenParamPagNum (Pag_SURVEYS,Gbl.Svys.CurrentPage); Btn_PutCreateButtonInline (Txt_Answer_survey); Frm_EndForm (); @@ -582,7 +590,8 @@ static void Svy_ShowOneSurvey (long SvyCod,bool ShowOnlyThisSvyComplete) Frm_StartForm (ActSeeSvy); Svy_PutParamSvyCod (Svy.SvyCod); Svy_PutHiddenParamSvyOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); Pag_PutHiddenParamPagNum (Pag_SURVEYS,Gbl.Svys.CurrentPage); Btn_PutConfirmButtonInline (Txt_View_survey_results); Frm_EndForm (); @@ -851,25 +860,25 @@ static void Svy_PutFormsToRemEditOneSvy (const struct Survey *Svy, /***** Put form to remove survey *****/ Ico_PutContextualIconToRemove (ActReqRemSvy, - Svy_PutParams,(void *) &Gbl); + Svy_PutParams,&Gbl); /***** Put form to reset survey *****/ Lay_PutContextualLinkOnlyIcon (ActReqRstSvy,NULL, - Svy_PutParams,(void *) &Gbl, + Svy_PutParams,&Gbl, "recycle.svg", Txt_Reset); /***** Put form to hide/show survey *****/ if (Svy->Status.Visible) Ico_PutContextualIconToHide (ActHidSvy,Anchor, - Svy_PutParams,(void *) &Gbl); + Svy_PutParams,&Gbl); else Ico_PutContextualIconToUnhide (ActShoSvy,Anchor, - Svy_PutParams,(void *) &Gbl); + Svy_PutParams,&Gbl); /***** Put form to edit survey *****/ Ico_PutContextualIconToEdit (ActEdiOneSvy,NULL, - Svy_PutParams,(void *) &Gbl); + Svy_PutParams,&Gbl); } /*****************************************************************************/ @@ -878,12 +887,15 @@ static void Svy_PutFormsToRemEditOneSvy (const struct Survey *Svy, static void Svy_PutParams (void *Args) { + Grp_WhichGroups_t WhichGroups; + if (Args) { if (Svy_CurrentSvyCod > 0) Svy_PutParamSvyCod (Svy_CurrentSvyCod); Att_PutHiddenParamAttOrder (); - Grp_PutParamWhichGrps ((void *) Grp_GetParamWhichGrps ()); + WhichGroups = Grp_GetParamWhichGroups (); + Grp_PutParamWhichGroups (&WhichGroups); Pag_PutHiddenParamPagNum (Pag_SURVEYS,Gbl.Svys.CurrentPage); } } @@ -1545,7 +1557,7 @@ void Svy_AskRemSurvey (void) /***** Get parameters *****/ Svy_GetParamSvyOrder (); - Grp_GetParamWhichGrps (); + Grp_GetParamWhichGroups (); Gbl.Svys.CurrentPage = Pag_GetParamPagNum (Pag_SURVEYS); /***** Get survey code *****/ @@ -1560,7 +1572,7 @@ void Svy_AskRemSurvey (void) /***** Show question and button to remove survey *****/ Svy_CurrentSvyCod = Svy.SvyCod; Ale_ShowAlertAndButton (ActRemSvy,NULL,NULL, - Svy_PutParams,(void *) &Gbl, + Svy_PutParams,&Gbl, Btn_REMOVE_BUTTON,Txt_Remove_survey, Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_survey_X, Svy.Title); @@ -1580,7 +1592,7 @@ void Svy_RemoveSurvey (void) /***** Get parameters *****/ Svy_GetParamSvyOrder (); - Grp_GetParamWhichGrps (); + Grp_GetParamWhichGroups (); Gbl.Svys.CurrentPage = Pag_GetParamPagNum (Pag_SURVEYS); /***** Get survey code *****/ @@ -1640,7 +1652,7 @@ void Svy_AskResetSurvey (void) /***** Get parameters *****/ Svy_GetParamSvyOrder (); - Grp_GetParamWhichGrps (); + Grp_GetParamWhichGroups (); Gbl.Svys.CurrentPage = Pag_GetParamPagNum (Pag_SURVEYS); /***** Get survey code *****/ @@ -1673,7 +1685,7 @@ static void Svy_PutButtonToResetSurvey (void) extern const char *Txt_Reset_survey; Frm_StartForm (ActRstSvy); - Svy_PutParams ((void *) &Gbl); + Svy_PutParams (&Gbl); Btn_PutRemoveButton (Txt_Reset_survey); Frm_EndForm (); } @@ -1689,7 +1701,7 @@ void Svy_ResetSurvey (void) /***** Get parameters *****/ Svy_GetParamSvyOrder (); - Grp_GetParamWhichGrps (); + Grp_GetParamWhichGroups (); Gbl.Svys.CurrentPage = Pag_GetParamPagNum (Pag_SURVEYS); /***** Get survey code *****/ @@ -1731,7 +1743,7 @@ void Svy_HideSurvey (void) /***** Get parameters *****/ Svy_GetParamSvyOrder (); - Grp_GetParamWhichGrps (); + Grp_GetParamWhichGroups (); Gbl.Svys.CurrentPage = Pag_GetParamPagNum (Pag_SURVEYS); /***** Get survey code *****/ @@ -1762,7 +1774,7 @@ void Svy_UnhideSurvey (void) /***** Get parameters *****/ Svy_GetParamSvyOrder (); - Grp_GetParamWhichGrps (); + Grp_GetParamWhichGroups (); Gbl.Svys.CurrentPage = Pag_GetParamPagNum (Pag_SURVEYS); /***** Get survey code *****/ @@ -1826,7 +1838,7 @@ void Svy_RequestCreatOrEditSvy (void) /***** Get parameters *****/ Svy_GetParamSvyOrder (); - Grp_GetParamWhichGrps (); + Grp_GetParamWhichGroups (); Gbl.Svys.CurrentPage = Pag_GetParamPagNum (Pag_SURVEYS); /***** Get the code of the survey *****/ @@ -1872,7 +1884,7 @@ void Svy_RequestCreatOrEditSvy (void) Svy_CurrentSvyCod = Svy.SvyCod; Frm_StartForm (ItsANewSurvey ? ActNewSvy : ActChgSvy); - Svy_PutParams ((void *) &Gbl); + Svy_PutParams (&Gbl); /***** Begin box and table *****/ if (ItsANewSurvey) @@ -2132,7 +2144,7 @@ void Svy_RecFormSurvey (void) /***** Get parameters *****/ Svy_GetParamSvyOrder (); - Grp_GetParamWhichGrps (); + Grp_GetParamWhichGroups (); Gbl.Svys.CurrentPage = Pag_GetParamPagNum (Pag_SURVEYS); /***** Get the code of the survey *****/ @@ -2606,7 +2618,7 @@ void Svy_RequestEditQuestion (void) /***** Get other parameters *****/ Svy_GetParamSvyOrder (); - Grp_GetParamWhichGrps (); + Grp_GetParamWhichGroups (); Gbl.Svys.CurrentPage = Pag_GetParamPagNum (Pag_SURVEYS); /***** Show form to create a new question in this survey *****/ @@ -2698,7 +2710,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst, if (asprintf (&Title,"%s %u",Txt_Question,SvyQst->QstInd + 1) < 0) // Question index may be 0, 1, 2, 3,... Lay_NotEnoughMemoryExit (); Box_BoxBegin (NULL,Title, - Svy_PutIconToRemoveOneQst,(void *) &Gbl, + Svy_PutIconToRemoveOneQst,&Gbl, NULL,Box_NOT_CLOSABLE); free (Title); } @@ -3219,7 +3231,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy) Svy_CurrentSvyCod = Svy->SvyCod; if (Svy->Status.ICanEdit) Box_BoxBegin (NULL,Txt_Questions, - Svy_PutIconToAddNewQuestion,(void *) &Gbl, + Svy_PutIconToAddNewQuestion,&Gbl, Hlp_ASSESSMENT_Surveys_questions,Box_NOT_CLOSABLE); else Box_BoxBegin (NULL,Txt_Questions, @@ -3280,7 +3292,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy) Svy_CurrentSvyCod = Svy->SvyCod; Svy_CurrentQstCod = SvyQst.QstCod; Ico_PutContextualIconToEdit (ActEdiOneSvyQst,NULL, - Svy_PutParamsToEditQuestion,(void *) &Gbl); + Svy_PutParamsToEditQuestion,&Gbl); HTM_TD_End (); } @@ -3358,7 +3370,7 @@ static void Svy_PutIconToAddNewQuestion (void *Args) if (Args) /***** Put form to create a new question *****/ Ico_PutContextualIconToAdd (ActEdiOneSvyQst,NULL, - Svy_PutParams,(void *) &Gbl, + Svy_PutParams,&Gbl, Txt_New_question); } @@ -3371,7 +3383,7 @@ static void Svy_PutButtonToCreateNewQuestion (void) extern const char *Txt_New_question; Frm_StartForm (ActEdiOneSvyQst); - Svy_PutParams ((void *) &Gbl); + Svy_PutParams (&Gbl); Btn_PutConfirmButton (Txt_New_question); Frm_EndForm (); } @@ -3609,7 +3621,7 @@ void Svy_RequestRemoveQst (void) Svy_CurrentSvyCod = SvyCod; Svy_CurrentQstCod = SvyQst.QstCod; Ale_ShowAlertAndButton (ActRemSvyQst,NULL,NULL, - Svy_PutParamsRemoveOneQst,(void *) &Gbl, + Svy_PutParamsRemoveOneQst,&Gbl, Btn_REMOVE_BUTTON,Txt_Remove_question, Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_question_X, (long) SvyQst.QstInd + 1); diff --git a/swad_syllabus.c b/swad_syllabus.c index 618083f8..8e982798 100644 --- a/swad_syllabus.c +++ b/swad_syllabus.c @@ -512,7 +512,7 @@ static void Syl_ShowSyllabus (bool PutIconToEdit) /***** Begin box and table *****/ if (PutIconToEdit) Box_BoxTableBegin (NULL,Txt_INFO_TITLE[Gbl.Crs.Info.Type], - Inf_PutIconToEditInfo,(void *) &Gbl, + Inf_PutIconToEditInfo,&Gbl, Gbl.Syllabus.EditionIsActive ? Hlp_COURSE_Syllabus_edit : Hlp_COURSE_Syllabus, Box_NOT_CLOSABLE,0); @@ -608,7 +608,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem, { Frm_StartForm (Gbl.Crs.Info.Type == Inf_LECTURES ? ActDelItmSylLec : ActDelItmSylPra); - Syl_PutParamNumItem ((void *) &Gbl); + Syl_PutParamNumItem (&Gbl); Ico_PutIconRemove (); Frm_EndForm (); } @@ -622,7 +622,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem, Lay_PutContextualLinkOnlyIcon (Gbl.Crs.Info.Type == Inf_LECTURES ? ActUp_IteSylLec : ActUp_IteSylPra, NULL, - Syl_PutParamNumItem,(void *) &Gbl, + Syl_PutParamNumItem,&Gbl, "arrow-up.svg", Str_BuildStringStr (Syl_LstItemsSyllabus.Lst[NumItem].HasChildren ? Txt_Move_up_X_and_its_subsections : Txt_Move_up_X, @@ -641,7 +641,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem, Lay_PutContextualLinkOnlyIcon (Gbl.Crs.Info.Type == Inf_LECTURES ? ActDwnIteSylLec : ActDwnIteSylPra, NULL, - Syl_PutParamNumItem,(void *) &Gbl, + Syl_PutParamNumItem,&Gbl, "arrow-down.svg", Str_BuildStringStr (Syl_LstItemsSyllabus.Lst[NumItem].HasChildren ? Txt_Move_down_X_and_its_subsections : Txt_Move_down_X, @@ -659,7 +659,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem, Lay_PutContextualLinkOnlyIcon (Gbl.Crs.Info.Type == Inf_LECTURES ? ActRgtIteSylLec : ActRgtIteSylPra, NULL, - Syl_PutParamNumItem,(void *) &Gbl, + Syl_PutParamNumItem,&Gbl, "arrow-left.svg", Str_BuildStringStr (Txt_Increase_level_of_X, StrItemCod)); @@ -677,7 +677,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem, Lay_PutContextualLinkOnlyIcon (Gbl.Crs.Info.Type == Inf_LECTURES ? ActLftIteSylLec : ActLftIteSylPra, NULL, - Syl_PutParamNumItem,(void *) &Gbl, + Syl_PutParamNumItem,&Gbl, "arrow-right.svg", Str_BuildStringStr (Txt_Decrease_level_of_X, StrItemCod)); @@ -837,7 +837,7 @@ static void Syl_PutFormItemSyllabus (bool NewItem,unsigned NumItem,int Level,int (Gbl.Crs.Info.Type == Inf_LECTURES ? ActModIteSylLec : ActModIteSylPra)); Gbl.Syllabus.ParamNumItem = NumItem; - Syl_PutParamNumItem ((void *) &Gbl); + Syl_PutParamNumItem (&Gbl); HTM_INPUT_TEXT ("Txt",Syl_MAX_CHARS_TEXT_ITEM,Text,true, "size=\"60\" placeholder=\"%s\"%s", Txt_Enter_a_new_item_here, diff --git a/swad_system_config.c b/swad_system_config.c index 9f8b76ae..5dd3440f 100644 --- a/swad_system_config.c +++ b/swad_system_config.c @@ -117,7 +117,7 @@ static void SysCfg_Configuration (bool PrintView) NULL,Box_NOT_CLOSABLE); else Box_BoxBegin (NULL,Cfg_PLATFORM_SHORT_NAME, - SysCfg_PutIconToPrint,(void *) &Gbl, + SysCfg_PutIconToPrint,&Gbl, Hlp_SYSTEM_Information,Box_NOT_CLOSABLE); /**************************** Left part ***********************************/ diff --git a/swad_test.c b/swad_test.c index a7dca1b6..787c8c7a 100644 --- a/swad_test.c +++ b/swad_test.c @@ -257,7 +257,7 @@ static unsigned Tst_GetParamNumQsts (void); static unsigned Tst_CountNumTagsInList (const struct Tst_Tags *Tags); static int Tst_CountNumAnswerTypesInList (const struct Tst_AnswerTypes *AnswerTypes); -static void Tst_PutFormEditOneQst (const struct Tst_Question *Question, +static void Tst_PutFormEditOneQst (struct Tst_Question *Question, char Stem[Cns_MAX_BYTES_TEXT + 1], char Feedback[Cns_MAX_BYTES_TEXT + 1]); static void Tst_PutFloatInputField (const char *Label,const char *Field, @@ -405,7 +405,7 @@ static void Tst_ShowFormRequestTest (struct Tst_Test *Test) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Take_a_test, - Tst_PutIconsTests,(void *) Test, + Tst_PutIconsTests,Test, Hlp_ASSESSMENT_Tests,Box_NOT_CLOSABLE); /***** Get tags *****/ @@ -1435,7 +1435,7 @@ static void Tst_ShowFormRequestEditTests (struct Tst_Test *Test) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_List_edit_questions, - Tst_PutIconsTests,(void *) Test, + Tst_PutIconsTests,Test, Hlp_ASSESSMENT_Tests_editing_questions,Box_NOT_CLOSABLE); /***** Get tags already present in the table of questions *****/ @@ -1521,7 +1521,7 @@ static void Tst_ShowFormRequestSelectTestsForGame (struct Tst_Test *Test) if ((Test->Tags.Num = Tst_GetAllTagsFromCurrentCrs (&mysql_res))) { Frm_StartForm (ActGamLstTstQst); - Gam_PutParams ((void *) &Gbl); + Gam_PutParams (&Gbl); HTM_TABLE_BeginPadding (2); @@ -2160,7 +2160,7 @@ static void Tst_ShowFormConfigTst (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Configure_tests, - Tst_PutIconsTests,(void *) &Test, + Tst_PutIconsTests,&Test, Hlp_ASSESSMENT_Tests,Box_NOT_CLOSABLE); /***** Begin form *****/ @@ -2723,7 +2723,7 @@ static void Tst_ListOneQstToEdit (struct Tst_Test *Test) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Questions, - Tst_PutIconsTests,(void *) Test, + Tst_PutIconsTests,Test, Hlp_ASSESSMENT_Tests,Box_NOT_CLOSABLE); /***** Write the heading *****/ @@ -2780,7 +2780,7 @@ static void Tst_ListOneOrMoreQuestionsForEdition (struct Tst_Test *Test, /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Questions, - Tst_PutIconsTests,(void *) Test, + Tst_PutIconsTests,Test, Hlp_ASSESSMENT_Tests,Box_NOT_CLOSABLE); /***** Write the heading *****/ @@ -2922,7 +2922,7 @@ static void Tst_WriteQuestionRowForEdition (struct Tst_Test *Test, /* Write icon to remove the question */ Frm_StartForm (ActReqRemOneTstQst); - Tst_PutParamQstCod ((void *) &Test->Question.QstCod); + Tst_PutParamQstCod (&Test->Question.QstCod); if (Test->NumQsts == 1) Par_PutHiddenParamChar ("OnlyThisQst",'Y'); // If there are only one row, don't list again after removing Dat_WriteParamsIniEndDates (); @@ -2932,7 +2932,7 @@ static void Tst_WriteQuestionRowForEdition (struct Tst_Test *Test, /* Write icon to edit the question */ Ico_PutContextualIconToEdit (ActEdiOneTstQst,NULL, - Tst_PutParamQstCod,(void *) &Test->Question.QstCod); + Tst_PutParamQstCod,&Test->Question.QstCod); HTM_TD_End (); @@ -2971,7 +2971,7 @@ static void Tst_WriteQuestionRowForEdition (struct Tst_Test *Test, Test->Question.Answer.Type == Tst_ANS_MULTIPLE_CHOICE) { Frm_StartForm (ActChgShfTstQst); - Tst_PutParamQstCod ((void *) &Test->Question.QstCod); + Tst_PutParamQstCod (&Test->Question.QstCod); Dat_WriteParamsIniEndDates (); Tst_WriteParamEditQst (Test); if (Test->NumQsts == 1) @@ -3084,7 +3084,7 @@ static void Tst_ListOneOrMoreQuestionsForSelection (unsigned NumQsts, /***** Begin form *****/ Frm_StartForm (ActAddTstQstToGam); - Gam_PutParams ((void *) &Gbl); + Gam_PutParams (&Gbl); /***** Write the heading *****/ HTM_TABLE_BeginWideMarginPadding (2); @@ -5144,7 +5144,7 @@ void Tst_ShowFormEditOneQst (void) // 2. By clicking "Edit" icon in a listing of existing questions // 3. From the action associated to reception of a question, on error in the parameters received from the form -static void Tst_PutFormEditOneQst (const struct Tst_Question *Question, +static void Tst_PutFormEditOneQst (struct Tst_Question *Question, char Stem[Cns_MAX_BYTES_TEXT + 1], char Feedback[Cns_MAX_BYTES_TEXT + 1]) { @@ -5189,7 +5189,7 @@ static void Tst_PutFormEditOneQst (const struct Tst_Question *Question, if (Question->QstCod > 0) // The question already has assigned a code { Box_BoxBegin (NULL,Str_BuildStringLong (Txt_Question_code_X,Question->QstCod), - Tst_PutIconToRemoveOneQst,(void *) Question->QstCod, + Tst_PutIconToRemoveOneQst,&Question->QstCod, Hlp_ASSESSMENT_Tests_writing_a_question,Box_NOT_CLOSABLE); Str_FreeString (); } @@ -5200,7 +5200,7 @@ static void Tst_PutFormEditOneQst (const struct Tst_Question *Question, /***** Begin form *****/ Frm_StartForm (ActRcvTstQst); - Tst_PutParamQstCod ((void *) &Question->QstCod); + Tst_PutParamQstCod (&Question->QstCod); /***** Begin table *****/ HTM_TABLE_BeginPadding (2); // Table for this question @@ -6648,7 +6648,7 @@ void Tst_RequestRemoveSelectedQsts (void) { /***** Show question and button to remove question *****/ Ale_ShowAlertAndButton (ActRemSevTstQst,NULL,NULL, - Tst_PutParamsRemoveSelectedQsts,(void *) &Test, + Tst_PutParamsRemoveSelectedQsts,&Test, Btn_REMOVE_BUTTON,Txt_Remove_questions, Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_selected_questions); } @@ -6766,14 +6766,18 @@ void Tst_RequestRemoveOneQst (void) Lay_ShowErrorAndExit ("Wrong test parameters."); /***** Show question and button to remove question *****/ - Ale_ShowAlertAndButton (ActRemOneTstQst,NULL,NULL, - EditingOnlyThisQst ? Tst_PutParamsRemoveOnlyThisQst : - Tst_PutParamsRemoveOneQstWhileEditing, - EditingOnlyThisQst ? (void *) &Test.Question.QstCod : - (void *) &Test, - Btn_REMOVE_BUTTON,Txt_Remove_question, - Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_question_X, - Test.Question.QstCod); + if (EditingOnlyThisQst) + Ale_ShowAlertAndButton (ActRemOneTstQst,NULL,NULL, + Tst_PutParamsRemoveOnlyThisQst,&Test.Question.QstCod, + Btn_REMOVE_BUTTON,Txt_Remove_question, + Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_question_X, + Test.Question.QstCod); + else + Ale_ShowAlertAndButton (ActRemOneTstQst,NULL,NULL, + Tst_PutParamsRemoveOneQstWhileEditing,&Test, + Btn_REMOVE_BUTTON,Txt_Remove_question, + Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_question_X, + Test.Question.QstCod); /***** Continue editing questions *****/ if (EditingOnlyThisQst) @@ -6810,7 +6814,7 @@ static void Tst_PutParamsRemoveOneQstWhileEditing (void *TestPtr) { Test = (struct Tst_Test *) TestPtr; - Tst_PutParamQstCod ((void *) &Test->Question.QstCod); + Tst_PutParamQstCod (&Test->Question.QstCod); Dat_WriteParamsIniEndDates (); Tst_WriteParamEditQst (Test); } diff --git a/swad_test_import.c b/swad_test_import.c index 903df98d..0268fed6 100644 --- a/swad_test_import.c +++ b/swad_test_import.c @@ -88,13 +88,13 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem, /**************** Put a link (form) to export test questions *****************/ /*****************************************************************************/ -void TsI_PutFormToExportQuestions (const struct Tst_Test *Test) +void TsI_PutFormToExportQuestions (struct Tst_Test *Test) { extern const char *Txt_Export_questions; /***** Put a link to create a file with questions *****/ Lay_PutContextualLinkIconText (ActLstTstQst,NULL, - TsI_PutParamsExportQsts,(void *) &Test, + TsI_PutParamsExportQsts,Test, "file-import.svg", Txt_Export_questions); } diff --git a/swad_test_import.h b/swad_test_import.h index 81a1e673..27be46bc 100644 --- a/swad_test_import.h +++ b/swad_test_import.h @@ -39,7 +39,7 @@ /***************************** Public prototypes *****************************/ /*****************************************************************************/ -void TsI_PutFormToExportQuestions (const struct Tst_Test *Test); +void TsI_PutFormToExportQuestions (struct Tst_Test *Test); bool TsI_GetCreateXMLParamFromForm (void); void TsI_PutFormToImportQuestions (void); void TsI_CreateXML (unsigned long NumRows,MYSQL_RES *mysql_res); diff --git a/swad_theme.c b/swad_theme.c index 1723ed30..c0a88087 100644 --- a/swad_theme.c +++ b/swad_theme.c @@ -318,7 +318,7 @@ void The_PutIconsToSelectTheme (void) char Icon[PATH_MAX + 1]; Box_BoxBegin (NULL,Txt_Theme_SKIN, - The_PutIconsTheme,(void *) &Gbl, + The_PutIconsTheme,&Gbl, Hlp_PROFILE_Settings_theme,Box_NOT_CLOSABLE); Set_StartSettingsHead (); Set_StartOneSettingSelector (); diff --git a/swad_timeline.c b/swad_timeline.c index 4ae385b6..4ce7d514 100644 --- a/swad_timeline.c +++ b/swad_timeline.c @@ -1087,7 +1087,7 @@ static void TL_ShowTimeline (char *Query, Query); /***** Begin box *****/ Box_BoxBegin (NULL,Title, - TL_PutIconsTimeline,(void *) &Gbl, + TL_PutIconsTimeline,&Gbl, Hlp_START_Timeline,Box_NOT_CLOSABLE); /***** Put form to select users whom public activity is displayed *****/ @@ -1179,7 +1179,7 @@ static void TL_FormStart (Act_Action_t ActionGbl,Act_Action_t ActionUsr) if (Gbl.Usrs.Other.UsrDat.UsrCod > 0) { Frm_StartFormAnchor (ActionUsr,"timeline"); - Usr_PutParamOtherUsrCodEncrypted ((void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); } else { @@ -4066,11 +4066,11 @@ static void TL_RequestRemovalNote (void) Gbl.Timeline.NotCod = SocNot.NotCod; // Note to be removed if (Gbl.Usrs.Other.UsrDat.UsrCod > 0) Ale_ShowAlertAndButton2 (ActRemSocPubUsr,"timeline",NULL, - TL_PutParamsRemoveNote,(void *) &Gbl, + TL_PutParamsRemoveNote,&Gbl, Btn_REMOVE_BUTTON,Txt_Remove); else Ale_ShowAlertAndButton2 (ActRemSocPubGbl,NULL,NULL, - TL_PutParamsRemoveNote,(void *) &Gbl, + TL_PutParamsRemoveNote,&Gbl, Btn_REMOVE_BUTTON,Txt_Remove); } } @@ -4087,7 +4087,7 @@ static void TL_PutParamsRemoveNote (void *Args) if (Args) { if (Gbl.Usrs.Other.UsrDat.UsrCod > 0) - Usr_PutParamOtherUsrCodEncrypted ((void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); else Usr_PutHiddenParamWho (Gbl.Timeline.Who); TL_PutHiddenParamNotCod (Gbl.Timeline.NotCod); @@ -4379,11 +4379,11 @@ static void TL_RequestRemovalComment (void) Gbl.Timeline.PubCod = SocCom.PubCod; // Publication to be removed if (Gbl.Usrs.Other.UsrDat.UsrCod > 0) Ale_ShowAlertAndButton2 (ActRemSocComUsr,"timeline",NULL, - TL_PutParamsRemoveCommment,(void *) &Gbl, + TL_PutParamsRemoveCommment,&Gbl, Btn_REMOVE_BUTTON,Txt_Remove); else Ale_ShowAlertAndButton2 (ActRemSocComGbl,NULL,NULL, - TL_PutParamsRemoveCommment,(void *) &Gbl, + TL_PutParamsRemoveCommment,&Gbl, Btn_REMOVE_BUTTON,Txt_Remove); } } @@ -4403,7 +4403,7 @@ static void TL_PutParamsRemoveCommment (void *Args) if (Args) { if (Gbl.Usrs.Other.UsrDat.UsrCod > 0) - Usr_PutParamOtherUsrCodEncrypted ((void *) Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); else Usr_PutHiddenParamWho (Gbl.Timeline.Who); TL_PutHiddenParamPubCod (Gbl.Timeline.PubCod); diff --git a/swad_timetable.c b/swad_timetable.c index 2be3b35b..24f6ead9 100644 --- a/swad_timetable.c +++ b/swad_timetable.c @@ -324,6 +324,7 @@ void TT_ShowClassTimeTable (void) }; bool PrintView = (Gbl.Action.Act == ActPrnCrsTT || Gbl.Action.Act == ActPrnMyTT);; + Grp_WhichGroups_t WhichGroups; /***** Initializations *****/ switch (Gbl.Action.Act) @@ -351,14 +352,14 @@ void TT_ShowClassTimeTable (void) Gbl.TimeTable.ContextualIcons.PutIconPrint = !PrintView; /***** Get whether to show only my groups or all groups *****/ - Grp_GetParamWhichGrps (); + Grp_GetParamWhichGroups (); /***** Begin box *****/ if (Gbl.TimeTable.ContextualIcons.PutIconEditCrsTT || Gbl.TimeTable.ContextualIcons.PutIconEditOfficeHours || Gbl.TimeTable.ContextualIcons.PutIconPrint) Box_BoxBegin ("100%",Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type], - TT_PutContextualIcons,(void *) &Gbl, + TT_PutContextualIcons,&Gbl, Help[Gbl.TimeTable.Type],Box_NOT_CLOSABLE); else Box_BoxBegin ("100%",Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type], @@ -385,8 +386,9 @@ void TT_ShowClassTimeTable (void) TT_PutFormToSelectWhichGroupsToShow (); /* Show form to change first day of week */ + WhichGroups = Grp_GetParamWhichGroups (); Cal_ShowFormToSelFirstDayOfWeek (ActChgTT1stDay[Gbl.TimeTable.Type], - Grp_PutParamWhichGrps,(void *) Grp_GetParamWhichGrps ()); + Grp_PutParamWhichGroups,&WhichGroups); Set_EndSettingsHead (); } @@ -404,11 +406,14 @@ void TT_ShowClassTimeTable (void) static void TT_PutContextualIcons (void *Args) { + Grp_WhichGroups_t WhichGroups; + if (Args) { + WhichGroups = Grp_GetParamWhichGroups (); if (Gbl.TimeTable.ContextualIcons.PutIconEditCrsTT) Ico_PutContextualIconToEdit (ActEdiCrsTT,NULL, - Grp_PutParamWhichGrps,(void *) Grp_GetParamWhichGrps ()); + Grp_PutParamWhichGroups,&WhichGroups); if (Gbl.TimeTable.ContextualIcons.PutIconEditOfficeHours) Ico_PutContextualIconToEdit (ActEdiTut,NULL, @@ -417,7 +422,7 @@ static void TT_PutContextualIcons (void *Args) if (Gbl.TimeTable.ContextualIcons.PutIconPrint) Ico_PutContextualIconToPrint (Gbl.TimeTable.Type == TT_COURSE_TIMETABLE ? ActPrnCrsTT : ActPrnMyTT, - Grp_PutParamWhichGrps,(void *) Grp_GetParamWhichGrps ()); + Grp_PutParamWhichGroups,&WhichGroups); } } @@ -450,7 +455,7 @@ void TT_EditCrsTimeTable (void) /***** Editable time table *****/ Gbl.TimeTable.Type = TT_COURSE_TIMETABLE; Box_BoxBegin ("100%",Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type], - TT_PutIconToViewCrsTT,(void *) &Gbl, + TT_PutIconToViewCrsTT,&Gbl, Hlp_COURSE_Timetable,Box_NOT_CLOSABLE); TT_ShowTimeTable (Gbl.Usrs.Me.UsrDat.UsrCod); Box_BoxEnd (); @@ -468,7 +473,7 @@ void TT_EditMyTutTimeTable (void) /***** Time table *****/ Gbl.TimeTable.Type = TT_TUTORING_TIMETABLE; Box_BoxBegin ("100%",Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type], - TT_PutIconToViewMyTT,(void *) &Gbl, + TT_PutIconToViewMyTT,&Gbl, Hlp_PROFILE_Timetable,Box_NOT_CLOSABLE); TT_ShowTimeTable (Gbl.Usrs.Me.UsrDat.UsrCod); Box_BoxEnd (); diff --git a/swad_user.c b/swad_user.c index d1c689f6..7fb78671 100644 --- a/swad_user.c +++ b/swad_user.c @@ -3527,7 +3527,7 @@ void Usr_ShowFormsLogoutAndRole (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Session, - Usr_PutLinkToLogOut,(void *) &Gbl, + Usr_PutLinkToLogOut,&Gbl, Hlp_PROFILE_Session_role,Box_NOT_CLOSABLE); /***** Put a form to change my role *****/ @@ -6388,7 +6388,7 @@ void Usr_PutFormToSelectUsrsToGoToAct (struct SelectedUsrs *SelectedUsrs, if (NextAction == ActAdmAsgWrkCrs) { Gbl.FileBrowser.FullTree = true; // By default, show all files - Brw_PutHiddenParamFullTreeIfSelected ((void *) &Gbl); + Brw_PutHiddenParamFullTreeIfSelected (&Gbl); } if (FuncParams) FuncParams (Args); @@ -7568,7 +7568,7 @@ void Usr_ListDataAdms (void) HTM_DIV_Begin ("class=\"PREF_CONT\""); HTM_DIV_Begin ("class=\"PREF_OFF\""); Frm_StartForm (ActLstOth); - Sco_PutParamCurrentScope ((void *) &Gbl); + Sco_PutParamCurrentScope (&Gbl); Usr_PutCheckboxListWithPhotos (); Frm_EndForm (); HTM_DIV_End (); @@ -8016,7 +8016,7 @@ void Usr_SeeGuests (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_ROLES_PLURAL_Abc[Rol_GST][Usr_SEX_UNKNOWN], - Usr_PutIconsListGsts,(void *) &Gbl, + Usr_PutIconsListGsts,&Gbl, Hlp_USERS_Guests,Box_NOT_CLOSABLE); /***** Form to select scope *****/ @@ -8039,11 +8039,11 @@ void Usr_SeeGuests (void) if (Gbl.Usrs.LstUsrs[Rol_GST].NumUsrs) { if (Usr_GetIfShowBigList (Gbl.Usrs.LstUsrs[Rol_GST].NumUsrs, - Sco_PutParamCurrentScope,(void *) &Gbl, + Sco_PutParamCurrentScope,&Gbl, NULL)) { /***** Form to select type of list of users *****/ - Usr_ShowFormsToSelectUsrListType (Sco_PutParamCurrentScope,(void *) &Gbl); + Usr_ShowFormsToSelectUsrListType (Sco_PutParamCurrentScope,&Gbl); /***** Draw a class photo with guests *****/ if (Gbl.Usrs.Me.ListType == Usr_LIST_AS_CLASS_PHOTO) @@ -8159,7 +8159,7 @@ void Usr_SeeStudents (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN], - Usr_PutIconsListStds,(void *) &Gbl, + Usr_PutIconsListStds,&Gbl, Hlp_USERS_Students,Box_NOT_CLOSABLE); /***** Form to select scope *****/ @@ -8185,7 +8185,7 @@ void Usr_SeeStudents (void) /***** Form to select groups *****/ if (Gbl.Scope.Current == Hie_CRS) - Grp_ShowFormToSelectSeveralGroups (Sco_PutParamCurrentScope,(void *) &Gbl, + Grp_ShowFormToSelectSeveralGroups (Sco_PutParamCurrentScope,&Gbl, Grp_MY_GROUPS); /***** Start section with user list *****/ @@ -8194,11 +8194,11 @@ void Usr_SeeStudents (void) if (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs) { if (Usr_GetIfShowBigList (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs, - Sco_PutParamCurrentScope,(void *) &Gbl, + Sco_PutParamCurrentScope,&Gbl, NULL)) { /***** Form to select type of list of users *****/ - Usr_ShowFormsToSelectUsrListType (Sco_PutParamCurrentScope,(void *) &Gbl); + Usr_ShowFormsToSelectUsrListType (Sco_PutParamCurrentScope,&Gbl); /***** Draw a class photo with students of the course *****/ if (Gbl.Usrs.Me.ListType == Usr_LIST_AS_CLASS_PHOTO) @@ -8346,7 +8346,7 @@ void Usr_SeeTeachers (void) /***** Begin box *****/ Box_BoxBegin (NULL,Txt_ROLES_PLURAL_Abc[Rol_TCH][Usr_SEX_UNKNOWN], - Usr_PutIconsListTchs,(void *) &Gbl, + Usr_PutIconsListTchs,&Gbl, Hlp_USERS_Teachers,Box_NOT_CLOSABLE); /***** Form to select scope *****/ @@ -8362,7 +8362,7 @@ void Usr_SeeTeachers (void) /***** Form to select groups *****/ if (Gbl.Scope.Current == Hie_CRS) - Grp_ShowFormToSelectSeveralGroups (Sco_PutParamCurrentScope,(void *) &Gbl, + Grp_ShowFormToSelectSeveralGroups (Sco_PutParamCurrentScope,&Gbl, Grp_MY_GROUPS); /***** Start section with user list *****/ @@ -8371,11 +8371,11 @@ void Usr_SeeTeachers (void) if (NumUsrs) { if (Usr_GetIfShowBigList (NumUsrs, - Sco_PutParamCurrentScope,(void *) &Gbl, + Sco_PutParamCurrentScope,&Gbl, NULL)) { /***** Form to select type of list of users *****/ - Usr_ShowFormsToSelectUsrListType (Sco_PutParamCurrentScope,(void *) &Gbl); + Usr_ShowFormsToSelectUsrListType (Sco_PutParamCurrentScope,&Gbl); /***** Draw a class photo with teachers of the course *****/ if (Gbl.Usrs.Me.ListType == Usr_LIST_AS_CLASS_PHOTO) @@ -8853,19 +8853,19 @@ static void Usr_PutIconsListTchs (void *Args) static void Usr_PutIconToPrintGsts (void) { Ico_PutContextualIconToPrint (ActPrnGstPho, - Usr_ShowGstsAllDataParams,(void *) &Gbl); + Usr_ShowGstsAllDataParams,&Gbl); } static void Usr_PutIconToPrintStds (void) { Ico_PutContextualIconToPrint (ActPrnStdPho, - Usr_ShowStdsAllDataParams,(void *) &Gbl); + Usr_ShowStdsAllDataParams,&Gbl); } static void Usr_PutIconToPrintTchs (void) { Ico_PutContextualIconToPrint (ActPrnTchPho, - Usr_ShowTchsAllDataParams,(void *) &Gbl); + Usr_ShowTchsAllDataParams,&Gbl); } /*****************************************************************************/ @@ -8877,7 +8877,7 @@ static void Usr_PutIconToShowGstsAllData (void) extern const char *Txt_Show_all_data_in_a_table; Lay_PutContextualLinkOnlyIcon (ActLstGstAll,NULL, - Usr_ShowGstsAllDataParams,(void *) &Gbl, + Usr_ShowGstsAllDataParams,&Gbl, "table.svg", Txt_Show_all_data_in_a_table); } @@ -8887,7 +8887,7 @@ static void Usr_PutIconToShowStdsAllData (void) extern const char *Txt_Show_all_data_in_a_table; Lay_PutContextualLinkOnlyIcon (ActLstStdAll,NULL, - Usr_ShowStdsAllDataParams,(void *) &Gbl, + Usr_ShowStdsAllDataParams,&Gbl, "table.svg", Txt_Show_all_data_in_a_table); } @@ -8897,7 +8897,7 @@ static void Usr_PutIconToShowTchsAllData (void) extern const char *Txt_Show_all_data_in_a_table; Lay_PutContextualLinkOnlyIcon (ActLstTchAll,NULL, - Usr_ShowTchsAllDataParams,(void *) &Gbl, + Usr_ShowTchsAllDataParams,&Gbl, "table.svg", Txt_Show_all_data_in_a_table); } @@ -8921,7 +8921,7 @@ static void Usr_ShowTchsAllDataParams (void *Args) { if (Args) { - Sco_PutParamCurrentScope ((void *) &Gbl); + Sco_PutParamCurrentScope (&Gbl); Usr_PutParamListWithPhotos (); } } diff --git a/swad_zip.c b/swad_zip.c index ef255d9e..6bf24e93 100644 --- a/swad_zip.c +++ b/swad_zip.c @@ -93,7 +93,7 @@ void ZIP_PutLinkToCreateZIPAsgWrk (void) extern const char *Txt_Create_ZIP_file; Lay_PutContextualLinkIconText (ActAdmAsgWrkCrs,NULL, - ZIP_PutLinkToCreateZIPAsgWrkParams,(void *) &Gbl, + ZIP_PutLinkToCreateZIPAsgWrkParams,&Gbl, "download.svg", Txt_Create_ZIP_file); } @@ -103,7 +103,7 @@ static void ZIP_PutLinkToCreateZIPAsgWrkParams (void *Args) if (Args) { Usr_PutHiddenParSelectedUsrsCods (&Gbl.Usrs.Selected); - Brw_PutHiddenParamFullTreeIfSelected ((void *) &Gbl); + Brw_PutHiddenParamFullTreeIfSelected (&Gbl); Par_PutHiddenParamChar ("CreateZIP",'Y'); } }