Risolti conflitti

git-svn-id: svn://10.65.10.50/trunk@6591 c028cbd2-c16b-5b4b-a496-9718f37d4682

include/applicat.cpp

@@ -16,21 +16,12 @@
 
 #include <bagn002.h>
 
-<<<<<<< applicat.cpp
-=======
-// #define  BITTEST(w,p) (((w) & (0x0001 << (p))) != 0)
-
->>>>>>> 1.90.2.4
 ///////////////////////////////////////////////////////////
 // Metodi di accesso globali all'applicazione corrente
 ///////////////////////////////////////////////////////////
 
 HIDDEN TApplication* _application = NULL;
-<<<<<<< applicat.cpp
 HIDDEN bool _xvt_running = FALSE;
-=======
-HIDDEN BOOL _xvt_running = FALSE;
->>>>>>> 1.90.2.4
 
 // @doc EXTERNAL
 
@@ -572,18 +563,8 @@ void TApplication::run(
     _name = cmd2name(argv[0]);
   }
   
-<<<<<<< applicat.cpp
   const int sn = get_serial_number();
   
-=======
-  if (use_files())
-    init_global_vars();
-  else
-    CGetPref();           
-  
-  const int sn = get_serial_number();
-  
->>>>>>> 1.90.2.4
   if (sn < 0)  
   {
     error_box("Probabilmente non e' stata inserita la chiave di protezione");
@@ -637,13 +618,8 @@ bool TApplication::get_version_info(int& year, int& release, int& tag, int& patc
 // About box: risposta alla opzione Informazioni del menu File
 void TApplication::about() const
 {
-<<<<<<< applicat.cpp
   const TFilename n(argv(0));
   const word ser_no = dongle().number();
-=======
-  const TFilename n(__argv[0]);
-  const word ser_no = dongle().number();
->>>>>>> 1.90.2.4
   int year, release, tag, patch;
 
   if (get_version_info(year, release, tag, patch))

include/checks.cpp

@@ -155,7 +155,7 @@ bool sorry_box(
 // @doc EXTERNAL
 
 // @msg yesno_box | Crea una finestra di RICHIESTA con il relativo messaggio
-int noyes_box(
+bool noyes_box(
   const char* fmt,   // @parm Messaggio da stampare nella finestra
   ...)               // @parmvar Uno o piu' parametri corrispondenti ai codici in <p fmt>
 {
@@ -171,7 +171,7 @@ int noyes_box(
   if (r == RESP_DEFAULT) r = K_NO;
   else
     if (r == RESP_2) r = K_YES;
-  return r;
+  return r == K_YES;
 #endif
 }
 
@@ -179,7 +179,7 @@ int noyes_box(
 // @doc EXTERNAL
 
 // @msg yesno_box | Crea una finestra di RICHIESTA con il relativo messaggio
-int yesno_box(
+bool yesno_box(
   const char* fmt,   // @parm Messaggio da stampare nella finestra
   ...)                           // @parmvar Uno o piu' parametri corrispondenti ai codici in <p fmt>
 
@@ -206,18 +206,6 @@ int yesno_box(
 #endif
 }
 
-
-bool noyes_box(const char* fmt, ...)
-{
-  buildmsg();
-
-  MessageBeep(MB_ICONQUESTION);
-  int r = MessageBox(GetFocus(), msg, "RICHIESTA",
-                     MB_YESNO | MB_ICONQUESTION | MB_DEFBUTTON2);
-  return r == IDYES;
-}
-
-
 // @doc EXTERNAL
 
 // @msg yesnofatal_box | Crea una finestra di RICHIESTA con il relativo
@@ -242,7 +230,7 @@ bool yesnofatal_box(
 
 #ifdef DBG  
   char s[256]; sprintf(s, "%s\nContinuare ugualmente?", msg);
-  const int ret = yesno_box("%s", s);
+  const bool ret = yesno_box("%s", s);
   if (!ret) fatal_box(msg);
 #else
   fatal_box("%s", msg);

include/checks.h

@@ -8,13 +8,13 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-  int message_box(const char* fmt, ...);
-  int warning_box(const char* fmt, ...);
-  int sorry_box(const char* fmt, ...);
-  int error_box(const char* fmt, ...);
-  int fatal_box(const char* fmt, ...);
-  int noyes_box(const char* fmt, ...);
-  int yesno_box(const char* fmt, ...);
+  bool message_box(const char* fmt, ...);
+  bool warning_box(const char* fmt, ...);
+  bool sorry_box(const char* fmt, ...);
+  bool error_box(const char* fmt, ...);
+  bool fatal_box(const char* fmt, ...);
+  bool noyes_box(const char* fmt, ...);
+  bool yesno_box(const char* fmt, ...);
   int yesnocancel_box(const char* fmt, ...);
   bool yesnofatal_box(const char* fmt, ...);
   bool __trace(const char* fmt, ...);

include/config.cpp

@@ -583,10 +583,6 @@ int TConfig::list_paragraphs(TString_array& pl)
   return pl.items();
 }
 
-<<<<<<< config.cpp
-int TConfig::list_variables(TString_array& vl, bool value, const char* section)
-{
-=======
 HIDDEN int compare_ini_variables(const TObject**o1, const TObject**o2)
 {
   const TString* s1 = (const TString*)*o1;
@@ -618,7 +614,6 @@ HIDDEN int compare_ini_variables(const TObject**o1, const TObject**o2)
 
 int TConfig::list_variables(TString_array& vl, bool value, const char* section, const bool sort)
 {              
->>>>>>> 1.54.2.5
   set_paragraph(section);
   vl.destroy();
   _data.restart();

include/controls.cpp

@@ -84,19 +84,11 @@ KEY TControl::xiev_to_key(const XI_EVENT* xiev)
   KEY key = k;
   if (key < K_INS || key > K_HELP)
   {
-<<<<<<< controls.cpp
-    if (xiev->v.chr.shift && (k < ' ' || k >= K_UP)) key += K_SHIFT;
-//    if (xiev->v.chr.control && k >= ' ') key += K_CTRL;
-//  Correzione per gestire i tasti AltGr sulle tastiere non U.S.A.     
-    if (xiev->v.chr.control && ((k >= K_F1 && k <= K_F12) || isalnum(k) || strchr("\r+-*/", k))) 
-      key += K_CTRL;
-=======
     if (xiev->v.chr.shift && (k < ' ' || k >= K_UP)) key += K_SHIFT;
     //if (xiev->v.chr.control && k >= ' ') key += K_CTRL;
 //  Correzione per gestire i tasti AltGr sulle tastiere non U.S.A.     
     if (xiev->v.chr.control && (k > K_SHIFT || (k >= K_F1 && k <= K_F12) || isalnum(k) || strchr("\r+-*/",k) != NULL)) 
       key += K_CTRL;
->>>>>>> 1.99.2.1
   }
   return key;
 }
@@ -452,17 +444,11 @@ WINDOW create_interface(WINDOW parent, short x, short y, short dx, short dy,
   def->v.itf->tab_on_enter = TRUE;
   def->v.itf->win = win;
 
-<<<<<<< controls.cpp
-  def->v.itf->edit_menu = TRUE;      // Update edit menu items
-  def->v.itf->menu_win = TASK_WIN;   // Window that owns the menu
-
-=======
 #ifdef XI_R4
   def->v.itf->edit_menu = TRUE;      // Update edit menu items
   def->v.itf->menu_win = TASK_WIN;   // Window that owns the menu
 #endif
 
->>>>>>> 1.99.2.1
   XI_OBJ* itf = xi_create(NULL, def);
   CHECK(itf, "Can't create an interface");
 

include/isam.cpp

@@ -9,6 +9,7 @@
 #include <progind.h>
 #endif
 
+#include <codeb.h>
 #include <config.h>
 #include <extcdecl.h>
 #include <mailbox.h>