Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit d2652ed

Browse files
livecodealilivecodeali
committed
removed almost all trace of MCVariableValue
1 parent b83ed02 commit d2652ed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+581
-3673
lines changed

‎engine/Android.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ LOCAL_SRC_FILES := $(addprefix src/,\
4747
mblandroid.cpp mblandroidalert.cpp mblandroidbrowser.cpp mblandroidbusyindicator.cpp \
4848
mblandroidcalendar.cpp mblandroidcamera.cpp mblandroidcontact.cpp mblandroidcontext.cpp mblandroidcontrol.cpp \
4949
mblandroiddc.cpp mblandroiddialog.cpp mblandroidfont.cpp mblandroidfs.cpp mblandroididletimer.cpp mblandroidinput.cpp \
50-
mblandroidio.cpp mblandroidjava.cpp mblandroidmail.cpp mblandroidmisc.cpp mblandroidmm.cpp \
50+
mblandroidio.cpp mblandroidjava.cpp mblandroidmail.cpp mblandroidmediapick.cpp mblandroidmisc.cpp mblandroidmm.cpp \
5151
mblandroidnetwork.cpp mblandroidnotification.cpp mblandroidorientation.cpp mblandroidplayer.cpp \
5252
mblandroidprocess.cpp mblandroidscroller.cpp mblandroidsensor.cpp mblandroidstore.cpp mblandroidsound.cpp \
5353
mblandroidtextlayout.cpp mblandroidtextmessaging.cpp mblandroidurl.cpp \

‎engine/engine-mobile.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,6 @@
247247
4DABCE5A15ECD4B50085E214 /* unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DD3DF0B1040ADFC00CAC7EF /* unicode.cpp */; };
248248
4DABCE5B15ECD4B50085E214 /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DD3DF261040AE0700CAC7EF /* util.cpp */; };
249249
4DABCE5C15ECD4B50085E214 /* variable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DD3DF241040AE0700CAC7EF /* variable.cpp */; };
250-
4DABCE5D15ECD4B50085E214 /* variablearray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DD3DF211040AE0700CAC7EF /* variablearray.cpp */; };
251-
4DABCE5E15ECD4B50085E214 /* variablevalue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DDD7F2D134BA5C0009037A0 /* variablevalue.cpp */; };
252250
4DABCE5F15ECD4B50085E214 /* vclip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DD3DF201040AE0700CAC7EF /* vclip.cpp */; };
253251
4DABCE6115ECD4B50085E214 /* visual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DD3DF1C1040AE0700CAC7EF /* visual.cpp */; };
254252
4DABCE6515ECD4FF0085E214 /* libstandalone-mobile-kernel.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DABCD8A15ECD40F0085E214 /* libstandalone-mobile-kernel.a */; };
@@ -840,8 +838,6 @@
840838
4DD3DF1C1040AE0700CAC7EF /* visual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = visual.cpp; path = src/visual.cpp; sourceTree = "<group>"; };
841839
4DD3DF1F1040AE0700CAC7EF /* vclip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = vclip.h; path = src/vclip.h; sourceTree = "<group>"; };
842840
4DD3DF201040AE0700CAC7EF /* vclip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vclip.cpp; path = src/vclip.cpp; sourceTree = "<group>"; };
843-
4DD3DF211040AE0700CAC7EF /* variablearray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = variablearray.cpp; path = src/variablearray.cpp; sourceTree = "<group>"; };
844-
4DD3DF221040AE0700CAC7EF /* variable_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = variable_impl.h; path = src/variable_impl.h; sourceTree = "<group>"; };
845841
4DD3DF231040AE0700CAC7EF /* variable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = variable.h; path = src/variable.h; sourceTree = "<group>"; };
846842
4DD3DF241040AE0700CAC7EF /* variable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = variable.cpp; path = src/variable.cpp; sourceTree = "<group>"; };
847843
4DD3DF251040AE0700CAC7EF /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = util.h; path = src/util.h; sourceTree = "<group>"; };
@@ -860,7 +856,6 @@
860856
4DDD7F29134BA5BF009037A0 /* iquantize_new.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = iquantize_new.cpp; path = src/iquantize_new.cpp; sourceTree = "<group>"; };
861857
4DDD7F2A134BA5BF009037A0 /* objectprops.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = objectprops.cpp; path = src/objectprops.cpp; sourceTree = "<group>"; };
862858
4DDD7F2B134BA5BF009037A0 /* sha1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sha1.cpp; path = src/sha1.cpp; sourceTree = "<group>"; };
863-
4DDD7F2D134BA5C0009037A0 /* variablevalue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = variablevalue.cpp; path = src/variablevalue.cpp; sourceTree = "<group>"; };
864859
4DDD7F35134BA5DA009037A0 /* mcutility.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mcutility.cpp; path = src/mcutility.cpp; sourceTree = "<group>"; };
865860
4DDD7F52134BA80E009037A0 /* customprinter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = customprinter.cpp; path = src/customprinter.cpp; sourceTree = "<group>"; };
866861
4DDD7F57134BA833009037A0 /* mbliphonetextlayout.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = mbliphonetextlayout.mm; path = src/mbliphonetextlayout.mm; sourceTree = "<group>"; };
@@ -875,7 +870,6 @@
875870
4DFFC8EE13DD909F006233A4 /* name.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = name.cpp; path = src/name.cpp; sourceTree = "<group>"; };
876871
4DFFC8F213DD90AF006233A4 /* objectpropsets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = objectpropsets.cpp; path = src/objectpropsets.cpp; sourceTree = "<group>"; };
877872
4DFFC8F613DD90CE006233A4 /* syscfdate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = syscfdate.cpp; path = src/syscfdate.cpp; sourceTree = "<group>"; };
878-
7607CF0117688D1400ADB512 /* mblandroidcamera.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mblandroidcamera.cpp; path = src/mblandroidcamera.cpp; sourceTree = "<group>"; };
879873
7607CF601769BB4C00ADB512 /* exec-interface-aclip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "exec-interface-aclip.cpp"; path = "src/exec-interface-aclip.cpp"; sourceTree = "<group>"; };
880874
7607CF611769BB4C00ADB512 /* exec-interface-button.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "exec-interface-button.cpp"; path = "src/exec-interface-button.cpp"; sourceTree = "<group>"; };
881875
7607CF621769BB4C00ADB512 /* exec-interface-card.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "exec-interface-card.cpp"; path = "src/exec-interface-card.cpp"; sourceTree = "<group>"; };
@@ -892,6 +886,7 @@
892886
7607CF6D1769BB4D00ADB512 /* exec-interface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "exec-interface.cpp"; path = "src/exec-interface.cpp"; sourceTree = "<group>"; };
893887
7607CF6E1769BB4D00ADB512 /* exec-interface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "exec-interface.h"; path = "src/exec-interface.h"; sourceTree = "<group>"; };
894888
7607CF6F1769BB4D00ADB512 /* exec-interface2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "exec-interface2.cpp"; path = "src/exec-interface2.cpp"; sourceTree = "<group>"; };
889+
7607CFD5176B232E00ADB512 /* mblandroidmediapick.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mblandroidmediapick.cpp; path = src/mblandroidmediapick.cpp; sourceTree = "<group>"; };
895890
768D66C117622FE100F203A3 /* exec-nativecontrol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "exec-nativecontrol.cpp"; path = "src/exec-nativecontrol.cpp"; sourceTree = "<group>"; };
896891
768D66C41765E11300F203A3 /* exec-pick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "exec-pick.cpp"; path = "src/exec-pick.cpp"; sourceTree = "<group>"; };
897892
BE096E7D175CD79D00F92F90 /* libfoundation-mobile.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libfoundation-mobile.xcodeproj"; path = "../libfoundation/libfoundation-mobile.xcodeproj"; sourceTree = SOURCE_ROOT; };
@@ -1266,7 +1261,6 @@
12661261
4DB983BF130BB1BD008A03DC /* Android */ = {
12671262
isa = PBXGroup;
12681263
children = (
1269-
7607CF0117688D1400ADB512 /* mblandroidcamera.cpp */,
12701264
4D91B3E2134CB7AE000D7AA5 /* com */,
12711265
4DB983C0130BB1DF008A03DC /* mblandroid.cpp */,
12721266
4DB983C1130BB1DF008A03DC /* mblandroid.h */,
@@ -1282,6 +1276,7 @@
12821276
4DB983C4130BB1DF008A03DC /* mblandroidcontext.h */,
12831277
E823E63114D2EA88001F73C4 /* mblandroidcontrol.cpp */,
12841278
E823E63314D2F2A1001F73C4 /* mblandroidcontrol.h */,
1279+
7607CFD5176B232E00ADB512 /* mblandroidmediapick.cpp */,
12851280
4DB983C6130BB1DF008A03DC /* mblandroiddc.cpp */,
12861281
4DB983C7130BB1DF008A03DC /* mblandroiddialog.cpp */,
12871282
4CF8A31615067985000745A4 /* mblandroidfont.cpp */,
@@ -1582,9 +1577,6 @@
15821577
4DD3DF071040ADFC00CAC7EF /* statemnt.h */,
15831578
4DD3DF241040AE0700CAC7EF /* variable.cpp */,
15841579
4DD3DF231040AE0700CAC7EF /* variable.h */,
1585-
4DD3DF221040AE0700CAC7EF /* variable_impl.h */,
1586-
4DD3DF211040AE0700CAC7EF /* variablearray.cpp */,
1587-
4DDD7F2D134BA5C0009037A0 /* variablevalue.cpp */,
15881580
);
15891581
name = "Core - Language";
15901582
sourceTree = "<group>";
@@ -2303,8 +2295,6 @@
23032295
4DABCE5A15ECD4B50085E214 /* unicode.cpp in Sources */,
23042296
4DABCE5B15ECD4B50085E214 /* util.cpp in Sources */,
23052297
4DABCE5C15ECD4B50085E214 /* variable.cpp in Sources */,
2306-
4DABCE5D15ECD4B50085E214 /* variablearray.cpp in Sources */,
2307-
4DABCE5E15ECD4B50085E214 /* variablevalue.cpp in Sources */,
23082298
4DABCE5F15ECD4B50085E214 /* vclip.cpp in Sources */,
23092299
4DABCE6115ECD4B50085E214 /* visual.cpp in Sources */,
23102300
BE4494AE175CDCB900346B49 /* foundation-legacy.cpp in Sources */,

‎engine/src/ask.cpp‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -351,16 +351,16 @@ Exec_errors MCAsk::exec_question(MCExecPoint& ep, const char *p_title)
351351
#else
352352
if (!t_error)
353353
{
354-
char *t_result;
355-
t_result = MCscreen -> popupaskdialog(AT_QUESTION, p_title, *t_prompt, *t_answer, question . hint);
356-
if (t_result != nil)
357-
ep . copysvalue(t_result);
354+
355+
MCAutoStringRef t_result;
356+
MCscreen -> popupaskdialog(AT_QUESTION, p_title, *t_prompt, *t_answer, question . hint, &t_result);
357+
if (*t_result != nil)
358+
/* UNCHECKED */ ep . setvalueref(*t_result);
358359
else
359360
{
360361
ep.clear();
361362
MCresult -> sets(MCcancelstring);
362363
}
363-
delete t_result;
364364
}
365365
#endif
366366

@@ -388,16 +388,15 @@ Exec_errors MCAsk::exec_password(MCExecPoint& ep, const char *p_title)
388388
#else
389389
if (!t_error)
390390
{
391-
char *t_result;
392-
t_result = MCscreen -> popupaskdialog(AT_PASSWORD, p_title, *t_prompt, *t_answer, password . hint);
393-
if (t_result != nil)
394-
ep . copysvalue(t_result);
391+
MCAutoStringRef t_result;
392+
MCscreen -> popupaskdialog(AT_PASSWORD, p_title, *t_prompt, *t_answer, password . hint, &t_result);
393+
if (*t_result != nil)
394+
/* UNCHECKED */ ep . setvalueref(*t_result);
395395
else
396396
{
397397
ep.clear();
398398
MCresult -> sets(MCcancelstring);
399399
}
400-
delete t_result;
401400
}
402401
#endif
403402

‎engine/src/exec-dialog.cpp‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -515,9 +515,8 @@ void MCDialogExecAskQuestion(MCExecContext& ctxt, int p_type, MCStringRef p_prom
515515
}
516516

517517
#else
518-
#ifdef MOBILE_BROKEN
519518
MCAutoStringRef t_result;
520-
if (MCscreen -> popupaskdialog(AT_QUESTION, p_title, p_prompt, p_answer, p_hint_answer, &t_result))
519+
if (MCscreen -> popupaskdialog(AT_QUESTION, MCStringGetCString(p_title), MCStringGetCString(p_prompt), MCStringGetCString(p_answer), p_hint_answer, &t_result))
521520
{
522521
ctxt . SetItToValue(*t_result);
523522
ctxt . SetTheResultToEmpty();
@@ -528,7 +527,6 @@ void MCDialogExecAskQuestion(MCExecContext& ctxt, int p_type, MCStringRef p_prom
528527
ctxt . SetTheResultToValue(MCN_cancel);
529528
}
530529
#endif
531-
#endif
532530
}
533531

534532
void MCDialogExecAskPassword(MCExecContext& ctxt, bool p_clear, MCStringRef p_prompt, MCStringRef p_answer, bool p_hint_answer, MCStringRef p_title, bool p_as_sheet)
@@ -557,9 +555,8 @@ void MCDialogExecAskPassword(MCExecContext& ctxt, bool p_clear, MCStringRef p_pr
557555
}
558556

559557
#else
560-
#ifdef MOBILE_BROKEN
561558
MCAutoStringRef t_result;
562-
if (MCscreen -> popupaskdialog(AT_PASSWORD, p_title, p_prompt, p_answer, p_hint_answer, &t_result))
559+
if (MCscreen -> popupaskdialog(AT_PASSWORD, MCStringGetCString(p_title), MCStringGetCString(p_prompt), MCStringGetCString(p_answer), p_hint_answer, &t_result))
563560
{
564561
ctxt . SetItToValue(*t_result);
565562
ctxt . SetTheResultToEmpty();
@@ -570,7 +567,6 @@ void MCDialogExecAskPassword(MCExecContext& ctxt, bool p_clear, MCStringRef p_pr
570567
ctxt . SetTheResultToValue(MCN_cancel);
571568
}
572569
#endif
573-
#endif
574570
}
575571

576572
static bool MCA_ask_file(MCStringRef p_prompt, MCStringRef p_initial, MCStringRef p_filter, MCStringRef p_title, bool p_as_sheet, bool& r_cancelled, MCStringRef& r_filename)

‎engine/src/exec-files.cpp‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,10 +1276,12 @@ void MCFilesExecPerformReadUntil(MCExecContext& ctxt, IO_handle p_stream, int4 p
12761276
}
12771277
else
12781278
if (isspace(t_buffer.Chars()[size - 1]))
1279+
{
12791280
if (--p_count == 0)
12801281
break;
12811282
else
12821283
doingspace = True;
1284+
}
12831285
}
12841286
else
12851287
{
@@ -1293,7 +1295,7 @@ void MCFilesExecPerformReadUntil(MCExecContext& ctxt, IO_handle p_stream, int4 p
12931295
j--;
12941296
}
12951297
if (i == 0 && (t_buffer.Chars()[j] == MCStringGetNativeCharAtIndex(p_sentinel, 0)
1296-
|| MCStringGetNativeCharAtIndex(p_sentinel, 0) == '\n' && t_buffer.Chars()[j] == '\r'))
1298+
|| (MCStringGetNativeCharAtIndex(p_sentinel, 0) == '\n' && t_buffer.Chars()[j] == '\r')))
12971299
{
12981300
// MW-2008-08-15: [[ Bug 6580 ]] This clause looks ahead for CR LF sequences
12991301
// if we have just enp_countered CR. However, it was previousy using MCS_seek_cur
@@ -1304,10 +1306,12 @@ void MCFilesExecPerformReadUntil(MCExecContext& ctxt, IO_handle p_stream, int4 p
13041306
uint1 term;
13051307
uint4 nread = 1;
13061308
if (MCS_read(&term, sizeof(char), nread, p_stream) == IO_NORMAL)
1309+
{
13071310
if (term != '\n')
13081311
MCS_putback(term, p_stream);
13091312
else
13101313
t_buffer.Chars()[j] = '\n';
1314+
}
13111315
}
13121316
if (--p_count == 0)
13131317
break;
@@ -1399,10 +1403,12 @@ void MCFilesExecPerformReadUntilBinary(MCExecContext& ctxt, IO_handle stream, in
13991403
}
14001404
else
14011405
if (isspace(t_buffer.Chars()[size - 1]))
1406+
{
14021407
if (--p_count == 0)
14031408
break;
14041409
else
14051410
doingspace = True;
1411+
}
14061412
}
14071413
else
14081414
{
@@ -1965,8 +1971,8 @@ void MCFilesExecWriteToProcess(MCExecContext& ctxt, MCNameRef p_process, MCStrin
19651971
void MCFilesExecSeekInFile(MCExecContext& ctxt, MCNameRef p_file, bool is_end, bool is_by, int64_t p_at)
19661972
{
19671973
uindex_t t_index;
1968-
if (!IO_findfile(p_file, t_index) || MCfiles[t_index].ihandle == NULL &&
1969-
MCfiles[t_index].ohandle == NULL)
1974+
if (!IO_findfile(p_file, t_index)
1975+
|| (MCfiles[t_index].ihandle == NULL && MCfiles[t_index].ohandle == NULL))
19701976
{
19711977
ctxt . LegacyThrow(EE_SEEK_NOFILE);
19721978
return;

‎engine/src/exec-multimedia.cpp‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -458,11 +458,9 @@ void MCMultimediaExecPlayAudioClip(MCExecContext& ctxt, MCStack *p_target, int p
458458
if (!MCtemplateaudio->issupported())
459459
{
460460
#ifdef _MOBILE
461-
#ifdef MOBILE_BROKEN
462461
extern bool MCSystemPlaySound(const char *p_filename, bool p_looping);
463-
if (!MCSystemPlaySound(ep.getcstring(), looping == True))
462+
if (!MCSystemPlaySound(MCStringGetCString(p_clip), p_looping))
464463
MCresult->sets("no sound support");
465-
#endif
466464
#endif
467465
return;
468466
}
@@ -544,16 +542,10 @@ void MCMultimediaExecPlayOperation(MCExecContext& ctxt, MCPlayer *p_player, int
544542
void MCMultimediaExecPlayVideoClip(MCExecContext& ctxt, MCStack *p_target, int p_chunk_type, MCStringRef p_clip, bool p_looping, MCPoint *p_at, MCStringRef p_options)
545543
{
546544
#ifdef _MOBILE
547-
#ifdef MOBILE_BROKEN
548545
extern bool MCSystemPlayVideo(const char *p_filename);
549-
MCExecPoint *t_old_ep;
550-
t_old_ep = MCEPptr;
551-
MCEPptr = &ep;
552-
if (!MCSystemPlayVideo(ep.getcstring()))
546+
if (!MCSystemPlayVideo(MCStringGetCString(p_clip)))
553547
MCresult->sets("no video support");
554-
MCEPptr = t_old_ep;
555548
return;
556-
#endif
557549
#endif
558550

559551
MCPlayer *tptr = MCMultimediaExecGetClip(p_clip, p_chunk_type);

0 commit comments

Comments
 (0)