Some minor cleanups

I have a few minor cleanups in my work tree:

1) Minor simplification/cleanup to counting max # of categories in
cell geometry (inline the static function, basically; the compiler
doesn't quite seem to do it).

2) Mionr rearrangement of hasChanges() in the annotation dialog code
to do the fast checks first and skip the slow ones.  Also removed the
checkOptions argument to hasChanges, because it was only passed in as
other that the default in a way that resulted in that code never being
used.

3) Typedef the ImageDB map data types, so there aren't a bunch of
files all having to explicitly use the template forms.  I also want to
change those to QHash rather than QMap, because I don't beieve any of
them rely on the ordering and a QHash appears to be marginally faster
in my test case.  Regardless of whether we decide to do that, I
believe those data types should all be typedef'd.

-- 
Robert Krawitz                                     <rlk-FrUbXkNCsVf2fBVCVOL8/[email protected]>

***  MIT Engineers   A Proud Tradition   http://mitathletics.com  ***
Member of the League for Programming Freedom  --  http://ProgFree.org
Project lead for Gutenprint   --    http://gimp-print.sourceforge.net

"Linux doesn't dictate how I work, I dictate how Linux works."
--Eric Crampton