Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-17 10:59:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2205 from defnax/photoshare-fixes

Browse source 
photoshare compile fixes
This commit is contained in:
defnax 2021-01-05 22:27:03 +01:00 • committed by GitHub
commit c184e7b7ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/PhotoShare/AlbumDialog.cpp
View file

@ -22,7 +22,9 @@
#include "AlbumDialog.h" #include "AlbumDialog.h"
#include "gui/gxs/GxsIdDetails.h" #include "gui/gxs/GxsIdDetails.h"
#include "gui/common/FilesDefs.h"
#include "ui_AlbumDialog.h" #include "ui_AlbumDialog.h"
#include "retroshare/rsgxsflags.h" #include "retroshare/rsgxsflags.h"
AlbumDialog::AlbumDialog(const RsPhotoAlbum& album, TokenQueue* photoQueue, RsPhoto* rs_Photo, QWidget *parent) : AlbumDialog::AlbumDialog(const RsPhotoAlbum& album, TokenQueue* photoQueue, RsPhoto* rs_Photo, QWidget *parent) :

1
retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp
View file

@ -22,6 +22,7 @@
#include "AlbumGroupDialog.h" #include "AlbumGroupDialog.h"
#include "AlbumExtra.h" #include "AlbumExtra.h"
#include "gui/gxs/GxsIdDetails.h" #include "gui/gxs/GxsIdDetails.h"
#include "gui/common/FilesDefs.h"
#include <iostream> #include <iostream>

2
retroshare-gui/src/gui/PhotoShare/AlbumItem.cpp
View file

@ -20,6 +20,8 @@
#include "AlbumItem.h" #include "AlbumItem.h"
#include "ui_AlbumItem.h" #include "ui_AlbumItem.h"
#include "gui/common/FilesDefs.h"
#include <iostream> #include <iostream>
#include <QMouseEvent> #include <QMouseEvent>

3
retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp
View file

@ -96,9 +96,10 @@ void PhotoDialog::toggleComments()
if (mCommentsCreated) { if (mCommentsCreated) {
ui->frame_comments->setVisible(true); ui->frame_comments->setVisible(true);
} else { } else {
RsGxsId current_author;
// create CommentDialog. // create CommentDialog.
RsGxsCommentService *commentService = dynamic_cast<RsGxsCommentService *>(mRsPhoto); RsGxsCommentService *commentService = dynamic_cast<RsGxsCommentService *>(mRsPhoto);
GxsCommentDialog *commentDialog = new GxsCommentDialog(this, mRsPhoto->getTokenService(), commentService); GxsCommentDialog *commentDialog = new GxsCommentDialog(this,current_author, mRsPhoto->getTokenService(), commentService);
// TODO: Need to fetch all msg versions, otherwise - won't get all the comments. // TODO: Need to fetch all msg versions, otherwise - won't get all the comments.
// For the moment - use current msgid. // For the moment - use current msgid.

1
retroshare-gui/src/gui/PhotoShare/PhotoItem.cpp
View file

@ -25,6 +25,7 @@
#include "PhotoItem.h" #include "PhotoItem.h"
#include "ui_PhotoItem.h" #include "ui_PhotoItem.h"
#include "gui/common/FilesDefs.h"
PhotoItem::PhotoItem(PhotoShareItemHolder *holder, const RsPhotoPhoto &photo, QWidget *parent): PhotoItem::PhotoItem(PhotoShareItemHolder *holder, const RsPhotoPhoto &photo, QWidget *parent):
QWidget(parent), QWidget(parent),