Change qvector to std::vector, add border drawing