mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-12-20 02:53:24 -05:00
gxs back end now compilable, need to test
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5346 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
d5520a1cd8
commit
17da89938f
15 changed files with 71 additions and 91 deletions
|
|
@ -24,7 +24,7 @@ void p3PhotoServiceV2::msgsChanged(
|
|||
}
|
||||
|
||||
|
||||
RsTokenService* p3PhotoServiceV2::getTokenService() {
|
||||
RsTokenServiceV2* p3PhotoServiceV2::getTokenService() {
|
||||
|
||||
return RsGenExchange::getTokenService();
|
||||
}
|
||||
|
|
@ -70,8 +70,9 @@ bool p3PhotoServiceV2::getAlbum(const uint32_t& token, std::vector<RsPhotoAlbum>
|
|||
|
||||
for(; vit != grpData.end(); vit++)
|
||||
{
|
||||
RsGxsGrpItem* item = *vit;
|
||||
RsPhotoAlbum album = *item;
|
||||
RsGxsPhotoAlbumItem* item = dynamic_cast<RsGxsPhotoAlbumItem*>(*vit);
|
||||
RsPhotoAlbum album = item->album;
|
||||
delete item;
|
||||
albums.push_back(album);
|
||||
}
|
||||
}
|
||||
|
|
@ -80,7 +81,7 @@ bool p3PhotoServiceV2::getAlbum(const uint32_t& token, std::vector<RsPhotoAlbum>
|
|||
}
|
||||
|
||||
|
||||
bool p3PhotoServiceV2::getPhoto(const uint32_t& token, PhotoResult& photo)
|
||||
bool p3PhotoServiceV2::getPhoto(const uint32_t& token, PhotoResult& photos)
|
||||
{
|
||||
GxsMsgDataMap msgData;
|
||||
bool ok = RsGenExchange::getMsgData(token, msgData);
|
||||
|
|
@ -101,8 +102,8 @@ bool p3PhotoServiceV2::getPhoto(const uint32_t& token, PhotoResult& photo)
|
|||
|
||||
if(item)
|
||||
{
|
||||
RsPhotoPhoto photo = *item;
|
||||
photo[grpId] = photo;
|
||||
RsPhotoPhoto photo = item->photo;
|
||||
photos[grpId].push_back(photo);
|
||||
delete item;
|
||||
}else
|
||||
{
|
||||
|
|
@ -121,20 +122,8 @@ bool p3PhotoServiceV2::submitAlbumDetails(RsPhotoAlbum& album)
|
|||
return false;
|
||||
}
|
||||
|
||||
void p3PhotoServiceV2::operator =(RsPhoto& lPhotos,
|
||||
const RsGxsPhotoPhotoItem& rPhoto)
|
||||
{
|
||||
lPhotos = rPhoto.photo;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void p3PhotoServiceV2::operator =(RsPhotoAlbum& lAlbum,
|
||||
const RsGxsPhotoAlbumItem& rAlbum)
|
||||
{
|
||||
lAlbum = rAlbum.album;
|
||||
}
|
||||
|
||||
bool p3PhotoServiceV2::submitPhoto(RsPhotoPhoto& photo)
|
||||
{
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ public:
|
|||
void msgsChanged(std::map<std::string,
|
||||
std::vector<std::string> >& msgs);
|
||||
|
||||
RsTokenService* getTokenService();
|
||||
RsTokenServiceV2* getTokenService();
|
||||
|
||||
bool getGroupList(const uint32_t &token,
|
||||
std::list<std::string> &groupIds);
|
||||
|
|
@ -71,11 +71,6 @@ public:
|
|||
bool getAlbum(const uint32_t &token, std::vector<RsPhotoAlbum> &albums);
|
||||
bool getPhoto(const uint32_t &token, PhotoResult &photos);
|
||||
|
||||
private:
|
||||
|
||||
void operator=(RsPhoto& lPhotos, const RsGxsPhotoPhotoItem& rPhoto);
|
||||
void operator=(RsPhotoAlbum& lAlbum, const RsGxsPhotoAlbumItem& rAlbum);
|
||||
|
||||
public:
|
||||
|
||||
/** Modifications **/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue