[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 857
Date       : Fri Apr 21 23:48:05 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/sgallery.cpp
   M /Trunk/XaraLX/Kernel/sgallery.h

Fixed naming conflict with name gallery over SetName() / GetName()


Diff:
Index: Trunk/XaraLX/Kernel/sgallery.cpp
===================================================================
--- Trunk/XaraLX/Kernel/sgallery.cpp	(revision 856)
+++ Trunk/XaraLX/Kernel/sgallery.cpp	(revision 857)
@@ -421,7 +421,7 @@
 			case DIM_CREATE:
 				{
 					String_32 name(CamResource::GetObjectName(DlgResID));
-					SetName(name);
+					SetGalName(name);
 				}
 				break;
 
@@ -2647,7 +2647,7 @@
 
 BOOL SuperGallery::InitMenuCommand(StringBase *CommandID, UINT32 MenuTextID)
 {
-	String_256 OpToken = GetName();
+	String_256 OpToken = GetGalName();
 	// With the new GIF Animation frame gallery, this can mean that the OpToken can easily
 	// overrun its String_32 allocation. Therefore, restrict the name to the first 16 characters.
 	// Unfortunately, we then use the name to find the gallery to send the command to!
@@ -2690,7 +2690,7 @@
 BOOL SuperGallery::AddCommand(GalleryContextMenu *TheMenu, StringBase *CommandID, BOOL Separator,
 							  MenuItem* pRootMenu)
 {
-	String_256 OpToken = GetName();
+	String_256 OpToken = GetGalName();
 	// With the new GIF Animation frame gallery, this can mean that the OpToken can easily
 	// overrun its String_32 allocation. Therefore, restrict the name to the first 16 characters.
 	// Unfortunately, we then use the name to find the gallery to send the command to!
Index: Trunk/XaraLX/Kernel/sgallery.h
===================================================================
--- Trunk/XaraLX/Kernel/sgallery.h	(revision 856)
+++ Trunk/XaraLX/Kernel/sgallery.h	(revision 857)
@@ -644,8 +644,8 @@
 	static SuperGallery*		FindSuperGallery(String_32& SuperGalleryName, INT32 limit = -1);
 
 	String_32		Name;
-	String_32&		GetName()								{ return Name; }
-	void			SetName(const String_32& str)			{ Name = str; }
+	String_32&		GetGalName()							{ return Name; }
+	void			SetGalName(const String_32& str)		{ Name = str; }
 
 };
 


Xara