From 7d1efa7ed915582e0d695bc65cb87c862385813d Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Thu, 2 Apr 2020 23:58:09 +0200 Subject: [PATCH] Fix compiler warnings --- libretroshare/src/retroshare/rsfiles.h | 5 +++-- libretroshare/src/retroshare/rstypes.h | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libretroshare/src/retroshare/rsfiles.h b/libretroshare/src/retroshare/rsfiles.h index 8a60444c7..78de40262 100644 --- a/libretroshare/src/retroshare/rsfiles.h +++ b/libretroshare/src/retroshare/rsfiles.h @@ -402,12 +402,12 @@ struct TurtleFileInfoV2 : RsSerializable { TurtleFileInfoV2() : fSize(0), fWeight(0) {} - TurtleFileInfoV2(const TurtleFileInfo& oldInfo) : + explicit TurtleFileInfoV2(const TurtleFileInfo& oldInfo) : fSize(oldInfo.size), fHash(oldInfo.hash), fName(oldInfo.name), fWeight(0) {} #ifdef RS_DEEP_FILES_INDEX - TurtleFileInfoV2(const DeepFilesSearchResult& dRes); + explicit TurtleFileInfoV2(const DeepFilesSearchResult& dRes); #endif // def RS_DEEP_FILES_INDEX uint64_t fSize; /// File size @@ -746,6 +746,7 @@ public: * interaction with Qt. As soon as you can, you should prefer to use the * version of this methodn which take `std::uintptr_t handle` as paramether. */ + RS_DEPRECATED_FOR(requestDirDetails) virtual int RequestDirDetails( void* handle, DirDetails& details, FileSearchFlags flags ) = 0; diff --git a/libretroshare/src/retroshare/rstypes.h b/libretroshare/src/retroshare/rstypes.h index 978934942..60902b7ab 100644 --- a/libretroshare/src/retroshare/rstypes.h +++ b/libretroshare/src/retroshare/rstypes.h @@ -201,7 +201,8 @@ struct FileInfo : RsSerializable std::string path; std::string fname; RsFileHash hash; - std::string ext; + + RS_DEPRECATED std::string ext; /// @deprecated unused uint64_t size; uint64_t avail; /// how much we have