*** empty log message ***

git-svn-id: svn://10.65.10.50/trunk@11851 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2004-03-13 00:22:18 +00:00
parent 13cdfaa288
commit 8bbd94ef24
13 changed files with 44 additions and 34 deletions

View File

@ -57,8 +57,8 @@ bool TEdit_file::_browse(TCursor& cursor, const TFilename& name)
{ {
TProgind* pind = NULL; TProgind* pind = NULL;
cursor.freeze(TRUE); cursor.freeze(TRUE);
bool go = FALSE; // bool go = FALSE; inutili verificare
bool first = FALSE; // bool first = FALSE;
long j; long j;
const long items = sheet.items(); const long items = sheet.items();
const long checked = sheet.checked(); const long checked = sheet.checked();
@ -171,7 +171,9 @@ bool TEdit_file::browse(TExternisamfile* file, const TFilename& name)
KEY TEdit_file::edit_record(TRectype& rec, bool readonly) KEY TEdit_file::edit_record(TRectype& rec, bool readonly)
{ {
for(int recs = 0; rec.fieldname(recs) != NULL; recs++); int recs;
for(recs = 0; rec.fieldname(recs) != NULL; recs++);
const int fpp = 16; // Fields per page const int fpp = 16; // Fields per page
const int rows = recs > fpp ? 20 : recs+4; const int rows = recs > fpp ? 20 : recs+4;
@ -181,11 +183,12 @@ KEY TEdit_file::edit_record(TRectype& rec, bool readonly)
int curpage = 0, currow = 1, nid = 100; int curpage = 0, currow = 1, nid = 100;
const char* cp; const char* cp;
int mcnt =0; // inutile verificare int mcnt =0;
const char* flags = readonly ? "D" : ""; const char* flags = readonly ? "D" : "";
int i;
for(int i = 0; (cp = rec.fieldname(i)) != NULL; i++) for(i = 0; (cp = rec.fieldname(i)) != NULL; i++)
{ {
// add fields ONE by ONE // add fields ONE by ONE
TString16 s(cp); s.left_just(16); TString16 s(cp); s.left_just(16);

View File

@ -34,7 +34,6 @@ clock_t TTest_application::start_timer() const
void TTest_application::test1() void TTest_application::test1()
{ {
TLocalisamfile tab(LF_COMUNI); TLocalisamfile tab(LF_COMUNI);
const TRecnotype n = tab.items();
clock_t start; clock_t start;
TRecnotype r = 0; TRecnotype r = 0;

View File

@ -5,6 +5,7 @@
#include <prefix.h> #include <prefix.h>
#include <progind.h> #include <progind.h>
#include <sheet.h> #include <sheet.h>
#include <utility.h>
#include "ba1.h" #include "ba1.h"
@ -128,7 +129,7 @@ void TPackFiles_application::main_loop()
ds.get(i); ds.get(i);
prefix().set(pref); prefix().set(pref);
const long flags = ds.flags(); const long flags = ds.flags();
const int module = abs((int)flags); // const int module = abs((int)flags); non piu usato verificare
if (flags >= 10000L) if (flags >= 10000L)
continue; // Skip files with flags over 10000 continue; // Skip files with flags over 10000
TSystemisamfile f(i); TSystemisamfile f(i);
@ -174,7 +175,7 @@ void TPackFiles_application::main_loop()
d.put(i, is_com ? _comdir : _nordir); d.put(i, is_com ? _comdir : _nordir);
if (f.pack() == NOERR) if (f.pack() == NOERR)
if (f.load(d_name) == NOERR) // Reload if (f.load(d_name) == NOERR) // Reload
unlink(d_name); remove_file(d_name);
else else
error_box(FR("Impossibile ricaricare %s. Errore %d"),(const char*) d_name, f.status()); error_box(FR("Impossibile ricaricare %s. Errore %d"),(const char*) d_name, f.status());
else else

View File

@ -300,7 +300,7 @@ TSubmenu& TMenu::get_submenu(const char* name)
void TMenu::import(const char* filename, TString& first) void TMenu::import(const char* filename, TString& first)
{ {
TSubmenu* sub; TSubmenu* sub = NULL;
TScanner scan(filename); TScanner scan(filename);
first.cut(0); first.cut(0);
while (scan.good()) while (scan.good())
@ -792,4 +792,4 @@ int ba1400(int argc, char** argv)
a.run(argc, argv, TR("Configurazione utenti")); a.run(argc, argv, TR("Configurazione utenti"));
} }
return 0; return 0;
} }

View File

@ -18,4 +18,4 @@ int main(int argc, char** argv)
exit(0); exit(0);
return 0; return 0;
} }

View File

@ -70,7 +70,9 @@ int list_dirs(
{ {
TWait_cursor hourglass; TWait_cursor hourglass;
TFilename dir(filelist); 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; if (dir[i] == '/' || dir[i] == '\\' || dir[i] == ':') break;
TFilename mask(dir.mid(i+1)); TFilename mask(dir.mid(i+1));
@ -173,4 +175,4 @@ int ba7200(int argc, char* argv[])
ma.run(argc, argv, "Copia Studio"); ma.run(argc, argv, "Copia Studio");
return 0; return 0;
} }

View File

@ -1,4 +1,2 @@
#define F01_DATI 101 #define F01_DATI 101
#define F01_DATIL 102 #define F01_DATIL 102

View File

@ -11,4 +11,4 @@ int main(int argc, char** argv)
default: ba8100(argc, argv); break; // Record Selector default: ba8100(argc, argv); break; // Record Selector
} }
return 0; return 0;
} }

View File

@ -11,7 +11,7 @@
#include <utility.h> #include <utility.h>
#include <xml.h> #include <xml.h>
#include "../../sqlite/sources/sqlite.h" #include "../sqlite/sqlite.h"
#include "ba8200.h" #include "ba8200.h"
#include "ba8201.h" #include "ba8201.h"
@ -361,7 +361,7 @@ protected:
bool save_tables_tree(TXmlItem& xml); bool save_tables_tree(TXmlItem& xml);
bool save_fields_sheet(TXmlItem& xml); bool save_fields_sheet(TXmlItem& xml);
void export(TQueryExportFormat fmt); void esporta(TQueryExportFormat fmt);
public: public:
bool load_query(); bool load_query();
@ -477,7 +477,7 @@ bool TQuery_mask::edit_file_in_tree()
fill_fields(); fill_fields();
} }
return ok; return update; // ????
} }
// Ordina per importanza i campi di un tracciato record // Ordina per importanza i campi di un tracciato record
@ -730,7 +730,7 @@ void TQuery_mask::edit_query()
warning_box(TR("Nessuna riga risultato")); warning_box(TR("Nessuna riga risultato"));
} }
void TQuery_mask::export(TQueryExportFormat fmt) void TQuery_mask::esporta(TQueryExportFormat fmt)
{ {
xvt_fsys_save_dir(); xvt_fsys_save_dir();
TFilename path; path.tempdir(); TFilename path; path.tempdir();
@ -1088,19 +1088,19 @@ bool TQuery_mask::on_field_event(TOperable_field& o, TField_event e, long jolly)
break; break;
case F_EXPORT_HTML: case F_EXPORT_HTML:
if (e == fe_button) if (e == fe_button)
export(fmt_html); esporta(fmt_html);
break; break;
case F_EXPORT_EXCEL: case F_EXPORT_EXCEL:
if (e == fe_button) if (e == fe_button)
export(fmt_slk); esporta(fmt_slk);
break; break;
case F_EXPORT_TXT: case F_EXPORT_TXT:
if (e == fe_button) if (e == fe_button)
export(fmt_txt); esporta(fmt_txt);
break; break;
case F_EXPORT_CAMPO: case F_EXPORT_CAMPO:
if (e == fe_button) if (e == fe_button)
export(fmt_campo); esporta(fmt_campo);
break; break;
case F_SHEET: case F_SHEET:
enable_sql_button(); enable_sql_button();

View File

@ -1,4 +1,8 @@
#ifdef WIN32
#include <fstream.h> #include <fstream.h>
#else
#include "../xvaga/incstr.h"
#endif
#include <diction.h> #include <diction.h>
#include <extcdecl.h> #include <extcdecl.h>
@ -70,7 +74,8 @@ bool select_sql_file(TFilename& path, const char* ext)
// Private interface // Private interface
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
#include "../../sqlite/sources/sqlite.h" #include "../sqlite/sqlite.h"
class TSQLite : public TObject class TSQLite : public TObject
{ {
@ -87,7 +92,7 @@ protected:
void build_curr_path(TFilename& name) const; void build_curr_path(TFilename& name) const;
void test_path(); void test_path();
bool export(const TRectype& rec, ostream& sql) const; bool esporta(const TRectype& rec, ostream& sql) const;
bool create_dbf_times(); bool create_dbf_times();
long get_dbf_time(const TString& table); long get_dbf_time(const TString& table);
bool set_dbf_time(const TString& table, long last); bool set_dbf_time(const TString& table, long last);
@ -292,7 +297,7 @@ bool TSQLite::exists(const char* table)
return yes; return yes;
} }
bool TSQLite::export(const TRectype& rec, ostream& sql) const bool TSQLite::esporta(const TRectype& rec, ostream& sql) const
{ {
const RecDes& rd = *rec.rec_des(); const RecDes& rd = *rec.rec_des();
TString tmp; TString tmp;
@ -372,7 +377,7 @@ bool TSQLite::import(int logicnum)
for (cur = 0; cur.pos() < items; ++cur) for (cur = 0; cur.pos() < items; ++cur)
{ {
export(curr, txt); esporta(curr, txt);
pi.addstatus(1); pi.addstatus(1);
if (pi.iscancelled()) if (pi.iscancelled())
break; break;

View File

@ -160,7 +160,7 @@ const TReport_font& TReport_section::font() const
{ {
if (_father == NULL) if (_father == NULL)
{ {
(TReport_font*)_font = new TReport_font; ((TReport_section*)this)->_font = new TReport_font;
f = _font; f = _font;
} }
else else
@ -232,8 +232,8 @@ class TReport_field : public TObject
short _width, _height; // Dimensioni in centesimi short _width, _height; // Dimensioni in centesimi
TString _picture, _field; TString _picture, _field;
TReport_font* _font;
bool _selected; bool _selected;
TReport_font* _font;
protected: protected:
const TReport_font& font() const; const TReport_font& font() const;

View File

@ -151,7 +151,7 @@ bool TFink_mask::char_handler(TMask_field& f, KEY k)
// ----------------------------------------------------------------- // -----------------------------------------------------------------
TForm_editor::TForm_editor() : _form(NULL), _extra(FALSE), _m(NULL) TForm_editor::TForm_editor() : _form(NULL), _m(NULL), _extra(FALSE)
{} {}
TForm_editor::~TForm_editor() TForm_editor::~TForm_editor()
@ -166,7 +166,7 @@ bool TForm_editor::create()
for (int a = 2; a < argc(); a++) for (int a = 2; a < argc(); a++)
{ {
if (stricmp(argv(a), "-E") == 0) if (xvt_str_compare_ignoring_case(argv(a), "-E") == 0)
{ {
_extra = TRUE; _extra = TRUE;
continue; continue;
@ -618,7 +618,9 @@ bool TForm_editor::form_config() const
TMask m(maskname); TMask m(maskname);
// carica campi // carica campi
for (int i = 0; i < m.fields(); i++) int i;
for (i = 0; i < m.fields(); i++)
{ {
TMask_field& f = m.fld(i); TMask_field& f = m.fld(i);
const TFieldref* fref = f.field(); const TFieldref* fref = f.field();

View File

@ -11,4 +11,4 @@
#define F_FATTRIC 109 #define F_FATTRIC 109
#define F_NUMULTRAS 110 #define F_NUMULTRAS 110
#define F_DATAULTRAS 111 #define F_DATAULTRAS 111
#define F_RAGSOC 112 #define F_RAGSOC 112