merge of branch v0.6-idclean 7180

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

View file

@ -78,9 +78,9 @@ void clearGroupTree();
void updateWikiPage(const RsWikiSnapshot &page);
bool getSelectedPage(std::string &groupId, std::string &pageId, std::string &origPageId);
bool getSelectedPage(RsGxsGroupId &groupId, RsGxsMessageId &pageId, RsGxsMessageId &origPageId);
std::string getSelectedPage();
std::string getSelectedGroup();
const RsGxsGroupId &getSelectedGroup();
// Using GroupTreeWidget.
@ -106,7 +106,7 @@ void loadWikiPage(const uint32_t &token);
WikiEditDialog *mEditDialog;
std::string mGroupSelected;
std::string mPageSelected;
RsGxsMessageId mPageSelected;
std::string mModSelected;
@ -114,7 +114,7 @@ void loadWikiPage(const uint32_t &token);
QTreeWidgetItem *mSubscribedGroups;
QTreeWidgetItem *mPopularGroups;
QTreeWidgetItem *mOtherGroups;
std::string mGroupId; // From GroupTreeWidget
RsGxsGroupId mGroupId; // From GroupTreeWidget
/* UI - from Designer */
Ui::WikiDialog ui;