Merge branch 'master' of https://github.com/Marxon13/M13OrderedDictionary

Conflicts:
	.DS_Store

Author: Marxon13

M13OrderedDictionary.h

@@ -141,6 +141,9 @@
  @param indices The indices to retreive the entries from.
  @return The dictionary containing the entries at the given index set.*/
 - (NSDictionary *)unorderedEntriesAtIndices:(NSIndexSet *)indices;
+/**The dictionary containing all entries and all objects
+ @return The dictionary containing all entries and all objects*/
+- (NSDictionary *)unorderedDictionary;
 
 /**The ordered array of all keys in the ordered dictionary.
  @return The ordered array of all keys in the ordered dictionary.*/
@@ -325,10 +328,10 @@
  @return The keys of the passing objects.*/
 - (NSArray *)keysOfObjectsAtIndices:(NSIndexSet *)indexSet options:(NSEnumerationOptions)opts passingTest:(BOOL (^)(id obj, NSUInteger idx, BOOL *stop))predicate;
 
-/**@name Preforming Selectors*/
+/**@name Performing Selectors*/
 /**Sends to each object in the orderedDictionary the message identified by a given selector, starting with the first object and continuing through the array to the last object.
  @param aSelector The selector to make the objects perform.*/
-- (void)makeObjectsPreformSelector:(SEL)aSelector;
+- (void)makeObjectsPerformSelector:(SEL)aSelector;
 
 /**Sends the aSelector message to each object in the orderedDictionary, starting with the first object and continuing through the array to the last object.
  @param aSelector The selector to perform.

M13OrderedDictionary.m

@@ -188,6 +188,11 @@ - (NSDictionary *)unorderedEntriesAtIndices:(NSIndexSet *)indexes
     return [NSDictionary dictionaryWithObjects:[objects objectsAtIndexes:indexes] forKeys:[keys objectsAtIndexes:indexes]];
 }
 
+- (NSDictionary *)unorderedDictionary
+{
+    return [NSDictionary dictionaryWithObjects:objects forKeys:keys];
+}
+
 - (NSArray *)allKeys
 {
     return keys;
@@ -415,9 +420,9 @@ - (NSArray *)keysOfObjectsAtIndices:(NSIndexSet *)indexSet options:(NSEnumeratio
     return [keys objectsAtIndexes:[objects indexesOfObjectsAtIndexes:indexSet options:opts passingTest:predicate]];
 }
 
-#pragma mark - Preforming Selectors
+#pragma mark - Performing Selectors
 
-- (void)makeObjectsPreformSelector:(SEL)aSelector
+- (void)makeObjectsPerformSelector:(SEL)aSelector
 {
     [objects makeObjectsPerformSelector:aSelector];
 }
@@ -920,18 +925,13 @@ - (void)addEntriesFromDictionary:(NSDictionary *)dictionary
 
 - (void)insertObject:(id)object pairedWithKey:(id<NSCopying>)key atIndex:(NSUInteger)index
 {
-    NSInteger idx = 0;
     if ([pairs objectForKey:key] != nil) {
-        if (index < [self indexOfKey:key]) {
-            idx = index - 1;
-        } else {
-            idx = index;
-        }
         [self removeEntryWithKey:key];
     }
+    
     [pairs setObject:object forKey:key];
-    [keys insertObject:key atIndex:idx];
-    [objects insertObject:object atIndex:idx];
+    [keys insertObject:key atIndex:index];
+    [objects insertObject:object atIndex:index];
 }
 
 - (void)insertEntry:(NSDictionary *)entry atIndex:(NSUInteger)index

M13OrderedDictionary.xcodeproj/project.xcworkspace/xcshareddata/M13OrderedDictionary.xccheckout

@@ -5,34 +5,34 @@
 	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
 	<false/>
 	<key>IDESourceControlProjectIdentifier</key>
-	<string>87933A7B-DEEA-45D2-A9C9-ECFD42622B81</string>
+	<string>A2290859-C43C-433C-B549-1EE23115D3CB</string>
 	<key>IDESourceControlProjectName</key>
 	<string>M13OrderedDictionary</string>
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
-		<key>2A58D87D-0C3D-4E3E-B996-44464EA9164D</key>
-		<string>https://github.com/Marxon13/M13OrderedDictionary.git</string>
+		<key>5CBA84AC-2517-437E-8596-079CE4775AC9</key>
+		<string>https://github.com/mattquiros/M13OrderedDictionary.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
 	<string>M13OrderedDictionary.xcodeproj/project.xcworkspace</string>
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
-		<key>2A58D87D-0C3D-4E3E-B996-44464EA9164D</key>
+		<key>5CBA84AC-2517-437E-8596-079CE4775AC9</key>
 		<string>../..</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
-	<string>https://github.com/Marxon13/M13OrderedDictionary.git</string>
+	<string>https://github.com/mattquiros/M13OrderedDictionary.git</string>
 	<key>IDESourceControlProjectVersion</key>
 	<integer>110</integer>
 	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>2A58D87D-0C3D-4E3E-B996-44464EA9164D</string>
+	<string>5CBA84AC-2517-437E-8596-079CE4775AC9</string>
 	<key>IDESourceControlProjectWCConfigurations</key>
 	<array>
 		<dict>
 			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
 			<string>public.vcs.git</string>
 			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>2A58D87D-0C3D-4E3E-B996-44464EA9164D</string>
+			<string>5CBA84AC-2517-437E-8596-079CE4775AC9</string>
 			<key>IDESourceControlWCCName</key>
 			<string>M13OrderedDictionary</string>
 		</dict>