I am not sure that this matters a great deal but perhaps someone can answer these questions and settle an argument?

When the current Queen dies, would Prince William still become King if his father, Prince Charles had died and never became King himself?

If Prince Charles had died before the Queen - would his brother Prince Andrew become King on her death?