Fixing GCC Wreorder warnings (#1750)

DhairyaBahl · web-flow · commit 0576fa82b922 · 2020-10-15T14:45:39.000+07:00
Fixing Wreorder warnings
Update vectorizersettings.cpp
Update state_bone.cpp
diff --git a/synfig-studio/src/gui/dialogs/vectorizersettings.cpp b/synfig-studio/src/gui/dialogs/vectorizersettings.cpp
@@ -55,18 +55,14 @@ using namespace studio;
 
 VectorizerSettings::VectorizerSettings(Gtk::Window& parent,etl::handle<synfig::Layer_Bitmap> my_layer_bitmap,
  etl::handle<studio::Instance> selected_instance,std::unordered_map <std::string,int>& configmap, etl::handle<synfig::Layer> reference_layer):
-	Gtk::Dialog(_("Convert-to-Vector Settings"),parent),
-	layer_bitmap_(my_layer_bitmap),
-	reference_layer_(reference_layer),
-	instance(selected_instance),
-	adjustment_threshold(Gtk::Adjustment::create(configmap["threshold"],1,10)),
-	entry_threshold(adjustment_threshold,1,0),
 	adjustment_accuracy(Gtk::Adjustment::create(configmap["accuracy"],1,10)),
 	entry_accuracy(adjustment_accuracy,1,0),
-	adjustment_despeckling(Gtk::Adjustment::create(configmap["despeckling"],0,500)),
-	entry_despeckling(adjustment_despeckling,1,0),
 	adjustment_accuracy2(Gtk::Adjustment::create(5,1,10)),
 	entry_accuracy2(adjustment_accuracy2,1,0),
+	adjustment_threshold(Gtk::Adjustment::create(configmap["threshold"],1,10)),
+	entry_threshold(adjustment_threshold,1,0),
+	adjustment_despeckling(Gtk::Adjustment::create(configmap["despeckling"],0,500)),
+	entry_despeckling(adjustment_despeckling,1,0),
 	adjustment_despeckling2(Gtk::Adjustment::create(3,0,500)),
 	entry_despeckling2(adjustment_despeckling2,1,0),
 	adjustment_maxthickness(Gtk::Adjustment::create(configmap["maxthickness"],0,500)),
@@ -76,7 +72,12 @@ VectorizerSettings::VectorizerSettings(Gtk::Window& parent,etl::handle<synfig::L
 	adjustment_adherence(Gtk::Adjustment::create(100,1,100)),
 	entry_adherence(adjustment_adherence,1,0),
 	adjustment_angle(Gtk::Adjustment::create(100,1,100)),
-	entry_angle(adjustment_angle,1,0)
+	entry_angle(adjustment_angle,1,0),
+	Gtk::Dialog(_("Convert-to-Vector Settings"),parent),
+	layer_bitmap_(my_layer_bitmap),
+	instance(selected_instance),
+	reference_layer_(reference_layer)
+	
 {
 	//Centerline and Outline option in the comboboxtext
 	// comboboxtext_mode.append(_("Centerline"));
diff --git a/synfig-studio/src/gui/states/state_bone.cpp b/synfig-studio/src/gui/states/state_bone.cpp
@@ -350,12 +350,13 @@ StateBone_Context::StateBone_Context(CanvasView *canvas_view) :
 	prev_table_status(false),
 	prev_workarea_layer_status_(get_work_area()->get_allow_layer_clicks()),
 	//depth(-1),
-	settings(synfigapp::Main::get_selected_input_device()->settings()),
 	active_bone(change_active_bone(get_work_area()->get_active_bone_value_node())),
-	radiobutton_skel(radiogroup,_("Skeleton Layer")),
-	radiobutton_skel_deform(radiogroup,_("Skeleton Deform Layer")),
 	c_layer(0),
-	drawing(false)
+	drawing(false),
+	settings(synfigapp::Main::get_selected_input_device()->settings()),
+	radiobutton_skel(radiogroup,_("Skeleton Layer")),
+	radiobutton_skel_deform(radiogroup,_("Skeleton Deform Layer"))
+	
 {
 	egress_on_selection_change=true;
 
diff --git a/synfig-studio/src/gui/workarea.cpp b/synfig-studio/src/gui/workarea.cpp
@@ -145,6 +145,8 @@ WorkArea::WorkArea(etl::loose_handle<synfigapp::CanvasInterface> canvas_interfac
 	last_event_time(0),
 	progresscallback(0),
 	drag_mode(DRAG_NONE),
+	active_bone_(0),
+	highlight_active_bone(false),
 	show_grid(false),
 	show_guides(true),
 	background_size(15,15),
@@ -158,7 +160,6 @@ WorkArea::WorkArea(etl::loose_handle<synfigapp::CanvasInterface> canvas_interfac
 	dirty_trap_count(0),
 	dirty_trap_queued(0),
 	onion_skin(false),
-	highlight_active_bone(false),
 	background_rendering(false),
 	allow_duck_clicks(true),
 	allow_bezier_clicks(true),
@@ -168,8 +169,7 @@ WorkArea::WorkArea(etl::loose_handle<synfigapp::CanvasInterface> canvas_interfac
 	timecode_width(0),
 	timecode_height(0),
 	bonesetup_width(0),
-	bonesetup_height(0),
-	active_bone_(0)
+	bonesetup_height(0)
 {
 	// default onion
 	onion_skins[0] = 1;
diff --git a/synfig-studio/src/synfigapp/actions/valuedesccreatechildbone.cpp b/synfig-studio/src/synfigapp/actions/valuedesccreatechildbone.cpp
@@ -68,11 +68,11 @@ ACTION_SET_CVS_ID(Action::ValueDescCreateChildBone,"$Id$");
 Action::ValueDescCreateChildBone::ValueDescCreateChildBone():
 	time(0),
 	origin(ValueBase(Point(1.1,0))),
-	scalelx(ValueBase(1.0)),
 	angle(Angle::rad(0)),
-	c_parent(false),
+	scalelx(ValueBase(1.0)),
 	width(0.1),
 	tipwidth(0.1),
+	c_parent(false),
 	c_active_bone(false)
 {
 }

Original file line number	Diff line number	Diff line change
`@@ -68,11 +68,11 @@ ACTION_SET_CVS_ID(Action::ValueDescCreateChildBone,"$Id$");`
`68`	`68`	`Action::ValueDescCreateChildBone::ValueDescCreateChildBone():`
`69`	`69`	`time(0),`
`70`	`70`	`origin(ValueBase(Point(1.1,0))),`
`71`		`- scalelx(ValueBase(1.0)),`
`72`	`71`	`angle(Angle::rad(0)),`
`73`		`- c_parent(false),`
	`72`	`+ scalelx(ValueBase(1.0)),`
`74`	`73`	`width(0.1),`
`75`	`74`	`tipwidth(0.1),`
	`75`	`+ c_parent(false),`
`76`	`76`	`c_active_bone(false)`
`77`	`77`	`{`
`78`	`78`	`}`