> I haven't changed maps to hashes at this time, but it's worth > considering. It definitely is, in each and every case the ordering doesn't matter (at least imho). Same for the Q_FOREACH removal I wanted to do recently. Tell me when your stuff is merged, so that I can redo it. Nice, the codebase gets cleaner and cleaner :-)