From aec7d0d6694a61dfcefb4b5b93b05d8951fce0e1 Mon Sep 17 00:00:00 2001 From: Alessandro Bonazzi Date: Mon, 3 Oct 2022 10:16:53 +0200 Subject: [PATCH] Patch level : 12.0 nopatch Files correlati : Commento: Modificata get_mask in _get_mask --- src/m770/770100.cpp | 2 +- src/m770/770102.h | 2 +- src/m770/770300.cpp | 6 +++--- src/m770/771200.cpp | 4 ++-- src/m770/771230.cpp | 2 +- src/m770/771231.cpp | 2 +- src/m770/771232.cpp | 2 +- src/m770/771233.cpp | 2 +- src/m770/771290.cpp | 4 ++-- src/m770/771295.cpp | 4 ++-- src/m770/771300.cpp | 4 ++-- src/m770/771310.cpp | 2 +- src/m770/773400.cpp | 2 +- src/m770/774300.cpp | 2 +- src/m770/775100.cpp | 2 +- src/m770/77g1.cpp | 2 +- src/m770/generic.cpp | 2 +- src/m770/quadb_b1.cpp | 4 ++-- src/m770/quadn_t.cpp | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/m770/770100.cpp b/src/m770/770100.cpp index d0f0811ea..8521f6e91 100755 --- a/src/m770/770100.cpp +++ b/src/m770/770100.cpp @@ -141,7 +141,7 @@ bool TSchedaPercipienti::changing_mask(int mode) return _mode != mode; } -TMask* TSchedaPercipienti::get_mask(int mode) +TMask* TSchedaPercipienti::_get_mask(int mode) { const int m = (mode == MODE_QUERY) ? 0 : 1; _mode = mode; diff --git a/src/m770/770102.h b/src/m770/770102.h index 5d519bfe2..2911842b0 100755 --- a/src/m770/770102.h +++ b/src/m770/770102.h @@ -175,7 +175,7 @@ class TSchedaPercipienti : public TRelation_application virtual bool user_create(); virtual bool user_destroy(); virtual TRelation* get_relation() const { return _rel; } - virtual TMask* get_mask(int mode); + virtual TMask* _get_mask(int mode); virtual bool changing_mask(int mode); virtual void init_query_mode (TMask&); virtual void init_query_insert_mode (TMask&); diff --git a/src/m770/770300.cpp b/src/m770/770300.cpp index dd1c87459..a173dca5c 100755 --- a/src/m770/770300.cpp +++ b/src/m770/770300.cpp @@ -9,15 +9,15 @@ protected: virtual bool user_create(); virtual bool user_destroy(); virtual TRelation* get_relation() const { return _rel; } - virtual TMask* get_mask(int) { return _msk; } + virtual TMask* _get_mask(int) { return _msk; } }; bool TAnagrafica_percipiente::user_create() { const TString& tabcom_editor = ini_get_string(CONFIG_GENERAL, "77", "Edit_4"); - if (tabcom_editor.blank()) + + if (tabcom_editor.blank()) ini_set_string(CONFIG_GENERAL, "77", "Edit_4", "700 -3"); - _rel = new TRelation(LF_PERC); _msk = new TMask("770300a"); return true; diff --git a/src/m770/771200.cpp b/src/m770/771200.cpp index 88777de51..88528455b 100755 --- a/src/m770/771200.cpp +++ b/src/m770/771200.cpp @@ -102,7 +102,7 @@ class TQuadroA : public TRelation_application virtual int write (const TMask& m); virtual bool remove(); virtual TRelation* get_relation() const { return _rel; } - virtual TMask* get_mask(int mode); + virtual TMask* _get_mask(int mode); virtual bool changing_mask(int mode); virtual void init_query_mode (TMask&); virtual void init_query_insert_mode (TMask&); @@ -145,7 +145,7 @@ bool TQuadroA::changing_mask(int mode) return _mode != mode; } -TMask* TQuadroA::get_mask(int mode) +TMask* TQuadroA::_get_mask(int mode) { const int m = (mode == MODE_QUERY) ? 0 : 1; _mode = mode; diff --git a/src/m770/771230.cpp b/src/m770/771230.cpp index 4340b9a60..2e76eb59f 100755 --- a/src/m770/771230.cpp +++ b/src/m770/771230.cpp @@ -250,7 +250,7 @@ protected: virtual bool remove(); virtual TRelation* get_relation() const { return _rel; } virtual bool changing_mask(int mode) { return FALSE; } - virtual TMask* get_mask(int mode) { return _msk; } + virtual TMask* _get_mask(int mode) { return _msk; } virtual void init_query_mode (TMask&); virtual void init_query_insert_mode (TMask&); virtual void init_insert_mode (TMask&); diff --git a/src/m770/771231.cpp b/src/m770/771231.cpp index 712a0c18e..bfd1953f4 100755 --- a/src/m770/771231.cpp +++ b/src/m770/771231.cpp @@ -52,7 +52,7 @@ class TQuadroF : public TRelation_application virtual int write (const TMask& m); virtual bool remove(); virtual TRelation* get_relation() const { return _rel; } - virtual TMask* get_mask(int mode) { return _msk; } + virtual TMask* _get_mask(int mode) { return _msk; } virtual bool changing_mask(int mode) { return FALSE; } virtual void init_query_mode (TMask&); virtual void init_insert_mode (TMask&); diff --git a/src/m770/771232.cpp b/src/m770/771232.cpp index c4f39a806..c4274f99d 100755 --- a/src/m770/771232.cpp +++ b/src/m770/771232.cpp @@ -69,7 +69,7 @@ class TQuadroG : public TRelation_application virtual int write (const TMask& m); virtual bool remove(); virtual TRelation* get_relation() const { return _rel; } - virtual TMask* get_mask(int mode) { return _msk; } + virtual TMask* _get_mask(int mode) { return _msk; } virtual bool changing_mask(int mode) { return FALSE; } virtual void init_query_mode (TMask&); virtual void init_insert_mode (TMask&); diff --git a/src/m770/771233.cpp b/src/m770/771233.cpp index 4d2b826e3..1a47b3297 100755 --- a/src/m770/771233.cpp +++ b/src/m770/771233.cpp @@ -109,7 +109,7 @@ protected: virtual int write (const TMask& m); virtual bool remove(); virtual TRelation* get_relation() const { return _rel; } - virtual TMask* get_mask(int mode) { return _msk; } + virtual TMask* _get_mask(int mode) { return _msk; } virtual bool changing_mask(int mode) { return FALSE; } virtual void init_query_mode (TMask&); virtual void init_query_insert_mode (TMask&); diff --git a/src/m770/771290.cpp b/src/m770/771290.cpp index 7e013882f..24a70d176 100755 --- a/src/m770/771290.cpp +++ b/src/m770/771290.cpp @@ -29,7 +29,7 @@ protected: virtual bool remove(); virtual TRelation* get_relation() const { return _rel; } - virtual TMask* get_mask(int mode); + virtual TMask* _get_mask(int mode); virtual bool changing_mask(int mode) {return FALSE; } // void init_mask(TMask&); @@ -188,7 +188,7 @@ void TQuadro_H_app::on_config_change() _anno = (int) conf.get_long(ANNO_SEL); } -TMask* TQuadro_H_app::get_mask(int mode) +TMask* TQuadro_H_app::_get_mask(int mode) { return _msk; } diff --git a/src/m770/771295.cpp b/src/m770/771295.cpp index 5818df10f..84e7debf5 100755 --- a/src/m770/771295.cpp +++ b/src/m770/771295.cpp @@ -20,7 +20,7 @@ protected: virtual bool user_destroy(); virtual TRelation* get_relation() const { return _rel; } - virtual TMask* get_mask(int mode); + virtual TMask* _get_mask(int mode); virtual bool changing_mask(int mode) {return FALSE; } // void init_mask(TMask&); @@ -62,7 +62,7 @@ bool TDettaglio_H_app::descr_ente (TMask_field& f , KEY k) return TRUE; } -TMask* TDettaglio_H_app::get_mask(int mode) +TMask* TDettaglio_H_app::_get_mask(int mode) { return _msk; } diff --git a/src/m770/771300.cpp b/src/m770/771300.cpp index 24b1c28c1..807678cb2 100755 --- a/src/m770/771300.cpp +++ b/src/m770/771300.cpp @@ -72,7 +72,7 @@ class TQuadroI : public TRelation_application virtual bool user_create(); virtual bool user_destroy(); virtual TRelation* get_relation() const { return _rel; } - virtual TMask* get_mask(int mode); + virtual TMask* _get_mask(int mode); virtual bool changing_mask(int mode) {return FALSE; } virtual int read(TMask& m); virtual void init_query_mode(TMask&); @@ -180,7 +180,7 @@ void TQuadroI::set_field_quadri(TMask& m) } } -TMask* TQuadroI::get_mask(int mode) +TMask* TQuadroI::_get_mask(int mode) { return _msk; } diff --git a/src/m770/771310.cpp b/src/m770/771310.cpp index 907380a59..c245c7a8d 100755 --- a/src/m770/771310.cpp +++ b/src/m770/771310.cpp @@ -26,7 +26,7 @@ class M71310_application : public TRelation_application virtual bool user_create(); virtual bool user_destroy(); virtual TRelation* get_relation() const { return _rel; } - virtual TMask* get_mask(int mode) { return _msk; } + virtual TMask* _get_mask(int mode) { return _msk; } virtual bool changing_mask(int mode) {return FALSE; } virtual void init_query_mode(TMask&); virtual void init_modify_mode(TMask&); diff --git a/src/m770/773400.cpp b/src/m770/773400.cpp index c2e04aa10..fcde7484b 100755 --- a/src/m770/773400.cpp +++ b/src/m770/773400.cpp @@ -118,7 +118,7 @@ void Tab770_application::init_modify_mode(TMask& m) bool Tab770_application::user_create() { Tab_application::user_create(); - _msk = get_mask(); + _msk = get_mask(MODE_QUERY); _tabname = get_tabname(); if (IsCausali()) diff --git a/src/m770/774300.cpp b/src/m770/774300.cpp index 1cf2b99ca..31214bd3c 100755 --- a/src/m770/774300.cpp +++ b/src/m770/774300.cpp @@ -152,7 +152,7 @@ class TAzzeramento_archivi : public TRelation_application virtual bool user_create(); virtual bool user_destroy(); virtual TRelation* get_relation() const { return _rel; } - virtual TMask* get_mask(int mode) { return _msk; } + virtual TMask* _get_mask(int mode) { return _msk; } virtual bool changing_mask(int mode) { return FALSE; } virtual void init_modify_mode(TMask&); virtual int rewrite(const TMask& m); diff --git a/src/m770/775100.cpp b/src/m770/775100.cpp index 756c92b17..306d9c169 100755 --- a/src/m770/775100.cpp +++ b/src/m770/775100.cpp @@ -23,7 +23,7 @@ protected: virtual bool user_create(); virtual bool user_destroy(); virtual TRelation* get_relation() const { return _rel; } - virtual TMask* get_mask(int mode) { return _msk; } + virtual TMask* _get_mask(int mode) { return _msk; } virtual bool changing_mask(int mode) { return FALSE; } virtual bool remove(); static bool codditta_handler(TMask_field& f, KEY k); diff --git a/src/m770/77g1.cpp b/src/m770/77g1.cpp index b725fac47..34eab17d8 100755 --- a/src/m770/77g1.cpp +++ b/src/m770/77g1.cpp @@ -31,7 +31,7 @@ class TQuadroG1 : public TRelation_application virtual int write (const TMask& m); virtual bool remove(); virtual TRelation* get_relation() const { return _rel; } - virtual TMask* get_mask(int mode) { return _msk; } + virtual TMask* _get_mask(int mode) { return _msk; } virtual bool changing_mask(int mode) { return FALSE; } virtual void init_query_mode (TMask&); virtual void init_insert_mode (TMask&); diff --git a/src/m770/generic.cpp b/src/m770/generic.cpp index 580eca2dd..bccdd11dc 100755 --- a/src/m770/generic.cpp +++ b/src/m770/generic.cpp @@ -70,7 +70,7 @@ class TGenericRel_application : public TRelation_application virtual int write (const TMask& m); virtual bool remove(); virtual void on_config_change(); - virtual TMask* get_mask(int) { return _msk; } + virtual TMask* _get_mask(int) { return _msk; } virtual bool changing_mask(int) { return FALSE;} virtual TRelation* get_relation() const { return _rel; } virtual void init_insert_mode(TMask&); diff --git a/src/m770/quadb_b1.cpp b/src/m770/quadb_b1.cpp index 5118a699a..923614a73 100755 --- a/src/m770/quadb_b1.cpp +++ b/src/m770/quadb_b1.cpp @@ -53,7 +53,7 @@ class TQuadriBB1_application : public TRelation_application virtual int write (const TMask& m); virtual bool remove(); virtual void on_config_change(); - virtual TMask* get_mask(int); + virtual TMask* _get_mask(int); virtual bool changing_mask(int); TMask* load_mask(int n); virtual TRelation* get_relation() const { return _rel; } @@ -93,7 +93,7 @@ bool TQuadriBB1_application::changing_mask(int mode) return _mode != mode; } -TMask* TQuadriBB1_application::get_mask(int mode) +TMask* TQuadriBB1_application::_get_mask(int mode) { const int m = (mode == MODE_QUERY) ? 0 : 1; _mode = mode; diff --git a/src/m770/quadn_t.cpp b/src/m770/quadn_t.cpp index 38b2a7df0..83e0cb14e 100755 --- a/src/m770/quadn_t.cpp +++ b/src/m770/quadn_t.cpp @@ -49,7 +49,7 @@ protected: virtual int write (const TMask& m); virtual bool remove(); virtual void on_config_change(); - virtual TMask* get_mask(int) { return _msk; } + virtual TMask* _get_mask(int) { return _msk; } virtual bool changing_mask(int) { return FALSE;} virtual TRelation* get_relation() const { return _rel; } virtual void init_mask(TMask&);