[13266] Used MCStringSplitByDelimiter where possible

livecodepanos · livecodepanos · commit dcf44d092fd6 · 2018-06-14T15:48:54.000+01:00
diff --git a/engine/src/button.cpp b/engine/src/button.cpp
@@ -2728,25 +2728,20 @@ void MCButton::openmenu(Boolean grab)
 			
 			uindex_t t_offset = 0;
             uindex_t t_new_offset = 0;
-			for (uindex_t i = 0; i < t_chosen_option; i++)
-            {
-                if (i != 0)
-                    t_offset = t_new_offset + 1;
-				/* UNCHECKED */ MCStringFirstIndexOfChar(t_menustring, '\n', t_offset, kMCStringOptionCompareExact, t_new_offset);
-            }
+			bool t_success = true;
 			
-			// if the user selects the last option, t_new_offset will not be updated, as there is no \n after the last option
-			// so update t_new_offset here if this is the case
-			if (t_new_offset == t_offset - 1)
-				t_new_offset = MCStringGetLength(t_menustring) + 1;
+			MCAutoProperListRef t_options;
+			
+			if (t_success)
+				t_success = MCStringSplitByDelimiter(t_menustring, kMCLineEndString, kMCStringOptionCompareExact, &t_options);
+			
+			MCStringRef t_label = static_cast<MCStringRef>(MCProperListFetchElementAtIndex(*t_options, t_chosen_option - 1));
+			
+			
+			MCValueAssign(label, t_label);
 			
-			MCAutoStringRef t_label;
-			/* UNCHECKED */ MCStringCopySubstring(t_menustring, 
-												  MCRangeMakeMinMax(t_offset, t_new_offset),
-												  &t_label);
-			MCValueAssign(label, *t_label);
 			flags |= F_LABEL;
-			handlemenupick(*t_label, nil);
+			handlemenupick(t_label, nil);
 		}
 		return;
 	}
diff --git a/engine/src/mblandroidmisc.cpp b/engine/src/mblandroidmisc.cpp
@@ -269,38 +269,33 @@ bool MCParseParameters(MCParameter*& p_parameters, const char *p_format, ...)
 
 bool MCSystemPick(MCStringRef p_options, bool p_use_checkmark, uint32_t p_initial_index, uint32_t& r_chosen_index, MCRectangle p_button_rect)
 {
-	// Split the string on new lines
-	MCAutoArrayRef t_options_arrayref;
-	uindex_t noptions = 0;
 	r_chosen_index = 0;
 	
 	MCStringRef *t_options_array = nil;
 	MCPickList *t_pick_list = nil;
 	
+	MCAutoProperListRef t_options_list;
+	uindex_t t_count = 0;
+	
+	// Split the string on new lines
 	bool t_success = true;
-	t_success = MCStringSplit(p_options, MCSTR("\n"), nil, kMCCompareExact, &t_options_arrayref);
+	t_success = MCStringSplitByDelimiter(p_options, kMCLineEndString, kMCStringOptionCompareExact, &t_options_list);
 	
 	if (t_success)
 	{
-		noptions = MCArrayGetCount(*t_options_arrayref);
+		t_count = MCProperListGetLength(*t_options_list);
+		t_success = MCMemoryNewArray(t_count, t_options_array);
 		
-		t_success = MCMemoryNewArray(noptions, t_options_array);
-		
-		for (uindex_t i = 0 ; t_success && i < noptions ; i++)
-		{
-			// Note: 't_options' is an array of strings
-			MCValueRef t_optionval = nil;
-			t_success = MCArrayFetchValueAtIndex(*t_options_arrayref, i + 1, t_optionval);
-			t_options_array[i] = MCValueRetain((MCStringRef)t_optionval);
-		}
+		for (uindex_t i = 0; t_success && i < t_count; i++)
+			t_options_array[i] = static_cast<MCStringRef>(MCProperListFetchElementAtIndex(*t_options_list, i));
 	}
 	
 	if (t_success)
 	{
 		t_success = MCMemoryNew(t_pick_list);
 		
 		t_pick_list -> options = t_options_array;
-		t_pick_list -> option_count = noptions;
+		t_pick_list -> option_count = t_count;
 		t_pick_list -> initial = p_initial_index;
 	}
 	
@@ -319,11 +314,6 @@ bool MCSystemPick(MCStringRef p_options, bool p_use_checkmark, uint32_t p_initia
 	if (t_success)
 	{
 		// cleanup
-		for (uindex_t i = 0; i < noptions; i++)
-		{
-			MCValueRelease(t_options_array[i]);
-		}
-		
 		MCMemoryDeleteArray(t_options_array);
 		MCMemoryDelete(t_pick_list);
 	}
