Skip to content

Commit ab05762

Browse files
peter-bpeter-b
committed
Rename control.h to mccontrol.h.
This is to avoid a naming conflict with control.h from the DirectShow API.
1 parent 594adc3 commit ab05762

28 files changed

Lines changed: 27 additions & 27 deletions

‎engine/engine-sources.gypi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
'src/card.h',
190190
'src/cardlst.h',
191191
'src/cdata.h',
192-
'src/control.h',
192+
'src/mccontrol.h',
193193
'src/cpalette.h',
194194
'src/dispatch.h',
195195
'src/edittool.h',

‎engine/src/button.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */
1717
#ifndef BUTTON_H
1818
#define BUTTON_H
1919

20-
#include "control.h"
20+
#include "mccontrol.h"
2121

2222

2323
#define AQUA_FUDGE 8

‎engine/src/cmdsc.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */
3131
#include "undolst.h"
3232
#include "chunk.h"
3333
#include "object.h"
34-
#include "control.h"
34+
#include "mccontrol.h"
3535
#include "mcerror.h"
3636
#include "dispatch.h"
3737
#include "stack.h"

‎engine/src/cmdsf.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */
3030
#include "chunk.h"
3131
#include "mcerror.h"
3232
#include "object.h"
33-
#include "control.h"
33+
#include "mccontrol.h"
3434
#include "aclip.h"
3535
#include "vclip.h"
3636
#include "eps.h"

‎engine/src/control.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */
2727
#include "stack.h"
2828
#include "tooltip.h"
2929
#include "card.h"
30-
#include "control.h"
30+
#include "mccontrol.h"
3131
#include "group.h"
3232
#include "field.h"
3333
#include "scrolbar.h"

‎engine/src/cpalette.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */
2020
#ifndef COLORS_H
2121
#define COLORS_H
2222

23-
#include "control.h"
23+
#include "mccontrol.h"
2424

2525
class MCColors : public MCControl
2626
{

‎engine/src/desktop.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "card.h"
3535
#include "debug.h"
3636
#include "dispatch.h"
37-
#include "control.h"
37+
#include "mccontrol.h"
3838
#include "field.h"
3939
#include "graphics_util.h"
4040
#include "redraw.h"

‎engine/src/eps.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */
2020
#ifndef MCEPS_H
2121
#define MCEPS_H
2222

23-
#include "control.h"
23+
#include "mccontrol.h"
2424

2525
class MCEPS : public MCControl
2626
{

‎engine/src/externalv1.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */
3333
#include "osspec.h"
3434
#include "globals.h"
3535
#include "object.h"
36-
#include "control.h"
36+
#include "mccontrol.h"
3737
#include "notify.h"
3838
#include "stack.h"
3939
#include "card.h"

‎engine/src/field.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ along with LiveCode. If not see <http://www.gnu.org/licenses/>. */
2020
#ifndef FIELD_H
2121
#define FIELD_H
2222

23-
#include "control.h"
23+
#include "mccontrol.h"
2424

2525
#define SCROLL_RATE 100
2626
#define MAX_PASTE_MESSAGES 32

0 commit comments

Comments
 (0)