The language by which we refer to firearms is important to establish mindset. A weapon is anything used with the intent to inflict damage. A firearm is simply the machine itself. Neutral.
Shoeless, not to pick on you, and I understand the reasoning behind using certain language under certain circumstances to create a mind set but regardless of word usage, a rose is a rose.
By your defined wording, there is really no such thing as a weapon unless it is in the act of causing harm or destruction to something else. A gun, baseball bat, USMC knife, sword, throwing star etc... not weapons. They aren't weaspons when they're being carried for self defense, they aren't weapons when you are training with them in case you need to use them for self defense, and if you
do use them to cause damage, then after the damage is done, they once again cease being weapons. This is the extreme limit of being PC.
A submarine launched missile capable of deploying 6 seperate tactical nuclear warheads is not a weapon. It isn't designed as such and after one levels six small cities, it was not a weapon. Sounds kinda silly when you up the ante, doesn't it?
Since we're all playing semantics here, it's still all about original intent. A Maxim gun is a weapon. A military Colt 1911A1 made in 1943 is a weapon. A M4 carbine is a weapon. A Glock 23 is a weapon. An single shot Anzchutz 22 is not a weapon, a 1,000 air pistol isn't a weapon. Most SVI open class pistols aren't weapons. A O/U shotgun for sporting clays isn't a weapon. (Actually, in a strict sense, these last four examples are still weapons. To be used against paper, steel and clay.)
If, when the firearm was designed and built, it was designed and built for hunting, self defense or military use, it is a weapon as clearly defined in most any dictionary. If it was designed for shooting paper, it isn't a weapon against humans or animals in either the most traditional or modern sense.
I just don't see you anyone can rationalize a handgun, carried on one's person, loaded with bullets designed to inflict the maximum amount damage against soft tissue is not a weapon. Drill instructors and NRA trainers aside, to the common person, it is absolutely a weapon. Before, during and after it's intended use.