mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-05 05:12:51 -04:00
- removed LinksCloud from plugins (based on obsolete cache system)
- removed copy constructor of RsGenericId from std::string as it allowed many inconsistencies and double transforms of IDs from/to strings git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7289 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
160e04fe9a
commit
33abca82e5
33 changed files with 97 additions and 143 deletions
|
@ -337,7 +337,7 @@ bool WikiDialog::getSelectedPage(RsGxsGroupId &groupId, RsGxsMessageId &pageId,
|
|||
return false;
|
||||
}
|
||||
|
||||
pageId = item->text(WIKI_GROUP_COL_PAGEID).toStdString();
|
||||
pageId = RsGxsMessageId(item->text(WIKI_GROUP_COL_PAGEID).toStdString());
|
||||
origPageId = RsGxsMessageId(item->text(WIKI_GROUP_COL_ORIGPAGEID).toStdString());
|
||||
|
||||
#ifdef WIKI_DEBUG
|
||||
|
@ -559,7 +559,7 @@ void WikiDialog::wikiSubscribe(bool subscribe)
|
|||
|
||||
void WikiDialog::wikiGroupChanged(const QString &groupId)
|
||||
{
|
||||
mGroupId = groupId.toStdString();
|
||||
mGroupId = RsGxsGroupId(groupId.toStdString());
|
||||
|
||||
if (mGroupId.isNull()) {
|
||||
return;
|
||||
|
|
|
@ -162,7 +162,7 @@ void WikiEditDialog::historySelected()
|
|||
|
||||
RsGxsGrpMsgIdPair newSnapshot = mThreadMsgIdPair;
|
||||
std::string pageId = item->data(WET_DATA_COLUMN, WET_ROLE_PAGEID).toString().toStdString();
|
||||
newSnapshot.second = pageId;
|
||||
newSnapshot.second = RsGxsMessageId(pageId);
|
||||
|
||||
std::cerr << "WikiEditDialog::historySelected() New PageId: " << pageId;
|
||||
std::cerr << std::endl;
|
||||
|
@ -469,10 +469,10 @@ void WikiEditDialog::submitEdit()
|
|||
if (mNewPage)
|
||||
{
|
||||
mWikiSnapshot.mMeta.mGroupId = mWikiCollection.mMeta.mGroupId;
|
||||
mWikiSnapshot.mMeta.mOrigMsgId = "";
|
||||
mWikiSnapshot.mMeta.mMsgId = "";
|
||||
mWikiSnapshot.mMeta.mParentId = "";
|
||||
mWikiSnapshot.mMeta.mThreadId = "";
|
||||
mWikiSnapshot.mMeta.mOrigMsgId.clear() ;
|
||||
mWikiSnapshot.mMeta.mMsgId.clear() ;
|
||||
mWikiSnapshot.mMeta.mParentId.clear() ;
|
||||
mWikiSnapshot.mMeta.mThreadId.clear() ;
|
||||
|
||||
std::cerr << "WikiEditDialog::submitEdit() Is New Page";
|
||||
std::cerr << std::endl;
|
||||
|
@ -484,9 +484,9 @@ void WikiEditDialog::submitEdit()
|
|||
// A New Version of the ThreadHead.
|
||||
mWikiSnapshot.mMeta.mGroupId = mWikiCollection.mMeta.mGroupId;
|
||||
mWikiSnapshot.mMeta.mOrigMsgId = mRepublishOrigId;
|
||||
mWikiSnapshot.mMeta.mParentId = "";
|
||||
mWikiSnapshot.mMeta.mThreadId = "";
|
||||
mWikiSnapshot.mMeta.mMsgId = "";
|
||||
mWikiSnapshot.mMeta.mParentId.clear() ;
|
||||
mWikiSnapshot.mMeta.mThreadId.clear() ;
|
||||
mWikiSnapshot.mMeta.mMsgId.clear() ;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue