That USB type-C strategy is for a laptop that is thinner than the Macbook Air. I don't think they will pull that trick for the normal Macbook Pro.
If you ask whether they'll keep regular USB or thunderbolt, perhaps but just for a few releases more. E.g. both could be gone by 2018.
That said, MPB will of course have > 1 USB C ports.