Remove the last reimp markers remaining

After 28754fa2d95e changed Q_DECL_OVERRIDE to override, we might as
well touch the code again to format it properly and remove the reimp
marker comments, which are not needed anymore with proper override
keywords.