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

Commit 64bf795

Browse files
andrewfergusonandrewferguson
committed
[[Bugfix-14721]] Increase readability of enum
The readibility of the MCGoStackVisibility enum has been increased by renaming it to MCInterfaceExecGoVisibility, and prepending the new enum name to all the enumeration values. Also the use of braces in the enum definition has been updated to conform to the existing style (note to self: read C++style.md *first* next time).
1 parent b46a43f commit 64bf795

File tree

4 files changed

+18
-13
lines changed

4 files changed

+18
-13
lines changed

‎engine/src/cmds.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1738,7 +1738,7 @@ class MCGo : public MCStatement
17381738
Window_mode mode;
17391739
Boolean marked;
17401740
Boolean visible;
1741-
MCGoStackVisibility visibilityType = kImplicit;
1741+
MCInterfaceExecGoVisibility visibilityType = kMCInterfaceExecGoVisibilityImplicit;
17421742
Boolean thisstack;
17431743

17441744
MCChunk *widget;

‎engine/src/cmdss.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ Parse_stat MCGo::parse(MCScriptPoint &sp)
112112

113113
initpoint(sp);
114114
if (sp.skip_token(SP_FACTOR, TT_PROPERTY, P_INVISIBLE) == PS_NORMAL)
115-
visibilityType = kExplicitInvisible;
115+
visibilityType = kMCInterfaceExecGoVisibilityExplicitInvisible;
116116
if (sp.skip_token(SP_FACTOR, TT_PROPERTY, P_VISIBLE) == PS_NORMAL)
117-
visibilityType = kExplicitVisible;
117+
visibilityType = kMCInterfaceExecGoVisibilityExplicitVisible;
118118
while (True)
119119
{
120120
if (sp.next(type) != PS_NORMAL)

‎engine/src/exec-interface.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4329,7 +4329,7 @@ void MCInterfaceExecChooseTool(MCExecContext& ctxt, MCStringRef p_input, int p_t
43294329

43304330
////////////////////////////////////////////////////////////////////////////////
43314331

4332-
void MCInterfaceExecGo(MCExecContext& ctxt, MCCard *p_card, MCStringRef p_window, int p_mode, bool p_this_stack, MCGoStackVisibility p_visibility_type)
4332+
void MCInterfaceExecGo(MCExecContext& ctxt, MCCard *p_card, MCStringRef p_window, int p_mode, bool p_this_stack, MCInterfaceExecGoVisibility p_visibility_type)
43334333
{
43344334

43354335
if (p_card == nil)
@@ -4453,13 +4453,13 @@ void MCInterfaceExecGo(MCExecContext& ctxt, MCCard *p_card, MCStringRef p_window
44534453
MCtrace = False;
44544454

44554455
// MW-2007-02-11: [[ Bug 4029 ]] - 'go invisible' fails to close stack window if window already open
4456-
if (p_visibility_type != kImplicit)
4456+
if (p_visibility_type != kMCInterfaceExecGoVisibilityImplicit)
44574457
{
44584458
if (t_stack -> getwindow() != NULL)
44594459
MCscreen -> closewindow(t_stack -> getwindow());
4460-
if (p_visibility_type == kExplicitVisible)
4460+
if (p_visibility_type == kMCInterfaceExecGoVisibilityExplicitVisible)
44614461
t_stack->setflag(true, F_VISIBLE);
4462-
if (p_visibility_type == kExplicitInvisible)
4462+
if (p_visibility_type == kMCInterfaceExecGoVisibilityExplicitInvisible)
44634463
t_stack->setflag(false, F_VISIBLE);
44644464
}
44654465

@@ -4543,12 +4543,12 @@ void MCInterfaceExecGo(MCExecContext& ctxt, MCCard *p_card, MCStringRef p_window
45434543
ctxt . Throw();
45444544
}
45454545

4546-
void MCInterfaceExecGoCardAsMode(MCExecContext& ctxt, MCCard *p_card, int p_mode, MCGoStackVisibility p_visibility_type, bool p_this_stack)
4546+
void MCInterfaceExecGoCardAsMode(MCExecContext& ctxt, MCCard *p_card, int p_mode, MCInterfaceExecGoVisibility p_visibility_type, bool p_this_stack)
45474547
{
45484548
MCInterfaceExecGo(ctxt, p_card, nil, p_mode, p_this_stack, p_visibility_type);
45494549
}
45504550

4551-
void MCInterfaceExecGoCardInWindow(MCExecContext& ctxt, MCCard *p_card, MCStringRef p_window, MCGoStackVisibility p_visibility_type, bool p_this_stack)
4551+
void MCInterfaceExecGoCardInWindow(MCExecContext& ctxt, MCCard *p_card, MCStringRef p_window, MCInterfaceExecGoVisibility p_visibility_type, bool p_this_stack)
45524552
{
45534553
MCInterfaceExecGo(ctxt, p_card, p_window, WM_MODELESS, p_this_stack, p_visibility_type);
45544554
}
@@ -4576,7 +4576,7 @@ void MCInterfaceExecGoHome(MCExecContext& ctxt, MCCard *p_card)
45764576
MCdefaultstackptr->close();
45774577
MCdefaultstackptr->checkdestroy();
45784578
}
4579-
MCGoStackVisibility visibilityType = kImplicit;
4579+
MCInterfaceExecGoVisibility visibilityType = kMCInterfaceExecGoVisibilityImplicit;
45804580
MCInterfaceExecGo(ctxt, p_card, nil, 0, false, visibilityType);
45814581
}
45824582

‎engine/src/exec.h‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2449,9 +2449,14 @@ void MCInterfaceExecReplaceInField(MCExecContext& ctxt, MCStringRef p_pattern, M
24492449

24502450
void MCInterfaceExecChooseTool(MCExecContext& ctxt, MCStringRef p_input, int p_tool);
24512451

2452-
enum MCGoStackVisibility { kImplicit, kExplicitVisible, kExplicitInvisible };
2453-
void MCInterfaceExecGoCardAsMode(MCExecContext& ctxt, MCCard *p_card, int p_mode, MCGoStackVisibility p_visibility_type, bool p_this_stack);
2454-
void MCInterfaceExecGoCardInWindow(MCExecContext& ctxt, MCCard *p_card, MCStringRef p_window, MCGoStackVisibility p_visibility_type, bool p_this_stack);
2452+
enum MCInterfaceExecGoVisibility
2453+
{
2454+
kMCInterfaceExecGoVisibilityImplicit,
2455+
kMCInterfaceExecGoVisibilityExplicitVisible,
2456+
kMCInterfaceExecGoVisibilityExplicitInvisible
2457+
};
2458+
void MCInterfaceExecGoCardAsMode(MCExecContext& ctxt, MCCard *p_card, int p_mode, MCInterfaceExecGoVisibility p_visibility_type, bool p_this_stack);
2459+
void MCInterfaceExecGoCardInWindow(MCExecContext& ctxt, MCCard *p_card, MCStringRef p_window, MCInterfaceExecGoVisibility p_visibility_type, bool p_this_stack);
24552460
void MCInterfaceExecGoRecentCard(MCExecContext& ctxt);
24562461
void MCInterfaceExecGoCardRelative(MCExecContext& ctxt, bool p_forward, real8 p_amount);
24572462
void MCInterfaceExecGoCardEnd(MCExecContext& ctxt, bool p_is_start);

0 commit comments

Comments
 (0)