From 768669968ca6dd81a3354aca93c686bcbae3181c Mon Sep 17 00:00:00 2001
From: CaS <CaS@72102866-910b-0410-8b05-ffd578937521>
Date: Sun, 1 Feb 2004 12:35:35 +0000
Subject: [PATCH] Improve method naming consistency

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@18520 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                              |  5 +++
 Headers/Additions/GNUstepBase/GSMime.h |  6 ++++
 Source/Additions/GSMime.m              | 44 +++++++++++++++++++++++---
 3 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f9b489df..799043e45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-01 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/Additions/GSMime.h: improve consistency of naming of
+	methods with add/set methods for new headers.
+
 2004-01-31  Manuel Guesdon <mguesdon@orange-concept.com>
 	* Source/NSNumber.m: Modified numberWithXX: methods
 	to test against abstractClass. If class is not the abstract 
diff --git a/Headers/Additions/GNUstepBase/GSMime.h b/Headers/Additions/GNUstepBase/GSMime.h
index a9837f743..233e8c5ff 100644
--- a/Headers/Additions/GNUstepBase/GSMime.h
+++ b/Headers/Additions/GNUstepBase/GSMime.h
@@ -107,6 +107,9 @@
 
 - (void) addContent: (id)newContent;
 - (void) addHeader: (GSMimeHeader*)info;
+- (GSMimeHeader*) addHeader: (NSString*)name
+                      value: (NSString*)value
+		 parameters: (NSDictionary*)parameters;
 - (NSArray*) allHeaders;
 - (id) content;
 - (id) contentByID: (NSString*)key;
@@ -141,6 +144,9 @@
 	       name: (NSString*)name;
 - (void) setContentType: (NSString*)newType;
 - (void) setHeader: (GSMimeHeader*)info;
+- (GSMimeHeader*) setHeader: (NSString*)name
+                      value: (NSString*)value
+		 parameters: (NSDictionary*)parameters;
 
 @end
 
diff --git a/Source/Additions/GSMime.m b/Source/Additions/GSMime.m
index bbe637f61..17225b9a6 100644
--- a/Source/Additions/GSMime.m
+++ b/Source/Additions/GSMime.m
@@ -3365,6 +3365,25 @@ static NSCharacterSet	*tokenSet = nil;
     }
 }
 
+/**
+ * Convenience method to create a new header and add it to the receiver.<br />
+ * Returns the newly created header.<br />
+ * See [GSMimeHeader-initWithName:value:parameters:] and -addHeader: methods.
+ */
+- (GSMimeHeader*) addHeader: (NSString*)name
+		      value: (NSString*)value
+		 parameters: (NSDictionary*)parameters
+{
+  GSMimeHeader	*hdr;
+
+  hdr = [[GSMimeHeader alloc] initWithName: name
+				     value: value
+				parameters: parameters];
+  [self addHeader: hdr];
+  RELEASE(hdr);
+  return hdr;
+}
+
 /**
  * <p>
  *   This method returns an array containing GSMimeHeader objects
@@ -3886,10 +3905,7 @@ static NSCharacterSet	*tokenSet = nil;
 }
 
 /**
- * Convenience method to create a new header and add it to the receiver
- * replacing any existing header of the same name.<br />
- * Returns the newly created header.<br />
- * See [GSMimeHeader-initWithName:value:parameters:] and -setHeader: methods.
+ * Deprecated ... use -setHeader:value:parameters:
  */
 - (GSMimeHeader*) makeHeader: (NSString*)name
 		       value: (NSString*)value
@@ -4584,6 +4600,26 @@ static NSCharacterSet	*tokenSet = nil;
   [self addHeader: info];
 }
 
+/**
+ * Convenience method to create a new header and add it to the receiver
+ * replacing any existing header of the same name.<br />
+ * Returns the newly created header.<br />
+ * See [GSMimeHeader-initWithName:value:parameters:] and -setHeader: methods.
+ */
+- (GSMimeHeader*) setHeader: (NSString*)name
+		      value: (NSString*)value
+		 parameters: (NSDictionary*)parameters
+{
+  GSMimeHeader	*hdr;
+
+  hdr = [[GSMimeHeader alloc] initWithName: name
+				     value: value
+				parameters: parameters];
+  [self setHeader: hdr];
+  RELEASE(hdr);
+  return hdr;
+}
+
 @end
 
 @implementation GSMimeDocument (Private)