Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 16:39:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed pointer to QStringList in QHash, causing memory loss

Browse Source
This commit is contained in:
csoler 2016-04-20 20:21:29 -04:00
parent aba3d2fb35
commit d6ae71ebc8
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
retroshare-gui/src/util/HandleRichText.cpp
View File

@ -658,7 +658,7 @@ static void findBestColor(QString &val, qreal bglum, qreal desiredContrast)
*/ */
static void optimizeHtml(QDomDocument& doc static void optimizeHtml(QDomDocument& doc
, QDomElement& currentElement , QDomElement& currentElement
, QHash<QString, QStringList*> &stylesList , QHash<QString, QStringList> &stylesList
, QHash<QString, QString> &knownStyle) , QHash<QString, QString> &knownStyle)
{ {
if (doc.documentElement().namedItem("style").toElement().attributeNode("RSOptimized").isAttr()) { if (doc.documentElement().namedItem("style").toElement().attributeNode("RSOptimized").isAttr()) {
@ -677,10 +677,10 @@ static void optimizeHtml(QDomDocument& doc
QString keyvalue = pair.at(1); QString keyvalue = pair.at(1);
keyvalue.replace(";",""); keyvalue.replace(";","");
QStringList classUsingIt(pair.at(0).split(',')); QStringList classUsingIt(pair.at(0).split(','));
QStringList* exported = new QStringList(); QStringList exported ;
foreach (QString keyVal, classUsingIt) { foreach (QString keyVal, classUsingIt) {
if(!keyVal.trimmed().isEmpty()) { if(!keyVal.trimmed().isEmpty()) {
exported->append(keyVal.trimmed().replace(".","")); exported.append(keyVal.trimmed().replace(".",""));
} }
} }
@ -805,14 +805,10 @@ static void optimizeHtml(QDomDocument& doc
foreach (QString pair, styles) { foreach (QString pair, styles) {
pair.replace(" ",""); pair.replace(" ","");
if (!pair.isEmpty()) { if (!pair.isEmpty()) {
QStringList* stylesListItem = stylesList.value(pair); QStringList& stylesListItem = stylesList[pair];
if(!stylesListItem){
// If value doesn't exist create it
stylesListItem = new QStringList();
stylesList.insert(pair, stylesListItem);
}
//Add the new class to this value //Add the new class to this value
stylesListItem->push_back(className); stylesListItem.push_back(className);
} }
} }
} }
@ -846,7 +842,7 @@ static void optimizeHtml(QDomDocument& doc
* @param desiredMinimumFontSize: Minimum font size. * @param desiredMinimumFontSize: Minimum font size.
*/ */
static void styleCreate(QDomDocument& doc static void styleCreate(QDomDocument& doc
, QHash<QString, QStringList*> stylesList , QHash<QString, QStringList>& stylesList
, unsigned int flag , unsigned int flag
, qreal bglum , qreal bglum
, qreal desiredContrast , qreal desiredContrast
@ -886,12 +882,12 @@ static void styleCreate(QDomDocument& doc
QString style = ""; QString style = "";
QHashIterator<QString, QStringList*> it(stylesList); QHashIterator<QString, QStringList> it(stylesList);
while(it.hasNext()) { while(it.hasNext()) {
it.next(); it.next();
QStringList* classUsingIt = it.value(); const QStringList& classUsingIt ( it.value()) ;
bool first = true; bool first = true;
foreach(QString className, *classUsingIt) { foreach(QString className, classUsingIt) {
if (!className.trimmed().isEmpty()) { if (!className.trimmed().isEmpty()) {
style += QString(first?".":",.") + className;// + " "; style += QString(first?".":",.") + className;// + " ";
first = false; first = false;
@ -1007,7 +1003,8 @@ void RsHtml::optimizeHtml(QString &text, unsigned int flag /*= 0*/
} }
QDomElement body = doc.documentElement(); QDomElement body = doc.documentElement();
QHash<QString, QStringList*> stylesList;
QHash<QString, QStringList> stylesList;
QHash<QString, QString> knownStyle; QHash<QString, QString> knownStyle;
::optimizeHtml(doc, body, stylesList, knownStyle); ::optimizeHtml(doc, body, stylesList, knownStyle);