From 83dbe7df6e9c6a4ea50c46234098152e1019c690 Mon Sep 17 00:00:00 2001 From: alex Date: Sat, 13 Mar 2004 09:03:18 +0000 Subject: [PATCH] Modifche dalla vesrione Linux sulla 2.1 git-svn-id: svn://10.65.10.50/trunk@11856 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ab/ab0100.cpp | 2 +- ab/ab0400.cpp | 2 +- ab/ab1.h | 2 +- ab/ab1100.cpp | 8 ++++---- ab/ab1200.cpp | 2 +- ab/ab2.h | 2 +- ab/ab2100.cpp | 4 ++-- ab/ab2100.h | 2 +- ab/ab2100a.h | 2 +- ab/ab2101.cpp | 7 ++----- ab/ab2102.cpp | 2 +- ab/ab3.h | 2 +- ab/ab3100.cpp | 6 +++--- ab/ablib01.cpp | 2 +- ab/batbarb.h | 8 ++++---- ab/caradd.h | 2 +- ab/colldich.h | 2 +- 17 files changed, 27 insertions(+), 30 deletions(-) diff --git a/ab/ab0100.cpp b/ab/ab0100.cpp index 4d3d6ca47..ea368ec3a 100755 --- a/ab/ab0100.cpp +++ b/ab/ab0100.cpp @@ -119,7 +119,7 @@ bool Tabanabil_application::user_create() return TRUE; } -ab0100(int argc, char* argv[]) +int ab0100(int argc, char* argv[]) { Tabanabil_application a; diff --git a/ab/ab0400.cpp b/ab/ab0400.cpp index 49e12d726..ad060b106 100755 --- a/ab/ab0400.cpp +++ b/ab/ab0400.cpp @@ -467,7 +467,7 @@ void TRicl_saldi::calculate() int gruppo; int conto; long sottoconto; - int indbil; + int indbil = 0; TSaldo sal; TRiga_calcolo r; TEsercizi_contabili es; diff --git a/ab/ab1.h b/ab/ab1.h index 87c6ef6ab..75372413c 100755 --- a/ab/ab1.h +++ b/ab/ab1.h @@ -4,4 +4,4 @@ int ab1100(int argc, char **argv); int ab1200(int argc, char **argv); -#endif //__AB1_H \ No newline at end of file +#endif //__AB1_H diff --git a/ab/ab1100.cpp b/ab/ab1100.cpp index dc4b9f33c..3df166d6a 100755 --- a/ab/ab1100.cpp +++ b/ab/ab1100.cpp @@ -11,7 +11,7 @@ #include -#include "AB1.h" +#include "ab1.h" #include "ab1100.h" #define FOOTER_LEN 4 // se non ridefinito nel .rpt @@ -220,9 +220,9 @@ void AB1100_application::set_rows() { TToken_string line; TFieldref campo; - int from, to, riga_record; + int from = 0, to = 0, riga_record; TString formato_campo, picture; - const char * name; + const char * name = NULL; TScanner rpt(_rptname); rpt.paragraph("Rows"); @@ -242,7 +242,7 @@ void AB1100_application::set_rows() from = campo.from(); to = campo.to(); name = campo.name(); - if (campo.file != 0) + if (campo.file() != 0) logicnum = campo.file(); } diff --git a/ab/ab1200.cpp b/ab/ab1200.cpp index fda2abcbd..8738768ca 100755 --- a/ab/ab1200.cpp +++ b/ab/ab1200.cpp @@ -4,7 +4,7 @@ #include #include //Definisce BAR_ITEM(1) -#include "AB1.h" +#include "ab1.h" #include "ab1200.h" diff --git a/ab/ab2.h b/ab/ab2.h index 5f4d2c9b3..834fcd65e 100755 --- a/ab/ab2.h +++ b/ab/ab2.h @@ -9,4 +9,4 @@ int ab2102(int argc, char **argv); //int ab2200(int argc, char **argv); -#endif //__AB2_H \ No newline at end of file +#endif //__AB2_H diff --git a/ab/ab2100.cpp b/ab/ab2100.cpp index 32363af2f..204c072a8 100755 --- a/ab/ab2100.cpp +++ b/ab/ab2100.cpp @@ -83,7 +83,7 @@ bool TAdditional_car::same_as(real other_id) ca.put(ABCA_ID,other_id); ca.read(); - real id=get(ABCA_ID); + real id = get_real(ABCA_ID); put(ABCA_ID,ca.get(ABCA_ID)); r= (*this == ca.curr()); put(ABCA_ID,id); @@ -209,4 +209,4 @@ int TAdditional_cols::write() curr().put(ABCD_ID,0); //Il record non č stato scritto ma devo inserire nella chiave del rocord //l'indice (=0) poichč questo andrą inserito in RELANA return err; -} \ No newline at end of file +} diff --git a/ab/ab2100.h b/ab/ab2100.h index 8bd1c461c..501f2e779 100755 --- a/ab/ab2100.h +++ b/ab/ab2100.h @@ -119,10 +119,10 @@ public: class TFile_text_AS400: public TFile_text { - TString16 _tipo_bilancio; TAssoc_array _last_id; // static long _idcaradd; long _idncomp; + TString16 _tipo_bilancio; //long _idcoldich; TString _codvc_prec; diff --git a/ab/ab2100a.h b/ab/ab2100a.h index 5f4b60b3b..af03aa6c0 100755 --- a/ab/ab2100a.h +++ b/ab/ab2100a.h @@ -19,4 +19,4 @@ #define F_TESTO_TIPOBIL 214 #define F_TIPO_BILANCIO 215 -#endif //__AB2100A_H \ No newline at end of file +#endif //__AB2100A_H diff --git a/ab/ab2101.cpp b/ab/ab2101.cpp index 5613ddea2..3c318c4df 100755 --- a/ab/ab2101.cpp +++ b/ab/ab2101.cpp @@ -1007,7 +1007,7 @@ void TRicezione_AS400::build_relana(TString& config_file, const TMask &msk, cons { THash_object *obj; obj=tabtree.get_hashobj(); //Ritorna il primo elemento dell'assoc_array completo di chiave - TToken_string key = obj->key(); //Estraggo la chiave dell'oggetto estratto dall'assoc_array + TToken_string key(obj->key()); //Estraggo la chiave dell'oggetto estratto dall'assoc_array rel.lfile().write((TRectype&)obj->obj()); //Aggiorno il file isam tabtree.remove(key); //Tolgo il record dall'assoc_array } @@ -1189,12 +1189,9 @@ TRicezione_userdef ::TRicezione_userdef(const TString & config, const TFilename _trasfile->open('r'); //apro il TFile_text in lettura } - - - int ab2101(int argc, char **argv) { TRicezione a; a.run(argc,argv,TR("Ricezione da file di testo")); return 0; -} \ No newline at end of file +} diff --git a/ab/ab2102.cpp b/ab/ab2102.cpp index abd6ad99a..028cd3de2 100755 --- a/ab/ab2102.cpp +++ b/ab/ab2102.cpp @@ -281,7 +281,7 @@ void TObject_send::converti(int main_file, const char * tabname) TCursor *cur=NULL; cur = new TCursor(tr_relation); - int logic_num= tr_relation->lfile().num(); +// int logic_num= tr_relation->lfile().num(); //Leggo il numero di records da convertire long items =cur->items(); //Barra scorrevole di attesa diff --git a/ab/ab3.h b/ab/ab3.h index f58dd9ace..ec245e1ea 100755 --- a/ab/ab3.h +++ b/ab/ab3.h @@ -3,4 +3,4 @@ void ab3100(int argc, char **argv); -#endif //__AB3_H \ No newline at end of file +#endif //__AB3_H diff --git a/ab/ab3100.cpp b/ab/ab3100.cpp index f1f7d7c7b..f5577be2f 100755 --- a/ab/ab3100.cpp +++ b/ab/ab3100.cpp @@ -117,7 +117,7 @@ bool naviga_tree(TMask_field& f, KEY k) if ( ab->current().get_bool(ABRA_USACARADD) ) { // Se il nodo esisteva gią, ci sarą anche la caradd; // se il nodo č nuovo, la caradd la devo aggiungere - TNumeric_id id_caradd = ab->current().get(ABRA_IDCARADD); // Caratteristica addizionale ridefinita + TNumeric_id id_caradd(ab->current().get(ABRA_IDCARADD)); // Caratteristica addizionale ridefinita if (id_caradd != ID_NULLO) { // Esiste gią una caradd specifica definita codice.add(id_caradd.string()); @@ -241,7 +241,7 @@ bool aggiorna_id_colldich(TMask_field& f, KEY k) if (sheet_msk.get_bool(F_USA_COLL)) { ab_tree.user_tree()->goto_node(sheet_msk.get(F_ID)); - TNumeric_id id_coll = ab_tree.user_tree()->current().get(ABRA_IDCOLDICH); // id del collegamento a dich. + TNumeric_id id_coll(ab_tree.user_tree()->current().get(ABRA_IDCOLDICH)); // id del collegamento a dich. if (id_coll != ID_NULLO) { //Rintraccio il collegamento @@ -276,7 +276,7 @@ bool aggiorna_id_caradd(TMask_field& f, KEY k) { //CARADD NON DI DEFAULT ab_tree.user_tree()->goto_node(sheet_msk.get(F_ID)); - TNumeric_id id_caradd = ab_tree.user_tree()->current().get(ABRA_IDCARADD); // Caratteristica addizionale ridefinita + TNumeric_id id_caradd(ab_tree.user_tree()->current().get(ABRA_IDCARADD)); // Caratteristica addizionale ridefinita if (id_caradd != ID_NULLO) { // Esiste gią una caradd specifica definita sheet_msk.set(F_IDCARADD,id_caradd); diff --git a/ab/ablib01.cpp b/ab/ablib01.cpp index a9030cd66..bdb505bb5 100755 --- a/ab/ablib01.cpp +++ b/ab/ablib01.cpp @@ -146,7 +146,7 @@ void TABsaldo::put_headkey(TRectype &rec) const int TABsaldo::read_body(bool lockstruct) { TString codditta = get(ABS_CODDITTA); - TToken_string key = codditta.right_just(5,'0'); + TToken_string key(codditta.right_just(5,'0')); key.add(get(ABS_ANNO)); key.add(get(ABS_CODPDB)); key.add(get(ABS_TIPOBIL)); diff --git a/ab/batbarb.h b/ab/batbarb.h index 24b8aa882..dd455e1b1 100755 --- a/ab/batbarb.h +++ b/ab/batbarb.h @@ -4,7 +4,7 @@ #define F_CODTAB_DITTA 101 #define F_CODTAB_ESE 102 #define F_CODTAB_PER 103 -#define F_CODTAB_TIPO 104 -#define F_SCEGLI 105 -#define F_DI 106 -#define F_DF 107 \ No newline at end of file +#define F_CODTAB_TIPO 104 +#define F_SCEGLI 105 +#define F_DI 106 +#define F_DF 107 diff --git a/ab/caradd.h b/ab/caradd.h index a74e43f34..ff8deb5ca 100755 --- a/ab/caradd.h +++ b/ab/caradd.h @@ -23,4 +23,4 @@ -#endif //_CARADD_H \ No newline at end of file +#endif //_CARADD_H diff --git a/ab/colldich.h b/ab/colldich.h index d3dbbd7d9..07be192c5 100755 --- a/ab/colldich.h +++ b/ab/colldich.h @@ -4,4 +4,4 @@ #define ABCD_ID "ID" -#endif //_COLLDICH_H \ No newline at end of file +#endif //_COLLDICH_H