[adobe-source-commits] sandbox/adobe-source/adobe/test/visual/sources client_assembler.cpp,1.10,1.11

[Tobias S. <t_s...@us...>]

Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19710/adobe-source/adobe/test/visual/sources

Modified Files:
	client_assembler.cpp 
Log Message:
Silences some GCC warnings (initialization order of member fields, signed/unsigned comparison)

Index: client_assembler.cpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources/client_assembler.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** client_assembler.cpp	15 Apr 2005 23:22:43 -0000	1.10
--- client_assembler.cpp	20 Apr 2005 07:57:22 -0000	1.11
***************
*** 253,262 ****
  	mac_token_t(adobe::sheet_t& sheet, adobe::eve_t& layout, adobe::assemblage_t& slave, eve_client::eve_client_holder& holder, const eve_client::button_notifier_t& notifier, size_enum_t dialog_size) :
  		assemblage_m(slave),
  		sheet_m(sheet),
  		layout_m(layout),
  		holder_m(holder),
  		notifier_m(notifier),
! 		dialog_size_m(dialog_size),
! 		root_m(0)
  	{ }
  
--- 253,262 ----
  	mac_token_t(adobe::sheet_t& sheet, adobe::eve_t& layout, adobe::assemblage_t& slave, eve_client::eve_client_holder& holder, const eve_client::button_notifier_t& notifier, size_enum_t dialog_size) :
  		assemblage_m(slave),
+ 		root_m(0),
  		sheet_m(sheet),
  		layout_m(layout),
  		holder_m(holder),
  		notifier_m(notifier),
! 		dialog_size_m(dialog_size)
  	{ }
  
***************
*** 264,269 ****
  	adobe::window_t*				root_m;
  	adobe::sheet_t&					sheet_m;
- 	eve_client::eve_client_holder&	holder_m;
  	adobe::eve_t&					layout_m;
  	eve_client::button_notifier_t	notifier_m;
  	size_enum_t						dialog_size_m;
--- 264,269 ----
  	adobe::window_t*				root_m;
  	adobe::sheet_t&					sheet_m;
  	adobe::eve_t&					layout_m;
+ 	eve_client::eve_client_holder&	holder_m;
  	eve_client::button_notifier_t	notifier_m;
  	size_enum_t						dialog_size_m;
***************
*** 325,329 ****
  	bool				metal_m;
  	bool				inited_m;
! 	adobe::name_t			target_m;
  };
  
--- 325,329 ----
  	bool				metal_m;
  	bool				inited_m;
! 	adobe::name_t		target_m;
  };
  
***************
*** 509,518 ****
  	
  		std::string			name_m;
- 		adobe::name_t		modifiers_m;
- 		adobe::name_t 		action_m;
  		adobe::name_t		bind_m;
  		adobe::name_t 		bind_output_m;
  	 	adobe::value_t		value_m;
  	 	adobe::dictionary_t	contributing_m;
  	};
  
--- 509,518 ----
  	
  		std::string			name_m;
  		adobe::name_t		bind_m;
  		adobe::name_t 		bind_output_m;
+ 		adobe::name_t 		action_m;
  	 	adobe::value_t		value_m;
  	 	adobe::dictionary_t	contributing_m;
+ 		adobe::name_t		modifiers_m;
  	};
  
***************
*** 750,755 ****
   	void control_value(std::size_t new_value);
  
-  	std::size_t					last_m; // Used to debounce
   	double						value_m;
   	adobe::slider_t				control_m;
   	format_t					format_m;
--- 750,755 ----
   	void control_value(std::size_t new_value);
  
   	double						value_m;
+  	std::size_t					last_m; // Used to debounce
   	adobe::slider_t				control_m;
   	format_t					format_m;
***************
*** 1558,1564 ****
  	client_proxy_t(parameters),
  	characters_m(edit_text_characters),
  	value_ref_m(0),
! 	edit_active_ref_m(0),
! 	num_lines_m(1)
  {
  	bool monospaced(false);
--- 1558,1564 ----
  	client_proxy_t(parameters),
  	characters_m(edit_text_characters),
+ 	num_lines_m(1),
  	value_ref_m(0),
! 	edit_active_ref_m(0)
  {
  	bool monospaced(false);
***************
*** 1796,1804 ****
  	popup_adjust_m(0),
  #endif
  	value_ref_m(0),
  	edit_active_ref_m(0),
! 	static_active_ref_m(0),
! 	go_static_m(false),
! 	monospaced_m(false)
  {
  	std::string format("#.00");
--- 1796,1804 ----
  	popup_adjust_m(0),
  #endif
+ 	monospaced_m(false),
+ 	go_static_m(false),
  	value_ref_m(0),
  	edit_active_ref_m(0),
! 	static_active_ref_m(0)
  {
  	std::string format("#.00");
***************
*** 1924,1928 ****
  std::size_t edit_number_proxy_t::popup_index()
  {
! 	for (long value(0); value < units_m.size(); ++value)
  		if (units_m[value] == unit_value_m) return value;
  
--- 1924,1928 ----
  std::size_t edit_number_proxy_t::popup_index()
  {
! 	for (std::size_t value(0); value < units_m.size(); ++value)
  		if (units_m[value] == unit_value_m) return value;
  
***************
*** 2319,2323 ****
  	if (show_value_m.type() == typeid(adobe::empty_t))
  	{
! 		if (tab_parent && tab_parent->panel_index_m < tab_parent->items_m.size())
  			show_value_m = tab_parent->items_m[tab_parent->panel_index_m++].get<adobe::dictionary_t>()[key_value];
  	}
--- 2319,2323 ----
  	if (show_value_m.type() == typeid(adobe::empty_t))
  	{
! 		if (tab_parent && std::size_t(tab_parent->panel_index_m) < tab_parent->items_m.size())
  			show_value_m = tab_parent->items_m[tab_parent->panel_index_m++].get<adobe::dictionary_t>()[key_value];
  	}
***************
*** 2829,2836 ****
  								client_proxy_t*) :
  	client_proxy_t(parameters),
  	grow_m(false),
  	metal_m(false),
! 	inited_m(false),
! 	layout_m(NULL)
  {
  	parameters.get<adobe::name_t>(key_target, target_m);
--- 2829,2836 ----
  								client_proxy_t*) :
  	client_proxy_t(parameters),
+ 	layout_m(NULL),
  	grow_m(false),
  	metal_m(false),
! 	inited_m(false)
  {
  	parameters.get<adobe::name_t>(key_target, target_m);
***************
*** 3176,3181 ****
  
  window_server_t::window_server_t(const char* directory_path, adobe::sheet_t& sheet) :
! 	directory_path_m(directory_path),
! 	sheet_m(sheet)
  { }
  
--- 3176,3181 ----
  
  window_server_t::window_server_t(const char* directory_path, adobe::sheet_t& sheet) :
! 	sheet_m(sheet),
! 	directory_path_m(directory_path)
  { }