From 8e1ae4334e508e4d9c6debaaacef2bd6bbdfc961 Mon Sep 17 00:00:00 2001 From: luca Date: Fri, 8 Jan 2010 09:54:58 +0000 Subject: [PATCH] Patch level : Files correlati : Ricompilazione Demo : [ ] Commento : pi-izzato il pe0001; eliminata una tonnellata di inutili include git-svn-id: svn://10.65.10.50/trunk@19889 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ps/pe0001.cpp | 20 -------------------- ps/pe0001.h | 3 --- ps/pi0001.cpp | 20 ++++++++++++++++++++ ps/pi0001.h | 3 +++ ps/{pe0001100.cpp => pi0001100.cpp} | 16 +++++----------- ps/{pe0001100.h => pi0001100.h} | 0 ps/{pe0001100a.h => pi0001100a.h} | 2 +- ps/{pe0001100a.uml => pi0001100a.uml} | 2 +- ps/{pe0001200.cpp => pi0001200.cpp} | 16 +++++----------- ps/{pe0001200a.h => pi0001200a.h} | 2 +- ps/{pe0001200a.uml => pi0001200a.uml} | 2 +- ps/{pe0001300.cpp => pi0001300.cpp} | 17 +++++------------ ps/{pe0001300a.h => pi0001300a.h} | 2 +- ps/{pe0001300a.uml => pi0001300a.uml} | 2 +- 14 files changed, 44 insertions(+), 63 deletions(-) delete mode 100755 ps/pe0001.cpp delete mode 100755 ps/pe0001.h create mode 100755 ps/pi0001.cpp create mode 100755 ps/pi0001.h rename ps/{pe0001100.cpp => pi0001100.cpp} (98%) rename ps/{pe0001100.h => pi0001100.h} (100%) rename ps/{pe0001100a.h => pi0001100a.h} (83%) rename ps/{pe0001100a.uml => pi0001100a.uml} (98%) rename ps/{pe0001200.cpp => pi0001200.cpp} (97%) rename ps/{pe0001200a.h => pi0001200a.h} (76%) rename ps/{pe0001200a.uml => pi0001200a.uml} (97%) rename ps/{pe0001300.cpp => pi0001300.cpp} (98%) rename ps/{pe0001300a.h => pi0001300a.h} (83%) rename ps/{pe0001300a.uml => pi0001300a.uml} (97%) diff --git a/ps/pe0001.cpp b/ps/pe0001.cpp deleted file mode 100755 index a07ebf6b4..000000000 --- a/ps/pe0001.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include - -#include "pe0001.h" - -int main(int argc, char** argv) -{ - int n = argc > 1 ? atoi(argv[1]+1) : 0; - switch(n) - { - case 1: - pe0001200(argc, argv); break; //importazione saldaconto - case 2: - pe0001300(argc, argv); break; //importazione cespiti - case 0: - default: - pe0001100(argc, argv); break; //importazione movimenti contabili - } - exit(0); - return 0; -} diff --git a/ps/pe0001.h b/ps/pe0001.h deleted file mode 100755 index 14e784cc7..000000000 --- a/ps/pe0001.h +++ /dev/null @@ -1,3 +0,0 @@ -int pe0001100(int argc, char* argv[]); // importazione movimenti contabili -int pe0001200(int argc, char* argv[]); // importazione saldaconto -int pe0001300(int argc, char* argv[]); // importazione cespiti \ No newline at end of file diff --git a/ps/pi0001.cpp b/ps/pi0001.cpp new file mode 100755 index 000000000..94a47fb55 --- /dev/null +++ b/ps/pi0001.cpp @@ -0,0 +1,20 @@ +#include + +#include "pi0001.h" + +int main(int argc, char** argv) +{ + int n = argc > 1 ? atoi(argv[1]+1) : 0; + switch(n) + { + case 1: + pi0001200(argc, argv); break; //importazione saldaconto + case 2: + pi0001300(argc, argv); break; //importazione cespiti + case 0: + default: + pi0001100(argc, argv); break; //importazione movimenti contabili + } + exit(0); + return 0; +} diff --git a/ps/pi0001.h b/ps/pi0001.h new file mode 100755 index 000000000..c94d73a1f --- /dev/null +++ b/ps/pi0001.h @@ -0,0 +1,3 @@ +int pi0001100(int argc, char* argv[]); // importazione movimenti contabili +int pi0001200(int argc, char* argv[]); // importazione saldaconto +int pi0001300(int argc, char* argv[]); // importazione cespiti \ No newline at end of file diff --git a/ps/pe0001100.cpp b/ps/pi0001100.cpp similarity index 98% rename from ps/pe0001100.cpp rename to ps/pi0001100.cpp index d04a49a50..e332b2d65 100755 --- a/ps/pe0001100.cpp +++ b/ps/pi0001100.cpp @@ -1,22 +1,16 @@ #include #include #include -#include #include -#include #include -#include #include -#include -#include #include -#include #include "../cg/cglib01.h" -#include "pe0001.h" -#include "pe0001100.h" -#include "pe0001100a.h" +#include "pi0001.h" +#include "pi0001100.h" +#include "pi0001100a.h" #include #include @@ -107,7 +101,7 @@ public: TImporta_mov_mask(); }; -TImporta_mov_mask::TImporta_mov_mask() :TAutomask ("pe0001100a") +TImporta_mov_mask::TImporta_mov_mask() :TAutomask ("pi0001100a") { } @@ -486,7 +480,7 @@ void TImporta_mov::main_loop() TImporta_mov& app() { return (TImporta_mov&) main_app(); } -int pe0001100 (int argc, char* argv[]) +int pi0001100 (int argc, char* argv[]) { TImporta_mov main_app; main_app.run(argc, argv, TR("Importazione contabilità Galileo")); diff --git a/ps/pe0001100.h b/ps/pi0001100.h similarity index 100% rename from ps/pe0001100.h rename to ps/pi0001100.h diff --git a/ps/pe0001100a.h b/ps/pi0001100a.h similarity index 83% rename from ps/pe0001100a.h rename to ps/pi0001100a.h index af3fde95a..adff0c3ad 100755 --- a/ps/pe0001100a.h +++ b/ps/pi0001100a.h @@ -1,4 +1,4 @@ -//campi maschera pe0001100a +//campi maschera pi0001100a #define F_CODITTA 101 #define F_RAGSOC 102 diff --git a/ps/pe0001100a.uml b/ps/pi0001100a.uml similarity index 98% rename from ps/pe0001100a.uml rename to ps/pi0001100a.uml index 2ff1d8b36..30de083cf 100755 --- a/ps/pe0001100a.uml +++ b/ps/pi0001100a.uml @@ -1,4 +1,4 @@ -#include "pe0001100a.h" +#include "pi0001100a.h" TOOLBAR "" 0 0 0 2 diff --git a/ps/pe0001200.cpp b/ps/pi0001200.cpp similarity index 97% rename from ps/pe0001200.cpp rename to ps/pi0001200.cpp index a27ce5ac8..0a42f1cb5 100755 --- a/ps/pe0001200.cpp +++ b/ps/pi0001200.cpp @@ -1,14 +1,8 @@ #include #include -#include -#include #include -#include -#include -#include #include #include -#include #include #include @@ -17,9 +11,9 @@ #include "../cg/cgsaldac.h" #include "../cg/cgpagame.h" -#include "pe0001.h" -#include "pe0001100.h" -#include "pe0001200a.h" +#include "pi0001.h" +#include "pi0001100.h" +#include "pi0001200a.h" #include #include @@ -122,7 +116,7 @@ public: TImporta_sc_mask(); }; -TImporta_sc_mask::TImporta_sc_mask() :TAutomask ("pe0001200a") +TImporta_sc_mask::TImporta_sc_mask() :TAutomask ("pi0001200a") { } @@ -354,7 +348,7 @@ void TImporta_sc::main_loop() TImporta_sc& app() { return (TImporta_sc&) main_app(); } -int pe0001200 (int argc, char* argv[]) +int pi0001200 (int argc, char* argv[]) { TImporta_sc main_app; main_app.run(argc, argv, TR("Importazione saldaconto")); diff --git a/ps/pe0001200a.h b/ps/pi0001200a.h similarity index 76% rename from ps/pe0001200a.h rename to ps/pi0001200a.h index 8020e337a..d2ab48b41 100755 --- a/ps/pe0001200a.h +++ b/ps/pi0001200a.h @@ -1,4 +1,4 @@ -//campi maschera pe0001200a +//campi maschera pi0001200a #define F_CODITTA 101 #define F_RAGSOC 102 diff --git a/ps/pe0001200a.uml b/ps/pi0001200a.uml similarity index 97% rename from ps/pe0001200a.uml rename to ps/pi0001200a.uml index 3273f3751..93916c289 100755 --- a/ps/pe0001200a.uml +++ b/ps/pi0001200a.uml @@ -1,4 +1,4 @@ -#include "pe0001200a.h" +#include "pi0001200a.h" TOOLBAR "" 0 0 0 2 diff --git a/ps/pe0001300.cpp b/ps/pi0001300.cpp similarity index 98% rename from ps/pe0001300.cpp rename to ps/pi0001300.cpp index e6e8a0025..5dd57e36a 100755 --- a/ps/pe0001300.cpp +++ b/ps/pi0001300.cpp @@ -1,16 +1,9 @@ #include #include #include -#include #include -#include -#include -#include #include -#include -#include #include -#include #include "../ce/ammce.h" #include "../ce/cespi.h" @@ -18,9 +11,9 @@ #include "../cg/cglib01.h" -#include "pe0001.h" -#include "pe0001100.h" -#include "pe0001300a.h" +#include "pi0001.h" +#include "pi0001100.h" +#include "pi0001300a.h" #include #include @@ -168,7 +161,7 @@ public: TImporta_cesp_mask(); }; -TImporta_cesp_mask::TImporta_cesp_mask() :TAutomask ("pe0001300a") +TImporta_cesp_mask::TImporta_cesp_mask() :TAutomask ("pi0001300a") { } @@ -470,7 +463,7 @@ void TImporta_cesp::main_loop() TImporta_cesp& app() { return (TImporta_cesp&) main_app(); } -int pe0001300 (int argc, char* argv[]) +int pi0001300 (int argc, char* argv[]) { TImporta_cesp main_app; main_app.run(argc, argv, TR("Importazione cespiti")); diff --git a/ps/pe0001300a.h b/ps/pi0001300a.h similarity index 83% rename from ps/pe0001300a.h rename to ps/pi0001300a.h index f06c9f04b..d064f4fc6 100755 --- a/ps/pe0001300a.h +++ b/ps/pi0001300a.h @@ -1,4 +1,4 @@ -//campi maschera pe0001300a +//campi maschera pi0001300a #define F_CODITTA 101 #define F_RAGSOC 102 diff --git a/ps/pe0001300a.uml b/ps/pi0001300a.uml similarity index 97% rename from ps/pe0001300a.uml rename to ps/pi0001300a.uml index 736b461c3..298ff0f6e 100755 --- a/ps/pe0001300a.uml +++ b/ps/pi0001300a.uml @@ -1,4 +1,4 @@ -#include "pe0001300a.h" +#include "pi0001300a.h" TOOLBAR "" 0 0 0 2