Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-31 10:19:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed missing returns

Browse source
This commit is contained in:
csoler 2020-03-21 15:46:52 +01:00
parent 2387150f64
commit b8ec91aac5
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
6 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
View file

@ -358,16 +358,6 @@ bool GxsChannelDialog::getGroupData(std::list<RsGxsGenericGroupData*>& groupInfo
for (auto& group: groups)
groupInfo.push_back(new RsGxsChannelGroup(group));
// if (group.mImage.mData != NULL) {
// QPixmap image;
// GxsIdDetails::loadPixmapFromData(group.mImage.mData, group.mImage.mSize, image,GxsIdDetails::ORIGINAL);
// channelData->mIcon[group.mMeta.mGroupId] = image;
// }
//
// if (!group.mDescription.empty()) {
// channelData->mDescription[group.mMeta.mGroupId] = QString::fromUtf8(group.mDescription.c_str());
// }
return true;
}

10
retroshare-gui/src/gui/gxschannels/GxsChannelDialog.h
View file

@ -46,14 +46,16 @@ protected:
virtual RetroShareLink::enumType getLinkType() { return RetroShareLink::TYPE_CHANNEL; }
virtual GroupFrameSettings::Type groupFrameSettingsType() { return GroupFrameSettings::Channel; }
virtual QString getHelpString() const ;
virtual void groupInfoToGroupItemInfo(const RsGxsGenericGroupData *groupData, GroupItemInfo &groupItemInfo);
virtual bool getDistantSearchResults(TurtleRequestId id, std::map<RsGxsGroupId,RsGxsGroupSummary>& group_infos);
virtual const std::set<TurtleRequestId> getSearchRequests() const override { return mSearchResults ; }
virtual TurtleRequestId distantSearch(const QString& search_string) ;
virtual void checkRequestGroup(const RsGxsGroupId& grpId) ;
virtual UserNotify *createUserNotify(QObject *parent) override;
const std::set<TurtleRequestId> getSearchRequests() const override { return mSearchResults ; }
UserNotify *createUserNotify(QObject *parent) override;
bool getGroupData(std::list<RsGxsGenericGroupData*>& groupInfo) override;
void groupInfoToGroupItemInfo(const RsGxsGenericGroupData *groupData, GroupItemInfo &groupItemInfo) override;
private slots:
void toggleAutoDownload();
void setDefaultDirectory();
@ -74,8 +76,6 @@ private:
virtual QWidget *createCommentHeaderWidget(const RsGxsGroupId &grpId, const RsGxsMessageId &msgId);
virtual uint32_t requestGroupSummaryType() { return GXS_REQUEST_TYPE_GROUP_DATA; } // request complete group data
bool getGroupData(std::list<RsGxsGenericGroupData*>& groupInfo) override;
void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);
std::set<TurtleRequestId> mSearchResults;