Modifica della versione Linux sulla 2.1

git-svn-id: svn://10.65.10.50/trunk@11853 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2004-03-13 00:29:26 +00:00
parent d375ae34df
commit 9c020e81ad
14 changed files with 36 additions and 32 deletions

View File

@ -252,7 +252,9 @@ void TArchive_app::save_zip_files(const TFilename& floppy_path, const TString& d
// Assegna un disco di destinazione a tutti i files
int disk = 1;
unsigned long written = 0;
for (int i = 0; i < _zip_list.items(); i++)
int i;
for (i = 0; i < _zip_list.items(); i++)
{
TAFile_info& fi = (TAFile_info&)_zip_list[i];
if (written > 0 && (written+fi._size) >= max_chunk)

View File

@ -137,7 +137,9 @@ int TAutoform_mask::list_dirs(const char* filelist, TString_array& result) const
result.destroy();
TFilename dir(filelist);
for (int i = dir.len()-1; i >= 0; i--)
int i;
for (i = dir.len()-1; i >= 0; i--)
if (dir[i] == '/' || dir[i] == '\\' || dir[i] == ':') break;
TFilename mask(dir.mid(i+1));

View File

@ -347,7 +347,7 @@ void TDictionary_mask::read_txt_file(const char* fname, int filetype)
good = line.starts_with("Item_");
if (good)
{
TToken_string str = line;
TToken_string str(line);
line.cut(0);
line << "PR \"" << str.get(1) << '"';
}
@ -468,7 +468,7 @@ bool TDictionary_mask::read_bin_file(const char* fname)
}
else
{
const index = counter-4;
const int index = counter-4;
if (index == 0)
{
ita.cut(0);

View File

@ -376,7 +376,7 @@ HIDDEN bool impdel_handler(TMask_field& f, KEY k)
const long ditta = m.get_long(F_DITTA);
TIva_round ir; ir.set_default_iva_mode(anno, tipo_del == 2, ditta);
real r = f.get();
real r(f.get());
ir.round(r);
f.set(r.string());
}
@ -490,7 +490,7 @@ bool TGeneric_table_app::valute_decimals_handler(TMask_field& f, KEY k)
if (k == K_ENTER)
{
TMask& m = f.mask();
real cambio = m.get(VAL_CHANGE);
real cambio(m.get(VAL_CHANGE));
if (cambio > ZERO && m.get_bool(VAL_INEURO))
{
// Se il cambio e' espresso in EURO metto in R10 il valore in lire
@ -520,7 +520,7 @@ bool TGeneric_table_app::change_decimals_handler(TMask_field& f, KEY k)
if (k == K_ENTER)
{
TMask& m = f.mask();
real cambio = f.get();
real cambio(f.get());
if (cambio > ZERO && m.get_bool(FLD_TABCAM_B1))
{
// Se il cambio e' espresso in EURO metto in R10 il valore in lire

View File

@ -52,7 +52,7 @@ public:
void set_footers();
void set_translations();
void set_relations();
BA3200_application(): _rel(NULL), _cur(NULL), _msk(NULL), _rpt(NULL) {}
BA3200_application(): _rpt(NULL), _msk(NULL), _rel(NULL), _cur(NULL) {}
virtual ~BA3200_application() {}
};
@ -285,9 +285,9 @@ void BA3200_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 = "";
_rpt->paragraph("Rows");
@ -306,7 +306,7 @@ void BA3200_application::set_rows()
from = campo.from();
to = campo.to();
name = campo.name();
if (campo.file != 0)
if (campo.file() != 0)
logicnum = campo.file();
}

View File

@ -9,8 +9,8 @@
class Libribollati_print : public TPrintapp
{
friend bool registro_handler(TMask_field& field, KEY key);
friend bool codditta_handler(TMask_field& field, KEY key);
static bool registro_handler(TMask_field& field, KEY key);
static bool codditta_handler(TMask_field& field, KEY key);
TMask* _msk;
TTable* _tab; // Tabella dei registri
@ -209,7 +209,7 @@ bool Libribollati_print::set_print(int)
return FALSE;
}
static bool registro_handler(TMask_field& field, KEY key)
bool Libribollati_print::registro_handler(TMask_field& field, KEY key)
{
if (key == K_TAB && field.focusdirty())
{
@ -219,7 +219,7 @@ static bool registro_handler(TMask_field& field, KEY key)
}
return TRUE;
}
static bool codditta_handler(TMask_field& field, KEY key)
bool Libribollati_print::codditta_handler(TMask_field& field, KEY key)
{
if (key == K_TAB)
{

View File

@ -88,7 +88,7 @@ public: // TPrint_application
};
TStampa_indici::TStampa_indici()
: _lib(NULL), _sort(NULL)
: _sort(NULL), _lib(NULL)
{
}
@ -114,7 +114,7 @@ void TStampa_indici::init_sort()
void TStampa_indici::crea_sort()
{
long anno,numini_paglib,numfin_paglib,codditta,numini_pagut,numfin_pagut;
long anno,numini_paglib,numfin_paglib = 0,codditta,numini_pagut,numfin_pagut;
TString cod_reg,cod_vidimaz,dep,app;
bool stamp_bollato = FALSE;
bool pagine_ann = FALSE;
@ -167,9 +167,9 @@ void TStampa_indici::crea_sort()
{
ultimo_mese = mese;
stampato = TRUE;
sprintf (_lib->anno, "%4d", anno);
sprintf (_lib->anno, "%4ld", anno);
sprintf (_lib->mese, "%2d", mese);
sprintf (_lib->nini_plib, "%5d", numini_paglib);
sprintf (_lib->nini_plib, "%5ld", numini_paglib);
_lib->num_riga = num_riga;
_lib->nfin_plib = numfin_paglib;
_lib->codditta = codditta;

View File

@ -311,7 +311,7 @@ bool TCond_pag_app::fixed_scad(TMask_field& f, KEY k)
return f.error_box("Giorno errato");
int i = 0;
static fld_arr[3] = {F_FIXSCAD_1, F_FIXSCAD_2, F_FIXSCAD_3};
static int fld_arr[3] = {F_FIXSCAD_1, F_FIXSCAD_2, F_FIXSCAD_3};
for (i = 0 ; i < 3; i++)
if (f.dlg() == fld_arr[i])
@ -378,7 +378,7 @@ bool TCond_pag_app::ult_class(TMask_field& f, KEY k)
// qui viene il belloccio
bool TCond_pag_app::sheet_action(TSheet_field&, int r, KEY k)
{
bool doit = TRUE, m_perc = FALSE, m_pag = FALSE;
bool doit = TRUE, m_perc = FALSE;
bool m_scad = FALSE, m_tipo = FALSE, m_ulc = FALSE, mod = FALSE;
word ahiahi = P_OK;
@ -536,7 +536,9 @@ void TCond_pag_app::sheet2ini(TSheet_field &sheet,TConfig& ini)
const TMask& m = sheet.mask();
const int nrate = m.get_int(F_NUM_RATE);
TString16 par;
for (int r = 0; r < nrate; r++)
int r;
for (r = 0; r < nrate; r++)
{
par.format("%d,%d", LF_TABCOM, r+1);
ini.set_paragraph(par);

View File

@ -91,7 +91,7 @@ public:
const char* descrizione_sottoconto(int, int, long);
void setta_righe_descr(TParagraph_string&,const TString&,const TString&);
BA3800_application(char livello) : _liv(toupper(livello)), _descr("", 40) {}
BA3800_application(char livello) : _descr("", 40), _liv(toupper(livello)) {}
};
void BA3800_application::postclose_print()
@ -403,7 +403,6 @@ void BA3800_application::totale_lettera()
void BA3800_application::stampa_totali_studio()
{
bool gia_stampato_conto_ord = FALSE;
TString16 diff_prod;
TString16 ris_imp;
@ -1055,9 +1054,7 @@ bool BA3800_application::preprocess_page(int file, int counter)
bool BA3800_application::preprocess_studio(int counter)
{
bool fai = TRUE;
TString saldostr,saldo_rafstr;
bool conto_dettagliato = TRUE;
if (counter == 0)
{
@ -1126,7 +1123,6 @@ bool BA3800_application::preprocess_ditta(int counter)
struct bil_ivd* bil = (struct bil_ivd*) _buff;
int g,c;
long s;
bool conto_dettagliato = TRUE;
if (!counter)
{

View File

@ -85,7 +85,8 @@ void Stampa_condizioni_pagamento_application::print_header()
// Setta le righe dell'intestazione
{
int soh = 1;
const long firm = get_firm();
get_firm(); // verificare
reset_header ();

View File

@ -250,4 +250,4 @@ int ba5100(int argc,char* argv[])
TQuery_application qa;
qa.run(argc, argv, TR("Ricerca Soci"));
return 0;
}
}

View File

@ -148,7 +148,7 @@ bool TAnaprint_app::preprocess_page(int file, int counter)
print_action TAnaprint_app::postprocess_page(int file, int counter)
{
const int cur = printer().current_row();
printer().current_row(); // verificare
if (file == LF_ANAG && _pr_type == schede && _inclditte)
printer().formfeed();
return NEXT_PAGE;

View File

@ -1,5 +1,5 @@
#include <printapp.h>
#include <iostream.h>
#include <incstr.h>
#include <mask.h>
#include <lffiles.h>
#include <stdio.h>

View File

@ -967,8 +967,9 @@ void TAnaprint_app::set_footers()
void TAnaprint_app::set_etichette()
{
int namerow = 0;
int i;
for (int i = 2; i <= _rows_et; i++)
for (i = 2; i <= _rows_et; i++)
set_row(i, "");
if (_is_piv)