deleted:    object.cpp
	deleted:    object.h
	modified:   window.cpp