diff --git a/retroshare-gui/src/gui/Posted/PostedDialog.cpp b/retroshare-gui/src/gui/Posted/PostedDialog.cpp index 15ce3139b..f1837da3b 100644 --- a/retroshare-gui/src/gui/Posted/PostedDialog.cpp +++ b/retroshare-gui/src/gui/Posted/PostedDialog.cpp @@ -193,7 +193,7 @@ GxsGroupDialog *PostedDialog::createGroupDialog(GxsGroupDialog::Mode mode, RsGxs int PostedDialog::shareKeyType() { //return POSTED_KEY_SHARE; - return 0; // Boards are public. By the time we offer the possibility to make them restricted, we need to not show the 'share publish permission' entry in the drop menu. + return GroupShareKey::NO_KEY_SHARE; // Boards are public. By the time we offer the possibility to make them restricted, we need to not show the 'share publish permission' entry in the drop menu. } GxsMessageFrameWidget *PostedDialog::createMessageFrameWidget(const RsGxsGroupId &groupId) diff --git a/retroshare-gui/src/gui/gxs/GxsGroupShareKey.h b/retroshare-gui/src/gui/gxs/GxsGroupShareKey.h index ed8df360a..441d5e41d 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupShareKey.h +++ b/retroshare-gui/src/gui/gxs/GxsGroupShareKey.h @@ -25,9 +25,6 @@ #include "ui_GxsGroupShareKey.h" -#define CHANNEL_KEY_SHARE 0x00000001 -#define FORUM_KEY_SHARE 0x00000002 -#define POSTED_KEY_SHARE 0x00000003 class GroupShareKey : public QDialog { @@ -40,6 +37,13 @@ public: GroupShareKey(QWidget *parent = 0, const RsGxsGroupId& grpId = RsGxsGroupId(), int grpType = 0); ~GroupShareKey(); + enum KeyShareType: uint8_t { + NO_KEY_SHARE = 0x00000000, + CHANNEL_KEY_SHARE = 0x00000001, + FORUM_KEY_SHARE = 0x00000002, + POSTED_KEY_SHARE = 0x00000003, + }; + protected: void changeEvent(QEvent *e); diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp index 5d08ea707..e18a161a3 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp @@ -207,7 +207,7 @@ GxsGroupDialog *GxsChannelDialog::createGroupDialog(GxsGroupDialog::Mode mode, R int GxsChannelDialog::shareKeyType() { - return CHANNEL_KEY_SHARE; + return GroupShareKey::CHANNEL_KEY_SHARE; } GxsMessageFrameWidget *GxsChannelDialog::createMessageFrameWidget(const RsGxsGroupId &groupId)