Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-09 06:42:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

merge of branch v0.6-idclean 7180

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-03-17 20:56:06 +00:00
parent 7815efb16f
commit 0f29d28b1b
397 changed files with 6503 additions and 5702 deletions
Download patch file Download diff file Expand all files Collapse all files

6
retroshare-gui/src/gui/feeds/AttachFileItem.h
View file

@ -47,9 +47,9 @@ class AttachFileItem : public QWidget, private Ui::AttachFileItem
public:
/** Default Constructor */
AttachFileItem(const QString& localpath,TransferRequestFlags flags);
AttachFileItem(const std::string& hash, const QString& name, uint64_t size, uint32_t flags,TransferRequestFlags tflags, const std::string& srcId);
AttachFileItem(const RsFileHash& hash, const QString& name, uint64_t size, uint32_t flags,TransferRequestFlags tflags, const std::string& srcId);
const std::string& FileHash() { return mFileHash; }
const RsFileHash& FileHash() { return mFileHash; }
const QString& FileName() { return mFileName; }
uint64_t FileSize() { return mFileSize; }
const QString& FilePath() { return mPath; }
@ -68,7 +68,7 @@ private:
void Setup();
QString mPath;
std::string mFileHash;
RsFileHash mFileHash;
QString mFileName;
uint64_t mFileSize;
std::string mSrcId;