[bug #36518] It's impossible to use GSWeb from Obj-C++ code

[Graham Lee]

URL:
  <http://savannah.gnu.org/bugs/?36518>

                 Summary: It's impossible to use GSWeb from Obj-C++ code
                 Project: GNUstep
            Submitted by: leeg
            Submitted on: Mon 21 May 2012 04:25:21 PM GMT
                Category: gsweb
                Severity: 3 - Normal
              Item Group: Bug
                  Status: None
                 Privacy: Public
             Assigned to: None
             Open/Closed: Open
         Discussion Lock: Any

    _______________________________________________________

Details:

The fix is simply to rename variables named as C++ keywords like "class" from
the public header files - private headers and implementations don't need to be
changed.


Index: GSWeb/GSWAction.h
===================================================================
--- GSWeb/GSWAction.h   (revision 35157)
+++ GSWeb/GSWAction.h   (working copy)
@@ -49,7 +49,7 @@
 +(BOOL)_isActionNamed:(NSString*)actionName
         actionOfClass:(Class)actionClass;
 +(SEL)_selectorForActionNamed:(NSString*)actionName
-                      inClass:(Class)class;
+                      inClass:(Class)actionClass;
 -(SEL)_selectorForActionNamed:(NSString*)actionName;
 -(id <GSWActionResults>)performActionNamed:(NSString*)actionName;
 
Index: GSWeb/GSWDynamicElement.h
===================================================================
--- GSWeb/GSWDynamicElement.h   (revision 35157)
+++ GSWeb/GSWDynamicElement.h   (working copy)
@@ -33,6 +33,9 @@
        #define _GSWDynamicElement_h__
 
 #import "GSWElement.h"
+#if __OBJC2__
+#include <objc/runtime.h>
+#endif
 
 GSWEB_EXPORT SEL evaluateConditionInContextSEL;
 
@@ -43,7 +46,7 @@
 
 -(id)initWithName:(NSString*)name
      associations:(NSDictionary*)associations
-         template:(GSWElement*)template;
+         template:(GSWElement*)aTemplate;
 
 -(BOOL)                evaluateCondition:(id)condition
                         inContext:(GSWContext*)context
Index: GSWeb/GSWString.h
===================================================================
--- GSWeb/GSWString.h   (revision 35157)
+++ GSWeb/GSWString.h   (working copy)
@@ -46,7 +46,7 @@
 
 -(id)initWithName:(NSString*)name
      associations:(NSMutableDictionary*)associations
-         template:(GSWElement*)template;
+         template:(GSWElement*)aTemplate;
 
 -(void)appendToResponse:(GSWResponse*)response
               inContext:(GSWContext*)context;
Index: GSWeb/GSWUtils.h
===================================================================
--- GSWeb/GSWUtils.h    (revision 35157)
+++ GSWeb/GSWUtils.h    (working copy)
@@ -297,7 +297,7 @@
 
 GSWEB_EXPORT BOOL
 loggedLockBeforeDateFromFunctionInFileInLine(id self,
-                                            BOOL try,
+                                            BOOL tryLock,
                                             NSDate *limit, 
                                             const char *file,
                                             const char *function,
Index: GSWeb/GSWHTMLURLValuedElement.h
===================================================================
--- GSWeb/GSWHTMLURLValuedElement.h     (revision 35157)
+++ GSWeb/GSWHTMLURLValuedElement.h     (working copy)
@@ -51,7 +51,7 @@
 
 -(id)initWithName:(NSString*)aName
      associations:(NSDictionary*)associations
-         template:(GSWElement*)template;
+         template:(GSWElement*)aTemplate;
 
 -(NSString*)valueAttributeName;
 -(NSString*)urlAttributeName;
Index: GSWeb/GSWComponentReference.h
===================================================================
--- GSWeb/GSWComponentReference.h       (revision 35157)
+++ GSWeb/GSWComponentReference.h       (working copy)
@@ -48,7 +48,7 @@
 
 -(id)initWithName:(NSString*)aName
      associations:(NSDictionary*)associations
-         template:(GSWElement*)template;
+         template:(GSWElement*)aTemplate;
 -(NSString*)description;
 
 -(void)popRefComponentInContext:(GSWContext*)aContext;
Index: GSWeb/GSWImage.h
===================================================================
--- GSWeb/GSWImage.h    (revision 35157)
+++ GSWeb/GSWImage.h    (working copy)
@@ -41,7 +41,7 @@
 }
 -(id)initWithName:(NSString*)name
      associations:(NSDictionary*)associations
-         template:(GSWElement*)template;
+         template:(GSWElement*)aTemplate;
 
 -(NSString*)valueAttributeName;
 -(NSString*)urlAttributeName;
Index: GSWeb/GSWComponentDefinition.h
===================================================================
--- GSWeb/GSWComponentDefinition.h      (revision 35157)
+++ GSWeb/GSWComponentDefinition.h      (working copy)
@@ -104,7 +104,7 @@
                        languages:(NSArray*)languages;
 
 - (GSWComponentReference*)
componentReferenceWithAssociations:(NSDictionary*)associations
-                                                    
template:(GSWElement*)template;
+                                                    
template:(GSWElement*)aTemplate;
                        
 -(NSDictionary*)componentAPI;
 
Index: GSWeb/GSWAssociation.h
===================================================================
--- GSWeb/GSWAssociation.h      (revision 35157)
+++ GSWeb/GSWAssociation.h      (working copy)
@@ -93,10 +93,10 @@
 -(NSString*)declarationName;
 -(NSString*)declarationType;
 
-+(void)setClasse:(Class)class
++(void)setClasse:(Class)classe
       forHandler:(NSString*)handler;
-+(void)addLogHandlerClasse:(Class)class;
-+(void)removeLogHandlerClasse:(Class)class;
++(void)addLogHandlerClasse:(Class)classe;
++(void)removeLogHandlerClasse:(Class)classe;
 
 +(GSWAssociation*)associationWithValue:(id)value;
 +(GSWAssociation*)associationWithKeyPath:(NSString*)keyPath;
Index: GSWeb/GSWTemporaryElement.h
===================================================================
--- GSWeb/GSWTemporaryElement.h (revision 35157)
+++ GSWeb/GSWTemporaryElement.h (working copy)
@@ -92,7 +92,7 @@
 -(GSWElement*)_elementWithDeclaration:(GSWDeclaration*)declaration
                                  name:(NSString*)name
                            properties:(NSDictionary*)properties
-                             template:(GSWElement*)template
+                             template:(GSWElement*)aTemplate
                             languages:(NSArray*)languages;
 
 @end
Index: GSWeb/GSWDynamicGroup.h
===================================================================
--- GSWeb/GSWDynamicGroup.h     (revision 35157)
+++ GSWeb/GSWDynamicGroup.h     (working copy)
@@ -42,7 +42,7 @@
 
 -(id)initWithName:(NSString*)name
      associations:(NSDictionary*)associations
-         template:(GSWElement*)template;
+         template:(GSWElement*)aTemplate;
          
 
 -(id)initWithName:(NSString*) name
Index: GSWeb/GSWHTMLStaticElement.h
===================================================================
--- GSWeb/GSWHTMLStaticElement.h        (revision 35157)
+++ GSWeb/GSWHTMLStaticElement.h        (working copy)
@@ -104,7 +104,7 @@
               contentElements:(NSArray*)elements;
 
 +(Class)_elementClassForName:(NSString*)name;
-+(void)setElementClass:(Class)class
++(void)setElementClass:(Class)classe
                forName:(NSString*)name;
 +(GSWElement*)_theEmptyElement;
 
Index: GSWeb/GSWActionURL.h
===================================================================
--- GSWeb/GSWActionURL.h        (revision 35157)
+++ GSWeb/GSWActionURL.h        (working copy)
@@ -35,7 +35,7 @@
 @interface GSWActionURL: GSWHyperlink
 -(id)initWithName:(NSString*)name
      associations:(NSDictionary*)associations
-         template:(GSWElement*)template;
+         template:(GSWElement*)aTemplate;
 
 @end
 
Index: GSWeb/GSWComponent.h
===================================================================
--- GSWeb/GSWComponent.h        (revision 35157)
+++ GSWeb/GSWComponent.h        (working copy)
@@ -95,7 +95,7 @@
 
 -(void) _setParent:(GSWComponent*) parent
       associations:(NSMutableDictionary *) assocdict
-          template:(GSWElement*) template;
+          template:(GSWElement*) aTemplate;
 
 -(void) pushValuesToParent;





    _______________________________________________________

Reply to this item at:

  <http://savannah.gnu.org/bugs/?36518>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/