[Adonthell-commits] CVS: adonthell/src/tools/dlgedit dlg_arrow.cc,1.2,1.3 dlg_arrow.h,1.2,1.3 dlg_circle.cc,1.3,1.4 dlg_circle.h,1.3,1.4 dlg_compiler.cc,1.7,1.8 dlg_compiler.h,1.4,1.5 dlg_module.cc,1.4,1.5 dlg_module.h,1.3,1.4 dlg_node.h,1.2,1.3 gui_settings.cc,1.3,1.4 main.cc,1.56,1.57

[Kai Sterker <address@hidden>]

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

Modified Files:
        dlg_arrow.cc dlg_arrow.h dlg_circle.cc dlg_circle.h 
        dlg_compiler.cc dlg_compiler.h dlg_module.cc dlg_module.h 
        dlg_node.h gui_settings.cc main.cc 
Log Message:
FIXED warnings when compiling with gcc 3.1

Index: dlg_arrow.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/dlg_arrow.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** dlg_arrow.cc        7 Apr 2002 09:51:28 -0000       1.2
--- dlg_arrow.cc        1 Jul 2002 13:53:59 -0000       1.3
***************
*** 218,222 ****
  
  // save an arrow to file
! void DlgArrow::save (ofstream &file)
  {
      // Keyword "Arrow" and arrow's number
--- 218,222 ----
  
  // save an arrow to file
! void DlgArrow::save (std::ofstream &file)
  {
      // Keyword "Arrow" and arrow's number

Index: dlg_arrow.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/dlg_arrow.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** dlg_arrow.h 7 Apr 2002 09:51:28 -0000       1.2
--- dlg_arrow.h 1 Jul 2002 13:53:59 -0000       1.3
***************
*** 72,76 ****
       * @param file Stream to an open file
       */
!     void save (ofstream &file);
      
      /**
--- 72,76 ----
       * @param file Stream to an open file
       */
!     void save (std::ofstream &file);
      
      /**

Index: dlg_circle.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/dlg_circle.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** dlg_circle.cc       25 Jun 2002 16:25:52 -0000      1.3
--- dlg_circle.cc       1 Jul 2002 13:53:59 -0000       1.4
***************
*** 239,243 ****
  
  // save all data neccessary to restore the circle
! void DlgCircle::save (ofstream &file)
  {
      // Keyword "Circle" and circle's number
--- 239,243 ----
  
  // save all data neccessary to restore the circle
! void DlgCircle::save (std::ofstream &file)
  {
      // Keyword "Circle" and circle's number

Index: dlg_circle.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/dlg_circle.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** dlg_circle.h        28 Apr 2002 15:31:55 -0000      1.3
--- dlg_circle.h        1 Jul 2002 13:53:59 -0000       1.4
***************
*** 92,96 ****
       * @param file Stream to an open file
       */
!     void save (ofstream &file);
  
      /**
--- 92,96 ----
       * @param file Stream to an open file
       */
!     void save (std::ofstream &file);
  
      /**

Index: dlg_compiler.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/dlg_compiler.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** dlg_compiler.cc     25 Jun 2002 16:25:52 -0000      1.7
--- dlg_compiler.cc     1 Jul 2002 13:53:59 -0000       1.8
***************
*** 21,25 ****
  
  #include <iterator>
! #include <ostream.h>
  #include "dlg_cmdline.h"
  #include "dlg_compiler.h"
--- 21,25 ----
  
  #include <iterator>
! #include <iostream>
  #include "dlg_cmdline.h"
  #include "dlg_compiler.h"
***************
*** 307,311 ****
  
  #ifdef _DEBUG_
!     cout << ">>> " << code << endl;
  #endif
      // replace the_npc/the_player with self.the_npc/self.the_player
--- 307,311 ----
  
  #ifdef _DEBUG_
!     std::cout << ">>> " << code << std::endl;
  #endif
      // replace the_npc/the_player with self.the_npc/self.the_player
***************
*** 366,371 ****
  
  #ifdef _DEBUG_
!                 cout << "token = '" << stripped << "', operator = '" <<
!                     operators[i] << "'\n" << flush;
  #endif
  
--- 366,371 ----
  
  #ifdef _DEBUG_
!                 std::cout << "token = '" << stripped << "', operator = '" <<
!                     operators[i] << "'\n" << std::flush;
  #endif
  
***************
*** 444,450 ****
                  begin = pos;
  #ifdef _DEBUG_
!                 cout << code << endl;
!                 for (u_int32 j = 0; j < begin; j++) cout << " ";
!                 cout << "^\n";
  #endif
                  break;
--- 444,450 ----
                  begin = pos;
  #ifdef _DEBUG_
!                 std::cout << code << std::endl;
!                 for (unsigned int j = 0; j < begin; j++) std::cout << " ";
!                 std::cout << "^\n";
  #endif
                  break;
***************
*** 452,456 ****
  
  #ifdef _DEBUG_
!     cout << "<<< " << code << "\n\n";
  #endif
      return code;
--- 452,456 ----
  
  #ifdef _DEBUG_
!     std::cout << "<<< " << code << "\n\n";
  #endif
      return code;
***************
*** 587,591 ****
          
              // add error to list
!             if (DlgCmdline::compile) cout << error;
              else GuiError::console->add (error, circle);
  
--- 587,591 ----
          
              // add error to list
!             if (DlgCmdline::compile) std::cout << error;
              else GuiError::console->add (error, circle);
  
***************
*** 606,610 ****
  
          // add error to list
!         if (DlgCmdline::compile) cout << error;
          else GuiError::console->add (error, circle);
          
--- 606,610 ----
  
          // add error to list
!         if (DlgCmdline::compile) std::cout << error;
          else GuiError::console->add (error, circle);
          
***************
*** 668,672 ****
              
              // add error to the error console
!             if (DlgCmdline::compile) cout << error;
              else GuiError::console->add (error, circle);
              
--- 668,672 ----
              
              // add error to the error console
!             if (DlgCmdline::compile) std::cout << error;
              else GuiError::console->add (error, circle);
              
***************
*** 710,714 ****
              error += "\"\n ";
              
!             if (DlgCmdline::compile) cout << error;
              else GuiError::console->add (error, child);
              
--- 710,714 ----
              error += "\"\n ";
              
!             if (DlgCmdline::compile) std::cout << error;
              else GuiError::console->add (error, child);
              

Index: dlg_compiler.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/dlg_compiler.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** dlg_compiler.h      25 Jun 2002 16:25:52 -0000      1.4
--- dlg_compiler.h      1 Jul 2002 13:53:59 -0000       1.5
***************
*** 24,28 ****
  
  #include <vector>
! #include <fstream.h>
  #include "dlg_module.h"
  #include "dlg_circle.h"
--- 24,28 ----
  
  #include <vector>
! #include <fstream>
  #include "dlg_module.h"
  #include "dlg_circle.h"
***************
*** 133,137 ****
      token getToken (const std::string &statement);
      
!     ofstream file;
      DlgModule *dialogue;            // The dialogue to be compiled    
      
--- 133,137 ----
      token getToken (const std::string &statement);
      
!     std::ofstream file;
      DlgModule *dialogue;            // The dialogue to be compiled    
      

Index: dlg_module.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/dlg_module.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** dlg_module.cc       25 Jun 2002 16:25:52 -0000      1.4
--- dlg_module.cc       1 Jul 2002 13:53:59 -0000       1.5
***************
*** 296,300 ****
  bool DlgModule::save (std::string &file)
  {
!     ofstream out (file.c_str ());
      int index = 0;
      
--- 296,300 ----
  bool DlgModule::save (std::string &file)
  {
!     std::ofstream out (file.c_str ());
      int index = 0;
      

Index: dlg_module.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/dlg_module.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** dlg_module.h        25 Jun 2002 16:25:52 -0000      1.3
--- dlg_module.h        1 Jul 2002 13:53:59 -0000       1.4
***************
*** 129,133 ****
       * Save the Dialogue to a file
       */
!     void save (ofstream &file)          { }
      
      /**
--- 129,133 ----
       * Save the Dialogue to a file
       */
!     void save (std::ofstream &file)          { }
      
      /**

Index: dlg_node.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/dlg_node.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** dlg_node.h  7 Apr 2002 09:51:28 -0000       1.2
--- dlg_node.h  1 Jul 2002 13:53:59 -0000       1.3
***************
*** 26,30 ****
  #include <string>
  #include <stdio.h>
! #include <fstream.h>
  #include "dlg_types.h"
  #include "dlg_node_gfx.h"
--- 26,30 ----
  #include <string>
  #include <stdio.h>
! #include <fstream>
  #include "dlg_types.h"
  #include "dlg_node_gfx.h"
***************
*** 132,136 ****
       * @param out Stream to the file to save to
       */
!     virtual void save (ofstream &out) { } 
      
      /**
--- 132,136 ----
       * @param out Stream to the file to save to
       */
!     virtual void save (std::ofstream &out) { }
      
      /**

Index: gui_settings.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/gui_settings.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** gui_settings.cc     17 Apr 2002 10:01:17 -0000      1.3
--- gui_settings.cc     1 Jul 2002 13:53:59 -0000       1.4
***************
*** 22,26 ****
  #include <gtk/gtk.h>
  #include <sys/stat.h>
! #include <iostream.h>
  #include "dlg_types.h"
  #include "gui_file.h"
--- 22,26 ----
  #include <gtk/gtk.h>
  #include <sys/stat.h>
! #include <iostream>
  #include "dlg_types.h"
  #include "gui_file.h"
***************
*** 208,211 ****
  {
      if (!entry->setProject (gtk_entry_get_text (GTK_ENTRY (project))))
!         cout << "Loading quests/characters failed!\n";
  }
--- 208,211 ----
  {
      if (!entry->setProject (gtk_entry_get_text (GTK_ENTRY (project))))
!         std::cout << "Loading quests/characters failed!\n";
  }

Index: main.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/main.cc,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -r1.56 -r1.57
*** main.cc     17 Apr 2002 10:01:17 -0000      1.56
--- main.cc     1 Jul 2002 13:53:59 -0000       1.57
***************
*** 25,29 ****
  
  #include <gtk/gtk.h>
! #include <iostream.h>
  #include <locale.h>
  #include "gettext.h"
--- 25,29 ----
  
  #include <gtk/gtk.h>
! #include <iostream>
  #include <locale.h>
  #include "gettext.h"
***************
*** 84,88 ****
              if (!GuiDlgedit::checkDialogue (dialogue))
              {
!                 cout << "Loading of '" << dialogue << "' failed\n";
                  continue;
              }
--- 84,88 ----
              if (!GuiDlgedit::checkDialogue (dialogue))
              {
!                 std::cout << "Loading of '" << dialogue << "' failed\n";
                  continue;
              }
***************
*** 93,101 ****
              if (!module->load ())
              {
!                 cout << "Loading of '" << dialogue << "' failed\n";
              }
              else
              {            
!                 cout << "Compiling '" << dialogue << "' ...\n";
              
                  // try to compile the dialogue
--- 93,101 ----
              if (!module->load ())
              {
!                 std::cout << "Loading of '" << dialogue << "' failed\n";
              }
              else
              {            
!                 std::cout << "Compiling '" << dialogue << "' ...\n";
              
                  // try to compile the dialogue