Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-21 13:49:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

added structures for generic turtle search and access functions in Gxs objects

Browse source
This commit is contained in:
csoler 2018-06-06 23:15:29 +02:00
parent b5c1b8210b
commit 7caf06b57d
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
31 changed files with 513 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

6
retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
View file

@ -792,7 +792,7 @@ void SearchDialog::advancedSearch(RsRegularExpression::Expression* expression)
RsRegularExpression::LinearizedExpression e ;
expression->linearize(e) ;
TurtleRequestId req_id = rsTurtle->turtleSearch(e) ;
TurtleRequestId req_id = rsFiles->turtleSearch(e) ;
// This will act before turtle results come to the interface, thanks to the signals scheduling policy.
initSearchResult(QString::fromStdString(e.GetStrings()),req_id, ui.FileTypeComboBox->currentIndex(), true) ;
@ -858,9 +858,9 @@ void SearchDialog::searchKeywords(const QString& keywords)
if(ui._anonF2Fsearch_CB->isChecked())
{
if(n==1)
req_id = rsTurtle->turtleSearch(words.front()) ;
req_id = rsFiles->turtleSearch(words.front()) ;
else
req_id = rsTurtle->turtleSearch(lin_exp) ;
req_id = rsFiles->turtleSearch(lin_exp) ;
}
else
req_id = RSRandom::random_u32() ; // generate a random 32 bits request id

2
retroshare-gui/src/gui/notifyqt.h
View file

@ -23,7 +23,9 @@ class MessengerWindow;
class ToasterItem;
class ToasterNotify;
class SignatureEventData ;
struct TurtleFileInfo;
struct TurtleGxsInfo;
class NotifyQt: public QObject, public NotifyClient
{