Patch level :4.0 nopatch

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :corretti errori di compilazione dovuti a compilatore nuovo


git-svn-id: svn://10.65.10.50/trunk@14700 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2007-01-02 14:26:03 +00:00
parent d11ebcd2ea
commit f1560c6744
19 changed files with 59 additions and 45 deletions

View File

@ -286,8 +286,8 @@ void TStampaIntra_form::print()
error_box(TR("Non esistono righe di riepilogo o rettifiche da stampare per il periodo selezionato"));
return;
}
for (int i = 1; i <= _totrow1; i++)
int i;
for (i = 1; i <= _totrow1; i++)
_tot1 += amm_euro(_riepiloghi->row(i));
for (i = 1; i <= _totrow2; i++)

View File

@ -568,7 +568,8 @@ bool TRecord_DI::add(const char* code, const char* val)
CHECKS(val && *val, "Can't add empty field ", code);
// Cerca il primo posto libero
for (int pos = HEADER_SIZE; pos < HEADER_SIZE+USEABLE_SIZE; pos += BLOCK_SIZE)
int pos;
for (pos = HEADER_SIZE; pos < HEADER_SIZE+USEABLE_SIZE; pos += BLOCK_SIZE)
{
if (_buffer[pos] == ' ')
break;

View File

@ -623,8 +623,8 @@ int TSchedaPercipienti::read(TMask& m)
TSheet_field& pags = pag_sheet_enabled(m,TRUE);
pags.destroy();
for (int r = 0; r < _rel->pag_items(); r++)
int r;
for (r = 0; r < _rel->pag_items(); r++)
rec2row(pags.row(r), _rel->pag(r), r);
TSheet_field& vers = (TSheet_field&)m.field(F_VERSAMENTI);
@ -667,7 +667,8 @@ void TSchedaPercipienti::fill_sheet(TMask& m)
TString16 qua(m.get(F_CODQUA));
TSheet_field& pags = pag_sheet_enabled(m);
for (int r = pags.items(); r < 16; r++)
int r;
for (r = pags.items(); r < 16; r++)
new_row(pags, r, FALSE);
TSheet_field& vers = (TSheet_field&)m.field(F_VERSAMENTI);
@ -900,8 +901,9 @@ void TSchedaPercipienti::mask2rel(const TMask& m)
pag_pack(); // Destroy all null rows
// salva pagamenti
TArray& rows = pags().rows_array();
for (int i = 0; i < rows.items(); i++)
TArray& rows = pags().rows_array();
int i;
for (i = 0; i < rows.items(); i++)
{
TToken_string& row = (TToken_string&)rows[i];
TRectype &r = _rel->pag(i);

View File

@ -54,7 +54,8 @@ int TSchedaPE::read_scperc_rows()
// carico array versamenti
int i = 0;
for(bool ok = is_first_match(LF_RVER); ok; ok = next_match(LF_RVER))
bool ok;
for(ok = is_first_match(LF_RVER); ok; ok = next_match(LF_RVER))
ver(i++) = rver.curr();
_old_ver = ver_items();
@ -133,8 +134,8 @@ int TSchedaPE::registra(bool re, bool force)
const char tipoa = sc.get_char("TIPOA");
const long codanagr = sc.get_long("CODANAGR");
const int nprog = sc.get_int ("NPROG");
for (int i = 0 ; i < ver_items(); i++)
int i;
for (i = 0 ; i < ver_items(); i++)
{
const bool vers_vuoto = empty_vers(ver(i));

View File

@ -231,7 +231,8 @@ TQuadroC_E2::TQuadroC_E2(const char* quadro)
TSheet_field& TQuadroC_E2::find_sheet(const TMask& m) const
{
for (int f = m.fields()-1; f > 0; f--)
int f;
for (f = m.fields()-1; f > 0; f--)
{
if (m.fld(f).is_kind_of(CLASS_SHEET_FIELD))
break;

View File

@ -259,7 +259,8 @@ void TQuadroF::riempi_prospetto(const char prosp)
TSheet_field& ss = (TSheet_field&)_msk->field(F_A + prosp - 'A');
TRecord_array& prosp_x = *(prosp == 'B' ? _prosp_b : (prosp == 'C' ? _prosp_c : _prosp_a));
const int last = prosp_x.last_row();
for (int i = 0; i < last; i++)
int i;
for (i = 0; i < last; i++)
{
TRectype& r = prosp_x.row(i+1, TRUE);
TToken_string& row = ss.row(i);

View File

@ -149,7 +149,8 @@ void TDistintaQuadroG::pack_sheet(const TMask& m)
TSheet_field& TDistintaQuadroG::find_sheet(const TMask& m) const
{
for (int f = m.fields()-1; f > 0; f--)
int f;
for (f = m.fields()-1; f > 0; f--)
{
if (m.fld(f).is_kind_of(CLASS_SHEET_FIELD))
break;

View File

@ -867,9 +867,11 @@ bool TStampa_perc::set_print(int)
STD_IMP_PIC = "############";
int fd = TCurrency::get_firm_dec();
if (fd > 0)
{
for (int i = STD_IMP_PIC.len()-1; fd > 0; i--, fd--)
{
int i;
for (i = STD_IMP_PIC.len()-1; fd > 0; i--, fd--)
STD_IMP_PIC[i] = '@';
STD_IMP_PIC[i] = ',';
}

View File

@ -139,7 +139,7 @@ bool Tab770_application::firm_change_enabled() const
return FALSE;
}
m73400(int argc, char* argv[])
int m73400(int argc, char* argv[])
{
Tab770_application a;
a.run(argc,argv, "Tabelle");

View File

@ -1638,7 +1638,7 @@ void TRiporti::calcola_riporti_E1(const long dich)
TLocalisamfile prosp_e1(LF_PROSPE1);
prosp_e1.put(PRE_CODDITTA, _codditta);
TRectype tot_prosp(LF_PROSPE1); // Totale delle due righe di prospetto
for (int err = prosp_e1.read(_isgteq); err == NOERR; err = prosp_e1.next())
for (err = prosp_e1.read(_isgteq); err == NOERR; err = prosp_e1.next())
{
if (prosp_e1.get_long(PRE_CODDITTA) != _codditta)
break;
@ -1842,7 +1842,8 @@ void TRiporti::calcola_riporti_G(const long dich)
const real aliquota = curr.get("ALIQUOTA");
str = aliquota.string("@@,@@"); str << titolo;
for (int p = 5; p >= 0 && str != precompiled[p]; p--);
int p;
for (p = 5; p >= 0 && str != precompiled[p]; p--);
if (p < 0) // E' una riga non precompilata
{
const int sez = curr.get_int("SEZIONE");

View File

@ -929,7 +929,8 @@ bool TRecord770::add(const char* code, const char* val)
CHECKS(val && *val, "Can't add empty field ", code);
// Cerca il primo posto libero
for (int pos = HEADER_SIZE; pos < HEADER_SIZE+USEABLE_SIZE; pos += BLOCK_SIZE)
int pos;
for (pos = HEADER_SIZE; pos < HEADER_SIZE+USEABLE_SIZE; pos += BLOCK_SIZE)
{
if (_buffer[pos] == ' ')
break;
@ -1006,7 +1007,7 @@ bool TTrasferimento770::open(const char* path, char mode)
if (_name.empty())
_name = default_name();
if (mode == 'r')
_in_stream = new ifstream(_name, ios::in | ios::nocreate | ios::binary);
_in_stream = new ifstream(_name, ios::in | ios::binary);
else
_out_stream = new ofstream(_name, ios::out | ios::binary);

View File

@ -1,4 +1,4 @@
#include <fstream.h>
#include <incstr.h>
#include <applicat.h>
#include <form.h>
@ -563,7 +563,7 @@ bool TTrasferimentoDylog::open(const char* path, char mode)
if (_name.empty())
_name = default_name();
if (mode == 'r')
_in_stream = new ifstream(_name, ios::in | ios::nocreate | ios::binary);
_in_stream = new ifstream(_name, ios::in | ios::binary);
else
_out_stream = new ofstream(_name, ios::out | ios::binary);

View File

@ -1,4 +1,4 @@
#include <fstream.h>
#include <incstr.h>
#include <applicat.h>
#include <mask.h>
@ -1419,7 +1419,8 @@ bool TConvert_app::cnv_basebis_971() const
TString newqcomp;
newqcomp.spaces(29);
int nchar = qcomp.len() < Lpos ? qcomp.len() : Lpos;
for (int i=0; i<nchar; i++)
int i;
for (i=0; i<nchar; i++)
newqcomp[i] = qcomp[i];
for (i=Lpos; i<qcomp.len(); i++)
if ((i+1)<newqcomp.len())

View File

@ -68,7 +68,8 @@ int TDipendente::compare(const TSortable& s) const
int TDipendenti::find(long cod) const
{
for (int i = _data.last(); i >= 0; i--)
int i;
for (i = _data.last(); i >= 0; i--)
if (dip(i).codice() == cod)
break;
return i;
@ -516,7 +517,8 @@ bool TQuadroA2::preprocess_body(const TCursor& cur)
// Nasconde i dati tranne il codice fiscale (al secondo giro)
TPrint_section& body = section('B', odd_page);
for (int i = 2; i <= 25; i++)
int i;
for (i = 2; i <= 25; i++)
{
TForm_item& f = body.find_field(i);
f.enable(ret_con != 'X');
@ -612,7 +614,8 @@ bool TQuadroAbis::preprocess_body(const TCursor& cur)
// Nasconde i dati tranne il codice fiscale (al secondo giro)
TPrint_section& body = section('B', odd_page);
for (int i = 2; i <= 37; i++)
int i;
for (i = 2; i <= 37; i++)
{
TForm_item& f = body.find_field(i);
f.enable(ret_con != 'X');

View File

@ -210,12 +210,12 @@ void TMRPtables::read_turni(TMask& m)
TUnita_produttiva up(file().curr());
for (int t=7; t >=0; t--)
{
const id= F_T1HINIZIO+t*5;
m.set(id,up.ora_inizio_turno(t));
m.set(id+1,up.min_inizio_turno(t));
m.set(id+2,up.ore_durata_turno(t));
m.set(id+3,up.min_durata_turno(t));
m.set(id+4,up.raw_numpers_turno(t));
const int id = F_T1HINIZIO+t*5;
m.set(id, up.ora_inizio_turno(t));
m.set(id+1, up.min_inizio_turno(t));
m.set(id+2, up.ore_durata_turno(t));
m.set(id+3, up.min_durata_turno(t));
m.set(id+4, up.raw_numpers_turno(t));
}
}
@ -224,7 +224,7 @@ void TMRPtables::write_turni(const TMask& m)
TUnita_produttiva & up=(TUnita_produttiva &)file().curr();
for (int t=0; t < 8; t++)
{
const id= F_T1HINIZIO+t*5;
const int id = F_T1HINIZIO+t*5;
up.set_inizio_turno(t, m.get_int(id), m.get_int(id+1));
up.set_durata_turno(t, m.get_int(id+2), m.get_int(id+3));
up.set_numpers_turno(t, m.get_int(id+4));

View File

@ -561,7 +561,8 @@ void TRilprod_mask::load_prod_file(const char * nomefile, bool savefile, bool on
const int rows = prd.body().rows();
bool found = false;
for (int i = rows; i > 0; i--)
int i;
for (i = rows; i > 0; i--)
{
const TRectype & row = prd.body()[i];
found = (d == row.get_date("DATAFINE") && h == row.get("ORAFINE")) ||

View File

@ -1,7 +1,4 @@
#ifndef __MR1_H
#define __MR1_H
int mr1100(int argc, char* argv[]);
#endif // __MR1_H
#ifndef __MR1_H
#define __MR1_H
int mr1100(int argc, char* argv[]);
#endif // __MR1_H

View File

@ -170,7 +170,8 @@ void TMRP_rep_line::fill(TRectype& record, TAssoc_array* capacita)
record.put("LINEA", _lin);
record.put("UM", _um);
TString16 campo;
for (int b = last(); b >= 0; b = pred(b))
int b;
for (b = last(); b >= 0; b = pred(b))
{
switch(b)
{

View File

@ -820,7 +820,7 @@ void TCalendar_win::update()
for (j = 1; j <= 12; j++)
{
const int y = rct.bottom * j / 13;
const last = TDate::last_day(j, _anno);
const int last = TDate::last_day(j, _anno);
for (i = 1; i <= last; i++)
{
const int x = rct.right * (i+1) / 33;