Fix for 'Remove All entries from this domain' on history item

fnkkio · fnkkio · commit 3cf9dac0666b · 2019-11-12T18:47:40.000+02:00
diff --git a/src/modules/windows/history/HistoryContentsWidget.cpp b/src/modules/windows/history/HistoryContentsWidget.cpp
@@ -187,7 +187,7 @@ void HistoryContentsWidget::removeDomainEntries()
 		return;
 	}
 
-	const QString host(QUrl(domainItem->text()).host());
+	const QString host(QUrl(domainItem->text()).host().remove(QRegExp("^www.")));
 	QVector<quint64> entries;
 
 	for (int i = 0; i < m_model->rowCount(); ++i)
@@ -203,7 +203,7 @@ void HistoryContentsWidget::removeDomainEntries()
 		{
 			const QStandardItem *entryItem(groupItem->child(j, 0));
 
-			if (entryItem && host == QUrl(entryItem->text()).host())
+			if (entryItem && host == QUrl(entryItem->text()).host().remove(QRegExp("^www.")))
 			{
 				entries.append(entryItem->data(IdentifierRole).toULongLong());
 			}

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ void HistoryContentsWidget::removeDomainEntries()`
`187`	`187`	`return;`
`188`	`188`	`}`
`189`	`189`
`190`		`- const QString host(QUrl(domainItem->text()).host());`
	`190`	`+ const QString host(QUrl(domainItem->text()).host().remove(QRegExp("^www.")));`
`191`	`191`	`QVector<quint64> entries;`
`192`	`192`
`193`	`193`	`for (int i = 0; i < m_model->rowCount(); ++i)`
`@@ -203,7 +203,7 @@ void HistoryContentsWidget::removeDomainEntries()`
`203`	`203`	`{`
`204`	`204`	`const QStandardItem *entryItem(groupItem->child(j, 0));`
`205`	`205`
`206`		`- if (entryItem && host == QUrl(entryItem->text()).host())`
	`206`	`+ if (entryItem && host == QUrl(entryItem->text()).host().remove(QRegExp("^www.")))`
`207`	`207`	`{`
`208`	`208`	`entries.append(entryItem->data(IdentifierRole).toULongLong());`
`209`	`209`	`}`