Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-25 17:21:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed memory leak in GuiExprElement.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8527 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2015-06-18 16:29:29 +00:00
parent 3bc17bf3c2
commit a0c0b9afa5
3 changed files with 103 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/advsearch/expressionwidget.cpp
View File

@ -99,7 +99,7 @@ bool ExpressionWidget::isStringSearchExpression()
void ExpressionWidget::adjustExprForTermType(int index) void ExpressionWidget::adjustExprForTermType(int index)
{ {
ExprSearchType type = (*GuiExprElement::TermsIndexMap)[index]; ExprSearchType type = GuiExprElement::TermsIndexMap[index];
searchType = type; searchType = type;
// now adjust the relevant elements // now adjust the relevant elements

181
retroshare-gui/src/gui/advsearch/guiexprelement.cpp
View File

@ -55,21 +55,21 @@ const int GuiExprElement::GTE_INDEX = 3;
const int GuiExprElement::GT_INDEX = 4; const int GuiExprElement::GT_INDEX = 4;
const int GuiExprElement::RANGE_INDEX = 5; const int GuiExprElement::RANGE_INDEX = 5;
QStringList * GuiExprElement::exprOpsList = new QStringList(); QStringList GuiExprElement::exprOpsList;
QStringList * GuiExprElement::searchTermsOptionsList = new QStringList(); QStringList GuiExprElement::searchTermsOptionsList;
QStringList * GuiExprElement::stringOptionsList = new QStringList(); QStringList GuiExprElement::stringOptionsList;
QStringList * GuiExprElement::relOptionsList = new QStringList(); QStringList GuiExprElement::relOptionsList;
QMap<int, ExprSearchType> * GuiExprElement::TermsIndexMap = new QMap<int, ExprSearchType>(); QMap<int, ExprSearchType> GuiExprElement::TermsIndexMap;
QMap<int, LogicalOperator> * GuiExprElement::logicalOpIndexMap = new QMap<int, LogicalOperator>(); QMap<int, LogicalOperator> GuiExprElement::logicalOpIndexMap;
QMap<int, StringOperator> * GuiExprElement::strConditionIndexMap = new QMap<int, StringOperator>(); QMap<int, StringOperator> GuiExprElement::strConditionIndexMap;
QMap<int, RelOperator> * GuiExprElement::relConditionIndexMap = new QMap<int, RelOperator>(); QMap<int, RelOperator> GuiExprElement::relConditionIndexMap;
QMap<int, QString> * GuiExprElement::logicalOpStrMap = new QMap<int, QString>(); QMap<int, QString> GuiExprElement::logicalOpStrMap;
QMap<int, QString> * GuiExprElement::termsStrMap = new QMap<int, QString>(); QMap<int, QString> GuiExprElement::termsStrMap;
QMap<int, QString> * GuiExprElement::strConditionStrMap = new QMap<int, QString>(); QMap<int, QString> GuiExprElement::strConditionStrMap;
QMap<int, QString> * GuiExprElement::relConditionStrMap = new QMap<int, QString>(); QMap<int, QString> GuiExprElement::relConditionStrMap;
bool GuiExprElement::initialised = false; bool GuiExprElement::initialised = false;
@ -114,48 +114,48 @@ void GuiExprElement::initialiseOptionsLists()
const QString GT = tr("greater than"); const QString GT = tr("greater than");
const QString RANGE = tr("is in range"); const QString RANGE = tr("is in range");
exprOpsList->append(AND); exprOpsList.append(AND);
exprOpsList->append(OR); exprOpsList.append(OR);
exprOpsList->append(XOR); exprOpsList.append(XOR);
GuiExprElement::searchTermsOptionsList->append(NAME); GuiExprElement::searchTermsOptionsList.append(NAME);
GuiExprElement::searchTermsOptionsList->append(PATH); GuiExprElement::searchTermsOptionsList.append(PATH);
GuiExprElement::searchTermsOptionsList->append(EXT); GuiExprElement::searchTermsOptionsList.append(EXT);
GuiExprElement::searchTermsOptionsList->append(HASH); GuiExprElement::searchTermsOptionsList.append(HASH);
//GuiExprElement::searchTermsOptionsList->append(KEYWORDS); //GuiExprElement::searchTermsOptionsList.append(KEYWORDS);
//GuiExprElement::searchTermsOptionsList->append(COMMENTS); //GuiExprElement::searchTermsOptionsList.append(COMMENTS);
//GuiExprElement::searchTermsOptionsList->append(META); //GuiExprElement::searchTermsOptionsList.append(META);
GuiExprElement::searchTermsOptionsList->append(DATE); GuiExprElement::searchTermsOptionsList.append(DATE);
GuiExprElement::searchTermsOptionsList->append(SIZE); GuiExprElement::searchTermsOptionsList.append(SIZE);
// GuiExprElement::searchTermsOptionsList->append(POP); // GuiExprElement::searchTermsOptionsList.append(POP);
GuiExprElement::stringOptionsList->append(CONTAINS); GuiExprElement::stringOptionsList.append(CONTAINS);
GuiExprElement::stringOptionsList->append(CONTALL); GuiExprElement::stringOptionsList.append(CONTALL);
GuiExprElement::stringOptionsList->append(IS); GuiExprElement::stringOptionsList.append(IS);
GuiExprElement::relOptionsList->append(LT); GuiExprElement::relOptionsList.append(LT);
GuiExprElement::relOptionsList->append(LTE); GuiExprElement::relOptionsList.append(LTE);
GuiExprElement::relOptionsList->append(EQUAL); GuiExprElement::relOptionsList.append(EQUAL);
GuiExprElement::relOptionsList->append(GTE); GuiExprElement::relOptionsList.append(GTE);
GuiExprElement::relOptionsList->append(GT); GuiExprElement::relOptionsList.append(GT);
GuiExprElement::relOptionsList->append(RANGE); GuiExprElement::relOptionsList.append(RANGE);
// now the maps // now the maps
(*GuiExprElement::logicalOpIndexMap)[GuiExprElement::AND_INDEX] = AndOp; GuiExprElement::logicalOpIndexMap[GuiExprElement::AND_INDEX] = AndOp;
(*GuiExprElement::logicalOpIndexMap)[GuiExprElement::OR_INDEX] = OrOp; GuiExprElement::logicalOpIndexMap[GuiExprElement::OR_INDEX] = OrOp;
(*GuiExprElement::logicalOpIndexMap)[GuiExprElement::XOR_INDEX] = XorOp; GuiExprElement::logicalOpIndexMap[GuiExprElement::XOR_INDEX] = XorOp;
(*GuiExprElement::TermsIndexMap)[GuiExprElement::NAME_INDEX] = NameSearch; GuiExprElement::TermsIndexMap[GuiExprElement::NAME_INDEX] = NameSearch;
(*GuiExprElement::TermsIndexMap)[GuiExprElement::PATH_INDEX] = PathSearch; GuiExprElement::TermsIndexMap[GuiExprElement::PATH_INDEX] = PathSearch;
(*GuiExprElement::TermsIndexMap)[GuiExprElement::EXT_INDEX] = ExtSearch; GuiExprElement::TermsIndexMap[GuiExprElement::EXT_INDEX] = ExtSearch;
(*GuiExprElement::TermsIndexMap)[GuiExprElement::HASH_INDEX] = HashSearch; GuiExprElement::TermsIndexMap[GuiExprElement::HASH_INDEX] = HashSearch;
(*GuiExprElement::TermsIndexMap)[GuiExprElement::DATE_INDEX] = DateSearch; GuiExprElement::TermsIndexMap[GuiExprElement::DATE_INDEX] = DateSearch;
(*GuiExprElement::TermsIndexMap)[GuiExprElement::SIZE_INDEX] = SizeSearch; GuiExprElement::TermsIndexMap[GuiExprElement::SIZE_INDEX] = SizeSearch;
(*GuiExprElement::TermsIndexMap)[GuiExprElement::POP_INDEX] = PopSearch; GuiExprElement::TermsIndexMap[GuiExprElement::POP_INDEX] = PopSearch;
(*GuiExprElement::strConditionIndexMap)[GuiExprElement::CONTAINS_INDEX] = ContainsAnyStrings; GuiExprElement::strConditionIndexMap[GuiExprElement::CONTAINS_INDEX] = ContainsAnyStrings;
(*GuiExprElement::strConditionIndexMap)[GuiExprElement::CONTALL_INDEX] = ContainsAllStrings; GuiExprElement::strConditionIndexMap[GuiExprElement::CONTALL_INDEX] = ContainsAllStrings;
(*GuiExprElement::strConditionIndexMap)[GuiExprElement::IS_INDEX] = EqualsString; GuiExprElement::strConditionIndexMap[GuiExprElement::IS_INDEX] = EqualsString;
/* W A R N I N G !!!! /* W A R N I N G !!!!
the cb elements correspond to their inverse rel op counterparts in rsexpr.h due to the nature of the cb elements correspond to their inverse rel op counterparts in rsexpr.h due to the nature of
@ -166,58 +166,57 @@ void GuiExprElement::initialiseOptionsLists()
files where the condition is greater than the file size i.e. files whose size is less than or equal to the condition files where the condition is greater than the file size i.e. files whose size is less than or equal to the condition
Therefore we invert the mapping of rel conditions here to match the behaviour of the impl. Therefore we invert the mapping of rel conditions here to match the behaviour of the impl.
*/ */
(*GuiExprElement::relConditionIndexMap)[GuiExprElement::LT_INDEX] = GreaterEquals; GuiExprElement::relConditionIndexMap[GuiExprElement::LT_INDEX] = GreaterEquals;
(*GuiExprElement::relConditionIndexMap)[GuiExprElement::LTE_INDEX] = Greater; GuiExprElement::relConditionIndexMap[GuiExprElement::LTE_INDEX] = Greater;
(*GuiExprElement::relConditionIndexMap)[GuiExprElement::EQUAL_INDEX] = Equals; GuiExprElement::relConditionIndexMap[GuiExprElement::EQUAL_INDEX] = Equals;
(*GuiExprElement::relConditionIndexMap)[GuiExprElement::GTE_INDEX] = Smaller; GuiExprElement::relConditionIndexMap[GuiExprElement::GTE_INDEX] = Smaller;
(*GuiExprElement::relConditionIndexMap)[GuiExprElement::GT_INDEX] = SmallerEquals; GuiExprElement::relConditionIndexMap[GuiExprElement::GT_INDEX] = SmallerEquals;
(*GuiExprElement::relConditionIndexMap)[GuiExprElement::RANGE_INDEX] = InRange; GuiExprElement::relConditionIndexMap[GuiExprElement::RANGE_INDEX] = InRange;
// the string to index map // the string to index map
(*GuiExprElement::termsStrMap)[GuiExprElement::NAME_INDEX] = NAME; GuiExprElement::termsStrMap[GuiExprElement::NAME_INDEX] = NAME;
(*GuiExprElement::termsStrMap)[GuiExprElement::PATH_INDEX] = PATH; GuiExprElement::termsStrMap[GuiExprElement::PATH_INDEX] = PATH;
(*GuiExprElement::termsStrMap)[GuiExprElement::EXT_INDEX] = EXT; GuiExprElement::termsStrMap[GuiExprElement::EXT_INDEX] = EXT;
(*GuiExprElement::termsStrMap)[GuiExprElement::HASH_INDEX] = HASH; GuiExprElement::termsStrMap[GuiExprElement::HASH_INDEX] = HASH;
(*GuiExprElement::termsStrMap)[GuiExprElement::DATE_INDEX] = DATE; GuiExprElement::termsStrMap[GuiExprElement::DATE_INDEX] = DATE;
(*GuiExprElement::termsStrMap)[GuiExprElement::SIZE_INDEX] = SIZE; GuiExprElement::termsStrMap[GuiExprElement::SIZE_INDEX] = SIZE;
(*GuiExprElement::termsStrMap)[GuiExprElement::POP_INDEX] = POP; GuiExprElement::termsStrMap[GuiExprElement::POP_INDEX] = POP;
(*GuiExprElement::logicalOpStrMap)[GuiExprElement::AND_INDEX] = AND; GuiExprElement::logicalOpStrMap[GuiExprElement::AND_INDEX] = AND;
(*GuiExprElement::logicalOpStrMap)[GuiExprElement::XOR_INDEX] = XOR; GuiExprElement::logicalOpStrMap[GuiExprElement::XOR_INDEX] = XOR;
(*GuiExprElement::logicalOpStrMap)[GuiExprElement::OR_INDEX] = OR; GuiExprElement::logicalOpStrMap[GuiExprElement::OR_INDEX] = OR;
(*GuiExprElement::strConditionStrMap)[GuiExprElement::CONTAINS_INDEX] = CONTAINS; GuiExprElement::strConditionStrMap[GuiExprElement::CONTAINS_INDEX] = CONTAINS;
(*GuiExprElement::strConditionStrMap)[GuiExprElement::CONTALL_INDEX] = CONTALL; GuiExprElement::strConditionStrMap[GuiExprElement::CONTALL_INDEX] = CONTALL;
(*GuiExprElement::strConditionStrMap)[GuiExprElement::IS_INDEX] = IS; GuiExprElement::strConditionStrMap[GuiExprElement::IS_INDEX] = IS;
(*GuiExprElement::relConditionStrMap)[GuiExprElement::LT_INDEX] = LT; GuiExprElement::relConditionStrMap[GuiExprElement::LT_INDEX] = LT;
(*GuiExprElement::relConditionStrMap)[GuiExprElement::LTE_INDEX] = LTE; GuiExprElement::relConditionStrMap[GuiExprElement::LTE_INDEX] = LTE;
(*GuiExprElement::relConditionStrMap)[GuiExprElement::EQUAL_INDEX] = EQUAL; GuiExprElement::relConditionStrMap[GuiExprElement::EQUAL_INDEX] = EQUAL;
(*GuiExprElement::relConditionStrMap)[GuiExprElement::GTE_INDEX] = GTE; GuiExprElement::relConditionStrMap[GuiExprElement::GTE_INDEX] = GTE;
(*GuiExprElement::relConditionStrMap)[GuiExprElement::GT_INDEX] = GT; GuiExprElement::relConditionStrMap[GuiExprElement::GT_INDEX] = GT;
(*GuiExprElement::relConditionStrMap)[GuiExprElement::RANGE_INDEX] = RANGE; GuiExprElement::relConditionStrMap[GuiExprElement::RANGE_INDEX] = RANGE;
GuiExprElement::initialised = true; GuiExprElement::initialised = true;
} }
QStringList* GuiExprElement::getConditionOptions(ExprSearchType t) QStringList GuiExprElement::getConditionOptions(ExprSearchType t)
{ {
QStringList * list = new QStringList();
switch (t) { switch (t) {
case NameSearch: case NameSearch:
case PathSearch: case PathSearch:
case ExtSearch: case ExtSearch:
case HashSearch: case HashSearch:
list = GuiExprElement::stringOptionsList; return GuiExprElement::stringOptionsList;
break; break;
case DateSearch: case DateSearch:
case PopSearch: case PopSearch:
case SizeSearch: case SizeSearch:
default: default:
list = GuiExprElement::relOptionsList; return GuiExprElement::relOptionsList;
} }
return list; return QStringList();
} }
QHBoxLayout * GuiExprElement::createLayout(QWidget * parent) QHBoxLayout * GuiExprElement::createLayout(QWidget * parent)
@ -251,19 +250,19 @@ ExprOpElement::ExprOpElement(QWidget * parent)
internalframe->setLayout(createLayout()); internalframe->setLayout(createLayout());
cb = new QComboBox(this); cb = new QComboBox(this);
cb->setMinimumSize(LOGICAL_OP_CB_WIDTH, FIELDS_MIN_HEIGHT); cb->setMinimumSize(LOGICAL_OP_CB_WIDTH, FIELDS_MIN_HEIGHT);
cb->addItems(*(GuiExprElement::exprOpsList)); cb->addItems(GuiExprElement::exprOpsList);
internalframe->layout()->addWidget(cb); internalframe->layout()->addWidget(cb);
} }
QString ExprOpElement::toString() QString ExprOpElement::toString()
{ {
return (*GuiExprElement::logicalOpStrMap)[cb->currentIndex()]; return GuiExprElement::logicalOpStrMap[cb->currentIndex()];
} }
LogicalOperator ExprOpElement::getLogicalOperator() LogicalOperator ExprOpElement::getLogicalOperator()
{ {
return (*GuiExprElement::logicalOpIndexMap)[cb->currentIndex()]; return GuiExprElement::logicalOpIndexMap[cb->currentIndex()];
} }
@ -279,12 +278,12 @@ ExprTermsElement::ExprTermsElement(QWidget * parent)
cb->setMinimumSize(STD_CB_WIDTH, FIELDS_MIN_HEIGHT); cb->setMinimumSize(STD_CB_WIDTH, FIELDS_MIN_HEIGHT);
connect (cb, SIGNAL(currentIndexChanged(int)), connect (cb, SIGNAL(currentIndexChanged(int)),
this, SIGNAL(currentIndexChanged(int))); this, SIGNAL(currentIndexChanged(int)));
cb->addItems(*(GuiExprElement::searchTermsOptionsList)); cb->addItems(GuiExprElement::searchTermsOptionsList);
internalframe->layout()->addWidget(cb); internalframe->layout()->addWidget(cb);
} }
QString ExprTermsElement::toString() QString ExprTermsElement::toString()
{ {
return (*GuiExprElement::termsStrMap)[cb->currentIndex()]; return GuiExprElement::termsStrMap[cb->currentIndex()];
} }
/* ******************************************************************/ /* ******************************************************************/
@ -299,37 +298,35 @@ ExprConditionElement::ExprConditionElement(ExprSearchType type, QWidget * parent
cb->setMinimumSize(CONDITION_CB_WIDTH, FIELDS_MIN_HEIGHT); cb->setMinimumSize(CONDITION_CB_WIDTH, FIELDS_MIN_HEIGHT);
connect (cb, SIGNAL(currentIndexChanged(int)), connect (cb, SIGNAL(currentIndexChanged(int)),
this, SIGNAL(currentIndexChanged(int))); this, SIGNAL(currentIndexChanged(int)));
cb->addItems(*(getConditionOptions(type))); cb->addItems(getConditionOptions(type));
internalframe->layout()->addWidget(cb); internalframe->layout()->addWidget(cb);
} }
QString ExprConditionElement::toString() QString ExprConditionElement::toString()
{ {
QString str = "";
if (isStringSearchExpression()) if (isStringSearchExpression())
{ {
str = (*GuiExprElement::strConditionStrMap)[cb->currentIndex()]; return GuiExprElement::strConditionStrMap[cb->currentIndex()];
} else { }
str = (*GuiExprElement::relConditionStrMap)[cb->currentIndex()];
} return GuiExprElement::relConditionStrMap[cb->currentIndex()];
return str;
} }
RelOperator ExprConditionElement::getRelOperator() RelOperator ExprConditionElement::getRelOperator()
{ {
return (*GuiExprElement::relConditionIndexMap)[cb->currentIndex()]; return GuiExprElement::relConditionIndexMap[cb->currentIndex()];
} }
StringOperator ExprConditionElement::getStringOperator() StringOperator ExprConditionElement::getStringOperator()
{ {
return (*GuiExprElement::strConditionIndexMap)[cb->currentIndex()]; return GuiExprElement::strConditionIndexMap[cb->currentIndex()];
} }
void ExprConditionElement::adjustForSearchType(ExprSearchType type) void ExprConditionElement::adjustForSearchType(ExprSearchType type)
{ {
cb->clear(); cb->clear();
cb->addItems(*(getConditionOptions(type))); cb->addItems(getConditionOptions(type));
searchType = type; searchType = type;
} }

26
retroshare-gui/src/gui/advsearch/guiexprelement.h
View File

@ -90,7 +90,7 @@ public:
static const int GT_INDEX; static const int GT_INDEX;
static const int RANGE_INDEX; static const int RANGE_INDEX;
static QMap<int, ExprSearchType> * TermsIndexMap; static QMap<int, ExprSearchType> TermsIndexMap;
virtual QString toString(){return QString("");} virtual QString toString(){return QString("");}
@ -100,7 +100,7 @@ protected:
/** provides the appropriate options list for the /** provides the appropriate options list for the
condition combobox */ condition combobox */
QStringList* getConditionOptions(ExprSearchType t); QStringList getConditionOptions(ExprSearchType t);
QHBoxLayout* createLayout(QWidget* parent = 0); QHBoxLayout* createLayout(QWidget* parent = 0);
QFrame * internalframe; QFrame * internalframe;
@ -108,21 +108,21 @@ protected:
ExprSearchType searchType; ExprSearchType searchType;
static bool initialised; static bool initialised;
static QStringList * exprOpsList; static QStringList exprOpsList;
static QStringList * searchTermsOptionsList; static QStringList searchTermsOptionsList;
static QStringList * stringOptionsList; static QStringList stringOptionsList;
static QStringList * relOptionsList; static QStringList relOptionsList;
// provides a mapping of condition operators to RSExpr reloperators // provides a mapping of condition operators to RSExpr reloperators
static QMap<int, LogicalOperator> * logicalOpIndexMap; static QMap<int, LogicalOperator> logicalOpIndexMap;
static QMap<int, StringOperator> * strConditionIndexMap; static QMap<int, StringOperator> strConditionIndexMap;
static QMap<int, RelOperator> * relConditionIndexMap; static QMap<int, RelOperator> relConditionIndexMap;
// provides a mapping of indexes to translatable strings // provides a mapping of indexes to translatable strings
static QMap<int, QString> * logicalOpStrMap; static QMap<int, QString> logicalOpStrMap;
static QMap<int, QString> * termsStrMap; static QMap<int, QString> termsStrMap;
static QMap<int, QString> * strConditionStrMap; static QMap<int, QString> strConditionStrMap;
static QMap<int, QString> * relConditionStrMap; static QMap<int, QString> relConditionStrMap;
}; };