[Adonthell-commits] CVS: adonthell/src/tools/dlgedit cfg_data.cc,1.6,1.7 dlg_arrow.cc,1.9,1.10 gui_settings.cc,1.10,1.11

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/adonthell/src/tools/dlgedit
In directory subversions:/tmp/cvs-serv24242/tools/dlgedit

Modified Files:
        cfg_data.cc dlg_arrow.cc gui_settings.cc 
Log Message:
FIXED compilation with gcc 3.2

Index: cfg_data.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/cfg_data.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** cfg_data.cc 5 May 2003 18:50:29 -0000       1.6
--- cfg_data.cc 6 May 2003 08:38:07 -0000       1.7
***************
*** 157,161 ****
      
      // default project
!     projects.push_back (string ("none"));
      
      // no such directory
--- 157,161 ----
      
      // default project
!     projects.push_back (std::string ("none"));
      
      // no such directory

Index: dlg_arrow.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/dlg_arrow.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** dlg_arrow.cc        1 Jan 2003 20:47:18 -0000       1.9
--- dlg_arrow.cc        6 May 2003 08:38:07 -0000       1.10
***************
*** 21,24 ****
--- 21,25 ----
  
  #include <math.h>
+ #include <iostream>
  #include "dlg_arrow.h"
  #include "dlg_module.h"
***************
*** 108,116 ****
      
      // gradient of line
!     double x = end.x () - start.x ();
!     double y = end.y () - start.y ();
  
      // tangens of angle between line(start, end) and x-axis
!     double m = x == 0 ? 1.0 : y / x;
      
      // direction where line(start, end) intersects with border of start
--- 109,117 ----
      
      // gradient of line
!     int x = end.x () - start.x ();
!     int y = end.y () - start.y ();
  
      // tangens of angle between line(start, end) and x-axis
!     double m = x == 0 ? 1.0 : double (y) / x;
      
      // direction where line(start, end) intersects with border of start
***************
*** 276,281 ****
                      if (!owner || owner->type () != MODULE)
                      {
!                         cout << "DlgArrow::load: failed to getModule (" 
!                              << n << ")!" << endl;
                          
                          return false;
--- 277,282 ----
                      if (!owner || owner->type () != MODULE)
                      {
!                         std::cout << "DlgArrow::load: failed to getModule (" 
!                              << n << ")!" << std::endl;
                          
                          return false;

Index: gui_settings.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/gui_settings.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** gui_settings.cc     5 May 2003 18:50:29 -0000       1.10
--- gui_settings.cc     6 May 2003 08:38:07 -0000       1.11
***************
*** 23,26 ****
--- 23,27 ----
  #include <sys/stat.h>
  #include <vector>
+ #include <iostream>
  #include "cfg_data.h"
  #include "gui_file.h"