Had to rename some reserved words in (maybe objc++ but possibly macros to do...

Had to rename some reserved words in (maybe objc++ but possibly macros to do with xcode?) IQ3Shader::id to ID, string::verify to validate.
Put casts back into OSX driver

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2215 dfc29bdd-3216-0410-991c-e03cc46cb475

include/IQ3Shader.h

@@ -637,12 +637,12 @@ namespace quake3
 	struct IShader
 	{
 		IShader ()
-			: id ( 0 ), VarGroup ( 0 )  {}
+			: ID ( 0 ), VarGroup ( 0 )  {}
 		virtual ~IShader () {}
 
 		void operator = (const IShader &other )
 		{
-			id = other.id;
+			ID = other.ID;
 			VarGroup = other.VarGroup;
 			name = other.name;
 		}
@@ -675,7 +675,7 @@ namespace quake3
 		}
 
 		// id
-		s32 id;
+		s32 ID;
 		SVarGroupList *VarGroup; // reference
 
 		// Shader: shader name ( also first variable in first Vargroup )

include/coreutil.h

@@ -131,7 +131,7 @@ inline core::string<c16>& deletePathFromPath(core::string<c16>& filename, s32 pa
 	if ( i )
 	{
 		filename [ i + 1 ] = 0;
-		filename.verify();
+		filename.validate();
 	}
 	return filename;
 }

include/irrString.h

@@ -917,7 +917,7 @@ public:
 	}
 
 	//! verify the existing string.
-	void verify()
+	void validate()
 	{
 		// terminate on existing null
 		for (u32 i=0; i<allocated; ++i)

source/Irrlicht/CFileSystem.cpp

@@ -268,7 +268,7 @@ const core::string<c16>& CFileSystem::getWorkingDirectory()
 			#endif		
 		#endif
 
-		WorkingDirectory [ type ].verify();
+		WorkingDirectory [ type ].validate();
 	}
 
 	return WorkingDirectory [ type ];

source/Irrlicht/CQ3LevelMesh.cpp

@@ -369,7 +369,7 @@ void CQ3LevelMesh::loadFogs(tBSPLump* l, io::IReadFile* file)
 
 		shader = getShader( fog.shader );
 		t.Texture = 0;
-		t.ShaderID = shader ? shader->id : -1;
+		t.ShaderID = shader ? shader->ID : -1;
 
 		FogMap.push_back ( t );
 	}
@@ -1536,7 +1536,7 @@ void CQ3LevelMesh::InitShader()
 	element.VarGroup->VariableGroup.push_back( group );
 	element.VarGroup->VariableGroup.push_back( SVarGroup() );
 	element.name = element.VarGroup->VariableGroup[0].Variable[0].name;
-	element.id = Shader.size();
+	element.ID = Shader.size();
 	Shader.push_back( element );
 
 	if ( LoadParam.loadAllShaders )
@@ -1621,7 +1621,7 @@ void CQ3LevelMesh::scriptcallback_config( SVarGroupList *& grouplist, eToken tok
 
 	grouplist->grab();
 	element.VarGroup = grouplist;
-	element.id = Entity.size();
+	element.ID = Entity.size();
 	Entity.push_back( element );
 }
 
@@ -1636,7 +1636,7 @@ void CQ3LevelMesh::scriptcallback_entity( SVarGroupList *& grouplist, eToken tok
 
 	IEntity element;
 	element.VarGroup = grouplist;
-	element.id = Entity.size();
+	element.ID = Entity.size();
 	element.name = grouplist->VariableGroup[1].get( "classname" );
 
 
@@ -1656,7 +1656,7 @@ void CQ3LevelMesh::scriptcallback_shader( SVarGroupList *& grouplist,eToken toke
 	grouplist->grab();
 	element.VarGroup = grouplist;
 	element.name = element.VarGroup->VariableGroup[0].Variable[0].name;
-	element.id = Shader.size();
+	element.ID = Shader.size();
 /*
 	core::stringc s;
 	dumpShader ( s, &element );
@@ -1892,7 +1892,7 @@ void CQ3LevelMesh::loadTextures()
 		shader = getShader( Textures[t].strName, false);
 		if ( shader )
 		{
-			Tex[t].ShaderID = shader->id;
+			Tex[t].ShaderID = shader->ID;
 
 			// if texture name == stage1 Texture map
 			const SVarGroup * group;

source/Irrlicht/MacOSX/CIrrDeviceMacOSX.h

@@ -83,7 +83,7 @@ namespace irr
 		{
 		public:
 
-			CCursorControl(const core::dimension2d<s32>& wsize, CIrrDeviceMacOSX *device) : WindowSize(wsize), IsVisible(true), InvWindowSize(0.0f, 0.0f), _device(device), UseReferenceRect(false)
+			CCursorControl(const core::dimension2d<u32>& wsize, CIrrDeviceMacOSX *device) : WindowSize(wsize), IsVisible(true), InvWindowSize(0.0f, 0.0f), _device(device), UseReferenceRect(false)
 			{
 				CursorPos.X = CursorPos.Y = 0;
 				if (WindowSize.Width!=0) InvWindowSize.Width = 1.0f / WindowSize.Width;

source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm

@@ -432,30 +432,31 @@ bool CIrrDeviceMacOSX::createWindow()
 	_screenWidth = (int) CGDisplayPixelsWide(display);
 	_screenHeight = (int) CGDisplayPixelsHigh(display);
 	
-	VideoModeList.setDesktop(CreationParams.Bits,core::dimension2d<s32>(_screenWidth, _screenHeight));
+	VideoModeList.setDesktop(CreationParams.Bits, core::dimension2d<u32>(_screenWidth, _screenHeight));
 
 	if (!CreationParams.Fullscreen)
 	{
 		_window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,CreationParams.WindowSize.Width,CreationParams.WindowSize.Height) styleMask:NSTitledWindowMask+NSClosableWindowMask+NSResizableWindowMask backing:NSBackingStoreBuffered defer:FALSE];
 		if (_window != NULL)
 		{
-			NSOpenGLPixelFormatAttribute windowattribs[] = {
+			NSOpenGLPixelFormatAttribute windowattribs[] = 
+			{
 					NSOpenGLPFANoRecovery,
 					NSOpenGLPFAAccelerated,
-					NSOpenGLPFADepthSize, depthSize,
-					NSOpenGLPFAColorSize, CreationParams.Bits,
-					NSOpenGLPFAAlphaSize, alphaSize,
-					NSOpenGLPFASampleBuffers, 1,
-					NSOpenGLPFASamples, CreationParams.AntiAlias,
-					NSOpenGLPFAStencilSize, CreationParams.Stencilbuffer?1:0,
+					NSOpenGLPFADepthSize, (NSOpenGLPixelFormatAttribute)depthSize,
+					NSOpenGLPFAColorSize, (NSOpenGLPixelFormatAttribute)CreationParams.Bits,
+					NSOpenGLPFAAlphaSize, (NSOpenGLPixelFormatAttribute)alphaSize,
+					NSOpenGLPFASampleBuffers, (NSOpenGLPixelFormatAttribute)1,
+					NSOpenGLPFASamples, (NSOpenGLPixelFormatAttribute)CreationParams.AntiAlias,
+					NSOpenGLPFAStencilSize, (NSOpenGLPixelFormatAttribute)(CreationParams.Stencilbuffer?1:0),
 					NSOpenGLPFADoubleBuffer,
 					(NSOpenGLPixelFormatAttribute)nil
 			};
 
 			if (CreationParams.AntiAlias<2)
 			{
-				windowattribs[9] = 0;
-				windowattribs[11] = 0;
+				windowattribs[9] = (NSOpenGLPixelFormatAttribute)0;
+				windowattribs[11] = (NSOpenGLPixelFormatAttribute)0;
 			}
 
 			NSOpenGLPixelFormat *format;
@@ -466,7 +467,7 @@ bool CIrrDeviceMacOSX::createWindow()
 					// Second try without stencilbuffer
 					if (CreationParams.Stencilbuffer)
 					{
-						windowattribs[13]=0;
+						windowattribs[13]=(NSOpenGLPixelFormatAttribute)0;
 					}
 					else
 						continue;
@@ -485,19 +486,19 @@ bool CIrrDeviceMacOSX::createWindow()
 					{
 						while (!format && windowattribs[12]>1)
 						{
-							windowattribs -= 1;
+							windowattribs[12] = (NSOpenGLPixelFormatAttribute)((int)windowattribs[12]-1);
 							format = [[NSOpenGLPixelFormat alloc] initWithAttributes:windowattribs];
 						}
 						if (!format)
 						{
-							windowattribs[9] = 0;
-							windowattribs[11] = 0;
+							windowattribs[9] = (NSOpenGLPixelFormatAttribute)0;
+							windowattribs[11] = (NSOpenGLPixelFormatAttribute)0;
 							format = [[NSOpenGLPixelFormat alloc] initWithAttributes:windowattribs];
 							if (!format)
 							{
 								// reset values for next try
-								windowattribs[9] = 1;
-								windowattribs[11] = CreationParams.AntiAlias;
+								windowattribs[9] = (NSOpenGLPixelFormatAttribute)1;
+								windowattribs[11] = (NSOpenGLPixelFormatAttribute)CreationParams.AntiAlias;
 							}
 							else
 							{
@@ -626,7 +627,7 @@ void CIrrDeviceMacOSX::setResize(int width, int height)
 	
 	// resize the driver to the inner pane size
 	NSRect driverFrame = [(NSWindow*)_window contentRectForFrameRect:[(NSWindow*)_window frame]];
-	getVideoDriver()->OnResize(core::dimension2d<s32>( (s32)driverFrame.size.width, (s32)driverFrame.size.height));
+	getVideoDriver()->OnResize(core::dimension2d<u32>( (s32)driverFrame.size.width, (s32)driverFrame.size.height));
 }
 
 void CIrrDeviceMacOSX::createDriver()
@@ -1308,7 +1309,7 @@ video::IVideoModeList* CIrrDeviceMacOSX::getVideoModeList()
 			long width = GetDictionaryLong(mode, kCGDisplayWidth);
 			long height = GetDictionaryLong(mode, kCGDisplayHeight);
 			// long refresh = GetDictionaryLong((mode), kCGDisplayRefreshRate);
-			VideoModeList.addMode(core::dimension2d<s32>(width, height),
+			VideoModeList.addMode(core::dimension2d<u32>(width, height),
 				bitsPerPixel);
 		}
 	}