QUAD: changed type to enum class, containing S and Q so far

How about `Uniform` instead of `uniform`?  Otherwise looks good.