* Merged r211-r234 of the common interfaces, with one change: the ObjC

    unit has been renamed ObjCRuntime, to avoid a name clash with the
    the other Objective-C translation, and this unit is also not included
    in the MacOSAll unit
  * warning: the FPCMacOSAll unit is now called MacOSAll, to avoid requiring
    ifdefs when keeping a program compilable between e.g. GPC and FPC

...
r211 | gale | 2008-03-19 07:41:36 +0100 (Wed, 19 Mar 2008) | 6 lines
Changed paths:
   A /metaPascal/trunc/MPPInterfaces/CGLTypes.pas
   A /metaPascal/trunc/MPPInterfaces/CVBase.pas
   A /metaPascal/trunc/MPPInterfaces/CVBuffer.pas
   A /metaPascal/trunc/MPPInterfaces/CVDisplayLink.pas
   A /metaPascal/trunc/MPPInterfaces/CVHostTime.pas
   A /metaPascal/trunc/MPPInterfaces/CVImageBuffer.pas
   A /metaPascal/trunc/MPPInterfaces/CVPixelBuffer.pas
   A /metaPascal/trunc/MPPInterfaces/CVPixelBufferPool.pas
   A /metaPascal/trunc/MPPInterfaces/CVPixelFormatDescription.pas
   A /metaPascal/trunc/MPPInterfaces/CVReturns.pas

Initial translations of CGLTypes.h, CVBase.h, CVBuffer.h, CVDisplayLink.h,
CVHostTime.h, CVImageBuffer.h, CVPixelBuffer.h, CVPixelBufferPool.h,
CVPixelFormatDescription.h, and CVReturn.h from MacOSX10.4u.sdk.  To avoid a GPC
identifier redeclaration problem, Pascal unit and file name corresponding to 
CVReturn.h uses a "s" suffix.

...
r212 | gale | 2008-03-19 09:55:13 +0100 (Wed, 19 Mar 2008) | 4 lines
Changed paths:
   D /metaPascal/trunc/MPPInterfaces/CGDisplayFade.pas
   A /metaPascal/trunc/MPPInterfaces/CGDisplayFades.pas (from /metaPascal/trunc/MPPInterfaces/CGDisplayFade.pas:210)
   M /metaPascal/trunc/MPPInterfaces/CoreGraphics.pas

Renamed CGDisplayFade unit to CGDisplayFades to fix a GPC gpc-20070904
redeclaration issue involving the function CGDisplayFade.  Also, updated the
CoreGraphics framework unit's uses clause to reflect the name change.

...
r213 | adriaan | 2008-03-25 09:37:06 +0100 (Tue, 25 Mar 2008) | 1 line
Changed paths:
   M /metaPascal/trunc/MPPInterfaces/fp.pas

Fix precision of pi
...
r214 | adriaan | 2008-03-25 09:50:48 +0100 (Tue, 25 Mar 2008) | 1 line
Changed paths:
   M /metaPascal/trunc/MPPInterfaces/Menus.pas

Fix byte parameter of GetMenuItemModifiers, SetMenuItemModifiers, GetMenuItemIconHandle and SetMenuItemIconHandle
...
r215 | adriaan | 2008-03-25 12:19:33 +0100 (Tue, 25 Mar 2008) | 1 line
Changed paths:
   M /metaPascal/trunc/Scripts/GenerateFile.pl

Use FourCharCode casts for FPC instead of hex numbers.
...
r216 | peter | 2008-03-25 14:20:20 +0100 (Tue, 25 Mar 2008) | 1 line
Changed paths:
   M /metaPascal/trunc/Makefile
   M /metaPascal/trunc/Scripts/GenerateFile.pl
   M /metaPascal/trunc/Scripts/GenerateMakefile.pl
   M /metaPascal/trunc/Scripts/make-common-interfaces.pl

XXXMacOSAll -> MacOSAll
...
r217 | adriaan | 2008-03-25 17:52:07 +0100 (Tue, 25 Mar 2008) | 1 line
Changed paths:
   M /metaPascal/trunc/MPPInterfaces/CFByteOrders.pas

Fix the result type of CFConvertFloat64SwappedToHost and friends for GPC and MW
...
r218 | gale | 2008-03-26 04:15:58 +0100 (Wed, 26 Mar 2008) | 2 lines
Changed paths:
   M /metaPascal/trunc/Scripts/GenerateFile.pl

Increment the GAP version number for tbe upcoming release.

...
r219 | adriaan | 2008-03-26 11:41:37 +0100 (Wed, 26 Mar 2008) | 1 line
Changed paths:
   M /metaPascal/trunc/MPPInterfaces/Events.pas

Change KeyMap to packed array of boolean for FPC. Solve GetKeys endian issue on PowerPC for FPC and GPC.
...
r220 | adriaan | 2008-03-26 12:19:19 +0100 (Wed, 26 Mar 2008) | 1 line
Changed paths:
   M /metaPascal/trunc/MPPInterfaces/fp.pas

Add pi=system.pi to fp.p for FPC
...
r221 | adriaan | 2008-03-26 12:41:27 +0100 (Wed, 26 Mar 2008) | 1 line
Changed paths:
   M /metaPascal/trunc/MPPInterfaces/Menus.pas

Fix GetItemMark and GetItemCmd for FPC and GPC
...
r222 | adriaan | 2008-03-26 16:42:53 +0100 (Wed, 26 Mar 2008) | 1 line
Changed paths:
   M /metaPascal/trunc/Scripts/GenerateMakefile.pl

Add support for: make GPC_COMPILER=xxx FPC_COMPILER=yyy compile
...
r223 | adriaan | 2008-03-30 17:25:57 +0200 (Sun, 30 Mar 2008) | 1 line
Changed paths:
   M /metaPascal/trunc/Scripts/GenerateFile.pl

Implement 'const var' for GPCt
...
r224 | adriaan | 2008-04-23 18:26:04 +0200 (Wed, 23 Apr 2008) | 1 line
Changed paths:
   M /metaPascal/trunc/MPPInterfaces/AIFF.pas

Rename ID in AIFF.pas to ChunkID
...
r225 | adriaan | 2008-04-23 18:34:38 +0200 (Wed, 23 Apr 2008) | 1 line
Changed paths:
   A /metaPascal/trunc/MPPInterfaces/ObjC.pas

Add Objective-C Runtime ObjC.pas
...
r226 | adriaan | 2008-05-04 07:19:30 +0200 (Sun, 04 May 2008) | 1 line
Changed paths:
   M /metaPascal/trunc/MPPInterfaces/Files.pas
   M /metaPascal/trunc/MPPInterfaces/Folders.pas

Introduce DirIDType = SInt32
...
r227 | adriaan | 2008-05-04 11:51:08 +0200 (Sun, 04 May 2008) | 1 line
Changed paths:
   M /metaPascal/trunc/MPPInterfaces/CFByteOrders.pas
   M /metaPascal/trunc/MPPInterfaces/Events.pas
   M /metaPascal/trunc/MPPInterfaces/Menus.pas
   M /metaPascal/trunc/MPPInterfaces/ToolUtils.pas

Fix MW warnings for units with an implementation part
...
r228 | adriaan | 2008-05-05 09:13:10 +0200 (Mon, 05 May 2008) | 1 line
Changed paths:
   M /metaPascal/trunc/MPPInterfaces/FPCStrings.pas

Fix compile error in FPCStrings.pas
...
r229 | adriaan | 2008-05-05 09:34:13 +0200 (Mon, 05 May 2008) | 1 line
Changed paths:
   M /metaPascal/trunc/Scripts/GenerateMacOS.pl

Add GPCStrings.pas (aka FPCStrings.pas) to MacOS.pas
...
r230 | adriaan | 2008-05-06 12:30:18 +0200 (Tue, 06 May 2008) | 1 line
Changed paths:
   M /metaPascal/trunc/Scripts/GenerateFile.pl

Set GAP release version to 210 instead of 201
...
r232 | adriaan | 2008-05-07 09:09:30 +0200 (Wed, 07 May 2008) | 1 line
Changed paths:
   M /metaPascal/trunc/Scripts/GenerateFile.pl

Fix GPC implemented procedures, functions and constants
...
r233 | adriaan | 2008-05-09 07:55:17 +0200 (Fri, 09 May 2008) | 1 line
Changed paths:
   M /metaPascal/trunc/MPPInterfaces/ObjC.pas

Add attribute(ignorable) to objc_msgSend(Super)
...
r234 | adriaan | 2008-05-16 21:09:52 +0200 (Fri, 16 May 2008) | 1 line
Changed paths:
   M /metaPascal/trunc/MPPInterfaces/ObjC.pas

Remove FPC implemented functions that reference the ObjC runtime
...

git-svn-id: trunk@11137 -

.gitattributes

@@ -4226,6 +4226,7 @@ packages/univint/src/CGDirectDisplay.pas svneol=native#text/plain
 packages/univint/src/CGDirectPalette.pas svneol=native#text/plain
 packages/univint/src/CGDisplayConfiguration.pas svneol=native#text/plain
 packages/univint/src/CGDisplayFade.pas svneol=native#text/plain
+packages/univint/src/CGDisplayFades.pas svneol=native#text/plain
 packages/univint/src/CGErrors.pas svneol=native#text/plain
 packages/univint/src/CGEvent.pas svneol=native#text/plain
 packages/univint/src/CGEventSource.pas svneol=native#text/plain
@@ -4238,6 +4239,7 @@ packages/univint/src/CGImage.pas svneol=native#text/plain
 packages/univint/src/CGImageDestination.pas svneol=native#text/plain
 packages/univint/src/CGImageProperties.pas svneol=native#text/plain
 packages/univint/src/CGImageSource.pas svneol=native#text/plain
+packages/univint/src/CGLTypes.pas svneol=native#text/plain
 packages/univint/src/CGLayer.pas svneol=native#text/plain
 packages/univint/src/CGPDFArray.pas svneol=native#text/plain
 packages/univint/src/CGPDFContentStream.pas svneol=native#text/plain
@@ -4265,6 +4267,15 @@ packages/univint/src/CMMComponent.pas svneol=native#text/plain
 packages/univint/src/CMPRComponent.pas svneol=native#text/plain
 packages/univint/src/CMScriptingPlugin.pas svneol=native#text/plain
 packages/univint/src/CMTypes.pas svneol=native#text/plain
+packages/univint/src/CVBase.pas svneol=native#text/plain
+packages/univint/src/CVBuffer.pas svneol=native#text/plain
+packages/univint/src/CVDisplayLink.pas svneol=native#text/plain
+packages/univint/src/CVHostTime.pas svneol=native#text/plain
+packages/univint/src/CVImageBuffer.pas svneol=native#text/plain
+packages/univint/src/CVPixelBuffer.pas svneol=native#text/plain
+packages/univint/src/CVPixelBufferPool.pas svneol=native#text/plain
+packages/univint/src/CVPixelFormatDescription.pas svneol=native#text/plain
+packages/univint/src/CVReturns.pas svneol=native#text/plain
 packages/univint/src/CarbonEvents.pas svneol=native#text/plain
 packages/univint/src/CarbonEventsCore.pas svneol=native#text/plain
 packages/univint/src/CodeFragments.pas svneol=native#text/plain
@@ -4291,7 +4302,6 @@ packages/univint/src/DriverGestalt.pas svneol=native#text/plain
 packages/univint/src/DriverSynchronization.pas svneol=native#text/plain
 packages/univint/src/Endian.pas svneol=native#text/plain
 packages/univint/src/Events.pas svneol=native#text/plain
-packages/univint/src/FPCMacOSAll.pas svneol=native#text/plain
 packages/univint/src/FileTypesAndCreators.pas svneol=native#text/plain
 packages/univint/src/Files.pas svneol=native#text/plain
 packages/univint/src/FindByContent.pas svneol=native#text/plain
@@ -4341,6 +4351,7 @@ packages/univint/src/MacHelp.pas svneol=native#text/plain
 packages/univint/src/MacLocales.pas svneol=native#text/plain
 packages/univint/src/MacMemory.pas svneol=native#text/plain
 packages/univint/src/MacOS.pas svneol=native#text/plain
+packages/univint/src/MacOSAll.pas svneol=native#text/plain
 packages/univint/src/MacOSXPosix.pas svneol=native#text/plain
 packages/univint/src/MacTextEditor.pas svneol=native#text/plain
 packages/univint/src/MacTypes.pas svneol=native#text/plain
@@ -4363,6 +4374,7 @@ packages/univint/src/OSA.pas svneol=native#text/plain
 packages/univint/src/OSAComp.pas svneol=native#text/plain
 packages/univint/src/OSAGeneric.pas svneol=native#text/plain
 packages/univint/src/OSUtils.pas svneol=native#text/plain
+packages/univint/src/ObjCRuntime.pas svneol=native#text/plain
 packages/univint/src/OpenTransport.pas svneol=native#text/plain
 packages/univint/src/OpenTransportProtocol.pas svneol=native#text/plain
 packages/univint/src/OpenTransportProviders.pas svneol=native#text/plain

packages/univint/Makefile.fpc

@@ -7,7 +7,7 @@ name=univint
 version=2.0.0
 
 [target]
-units=FPCMacOSAll MacOS GPCStrings
+units=MacOSAll MacOS
 implicitunits=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs \
   AEDataModel AEHelpers AEInteraction AEMach AEObjects \
   AEPackObject AERegistry AEUserTermTypes AIFF ASDebugging \
@@ -81,7 +81,13 @@ implicitunits=ABActions ABAddressBook ABGlobals ABPeoplePicker ABTypedefs \
   TranslationServices AXActionConstants HIMovieView \
   CGImageDestination AXValueConstants AXAttributeConstants \
   AXTextAttributedString CGImageProperties CGImageSource \
-  UniversalAccess HostTime
+  UniversalAccess HostTime GPCStrings \
+  CGDisplayFades CGLTypes CVBase CVBuffer \
+  CVDisplayLink CVHostTime CVImageBuffer CVPixelBuffer \
+  CVPixelBufferPool CVPixelFormatDescription CVReturns \
+  ObjCRuntime
+
+  
 exampledirs=examples
 
 [libs]
@@ -101,5 +107,5 @@ sourcedir=src tests
 fpcdir=../..
 
 [rules]
-FPCMacOSAll$(PPUEXT): $(filter-out MacOS.pas GPCStrings.pas,$(wildcard *.pas))
-MacOS$(PPUEXT): $(filter-out FPCMacOSAll.pas GPCStrings.pas,$(wildcard *.pas))
+MacOSAll$(PPUEXT): $(filter-out MacOS.pas GPCStrings.pas,$(wildcard *.pas))
+MacOS$(PPUEXT): $(filter-out MacOSAll.pas,$(wildcard *.pas))

packages/univint/src/ABActions.pas

@@ -9,7 +9,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -17,12 +17,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit ABActions;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/ABAddressBook.pas

@@ -10,7 +10,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -18,12 +18,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit ABAddressBook;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/ABGlobals.pas

@@ -10,7 +10,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -18,12 +18,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit ABGlobals;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/ABPeoplePicker.pas

@@ -9,7 +9,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -17,12 +17,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit ABPeoplePicker;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}
@@ -230,7 +230,7 @@ procedure ABPickerDeselectAll( inPicker: ABPickerRef ); external name '_ABPicker
 
 const
     // Carbon Event class for People Picker
-    kEventClassABPeoplePicker = $61627070 (* 'abpp' *);
+    kEventClassABPeoplePicker = FourCharCode('abpp');
 
 const
     // Carbon Event kinds for People Picker
@@ -244,7 +244,7 @@ const
 
 const
     // Carbon Event parameter name
-    kEventParamABPickerRef	=  $61627070 (* 'abpp' *);
+    kEventParamABPickerRef	=  FourCharCode('abpp');
 
     // Set the event handler for People Picker events.
 // AVAILABLE_MAC_OS_X_VERSION_10_3_AND_LATER

packages/univint/src/ABTypedefs.pas

@@ -10,7 +10,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -18,12 +18,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit ABTypedefs;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/AEDataModel.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AEDataModel;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}
@@ -112,91 +112,91 @@ uses MacTypes,MixedMode;
 { Apple event descriptor types }
 
 const
-	typeBoolean					= $626F6F6C (* 'bool' *);
-	typeChar					= $54455854 (* 'TEXT' *); { Deprecated, use typeUTF8Text instead. }
+	typeBoolean					= FourCharCode('bool');
+	typeChar					= FourCharCode('TEXT'); { Deprecated, use typeUTF8Text instead. }
 
 { The preferred unicode text types.  In both cases, there is no explicit null termination or length byte. }
 
-	typeUTF16ExternalRepresentation = $75743136 (* 'ut16' *); { big-endian 16 bit unicode with optional byte-order-mark, or little-endian 16 bit unicode with required byte-order-mark. }
-	typeUTF8Text                = $75746638 (* 'utf8' *); { 8 bit unicode }
+	typeUTF16ExternalRepresentation = FourCharCode('ut16'); { big-endian 16 bit unicode with optional byte-order-mark, or little-endian 16 bit unicode with required byte-order-mark. }
+	typeUTF8Text                = FourCharCode('utf8'); { 8 bit unicode }
 
 	{	 Preferred numeric Apple event descriptor types 	}
-	typeSInt16					= $73686F72 (* 'shor' *);
-	typeSInt32					= $6C6F6E67 (* 'long' *);
-	typeUInt32					= $6D61676E (* 'magn' *);
-	typeSInt64					= $636F6D70 (* 'comp' *);
-	typeIEEE32BitFloatingPoint	= $73696E67 (* 'sing' *);
-	typeIEEE64BitFloatingPoint	= $646F7562 (* 'doub' *);
-	type128BitFloatingPoint		= $6C64626C (* 'ldbl' *);
-	typeDecimalStruct			= $6465636D (* 'decm' *);
+	typeSInt16					= FourCharCode('shor');
+	typeSInt32					= FourCharCode('long');
+	typeUInt32					= FourCharCode('magn');
+	typeSInt64					= FourCharCode('comp');
+	typeIEEE32BitFloatingPoint	= FourCharCode('sing');
+	typeIEEE64BitFloatingPoint	= FourCharCode('doub');
+	type128BitFloatingPoint		= FourCharCode('ldbl');
+	typeDecimalStruct			= FourCharCode('decm');
 
 	{	 Non-preferred Apple event descriptor types 	}
-	typeSMInt					= $73686F72 (* 'shor' *);
-	typeShortInteger			= $73686F72 (* 'shor' *);
-	typeInteger					= $6C6F6E67 (* 'long' *);
-	typeLongInteger				= $6C6F6E67 (* 'long' *);
-	typeMagnitude				= $6D61676E (* 'magn' *);
-	typeComp					= $636F6D70 (* 'comp' *);
-	typeSMFloat					= $73696E67 (* 'sing' *);
-	typeShortFloat				= $73696E67 (* 'sing' *);
-	typeFloat					= $646F7562 (* 'doub' *);
-	typeLongFloat				= $646F7562 (* 'doub' *);
-	typeExtended				= $65787465 (* 'exte' *);
+	typeSMInt					= FourCharCode('shor');
+	typeShortInteger			= FourCharCode('shor');
+	typeInteger					= FourCharCode('long');
+	typeLongInteger				= FourCharCode('long');
+	typeMagnitude				= FourCharCode('magn');
+	typeComp					= FourCharCode('comp');
+	typeSMFloat					= FourCharCode('sing');
+	typeShortFloat				= FourCharCode('sing');
+	typeFloat					= FourCharCode('doub');
+	typeLongFloat				= FourCharCode('doub');
+	typeExtended				= FourCharCode('exte');
 
 	{	 More Apple event descriptor types 	}
-	typeAEList					= $6C697374 (* 'list' *);
-	typeAERecord				= $7265636F (* 'reco' *);
-	typeAppleEvent				= $61657674 (* 'aevt' *);
-	typeEventRecord				= $65767263 (* 'evrc' *);
-	typeTrue					= $74727565 (* 'true' *);
-	typeFalse					= $66616C73 (* 'fals' *);
-	typeAlias					= $616C6973 (* 'alis' *);
-	typeEnumerated				= $656E756D (* 'enum' *);
-	typeType					= $74797065 (* 'type' *);
-	typeAppParameters			= $61707061 (* 'appa' *);
-	typeProperty				= $70726F70 (* 'prop' *);
-	typeFSS						= $66737320 (* 'fss ' *);
-	typeFSRef					= $66737266 (* 'fsrf' *);
-	typeFileURL					= $6675726C (* 'furl' *);
-	typeKeyword					= $6B657977 (* 'keyw' *);
-	typeSectionH				= $73656374 (* 'sect' *);
-	typeWildCard				= $2A2A2A2A (* '****' *);
-	typeApplSignature			= $7369676E (* 'sign' *);
-	typeQDRectangle				= $71647274 (* 'qdrt' *);
-	typeFixed					= $66697864 (* 'fixd' *);
-	typeProcessSerialNumber		= $70736E20 (* 'psn ' *);
-	typeApplicationURL			= $6170726C (* 'aprl' *);
-	typeNull					= $6E756C6C (* 'null' *);						{  null or nonexistent data  }
+	typeAEList					= FourCharCode('list');
+	typeAERecord				= FourCharCode('reco');
+	typeAppleEvent				= FourCharCode('aevt');
+	typeEventRecord				= FourCharCode('evrc');
+	typeTrue					= FourCharCode('true');
+	typeFalse					= FourCharCode('fals');
+	typeAlias					= FourCharCode('alis');
+	typeEnumerated				= FourCharCode('enum');
+	typeType					= FourCharCode('type');
+	typeAppParameters			= FourCharCode('appa');
+	typeProperty				= FourCharCode('prop');
+	typeFSS						= FourCharCode('fss ');
+	typeFSRef					= FourCharCode('fsrf');
+	typeFileURL					= FourCharCode('furl');
+	typeKeyword					= FourCharCode('keyw');
+	typeSectionH				= FourCharCode('sect');
+	typeWildCard				= FourCharCode('****');
+	typeApplSignature			= FourCharCode('sign');
+	typeQDRectangle				= FourCharCode('qdrt');
+	typeFixed					= FourCharCode('fixd');
+	typeProcessSerialNumber		= FourCharCode('psn ');
+	typeApplicationURL			= FourCharCode('aprl');
+	typeNull					= FourCharCode('null');						{  null or nonexistent data  }
 
 {$ifc CALL_NOT_IN_CARBON}
 	{	 Deprecated addressing modes under Carbon 	}
-	typeSessionID				= $73736964 (* 'ssid' *);
-	typeTargetID				= $74617267 (* 'targ' *);
-	typeDispatcherID			= $64737074 (* 'dspt' *);
+	typeSessionID				= FourCharCode('ssid');
+	typeTargetID				= FourCharCode('targ');
+	typeDispatcherID			= FourCharCode('dspt');
 
 {$endc}  {CALL_NOT_IN_CARBON}
 
 	{ New addressing modes for MacOS X }
-	typeKernelProcessID         = $6B706964 (* 'kpid' *);
-	typeMachPort                = $706F7274 (* 'port' *);
+	typeKernelProcessID         = FourCharCode('kpid');
+	typeMachPort                = FourCharCode('port');
 
 	{ Targeting applications by bundle ID is only available in Mac OS X 10.3 or later. }
-	typeApplicationBundleID     = $62756E64 (* 'bund' *);
+	typeApplicationBundleID     = FourCharCode('bund');
 
 	{	 Keywords for Apple event attributes 	}
-	keyTransactionIDAttr		= $7472616E (* 'tran' *);
-	keyReturnIDAttr				= $72746964 (* 'rtid' *);
-	keyEventClassAttr			= $6576636C (* 'evcl' *);
-	keyEventIDAttr				= $65766964 (* 'evid' *);
-	keyAddressAttr				= $61646472 (* 'addr' *);
-	keyOptionalKeywordAttr		= $6F70746B (* 'optk' *);
-	keyTimeoutAttr				= $74696D6F (* 'timo' *);
-	keyInteractLevelAttr		= $696E7465 (* 'inte' *);						{  this attribute is read only - will be set in AESend  }
-	keyEventSourceAttr			= $65737263 (* 'esrc' *);						{  this attribute is read only - returned as typeShortInteger  }
-	keyMissedKeywordAttr		= $6D697373 (* 'miss' *);						{  this attribute is read only  }
-	keyOriginalAddressAttr		= $66726F6D (* 'from' *);						{  new in 1.0.1  }
-	keyAcceptTimeoutAttr		= $6163746D (* 'actm' *);						{  new for Mac OS X  }
-	keyReplyRequestedAttr       = $72657071 (* 'repq' *);                       { Was a reply requested for this event - returned as typeBoolean }
+	keyTransactionIDAttr		= FourCharCode('tran');
+	keyReturnIDAttr				= FourCharCode('rtid');
+	keyEventClassAttr			= FourCharCode('evcl');
+	keyEventIDAttr				= FourCharCode('evid');
+	keyAddressAttr				= FourCharCode('addr');
+	keyOptionalKeywordAttr		= FourCharCode('optk');
+	keyTimeoutAttr				= FourCharCode('timo');
+	keyInteractLevelAttr		= FourCharCode('inte');						{  this attribute is read only - will be set in AESend  }
+	keyEventSourceAttr			= FourCharCode('esrc');						{  this attribute is read only - returned as typeShortInteger  }
+	keyMissedKeywordAttr		= FourCharCode('miss');						{  this attribute is read only  }
+	keyOriginalAddressAttr		= FourCharCode('from');						{  new in 1.0.1  }
+	keyAcceptTimeoutAttr		= FourCharCode('actm');						{  new for Mac OS X  }
+	keyReplyRequestedAttr       = FourCharCode('repq');                       { Was a reply requested for this event - returned as typeBoolean }
 
 	{ These bits are specified in the keyXMLDebuggingAttr (an SInt32) }
 	kAEDebugPOSTHeader          = 1 shl 0; { headers of the HTTP post we sent - typeChar }
@@ -209,36 +209,36 @@ const
     SOAP message to specify the serialization schema.  If not
     specified, kSOAP1999Schema is the default. These should be added as
     typeType. }
-	kSOAP1999Schema             = $73733939 (* 'ss99' *);
-	kSOAP2001Schema             = $73733031 (* 'ss01' *);
+	kSOAP1999Schema             = FourCharCode('ss99');
+	kSOAP2001Schema             = FourCharCode('ss01');
 
 	{ outgoing event attributes }
-	keyUserNameAttr             = $756E616D (* 'unam' *);
-	keyUserPasswordAttr         = $70617373 (* 'pass' *); { not sent with the event }
-	keyDisableAuthenticationAttr = $61757468 (* 'auth' *); { When present and with a non zero value (that is, false, or integer 0), }
+	keyUserNameAttr             = FourCharCode('unam');
+	keyUserPasswordAttr         = FourCharCode('pass'); { not sent with the event }
+	keyDisableAuthenticationAttr = FourCharCode('auth'); { When present and with a non zero value (that is, false, or integer 0), }
                                                            { AESend will not authenticate the user.  If not present, or with a non-zero}
                                                            { value, AESend will prompt for authentication information from the user if the interaction level allows. }
-	keyXMLDebuggingAttr         = $78646267 (* 'xdbg' *); { a bitfield of specifying which XML debugging data is to be returned with the event }
+	keyXMLDebuggingAttr         = FourCharCode('xdbg'); { a bitfield of specifying which XML debugging data is to be returned with the event }
                                                           { Event class / id }
-	kAERPCClass                 = $72706320 (* 'rpc ' *); { for outgoing XML events }
-	kAEXMLRPCScheme             = $52504332 (* 'RPC2' *); { event ID: event should be sent to an XMLRPC endpoint }
-	kAESOAPScheme               = $534F4150 (* 'SOAP' *); { event ID: event should be sent to a SOAP endpoint }
-	kAESharedScriptHandler      = $77736370 (* 'wscp' *); { event ID: handler for incoming XML requests }
+	kAERPCClass                 = FourCharCode('rpc '); { for outgoing XML events }
+	kAEXMLRPCScheme             = FourCharCode('RPC2'); { event ID: event should be sent to an XMLRPC endpoint }
+	kAESOAPScheme               = FourCharCode('SOAP'); { event ID: event should be sent to a SOAP endpoint }
+	kAESharedScriptHandler      = FourCharCode('wscp'); { event ID: handler for incoming XML requests }
                                                           { these parameters exist as part of the direct object of the event for both incoming and outgoing requests }
-	keyRPCMethodName            = $6D657468 (* 'meth' *); { name of the method to call }
-	keyRPCMethodParam           = $7061726D (* 'parm' *); { the list (or structure) of parameters }
-	keyRPCMethodParamOrder      = $2F6F7264 (* '/ord' *); { if a structure, the order of parameters (a list) }
+	keyRPCMethodName            = FourCharCode('meth'); { name of the method to call }
+	keyRPCMethodParam           = FourCharCode('parm'); { the list (or structure) of parameters }
+	keyRPCMethodParamOrder      = FourCharCode('/ord'); { if a structure, the order of parameters (a list) }
                                                           { when keyXMLDebugginAttr so specifies, these additional parameters will be part of the reply. }
-	keyAEPOSTHeaderData         = $70686564 (* 'phed' *); { what we sent to the server }
-	keyAEReplyHeaderData        = $72686564 (* 'rhed' *); { what the server sent to us }
-	keyAEXMLRequestData         = $78726571 (* 'xreq' *); { what we sent to the server }
-	keyAEXMLReplyData           = $78726570 (* 'xrep' *); { what the server sent to us }
+	keyAEPOSTHeaderData         = FourCharCode('phed'); { what we sent to the server }
+	keyAEReplyHeaderData        = FourCharCode('rhed'); { what the server sent to us }
+	keyAEXMLRequestData         = FourCharCode('xreq'); { what we sent to the server }
+	keyAEXMLReplyData           = FourCharCode('xrep'); { what the server sent to us }
                                                           { additional parameters that can be specified in the direct object of the event }
-	keyAdditionalHTTPHeaders    = $61686564 (* 'ahed' *); { list of additional HTTP headers (a list of 2 element lists) }
-	keySOAPAction               = $73616374 (* 'sact' *); { the SOAPAction header (required for SOAP messages) }
-	keySOAPMethodNameSpace      = $6D737063 (* 'mspc' *); { Optional namespace (defaults to m:) }
-	keySOAPMethodNameSpaceURI   = $6D737075 (* 'mspu' *); { Required namespace URI }
-	keySOAPSchemaVersion        = $73736368 (* 'ssch' *); { Optional XML Schema version, defaults to kSOAP1999Schama }
+	keyAdditionalHTTPHeaders    = FourCharCode('ahed'); { list of additional HTTP headers (a list of 2 element lists) }
+	keySOAPAction               = FourCharCode('sact'); { the SOAPAction header (required for SOAP messages) }
+	keySOAPMethodNameSpace      = FourCharCode('mspc'); { Optional namespace (defaults to m:) }
+	keySOAPMethodNameSpaceURI   = FourCharCode('mspu'); { Required namespace URI }
+	keySOAPSchemaVersion        = FourCharCode('ssch'); { Optional XML Schema version, defaults to kSOAP1999Schama }
 
 { 
    When serializing AERecords as SOAP structures, it is possible
@@ -255,10 +255,10 @@ const
     </myStruct>
 
 }
-	keySOAPStructureMetaData    = $2F736D64 (* '/smd' *);
-	keySOAPSMDNamespace         = $73736E73 (* 'ssns' *); { "myNamespace"}
-	keySOAPSMDNamespaceURI      = $73736E75 (* 'ssnu' *); { "http://myUri.org/xsd"}
-	keySOAPSMDType              = $73737470 (* 'sstp' *); { "MyStructType"}
+	keySOAPStructureMetaData    = FourCharCode('/smd');
+	keySOAPSMDNamespace         = FourCharCode('ssns'); { "myNamespace"}
+	keySOAPSMDNamespaceURI      = FourCharCode('ssnu'); { "http://myUri.org/xsd"}
+	keySOAPSMDType              = FourCharCode('sstp'); { "MyStructType"}
 
 { 
  * Web Services Proxy support.  Available only on Mac OS X 10.2 or later.
@@ -266,10 +266,10 @@ const
  * being sent (not part of the direct object.)
  }
    { Automatically configure the proxy based on System Configuration }
-	kAEUseHTTPProxyAttr         = $78757072 (* 'xupr' *); { a typeBoolean.  Defaults to true.}
+	kAEUseHTTPProxyAttr         = FourCharCode('xupr'); { a typeBoolean.  Defaults to true.}
                                                           { manually specify the proxy host and port. }
-	kAEHTTPProxyPortAttr        = $78687470 (* 'xhtp' *); { a typeSInt32}
-	kAEHTTPProxyHostAttr        = $78687468 (* 'xhth' *); { a typeChar}
+	kAEHTTPProxyPortAttr        = FourCharCode('xhtp'); { a typeSInt32}
+	kAEHTTPProxyHostAttr        = FourCharCode('xhth'); { a typeChar}
 
 {
  * Web Services SOCKS support.  kAEUseSocksAttr is a boolean that
@@ -279,15 +279,15 @@ const
 	kAESocks4Protocol           = 4;
 	kAESocks5Protocol           = 5;
 
-	kAEUseSocksAttr             = $78736373 (* 'xscs' *); { a typeBoolean.  Defaults to true.}
+	kAEUseSocksAttr             = FourCharCode('xscs'); { a typeBoolean.  Defaults to true.}
                                                           { This attribute specifies a specific SOCKS protocol to be used }
-	kAESocksProxyAttr           = $78736F6B (* 'xsok' *); { a typeSInt32}
+	kAESocksProxyAttr           = FourCharCode('xsok'); { a typeSInt32}
                                                      { if version >= 4 }
-	kAESocksHostAttr            = $78736873 (* 'xshs' *); { a typeChar}
-	kAESocksPortAttr            = $78736870 (* 'xshp' *); { a typeSInt32}
-	kAESocksUserAttr            = $78736875 (* 'xshu' *); { a typeChar}
+	kAESocksHostAttr            = FourCharCode('xshs'); { a typeChar}
+	kAESocksPortAttr            = FourCharCode('xshp'); { a typeSInt32}
+	kAESocksUserAttr            = FourCharCode('xshu'); { a typeChar}
                                                      { if version >= 5 }
-	kAESocksPasswordAttr        = $78736877 (* 'xshw' *); { a typeChar}
+	kAESocksPasswordAttr        = FourCharCode('xshw'); { a typeChar}
 
 
 

packages/univint/src/AEHelpers.pas

@@ -21,7 +21,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -29,12 +29,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AEHelpers;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/AEInteraction.pas

@@ -16,7 +16,7 @@
 {       Pascal Translation Updated:  Peter N Lewis, <[email protected]>, August 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -24,12 +24,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AEInteraction;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/AEMach.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AEMach;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}
@@ -138,7 +138,7 @@ uses MacTypes,MixedMode,AEDataModel;
  *}
 
 const
-	typeReplyPortAttr			= $72657070 (* 'repp' *);
+	typeReplyPortAttr			= FourCharCode('repp');
 
 {$ifc TARGET_RT_MAC_MACHO}
 {$ifc not undefined _MACH_MESSAGE_H_}

packages/univint/src/AEObjects.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AEObjects;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}
@@ -112,62 +112,62 @@ uses MacTypes,AEDataModel,OSUtils,AppleEvents,MacErrors;
 
 const
 																{ *** LOGICAL OPERATOR CONSTANTS  *** }
-	kAEAND						= $414E4420 (* 'AND ' *);						{   0x414e4420   }
-	kAEOR						= $4F522020 (* 'OR  ' *);						{   0x4f522020   }
-	kAENOT						= $4E4F5420 (* 'NOT ' *);						{   0x4e4f5420   }
+	kAEAND						= FourCharCode('AND ');						{   0x414e4420   }
+	kAEOR						= FourCharCode('OR  ');						{   0x4f522020   }
+	kAENOT						= FourCharCode('NOT ');						{   0x4e4f5420   }
 																{ *** ABSOLUTE ORDINAL CONSTANTS  *** }
-	kAEFirst					= $66697273 (* 'firs' *);						{   0x66697273   }
-	kAELast						= $6C617374 (* 'last' *);						{   0x6c617374   }
-	kAEMiddle					= $6D696464 (* 'midd' *);						{   0x6d696464   }
-	kAEAny						= $616E7920 (* 'any ' *);						{   0x616e7920   }
-	kAEAll						= $616C6C20 (* 'all ' *);						{   0x616c6c20   }
+	kAEFirst					= FourCharCode('firs');						{   0x66697273   }
+	kAELast						= FourCharCode('last');						{   0x6c617374   }
+	kAEMiddle					= FourCharCode('midd');						{   0x6d696464   }
+	kAEAny						= FourCharCode('any ');						{   0x616e7920   }
+	kAEAll						= FourCharCode('all ');						{   0x616c6c20   }
 																{ *** RELATIVE ORDINAL CONSTANTS  *** }
-	kAENext						= $6E657874 (* 'next' *);						{   0x6e657874   }
-	kAEPrevious					= $70726576 (* 'prev' *);						{   0x70726576   }
+	kAENext						= FourCharCode('next');						{   0x6e657874   }
+	kAEPrevious					= FourCharCode('prev');						{   0x70726576   }
 																{ *** KEYWORD CONSTANT    *** }
-	keyAECompOperator			= $72656C6F (* 'relo' *);						{   0x72656c6f   }
-	keyAELogicalTerms			= $7465726D (* 'term' *);						{   0x7465726d   }
-	keyAELogicalOperator		= $6C6F6763 (* 'logc' *);						{   0x6c6f6763   }
-	keyAEObject1				= $6F626A31 (* 'obj1' *);						{   0x6f626a31   }
-	keyAEObject2				= $6F626A32 (* 'obj2' *);						{   0x6f626a32   }
+	keyAECompOperator			= FourCharCode('relo');						{   0x72656c6f   }
+	keyAELogicalTerms			= FourCharCode('term');						{   0x7465726d   }
+	keyAELogicalOperator		= FourCharCode('logc');						{   0x6c6f6763   }
+	keyAEObject1				= FourCharCode('obj1');						{   0x6f626a31   }
+	keyAEObject2				= FourCharCode('obj2');						{   0x6f626a32   }
 																{     ... for Keywords for getting fields out of object specifier records.  }
-	keyAEDesiredClass			= $77616E74 (* 'want' *);						{   0x77616e74   }
-	keyAEContainer				= $66726F6D (* 'from' *);						{   0x66726f6d   }
-	keyAEKeyForm				= $666F726D (* 'form' *);						{   0x666f726d   }
-	keyAEKeyData				= $73656C64 (* 'seld' *);						{   0x73656c64   }
+	keyAEDesiredClass			= FourCharCode('want');						{   0x77616e74   }
+	keyAEContainer				= FourCharCode('from');						{   0x66726f6d   }
+	keyAEKeyForm				= FourCharCode('form');						{   0x666f726d   }
+	keyAEKeyData				= FourCharCode('seld');						{   0x73656c64   }
 
 																{     ... for Keywords for getting fields out of Range specifier records.  }
-	keyAERangeStart				= $73746172 (* 'star' *);						{   0x73746172   }
-	keyAERangeStop				= $73746F70 (* 'stop' *);						{   0x73746f70   }
+	keyAERangeStart				= FourCharCode('star');						{   0x73746172   }
+	keyAERangeStop				= FourCharCode('stop');						{   0x73746f70   }
 																{     ... special handler selectors for OSL Callbacks.  }
-	keyDisposeTokenProc			= $78746F6B (* 'xtok' *);						{   0x78746f6b   }
-	keyAECompareProc			= $636D7072 (* 'cmpr' *);						{   0x636d7072   }
-	keyAECountProc				= $636F6E74 (* 'cont' *);						{   0x636f6e74   }
-	keyAEMarkTokenProc			= $6D6B6964 (* 'mkid' *);						{   0x6d6b6964   }
-	keyAEMarkProc				= $6D61726B (* 'mark' *);						{   0x6d61726b   }
-	keyAEAdjustMarksProc		= $61646A6D (* 'adjm' *);						{   0x61646a6d   }
-	keyAEGetErrDescProc			= $696E6463 (* 'indc' *);						{   0x696e6463   }
+	keyDisposeTokenProc			= FourCharCode('xtok');						{   0x78746f6b   }
+	keyAECompareProc			= FourCharCode('cmpr');						{   0x636d7072   }
+	keyAECountProc				= FourCharCode('cont');						{   0x636f6e74   }
+	keyAEMarkTokenProc			= FourCharCode('mkid');						{   0x6d6b6964   }
+	keyAEMarkProc				= FourCharCode('mark');						{   0x6d61726b   }
+	keyAEAdjustMarksProc		= FourCharCode('adjm');						{   0x61646a6d   }
+	keyAEGetErrDescProc			= FourCharCode('indc');						{   0x696e6463   }
 
 	{	***   VALUE and type CONSTANTS    ***	}
 																{     ... possible values for the keyAEKeyForm field of an object specifier.  }
-	formAbsolutePosition		= $696E6478 (* 'indx' *);						{   0x696e6478   }
-	formRelativePosition		= $72656C65 (* 'rele' *);						{   0x72656c65   }
-	formTest					= $74657374 (* 'test' *);						{   0x74657374   }
-	formRange					= $72616E67 (* 'rang' *);						{   0x72616e67   }
-	formPropertyID				= $70726F70 (* 'prop' *);						{   0x70726f70   }
-	formName					= $6E616D65 (* 'name' *);						{   0x6e616d65   }
+	formAbsolutePosition		= FourCharCode('indx');						{   0x696e6478   }
+	formRelativePosition		= FourCharCode('rele');						{   0x72656c65   }
+	formTest					= FourCharCode('test');						{   0x74657374   }
+	formRange					= FourCharCode('rang');						{   0x72616e67   }
+	formPropertyID				= FourCharCode('prop');						{   0x70726f70   }
+	formName					= FourCharCode('name');						{   0x6e616d65   }
 																{     ... relevant types (some of these are often pared with forms above).  }
-	typeObjectSpecifier			= $6F626A20 (* 'obj ' *);						{   0x6f626a20   }
-	typeObjectBeingExamined		= $65786D6E (* 'exmn' *);						{   0x65786d6e   }
-	typeCurrentContainer		= $63636E74 (* 'ccnt' *);						{   0x63636e74   }
-	typeToken					= $746F6B65 (* 'toke' *);						{   0x746f6b65   }
-	typeRelativeDescriptor		= $72656C20 (* 'rel ' *);						{   0x72656c20   }
-	typeAbsoluteOrdinal			= $6162736F (* 'abso' *);						{   0x6162736f   }
-	typeIndexDescriptor			= $696E6465 (* 'inde' *);						{   0x696e6465   }
-	typeRangeDescriptor			= $72616E67 (* 'rang' *);						{   0x72616e67   }
-	typeLogicalDescriptor		= $6C6F6769 (* 'logi' *);						{   0x6c6f6769   }
-	typeCompDescriptor			= $636D7064 (* 'cmpd' *);						{   0x636d7064   }
-	typeOSLTokenList			= $6F73746C (* 'ostl' *);						{   0x6F73746C   }
+	typeObjectSpecifier			= FourCharCode('obj ');						{   0x6f626a20   }
+	typeObjectBeingExamined		= FourCharCode('exmn');						{   0x65786d6e   }
+	typeCurrentContainer		= FourCharCode('ccnt');						{   0x63636e74   }
+	typeToken					= FourCharCode('toke');						{   0x746f6b65   }
+	typeRelativeDescriptor		= FourCharCode('rel ');						{   0x72656c20   }
+	typeAbsoluteOrdinal			= FourCharCode('abso');						{   0x6162736f   }
+	typeIndexDescriptor			= FourCharCode('inde');						{   0x696e6465   }
+	typeRangeDescriptor			= FourCharCode('rang');						{   0x72616e67   }
+	typeLogicalDescriptor		= FourCharCode('logi');						{   0x6c6f6769   }
+	typeCompDescriptor			= FourCharCode('cmpd');						{   0x636d7064   }
+	typeOSLTokenList			= FourCharCode('ostl');						{   0x6F73746C   }
 
 	{	 Possible values for flags parameter to AEResolve.  They're additive 	}
 	kAEIDoMinimum				= $0000;
@@ -179,13 +179,13 @@ const
 	kAEUseRelativeIterators		= $0040;
 
 	{	*** SPECIAL CONSTANTS FOR CUSTOM WHOSE-CLAUSE RESOLUTION 	}
-	typeWhoseDescriptor			= $77686F73 (* 'whos' *);						{   0x77686f73   }
-	formWhose					= $77686F73 (* 'whos' *);						{   0x77686f73   }
-	typeWhoseRange				= $77726E67 (* 'wrng' *);						{   0x77726e67   }
-	keyAEWhoseRangeStart		= $77737472 (* 'wstr' *);						{   0x77737472   }
-	keyAEWhoseRangeStop			= $77737470 (* 'wstp' *);						{   0x77737470   }
-	keyAEIndex					= $6B696478 (* 'kidx' *);						{   0x6b696478   }
-	keyAETest					= $6B747374 (* 'ktst' *);						{   0x6b747374   }
+	typeWhoseDescriptor			= FourCharCode('whos');						{   0x77686f73   }
+	formWhose					= FourCharCode('whos');						{   0x77686f73   }
+	typeWhoseRange				= FourCharCode('wrng');						{   0x77726e67   }
+	keyAEWhoseRangeStart		= FourCharCode('wstr');						{   0x77737472   }
+	keyAEWhoseRangeStop			= FourCharCode('wstp');						{   0x77737470   }
+	keyAEIndex					= FourCharCode('kidx');						{   0x6b696478   }
+	keyAETest					= FourCharCode('ktst');						{   0x6b747374   }
 
 	{	
 	    used for rewriting tokens in place of 'ccnt' descriptors

packages/univint/src/AEPackObject.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AEPackObject;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/AEUserTermTypes.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AEUserTermTypes;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}
@@ -111,10 +111,10 @@ uses MacTypes,ConditionalMacros;
 
 
 const
-	kAEUserTerminology			= $61657574 (* 'aeut' *);						{   0x61657574   }
-	kAETerminologyExtension		= $61657465 (* 'aete' *);						{   0x61657465   }
-	kAEScriptingSizeResource	= $7363737A (* 'scsz' *);						{   0x7363737a   }
-	kAEOSAXSizeResource			= $6F73697A (* 'osiz' *);
+	kAEUserTerminology			= FourCharCode('aeut');						{   0x61657574   }
+	kAETerminologyExtension		= FourCharCode('aete');						{   0x61657465   }
+	kAEScriptingSizeResource	= FourCharCode('scsz');						{   0x7363737a   }
+	kAEOSAXSizeResource			= FourCharCode('osiz');
 
 	kAEUTHasReturningParam		= 31;							{  if event has a keyASReturning param  }
 	kAEUTOptional				= 15;							{  if something is optional  }

packages/univint/src/AIFF.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AIFF;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}
@@ -111,22 +111,22 @@ uses MacTypes;
 
 
 const
-	AIFFID						= $41494646 (* 'AIFF' *);
-	AIFCID						= $41494643 (* 'AIFC' *);
-	FormatVersionID				= $46564552 (* 'FVER' *);
-	CommonID					= $434F4D4D (* 'COMM' *);
-	FORMID						= $464F524D (* 'FORM' *);
-	SoundDataID					= $53534E44 (* 'SSND' *);
-	MarkerID					= $4D41524B (* 'MARK' *);
-	InstrumentID				= $494E5354 (* 'INST' *);
-	MIDIDataID					= $4D494449 (* 'MIDI' *);
-	AudioRecordingID			= $41455344 (* 'AESD' *);
-	ApplicationSpecificID		= $4150504C (* 'APPL' *);
-	CommentID					= $434F4D54 (* 'COMT' *);
-	NameID						= $4E414D45 (* 'NAME' *);
-	AuthorID					= $41555448 (* 'AUTH' *);
-	CopyrightID					= $28632920 (* '(c) ' *);
-	AnnotationID				= $414E4E4F (* 'ANNO' *);
+	AIFFID						= FourCharCode('AIFF');
+	AIFCID						= FourCharCode('AIFC');
+	FormatVersionID				= FourCharCode('FVER');
+	CommonID					= FourCharCode('COMM');
+	FORMID						= FourCharCode('FORM');
+	SoundDataID					= FourCharCode('SSND');
+	MarkerID					= FourCharCode('MARK');
+	InstrumentID				= FourCharCode('INST');
+	MIDIDataID					= FourCharCode('MIDI');
+	AudioRecordingID			= FourCharCode('AESD');
+	ApplicationSpecificID		= FourCharCode('APPL');
+	CommentID					= FourCharCode('COMT');
+	NameID						= FourCharCode('NAME');
+	AuthorID					= FourCharCode('AUTH');
+	CopyrightID					= FourCharCode('(c) ');
+	AnnotationID				= FourCharCode('ANNO');
 
 	NoLooping					= 0;
 	ForwardLooping				= 1;
@@ -142,39 +142,40 @@ const
 	MACE3to1Name				= 'MACE 3-to-1';
 	MACE6to1Name				= 'MACE 6-to-1';
 																{  Compression Types  }
-	NoneType					= $4E4F4E45 (* 'NONE' *);
-	ACE2Type					= $41434532 (* 'ACE2' *);
-	ACE8Type					= $41434538 (* 'ACE8' *);
-	MACE3Type					= $4D414333 (* 'MAC3' *);
-	MACE6Type					= $4D414336 (* 'MAC6' *);
+	NoneType					= FourCharCode('NONE');
+	ACE2Type					= FourCharCode('ACE2');
+	ACE8Type					= FourCharCode('ACE8');
+	MACE3Type					= FourCharCode('MAC3');
+	MACE6Type					= FourCharCode('MAC6');
 
 
 type
-	ID									= UInt32;
+{ changed from ID to ChunkID, as ID is used in objc.pas (sorry) }
+	ChunkID									= UInt32; {ID}
 	MarkerIdType						= SInt16;
 	ChunkHeaderPtr = ^ChunkHeader;
 	ChunkHeader = record
-		ckID:					ID;
+		ckID:					ChunkID;
 		ckSize:					SInt32;
 	end;
 
 	ContainerChunkPtr = ^ContainerChunk;
 	ContainerChunk = record
-		ckID:					ID;
+		ckID:					ChunkID;
 		ckSize:					SInt32;
-		formType:				ID;
+		formType:				ChunkID;
 	end;
 
 	FormatVersionChunkPtr = ^FormatVersionChunk;
 	FormatVersionChunk = record
-		ckID:					ID;
+		ckID:					ChunkID;
 		ckSize:					SInt32;
 		timestamp:				UInt32;
 	end;
 
 	CommonChunkPtr = ^CommonChunk;
 	CommonChunk = record
-		ckID:					ID;
+		ckID:					ChunkID;
 		ckSize:					SInt32;
 		numChannels:			SInt16;
 		numSampleFrames:		UInt32;
@@ -184,19 +185,19 @@ type
 
 	ExtCommonChunkPtr = ^ExtCommonChunk;
 	ExtCommonChunk = record
-		ckID:					ID;
+		ckID:					ChunkID;
 		ckSize:					SInt32;
 		numChannels:			SInt16;
 		numSampleFrames:		UInt32;
 		sampleSize:				SInt16;
 		sampleRate:				extended80;
-		compressionType:		ID;
+		compressionType:		ChunkID;
 		compressionName:		SInt8;									{  variable length array, Pascal string  }
 	end;
 
 	SoundDataChunkPtr = ^SoundDataChunk;
 	SoundDataChunk = record
-		ckID:					ID;
+		ckID:					ChunkID;
 		ckSize:					SInt32;
 		offset:					UInt32;
 		blockSize:				UInt32;
@@ -211,7 +212,7 @@ type
 
 	MarkerChunkPtr = ^MarkerChunk;
 	MarkerChunk = record
-		ckID:					ID;
+		ckID:					ChunkID;
 		ckSize:					SInt32;
 		numMarkers:				UInt16;
 		Markers:				array [0..0] of Marker;					{  variable length array  }
@@ -226,7 +227,7 @@ type
 
 	InstrumentChunkPtr = ^InstrumentChunk;
 	InstrumentChunk = packed record
-		ckID:					ID;
+		ckID:					ChunkID;
 		ckSize:					SInt32;
 		baseFrequency:			UInt8;
 		detune:					UInt8;
@@ -241,21 +242,21 @@ type
 
 	MIDIDataChunkPtr = ^MIDIDataChunk;
 	MIDIDataChunk = record
-		ckID:					ID;
+		ckID:					ChunkID;
 		ckSize:					SInt32;
 		MIDIdata:				SInt8;									{  variable length array  }
 	end;
 
 	AudioRecordingChunkPtr = ^AudioRecordingChunk;
 	AudioRecordingChunk = record
-		ckID:					ID;
+		ckID:					ChunkID;
 		ckSize:					SInt32;
 		AESChannelStatus:		packed array [0..23] of UInt8;
 	end;
 
 	ApplicationSpecificChunkPtr = ^ApplicationSpecificChunk;
 	ApplicationSpecificChunk = record
-		ckID:					ID;
+		ckID:					ChunkID;
 		ckSize:					SInt32;
 		applicationSignature:	OSType;
 		data:					SInt8;									{  variable length array  }
@@ -271,7 +272,7 @@ type
 
 	CommentsChunkPtr = ^CommentsChunk;
 	CommentsChunk = record
-		ckID:					ID;
+		ckID:					ChunkID;
 		ckSize:					SInt32;
 		numComments:			UInt16;
 		comments:				array [0..0] of Comment;				{  variable length array  }
@@ -279,7 +280,7 @@ type
 
 	TextChunkPtr = ^TextChunk;
 	TextChunk = record
-		ckID:					ID;
+		ckID:					ChunkID;
 		ckSize:					SInt32;
 		text:					SInt8;									{  variable length array, Pascal string  }
 	end;

packages/univint/src/ASDebugging.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit ASDebugging;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/ASRegistry.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit ASRegistry;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}
@@ -111,185 +111,185 @@ uses MacTypes,AERegistry,AEObjects;
 
 
 const
-	keyAETarget					= $74617267 (* 'targ' *);
-	keySubjectAttr				= $7375626A (* 'subj' *);						{  Magic 'returning' parameter:  }
-	keyASReturning				= $4B72746E (* 'Krtn' *);						{  AppleScript Specific Codes:  }
-	kASAppleScriptSuite			= $61736372 (* 'ascr' *);
-	kASScriptEditorSuite		= $546F7953 (* 'ToyS' *);
-	kASTypeNamesSuite			= $74706E6D (* 'tpnm' *);						{  dynamic terminologies  }
-	typeAETE					= $61657465 (* 'aete' *);
-	typeAEUT					= $61657574 (* 'aeut' *);
-	kGetAETE					= $67647465 (* 'gdte' *);
-	kGetAEUT					= $67647574 (* 'gdut' *);
-	kUpdateAEUT					= $75647574 (* 'udut' *);
-	kUpdateAETE					= $75647465 (* 'udte' *);
-	kCleanUpAEUT				= $63647574 (* 'cdut' *);
-	kASComment					= $636D6E74 (* 'cmnt' *);
-	kASLaunchEvent				= $6E6F6F70 (* 'noop' *);
-	keyScszResource				= $7363737A (* 'scsz' *);
-	typeScszResource			= $7363737A (* 'scsz' *);						{  subroutine calls  }
-	kASSubroutineEvent			= $70736272 (* 'psbr' *);
-	keyASSubroutineName			= $736E616D (* 'snam' *);
-	kASPrepositionalSubroutine	= $70736272 (* 'psbr' *);
-	keyASPositionalArgs			= $70617267 (* 'parg' *);
+	keyAETarget					= FourCharCode('targ');
+	keySubjectAttr				= FourCharCode('subj');						{  Magic 'returning' parameter:  }
+	keyASReturning				= FourCharCode('Krtn');						{  AppleScript Specific Codes:  }
+	kASAppleScriptSuite			= FourCharCode('ascr');
+	kASScriptEditorSuite		= FourCharCode('ToyS');
+	kASTypeNamesSuite			= FourCharCode('tpnm');						{  dynamic terminologies  }
+	typeAETE					= FourCharCode('aete');
+	typeAEUT					= FourCharCode('aeut');
+	kGetAETE					= FourCharCode('gdte');
+	kGetAEUT					= FourCharCode('gdut');
+	kUpdateAEUT					= FourCharCode('udut');
+	kUpdateAETE					= FourCharCode('udte');
+	kCleanUpAEUT				= FourCharCode('cdut');
+	kASComment					= FourCharCode('cmnt');
+	kASLaunchEvent				= FourCharCode('noop');
+	keyScszResource				= FourCharCode('scsz');
+	typeScszResource			= FourCharCode('scsz');						{  subroutine calls  }
+	kASSubroutineEvent			= FourCharCode('psbr');
+	keyASSubroutineName			= FourCharCode('snam');
+	kASPrepositionalSubroutine	= FourCharCode('psbr');
+	keyASPositionalArgs			= FourCharCode('parg');
 
 																{  Add this parameter to a Get Data result if your app handled the 'as' parameter  }
-	keyAppHandledCoercion		= $69646173 (* 'idas' *);
+	keyAppHandledCoercion		= FourCharCode('idas');
 
 																{  Miscellaneous AppleScript commands  }
-	kASStartLogEvent			= $6C6F6731 (* 'log1' *);
-	kASStopLogEvent				= $6C6F6730 (* 'log0' *);
-	kASCommentEvent				= $636D6E74 (* 'cmnt' *);
+	kASStartLogEvent			= FourCharCode('log1');
+	kASStopLogEvent				= FourCharCode('log0');
+	kASCommentEvent				= FourCharCode('cmnt');
 
 
 	{	 Operator Events: 	}
 																{  Binary:  }
-	kASAdd						= $2B202020 (* '+   ' *);
-	kASSubtract					= $2D202020 (* '-   ' *);
-	kASMultiply					= $2A202020 (* '*   ' *);
-	kASDivide					= $2F202020 (* '/   ' *);
-	kASQuotient					= $64697620 (* 'div ' *);
-	kASRemainder				= $6D6F6420 (* 'mod ' *);
-	kASPower					= $5E202020 (* '^   ' *);
-	kASEqual					= $3D202020 (* '=   ' *);
-	kASNotEqual					= $E289A020 (* '­   ' *);
-	kASGreaterThan				= $3E202020 (* '>   ' *);
-	kASGreaterThanOrEqual		= $3E3D2020 (* '>=  ' *);
-	kASLessThan					= $3C202020 (* '<   ' *);
-	kASLessThanOrEqual			= $3C3D2020 (* '<=  ' *);
-	kASComesBefore				= $63626672 (* 'cbfr' *);
-	kASComesAfter				= $63616672 (* 'cafr' *);
-	kASConcatenate				= $63636174 (* 'ccat' *);
-	kASStartsWith				= $62677774 (* 'bgwt' *);
-	kASEndsWith					= $656E6473 (* 'ends' *);
-	kASContains					= $636F6E74 (* 'cont' *);
-
-	kASAnd						= $414E4420 (* 'AND ' *);
-	kASOr						= $4F522020 (* 'OR  ' *);						{  Unary:  }
-	kASNot						= $4E4F5420 (* 'NOT ' *);
-	kASNegate					= $6E656720 (* 'neg ' *);
-	keyASArg					= $61726720 (* 'arg ' *);
+	kASAdd						= FourCharCode('+   ');
+	kASSubtract					= FourCharCode('-   ');
+	kASMultiply					= FourCharCode('*   ');
+	kASDivide					= FourCharCode('/   ');
+	kASQuotient					= FourCharCode('div ');
+	kASRemainder				= FourCharCode('mod ');
+	kASPower					= FourCharCode('^   ');
+	kASEqual					= FourCharCode('=   ');
+	kASNotEqual					= FourCharCode('­   ');
+	kASGreaterThan				= FourCharCode('>   ');
+	kASGreaterThanOrEqual		= FourCharCode('>=  ');
+	kASLessThan					= FourCharCode('<   ');
+	kASLessThanOrEqual			= FourCharCode('<=  ');
+	kASComesBefore				= FourCharCode('cbfr');
+	kASComesAfter				= FourCharCode('cafr');
+	kASConcatenate				= FourCharCode('ccat');
+	kASStartsWith				= FourCharCode('bgwt');
+	kASEndsWith					= FourCharCode('ends');
+	kASContains					= FourCharCode('cont');
+
+	kASAnd						= FourCharCode('AND ');
+	kASOr						= FourCharCode('OR  ');						{  Unary:  }
+	kASNot						= FourCharCode('NOT ');
+	kASNegate					= FourCharCode('neg ');
+	keyASArg					= FourCharCode('arg ');
 
 																{  event code for the 'error' statement  }
-	kASErrorEventCode			= $65727220 (* 'err ' *);
-	kOSAErrorArgs				= $65727261 (* 'erra' *);
-	keyAEErrorObject			= $65726F62 (* 'erob' *);						{  Properties:  }
-	pLength						= $6C656E67 (* 'leng' *);
-	pReverse					= $72767365 (* 'rvse' *);
-	pRest						= $72657374 (* 'rest' *);
-	pInherits					= $6340235E (* 'c@#^' *);
-	pProperties					= $70414C4C (* 'pALL' *);						{  User-Defined Record Fields:  }
-	keyASUserRecordFields		= $75737266 (* 'usrf' *);
-	typeUserRecordFields		= $6C697374 (* 'list' *);
+	kASErrorEventCode			= FourCharCode('err ');
+	kOSAErrorArgs				= FourCharCode('erra');
+	keyAEErrorObject			= FourCharCode('erob');						{  Properties:  }
+	pLength						= FourCharCode('leng');
+	pReverse					= FourCharCode('rvse');
+	pRest						= FourCharCode('rest');
+	pInherits					= FourCharCode('c@#^');
+	pProperties					= FourCharCode('pALL');						{  User-Defined Record Fields:  }
+	keyASUserRecordFields		= FourCharCode('usrf');
+	typeUserRecordFields		= FourCharCode('list');
 
 	{	 Prepositions: 	}
-	keyASPrepositionAt			= $61742020 (* 'at  ' *);
-	keyASPrepositionIn			= $696E2020 (* 'in  ' *);
-	keyASPrepositionFrom		= $66726F6D (* 'from' *);
-	keyASPrepositionFor			= $666F7220 (* 'for ' *);
-	keyASPrepositionTo			= $746F2020 (* 'to  ' *);
-	keyASPrepositionThru		= $74687275 (* 'thru' *);
-	keyASPrepositionThrough		= $74686768 (* 'thgh' *);
-	keyASPrepositionBy			= $62792020 (* 'by  ' *);
-	keyASPrepositionOn			= $6F6E2020 (* 'on  ' *);
-	keyASPrepositionInto		= $696E746F (* 'into' *);
-	keyASPrepositionOnto		= $6F6E746F (* 'onto' *);
-	keyASPrepositionBetween		= $6274776E (* 'btwn' *);
-	keyASPrepositionAgainst		= $61677374 (* 'agst' *);
-	keyASPrepositionOutOf		= $6F75746F (* 'outo' *);
-	keyASPrepositionInsteadOf	= $6973746F (* 'isto' *);
-	keyASPrepositionAsideFrom	= $61736466 (* 'asdf' *);
-	keyASPrepositionAround		= $61726E64 (* 'arnd' *);
-	keyASPrepositionBeside		= $62736964 (* 'bsid' *);
-	keyASPrepositionBeneath		= $626E7468 (* 'bnth' *);
-	keyASPrepositionUnder		= $756E6472 (* 'undr' *);
-
-	keyASPrepositionOver		= $6F766572 (* 'over' *);
-	keyASPrepositionAbove		= $61627665 (* 'abve' *);
-	keyASPrepositionBelow		= $62656C77 (* 'belw' *);
-	keyASPrepositionApartFrom	= $61707274 (* 'aprt' *);
-	keyASPrepositionGiven		= $6769766E (* 'givn' *);
-	keyASPrepositionWith		= $77697468 (* 'with' *);
-	keyASPrepositionWithout		= $776F7574 (* 'wout' *);
-	keyASPrepositionAbout		= $61626F75 (* 'abou' *);
-	keyASPrepositionSince		= $736E6365 (* 'snce' *);
-	keyASPrepositionUntil		= $74696C6C (* 'till' *);
+	keyASPrepositionAt			= FourCharCode('at  ');
+	keyASPrepositionIn			= FourCharCode('in  ');
+	keyASPrepositionFrom		= FourCharCode('from');
+	keyASPrepositionFor			= FourCharCode('for ');
+	keyASPrepositionTo			= FourCharCode('to  ');
+	keyASPrepositionThru		= FourCharCode('thru');
+	keyASPrepositionThrough		= FourCharCode('thgh');
+	keyASPrepositionBy			= FourCharCode('by  ');
+	keyASPrepositionOn			= FourCharCode('on  ');
+	keyASPrepositionInto		= FourCharCode('into');
+	keyASPrepositionOnto		= FourCharCode('onto');
+	keyASPrepositionBetween		= FourCharCode('btwn');
+	keyASPrepositionAgainst		= FourCharCode('agst');
+	keyASPrepositionOutOf		= FourCharCode('outo');
+	keyASPrepositionInsteadOf	= FourCharCode('isto');
+	keyASPrepositionAsideFrom	= FourCharCode('asdf');
+	keyASPrepositionAround		= FourCharCode('arnd');
+	keyASPrepositionBeside		= FourCharCode('bsid');
+	keyASPrepositionBeneath		= FourCharCode('bnth');
+	keyASPrepositionUnder		= FourCharCode('undr');
+
+	keyASPrepositionOver		= FourCharCode('over');
+	keyASPrepositionAbove		= FourCharCode('abve');
+	keyASPrepositionBelow		= FourCharCode('belw');
+	keyASPrepositionApartFrom	= FourCharCode('aprt');
+	keyASPrepositionGiven		= FourCharCode('givn');
+	keyASPrepositionWith		= FourCharCode('with');
+	keyASPrepositionWithout		= FourCharCode('wout');
+	keyASPrepositionAbout		= FourCharCode('abou');
+	keyASPrepositionSince		= FourCharCode('snce');
+	keyASPrepositionUntil		= FourCharCode('till');
 
 																{  Terminology & Dialect things:  }
-	kDialectBundleResType		= $4462646C (* 'Dbdl' *);						{  AppleScript Classes and Enums:  }
-	cConstant					= $656E756D (* 'enum' *);
-	cClassIdentifier			= $70636C73 (* 'pcls' *);
-	cObjectBeingExamined		= $65786D6E (* 'exmn' *);
-	cList						= $6C697374 (* 'list' *);
-	cSmallReal					= $73696E67 (* 'sing' *);
-	cReal						= $646F7562 (* 'doub' *);
-	cRecord						= $7265636F (* 'reco' *);
-	cReference					= $6F626A20 (* 'obj ' *);
-	cUndefined					= $756E6466 (* 'undf' *);
-	cMissingValue				= $6D736E67 (* 'msng' *);
-	cSymbol						= $73796D62 (* 'symb' *);
-	cLinkedList					= $6C6C7374 (* 'llst' *);
-	cVector						= $76656374 (* 'vect' *);
-	cEventIdentifier			= $65766E74 (* 'evnt' *);
-	cKeyIdentifier				= $6B796964 (* 'kyid' *);
-	cUserIdentifier				= $75696420 (* 'uid ' *);
-	cPreposition				= $70726570 (* 'prep' *);
-	cKeyForm					= $6B66726D (* 'kfrm' *);
-	cScript						= $73637074 (* 'scpt' *);
-	cHandler					= $68616E64 (* 'hand' *);
-	cProcedure					= $70726F63 (* 'proc' *);
-
-	cHandleBreakpoint			= $6272616B (* 'brak' *);
-
-	cClosure					= $636C7372 (* 'clsr' *);
-	cRawData					= $72646174 (* 'rdat' *);
-	cStringClass				= $54455854 (* 'TEXT' *);
-	cNumber						= $6E6D6272 (* 'nmbr' *);
-	cListElement				= $63656C6D (* 'celm' *);
-	cListOrRecord				= $6C722020 (* 'lr  ' *);
-	cListOrString				= $6C732020 (* 'ls  ' *);
-	cListRecordOrString			= $6C727320 (* 'lrs ' *);
-	cNumberOrString				= $6E732020 (* 'ns  ' *);
-	cNumberOrDateTime			= $6E642020 (* 'nd  ' *);
-	cNumberDateTimeOrString		= $6E647320 (* 'nds ' *);
-	cAliasOrString				= $73662020 (* 'sf  ' *);
-	cSeconds					= $73636E64 (* 'scnd' *);
-	typeSound					= $736E6420 (* 'snd ' *);
-	enumBooleanValues			= $626F6F76 (* 'boov' *);						{   Use this instead of typeBoolean to avoid with/without conversion   }
-	kAETrue						= $74727565 (* 'true' *);
-	kAEFalse					= $66616C73 (* 'fals' *);
-	enumMiscValues				= $6D697363 (* 'misc' *);
-	kASCurrentApplication		= $63757261 (* 'cura' *);						{  User-defined property ospecs:  }
-	formUserPropertyID			= $75737270 (* 'usrp' *);
-
-//	cString						= $54455854 (* 'TEXT' *);						{  old name for cStringClass - can't be used in .r files }
+	kDialectBundleResType		= FourCharCode('Dbdl');						{  AppleScript Classes and Enums:  }
+	cConstant					= FourCharCode('enum');
+	cClassIdentifier			= FourCharCode('pcls');
+	cObjectBeingExamined		= FourCharCode('exmn');
+	cList						= FourCharCode('list');
+	cSmallReal					= FourCharCode('sing');
+	cReal						= FourCharCode('doub');
+	cRecord						= FourCharCode('reco');
+	cReference					= FourCharCode('obj ');
+	cUndefined					= FourCharCode('undf');
+	cMissingValue				= FourCharCode('msng');
+	cSymbol						= FourCharCode('symb');
+	cLinkedList					= FourCharCode('llst');
+	cVector						= FourCharCode('vect');
+	cEventIdentifier			= FourCharCode('evnt');
+	cKeyIdentifier				= FourCharCode('kyid');
+	cUserIdentifier				= FourCharCode('uid ');
+	cPreposition				= FourCharCode('prep');
+	cKeyForm					= FourCharCode('kfrm');
+	cScript						= FourCharCode('scpt');
+	cHandler					= FourCharCode('hand');
+	cProcedure					= FourCharCode('proc');
+
+	cHandleBreakpoint			= FourCharCode('brak');
+
+	cClosure					= FourCharCode('clsr');
+	cRawData					= FourCharCode('rdat');
+	cStringClass				= FourCharCode('TEXT');
+	cNumber						= FourCharCode('nmbr');
+	cListElement				= FourCharCode('celm');
+	cListOrRecord				= FourCharCode('lr  ');
+	cListOrString				= FourCharCode('ls  ');
+	cListRecordOrString			= FourCharCode('lrs ');
+	cNumberOrString				= FourCharCode('ns  ');
+	cNumberOrDateTime			= FourCharCode('nd  ');
+	cNumberDateTimeOrString		= FourCharCode('nds ');
+	cAliasOrString				= FourCharCode('sf  ');
+	cSeconds					= FourCharCode('scnd');
+	typeSound					= FourCharCode('snd ');
+	enumBooleanValues			= FourCharCode('boov');						{   Use this instead of typeBoolean to avoid with/without conversion   }
+	kAETrue						= FourCharCode('true');
+	kAEFalse					= FourCharCode('fals');
+	enumMiscValues				= FourCharCode('misc');
+	kASCurrentApplication		= FourCharCode('cura');						{  User-defined property ospecs:  }
+	formUserPropertyID			= FourCharCode('usrp');
+
+//	cString						= FourCharCode('TEXT');						{  old name for cStringClass - can't be used in .r files }
 
 																{  Global properties:  }
-	pASIt						= $69742020 (* 'it  ' *);
-	pASMe						= $6D652020 (* 'me  ' *);
-	pASResult					= $72736C74 (* 'rslt' *);
-	pASSpace					= $73706163 (* 'spac' *);
-	pASReturn					= $72657420 (* 'ret ' *);
-	pASTab						= $74616220 (* 'tab ' *);
-	pASPi						= $70692020 (* 'pi  ' *);
-	pASParent					= $70617265 (* 'pare' *);
-	kASInitializeEventCode		= $696E6974 (* 'init' *);
-	pASPrintLength				= $70726C6E (* 'prln' *);
-	pASPrintDepth				= $70726470 (* 'prdp' *);
-	pASTopLevelScript			= $61736372 (* 'ascr' *);
+	pASIt						= FourCharCode('it  ');
+	pASMe						= FourCharCode('me  ');
+	pASResult					= FourCharCode('rslt');
+	pASSpace					= FourCharCode('spac');
+	pASReturn					= FourCharCode('ret ');
+	pASTab						= FourCharCode('tab ');
+	pASPi						= FourCharCode('pi  ');
+	pASParent					= FourCharCode('pare');
+	kASInitializeEventCode		= FourCharCode('init');
+	pASPrintLength				= FourCharCode('prln');
+	pASPrintDepth				= FourCharCode('prdp');
+	pASTopLevelScript			= FourCharCode('ascr');
 
 																{  Considerations  }
-	kAECase						= $63617365 (* 'case' *);
-	kAEDiacritic				= $64696163 (* 'diac' *);
-	kAEWhiteSpace				= $77686974 (* 'whit' *);
-	kAEHyphens					= $68797068 (* 'hyph' *);
-	kAEExpansion				= $65787061 (* 'expa' *);
-	kAEPunctuation				= $70756E63 (* 'punc' *);
-	kAEZenkakuHankaku			= $7A6B686B (* 'zkhk' *);
-	kAESmallKana				= $736B6E61 (* 'skna' *);
-	kAEKataHiragana				= $68696B61 (* 'hika' *);
-	kASConsiderReplies			= $726D7465 (* 'rmte' *);
-	enumConsiderations			= $636F6E73 (* 'cons' *);
+	kAECase						= FourCharCode('case');
+	kAEDiacritic				= FourCharCode('diac');
+	kAEWhiteSpace				= FourCharCode('whit');
+	kAEHyphens					= FourCharCode('hyph');
+	kAEExpansion				= FourCharCode('expa');
+	kAEPunctuation				= FourCharCode('punc');
+	kAEZenkakuHankaku			= FourCharCode('zkhk');
+	kAESmallKana				= FourCharCode('skna');
+	kAEKataHiragana				= FourCharCode('hika');
+	kASConsiderReplies			= FourCharCode('rmte');
+	enumConsiderations			= FourCharCode('cons');
 
 	{	 Considerations bit masks 	}
 	kAECaseConsiderMask			= $00000001;
@@ -306,67 +306,67 @@ const
 	kAEExpansionIgnoreMask		= $00100000;
 	kAEPunctuationIgnoreMask	= $00200000;
 	kASConsiderRepliesIgnoreMask = $00400000;
-	enumConsidsAndIgnores		= $63736967 (* 'csig' *);
-
-	cCoercion					= $636F6563 (* 'coec' *);
-	cCoerceUpperCase			= $74787570 (* 'txup' *);
-	cCoerceLowerCase			= $74786C6F (* 'txlo' *);
-	cCoerceRemoveDiacriticals	= $74786463 (* 'txdc' *);
-	cCoerceRemovePunctuation	= $74787063 (* 'txpc' *);
-	cCoerceRemoveHyphens		= $74786879 (* 'txhy' *);
-	cCoerceOneByteToTwoByte		= $74786578 (* 'txex' *);
-	cCoerceRemoveWhiteSpace		= $74787773 (* 'txws' *);
-	cCoerceSmallKana			= $7478736B (* 'txsk' *);
-	cCoerceZenkakuhankaku		= $74787A65 (* 'txze' *);
-	cCoerceKataHiragana			= $74786B68 (* 'txkh' *);						{  Lorax things:  }
-	cZone						= $7A6F6E65 (* 'zone' *);
-	cMachine					= $6D616368 (* 'mach' *);
-	cAddress					= $61646472 (* 'addr' *);
-	cRunningAddress				= $72616464 (* 'radd' *);
-	cStorage					= $73746F72 (* 'stor' *);
+	enumConsidsAndIgnores		= FourCharCode('csig');
+
+	cCoercion					= FourCharCode('coec');
+	cCoerceUpperCase			= FourCharCode('txup');
+	cCoerceLowerCase			= FourCharCode('txlo');
+	cCoerceRemoveDiacriticals	= FourCharCode('txdc');
+	cCoerceRemovePunctuation	= FourCharCode('txpc');
+	cCoerceRemoveHyphens		= FourCharCode('txhy');
+	cCoerceOneByteToTwoByte		= FourCharCode('txex');
+	cCoerceRemoveWhiteSpace		= FourCharCode('txws');
+	cCoerceSmallKana			= FourCharCode('txsk');
+	cCoerceZenkakuhankaku		= FourCharCode('txze');
+	cCoerceKataHiragana			= FourCharCode('txkh');						{  Lorax things:  }
+	cZone						= FourCharCode('zone');
+	cMachine					= FourCharCode('mach');
+	cAddress					= FourCharCode('addr');
+	cRunningAddress				= FourCharCode('radd');
+	cStorage					= FourCharCode('stor');
 
 																{  DateTime things:  }
-	pASWeekday					= $776B6479 (* 'wkdy' *);
-	pASMonth					= $6D6E7468 (* 'mnth' *);
-	pASDay						= $64617920 (* 'day ' *);
-	pASYear						= $79656172 (* 'year' *);
-	pASTime						= $74696D65 (* 'time' *);
-	pASDateString				= $64737472 (* 'dstr' *);
-	pASTimeString				= $74737472 (* 'tstr' *);						{  Months  }
-	cMonth						= $6D6E7468 (* 'mnth' *);
-	cJanuary					= $6A616E20 (* 'jan ' *);
-	cFebruary					= $66656220 (* 'feb ' *);
-	cMarch						= $6D617220 (* 'mar ' *);
-	cApril						= $61707220 (* 'apr ' *);
-	cMay						= $6D617920 (* 'may ' *);
-	cJune						= $6A756E20 (* 'jun ' *);
-	cJuly						= $6A756C20 (* 'jul ' *);
-	cAugust						= $61756720 (* 'aug ' *);
-	cSeptember					= $73657020 (* 'sep ' *);
-	cOctober					= $6F637420 (* 'oct ' *);
-	cNovember					= $6E6F7620 (* 'nov ' *);
-	cDecember					= $64656320 (* 'dec ' *);
+	pASWeekday					= FourCharCode('wkdy');
+	pASMonth					= FourCharCode('mnth');
+	pASDay						= FourCharCode('day ');
+	pASYear						= FourCharCode('year');
+	pASTime						= FourCharCode('time');
+	pASDateString				= FourCharCode('dstr');
+	pASTimeString				= FourCharCode('tstr');						{  Months  }
+	cMonth						= FourCharCode('mnth');
+	cJanuary					= FourCharCode('jan ');
+	cFebruary					= FourCharCode('feb ');
+	cMarch						= FourCharCode('mar ');
+	cApril						= FourCharCode('apr ');
+	cMay						= FourCharCode('may ');
+	cJune						= FourCharCode('jun ');
+	cJuly						= FourCharCode('jul ');
+	cAugust						= FourCharCode('aug ');
+	cSeptember					= FourCharCode('sep ');
+	cOctober					= FourCharCode('oct ');
+	cNovember					= FourCharCode('nov ');
+	cDecember					= FourCharCode('dec ');
 
 																{  Weekdays  }
-	cWeekday					= $776B6479 (* 'wkdy' *);
-	cSunday						= $73756E20 (* 'sun ' *);
-	cMonday						= $6D6F6E20 (* 'mon ' *);
-	cTuesday					= $74756520 (* 'tue ' *);
-	cWednesday					= $77656420 (* 'wed ' *);
-	cThursday					= $74687520 (* 'thu ' *);
-	cFriday						= $66726920 (* 'fri ' *);
-	cSaturday					= $73617420 (* 'sat ' *);						{  AS 1.1 Globals:  }
-	pASQuote					= $71756F74 (* 'quot' *);
-	pASSeconds					= $73656373 (* 'secs' *);
-	pASMinutes					= $6D696E20 (* 'min ' *);
-	pASHours					= $686F7572 (* 'hour' *);
-	pASDays						= $64617973 (* 'days' *);
-	pASWeeks					= $7765656B (* 'week' *);						{  Writing Code things:  }
-	cWritingCodeInfo			= $6369746C (* 'citl' *);
-	pScriptCode					= $70736364 (* 'pscd' *);
-	pLangCode					= $706C6364 (* 'plcd' *);						{  Magic Tell and End Tell events for logging:  }
-	kASMagicTellEvent			= $74656C6C (* 'tell' *);
-	kASMagicEndTellEvent		= $74656E64 (* 'tend' *);
+	cWeekday					= FourCharCode('wkdy');
+	cSunday						= FourCharCode('sun ');
+	cMonday						= FourCharCode('mon ');
+	cTuesday					= FourCharCode('tue ');
+	cWednesday					= FourCharCode('wed ');
+	cThursday					= FourCharCode('thu ');
+	cFriday						= FourCharCode('fri ');
+	cSaturday					= FourCharCode('sat ');						{  AS 1.1 Globals:  }
+	pASQuote					= FourCharCode('quot');
+	pASSeconds					= FourCharCode('secs');
+	pASMinutes					= FourCharCode('min ');
+	pASHours					= FourCharCode('hour');
+	pASDays						= FourCharCode('days');
+	pASWeeks					= FourCharCode('week');						{  Writing Code things:  }
+	cWritingCodeInfo			= FourCharCode('citl');
+	pScriptCode					= FourCharCode('pscd');
+	pLangCode					= FourCharCode('plcd');						{  Magic Tell and End Tell events for logging:  }
+	kASMagicTellEvent			= FourCharCode('tell');
+	kASMagicEndTellEvent		= FourCharCode('tend');
 
 {$ALIGN MAC68K}
 

packages/univint/src/ATSFont.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit ATSFont;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}
@@ -773,7 +773,7 @@ const
    * as decribed below. A query dictionary may have any or all of these
    * entries.
    }
-  kATSQueryActivateFontMessage  = $61747361 (* 'atsa' *);
+  kATSQueryActivateFontMessage  = FourCharCode('atsa');
 
 
 {

packages/univint/src/ATSLayoutTypes.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit ATSLayoutTypes;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/ATSTypes.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit ATSTypes;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}
@@ -174,8 +174,8 @@ const
 	kFMFontCallbackFilterSelector = 5;
 	kFMFontDirectoryFilterSelector = 6;
 
-	kFMTrueTypeFontTechnology	= $74727565 (* 'true' *);
-	kFMPostScriptFontTechnology	= $74797031 (* 'typ1' *);
+	kFMTrueTypeFontTechnology	= FourCharCode('true');
+	kFMPostScriptFontTechnology	= FourCharCode('typ1');
 
 
 type

packages/univint/src/ATSUnicodeDirectAccess.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit ATSUnicodeDirectAccess;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/ATSUnicodeDrawing.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit ATSUnicodeDrawing;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/ATSUnicodeFlattening.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit ATSUnicodeFlattening;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}
@@ -118,7 +118,7 @@ uses MacTypes,ATSUnicodeTypes,SFNTTypes;
 
 type ATSUFlattenedDataStreamFormat = UInt32;
 const
-  kATSUDataStreamUnicodeStyledText = $7573746C (* 'ustl' *);
+  kATSUDataStreamUnicodeStyledText = FourCharCode('ustl');
 
 
 {
@@ -484,7 +484,7 @@ type ATSFlatDataFontSpeciferType = UInt32;
 const
                                         { this specifier allows the storage of font data based on name data. This}
                                         { uses the stuctures below to store the actual data itself.}
-  kATSFlattenedFontSpecifierRawNameData = $6E616D64 (* 'namd' *);
+  kATSFlattenedFontSpecifierRawNameData = FourCharCode('namd');
 
 {
    this is the main header for the font data. It dictates what type of data

packages/univint/src/ATSUnicodeFonts.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit ATSUnicodeFonts;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/ATSUnicodeGlyphs.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit ATSUnicodeGlyphs;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/ATSUnicodeObjects.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit ATSUnicodeObjects;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/ATSUnicodeTypes.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit ATSUnicodeTypes;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/AVLTree.pas

@@ -17,7 +17,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -25,12 +25,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AVLTree;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/AXActionConstants.pas

@@ -11,7 +11,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -19,12 +19,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AXActionConstants;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/AXAttributeConstants.pas

@@ -11,7 +11,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -19,12 +19,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AXAttributeConstants;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/AXErrors.pas

@@ -10,7 +10,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -18,12 +18,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AXErrors;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/AXNotificationConstants.pas

@@ -11,7 +11,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -19,12 +19,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AXNotificationConstants;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/AXRoleConstants.pas

@@ -11,7 +11,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -19,12 +19,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AXRoleConstants;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/AXTextAttributedString.pas

@@ -9,7 +9,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -17,12 +17,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AXTextAttributedString;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/AXUIElement.pas

@@ -9,7 +9,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -17,12 +17,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AXUIElement;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/AXValue.pas

@@ -10,7 +10,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -18,12 +18,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AXValue;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/AXValueConstants.pas

@@ -11,7 +11,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -19,12 +19,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AXValueConstants;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/Aliases.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit Aliases;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}
@@ -111,7 +111,7 @@ uses MacTypes,Files;
 
 
 const
-	rAliasType					= $616C6973 (* 'alis' *);						{  Aliases are stored as resources of this type  }
+	rAliasType					= FourCharCode('alis');						{  Aliases are stored as resources of this type  }
 
 																{  define alias resolution action rules mask  }
 	kARMMountVol				= $00000001;					{  mount the volume automatically  }

packages/univint/src/Appearance.pas

@@ -16,7 +16,7 @@
 {       Pascal Translation Updated:  Peter N Lewis, <[email protected]>, August 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -24,12 +24,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit Appearance;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}
@@ -112,20 +112,20 @@ uses MacTypes,CFBase,CGContext,Collections,Processes,QuickdrawText,TextCommon,Qu
 {$ALIGN MAC68K}
 
 const
-	kAppearanceEventClass = $61707072 (* 'appr' *); { Event Class }
-	kAEAppearanceChanged = $74686D65 (* 'thme' *); { Appearance changed (e.g. platinum to hi-tech) }
-	kAESystemFontChanged = $73797366 (* 'sysf' *); { system font changed }
-	kAESmallSystemFontChanged = $7373666E (* 'ssfn' *); { small system font changed }
-	kAEViewsFontChanged = $76666E74 (* 'vfnt' *); { views font changed }
+	kAppearanceEventClass = FourCharCode('appr'); { Event Class }
+	kAEAppearanceChanged = FourCharCode('thme'); { Appearance changed (e.g. platinum to hi-tech) }
+	kAESystemFontChanged = FourCharCode('sysf'); { system font changed }
+	kAESmallSystemFontChanged = FourCharCode('ssfn'); { small system font changed }
+	kAEViewsFontChanged = FourCharCode('vfnt'); { views font changed }
 
 {ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ}
 { Appearance Manager file types                                                    }
 {ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ}
 const
-	kThemeDataFileType = $74686D65 (* 'thme' *); { file type for theme files }
-	kThemePlatinumFileType = $706C746E (* 'pltn' *); { file type for platinum appearance }
-	kThemeCustomThemesFileType = $7363656E (* 'scen' *); { file type for user themes }
-	kThemeSoundTrackFileType = $74736E64 (* 'tsnd' *);
+	kThemeDataFileType = FourCharCode('thme'); { file type for theme files }
+	kThemePlatinumFileType = FourCharCode('pltn'); { file type for platinum appearance }
+	kThemeCustomThemesFileType = FourCharCode('scen'); { file type for user themes }
+	kThemeSoundTrackFileType = FourCharCode('tsnd');
 
 {ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ}
 { Appearance Manager Supported Themes                                              }
@@ -733,33 +733,33 @@ type
 {           is completely inert on X, and will return unimpErr.                            }
 {ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ}
 const
-	kThemeNameTag = $6E616D65 (* 'name' *); { Str255}
-	kThemeVariantNameTag = $7661726E (* 'varn' *); { Str255}
-	kThemeVariantBaseTintTag = $74696E74 (* 'tint' *); { RGBColor (10.1 and later)}
-	kThemeHighlightColorTag = $68636F6C (* 'hcol' *); { RGBColor}
-	kThemeScrollBarArrowStyleTag = $73626172 (* 'sbar' *); { ThemeScrollBarArrowStyle}
-	kThemeScrollBarThumbStyleTag = $73627468 (* 'sbth' *); { ThemeScrollBarThumbStyle}
-	kThemeSoundsEnabledTag = $736E6473 (* 'snds' *); { Boolean}
-	kThemeDblClickCollapseTag = $636F6C6C (* 'coll' *); { Boolean}
+	kThemeNameTag = FourCharCode('name'); { Str255}
+	kThemeVariantNameTag = FourCharCode('varn'); { Str255}
+	kThemeVariantBaseTintTag = FourCharCode('tint'); { RGBColor (10.1 and later)}
+	kThemeHighlightColorTag = FourCharCode('hcol'); { RGBColor}
+	kThemeScrollBarArrowStyleTag = FourCharCode('sbar'); { ThemeScrollBarArrowStyle}
+	kThemeScrollBarThumbStyleTag = FourCharCode('sbth'); { ThemeScrollBarThumbStyle}
+	kThemeSoundsEnabledTag = FourCharCode('snds'); { Boolean}
+	kThemeDblClickCollapseTag = FourCharCode('coll'); { Boolean}
 
 const
-	kThemeAppearanceFileNameTag = $74686D65 (* 'thme' *); { Str255}
-	kThemeSystemFontTag = $6C677366 (* 'lgsf' *); { Str255}
-	kThemeSmallSystemFontTag = $736D7366 (* 'smsf' *); { Str255}
-	kThemeViewsFontTag = $76666E74 (* 'vfnt' *); { Str255}
-	kThemeViewsFontSizeTag = $7666737A (* 'vfsz' *); { SInt16}
-	kThemeDesktopPatternNameTag = $7061746E (* 'patn' *); { Str255}
-	kThemeDesktopPatternTag = $70617474 (* 'patt' *); { <variable-length data> (flattened pattern)}
-	kThemeDesktopPictureNameTag = $64706E6D (* 'dpnm' *); { Str255}
-	kThemeDesktopPictureAliasTag = $6470616C (* 'dpal' *); { <alias handle>}
-	kThemeDesktopPictureAlignmentTag = $6470616E (* 'dpan' *); { UInt32 (see the Picture Alignments below)}
-	kThemeHighlightColorNameTag = $68636E6D (* 'hcnm' *); { Str255}
-	kThemeExamplePictureIDTag = $65706963 (* 'epic' *); { SInt16}
-	kThemeSoundTrackNameTag = $736E6474 (* 'sndt' *); { Str255}
-	kThemeSoundMaskTag = $736D736B (* 'smsk' *); { UInt32}
-	kThemeUserDefinedTag = $75736572 (* 'user' *); { Boolean (this should _always_ be true if present - used by Control Panel).}
-	kThemeSmoothFontEnabledTag = $736D6F6F (* 'smoo' *); { Boolean}
-	kThemeSmoothFontMinSizeTag = $736D6F73 (* 'smos' *); { UInt16 (must be >= 12 and <= 24)}
+	kThemeAppearanceFileNameTag = FourCharCode('thme'); { Str255}
+	kThemeSystemFontTag = FourCharCode('lgsf'); { Str255}
+	kThemeSmallSystemFontTag = FourCharCode('smsf'); { Str255}
+	kThemeViewsFontTag = FourCharCode('vfnt'); { Str255}
+	kThemeViewsFontSizeTag = FourCharCode('vfsz'); { SInt16}
+	kThemeDesktopPatternNameTag = FourCharCode('patn'); { Str255}
+	kThemeDesktopPatternTag = FourCharCode('patt'); { <variable-length data> (flattened pattern)}
+	kThemeDesktopPictureNameTag = FourCharCode('dpnm'); { Str255}
+	kThemeDesktopPictureAliasTag = FourCharCode('dpal'); { <alias handle>}
+	kThemeDesktopPictureAlignmentTag = FourCharCode('dpan'); { UInt32 (see the Picture Alignments below)}
+	kThemeHighlightColorNameTag = FourCharCode('hcnm'); { Str255}
+	kThemeExamplePictureIDTag = FourCharCode('epic'); { SInt16}
+	kThemeSoundTrackNameTag = FourCharCode('sndt'); { Str255}
+	kThemeSoundMaskTag = FourCharCode('smsk'); { UInt32}
+	kThemeUserDefinedTag = FourCharCode('user'); { Boolean (this should _always_ be true if present - used by Control Panel).}
+	kThemeSmoothFontEnabledTag = FourCharCode('smoo'); { Boolean}
+	kThemeSmoothFontMinSizeTag = FourCharCode('smos'); { UInt16 (must be >= 12 and <= 24)}
 
 { Picture Aligmnents that might be reported in the data for kThemeDesktopPictureAlignmentTag}
 const
@@ -1981,20 +1981,20 @@ const
 {ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ}
 const
 	kThemeDragSoundNone = 0;
-	kThemeDragSoundMoveWindow = $776D6F76 (* 'wmov' *);
-	kThemeDragSoundGrowWindow = $7767726F (* 'wgro' *);
-	kThemeDragSoundMoveUtilWindow = $756D6F76 (* 'umov' *);
-	kThemeDragSoundGrowUtilWindow = $7567726F (* 'ugro' *);
-	kThemeDragSoundMoveDialog = $646D6F76 (* 'dmov' *);
-	kThemeDragSoundMoveAlert = $616D6F76 (* 'amov' *);
-	kThemeDragSoundMoveIcon = $696D6F76 (* 'imov' *);
-	kThemeDragSoundSliderThumb = $736C7468 (* 'slth' *);
-	kThemeDragSoundSliderGhost = $736C6768 (* 'slgh' *);
-	kThemeDragSoundScrollBarThumb = $73627468 (* 'sbth' *);
-	kThemeDragSoundScrollBarGhost = $73626768 (* 'sbgh' *);
-	kThemeDragSoundScrollBarArrowDecreasing = $73626164 (* 'sbad' *);
-	kThemeDragSoundScrollBarArrowIncreasing = $73626169 (* 'sbai' *);
-	kThemeDragSoundDragging = $64726167 (* 'drag' *);
+	kThemeDragSoundMoveWindow = FourCharCode('wmov');
+	kThemeDragSoundGrowWindow = FourCharCode('wgro');
+	kThemeDragSoundMoveUtilWindow = FourCharCode('umov');
+	kThemeDragSoundGrowUtilWindow = FourCharCode('ugro');
+	kThemeDragSoundMoveDialog = FourCharCode('dmov');
+	kThemeDragSoundMoveAlert = FourCharCode('amov');
+	kThemeDragSoundMoveIcon = FourCharCode('imov');
+	kThemeDragSoundSliderThumb = FourCharCode('slth');
+	kThemeDragSoundSliderGhost = FourCharCode('slgh');
+	kThemeDragSoundScrollBarThumb = FourCharCode('sbth');
+	kThemeDragSoundScrollBarGhost = FourCharCode('sbgh');
+	kThemeDragSoundScrollBarArrowDecreasing = FourCharCode('sbad');
+	kThemeDragSoundScrollBarArrowIncreasing = FourCharCode('sbai');
+	kThemeDragSoundDragging = FourCharCode('drag');
 
 type
 	ThemeDragSoundKind = OSType;
@@ -2006,122 +2006,122 @@ type
 {ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ}
 const
 	kThemeSoundNone = 0;
-	kThemeSoundMenuOpen = $6D6E756F (* 'mnuo' *); { menu sounds }
-	kThemeSoundMenuClose = $6D6E7563 (* 'mnuc' *);
-	kThemeSoundMenuItemHilite = $6D6E7569 (* 'mnui' *);
-	kThemeSoundMenuItemRelease = $6D6E7573 (* 'mnus' *);
-	kThemeSoundWindowClosePress = $77636C70 (* 'wclp' *); { window sounds }
-	kThemeSoundWindowCloseEnter = $77636C65 (* 'wcle' *);
-	kThemeSoundWindowCloseExit = $77636C78 (* 'wclx' *);
-	kThemeSoundWindowCloseRelease = $77636C72 (* 'wclr' *);
-	kThemeSoundWindowZoomPress = $777A6D70 (* 'wzmp' *);
-	kThemeSoundWindowZoomEnter = $777A6D65 (* 'wzme' *);
-	kThemeSoundWindowZoomExit = $777A6D78 (* 'wzmx' *);
-	kThemeSoundWindowZoomRelease = $777A6D72 (* 'wzmr' *);
-	kThemeSoundWindowCollapsePress = $77636F70 (* 'wcop' *);
-	kThemeSoundWindowCollapseEnter = $77636F65 (* 'wcoe' *);
-	kThemeSoundWindowCollapseExit = $77636F78 (* 'wcox' *);
-	kThemeSoundWindowCollapseRelease = $77636F72 (* 'wcor' *);
-	kThemeSoundWindowDragBoundary = $77646264 (* 'wdbd' *);
-	kThemeSoundUtilWinClosePress = $75636C70 (* 'uclp' *); { utility window sounds }
-	kThemeSoundUtilWinCloseEnter = $75636C65 (* 'ucle' *);
-	kThemeSoundUtilWinCloseExit = $75636C78 (* 'uclx' *);
-	kThemeSoundUtilWinCloseRelease = $75636C72 (* 'uclr' *);
-	kThemeSoundUtilWinZoomPress = $757A6D70 (* 'uzmp' *);
-	kThemeSoundUtilWinZoomEnter = $757A6D65 (* 'uzme' *);
-	kThemeSoundUtilWinZoomExit = $757A6D78 (* 'uzmx' *);
-	kThemeSoundUtilWinZoomRelease = $757A6D72 (* 'uzmr' *);
-	kThemeSoundUtilWinCollapsePress = $75636F70 (* 'ucop' *);
-	kThemeSoundUtilWinCollapseEnter = $75636F65 (* 'ucoe' *);
-	kThemeSoundUtilWinCollapseExit = $75636F78 (* 'ucox' *);
-	kThemeSoundUtilWinCollapseRelease = $75636F72 (* 'ucor' *);
-	kThemeSoundUtilWinDragBoundary = $75646264 (* 'udbd' *);
-	kThemeSoundWindowOpen = $776F706E (* 'wopn' *); { window close and zoom action }
-	kThemeSoundWindowClose = $77636C73 (* 'wcls' *);
-	kThemeSoundWindowZoomIn = $777A6D69 (* 'wzmi' *);
-	kThemeSoundWindowZoomOut = $777A6D6F (* 'wzmo' *);
-	kThemeSoundWindowCollapseUp = $77636F6C (* 'wcol' *);
-	kThemeSoundWindowCollapseDown = $77657870 (* 'wexp' *);
-	kThemeSoundWindowActivate = $77616374 (* 'wact' *);
-	kThemeSoundUtilWindowOpen = $756F706E (* 'uopn' *);
-	kThemeSoundUtilWindowClose = $75636C73 (* 'ucls' *);
-	kThemeSoundUtilWindowZoomIn = $757A6D69 (* 'uzmi' *);
-	kThemeSoundUtilWindowZoomOut = $757A6D6F (* 'uzmo' *);
-	kThemeSoundUtilWindowCollapseUp = $75636F6C (* 'ucol' *);
-	kThemeSoundUtilWindowCollapseDown = $75657870 (* 'uexp' *);
-	kThemeSoundUtilWindowActivate = $75616374 (* 'uact' *);
-	kThemeSoundDialogOpen = $646F706E (* 'dopn' *);
-	kThemeSoundDialogClose = $646C6763 (* 'dlgc' *);
-	kThemeSoundAlertOpen = $616F706E (* 'aopn' *);
-	kThemeSoundAlertClose = $616C7463 (* 'altc' *);
-	kThemeSoundPopupWindowOpen = $70776F70 (* 'pwop' *);
-	kThemeSoundPopupWindowClose = $7077636C (* 'pwcl' *);
-	kThemeSoundButtonPress = $62746E70 (* 'btnp' *); { button }
-	kThemeSoundButtonEnter = $62746E65 (* 'btne' *);
-	kThemeSoundButtonExit = $62746E78 (* 'btnx' *);
-	kThemeSoundButtonRelease = $62746E72 (* 'btnr' *);
-	kThemeSoundDefaultButtonPress = $64627470 (* 'dbtp' *); { default button }
-	kThemeSoundDefaultButtonEnter = $64627465 (* 'dbte' *);
-	kThemeSoundDefaultButtonExit = $64627478 (* 'dbtx' *);
-	kThemeSoundDefaultButtonRelease = $64627472 (* 'dbtr' *);
-	kThemeSoundCancelButtonPress = $63627470 (* 'cbtp' *); { cancel button }
-	kThemeSoundCancelButtonEnter = $63627465 (* 'cbte' *);
-	kThemeSoundCancelButtonExit = $63627478 (* 'cbtx' *);
-	kThemeSoundCancelButtonRelease = $63627472 (* 'cbtr' *);
-	kThemeSoundCheckboxPress = $63686B70 (* 'chkp' *); { checkboxes }
-	kThemeSoundCheckboxEnter = $63686B65 (* 'chke' *);
-	kThemeSoundCheckboxExit = $63686B78 (* 'chkx' *);
-	kThemeSoundCheckboxRelease = $63686B72 (* 'chkr' *);
-	kThemeSoundRadioPress = $72616470 (* 'radp' *); { radio buttons }
-	kThemeSoundRadioEnter = $72616465 (* 'rade' *);
-	kThemeSoundRadioExit = $72616478 (* 'radx' *);
-	kThemeSoundRadioRelease = $72616472 (* 'radr' *);
-	kThemeSoundScrollArrowPress = $73626170 (* 'sbap' *); { scroll bars }
-	kThemeSoundScrollArrowEnter = $73626165 (* 'sbae' *);
-	kThemeSoundScrollArrowExit = $73626178 (* 'sbax' *);
-	kThemeSoundScrollArrowRelease = $73626172 (* 'sbar' *);
-	kThemeSoundScrollEndOfTrack = $73627465 (* 'sbte' *);
-	kThemeSoundScrollTrackPress = $73627470 (* 'sbtp' *);
-	kThemeSoundSliderEndOfTrack = $736C7465 (* 'slte' *); { sliders }
-	kThemeSoundSliderTrackPress = $736C7470 (* 'sltp' *);
-	kThemeSoundBalloonOpen = $626C6E6F (* 'blno' *); { help balloons }
-	kThemeSoundBalloonClose = $626C6E63 (* 'blnc' *);
-	kThemeSoundBevelPress = $62657670 (* 'bevp' *); { Bevel buttons }
-	kThemeSoundBevelEnter = $62657665 (* 'beve' *);
-	kThemeSoundBevelExit = $62657678 (* 'bevx' *);
-	kThemeSoundBevelRelease = $62657672 (* 'bevr' *);
-	kThemeSoundLittleArrowUpPress = $6C617570 (* 'laup' *); { Little Arrows }
-	kThemeSoundLittleArrowDnPress = $6C616470 (* 'ladp' *);
-	kThemeSoundLittleArrowEnter = $6C617265 (* 'lare' *);
-	kThemeSoundLittleArrowExit = $6C617278 (* 'larx' *);
-	kThemeSoundLittleArrowUpRelease = $6C617572 (* 'laur' *);
-	kThemeSoundLittleArrowDnRelease = $6C616472 (* 'ladr' *);
-	kThemeSoundPopupPress = $706F7070 (* 'popp' *); { Popup Buttons }
-	kThemeSoundPopupEnter = $706F7065 (* 'pope' *);
-	kThemeSoundPopupExit = $706F7078 (* 'popx' *);
-	kThemeSoundPopupRelease = $706F7072 (* 'popr' *);
-	kThemeSoundDisclosurePress = $64736370 (* 'dscp' *); { Disclosure Buttons }
-	kThemeSoundDisclosureEnter = $64736365 (* 'dsce' *);
-	kThemeSoundDisclosureExit = $64736378 (* 'dscx' *);
-	kThemeSoundDisclosureRelease = $64736372 (* 'dscr' *);
-	kThemeSoundTabPressed = $74616270 (* 'tabp' *); { Tabs }
-	kThemeSoundTabEnter = $74616265 (* 'tabe' *);
-	kThemeSoundTabExit = $74616278 (* 'tabx' *);
-	kThemeSoundTabRelease = $74616272 (* 'tabr' *);
-	kThemeSoundDragTargetHilite = $64746869 (* 'dthi' *); { drag manager }
-	kThemeSoundDragTargetUnhilite = $64747568 (* 'dtuh' *);
-	kThemeSoundDragTargetDrop = $64746472 (* 'dtdr' *);
-	kThemeSoundEmptyTrash = $66747273 (* 'ftrs' *); { finder }
-	kThemeSoundSelectItem = $6673656C (* 'fsel' *);
-	kThemeSoundNewItem = $666E6577 (* 'fnew' *);
-	kThemeSoundReceiveDrop = $66647270 (* 'fdrp' *);
-	kThemeSoundCopyDone = $66637064 (* 'fcpd' *);
-	kThemeSoundResolveAlias = $6672616C (* 'fral' *);
-	kThemeSoundLaunchApp = $666C6170 (* 'flap' *);
-	kThemeSoundDiskInsert = $64736B69 (* 'dski' *);
-	kThemeSoundDiskEject = $64736B65 (* 'dske' *);
-	kThemeSoundFinderDragOnIcon = $66646F6E (* 'fdon' *);
-	kThemeSoundFinderDragOffIcon = $66646F66 (* 'fdof' *);
+	kThemeSoundMenuOpen = FourCharCode('mnuo'); { menu sounds }
+	kThemeSoundMenuClose = FourCharCode('mnuc');
+	kThemeSoundMenuItemHilite = FourCharCode('mnui');
+	kThemeSoundMenuItemRelease = FourCharCode('mnus');
+	kThemeSoundWindowClosePress = FourCharCode('wclp'); { window sounds }
+	kThemeSoundWindowCloseEnter = FourCharCode('wcle');
+	kThemeSoundWindowCloseExit = FourCharCode('wclx');
+	kThemeSoundWindowCloseRelease = FourCharCode('wclr');
+	kThemeSoundWindowZoomPress = FourCharCode('wzmp');
+	kThemeSoundWindowZoomEnter = FourCharCode('wzme');
+	kThemeSoundWindowZoomExit = FourCharCode('wzmx');
+	kThemeSoundWindowZoomRelease = FourCharCode('wzmr');
+	kThemeSoundWindowCollapsePress = FourCharCode('wcop');
+	kThemeSoundWindowCollapseEnter = FourCharCode('wcoe');
+	kThemeSoundWindowCollapseExit = FourCharCode('wcox');
+	kThemeSoundWindowCollapseRelease = FourCharCode('wcor');
+	kThemeSoundWindowDragBoundary = FourCharCode('wdbd');
+	kThemeSoundUtilWinClosePress = FourCharCode('uclp'); { utility window sounds }
+	kThemeSoundUtilWinCloseEnter = FourCharCode('ucle');
+	kThemeSoundUtilWinCloseExit = FourCharCode('uclx');
+	kThemeSoundUtilWinCloseRelease = FourCharCode('uclr');
+	kThemeSoundUtilWinZoomPress = FourCharCode('uzmp');
+	kThemeSoundUtilWinZoomEnter = FourCharCode('uzme');
+	kThemeSoundUtilWinZoomExit = FourCharCode('uzmx');
+	kThemeSoundUtilWinZoomRelease = FourCharCode('uzmr');
+	kThemeSoundUtilWinCollapsePress = FourCharCode('ucop');
+	kThemeSoundUtilWinCollapseEnter = FourCharCode('ucoe');
+	kThemeSoundUtilWinCollapseExit = FourCharCode('ucox');
+	kThemeSoundUtilWinCollapseRelease = FourCharCode('ucor');
+	kThemeSoundUtilWinDragBoundary = FourCharCode('udbd');
+	kThemeSoundWindowOpen = FourCharCode('wopn'); { window close and zoom action }
+	kThemeSoundWindowClose = FourCharCode('wcls');
+	kThemeSoundWindowZoomIn = FourCharCode('wzmi');
+	kThemeSoundWindowZoomOut = FourCharCode('wzmo');
+	kThemeSoundWindowCollapseUp = FourCharCode('wcol');
+	kThemeSoundWindowCollapseDown = FourCharCode('wexp');
+	kThemeSoundWindowActivate = FourCharCode('wact');
+	kThemeSoundUtilWindowOpen = FourCharCode('uopn');
+	kThemeSoundUtilWindowClose = FourCharCode('ucls');
+	kThemeSoundUtilWindowZoomIn = FourCharCode('uzmi');
+	kThemeSoundUtilWindowZoomOut = FourCharCode('uzmo');
+	kThemeSoundUtilWindowCollapseUp = FourCharCode('ucol');
+	kThemeSoundUtilWindowCollapseDown = FourCharCode('uexp');
+	kThemeSoundUtilWindowActivate = FourCharCode('uact');
+	kThemeSoundDialogOpen = FourCharCode('dopn');
+	kThemeSoundDialogClose = FourCharCode('dlgc');
+	kThemeSoundAlertOpen = FourCharCode('aopn');
+	kThemeSoundAlertClose = FourCharCode('altc');
+	kThemeSoundPopupWindowOpen = FourCharCode('pwop');
+	kThemeSoundPopupWindowClose = FourCharCode('pwcl');
+	kThemeSoundButtonPress = FourCharCode('btnp'); { button }
+	kThemeSoundButtonEnter = FourCharCode('btne');
+	kThemeSoundButtonExit = FourCharCode('btnx');
+	kThemeSoundButtonRelease = FourCharCode('btnr');
+	kThemeSoundDefaultButtonPress = FourCharCode('dbtp'); { default button }
+	kThemeSoundDefaultButtonEnter = FourCharCode('dbte');
+	kThemeSoundDefaultButtonExit = FourCharCode('dbtx');
+	kThemeSoundDefaultButtonRelease = FourCharCode('dbtr');
+	kThemeSoundCancelButtonPress = FourCharCode('cbtp'); { cancel button }
+	kThemeSoundCancelButtonEnter = FourCharCode('cbte');
+	kThemeSoundCancelButtonExit = FourCharCode('cbtx');
+	kThemeSoundCancelButtonRelease = FourCharCode('cbtr');
+	kThemeSoundCheckboxPress = FourCharCode('chkp'); { checkboxes }
+	kThemeSoundCheckboxEnter = FourCharCode('chke');
+	kThemeSoundCheckboxExit = FourCharCode('chkx');
+	kThemeSoundCheckboxRelease = FourCharCode('chkr');
+	kThemeSoundRadioPress = FourCharCode('radp'); { radio buttons }
+	kThemeSoundRadioEnter = FourCharCode('rade');
+	kThemeSoundRadioExit = FourCharCode('radx');
+	kThemeSoundRadioRelease = FourCharCode('radr');
+	kThemeSoundScrollArrowPress = FourCharCode('sbap'); { scroll bars }
+	kThemeSoundScrollArrowEnter = FourCharCode('sbae');
+	kThemeSoundScrollArrowExit = FourCharCode('sbax');
+	kThemeSoundScrollArrowRelease = FourCharCode('sbar');
+	kThemeSoundScrollEndOfTrack = FourCharCode('sbte');
+	kThemeSoundScrollTrackPress = FourCharCode('sbtp');
+	kThemeSoundSliderEndOfTrack = FourCharCode('slte'); { sliders }
+	kThemeSoundSliderTrackPress = FourCharCode('sltp');
+	kThemeSoundBalloonOpen = FourCharCode('blno'); { help balloons }
+	kThemeSoundBalloonClose = FourCharCode('blnc');
+	kThemeSoundBevelPress = FourCharCode('bevp'); { Bevel buttons }
+	kThemeSoundBevelEnter = FourCharCode('beve');
+	kThemeSoundBevelExit = FourCharCode('bevx');
+	kThemeSoundBevelRelease = FourCharCode('bevr');
+	kThemeSoundLittleArrowUpPress = FourCharCode('laup'); { Little Arrows }
+	kThemeSoundLittleArrowDnPress = FourCharCode('ladp');
+	kThemeSoundLittleArrowEnter = FourCharCode('lare');
+	kThemeSoundLittleArrowExit = FourCharCode('larx');
+	kThemeSoundLittleArrowUpRelease = FourCharCode('laur');
+	kThemeSoundLittleArrowDnRelease = FourCharCode('ladr');
+	kThemeSoundPopupPress = FourCharCode('popp'); { Popup Buttons }
+	kThemeSoundPopupEnter = FourCharCode('pope');
+	kThemeSoundPopupExit = FourCharCode('popx');
+	kThemeSoundPopupRelease = FourCharCode('popr');
+	kThemeSoundDisclosurePress = FourCharCode('dscp'); { Disclosure Buttons }
+	kThemeSoundDisclosureEnter = FourCharCode('dsce');
+	kThemeSoundDisclosureExit = FourCharCode('dscx');
+	kThemeSoundDisclosureRelease = FourCharCode('dscr');
+	kThemeSoundTabPressed = FourCharCode('tabp'); { Tabs }
+	kThemeSoundTabEnter = FourCharCode('tabe');
+	kThemeSoundTabExit = FourCharCode('tabx');
+	kThemeSoundTabRelease = FourCharCode('tabr');
+	kThemeSoundDragTargetHilite = FourCharCode('dthi'); { drag manager }
+	kThemeSoundDragTargetUnhilite = FourCharCode('dtuh');
+	kThemeSoundDragTargetDrop = FourCharCode('dtdr');
+	kThemeSoundEmptyTrash = FourCharCode('ftrs'); { finder }
+	kThemeSoundSelectItem = FourCharCode('fsel');
+	kThemeSoundNewItem = FourCharCode('fnew');
+	kThemeSoundReceiveDrop = FourCharCode('fdrp');
+	kThemeSoundCopyDone = FourCharCode('fcpd');
+	kThemeSoundResolveAlias = FourCharCode('fral');
+	kThemeSoundLaunchApp = FourCharCode('flap');
+	kThemeSoundDiskInsert = FourCharCode('dski');
+	kThemeSoundDiskEject = FourCharCode('dske');
+	kThemeSoundFinderDragOnIcon = FourCharCode('fdon');
+	kThemeSoundFinderDragOffIcon = FourCharCode('fdof');
 
 type
 	ThemeSoundKind = OSType;

packages/univint/src/AppleDiskPartitions.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AppleDiskPartitions;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}
@@ -202,12 +202,12 @@ const
 
 
 	{	 Well known driver signatures, stored in the first four byte of pmPad. 	}
-	kPatchDriverSignature		= $70744452 (* 'ptDR' *);						{  SCSI and ATA[PI] patch driver     }
+	kPatchDriverSignature		= FourCharCode('ptDR');						{  SCSI and ATA[PI] patch driver     }
 	kSCSIDriverSignature		= $00010600;					{  SCSI  hard disk driver            }
-	kATADriverSignature			= $77696B69 (* 'wiki' *);						{  ATA   hard disk driver            }
-	kSCSICDDriverSignature		= $43447672 (* 'CDvr' *);						{  SCSI  CD-ROM    driver            }
-	kATAPIDriverSignature		= $41545049 (* 'ATPI' *);						{  ATAPI CD-ROM    driver            }
-	kDriveSetupHFSSignature		= $44535531 (* 'DSU1' *);						{  Drive Setup HFS partition         }
+	kATADriverSignature			= FourCharCode('wiki');						{  ATA   hard disk driver            }
+	kSCSICDDriverSignature		= FourCharCode('CDvr');						{  SCSI  CD-ROM    driver            }
+	kATAPIDriverSignature		= FourCharCode('ATPI');						{  ATAPI CD-ROM    driver            }
+	kDriveSetupHFSSignature		= FourCharCode('DSU1');						{  Drive Setup HFS partition         }
 
 
 {$ALIGN MAC68K}

packages/univint/src/AppleEvents.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AppleEvents;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}
@@ -119,36 +119,36 @@ uses MacTypes,MixedMode,AEDataModel,AEInteraction, CFArray, CFBase, CFRunLoop, C
 
 const
 																{  Keywords for Apple event parameters  }
-	keyDirectObject				= $2D2D2D2D (* '----' *);
-	keyErrorNumber				= $6572726E (* 'errn' *);
-	keyErrorString				= $65727273 (* 'errs' *);
-	keyProcessSerialNumber		= $70736E20 (* 'psn ' *);						{  Keywords for special handlers  }
-	keyPreDispatch				= $70686163 (* 'phac' *);						{  preHandler accessor call  }
-	keySelectProc				= $73656C68 (* 'selh' *);						{  more selector call  }
+	keyDirectObject				= FourCharCode('----');
+	keyErrorNumber				= FourCharCode('errn');
+	keyErrorString				= FourCharCode('errs');
+	keyProcessSerialNumber		= FourCharCode('psn ');						{  Keywords for special handlers  }
+	keyPreDispatch				= FourCharCode('phac');						{  preHandler accessor call  }
+	keySelectProc				= FourCharCode('selh');						{  more selector call  }
 																{  Keyword for recording  }
-	keyAERecorderCount			= $72656372 (* 'recr' *);						{  available only in vers 1.0.1 and greater  }
+	keyAERecorderCount			= FourCharCode('recr');						{  available only in vers 1.0.1 and greater  }
 																{  Keyword for version information  }
-	keyAEVersion				= $76657273 (* 'vers' *);						{  available only in vers 1.0.1 and greater  }
+	keyAEVersion				= FourCharCode('vers');						{  available only in vers 1.0.1 and greater  }
 
 	{	 Event Class 	}
-	kCoreEventClass				= $61657674 (* 'aevt' *);
+	kCoreEventClass				= FourCharCode('aevt');
 
 	{	 Event IDÕs 	}
-	kAEOpenApplication			= $6F617070 (* 'oapp' *);
-	kAEOpenDocuments			= $6F646F63 (* 'odoc' *);
-	kAEPrintDocuments			= $70646F63 (* 'pdoc' *);
-	kAEQuitApplication			= $71756974 (* 'quit' *);
-	kAEAnswer					= $616E7372 (* 'ansr' *);
-	kAEApplicationDied			= $6F626974 (* 'obit' *);
-	kAEShowPreferences			= $70726566 (* 'pref' *);						{  sent by Mac OS X when the user chooses the Preferences item  }
-	kAEAutosaveNow              = $61736176 (* 'asav' *);                       { sent by Mac OS X when it is advisable to autosave all the user's documents with uncommitted changes. }
+	kAEOpenApplication			= FourCharCode('oapp');
+	kAEOpenDocuments			= FourCharCode('odoc');
+	kAEPrintDocuments			= FourCharCode('pdoc');
+	kAEQuitApplication			= FourCharCode('quit');
+	kAEAnswer					= FourCharCode('ansr');
+	kAEApplicationDied			= FourCharCode('obit');
+	kAEShowPreferences			= FourCharCode('pref');						{  sent by Mac OS X when the user chooses the Preferences item  }
+	kAEAutosaveNow              = FourCharCode('asav');                       { sent by Mac OS X when it is advisable to autosave all the user's documents with uncommitted changes. }
 
 	{	 Constants for recording 	}
-	kAEStartRecording			= $72656361 (* 'reca' *);						{  available only in vers 1.0.1 and greater  }
-	kAEStopRecording			= $72656363 (* 'recc' *);						{  available only in vers 1.0.1 and greater  }
-	kAENotifyStartRecording		= $72656331 (* 'rec1' *);						{  available only in vers 1.0.1 and greater  }
-	kAENotifyStopRecording		= $72656330 (* 'rec0' *);						{  available only in vers 1.0.1 and greater  }
-	kAENotifyRecording			= $72656372 (* 'recr' *);						{  available only in vers 1.0.1 and greater  }
+	kAEStartRecording			= FourCharCode('reca');						{  available only in vers 1.0.1 and greater  }
+	kAEStopRecording			= FourCharCode('recc');						{  available only in vers 1.0.1 and greater  }
+	kAENotifyStartRecording		= FourCharCode('rec1');						{  available only in vers 1.0.1 and greater  }
+	kAENotifyStopRecording		= FourCharCode('rec0');						{  available only in vers 1.0.1 and greater  }
+	kAENotifyRecording			= FourCharCode('recr');						{  available only in vers 1.0.1 and greater  }
 
 
 	{	

packages/univint/src/AppleHelp.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AppleHelp;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/AppleScript.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AppleScript;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}
@@ -118,9 +118,9 @@ uses MacTypes,AEDataModel,Components,MacErrors,AppleEvents,OSA,TextEdit;
 }
 
 const
-	typeAppleScript				= $61736372 (* 'ascr' *);
-	kAppleScriptSubtype			= $61736372 (* 'ascr' *);
-	typeASStorage				= $61736372 (* 'ascr' *);
+	typeAppleScript				= FourCharCode('ascr');
+	kAppleScriptSubtype			= FourCharCode('ascr');
+	typeASStorage				= FourCharCode('ascr');
 
 	{	*************************************************************************
 	    Component Selectors
@@ -135,7 +135,7 @@ const
 	{	*************************************************************************
 	    OSAGetScriptInfo Selectors
 	*************************************************************************	}
-	kASHasOpenHandler			= $68736F64 (* 'hsod' *);
+	kASHasOpenHandler			= FourCharCode('hsod');
 
 	{	
 	        This selector is used to query a context as to whether it contains

packages/univint/src/AudioHardware.pas

@@ -14,7 +14,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -22,12 +22,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AudioHardware;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}
@@ -208,17 +208,17 @@ uses MacTypes, CFRunLoop, CoreAudioTypes;
 }
 const
 	kAudioHardwareNoError = 0;
-	kAudioHardwareNotRunningError = $73746F70 (* 'stop' *);
-	kAudioHardwareUnspecifiedError = $77686174 (* 'what' *);
-	kAudioHardwareUnknownPropertyError = $77686F3F (* 'who?' *);
-	kAudioHardwareBadPropertySizeError = $2173697A (* '!siz' *);
-	kAudioHardwareIllegalOperationError = $6E6F7065 (* 'nope' *);
-	kAudioHardwareBadObjectError = $216F626A (* '!obj' *);
-	kAudioHardwareBadDeviceError = $21646576 (* '!dev' *);
-	kAudioHardwareBadStreamError = $21737472 (* '!str' *);
-	kAudioHardwareUnsupportedOperationError = $756E6F70 (* 'unop' *);
-	kAudioDeviceUnsupportedFormatError = $21646174 (* '!dat' *);
-	kAudioDevicePermissionsError = $21686F67 (* '!hog' *);
+	kAudioHardwareNotRunningError = FourCharCode('stop');
+	kAudioHardwareUnspecifiedError = FourCharCode('what');
+	kAudioHardwareUnknownPropertyError = FourCharCode('who?');
+	kAudioHardwareBadPropertySizeError = FourCharCode('!siz');
+	kAudioHardwareIllegalOperationError = FourCharCode('nope');
+	kAudioHardwareBadObjectError = FourCharCode('!obj');
+	kAudioHardwareBadDeviceError = FourCharCode('!dev');
+	kAudioHardwareBadStreamError = FourCharCode('!str');
+	kAudioHardwareUnsupportedOperationError = FourCharCode('unop');
+	kAudioDeviceUnsupportedFormatError = FourCharCode('!dat');
+	kAudioDevicePermissionsError = FourCharCode('!hog');
 
 //==================================================================================================
 //#pragma mark    Property Support Types
@@ -305,8 +305,8 @@ type
 						A synonym for kAudioObjectPropertyElementWildcard.
 }
 const
-	kAudioObjectPropertySelectorWildcard = $2A2A2A2A (* '****' *);
-	kAudioObjectPropertyScopeWildcard = $2A2A2A2A (* '****' *);
+	kAudioObjectPropertySelectorWildcard = FourCharCode('****');
+	kAudioObjectPropertyScopeWildcard = FourCharCode('****');
 	kAudioObjectPropertyElementWildcard = $FFFFFFFF;
 	kAudioPropertyWildcardPropertyID = kAudioObjectPropertySelectorWildcard;
 	kAudioPropertyWildcardSection = $FF;
@@ -376,10 +376,10 @@ type
                         The AudioObjectID for a non-existant AudioObject.
 }
 const
-	kAudioObjectPropertyScopeGlobal = $676C6F62 (* 'glob' *);
+	kAudioObjectPropertyScopeGlobal = FourCharCode('glob');
 	kAudioObjectPropertyElementMaster = 0;
-	kAudioObjectClassID = $616F626A (* 'aobj' *);
-	kAudioObjectClassIDWildcard = $2A2A2A2A (* '****' *);
+	kAudioObjectClassID = FourCharCode('aobj');
+	kAudioObjectClassIDWildcard = FourCharCode('****');
 	kAudioObjectUnknown = 0;
 
 //==================================================================================================
@@ -434,17 +434,17 @@ const
                         AudioPlugIn when a listener is removed.
 }
 const
-	kAudioObjectPropertyClass = $636C6173 (* 'clas' *);
-	kAudioObjectPropertyOwner = $73746476 (* 'stdv' *);
-	kAudioObjectPropertyCreator = $6F706C67 (* 'oplg' *);
-	kAudioObjectPropertyName = $6C6E616D (* 'lnam' *);
-	kAudioObjectPropertyManufacturer = $6C6D616B (* 'lmak' *);
-	kAudioObjectPropertyElementName = $6C63686E (* 'lchn' *);
-	kAudioObjectPropertyElementCategoryName = $6C63636E (* 'lccn' *);
-	kAudioObjectPropertyElementNumberName = $6C636E6E (* 'lcnn' *);
-	kAudioObjectPropertyOwnedObjects = $6F776E64 (* 'ownd' *);
-	kAudioObjectPropertyListenerAdded = $6C697361 (* 'lisa' *);
-	kAudioObjectPropertyListenerRemoved = $6C697372 (* 'lisr' *);
+	kAudioObjectPropertyClass = FourCharCode('clas');
+	kAudioObjectPropertyOwner = FourCharCode('stdv');
+	kAudioObjectPropertyCreator = FourCharCode('oplg');
+	kAudioObjectPropertyName = FourCharCode('lnam');
+	kAudioObjectPropertyManufacturer = FourCharCode('lmak');
+	kAudioObjectPropertyElementName = FourCharCode('lchn');
+	kAudioObjectPropertyElementCategoryName = FourCharCode('lccn');
+	kAudioObjectPropertyElementNumberName = FourCharCode('lcnn');
+	kAudioObjectPropertyOwnedObjects = FourCharCode('ownd');
+	kAudioObjectPropertyListenerAdded = FourCharCode('lisa');
+	kAudioObjectPropertyListenerRemoved = FourCharCode('lisr');
 
 //==================================================================================================
 //#pragma mark    AudioObject Functions
@@ -630,11 +630,11 @@ function AudioObjectRemovePropertyListener( inObjectID: AudioObjectID; const (*v
                         panning a mono signal between a left/right pair of outputs.
 }
 const
-	kAudioControlClassID = $6163746C (* 'actl' *);
-	kAudioLevelControlClassID = $6C65766C (* 'levl' *);
-	kAudioBooleanControlClassID = $746F676C (* 'togl' *);
-	kAudioSelectorControlClassID = $736C6374 (* 'slct' *);
-	kAudioStereoPanControlClassID = $7370616E (* 'span' *);
+	kAudioControlClassID = FourCharCode('actl');
+	kAudioLevelControlClassID = FourCharCode('levl');
+	kAudioBooleanControlClassID = FourCharCode('togl');
+	kAudioSelectorControlClassID = FourCharCode('slct');
+	kAudioStereoPanControlClassID = FourCharCode('span');
 
 {!
     @enum           AudioLevelControl Subclass IDs
@@ -651,9 +651,9 @@ const
                         An AudioLevelControl for the boot chime of the CPU.
 }
 const
-	kAudioVolumeControlClassID = $766C6D65 (* 'vlme' *);
-	kAudioLFEVolumeControlClassID = $73756276 (* 'subv' *);
-	kAudioBootChimeVolumeControlClassID = $7072616D (* 'pram' *);
+	kAudioVolumeControlClassID = FourCharCode('vlme');
+	kAudioLFEVolumeControlClassID = FourCharCode('subv');
+	kAudioBootChimeVolumeControlClassID = FourCharCode('pram');
 
 {!
     @enum           AudioBooleanControl Subclass IDs
@@ -679,11 +679,11 @@ const
                         ultimately owns the control also owns any iSub attached to the CPU.
 }
 const
-	kAudioMuteControlClassID = $6D757465 (* 'mute' *);
-	kAudioSoloControlClassID = $736F6C6F (* 'solo' *);
-	kAudioJackControlClassID = $6A61636B (* 'jack' *);
-	kAudioLFEMuteControlClassID = $7375626D (* 'subm' *);
-	kAudioISubOwnerControlClassID = $61746368 (* 'atch' *);
+	kAudioMuteControlClassID = FourCharCode('mute');
+	kAudioSoloControlClassID = FourCharCode('solo');
+	kAudioJackControlClassID = FourCharCode('jack');
+	kAudioLFEMuteControlClassID = FourCharCode('subm');
+	kAudioISubOwnerControlClassID = FourCharCode('atch');
 
 {!
     @enum           AudioSelectorControl Subclass IDs
@@ -705,10 +705,10 @@ const
                         instrument, etc.
 }
 const
-	kAudioDataSourceControlClassID = $64737263 (* 'dsrc' *);
-	kAudioDataDestinationControlClassID = $64657374 (* 'dest' *);
-	kAudioClockSourceControlClassID = $636C636B (* 'clck' *);
-	kAudioLineLevelControlClassID = $6E6C766C (* 'nlvl' *);
+	kAudioDataSourceControlClassID = FourCharCode('dsrc');
+	kAudioDataDestinationControlClassID = FourCharCode('dest');
+	kAudioClockSourceControlClassID = FourCharCode('clck');
+	kAudioLineLevelControlClassID = FourCharCode('nlvl');
 
 //==================================================================================================
 //#pragma mark    AudioControl Properties
@@ -732,9 +732,9 @@ const
                         control.
 }
 const
-	kAudioControlPropertyScope = $63736370 (* 'cscp' *);
-	kAudioControlPropertyElement = $63656C6D (* 'celm' *);
-	kAudioControlPropertyVariant = $63766172 (* 'cvar' *);
+	kAudioControlPropertyScope = FourCharCode('cscp');
+	kAudioControlPropertyElement = FourCharCode('celm');
+	kAudioControlPropertyVariant = FourCharCode('cvar');
 
 {!
     @enum           AudioLevelControl Properties
@@ -757,11 +757,11 @@ const
                         exit contains the equivalent scalar value.
 }
 const
-	kAudioLevelControlPropertyScalarValue = $6C637376 (* 'lcsv' *);
-	kAudioLevelControlPropertyDecibelValue = $6C636476 (* 'lcdv' *);
-	kAudioLevelControlPropertyDecibelRange = $6C636472 (* 'lcdr' *);
-	kAudioLevelControlPropertyConvertScalarToDecibels = $6C637364 (* 'lcsd' *);
-	kAudioLevelControlPropertyConvertDecibelsToScalar = $6C636473 (* 'lcds' *);
+	kAudioLevelControlPropertyScalarValue = FourCharCode('lcsv');
+	kAudioLevelControlPropertyDecibelValue = FourCharCode('lcdv');
+	kAudioLevelControlPropertyDecibelRange = FourCharCode('lcdr');
+	kAudioLevelControlPropertyConvertScalarToDecibels = FourCharCode('lcsd');
+	kAudioLevelControlPropertyConvertDecibelsToScalar = FourCharCode('lcds');
 
 {!
     @enum           AudioBooleanControl Properties
@@ -772,7 +772,7 @@ const
                         A UInt32 where 0 means false and 1 means true.
 }
 const
-	kAudioBooleanControlPropertyValue = $6263766C (* 'bcvl' *);
+	kAudioBooleanControlPropertyValue = FourCharCode('bcvl');
 
 {!
     @enum           AudioSelectorControl Properties
@@ -790,9 +790,9 @@ const
                         the returned CFObject.
 }
 const
-	kAudioSelectorControlPropertyCurrentItem = $73636369 (* 'scci' *);
-	kAudioSelectorControlPropertyAvailableItems = $73636169 (* 'scai' *);
-	kAudioSelectorControlPropertyItemName = $7363696E (* 'scin' *);
+	kAudioSelectorControlPropertyCurrentItem = FourCharCode('scci');
+	kAudioSelectorControlPropertyAvailableItems = FourCharCode('scai');
+	kAudioSelectorControlPropertyItemName = FourCharCode('scin');
 
 {!
     @enum           AudioClockSourceControl Properties
@@ -804,7 +804,7 @@ const
                         this property are defined in <IOAudio/audio/IOAudioTypes.h>.
 }
 const
-	kAudioClockSourceControlPropertyItemKind = $636C6B6B (* 'clkk' *);
+	kAudioClockSourceControlPropertyItemKind = FourCharCode('clkk');
 
 {!
     @enum           AudioStereoPanControl Properties
@@ -818,8 +818,8 @@ const
                         the signal is being panned between.
 }
 const
-	kAudioStereoPanControlPropertyValue = $73706376 (* 'spcv' *);
-	kAudioStereoPanControlPropertyPanningChannels = $73706363 (* 'spcc' *);
+	kAudioStereoPanControlPropertyValue = FourCharCode('spcv');
+	kAudioStereoPanControlPropertyPanningChannels = FourCharCode('spcc');
 
 //==================================================================================================
 //#pragma mark    AudioSystemObject Types
@@ -860,7 +860,7 @@ type
                         AudioSystemObject.
 }
 const
-	kAudioSystemObjectClassID = $61737973 (* 'asys' *);
+	kAudioSystemObjectClassID = FourCharCode('asys');
 	kAudioObjectSystemObject = 1;
 
 //==================================================================================================
@@ -920,18 +920,18 @@ const
                         given bundle ID doesn't match any AudioPlugIns.
 }
 const
-	kAudioHardwarePropertyProcessIsMaster = $6D617374 (* 'mast' *);
-	kAudioHardwarePropertyIsInitingOrExiting = $696E6F74 (* 'inot' *);
-	kAudioHardwarePropertyDevices = $64657623 (* 'dev#' *);
-	kAudioHardwarePropertyDefaultInputDevice = $64496E20 (* 'dIn ' *);
-	kAudioHardwarePropertyDefaultOutputDevice = $644F7574 (* 'dOut' *);
-	kAudioHardwarePropertyDefaultSystemOutputDevice = $734F7574 (* 'sOut' *);
-	kAudioHardwarePropertyDeviceForUID = $64756964 (* 'duid' *);
-	kAudioHardwarePropertySleepingIsAllowed = $736C6570 (* 'slep' *);
-	kAudioHardwarePropertyUnloadingIsAllowed = $756E6C64 (* 'unld' *);
-	kAudioHardwarePropertyHogModeIsAllowed = $686F6772 (* 'hogr' *);
-	kAudioHardwarePropertyRunLoop = $726E6C70 (* 'rnlp' *);
-	kAudioHardwarePropertyPlugInForBundleID = $70696269 (* 'pibi' *);
+	kAudioHardwarePropertyProcessIsMaster = FourCharCode('mast');
+	kAudioHardwarePropertyIsInitingOrExiting = FourCharCode('inot');
+	kAudioHardwarePropertyDevices = FourCharCode('dev#');
+	kAudioHardwarePropertyDefaultInputDevice = FourCharCode('dIn ');
+	kAudioHardwarePropertyDefaultOutputDevice = FourCharCode('dOut');
+	kAudioHardwarePropertyDefaultSystemOutputDevice = FourCharCode('sOut');
+	kAudioHardwarePropertyDeviceForUID = FourCharCode('duid');
+	kAudioHardwarePropertySleepingIsAllowed = FourCharCode('slep');
+	kAudioHardwarePropertyUnloadingIsAllowed = FourCharCode('unld');
+	kAudioHardwarePropertyHogModeIsAllowed = FourCharCode('hogr');
+	kAudioHardwarePropertyRunLoop = FourCharCode('rnlp');
+	kAudioHardwarePropertyPlugInForBundleID = FourCharCode('pibi');
 
 {!
     @enum           AudioSystemObject Properties Implemented via AudioControl objects
@@ -962,11 +962,11 @@ const
                         an AudioControl object that is a subclass of AudioBootChimeVolumeControl.
 }
 const
-	kAudioHardwarePropertyBootChimeVolumeScalar = $62627673 (* 'bbvs' *);
-	kAudioHardwarePropertyBootChimeVolumeDecibels = $62627664 (* 'bbvd' *);
-	kAudioHardwarePropertyBootChimeVolumeRangeDecibels = $62626423 (* 'bbd#' *);
-	kAudioHardwarePropertyBootChimeVolumeScalarToDecibels = $62763264 (* 'bv2d' *);
-	kAudioHardwarePropertyBootChimeVolumeDecibelsToScalar = $62643276 (* 'bd2v' *);
+	kAudioHardwarePropertyBootChimeVolumeScalar = FourCharCode('bbvs');
+	kAudioHardwarePropertyBootChimeVolumeDecibels = FourCharCode('bbvd');
+	kAudioHardwarePropertyBootChimeVolumeRangeDecibels = FourCharCode('bbd#');
+	kAudioHardwarePropertyBootChimeVolumeScalarToDecibels = FourCharCode('bv2d');
+	kAudioHardwarePropertyBootChimeVolumeDecibelsToScalar = FourCharCode('bd2v');
 
 //==================================================================================================
 //#pragma mark    AudioSystemObject Functions
@@ -1112,7 +1112,7 @@ function AudioHardwareRemovePropertyListener( inPropertyID: AudioHardwarePropert
                         The AudioClassID that identifies the AudioPlugIn class.
 }
 const
-	kAudioPlugInClassID = $61706C67 (* 'aplg' *);
+	kAudioPlugInClassID = FourCharCode('aplg');
 
 //==================================================================================================
 //#pragma mark    AudioPlugIn Properties
@@ -1140,9 +1140,9 @@ const
                         destroy.
 }
 const
-	kAudioPlugInPropertyBundleID = $70696964 (* 'piid' *);
-	kAudioPlugInCreateAggregateDevice = $63616767 (* 'cagg' *);
-	kAudioPlugInDestroyAggregateDevice = $64616767 (* 'dagg' *);
+	kAudioPlugInPropertyBundleID = FourCharCode('piid');
+	kAudioPlugInCreateAggregateDevice = FourCharCode('cagg');
+	kAudioPlugInDestroyAggregateDevice = FourCharCode('dagg');
 
 //==================================================================================================
 //#pragma mark    AudioDevice Types
@@ -1272,10 +1272,10 @@ type
                         The AudioObjectID for a nonexistent AudioObject.
 }
 const
-	kAudioDevicePropertyScopeInput = $696E7074 (* 'inpt' *);
-	kAudioDevicePropertyScopeOutput = $6F757470 (* 'outp' *);
-	kAudioDevicePropertyScopePlayThrough = $70747275 (* 'ptru' *);
-	kAudioDeviceClassID = $61646576 (* 'adev' *);
+	kAudioDevicePropertyScopeInput = FourCharCode('inpt');
+	kAudioDevicePropertyScopeOutput = FourCharCode('outp');
+	kAudioDevicePropertyScopePlayThrough = FourCharCode('ptru');
+	kAudioDeviceClassID = FourCharCode('adev');
 	kAudioDeviceUnknown = kAudioObjectUnknown;
 
 {!
@@ -1452,35 +1452,35 @@ const
                         as measured by it's time stamps.
 }
 const
-	kAudioDevicePropertyPlugIn = $706C7567 (* 'plug' *);
-	kAudioDevicePropertyConfigurationApplication = $63617070 (* 'capp' *);
-	kAudioDevicePropertyDeviceUID = $75696420 (* 'uid ' *);
-	kAudioDevicePropertyModelUID = $6D756964 (* 'muid' *);
-	kAudioDevicePropertyTransportType = $7472616E (* 'tran' *);
-	kAudioDevicePropertyRelatedDevices = $616B696E (* 'akin' *);
-	kAudioDevicePropertyClockDomain = $636C6B64 (* 'clkd' *);
-	kAudioDevicePropertyDeviceIsAlive = $6C69766E (* 'livn' *);
-	kAudioDevicePropertyDeviceHasChanged = $64696666 (* 'diff' *);
-	kAudioDevicePropertyDeviceIsRunning = $676F696E (* 'goin' *);
-	kAudioDevicePropertyDeviceIsRunningSomewhere = $676F6E65 (* 'gone' *);
-	kAudioDevicePropertyDeviceCanBeDefaultDevice = $64666C74 (* 'dflt' *);
-	kAudioDevicePropertyDeviceCanBeDefaultSystemDevice = $73666C74 (* 'sflt' *);
-	kAudioDeviceProcessorOverload = $6F766572 (* 'over' *);
-	kAudioDevicePropertyHogMode = $6F696E6B (* 'oink' *);
-	kAudioDevicePropertyLatency = $6C746E63 (* 'ltnc' *);
-	kAudioDevicePropertyBufferFrameSize = $6673697A (* 'fsiz' *);
-	kAudioDevicePropertyBufferFrameSizeRange = $66737A23 (* 'fsz#' *);
-	kAudioDevicePropertyUsesVariableBufferFrameSizes = $7666737A (* 'vfsz' *);
-	kAudioDevicePropertyStreams = $73746D23 (* 'stm#' *);
-	kAudioDevicePropertySafetyOffset = $73616674 (* 'saft' *);
-	kAudioDevicePropertyIOCycleUsage = $6E637963 (* 'ncyc' *);
-	kAudioDevicePropertyStreamConfiguration = $736C6179 (* 'slay' *);
-	kAudioDevicePropertyIOProcStreamUsage = $73757365 (* 'suse' *);
-	kAudioDevicePropertyPreferredChannelsForStereo = $64636832 (* 'dch2' *);
-	kAudioDevicePropertyPreferredChannelLayout = $73726E64 (* 'srnd' *);
-	kAudioDevicePropertyNominalSampleRate = $6E737274 (* 'nsrt' *);
-	kAudioDevicePropertyAvailableNominalSampleRates = $6E737223 (* 'nsr#' *);
-	kAudioDevicePropertyActualSampleRate = $61737274 (* 'asrt' *);
+	kAudioDevicePropertyPlugIn = FourCharCode('plug');
+	kAudioDevicePropertyConfigurationApplication = FourCharCode('capp');
+	kAudioDevicePropertyDeviceUID = FourCharCode('uid ');
+	kAudioDevicePropertyModelUID = FourCharCode('muid');
+	kAudioDevicePropertyTransportType = FourCharCode('tran');
+	kAudioDevicePropertyRelatedDevices = FourCharCode('akin');
+	kAudioDevicePropertyClockDomain = FourCharCode('clkd');
+	kAudioDevicePropertyDeviceIsAlive = FourCharCode('livn');
+	kAudioDevicePropertyDeviceHasChanged = FourCharCode('diff');
+	kAudioDevicePropertyDeviceIsRunning = FourCharCode('goin');
+	kAudioDevicePropertyDeviceIsRunningSomewhere = FourCharCode('gone');
+	kAudioDevicePropertyDeviceCanBeDefaultDevice = FourCharCode('dflt');
+	kAudioDevicePropertyDeviceCanBeDefaultSystemDevice = FourCharCode('sflt');
+	kAudioDeviceProcessorOverload = FourCharCode('over');
+	kAudioDevicePropertyHogMode = FourCharCode('oink');
+	kAudioDevicePropertyLatency = FourCharCode('ltnc');
+	kAudioDevicePropertyBufferFrameSize = FourCharCode('fsiz');
+	kAudioDevicePropertyBufferFrameSizeRange = FourCharCode('fsz#');
+	kAudioDevicePropertyUsesVariableBufferFrameSizes = FourCharCode('vfsz');
+	kAudioDevicePropertyStreams = FourCharCode('stm#');
+	kAudioDevicePropertySafetyOffset = FourCharCode('saft');
+	kAudioDevicePropertyIOCycleUsage = FourCharCode('ncyc');
+	kAudioDevicePropertyStreamConfiguration = FourCharCode('slay');
+	kAudioDevicePropertyIOProcStreamUsage = FourCharCode('suse');
+	kAudioDevicePropertyPreferredChannelsForStereo = FourCharCode('dch2');
+	kAudioDevicePropertyPreferredChannelLayout = FourCharCode('srnd');
+	kAudioDevicePropertyNominalSampleRate = FourCharCode('nsrt');
+	kAudioDevicePropertyAvailableNominalSampleRates = FourCharCode('nsr#');
+	kAudioDevicePropertyActualSampleRate = FourCharCode('asrt');
 
 {!
     @enum           AudioDevice Properties Implemented via AudioControl objects
@@ -1685,45 +1685,45 @@ const
                         object that is a subclass of AudioLFEMuteControl.
 }
 const
-	kAudioDevicePropertyJackIsConnected = $6A61636B (* 'jack' *);
-	kAudioDevicePropertyVolumeScalar = $766F6C6D (* 'volm' *);
-	kAudioDevicePropertyVolumeDecibels = $766F6C64 (* 'vold' *);
-	kAudioDevicePropertyVolumeRangeDecibels = $76646223 (* 'vdb#' *);
-	kAudioDevicePropertyVolumeScalarToDecibels = $76326462 (* 'v2db' *);
-	kAudioDevicePropertyVolumeDecibelsToScalar = $64623276 (* 'db2v' *);
-	kAudioDevicePropertyStereoPan = $7370616E (* 'span' *);
-	kAudioDevicePropertyStereoPanChannels = $73706E23 (* 'spn#' *);
-	kAudioDevicePropertyMute = $6D757465 (* 'mute' *);
-	kAudioDevicePropertySolo = $736F6C6F (* 'solo' *);
-	kAudioDevicePropertyDataSource = $73737263 (* 'ssrc' *);
-	kAudioDevicePropertyDataSources = $73736323 (* 'ssc#' *);
-	kAudioDevicePropertyDataSourceNameForIDCFString = $6C73636E (* 'lscn' *);
-	kAudioDevicePropertyClockSource = $63737263 (* 'csrc' *);
-	kAudioDevicePropertyClockSources = $63736323 (* 'csc#' *);
-	kAudioDevicePropertyClockSourceNameForIDCFString = $6C63736E (* 'lcsn' *);
-	kAudioDevicePropertyClockSourceKindForID = $6373636B (* 'csck' *);
-	kAudioDevicePropertyPlayThru = $74687275 (* 'thru' *);
-	kAudioDevicePropertyPlayThruSolo = $74687273 (* 'thrs' *);
-	kAudioDevicePropertyPlayThruVolumeScalar = $6D767363 (* 'mvsc' *);
-	kAudioDevicePropertyPlayThruVolumeDecibels = $6D766462 (* 'mvdb' *);
-	kAudioDevicePropertyPlayThruVolumeRangeDecibels = $6D766423 (* 'mvd#' *);
-	kAudioDevicePropertyPlayThruVolumeScalarToDecibels = $6D763264 (* 'mv2d' *);
-	kAudioDevicePropertyPlayThruVolumeDecibelsToScalar = $6D763273 (* 'mv2s' *);
-	kAudioDevicePropertyPlayThruStereoPan = $6D73706E (* 'mspn' *);
-	kAudioDevicePropertyPlayThruStereoPanChannels = $6D737023 (* 'msp#' *);
-	kAudioDevicePropertyPlayThruDestination = $6D646473 (* 'mdds' *);
-	kAudioDevicePropertyPlayThruDestinations = $6D646423 (* 'mdd#' *);
-	kAudioDevicePropertyPlayThruDestinationNameForIDCFString = $6D646463 (* 'mddc' *);
-	kAudioDevicePropertyChannelNominalLineLevel = $6E6C766C (* 'nlvl' *);
-	kAudioDevicePropertyChannelNominalLineLevels = $6E6C7623 (* 'nlv#' *);
-	kAudioDevicePropertyChannelNominalLineLevelNameForIDCFString = $6C636E6C (* 'lcnl' *);
-	kAudioDevicePropertyDriverShouldOwniSub = $69737562 (* 'isub' *);
-	kAudioDevicePropertySubVolumeScalar = $73766C6D (* 'svlm' *);
-	kAudioDevicePropertySubVolumeDecibels = $73766C64 (* 'svld' *);
-	kAudioDevicePropertySubVolumeRangeDecibels = $73766423 (* 'svd#' *);
-	kAudioDevicePropertySubVolumeScalarToDecibels = $73763264 (* 'sv2d' *);
-	kAudioDevicePropertySubVolumeDecibelsToScalar = $73643276 (* 'sd2v' *);
-	kAudioDevicePropertySubMute = $736D7574 (* 'smut' *);
+	kAudioDevicePropertyJackIsConnected = FourCharCode('jack');
+	kAudioDevicePropertyVolumeScalar = FourCharCode('volm');
+	kAudioDevicePropertyVolumeDecibels = FourCharCode('vold');
+	kAudioDevicePropertyVolumeRangeDecibels = FourCharCode('vdb#');
+	kAudioDevicePropertyVolumeScalarToDecibels = FourCharCode('v2db');
+	kAudioDevicePropertyVolumeDecibelsToScalar = FourCharCode('db2v');
+	kAudioDevicePropertyStereoPan = FourCharCode('span');
+	kAudioDevicePropertyStereoPanChannels = FourCharCode('spn#');
+	kAudioDevicePropertyMute = FourCharCode('mute');
+	kAudioDevicePropertySolo = FourCharCode('solo');
+	kAudioDevicePropertyDataSource = FourCharCode('ssrc');
+	kAudioDevicePropertyDataSources = FourCharCode('ssc#');
+	kAudioDevicePropertyDataSourceNameForIDCFString = FourCharCode('lscn');
+	kAudioDevicePropertyClockSource = FourCharCode('csrc');
+	kAudioDevicePropertyClockSources = FourCharCode('csc#');
+	kAudioDevicePropertyClockSourceNameForIDCFString = FourCharCode('lcsn');
+	kAudioDevicePropertyClockSourceKindForID = FourCharCode('csck');
+	kAudioDevicePropertyPlayThru = FourCharCode('thru');
+	kAudioDevicePropertyPlayThruSolo = FourCharCode('thrs');
+	kAudioDevicePropertyPlayThruVolumeScalar = FourCharCode('mvsc');
+	kAudioDevicePropertyPlayThruVolumeDecibels = FourCharCode('mvdb');
+	kAudioDevicePropertyPlayThruVolumeRangeDecibels = FourCharCode('mvd#');
+	kAudioDevicePropertyPlayThruVolumeScalarToDecibels = FourCharCode('mv2d');
+	kAudioDevicePropertyPlayThruVolumeDecibelsToScalar = FourCharCode('mv2s');
+	kAudioDevicePropertyPlayThruStereoPan = FourCharCode('mspn');
+	kAudioDevicePropertyPlayThruStereoPanChannels = FourCharCode('msp#');
+	kAudioDevicePropertyPlayThruDestination = FourCharCode('mdds');
+	kAudioDevicePropertyPlayThruDestinations = FourCharCode('mdd#');
+	kAudioDevicePropertyPlayThruDestinationNameForIDCFString = FourCharCode('mddc');
+	kAudioDevicePropertyChannelNominalLineLevel = FourCharCode('nlvl');
+	kAudioDevicePropertyChannelNominalLineLevels = FourCharCode('nlv#');
+	kAudioDevicePropertyChannelNominalLineLevelNameForIDCFString = FourCharCode('lcnl');
+	kAudioDevicePropertyDriverShouldOwniSub = FourCharCode('isub');
+	kAudioDevicePropertySubVolumeScalar = FourCharCode('svlm');
+	kAudioDevicePropertySubVolumeDecibels = FourCharCode('svld');
+	kAudioDevicePropertySubVolumeRangeDecibels = FourCharCode('svd#');
+	kAudioDevicePropertySubVolumeScalarToDecibels = FourCharCode('sv2d');
+	kAudioDevicePropertySubVolumeDecibelsToScalar = FourCharCode('sd2v');
+	kAudioDevicePropertySubMute = FourCharCode('smut');
 
 {!
     @enum           AudioDevice Properties That Ought To Some Day Be Deprecated
@@ -1876,28 +1876,28 @@ const
                         better for localization.)
 }
 const
-	kAudioDevicePropertyDeviceName = $6E616D65 (* 'name' *);
+	kAudioDevicePropertyDeviceName = FourCharCode('name');
 	kAudioDevicePropertyDeviceNameCFString = kAudioObjectPropertyName;
-	kAudioDevicePropertyDeviceManufacturer = $6D616B72 (* 'makr' *);
+	kAudioDevicePropertyDeviceManufacturer = FourCharCode('makr');
 	kAudioDevicePropertyDeviceManufacturerCFString = kAudioObjectPropertyManufacturer;
-	kAudioDevicePropertyRegisterBufferList = $72627566 (* 'rbuf' *);
-	kAudioDevicePropertyBufferSize = $6273697A (* 'bsiz' *);
-	kAudioDevicePropertyBufferSizeRange = $62737A23 (* 'bsz#' *);
-	kAudioDevicePropertyChannelName = $63686E6D (* 'chnm' *);
+	kAudioDevicePropertyRegisterBufferList = FourCharCode('rbuf');
+	kAudioDevicePropertyBufferSize = FourCharCode('bsiz');
+	kAudioDevicePropertyBufferSizeRange = FourCharCode('bsz#');
+	kAudioDevicePropertyChannelName = FourCharCode('chnm');
 	kAudioDevicePropertyChannelNameCFString = kAudioObjectPropertyElementName;
-	kAudioDevicePropertyChannelCategoryName = $63636E6D (* 'ccnm' *);
+	kAudioDevicePropertyChannelCategoryName = FourCharCode('ccnm');
 	kAudioDevicePropertyChannelCategoryNameCFString = kAudioObjectPropertyElementCategoryName;
-	kAudioDevicePropertyChannelNumberName = $636E6E6D (* 'cnnm' *);
+	kAudioDevicePropertyChannelNumberName = FourCharCode('cnnm');
 	kAudioDevicePropertyChannelNumberNameCFString = kAudioObjectPropertyElementNumberName;
-	kAudioDevicePropertySupportsMixing = $6D69783F (* 'mix?' *);
-	kAudioDevicePropertyStreamFormat = $73666D74 (* 'sfmt' *);
-	kAudioDevicePropertyStreamFormats = $73666D23 (* 'sfm#' *);
-	kAudioDevicePropertyStreamFormatSupported = $73666D3F (* 'sfm?' *);
-	kAudioDevicePropertyStreamFormatMatch = $73666D6D (* 'sfmm' *);
-	kAudioDevicePropertyDataSourceNameForID = $7373636E (* 'sscn' *);
-	kAudioDevicePropertyClockSourceNameForID = $6373636E (* 'cscn' *);
-	kAudioDevicePropertyPlayThruDestinationNameForID = $6D64646E (* 'mddn' *);
-	kAudioDevicePropertyChannelNominalLineLevelNameForID = $636E6C76 (* 'cnlv' *);
+	kAudioDevicePropertySupportsMixing = FourCharCode('mix?');
+	kAudioDevicePropertyStreamFormat = FourCharCode('sfmt');
+	kAudioDevicePropertyStreamFormats = FourCharCode('sfm#');
+	kAudioDevicePropertyStreamFormatSupported = FourCharCode('sfm?');
+	kAudioDevicePropertyStreamFormatMatch = FourCharCode('sfmm');
+	kAudioDevicePropertyDataSourceNameForID = FourCharCode('sscn');
+	kAudioDevicePropertyClockSourceNameForID = FourCharCode('cscn');
+	kAudioDevicePropertyPlayThruDestinationNameForID = FourCharCode('mddn');
+	kAudioDevicePropertyChannelNominalLineLevelNameForID = FourCharCode('cnlv');
 
 //==================================================================================================
 //#pragma mark    AudioDevice Functions
@@ -2265,7 +2265,7 @@ type
                         The AudioObjectID for a nonexistent AudioObject.
 }
 const
-	kAudioStreamClassID = $61737472 (* 'astr' *);
+	kAudioStreamClassID = FourCharCode('astr');
 	kAudioStreamUnknown = kAudioObjectUnknown;
 
 //==================================================================================================
@@ -2316,14 +2316,14 @@ const
                         transactions.
 }
 const
-	kAudioStreamPropertyDirection = $73646972 (* 'sdir' *);
-	kAudioStreamPropertyTerminalType = $7465726D (* 'term' *);
-	kAudioStreamPropertyStartingChannel = $7363686E (* 'schn' *);
+	kAudioStreamPropertyDirection = FourCharCode('sdir');
+	kAudioStreamPropertyTerminalType = FourCharCode('term');
+	kAudioStreamPropertyStartingChannel = FourCharCode('schn');
 	kAudioStreamPropertyLatency = kAudioDevicePropertyLatency;
-	kAudioStreamPropertyVirtualFormat = $73666D74 (* 'sfmt' *);
-	kAudioStreamPropertyAvailableVirtualFormats = $73666D61 (* 'sfma' *);
-	kAudioStreamPropertyPhysicalFormat = $70667420 (* 'pft ' *);
-	kAudioStreamPropertyAvailablePhysicalFormats = $70667461 (* 'pfta' *);
+	kAudioStreamPropertyVirtualFormat = FourCharCode('sfmt');
+	kAudioStreamPropertyAvailableVirtualFormats = FourCharCode('sfma');
+	kAudioStreamPropertyPhysicalFormat = FourCharCode('pft ');
+	kAudioStreamPropertyAvailablePhysicalFormats = FourCharCode('pfta');
 
 
 {!
@@ -2367,9 +2367,9 @@ const
 }
 const
 	kAudioStreamPropertyOwningDevice = kAudioObjectPropertyOwner;
-	kAudioStreamPropertyPhysicalFormats = $70667423 (* 'pft#' *);
-	kAudioStreamPropertyPhysicalFormatSupported = $7066743F (* 'pft?' *);
-	kAudioStreamPropertyPhysicalFormatMatch = $7066746D (* 'pftm' *);
+	kAudioStreamPropertyPhysicalFormats = FourCharCode('pft#');
+	kAudioStreamPropertyPhysicalFormatSupported = FourCharCode('pft?');
+	kAudioStreamPropertyPhysicalFormatMatch = FourCharCode('pftm');
 
 //==================================================================================================
 //#pragma mark    AudioStream Functions
@@ -2505,9 +2505,9 @@ function AudioStreamRemovePropertyListener( inStream: AudioStreamID; inChannel:
                         automatically generated aggregate devices.
 }
 const
-	kAudioAggregateDeviceClassID = $61616767 (* 'aagg' *);
-	kAudioDeviceTransportTypeAggregate = $67727570 (* 'grup' *);
-	kAudioDeviceTransportTypeAutoAggregate = $66677270 (* 'fgrp' *);
+	kAudioAggregateDeviceClassID = FourCharCode('aagg');
+	kAudioDeviceTransportTypeAggregate = FourCharCode('grup');
+	kAudioDeviceTransportTypeAutoAggregate = FourCharCode('fgrp');
 
 {!
     @defined        kAudioAggregateDeviceUIDKey
@@ -2582,9 +2582,9 @@ const
                         Constants section.
 }
 const
-	kAudioAggregateDevicePropertyFullSubDeviceList = $67727570 (* 'grup' *);
-	kAudioAggregateDevicePropertyActiveSubDeviceList = $61677270 (* 'agrp' *);
-	kAudioAggregateDevicePropertyComposition = $61636F6D (* 'acom' *);
+	kAudioAggregateDevicePropertyFullSubDeviceList = FourCharCode('grup');
+	kAudioAggregateDevicePropertyActiveSubDeviceList = FourCharCode('agrp');
+	kAudioAggregateDevicePropertyComposition = FourCharCode('acom');
 
 {!
     @enum           AudioAggregateDevice Properties Implemented via AudioControl objects
@@ -2600,7 +2600,7 @@ const
                         global scope of the AudioAggregateDevice.
 }
 const
-	kAudioAggregateDevicePropertyMasterSubDevice = $616D7374 (* 'amst' *);
+	kAudioAggregateDevicePropertyMasterSubDevice = FourCharCode('amst');
 
 //==================================================================================================
 //#pragma mark    AudioSubDevice Constants
@@ -2612,7 +2612,7 @@ const
                         The AudioClassID that identifies the AudioSubDevice class.
 }
 const
-	kAudioSubDeviceClassID = $61737562 (* 'asub' *);
+	kAudioSubDeviceClassID = FourCharCode('asub');
 
 {!
     @enum           AudioSubDevice Clock Drift Compensation Methods
@@ -2661,9 +2661,9 @@ const
                         compensation.
 }
 const
-	kAudioSubDevicePropertyExtraLatency = $786C7463 (* 'xltc' *);
-	kAudioSubDevicePropertyDriftCompensation = $64726674 (* 'drft' *);
-	kAudioSubDevicePropertyDriftCompensationQuality = $64726671 (* 'drfq' *);
+	kAudioSubDevicePropertyExtraLatency = FourCharCode('xltc');
+	kAudioSubDevicePropertyDriftCompensation = FourCharCode('drft');
+	kAudioSubDevicePropertyDriftCompensationQuality = FourCharCode('drfq');
 
 //==================================================================================================
 

packages/univint/src/AuthSession.pas

@@ -25,7 +25,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -33,12 +33,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AuthSession;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/Authorization.pas

@@ -25,7 +25,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -33,12 +33,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit Authorization;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/AuthorizationDB.pas

@@ -24,7 +24,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -32,12 +32,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AuthorizationDB;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/AuthorizationTags.pas

@@ -25,7 +25,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -33,12 +33,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit AuthorizationTags;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFArray.pas

@@ -4,7 +4,7 @@
 {       Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFArray;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFAttributedString.pas

@@ -4,7 +4,7 @@
 {       Pascal Translation:  Peter N Lewis, <[email protected]>, August 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFAttributedString;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFBag.pas

@@ -4,7 +4,7 @@
 {       Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFBag;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFBase.pas

@@ -4,7 +4,7 @@
 {       Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFBase;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFBinaryHeap.pas

@@ -4,7 +4,7 @@
 {   Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFBinaryHeap;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFBitVector.pas

@@ -5,7 +5,7 @@
 {       Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -13,12 +13,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFBitVector;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFBundle.pas

@@ -4,7 +4,7 @@
 {       Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFBundle;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFByteOrders.pas

@@ -6,7 +6,7 @@
 {   Pascal Translation Updated:  Jonas Maebe, <[email protected]>, April 2006, February 2008 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -14,12 +14,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFByteOrders;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}
@@ -169,6 +169,7 @@ function CFConvertDoubleSwappedToHost( arg: CFSwappedFloat64 ): Float64; inline;
 
 implementation
 
+
 {$R-}
 
 function CFByteOrderGetCurrent: CFByteOrder; inline;

packages/univint/src/CFCalendar.pas

@@ -4,7 +4,7 @@
 {       Pascal Translation:  Peter N Lewis, <[email protected]>, August 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFCalendar;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFCharacterSet.pas

@@ -4,7 +4,7 @@
 {   Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFCharacterSet;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFData.pas

@@ -4,7 +4,7 @@
 {   Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFData;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFDate.pas

@@ -4,7 +4,7 @@
 {   Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFDate;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFDateFormatter.pas

@@ -5,7 +5,7 @@
 {	  Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -13,12 +13,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFDateFormatter;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFDictionary.pas

@@ -4,7 +4,7 @@
 {   Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFDictionary;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFFTPStream.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFFTPStream;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFHTTPMessage.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFHTTPMessage;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFHTTPStream.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFHTTPStream;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFHost.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFHost;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFLocale.pas

@@ -5,7 +5,7 @@
 {	  Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -13,12 +13,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFLocale;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFMachPort.pas

@@ -5,7 +5,7 @@
 {	  Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -13,12 +13,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFMachPort;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFMessagePort.pas

@@ -5,7 +5,7 @@
 {	  Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -13,12 +13,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFMessagePort;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFNetServices.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFNetServices;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFNotificationCenter.pas

@@ -5,7 +5,7 @@
 {	  Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -13,12 +13,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFNotificationCenter;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFNumber.pas

@@ -4,7 +4,7 @@
 {   Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFNumber;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFNumberFormatter.pas

@@ -5,7 +5,7 @@
 {   Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -13,12 +13,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFNumberFormatter;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFPlugIn.pas

@@ -4,7 +4,7 @@
 {   Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFPlugIn;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFPlugInCOM.pas

@@ -4,7 +4,7 @@
 {   Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFPlugInCOM;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFPreferences.pas

@@ -4,7 +4,7 @@
 {   Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFPreferences;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFPropertyList.pas

@@ -4,7 +4,7 @@
 {   Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFPropertyList;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFRunLoop.pas

@@ -4,7 +4,7 @@
 {   Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFRunLoop;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFSet.pas

@@ -4,7 +4,7 @@
 {   Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFSet;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFSocket.pas

@@ -5,7 +5,7 @@
 {   Pascal Translation Updated:  Peter N Lewis, <[email protected]>, September 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -13,12 +13,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFSocket;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFSocketStream.pas

@@ -18,7 +18,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -26,12 +26,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFSocketStream;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFStream.pas

@@ -5,7 +5,7 @@
 {	  Pascal Translation Updated:  Peter N Lewis, <[email protected]>, November 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -13,12 +13,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFStream;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFString.pas

@@ -4,7 +4,7 @@
 {	  Pascal Translation Updated:  Peter N Lewis, <[email protected]>, November 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFString;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFStringEncodingExt.pas

@@ -4,7 +4,7 @@
 {	  Pascal Translation Updated:  Peter N Lewis, <[email protected]>, November 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFStringEncodingExt;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFTimeZone.pas

@@ -4,7 +4,7 @@
 {	  Pascal Translation Updated:  Peter N Lewis, <[email protected]>, November 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFTimeZone;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFTree.pas

@@ -4,7 +4,7 @@
 {	  Pascal Translation Updated:  Peter N Lewis, <[email protected]>, November 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFTree;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFURL.pas

@@ -4,7 +4,7 @@
 {	  Pascal Translation Updated:  Peter N Lewis, <[email protected]>, November 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFURL;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFURLAccess.pas

@@ -4,7 +4,7 @@
 {	  Pascal Translation Updated:  Peter N Lewis, <[email protected]>, November 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFURLAccess;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFUUID.pas

@@ -4,7 +4,7 @@
 {	  Pascal Translation Updated:  Peter N Lewis, <[email protected]>, November 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFUUID;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFUserNotification.pas

@@ -5,7 +5,7 @@
 {	  Pascal Translation Updated:  Peter N Lewis, <[email protected]>, November 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -13,12 +13,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFUserNotification;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFXMLNode.pas

@@ -4,7 +4,7 @@
 {	  Pascal Translation Updated:  Peter N Lewis, <[email protected]>, November 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFXMLNode;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CFXMLParser.pas

@@ -4,7 +4,7 @@
 {	  Pascal Translation Updated:  Peter N Lewis, <[email protected]>, November 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CFXMLParser;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CGAffineTransforms.pas

@@ -5,7 +5,7 @@
 {       Pascal Translation Updated:  Peter N Lewis, <[email protected]>, August 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -13,12 +13,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CGAffineTransforms;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CGBase.pas

@@ -5,7 +5,7 @@
 {       Pascal Translation Updated:  Peter N Lewis, <[email protected]>, August 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -13,12 +13,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CGBase;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CGBitmapContext.pas

@@ -4,7 +4,7 @@
  }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -12,12 +12,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CGBitmapContext;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CGColor.pas

@@ -5,7 +5,7 @@
 {       Pascal Translation:  Peter N Lewis, <[email protected]>, August 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -13,12 +13,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CGColor;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CGColorSpace.pas

@@ -7,7 +7,7 @@
 
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -15,12 +15,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CGColorSpace;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}

packages/univint/src/CGContext.pas

@@ -5,7 +5,7 @@
 {       Pascal Translation Updated:  Peter N Lewis, <[email protected]>, August 2005 }
 {
     Modified for use with Free Pascal
-    Version 200
+    Version 210
     Please report any bugs to <[email protected]>
 }
 
@@ -13,12 +13,12 @@
 {$packenum 1}
 {$macro on}
 {$inline on}
-{$CALLING MWPASCAL}
+{$calling mwpascal}
 
 unit CGContext;
 interface
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
-{$setc GAP_INTERFACES_VERSION := $0200}
+{$setc GAP_INTERFACES_VERSION := $0210}
 
 {$ifc not defined USE_CFSTR_CONSTANT_MACROS}
     {$setc USE_CFSTR_CONSTANT_MACROS := TRUE}