mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-12 19:12:28 -04:00
* Switched to new rsFiles interface.
* Updated Transfers/SharedFiles/Messages.. etc Dialogs. * Disabled 'Recommendation Lists' for the moment. * updated Interface files. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@631 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
be392405e8
commit
32973f0838
13 changed files with 215 additions and 213 deletions
|
@ -24,6 +24,7 @@
|
|||
#include "SearchDialog.h"
|
||||
#include "rsiface/rsiface.h"
|
||||
#include "rsiface/rsexpr.h"
|
||||
#include "rsiface/rsfiles.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
|
@ -226,10 +227,10 @@ void SearchDialog::download()
|
|||
// call the download
|
||||
if (item->text(SR_ID_COL) != "Local")
|
||||
{
|
||||
rsicontrol -> FileRequest((item->text(SR_NAME_COL)).toStdString(),
|
||||
rsFiles -> FileRequest((item->text(SR_NAME_COL)).toStdString(),
|
||||
(item->text(SR_HASH_COL)).toStdString(),
|
||||
(item->text(SR_SIZE_COL)).toInt(),
|
||||
"");
|
||||
"", 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -378,7 +379,7 @@ void SearchDialog::advancedSearch(Expression* expression)
|
|||
|
||||
/* call to core */
|
||||
std::list<FileDetail> results;
|
||||
rsicontrol -> SearchBoolExp(expression, results);
|
||||
rsFiles -> SearchBoolExp(expression, results);
|
||||
|
||||
/* abstraction to allow reusee of tree rendering code */
|
||||
resultsToTree((advSearchDialog->getSearchAsString()).toStdString(), results);
|
||||
|
@ -412,7 +413,7 @@ void SearchDialog::searchKeywords()
|
|||
std::list<FileDetail> initialResults;
|
||||
std::list<FileDetail> * finalResults = 0;
|
||||
|
||||
rsicontrol -> SearchKeywords(words, initialResults);
|
||||
rsFiles -> SearchKeywords(words, initialResults);
|
||||
/* which extensions do we use? */
|
||||
QString qExt, qName;
|
||||
int extIndex;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue