更新强制类型转换

最新版-暂时无bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	DFDEditor2/DFDEditor2/DFDEditor2/DiagramEditor.cpp
	DFDEditor2/DFDEditor2/DFDEditor2/Element.h