mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-05 15:45:04 -04:00
Compilation fix. Rs compiles now, group and message creation work ok, more testing to do still
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7192 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
5b472c34e2
commit
e2c8c6e141
9 changed files with 14 additions and 14 deletions
|
@ -391,7 +391,7 @@ void CreateCircleDialog::updateCircleGUI()
|
|||
std::cerr << "CreateCircleDialog::updateCircleGUI() : EXTERNAL CIRCLETYPE";
|
||||
std::cerr << std::endl;
|
||||
|
||||
if (mCircleGroup.mMeta.mCircleId == mCircleGroup.mMeta.mGroupId)
|
||||
if (mCircleGroup.mMeta.mCircleId.toStdString() == mCircleGroup.mMeta.mGroupId.toStdString())
|
||||
{
|
||||
ui.radioButton_Restricted->setChecked(true);
|
||||
}
|
||||
|
|
|
@ -548,7 +548,7 @@ void IdDialog::modifyReputation()
|
|||
std::cerr << "IdDialog::modifyReputation()";
|
||||
std::cerr << std::endl;
|
||||
|
||||
std::string id = ui.lineEdit_KeyId->text().toStdString();
|
||||
RsGxsId id(ui.lineEdit_KeyId->text().toStdString());
|
||||
|
||||
int mod = 0;
|
||||
if (ui.repMod_Accept->isChecked())
|
||||
|
|
|
@ -191,10 +191,10 @@ void PostedListDialog::groupListCustomPopupMenu(QPoint /*point*/)
|
|||
contextMnu.addSeparator();
|
||||
|
||||
action = contextMnu.addAction(QIcon(IMAGE_SHOW), tr("Show Topic Details"), this, SLOT(showTopic()));
|
||||
action->setEnabled (!mCurrTopicId.empty());
|
||||
action->setEnabled (!mCurrTopicId.isNull());
|
||||
|
||||
action = contextMnu.addAction(QIcon(IMAGE_EDIT), tr("Edit Topic Details"), this, SLOT(editTopic()));
|
||||
action->setEnabled (!mCurrTopicId.empty() && IS_GROUP_ADMIN(subscribeFlags));
|
||||
action->setEnabled (!mCurrTopicId.isNull() && IS_GROUP_ADMIN(subscribeFlags));
|
||||
|
||||
contextMnu.exec(QCursor::pos());
|
||||
}
|
||||
|
@ -378,7 +378,7 @@ void PostedListDialog::newTopic()
|
|||
|
||||
void PostedListDialog::showTopic()
|
||||
{
|
||||
if (mCurrTopicId.empty()) {
|
||||
if (mCurrTopicId.isNull()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -388,7 +388,7 @@ void PostedListDialog::showTopic()
|
|||
|
||||
void PostedListDialog::editTopic()
|
||||
{
|
||||
if (mCurrTopicId.empty()) {
|
||||
if (mCurrTopicId.isNull()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -633,7 +633,7 @@ void WikiDialog::groupListCustomPopupMenu(QPoint /*point*/)
|
|||
contextMnu.addSeparator();
|
||||
|
||||
action = contextMnu.addAction(QIcon(IMAGE_INFO), tr("Show Wiki Group"), this, SLOT(showGroupDetails()));
|
||||
action->setEnabled (!mGroupId.empty ());
|
||||
action->setEnabled (!mGroupId.isNull());
|
||||
|
||||
action = contextMnu.addAction(QIcon(IMAGE_EDIT), tr("Edit Wiki Group"), this, SLOT(editGroupDetails()));
|
||||
action->setEnabled (!mGroupId.isNull() && IS_GROUP_ADMIN(subscribeFlags));
|
||||
|
|
|
@ -370,7 +370,7 @@ void GxsChannelDialog::openChat(const RsPeerId & /*peerId*/)
|
|||
|
||||
void GxsChannelDialog::editChannelDetail()
|
||||
{
|
||||
if (mChannelId.empty()) {
|
||||
if (mChannelId.isNull()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -799,7 +799,7 @@ void GxsChannelDialog::subscribeChannel()
|
|||
|
||||
void GxsChannelDialog::showChannelDetails()
|
||||
{
|
||||
if (mChannelId.empty()) {
|
||||
if (mChannelId.isNull()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue