[Oorexx-svn] SF.net SVN: oorexx: [711] interpreter-3.x/trunk/platform/windows/oodialog/ oovuser.c

[<mie...@us...>]

Revision: 711
          http://oorexx.svn.sourceforge.net/oorexx/?rev=711&view=rev
Author:   miesfeld
Date:     2007-08-24 17:07:00 -0700 (Fri, 24 Aug 2007)

Log Message:
-----------
Rename 'class' and 'template' variables in ooDialog oovuser.c  class and
template are reserved words in C++ and the use of these variable names
causes my editor to choke every time the file is loaded.

Modified Paths:
--------------
    interpreter-3.x/trunk/platform/windows/oodialog/oovuser.c

Modified: interpreter-3.x/trunk/platform/windows/oodialog/oovuser.c
===================================================================
--- interpreter-3.x/trunk/platform/windows/oodialog/oovuser.c	2007-08-24 23:32:55 UTC (rev 710)
+++ interpreter-3.x/trunk/platform/windows/oodialog/oovuser.c	2007-08-25 00:07:00 UTC (rev 711)
@@ -197,12 +197,12 @@
 }
 
 
-void UCreateDlg(WORD ** template, WORD **p, INT NrItems, INT x, INT y, INT cx, INT cy,
-                CHAR * class, CHAR * title, CHAR * fontname, INT fontsize, ULONG lStyle)
+void UCreateDlg(WORD ** ppTemplate, WORD **p, INT NrItems, INT x, INT y, INT cx, INT cy,
+                CHAR * dlgClass, CHAR * title, CHAR * fontname, INT fontsize, ULONG lStyle)
 {
    int   nchar;
 
-   *template = *p = (PWORD) LocalAlloc(LPTR, (NrItems+3)*256);
+   *ppTemplate = *p = (PWORD) LocalAlloc(LPTR, (NrItems+3)*256);
 
      /* start to fill in the dlgtemplate information.  addressing by WORDs */
    **p = LOWORD (lStyle);
@@ -230,9 +230,9 @@
    (*p)++;
 
    /* copy the class of the dialog */
-   if ( !(lStyle & WS_CHILD) && (class))
+   if ( !(lStyle & WS_CHILD) && (dlgClass))
    {
-      nchar = nCopyAnsiToWideChar (*p, TEXT(class));
+      nchar = nCopyAnsiToWideChar (*p, TEXT(dlgClass));
       (*p) += nchar;
    }
    else
@@ -1150,7 +1150,7 @@
   PRXSTRING retstr )
 {
    INT i;
-   WORD *p, *template;
+   WORD *p, *pTemplate;
    HANDLE hMem;
 
    CHECKARGL(1);
@@ -1164,7 +1164,7 @@
 
        hMem = GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, (i+1)*128);
 
-       template = p = (PWORD) GlobalLock(hMem);
+       pTemplate = p = (PWORD) GlobalLock(hMem);
 
        if (!p) RETC(1)
        /* writing menu header */
@@ -1187,7 +1187,7 @@
        p++;
     #endif
 
-       sprintf(retstr->strptr, "%ld %ld %ld", hMem, template, p);
+       sprintf(retstr->strptr, "%ld %ld %ld", hMem, pTemplate, p);
        retstr->strlength = strlen(retstr->strptr);
        return 0;
    }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.