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

Merging branches/v0.6-initdev into trunk.

Browse source 
These split at 6672 -> 7075, so quite a bit merge.
libretroshare compiles - but untested.
retroshare-gui needs GenCertDialog.ui and IdEditDialog.ui to be properly merged. (compile errors).
some plugins will be broken.
retroshare-nogui is untested.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2014-02-01 14:16:15 +00:00
commit c0738eec7f
407 changed files with 23716 additions and 50779 deletions
Download patch file Download diff file Expand all files Collapse all files

15
retroshare-gui/src/gui/RetroShareLink.cpp
View file

@ -28,6 +28,7 @@
#include <QMessageBox>
#include <QIcon>
#include <QObject>
#include <time.h>
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
#include <QUrlQuery>
@ -35,8 +36,8 @@
#include "RetroShareLink.h"
#include "MainWindow.h"
#include "ForumsDialog.h"
#include "ChannelFeed.h"
//#include "ForumsDialog.h"
//#include "ChannelFeed.h"
#include "SearchDialog.h"
#include "msgs/MessageComposer.h"
#include "util/misc.h"
@ -49,8 +50,8 @@
#include <retroshare/rsfiles.h>
#include <retroshare/rsmsgs.h>
#include <retroshare/rspeers.h>
#include <retroshare/rsforums.h>
#include <retroshare/rschannels.h>
//#include <retroshare/rsforums.h>
//#include <retroshare/rschannels.h>
//#define DEBUG_RSLINK 1
@ -481,6 +482,7 @@ bool RetroShareLink::createForum(const std::string& id, const std::string& msgId
{
clear();
#if 0
if (!id.empty()) {
_hash = QString::fromStdString(id);
_msgId = QString::fromStdString(msgId);
@ -499,6 +501,7 @@ bool RetroShareLink::createForum(const std::string& id, const std::string& msgId
}
}
}
#endif
check();
@ -509,6 +512,7 @@ bool RetroShareLink::createChannel(const std::string& id, const std::string& msg
{
clear();
#if 0
if (!id.empty()) {
_hash = QString::fromStdString(id);
_msgId = QString::fromStdString(msgId);
@ -527,6 +531,7 @@ bool RetroShareLink::createChannel(const std::string& id, const std::string& msg
}
}
}
#endif
check();
@ -1370,6 +1375,7 @@ static void processList(const QStringList &list, const QString &textSingular, co
break;
}
#if 0
case TYPE_FORUM:
{
#ifdef DEBUG_RSLINK
@ -1461,6 +1467,7 @@ static void processList(const QStringList &list, const QString &textSingular, co
}
break;
}
#endif
case TYPE_SEARCH:
{