Tidy up class method grouping using pragma marks rather than categories

TNStropheConnection.j

@@ -184,14 +184,10 @@
     return self;
 }
 
-@end
-
 
 #pragma mark -
 #pragma mark TNStropheConnection Connection
 
-@implementation TNStropheConnection (Connection)
-
 - (void)addNamespaceWithName:(CPString)aName value:(CPString)aValue
 {
     Strophe.addNamespace(aName, aValue)
@@ -292,14 +288,10 @@
     _connection.flush();
 }
 
-@end
-
 
 #pragma mark -
 #pragma mark TNStropheConnection Features
 
-@implementation TNStropheConnection (Features)
-
 - (void)addFeature:(CPString)aFeatureNamespace
 {
     [_features addObject:aFeatureNamespace];
@@ -348,14 +340,10 @@
     return YES;
 }
 
-@end
-
 
 #pragma mark -
 #pragma mark TNStropheConnection Sending
 
-@implementation TNStropheConnection (Sending)
-
 /*! send a TNStropheStanza object
     @param aStanza: the stanza to send
 */
@@ -403,14 +391,10 @@
         _audioTagReceive.play();
 }
 
-@end
-
 
 #pragma mark -
 #pragma mark TNStropheConnection Handlers
 
-@implementation TNStropheConnection (Handlers)
-
 /*! allows to register a selector for beeing fired on XMPP events, according to the content of a dictionnary parameter.
     The dictionnary should contains zero to many of the followings :
      - <b>namespace</b>: the namespace of the stanza or of the first child (like query)
@@ -512,10 +496,6 @@
 
 @end
 
-
-#pragma mark -
-#pragma mark TNStropheConnection CPCoding
-
 @implementation TNStropheConnection (CPCoding)
 
 - (id)initWithCoder:(CPCoder)aCoder

TNStropheContact.j

@@ -24,9 +24,6 @@
 @import "TNStropheGlobals.j"
 
 
-#pragma mark -
-#pragma mark TNStropheContact
-
 /*! @ingroup strophecappuccino
     this is an implementation of a XMPP Contact
 */
@@ -110,13 +107,9 @@
     return self;
 }
 
-@end
-
 
 #pragma mark -
-#pragma mark TNStropheContact Status
-
-@implementation TNStropheContact (Status)
+#pragma mark Status
 
 /*! probe the contact about its status
     You should never have to use this message if you are using TNStropheRoster
@@ -257,13 +250,9 @@
     _isComposing = NO;
 }
 
-@end
-
 
 #pragma mark -
-#pragma mark TNStropheContact Subscription
-
-@implementation TNStropheContact (Subscription)
+#pragma mark Subscription
 
 /*! subscribe to the contact
 */
@@ -289,13 +278,9 @@
     [_connection send:auth];
 }
 
-@end
-
 
 #pragma mark -
-#pragma mark TNStropheContact MetaData
-
-@implementation TNStropheContact (MetaData)
+#pragma mark MetaData
 
 - (CPString)description
 {
@@ -404,13 +389,9 @@
     [[CPNotificationCenter defaultCenter] postNotificationName:TNStropheContactGroupUpdatedNotification object:self];
 }
 
-@end
-
 
 #pragma mark -
-#pragma mark TNStropheContact Communicating
-
-@implementation TNStropheContact (Communicating)
+#pragma mark Communicating
 
 /*! send a TNStropheStanza to the contact. From, ant To value are rewritten. This message uses a given stanza id
     in order to use it if you need. You should mostly use the
@@ -588,11 +569,7 @@
 
 @end
 
-
-#pragma mark -
-#pragma mark TNStropheContact codingCompliant
-
-@implementation TNStropheContact (codingCompliant)
+@implementation TNStropheContact (CPCoding)
 
 - (id)initWithCoder:(CPCoder)aCoder
 {

TNStropheGroup.j

@@ -17,13 +17,9 @@
  */
 
 @import <Foundation/Foundation.j>
-
 @import "TNStropheGlobals.j"
 
 
-#pragma mark -
-#pragma mark TNStropheGroup
-
 /*! @ingroup strophecappuccino
     this is an implementation of a basic XMPP Group.
 */
@@ -89,11 +85,7 @@
 
 @end
 
-
-#pragma mark -
-#pragma mark TNStropheGroup codingCompliant
-
-@implementation TNStropheGroup (codingCompliant)
+@implementation TNStropheGroup (CPCoding)
 
 - (id)initWithCoder:(CPCoder)aCoder
 {

TNStropheRoster.j

@@ -79,13 +79,9 @@
     [_connection disconnect];
 }
 
-@end
-
 
 #pragma mark -
-#pragma mark TNStropheRoster Fetch
-
-@implementation TNStropheRoster (Fetch)
+#pragma mark Fetch
 
 /*! ask the server to get the roster of the TNStropheConnection user
 */
@@ -143,13 +139,9 @@
     return NO;
 }
 
-@end
-
 
 #pragma mark -
-#pragma mark TNStropheRoster Groups
-
-@implementation TNStropheRoster (Groups)
+#pragma mark Groups
 
 /*! add a group to the roster with given name
     @param aGroupName the name of the new group
@@ -259,13 +251,9 @@
     return nil;
 }
 
-@end
-
 
 #pragma mark -
-#pragma mark TNStropheRoster Contacts
-
-@implementation TNStropheRoster (Contacts)
+#pragma mark Contacts
 
 /*! add a new contact to the roster with given information
     @param aJID the JID of the new contact
@@ -404,13 +392,9 @@
     [aContact changeGroup:newGroup];
 }
 
-@end
-
 
 #pragma mark -
-#pragma mark TNStropheRoster Subscriptions
-
-@implementation TNStropheRoster (Subscriptions)
+#pragma mark Subscriptions
 
 /*! message sent when a presence information received
     send didReceiveSubscriptionRequest: to the delegate with the stanza as parameter