diff -r 106a4bfcb866 -r 013a02bf2bb0 smf/smfservermodule/smfserver/pluginmgr/smfpluginmanagerutil.cpp --- a/smf/smfservermodule/smfserver/pluginmgr/smfpluginmanagerutil.cpp Thu Aug 05 16:46:37 2010 +0530 +++ b/smf/smfservermodule/smfserver/pluginmgr/smfpluginmanagerutil.cpp Thu Aug 05 16:48:48 2010 +0530 @@ -19,6 +19,8 @@ */ // plugin interfaces +#include +#include #include #include #include @@ -77,18 +79,22 @@ * @param aInstance Instance of the loaded plugin that perform this operation * @param aOperation The type of operation to be performed * @param aInputData The data required to create the web query - * @param aReqData [out] The request data created by the plugin + * @param aReqData [out] The request data created by the + * plugin (don't consider for synchronous requests) * @param aResult [out] SmfError, The result of the operation * It can be :- * SmfPluginNoError (if plugin has created the request successfully) * SmfPluginUnknownPluginService (if plugin service is not known or unsupported) * SmfPluginRequestCreationFailed (if request creation has failed) + * @param aOutputData [out] The output data to be filled by the + * plugins (for synchronous request only), don't consider for asynchronous requests */ void SmfPluginManagerUtil::createRequest ( QObject* aInstance, const SmfRequestTypeID &aOperation, QByteArray &aInputData, SmfPluginRequestData &aReqData, - SmfError &aResult ) + SmfError &aResult, + QByteArray &aOutputData ) { qDebug()<<"SmfPluginManagerUtil::createRequest()"; SmfPluginError pluginErrorVal = SmfPluginErrServiceNotSupported; @@ -130,6 +136,14 @@ aInputData, aReqData); break; + case SmfPostGetMaxCharsInPost: + case SmfPostGetMaxItems: + case SmfPostGetSupportedFormats: + case SmfPostGetAppearanceSupport: + pluginErrorVal = createSyncRequest(aInstance, aOperation, + aInputData, aOutputData); + break; + case SmfMusicGetLyrics: case SmfMusicGetSubtitle: case SmfMusicLyricsCustomRequest: @@ -140,7 +154,6 @@ case SmfMusicGetEventsOnLoc: case SmfMusicGetVenueOnLoc: - case SmfMusicGetEventsOnVenue: case SmfMusicPostEvents: case SmfMusicEventsCustomRequest: // Authorise the plugin and call create request methods @@ -152,7 +165,6 @@ case SmfMusicGetTracks: case SmfMusicGetTrackInfo: case SmfMusicGetStores: - case SmfMusicPostCurrentPlaying: case SmfMusicSearchCustomRequest: // Authorise the plugin and call create request methods pluginErrorVal = createMusicSearchRequest(aInstance, aOperation, @@ -161,6 +173,9 @@ case SmfMusicGetUserInfo: case SmfMusicSearchUser: + case SmfMusicPostCurrentPlaying: + case SmfMusicPostRating: + case SmfMusicPostComment: case SmfMusicServiceCustomRequest: // Authorise the plugin and call create request methods pluginErrorVal = createMusicServiceRequest(aInstance, aOperation, @@ -177,6 +192,7 @@ aInputData, aReqData); break; + case SmfPictureGetAlbums: case SmfPictureGetPictures: case SmfPictureDescription: case SmfPictureUpload: @@ -223,12 +239,15 @@ { QDataStream stream(aInputData); int pageNum, itemPerPage; + quint8 flag = 0; switch(aOperation) { case SmfActivitySelfActivity: qDebug()<<"Plugin Operation requested : selfactivities()"; + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->selfActivities(aReqData, pageNum, itemPerPage); break; @@ -237,8 +256,11 @@ { qDebug()<<"Plugin Operation requested : friendsActivities()"; SmfContact contact; + stream>>flag; stream>>contact; + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->friendsActivities(aReqData, contact, pageNum, itemPerPage); break; @@ -249,6 +271,7 @@ qDebug()<<"Plugin Operation requested : filtered()"; QList list; QList intList; + stream>>flag; stream>>intList; list.clear(); foreach(int val, intList) @@ -257,7 +280,9 @@ list.append(type); } + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->filtered(aReqData, list, pageNum, itemPerPage); break; @@ -267,9 +292,12 @@ { qDebug()<<"Plugin Operation requested : customRequest()"; int operationType; + stream>>flag; stream>>operationType; QByteArray data; - stream>>data; + stream>>flag; + if(flag) + stream>>data; pluginErrorVal = plugin->customRequest(aReqData, operationType, &data); break; } @@ -317,19 +345,24 @@ { QDataStream stream(aInputData); int pageNum, itemPerPage; + quint8 flag = 0; switch(aOperation) { case SmfContactGetFriends: qDebug()<<"Plugin Operation requested : friends()"; + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->friends(aReqData, pageNum, itemPerPage); break; case SmfContactGetFollowers: qDebug()<<"Plugin Operation requested : followers()"; + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->followers(aReqData, pageNum, itemPerPage); break; @@ -338,8 +371,12 @@ { qDebug()<<"Plugin Operation requested : search()"; SmfContact searchContact; - stream>>searchContact; + stream>>flag; + if(flag) + stream>>searchContact; + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->search(aReqData, searchContact, pageNum, itemPerPage); break; @@ -349,10 +386,16 @@ { qDebug()<<"Plugin Operation requested : searchNear()"; SmfLocation location; + stream>>flag; + if(flag) + stream>>location; + stream>>flag; int i; stream>>i; SmfLocationSearchBoundary proximity = (SmfLocationSearchBoundary)i; + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->searchNear(aReqData, location, proximity, pageNum, itemPerPage); break; @@ -361,7 +404,9 @@ case SmfContactGetGroups: { qDebug()<<"Plugin Operation requested : groups()"; + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->groups(aReqData, pageNum, itemPerPage); break; @@ -371,8 +416,11 @@ { qDebug()<<"Plugin Operation requested : searchInGroup()"; SmfGroup group; + stream>>flag; stream>>group; + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->searchInGroup(aReqData, group, pageNum, itemPerPage); break; @@ -382,9 +430,12 @@ { qDebug()<<"Plugin Operation requested : customRequest()"; int operationType; + stream>>flag; stream>>operationType; QByteArray data; - stream>>data; + stream>>flag; + if(flag) + stream>>data; pluginErrorVal = plugin->customRequest(aReqData, operationType, &data); break; } @@ -436,35 +487,46 @@ SmfPost post; SmfLocation location; int pageNum, itemPerPage; - + quint8 flag = 0; switch(aOperation) { case SmfContactRetrievePosts: qDebug()<<"Plugin Operation requested : retrieve()"; - stream>>contact; + stream>>flag; + if(flag) + stream>>contact; + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->retrieve(aReqData, &contact, pageNum, itemPerPage); break; case SmfContactPost: qDebug()<<"Plugin Operation requested : post()"; + stream>>flag; stream>>post; + stream>>flag; stream>>location; pluginErrorVal = plugin->post(aReqData, post, location); break; case SmfContactUpdatePost: qDebug()<<"Plugin Operation requested : updatePost()"; + stream>>flag; stream>>post; pluginErrorVal = plugin->updatePost(aReqData, post); break; case SmfContactPostDirected: qDebug()<<"Plugin Operation requested : postDirected()"; + stream>>flag; stream>>post; + stream>>flag; stream>>contact; - stream>>location; + stream>>flag; + if(flag) + stream>>location; qDebug()<<"Post data = "<().guid(); pluginErrorVal = plugin->postDirected(aReqData, post, contact, &location); @@ -474,9 +536,13 @@ { qDebug()<<"Plugin Operation requested : commentOnAPost()"; SmfPost post2; + stream>>flag; stream>>post; + stream>>flag; stream>>post2; - stream>>location; + stream>>flag; + if(flag) + stream>>location; pluginErrorVal = plugin->commentOnAPost(aReqData, post, post2, &location); break; } @@ -486,8 +552,10 @@ qDebug()<<"Plugin Operation requested : postAppearence()"; QString status; int i; + stream>>flag; stream>>i; SmfPresenceInfo presence = (SmfPresenceInfo)i; + stream>>flag; stream>>status; pluginErrorVal = plugin->postAppearence(aReqData, presence, status); break; @@ -497,8 +565,11 @@ { qDebug()<<"Plugin Operation requested : sharePost()"; bool edited; + stream>>flag; stream>>post; + stream>>flag; stream>>contact; + stream>>flag; stream>>edited; pluginErrorVal = plugin->sharePost(aReqData, post, contact, edited); break; @@ -508,9 +579,12 @@ { qDebug()<<"Plugin Operation requested : customRequest()"; int operationType; + stream>>flag; stream>>operationType; QByteArray data; - stream>>data; + stream>>flag; + if(flag) + stream>>data; pluginErrorVal = plugin->customRequest(aReqData, operationType, &data); break; } @@ -560,13 +634,17 @@ QDataStream stream(aInputData); SmfTrackInfo trackInfo; int pageNum, itemPerPage; + quint8 flag = 0; switch(aOperation) { case SmfMusicGetLyrics: qDebug()<<"Plugin Operation requested : lyrics()"; + stream>>flag; stream>>trackInfo; + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->lyrics(aReqData, trackInfo, pageNum, itemPerPage); break; @@ -576,9 +654,12 @@ qDebug()<<"Plugin Operation requested : subtitles()"; stream>>trackInfo; int i; + stream>>flag; stream>>i; SmfSubtitleSearchFilter filter = (SmfSubtitleSearchFilter)i; + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->subtitles(aReqData, trackInfo, filter, pageNum, itemPerPage); break; @@ -588,9 +669,12 @@ { qDebug()<<"Plugin Operation requested : customRequest()"; int operationType; + stream>>flag; stream>>operationType; QByteArray data; - stream>>data; + stream>>flag; + if(flag) + stream>>data; pluginErrorVal = plugin->customRequest(aReqData, operationType, &data); break; } @@ -638,41 +722,38 @@ { QDataStream stream(aInputData); int pageNum, itemPerPage; - QtMobility::QGeoPositionInfo location; - + SmfLocation location; + quint8 flag = 0; + switch(aOperation) { case SmfMusicGetEventsOnLoc: qDebug()<<"Plugin Operation requested : events() OnLoc"; + stream>>flag; stream>>location; + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->events(aReqData, location, pageNum, itemPerPage); break; case SmfMusicGetVenueOnLoc: qDebug()<<"Plugin Operation requested : venues()"; + stream>>flag; stream>>location; + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->venues(aReqData, location, pageNum, itemPerPage); break; - case SmfMusicGetEventsOnVenue: - { - qDebug()<<"Plugin Operation requested : events() OnVenue"; - SmfLocation venue; - stream>>venue; - stream>>pageNum; - stream>>itemPerPage; - pluginErrorVal = plugin->events(aReqData, venue, pageNum, itemPerPage); - break; - } - case SmfMusicPostEvents: { qDebug()<<"Plugin Operation requested : postEvents()"; QList list; + stream>>flag; stream>>list; pluginErrorVal = plugin->postEvents(aReqData, list); break; @@ -682,9 +763,12 @@ { qDebug()<<"Plugin Operation requested : customRequest()"; int operationType; + stream>>flag; stream>>operationType; QByteArray data; - stream>>data; + stream>>flag; + if(flag) + stream>>data; pluginErrorVal = plugin->customRequest(aReqData, operationType, &data); break; } @@ -734,21 +818,28 @@ QDataStream stream(aInputData); int pageNum, itemPerPage; SmfTrackInfo trackInfo; + quint8 flag = 0; switch(aOperation) { case SmfMusicGetRecommendations: qDebug()<<"Plugin Operation requested : recommendations()"; + stream>>flag; stream>>trackInfo; + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->recommendations(aReqData, trackInfo, pageNum, itemPerPage); break; case SmfMusicGetTracks: qDebug()<<"Plugin Operation requested : tracks()"; + stream>>flag; stream>>trackInfo; + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->tracks(aReqData, trackInfo, pageNum, itemPerPage); break; @@ -757,8 +848,11 @@ { qDebug()<<"Plugin Operation requested : trackInfo()"; SmfMusicFingerPrint fp; + stream>>flag; stream>>fp; + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->trackInfo(aReqData, fp, pageNum, itemPerPage); break; @@ -766,45 +860,25 @@ case SmfMusicGetStores: qDebug()<<"Plugin Operation requested : stores()"; + stream>>flag; stream>>trackInfo; + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->stores(aReqData, trackInfo, pageNum, itemPerPage); break; - case SmfMusicPostCurrentPlaying: - qDebug()<<"Plugin Operation requested : postCurrentPlaying()"; - stream>>trackInfo; - pluginErrorVal = plugin->postCurrentPlaying(aReqData, trackInfo); - break; - - case SmfMusicPostRating: - { - qDebug()<<"Plugin Operation requested : postRating()"; - stream>>trackInfo; - SmfMusicRating rating; - stream>>rating; - pluginErrorVal = plugin->postRating(aReqData, trackInfo, rating); - break; - } - - case SmfMusicPostComment: - { - qDebug()<<"Plugin Operation requested : postComment()"; - stream>>trackInfo; - SmfComment comment; - stream>>comment; - pluginErrorVal = plugin->postComments(aReqData, trackInfo, comment); - break; - } - case SmfMusicSearchCustomRequest: { qDebug()<<"Plugin Operation requested : customRequest()"; int operationType; + stream>>flag; stream>>operationType; QByteArray data; - stream>>data; + stream>>flag; + if(flag) + stream>>data; pluginErrorVal = plugin->customRequest(aReqData, operationType, &data); break; } @@ -853,6 +927,8 @@ { QDataStream stream(aInputData); int pageNum, itemPerPage; + SmfTrackInfo trackInfo; + quint8 flag = 0; switch(aOperation) { @@ -865,20 +941,57 @@ { qDebug()<<"Plugin Operation requested : serachNear() for Music"; SmfLocation place; + stream>>flag; stream>>place; + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->searchUser(aReqData, place, pageNum, itemPerPage); break; } + case SmfMusicPostCurrentPlaying: + qDebug()<<"Plugin Operation requested : postCurrentPlaying()"; + stream>>flag; + stream>>trackInfo; + pluginErrorVal = plugin->postCurrentPlaying(aReqData, trackInfo); + break; + + case SmfMusicPostRating: + { + qDebug()<<"Plugin Operation requested : postRating()"; + stream>>flag; + stream>>trackInfo; + SmfMusicRating rating; + stream>>flag; + stream>>rating; + pluginErrorVal = plugin->postRating(aReqData, trackInfo, rating); + break; + } + + case SmfMusicPostComment: + { + qDebug()<<"Plugin Operation requested : postComment()"; + stream>>flag; + stream>>trackInfo; + SmfComment comment; + stream>>flag; + stream>>comment; + pluginErrorVal = plugin->postComments(aReqData, trackInfo, comment); + break; + } + case SmfMusicServiceCustomRequest: { qDebug()<<"Plugin Operation requested : customRequest()"; int operationType; + stream>>flag; stream>>operationType; QByteArray data; - stream>>data; + stream>>flag; + if(flag) + stream>>data; pluginErrorVal = plugin->customRequest(aReqData, operationType, &data); break; } @@ -928,12 +1041,15 @@ QDataStream stream(aInputData); int pageNum, itemPerPage; SmfPlaylist playlist; + quint8 flag = 0; switch(aOperation) { case SmfMusicGetPlaylists: qDebug()<<"Plugin Operation requested : playlists()"; + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->playlists(aReqData, pageNum, itemPerPage); break; @@ -942,8 +1058,12 @@ { qDebug()<<"Plugin Operation requested : playlistsOf()"; SmfMusicProfile user; - stream>>user; + stream>>flag; + if(flag) + stream>>user; + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->playlistsOf(aReqData, user, pageNum, itemPerPage); break; @@ -953,14 +1073,18 @@ { qDebug()<<"Plugin Operation requested : addToPlaylist()"; QList list; + stream>>flag; stream>>playlist; - stream>>list; + stream>>flag; + if(flag) + stream>>list; pluginErrorVal = plugin->addToPlaylist(aReqData, playlist, list); break; } case SmfMusicPostCurrentPlayingPlaylist: qDebug()<<"Plugin Operation requested : postCurrentPlayingPlaylist()"; + stream>>flag; stream>>playlist; pluginErrorVal = plugin->postCurrentPlayingPlaylist(aReqData, playlist); break; @@ -969,9 +1093,12 @@ { qDebug()<<"Plugin Operation requested : customRequest()"; int operationType; + stream>>flag; stream>>operationType; QByteArray data; - stream>>data; + stream>>flag; + if(flag) + stream>>data; pluginErrorVal = plugin->customRequest(aReqData, operationType, &data); break; } @@ -1019,6 +1146,7 @@ { QDataStream stream(aInputData); SmfPicture picture; + quint8 flag = 0; switch(aOperation) { @@ -1029,8 +1157,11 @@ QStringList names; SmfContact contact; int pageNum, itemPerPage; + stream>>flag; stream>>names; - stream>>contact; + stream>>flag; + if(flag) + stream>>contact; stream>>pageNum; stream>>itemPerPage; pluginErrorVal = plugin->albums(aReqData, names, &contact, pageNum, itemPerPage); @@ -1042,8 +1173,11 @@ qDebug()<<"Plugin Operation requested : pictures()"; int pageNum, itemPerPage; SmfPictureAlbumList albumList; + stream>>flag; stream>>albumList; + stream>>flag; stream>>pageNum; + stream>>flag; stream>>itemPerPage; pluginErrorVal = plugin->pictures(aReqData, albumList, pageNum, itemPerPage); break; @@ -1051,6 +1185,7 @@ case SmfPictureDescription: qDebug()<<"Plugin Operation requested : description()"; + stream>>flag; stream>>picture; pluginErrorVal = plugin->description(aReqData, picture); break; @@ -1059,8 +1194,12 @@ { qDebug()<<"Plugin Operation requested : upload() single"; SmfPictureAlbum album; - stream>>picture; - stream>>album; + stream>>flag; + if(flag) + stream>>picture; + stream>>flag; + if(flag) + stream>>album; pluginErrorVal = plugin->upload(aReqData, picture, &album); break; } @@ -1070,8 +1209,12 @@ qDebug()<<"Plugin Operation requested : upload() Multiple"; QList list; SmfPictureAlbum album; - stream>>list; - stream>>album; + stream>>flag; + if(flag) + stream>>list; + stream>>flag; + if(flag) + stream>>album; pluginErrorVal = plugin->upload(aReqData, list, &album); break; } @@ -1080,7 +1223,9 @@ { qDebug()<<"Plugin Operation requested : postComment()"; SmfComment comment; + stream>>flag; stream>>picture; + stream>>flag; stream>>comment; pluginErrorVal = plugin->postComment(aReqData, picture, comment); break; @@ -1090,9 +1235,12 @@ { qDebug()<<"Plugin Operation requested : customRequest()"; int operationType; + stream>>flag; stream>>operationType; QByteArray data; - stream>>data; + stream>>flag; + if(flag) + stream>>data; pluginErrorVal = plugin->customRequest(aReqData, operationType, &data); break; } @@ -1113,6 +1261,123 @@ /** + * Method called to create a synchronous plugin request. + * @param aPlugin The instance of the loaded plugin that performs the + * contact fetch operation. + * @param aOperation The type of operation to be performed + * @param aInputData The data required to create the web query + * @param aOutputData [out] The output data to be filled by the plugins + * @return SmfPluginError + */ +SmfPluginError SmfPluginManagerUtil::createSyncRequest ( QObject *aPlugin, + const SmfRequestTypeID &aOperation, + QByteArray &aInputData, + QByteArray &aOutputData ) + { + qDebug()<<"SmfPluginManagerUtil::createSyncRequest"; + Q_UNUSED(aInputData) + + SmfPluginError pluginErrorVal = SmfPluginErrServiceNotSupported; + + if(aPlugin) + { + QDataStream outStream(&aOutputData, QIODevice::ReadWrite); + + switch(aOperation) + { + case SmfPostGetMaxCharsInPost: + { + qDebug()<<"Plugin Operation requested : maxCharsInPost()"; + SmfPostProviderPlugin *plugin = NULL; + plugin = qobject_cast(aPlugin); + + if(!plugin) + { + qDebug()<<"Plugin instance couldn't be typecasted!!!"; + pluginErrorVal = SmfPluginErrRequestNotCreated; + break; + } + + qint32 val = plugin->maxCharsInPost(); + outStream<(aPlugin); + + if(!plugin) + { + qDebug()<<"Plugin instance couldn't be typecasted!!!"; + pluginErrorVal = SmfPluginErrRequestNotCreated; + break; + } + + qint32 val = plugin->maxItems(); + outStream<(aPlugin); + + if(!plugin) + { + qDebug()<<"Plugin instance couldn't be typecasted!!!"; + pluginErrorVal = SmfPluginErrRequestNotCreated; + break; + } + + QVector formats = plugin->supportedFormats(); + outStream<(aPlugin); + + if(!plugin) + { + qDebug()<<"Plugin instance couldn't be typecasted!!!"; + pluginErrorVal = SmfPluginErrRequestNotCreated; + break; + } + + bool val = plugin->supportsAppearence(); + outStream<responseAvailable(aOperation, aTransportResult, aResponse, aResult, aRetType, aPageResult ); @@ -1236,6 +1515,20 @@ qDebug()<<"SmfPluginManagerUtil::serializeResult"; switch(aOperation) { + // FOR ACTIVITY - FETCHER + case SmfActivitySelfActivity: + case SmfActivityFriendsActivities: + case SmfActivityFiltered: + { + qDebug()<<"Serializing to : QList"; + QList activityList; + if( aResult->canConvert() ) + activityList = aResult->value(); + aDataStream<"; QList eventList; @@ -1370,17 +1662,6 @@ break; } - case SmfMusicPostCurrentPlaying: - { - qDebug()<<"Serializing to : bool"; - bool value; - if( QVariant::Bool == aResult->type() ) - value = aResult->toBool(); - aDataStream<type() ) + value = aResult->toBool(); + aDataStream<"; + QList albumList; + if( aResult->canConvert() ) + albumList = aResult->value(); + aDataStream<"; @@ -1458,6 +1761,26 @@ break; } + // FOR ALL INTERFACES CUSTOM REQUESTS + case SmfContactCustomRequest: + case SmfContactPostCustomRequest: + case SmfMusicLyricsCustomRequest: + case SmfMusicEventsCustomRequest: + case SmfMusicSearchCustomRequest: + case SmfMusicServiceCustomRequest: + case SmfMusicPlaylistCustomRequest: + case SmfPictureCustomRequest: + case SmfActivityCustomRequest: + { + qDebug()<<"Custom Requests are handled as bytearrays in PM now!!!"; + qDebug()<<"Serializing to : QByteArray"; + QByteArray customResult; + if( QVariant::ByteArray == aResult->type() ) + customResult.append(aResult->toByteArray()); + aDataStream<