kdenonbeta/empath empath_logo.png,1.1,1.2 Author: rikkus CVSROOT: /home/kde Tue Nov 30 22:48:52 MET 1999 Update of /home/kde/kdenonbeta/empath In directory zeus:/tmp/cvs-serv5050 Modified Files: empath_logo.png Log Message: *** WARNING TO TESTERS *** The index format has changed. rm -rf ~/.kde/share/apps/empath before using. ************************** Today I noticed for the first time what happens if two developers hack a large portion of the same file. I know diff is intelligent, but it's too intelligent for me. No way could I figure out how to resolve those conflicts. I think diff screwed up. Two methods had been removed from header but the source file still included them. Anyway, the solution seems to be to copy your own version, remove the old, cvs up and edit :) Changes: EmpathIndex and RDatabase now use QString rather than QCString for keys. This makes things simpler and faster. No QString::utf8() ( or latin1() or whatever). EmpathIndexRecord is now passed around by value. It's trivial to copy it so we might as well. The memory handling was a pain. I think doing this has plugged some leaks. The memory usage from /proc//stat appears to have dropped a little. Speedups - no setting the status of a record to what it already is (and updating the bloody index on disk !) - now using setStatusPixmap() in EmpathMessageListWidget. Logo fixed slightly. Still needs to be replaced with something, er, artistic. Wilco: You're as bad as me with your if .. else braces: if (something) for () { // A page worth of code } else for () { // Another page worth of code } Hehe, I _like_ it like this.. I'm looking forward to screams from anyone else looking at it though ;)