[Tora-cvs] tora tobrowser.h,1.43,1.44 totool.h,1.37,1.38 toalert.cpp,1.30,1.31 toanalyze.cpp,1.39,1.40 tobackup.cpp,1.8,1.9 tobrowser.cpp,1.133,1.134 tocurrent.cpp,1.41,1.42 todebug.cpp,1.124,1.125 toinvalid.cpp,1.26,1.27 tooutput.cpp,1.49,1.50 toprofiler.cpp,1.19,1.20 torollback.cpp,1.71,1.72 toscript.cpp,1.70,1.71 tosecurity.cpp,1.59,1.60 tosession.cpp,1.78,1.79 tosgatrace.cpp,1.63,1.64 tostorage.cpp,1.70,1.71 totemplate.cpp,1.66,1.67 totemporary.cpp,1.6,1.7 totool.cpp,1.81,1.82 totuning.cpp,1.102,1.103 toworksheet.cpp,1.197,1.198

[mrjohnson <mrj...@us...>]

Update of /cvsroot/tora/tora
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19497

Modified Files:
	tobrowser.h totool.h toalert.cpp toanalyze.cpp tobackup.cpp 
	tobrowser.cpp tocurrent.cpp todebug.cpp toinvalid.cpp 
	tooutput.cpp toprofiler.cpp torollback.cpp toscript.cpp 
	tosecurity.cpp tosession.cpp tosgatrace.cpp tostorage.cpp 
	totemplate.cpp totemporary.cpp totool.cpp totuning.cpp 
	toworksheet.cpp 
Log Message:
pointers to character constants should be const char* . this fixes a
bunch of compiler warnings with newer gcc.

also, totemplate.cpp used #if TO_KDE, changed to #ifdef like other
files use.



Index: tobackup.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tobackup.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tobackup.cpp	12 May 2004 19:02:11 -0000	1.8
--- tobackup.cpp	23 Feb 2005 22:47:15 -0000	1.9
***************
*** 64,68 ****
    std::map<toConnection *,QWidget *> Windows;
  
!   virtual char **pictureXPM(void)
    { return tobackup_xpm; }
  public:
--- 64,68 ----
    std::map<toConnection *,QWidget *> Windows;
  
!   virtual const char **pictureXPM(void)
    { return tobackup_xpm; }
  public:

Index: totool.cpp
===================================================================
RCS file: /cvsroot/tora/tora/totool.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** totool.cpp	18 Feb 2005 17:03:30 -0000	1.81
--- totool.cpp	23 Feb 2005 22:47:16 -0000	1.82
***************
*** 200,206 ****
  #endif
  
! char **toTool::pictureXPM(void)
  {
!   return NULL;
  }
  
--- 200,206 ----
  #endif
  
! const char **toTool::pictureXPM(void)
  {
!   return (const char **) NULL;  // compiler warning
  }
  
***************
*** 224,230 ****
  {
    if (!ButtonPicture) {
!     char **picture=pictureXPM();
      if (picture)
!       ButtonPicture=new QPixmap((const char **)picture);
    }
    return ButtonPicture;
--- 224,230 ----
  {
    if (!ButtonPicture) {
!     const char **picture=pictureXPM();
      if (picture)
!       ButtonPicture=new QPixmap(picture);
    }
    return ButtonPicture;

Index: toworksheet.cpp
===================================================================
RCS file: /cvsroot/tora/tora/toworksheet.cpp,v
retrieving revision 1.197
retrieving revision 1.198
diff -C2 -d -r1.197 -r1.198
*** toworksheet.cpp	20 May 2004 07:10:51 -0000	1.197
--- toworksheet.cpp	23 Feb 2005 22:47:16 -0000	1.198
***************
*** 198,202 ****
  class toWorksheetTool : public toTool {
  protected:
!   virtual char **pictureXPM(void)
    { return toworksheet_xpm; }
  public:
--- 198,202 ----
  class toWorksheetTool : public toTool {
  protected:
!   virtual const char **pictureXPM(void)
    { return toworksheet_xpm; }
  public:

Index: totemplate.cpp
===================================================================
RCS file: /cvsroot/tora/tora/totemplate.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** totemplate.cpp	12 May 2004 19:02:34 -0000	1.66
--- totemplate.cpp	23 Feb 2005 22:47:16 -0000	1.67
***************
*** 388,392 ****
    toTemplate *Window;
  protected:
!   virtual char **pictureXPM(void)
    { return totemplate_xpm; }
  public:
--- 388,392 ----
    toTemplate *Window;
  protected:
!   virtual const char **pictureXPM(void)
    { return totemplate_xpm; }
  public:
***************
*** 402,406 ****
        Window=new toTemplate(Dock);
      } else if (Dock->isHidden()) {
! #if TO_KDE
        toAttachDock(Dock,Window,QMainWindow::Left);
  #else
--- 402,406 ----
        Window=new toTemplate(Dock);
      } else if (Dock->isHidden()) {
! #ifdef TO_KDE
        toAttachDock(Dock,Window,QMainWindow::Left);
  #else
***************
*** 409,413 ****
        Window->showResult(true);
      } else {
! #if TO_KDE
        toAttachDock(Dock,Window,QMainWindow::Minimized);
  #else
--- 409,413 ----
        Window->showResult(true);
      } else {
! #ifdef TO_KDE
        toAttachDock(Dock,Window,QMainWindow::Minimized);
  #else
***************
*** 534,538 ****
  
    if (show) {
! #if TO_KDE
      toAttachDock((TODock *)Result,Frame,QMainWindow::Bottom);
  #else
--- 534,538 ----
  
    if (show) {
! #ifdef TO_KDE
      toAttachDock((TODock *)Result,Frame,QMainWindow::Bottom);
  #else
***************
*** 540,544 ****
  #endif
    } else {
! #if TO_KDE
      toAttachDock((TODock *)Result,Frame,QMainWindow::Minimized);
  #else
--- 540,544 ----
  #endif
    } else {
! #ifdef TO_KDE
      toAttachDock((TODock *)Result,Frame,QMainWindow::Minimized);
  #else

Index: tosession.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tosession.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** tosession.cpp	12 May 2004 19:02:34 -0000	1.78
--- tosession.cpp	23 Feb 2005 22:47:16 -0000	1.79
***************
*** 82,86 ****
  class toSessionTool : public toTool {
  protected:
!   virtual char **pictureXPM(void)
    { return tosession_xpm; }
  public:
--- 82,86 ----
  class toSessionTool : public toTool {
  protected:
!   virtual const char **pictureXPM(void)
    { return tosession_xpm; }
  public:

Index: tosecurity.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tosecurity.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** tosecurity.cpp	12 May 2004 19:02:34 -0000	1.59
--- tosecurity.cpp	23 Feb 2005 22:47:16 -0000	1.60
***************
*** 177,181 ****
  class toSecurityTool : public toTool {
  protected:
!   virtual char **pictureXPM(void)
    { return tosecurity_xpm; }
  public:
--- 177,181 ----
  class toSecurityTool : public toTool {
  protected:
!   virtual const char **pictureXPM(void)
    { return tosecurity_xpm; }
  public:

Index: toscript.cpp
===================================================================
RCS file: /cvsroot/tora/tora/toscript.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** toscript.cpp	29 Jun 2004 04:38:01 -0000	1.70
--- toscript.cpp	23 Feb 2005 22:47:16 -0000	1.71
***************
*** 181,185 ****
  class toScriptTool : public toTool {
  protected:
!   virtual char **pictureXPM(void)
    { return toscript_xpm; }
  public:
--- 181,185 ----
  class toScriptTool : public toTool {
  protected:
!   virtual const char **pictureXPM(void)
    { return toscript_xpm; }
  public:

Index: todebug.cpp
===================================================================
RCS file: /cvsroot/tora/tora/todebug.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** todebug.cpp	31 May 2004 22:43:11 -0000	1.124
--- todebug.cpp	23 Feb 2005 22:47:15 -0000	1.125
***************
*** 118,122 ****
    std::map<toConnection *,QWidget *> Windows;
  
!   virtual char **pictureXPM(void)
    { return todebug_xpm; }
  public:
--- 118,122 ----
    std::map<toConnection *,QWidget *> Windows;
  
!   virtual const char **pictureXPM(void)
    { return todebug_xpm; }
  public:
***************
*** 829,834 ****
  
  static struct TypeMapType {
!   char *Type;
!   char *Description;
    bool WantName;
    bool Declaration;
--- 829,834 ----
  
  static struct TypeMapType {
!   const char *Type;
!   const char *Description;
    bool WantName;
    bool Declaration;

Index: totool.h
===================================================================
RCS file: /cvsroot/tora/tora/totool.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** totool.h	12 May 2004 19:02:34 -0000	1.37
--- totool.h	23 Feb 2005 22:47:15 -0000	1.38
***************
*** 1,3 ****
! //***************************************************************************
  /*
   * TOra - An Oracle Toolkit for DBA's and developers
--- 1,3 ----
! /***************************************************************************
  /*
   * TOra - An Oracle Toolkit for DBA's and developers
***************
*** 103,107 ****
     * Should return the xpm used to create the @ref ButtonPicture.
     */
!   virtual char **pictureXPM(void);
  public:
    /**
--- 103,107 ----
     * Should return the xpm used to create the @ref ButtonPicture.
     */
!   virtual const char **pictureXPM(void);
  public:
    /**

Index: toinvalid.cpp
===================================================================
RCS file: /cvsroot/tora/tora/toinvalid.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** toinvalid.cpp	17 Feb 2005 16:42:28 -0000	1.26
--- toinvalid.cpp	23 Feb 2005 22:47:15 -0000	1.27
***************
*** 89,93 ****
  
  class toInvalidTool : public toTool {
!   virtual char **pictureXPM(void)
    { return toinvalid_xpm; }
  public:
--- 89,93 ----
  
  class toInvalidTool : public toTool {
!   virtual const char **pictureXPM(void)
    { return toinvalid_xpm; }
  public:

Index: tostorage.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tostorage.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** tostorage.cpp	23 Feb 2005 17:18:12 -0000	1.70
--- tostorage.cpp	23 Feb 2005 22:47:16 -0000	1.71
***************
*** 129,133 ****
  class toStorageTool : public toTool {
  protected:
!   virtual char **pictureXPM(void)
    { return tostorage_xpm; }
  public:
--- 129,133 ----
  class toStorageTool : public toTool {
  protected:
!   virtual const char **pictureXPM(void)
    { return tostorage_xpm; }
  public:

Index: tobrowser.h
===================================================================
RCS file: /cvsroot/tora/tora/tobrowser.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** tobrowser.h	29 Jun 2004 04:38:01 -0000	1.43
--- tobrowser.h	23 Feb 2005 22:47:15 -0000	1.44
***************
*** 183,187 ****
  
  protected:
!   virtual char **pictureXPM(void);
  public:
    toBrowserTool();
--- 183,187 ----
  
  protected:
!   virtual const char **pictureXPM(void);
  public:
    toBrowserTool();

Index: toanalyze.cpp
===================================================================
RCS file: /cvsroot/tora/tora/toanalyze.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** toanalyze.cpp	12 May 2004 19:02:11 -0000	1.39
--- toanalyze.cpp	23 Feb 2005 22:47:15 -0000	1.40
***************
*** 73,77 ****
  
  class toAnalyzeTool : public toTool {
!   virtual char **pictureXPM(void)
    { return toanalyze_xpm; }
  public:
--- 73,77 ----
  
  class toAnalyzeTool : public toTool {
!   virtual const char **pictureXPM(void)
    { return toanalyze_xpm; }
  public:

Index: torollback.cpp
===================================================================
RCS file: /cvsroot/tora/tora/torollback.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** torollback.cpp	12 May 2004 19:02:34 -0000	1.71
--- torollback.cpp	23 Feb 2005 22:47:15 -0000	1.72
***************
*** 169,173 ****
  class toRollbackTool : public toTool {
  protected:
!   virtual char **pictureXPM(void)
    { return torollback_xpm; }
  public:
--- 169,173 ----
  class toRollbackTool : public toTool {
  protected:
!   virtual const char **pictureXPM(void)
    { return torollback_xpm; }
  public:

Index: tobrowser.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tobrowser.cpp,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** tobrowser.cpp	17 Feb 2005 17:13:18 -0000	1.133
--- tobrowser.cpp	23 Feb 2005 22:47:15 -0000	1.134
***************
*** 128,132 ****
  
  
! char **toBrowserTool::pictureXPM(void)
  {
    return tobrowser_xpm;
--- 128,132 ----
  
  
! const char **toBrowserTool::pictureXPM(void)
  {
    return tobrowser_xpm;

Index: tosgatrace.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tosgatrace.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** tosgatrace.cpp	12 May 2004 19:02:34 -0000	1.63
--- tosgatrace.cpp	23 Feb 2005 22:47:16 -0000	1.64
***************
*** 103,107 ****
  class toSGATraceTool : public toTool {
  protected:
!   virtual char **pictureXPM(void)
    { return tosgatrace_xpm; }
  public:
--- 103,107 ----
  class toSGATraceTool : public toTool {
  protected:
!   virtual const char **pictureXPM(void)
    { return tosgatrace_xpm; }
  public:

Index: totuning.cpp
===================================================================
RCS file: /cvsroot/tora/tora/totuning.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** totuning.cpp	17 Feb 2005 19:37:10 -0000	1.102
--- totuning.cpp	23 Feb 2005 22:47:16 -0000	1.103
***************
*** 140,144 ****
  class toTuningTool : public toTool {
  protected:
!   virtual char **pictureXPM(void)
    { return totuning_xpm; }
  public:
--- 140,144 ----
  class toTuningTool : public toTool {
  protected:
!   virtual const char **pictureXPM(void)
    { return totuning_xpm; }
  public:

Index: toalert.cpp
===================================================================
RCS file: /cvsroot/tora/tora/toalert.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** toalert.cpp	12 May 2004 19:02:11 -0000	1.30
--- toalert.cpp	23 Feb 2005 22:47:15 -0000	1.31
***************
*** 81,85 ****
    std::map<toConnection *,QWidget *> Windows;
  
!   virtual char **pictureXPM(void)
    { return toalert_xpm; }
  public:
--- 81,85 ----
    std::map<toConnection *,QWidget *> Windows;
  
!   virtual const char **pictureXPM(void)
    { return toalert_xpm; }
  public:

Index: totemporary.cpp
===================================================================
RCS file: /cvsroot/tora/tora/totemporary.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** totemporary.cpp	12 May 2004 19:02:34 -0000	1.6
--- totemporary.cpp	23 Feb 2005 22:47:16 -0000	1.7
***************
*** 107,111 ****
  
  class toTemporaryTool : public toTool {
!   virtual char **pictureXPM(void)
    { return totemporary_xpm; }
  public:
--- 107,111 ----
  
  class toTemporaryTool : public toTool {
!   virtual const char **pictureXPM(void)
    { return totemporary_xpm; }
  public:

Index: toprofiler.cpp
===================================================================
RCS file: /cvsroot/tora/tora/toprofiler.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** toprofiler.cpp	12 Jan 2004 01:06:05 -0000	1.19
--- toprofiler.cpp	23 Feb 2005 22:47:15 -0000	1.20
***************
*** 223,227 ****
  
  class toProfilerTool : public toTool {
!   virtual char **pictureXPM(void)
    { return clock_xpm; }
  public:
--- 223,227 ----
  
  class toProfilerTool : public toTool {
!   virtual const char **pictureXPM(void)
    { return clock_xpm; }
  public:

Index: tooutput.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tooutput.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** tooutput.cpp	17 Feb 2005 19:37:09 -0000	1.49
--- tooutput.cpp	23 Feb 2005 22:47:15 -0000	1.50
***************
*** 122,126 ****
    std::map<toConnection *,QWidget *> Windows;
  
!   virtual char **pictureXPM(void)
    { return tooutput_xpm; }
  public:
--- 122,126 ----
    std::map<toConnection *,QWidget *> Windows;
  
!   virtual const char **pictureXPM(void)
    { return tooutput_xpm; }
  public:

Index: tocurrent.cpp
===================================================================
RCS file: /cvsroot/tora/tora/tocurrent.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** tocurrent.cpp	31 May 2004 22:43:11 -0000	1.41
--- tocurrent.cpp	23 Feb 2005 22:47:15 -0000	1.42
***************
*** 69,73 ****
    std::map<toConnection *,QWidget *> Windows;
  
!   virtual char **pictureXPM(void)
    { return tocurrent_xpm; }
  public:
--- 69,73 ----
    std::map<toConnection *,QWidget *> Windows;
  
!   virtual const char **pictureXPM(void)
    { return tocurrent_xpm; }
  public: