Expand functions and fix type in connect.
Expand functions and fix type in connect.

Change-Id: I50acaf92b711e7d2c5b310924d4b0a0ebd778091
Reviewed-by: Tim Jenssen <6a21f175c697b4129e1bafb6e9b52078bb1a6738@nokia.com>
Reviewed-by: Karsten Heimrich <81d67632fe4bf9afb88a400b41aa25e19a1d2a12@nokia.com>

olear/qtifw,olear/qtifw,olear/qtifw,olear/qtifw