diff --git a/sc/sc0100.h b/sc/sc0100.h index b483a05eb..2fb10c4c9 100755 --- a/sc/sc0100.h +++ b/sc/sc0100.h @@ -5,12 +5,13 @@ #include #endif -#ifndef __SALDACON_H -#include "../cg/saldacon.h" +#ifndef __CGSALDAC_H +#include "../cg/cgsaldac.h" #endif #ifndef __MASK_H class TMask; +class TMask_field; #endif class TSaldaconto_app : public TApplication diff --git a/sc/sc0101.cpp b/sc/sc0101.cpp index 024df4db1..8ec1ce037 100755 --- a/sc/sc0101.cpp +++ b/sc/sc0101.cpp @@ -3,8 +3,7 @@ #include #include "../cg/cglib01.h" -#include "../cg/pagament.h" -#include "../cg/saldacon.h" +#include "../cg/cgpagame.h" #include "../cg/cg21sld.h" #include "sc0100.h" diff --git a/sc/sc1100.cpp b/sc/sc1100.cpp index 7a6975c2b..f07fa6a44 100755 --- a/sc/sc1100.cpp +++ b/sc/sc1100.cpp @@ -2,20 +2,15 @@ #include #include -#include #include #include -#include +#include #include #include -#include "../cg/saldacon.h" +#include "../cg/cgsaldac.h" #include "sc1100.h" -#include -#include -#include - class TDeletepart_app : public TApplication { TArchive _arc; diff --git a/sc/sc1200.cpp b/sc/sc1200.cpp index beb4a8784..d03f27a20 100755 --- a/sc/sc1200.cpp +++ b/sc/sc1200.cpp @@ -6,17 +6,15 @@ #include #include -#include -#include -#include -#include -#include - #include "../cg/cglib02.h" -#include "../cg/saldacon.h" +#include "../cg/cgsaldac.h" #include "sc1200.h" +#include +#include + + class TCreatepart_app : public TApplication { TEsercizi_contabili _esc; diff --git a/sc/sc1300.cpp b/sc/sc1300.cpp index b42ee728e..1086825cd 100755 --- a/sc/sc1300.cpp +++ b/sc/sc1300.cpp @@ -1,4 +1,3 @@ -#include #include #include "sc1.h" @@ -65,7 +64,6 @@ bool SollecitiStorici_app::zap_handler(TMask_field& f, KEY k) return TRUE; } - void SollecitiStorici_app::zap_cliente(const char* cod) { TLocalisamfile& sr = _rel->lfile(); @@ -78,7 +76,6 @@ void SollecitiStorici_app::zap_cliente(const char* cod) sr.remove(); } - int SollecitiStorici_app::write(const TMask& m) { TLocalisamfile& sr = _rel->lfile(); diff --git a/sc/sc2100.cpp b/sc/sc2100.cpp index 224380880..5b16f9f79 100755 --- a/sc/sc2100.cpp +++ b/sc/sc2100.cpp @@ -5,7 +5,7 @@ #include #include -#include "../cg/saldacon.h" +#include "../cg/cgsaldac.h" #include "sc2.h" #include "sc2101.h" #include "sc2102.h" @@ -16,8 +16,6 @@ #include #include #include -#include -#include /////////////////////////////////////////////////////////// // TEC_form diff --git a/sc/sc2102.h b/sc/sc2102.h index 1bea758f7..55e8c62bf 100755 --- a/sc/sc2102.h +++ b/sc/sc2102.h @@ -1,15 +1,13 @@ - #ifndef __SC2102_H #define __SC2102_H -#include - -#include -#include -#include -#include -#include +#ifndef __ASSOC_H +#include +#endif +#ifndef __ISAM_H +#include +#endif /////////////////////////////////////////////////////////// // Totalizzatore diff --git a/sc/sc2200.cpp b/sc/sc2200.cpp index 0b373f9d4..be850ec6c 100755 --- a/sc/sc2200.cpp +++ b/sc/sc2200.cpp @@ -1,53 +1,18 @@ -#ifndef __PRINTAPP_H -#include -#endif - -#ifndef __CONFIG_H -#include -#endif - -#ifndef __ASSOC_H #include -#endif - -#ifndef __UTILITY_H -#include -#endif - -#ifndef __SALDACON_H -#include "../cg/saldacon.h" -#endif - -#ifndef __DITTE_H -#include -#endif - -#ifndef __CLIFO_H -#include -#endif - -#ifndef __PCONTI_H -#include -#endif - -#ifndef __PARTITE_H -#include -#endif - -#ifndef __SCADENZE_H -#include -#endif - -#ifndef _FLD_CAUS_H -#include -#endif - -#include +#include +#include +//#include +#include "../cg/cgsaldac.h" #include "sc2.h" #include "sc2200.h" #include "sc2201.h" +#include +#include +#include +#include + #define SCADCLIFO_ALIAS 51 #define CLIFOSCAD_ALIAS 52 #define SCADPCON_ALIAS 53 @@ -458,7 +423,7 @@ bool TStampaScadenzario::preprocess_page(int file, int counter) _datareg = row.get_date(PART_DATAREG).string(brief); _datadoc = row.get_date(PART_DATADOC).string(brief); _numdoc = row.get(PART_NUMDOC); - _protiva = format("%5ld",row.get_long(PART_PROTIVA)); + _protiva.format("%5ld",row.get_long(PART_PROTIVA)); *_descrizione = row.get(PART_DESCR); _codval = row.get(PART_CODVAL); //Per indicare che non e' indicata la valuta o e' LIRA (se la stampa in valuta is disabled) @@ -574,7 +539,7 @@ bool TStampaScadenzario::preprocess_page(int file, int counter) // Tiene aggiornati tutti i totali mese/periodo (Totali dei prospetti check_add_key_to_tp(tipo_pag, ult_cla); _cur_data = datascad; - _cur_codcf_s = format("%6ld",codcf); + _cur_codcf_s.format("%6ld",codcf); } // Qui stampa il totale generale e lo specchietto colonnello. // Vale con l'ordinamento principale per data di scadenza. @@ -620,9 +585,9 @@ bool TStampaScadenzario::preprocess_page(int file, int counter) } if (changed) { - _cur_gr_s = format("%3d",gruppo); - _cur_co_s = format("%3d",conto); - _cur_codcf_s = format("%6ld",codcf); + _cur_gr_s.format("%3d",gruppo); + _cur_co_s.format("%3d",conto); + _cur_codcf_s.format("%6ld",codcf); } _cur_gr=gruppo; _cur_co=conto; diff --git a/sc/sc2300.cpp b/sc/sc2300.cpp index d8a17e135..c5760c206 100755 --- a/sc/sc2300.cpp +++ b/sc/sc2300.cpp @@ -1,18 +1,15 @@ #include #include -#include "../cg/saldacon.h" - -#include -#include -#include -#include -#include - +#include "../cg/cgsaldac.h" #include "sc2.h" #include "sc2201.h" #include "sc2300.h" +#include +#include +#include + /////////////////////////////////////////////////////////// // Stampa scaduto /////////////////////////////////////////////////////////// diff --git a/sc/sc2401.cpp b/sc/sc2401.cpp index ed5fbbd44..a4875ff2a 100755 --- a/sc/sc2401.cpp +++ b/sc/sc2401.cpp @@ -1,14 +1,13 @@ -#include "../cg/saldacon.h" -#include -#include -#include -#include #include +#include +#include "../cg/cgsaldac.h" #include "sc21pec.h" #include "sc2401.h" #include +#include + bool TESSL_mask::codprof_handler(TMask_field& f, KEY k) { diff --git a/sc/sc2401.h b/sc/sc2401.h index dadf14e13..bf7ebcca0 100755 --- a/sc/sc2401.h +++ b/sc/sc2401.h @@ -2,25 +2,39 @@ #ifndef __SC2401_H #define __SC2401_H -#include +#ifndef __FORM_H #include +#endif -#include "../cg/saldacon.h" +#ifndef __CGSALDAC_H +#include "../cg/cgsaldac.h" +#endif + +#ifndef __SC2102_H #include "sc2102.h" -#include "sc2400a.h" -#include "sc21pec.h" +#endif -#include -#include -#include -#include +#ifndef __SC2400A_H +#include "sc2400a.h" +#endif + +#ifndef __SC21PEC_H +#include "sc21pec.h" +#endif #ifndef __SCSELECT_H #include "scselect.h" #endif -class TESSL_mask: public TSelection_mask +#ifndef __CLIFO_H +#include +#endif +#ifndef __CAUSALI_H +#include +#endif + +class TESSL_mask: public TSelection_mask { TRelation _ditta; TString _tmp; diff --git a/sc/sc2402.cpp b/sc/sc2402.cpp index 0ac10ba8c..d62c22d30 100755 --- a/sc/sc2402.cpp +++ b/sc/sc2402.cpp @@ -1,30 +1,24 @@ -#include "../cg/saldacon.h" -#include -#include -#include - #include "sc21pec.h" #include "sc2102.h" #include "sc2402.h" +#include "../cg/cgsaldac.h" + #include TSol_mask::TSol_mask(const char *name) :TESSL_mask(name) - { } TSol_mask::~TSol_mask() {} bool TSol_mask::get_sel_tot_saldo() const - { return get(F_RIFIMPMIN) == "C"; } real TSol_mask::get_sel_importo() const - { return real(get(F_IMPORMIN)); } @@ -35,13 +29,11 @@ real TSol_mask::get_sel_importo() const TSol_row::TSol_row(const TRiga_partite& row, const TDate& data, const TImporto& imp, int rata) :TESSL_row(row, data, imp, rata) - { } TSol_row::TSol_row(const char* desc, const TImporto& imp, const TValuta& val) :TESSL_row(desc, imp, val) - {} /////////////////////////////////////////////////////////// @@ -50,7 +42,6 @@ TSol_row::TSol_row(const char* desc, const TImporto& imp, const TValuta& val) TSol_form::TSol_form(const TSol_mask& m, bool gesval, short id_datalim, short id_datascad) :TESSL_form(m, gesval, id_datalim, id_datascad) - { _sel_tot_saldo = m.get_sel_tot_saldo(); _sel_importo = m.get_sel_importo(); @@ -62,7 +53,6 @@ TSol_form::TSol_form(const TSol_mask& m, bool gesval, short id_datalim, short id TSol_array::TSol_array(const TPartita& game, const TSol_form* f) :TESSL_array(game, f) - { } diff --git a/sc/sc2402.h b/sc/sc2402.h index 416da814c..34515f560 100755 --- a/sc/sc2402.h +++ b/sc/sc2402.h @@ -1,28 +1,12 @@ - #ifndef __SC2402_H #define __SC2402_H -#include -#include - -#include "../cg/saldacon.h" -#include "sc2102.h" -#include "sc2400a.h" -#include "sc21pec.h" - +#ifndef __SC2401_H #include "sc2401.h" - -#include -#include -#include -#include +#endif class TSol_mask: public TESSL_mask - { - -protected: - public: bool get_sel_tot_saldo() const ; real get_sel_importo() const ;