Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-25 01:01:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

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

@ -143,7 +143,7 @@ void GxsChannelDialog::updateDisplay(bool complete)
/* Update channel list */
insertChannels();
}
if (!mChannelId.empty() && std::find(grpIds.begin(), grpIds.end(), mChannelId) != grpIds.end()) {
if (!mChannelId.isNull() && std::find(grpIds.begin(), grpIds.end(), mChannelId) != grpIds.end()) {
requestGroupData(mChannelId);
}
@ -192,12 +192,12 @@ void GxsChannelDialog::processSettings(bool load)
void GxsChannelDialog::channelListCustomPopupMenu( QPoint /*point*/ )
{
if (mChannelId.empty())
if (mChannelId.isNull())
{
return;
}
uint32_t subscribeFlags = ui.treeWidget->subscribeFlags(QString::fromStdString(mChannelId));
uint32_t subscribeFlags = ui.treeWidget->subscribeFlags(QString::fromStdString(mChannelId.toStdString()));
QMenu contextMnu(this);
@ -270,7 +270,7 @@ void GxsChannelDialog::channelListCustomPopupMenu( QPoint /*point*/ )
contextMnu.addSeparator();
QAction *action = contextMnu.addAction(QIcon(":/images/copyrslink.png"), tr("Copy RetroShare Link"), this, SLOT(copyChannelLink()));
action->setEnabled(!mChannelId.empty());
action->setEnabled(!mChannelId.isNull());
contextMnu.exec(QCursor::pos());
@ -338,7 +338,7 @@ void GxsChannelDialog::channelListCustomPopupMenu( QPoint /*point*/ )
contextMnu.addSeparator();
QAction *action = contextMnu.addAction(QIcon(":/images/copyrslink.png"), tr("Copy RetroShare Link"), this, SLOT(copyChannelLink()));
action->setEnabled(!mChannelId.empty());
action->setEnabled(!mChannelId.isNull());
contextMnu.exec(QCursor::pos());
@ -364,7 +364,7 @@ void GxsChannelDialog::deleteFeedItem(QWidget * /*item*/, uint32_t /*type*/)
{
}
void GxsChannelDialog::openChat(std::string /*peerId*/)
void GxsChannelDialog::openChat(const RsPeerId & /*peerId*/)
{
}
@ -389,7 +389,7 @@ void GxsChannelDialog::shareKey()
void GxsChannelDialog::copyChannelLink()
{
#if 0
if (mChannelId.empty()) {
if (mChannelId.isNull()) {
return;
}
@ -407,7 +407,7 @@ void GxsChannelDialog::copyChannelLink()
void GxsChannelDialog::createMsg()
{
if (mChannelId.empty()) {
if (mChannelId.isNull()) {
return;
}
@ -440,7 +440,7 @@ void GxsChannelDialog::selectChannel(const QString &id)
static void channelInfoToGroupItemInfo(const RsGroupMetaData &channelInfo, GroupItemInfo &groupItemInfo)
{
groupItemInfo.id = QString::fromStdString(channelInfo.mGroupId);
groupItemInfo.id = QString::fromStdString(channelInfo.mGroupId.toStdString());
groupItemInfo.name = QString::fromUtf8(channelInfo.mGroupName.c_str());
groupItemInfo.popularity = channelInfo.mPop;
groupItemInfo.lastpost = QDateTime::fromTime_t(channelInfo.mLastPost);
@ -774,7 +774,7 @@ void GxsChannelDialog::unsubscribeChannel()
std::cerr << std::endl;
#endif
if (mChannelId.empty())
if (mChannelId.isNull())
return;
uint32_t token = 0;
@ -789,7 +789,7 @@ void GxsChannelDialog::subscribeChannel()
std::cerr << std::endl;
#endif
if (mChannelId.empty())
if (mChannelId.isNull())
return;
uint32_t token = 0;
@ -803,15 +803,16 @@ void GxsChannelDialog::showChannelDetails()
return;
}
GxsChannelGroupDialog cf(mChannelQueue, rsGxsChannels->getTokenService(), GxsGroupDialog::MODE_SHOW, mChannelId, this);
cf.exec ();
GxsChannelGroupDialog cf(mChannelQueue, rsGxsChannels->getTokenService(), GxsGroupDialog::MODE_SHOW, mChannelId, this);
cf.exec ();
}
void GxsChannelDialog::setAllAsReadClicked()
{
#if 0
if (mChannelId.empty()) {
if (mChannelId.isNull()) {
return;
}
@ -839,7 +840,7 @@ void GxsChannelDialog::setAllAsReadClicked()
void GxsChannelDialog::toggleAutoDownload()
{
if (mChannelId.empty())
if (mChannelId.isNull())
return;
bool autoDl = rsGxsChannels->getChannelAutoDownload(mChannelId);
@ -857,11 +858,11 @@ void GxsChannelDialog::toggleAutoDownload()
bool GxsChannelDialog::navigate(const std::string& channelId, const std::string& msgId)
{
#if 0
if (channelId.empty()) {
if (channelId.isNull()) {
return false;
}
if (treeWidget->activateId(QString::fromStdString(channelId), msgId.empty()) == NULL) {
if (treeWidget->activateId(QString::fromStdString(channelId), msgId.isNull()) == NULL) {
return false;
}
@ -870,7 +871,7 @@ bool GxsChannelDialog::navigate(const std::string& channelId, const std::string&
return false;
}
if (msgId.empty()) {
if (msgId.isNull()) {
return true;
}
@ -969,7 +970,7 @@ void GxsChannelDialog::requestGroupData(const RsGxsGroupId &grpId)
mChannelQueue->cancelActiveRequestTokens(TOKEN_TYPE_GROUP_DATA);
if (grpId.empty()) {
if (grpId.isNull()) {
mStateHelper->setActive(TOKEN_TYPE_GROUP_DATA, false);
mStateHelper->setLoading(TOKEN_TYPE_GROUP_DATA, false);
mStateHelper->clear(TOKEN_TYPE_GROUP_DATA);
@ -1036,7 +1037,7 @@ void GxsChannelDialog::requestPosts(const RsGxsGroupId &grpId)
mChannelQueue->cancelActiveRequestTokens(TOKEN_TYPE_POSTS);
if (grpId.empty()) {
if (grpId.isNull()) {
mStateHelper->setActive(TOKEN_TYPE_POSTS, false);
mStateHelper->setLoading(TOKEN_TYPE_POSTS, false);
mStateHelper->clear(TOKEN_TYPE_POSTS);