From 4bac31af7eef214e48dae92a3f821d3b2f771492 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 4 May 1998 10:12:16 +0000
Subject: [PATCH] *.url     Aggiornato uso url *.h       Migliorati #include

git-svn-id: svn://10.65.10.50/trunk@6601 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 sv/sv0.url     | 24 ++++--------------------
 sv/sv1.url     | 24 ++++--------------------
 sv/sv2.url     | 24 ++++--------------------
 sv/svlib01.cpp |  7 ++-----
 sv/svlib01.h   | 19 +++++++------------
 sv/svlib09.h   | 14 ++------------
 6 files changed, 23 insertions(+), 89 deletions(-)

diff --git a/sv/sv0.url b/sv/sv0.url
index a5bcb5b31..edcf837eb 100755
--- a/sv/sv0.url
+++ b/sv/sv0.url
@@ -1,22 +1,6 @@
+#define APPNAME campo
+#define QAPPNAME "campo"
+#define QFIRMNAME "A.G.A. Informatica Srl"
+
 #include <default.url>
 
-MENU TASK_MENUBAR
-  SUBMENU MENU_FILE "~File"
-
-MENU M_FONT
-  ITEM M_FONT_SELECT "~Font"  
-  ITEM MENU_ITEM(2)  "~Colori"
-  ITEM MENU_ITEM(3)  "~Editor"
-
-MENUBAR MENU_BAR(1)
-MENU MENU_BAR(1)
-  SUBMENU MENU_FILE "~File"
-
-MENUBAR MENU_BAR(2)
-MENU MENU_BAR(2)
-  SUBMENU MENU_FILE "~File"
-
-MENUBAR MENU_BAR(3)
-MENU MENU_BAR(3)
-  SUBMENU MENU_FILE "~File"
-
diff --git a/sv/sv1.url b/sv/sv1.url
index a5bcb5b31..edcf837eb 100755
--- a/sv/sv1.url
+++ b/sv/sv1.url
@@ -1,22 +1,6 @@
+#define APPNAME campo
+#define QAPPNAME "campo"
+#define QFIRMNAME "A.G.A. Informatica Srl"
+
 #include <default.url>
 
-MENU TASK_MENUBAR
-  SUBMENU MENU_FILE "~File"
-
-MENU M_FONT
-  ITEM M_FONT_SELECT "~Font"  
-  ITEM MENU_ITEM(2)  "~Colori"
-  ITEM MENU_ITEM(3)  "~Editor"
-
-MENUBAR MENU_BAR(1)
-MENU MENU_BAR(1)
-  SUBMENU MENU_FILE "~File"
-
-MENUBAR MENU_BAR(2)
-MENU MENU_BAR(2)
-  SUBMENU MENU_FILE "~File"
-
-MENUBAR MENU_BAR(3)
-MENU MENU_BAR(3)
-  SUBMENU MENU_FILE "~File"
-
diff --git a/sv/sv2.url b/sv/sv2.url
index a5bcb5b31..edcf837eb 100755
--- a/sv/sv2.url
+++ b/sv/sv2.url
@@ -1,22 +1,6 @@
+#define APPNAME campo
+#define QAPPNAME "campo"
+#define QFIRMNAME "A.G.A. Informatica Srl"
+
 #include <default.url>
 
-MENU TASK_MENUBAR
-  SUBMENU MENU_FILE "~File"
-
-MENU M_FONT
-  ITEM M_FONT_SELECT "~Font"  
-  ITEM MENU_ITEM(2)  "~Colori"
-  ITEM MENU_ITEM(3)  "~Editor"
-
-MENUBAR MENU_BAR(1)
-MENU MENU_BAR(1)
-  SUBMENU MENU_FILE "~File"
-
-MENUBAR MENU_BAR(2)
-MENU MENU_BAR(2)
-  SUBMENU MENU_FILE "~File"
-
-MENUBAR MENU_BAR(3)
-MENU MENU_BAR(3)
-  SUBMENU MENU_FILE "~File"
-
diff --git a/sv/svlib01.cpp b/sv/svlib01.cpp
index f259d7541..730f1200b 100755
--- a/sv/svlib01.cpp
+++ b/sv/svlib01.cpp
@@ -1,9 +1,7 @@
 #include <prefix.h>
-#include <progind.h>
-#include <recarray.h>
 
 #include "svlib01.h"
-#include "svlib09.h"
+#include "../ve/velib.h"
 
 #include "svriep.h"
 #include "svstat.h"
@@ -176,7 +174,6 @@ int date2period(const TDate& datadoc, TFrequenza_statistiche freq)
   return classe;
 }
 
-//@cmember 
 long date2long(const TDate d, TFrequenza_statistiche f)
 {
   return long(d.year())*long(last_period(d.year(),f))+date2period(d,f);
@@ -301,7 +298,7 @@ void TStats_agg::init()
   _zona      = ini.get_bool("ZonaGrp");
   _giacenza  = ini.get_bool("GiacenzaGrp");
   _magazzino = ini.get_bool("MagazzinoGrp");
-  _catvend    = ini.get_bool("CatVendGrp");
+  _catvend   = ini.get_bool("CatVendGrp");
 }
 
 void TStats_agg::test_firm() const
diff --git a/sv/svlib01.h b/sv/svlib01.h
index ebbb76bdb..991c45aff 100755
--- a/sv/svlib01.h
+++ b/sv/svlib01.h
@@ -1,21 +1,18 @@
 #ifndef __SVLIB01_H
 #define __SVLIB01_H
 
-#ifndef __ASSOC_H
-#include "assoc.h"
+#ifndef __VARREC_H
+#include <varrec.h>
+#endif
+
+#ifndef __SVLIB09_H
+#include "svlib09.h"
 #endif
 
 #ifndef __VELIB_H
-#include "..\ve\velib.h"
+class TRiga_documento;
 #endif
 
-#ifndef __TABUTIL_H
-#include <tabutil.h>
-#endif
-
-#include "..\mg\mglib.h"
-#include "svlib09.h"
-
 enum TFrequenza_statistiche { fs_nulla, fs_giornaliera, 
                               fs_settimanale, fs_quindicinale, 
                               fs_mensile, fs_bimestrale, 
@@ -101,7 +98,6 @@ public:
 
 class TSVriep_record : public TVariable_rectype
 {
-  
 public:
 
   virtual const TString & get_str(const char* fieldname) const;
@@ -112,7 +108,6 @@ public:
 
 const TString& get_partname(const char *lev_code) ;
 
-
 class TStat_cache : public TRWrecord_cache
 {
 protected:
diff --git a/sv/svlib09.h b/sv/svlib09.h
index 01fe5b352..6ad9c5253 100755
--- a/sv/svlib09.h
+++ b/sv/svlib09.h
@@ -1,20 +1,10 @@
 #ifndef __SVLIB09_H
 #define __SVLIB09_H
 
-#ifndef __ASSOC_H
-#include "assoc.h"
+#ifndef __RECARRAY_H
+#include <recarray.h>
 #endif
 
-#ifndef __VELIB_H
-#include "..\ve\velib.h"
-#endif
-
-#ifndef __TABUTIL_H
-#include <tabutil.h>
-#endif
-
-#include "..\mg\mglib.h"
-
 class TRWrecord_cache : public TRecord_cache
 {
   TAssoc_array _flags;