small cleanups (move var definition to initialization, remove unused vars)
small cleanups (move var definition to initialization, remove unused vars)

svn path=/trunk/kdepim/; revision=208181

lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi