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@14712 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2007-01-03 16:21:58 +00:00
parent eebf2d65ba
commit 5740e0d04f
10 changed files with 33 additions and 23 deletions

View File

@ -162,7 +162,8 @@ void TStampa_statistiche_app::main_loop()
int month_from = date_from.month();
int month_to = date_to.month();
int inc_month = _msk->get_int(F_GROUPMONTH);
for (int m = month_from; m <= month_to; m += inc_month)
int m;
for (m = month_from; m <= month_to; m += inc_month)
{
desc = months[m - 1];
const int index = m + inc_month > 12 ? 12 : m + inc_month - 1;

View File

@ -590,7 +590,8 @@ void TEC_array::arrange_scaduto(const TPartita& game)
const char sezione = game.conto().tipo() == 'C' ? 'A' : 'D';
totpag.normalize(sezione);
for (int r = items()-1; r >= 0; r--)
int r;
for (r = items()-1; r >= 0; r--)
{
TEC_row& s = row(r);
real imp(s.scaduto());
@ -624,7 +625,8 @@ void TEC_array::arrange_scaduto(const TPartita& game)
TEC_array::TEC_array(const TPartita& game, const TEC_form* f)
: _form(f)
{
for (int r = game.last(); r > 0; r = game.pred(r))
int r;
for (r = game.last(); r > 0; r = game.pred(r))
add_row(game.riga(r));
if (items() > 0)
{
@ -814,8 +816,9 @@ void TEC_form::print_total(int riga, const THash_object& o)
TForm_item& bdesc = body.find_field(PEC_DESCR);
// Sostituisce magic-names nei prompt
TString80 s;
for (int i = 0; i < MAXID; i++)
TString80 s;
int i;
for (i = 0; i < MAXID; i++)
{
TForm_item& desc_field = foot.find_field(f_id[i]);
if (desc_field.shown())
@ -973,8 +976,8 @@ bool TEC_form::print_game(const TPartita& game)
int ultima_riga = 0;
int ultima_rata = 0;
for (int r = 0; r < righe.items(); r++)
int r;
for (r = 0; r < righe.items(); r++)
{
TEC_row& riga = righe.row(r);

View File

@ -536,7 +536,8 @@ void TESSL_array::arrange_scaduto(const TPartita& game)
const char sezione = game.conto().tipo() == 'C' ? 'D' : 'A';
totpag.normalize(sezione);
for (int r = items()-1; r >= 0; r--)
int r;
for (r = items()-1; r >= 0; r--)
{
TESSL_row& s = row(r);
real imp(s.scaduto());
@ -570,7 +571,8 @@ void TESSL_array::arrange_scaduto(const TPartita& game)
TESSL_array::TESSL_array(const TPartita& game, const TESSL_form* f)
:_form(f)
{
for (int r = game.last(); r > 0; r = game.pred(r))
int r;
for (r = game.last(); r > 0; r = game.pred(r))
add_row(game.riga(r));
const char sezione = f->sezione_normale();
for (r = items()-1; r >= 0; r--)
@ -757,8 +759,9 @@ void TESSL_form::print_total(int riga, const THash_object& o)
TForm_item& bdesc = body.find_field(PEC_DESCR);
// Sostituisce magic-names nei prompt
TString s(80);
for (int i = 0; i < MAXID; i++)
TString s(80);
int i;
for (i = 0; i < MAXID; i++)
{
TForm_item& desc_field = foot.find_field(f_id[i]);
if (desc_field.shown())
@ -937,8 +940,8 @@ bool TESSL_form::print_game(const TPartita& game)
int ultima_riga = 0;
int ultima_rata = 0;
for (int r = 0; r < righe.items(); r++)
int r;
for (r = 0; r < righe.items(); r++)
{
TESSL_row& riga = righe.row(r);
if (pr.rows_left() <= (body.height()+1))

View File

@ -127,7 +127,7 @@ TImporto TConfronta_mask::importo_riga(const TRectype& riga) const
{
TString16 key; key << riga.get(PART_CODCAUS) << "|14"; // Riga ritenute sociali
const char sezcaus = cache().get(LF_RCAUSALI, key, RCA_SEZIONE)[0];
const sezrs = sezcaus > ' ' ? (sezcaus == 'D' ? 'A' : 'D') : riga.get_char(PART_SEZ);
const char sezrs = sezcaus > ' ' ? (sezcaus == 'D' ? 'A' : 'D') : riga.get_char(PART_SEZ);
i += TImporto(sezrs, ritsoc);
}
}

View File

@ -224,8 +224,9 @@ void TProspettoScadenze::compute_all(TPartita& p, TBill& bill)
const int lst = rs.last();
int prima_riga_pagamento = -1;
TDate first_date;// data relativa alla prima riga di pagamento
for (int pp = rs.first(); pp <= lst; pp = rs.succ(pp))
int pp;
for (pp = rs.first(); pp <= lst; pp = rs.succ(pp))
{
const TRiga_partite& sum = p.riga(pp);
TDate current_date(sum.get_date(PART_DATAPAG));

View File

@ -43,7 +43,7 @@ public:
size_t GetCount() const { return m_Hash.GetCount(); }
size_t GetLicenses();
void BeginFind() { m_Hash.BeginFind(); }
TUserInfo* Next() { wxNode* n = m_Hash.Next(); return n ? (TUserInfo*)n->GetData() : NULL; }
TUserInfo* Next() { wxHashTable::Node* n = m_Hash.Next(); return n ? (TUserInfo*)n->GetData() : NULL; }
TUserTable(size_t size = 13);
};

View File

@ -47,7 +47,7 @@ public:
size_t GetCount() const { return m_Hash.GetCount(); }
void BeginFind() { m_Hash.BeginFind(); }
wxNode* Next() { return m_Hash.Next(); }
wxHashTable::Node* Next() { return m_Hash.Next(); }
THashTable(size_t size = 13);
};

View File

@ -50,7 +50,7 @@ void TLerchServer::CreateServersList(wxArrayString& arr) const
const char* aperta = strchr(buff, '[');
while (aperta != NULL)
{
char* chiusa = strchr(aperta+1, ']');
char* chiusa = (char*)strchr(aperta+1, ']');
if (chiusa != NULL)
{
*chiusa = '\0';
@ -334,7 +334,7 @@ void TLerchServer::ProcessFormUpdate(THashTable& args, wxSocketBase& sock)
{
const wxString strApp = args.Get("App");
args.BeginFind();
for (wxNode* pNode = args.Next(); pNode; pNode = args.Next())
for (wxHashTable::Node* pNode = args.Next(); pNode; pNode = args.Next())
{
const wxString strKey = pNode->GetKeyString();
if (strKey != "App")

View File

@ -448,7 +448,7 @@ void TXmlItem::Write(wxOutputStream& outf, int tab) const
if (m_Attributes != NULL)
{
m_Attributes->BeginFind();
for (wxNode* pNode = m_Attributes->Next(); pNode; pNode = m_Attributes->Next())
for (wxHashTable::Node* pNode = m_Attributes->Next(); pNode; pNode = m_Attributes->Next())
{
outf << " " << pNode->GetKeyString() << "=";
const TXmlAttr* attr = (const TXmlAttr*)pNode->GetData();

View File

@ -177,7 +177,8 @@ int TTable_expression::name2index(const char* name) const
load_table();
TString code(name); code.upper();
for (int index = _expr.items()-1; index >= 0; index--)
int index;
for (index = _expr.items()-1; index >= 0; index--)
{
const THash_object& h = (const THash_object&)_expr[index];
if (h.key() == code)
@ -381,7 +382,8 @@ TToken_string& TRicalcolo_mask::get_key_expr(int key)
bool TRicalcolo_mask::gestione_um(char tipo) const
{
const char* const lco = "LCO";
for (int i = 0; i < 3 && toupper(tipo) != lco[i]; i++);
int i;
for (i = 0; i < 3 && toupper(tipo) != lco[i]; i++);
CHECK(i < 3, "Gestione unita' di misura errata");
TConfig ve(CONFIG_DITTA, "ve");
return ve.get_bool("GESUM", NULL, i+1);