Move function-scope static QThreadStorage objects to namespace scope

to ensure destruction after all function-scope statics and avoid warning
"thread exited after QThreadStorage destroyed".
This commit is contained in:
Mat Sutcliffe
2019-01-05 16:49:20 +00:00
parent 1493106970
commit e7582f2f3c
4 changed files with 9 additions and 4 deletions

View File

@@ -116,6 +116,8 @@ namespace BlackGui
return (mw && mw->isFrameless());
}
static QThreadStorage<QRegularExpression> tsRegex;
bool CGuiUtility::lenientTitleComparison(const QString &title, const QString &comparison)
{
if (title == comparison) { return true; }
@@ -127,7 +129,6 @@ namespace BlackGui
if (t == c) { return true; }
// further unify
static QThreadStorage<QRegularExpression> tsRegex;
if (! tsRegex.hasLocalData()) { tsRegex.setLocalData(QRegularExpression("[^a-z0-9\\s]")); }
const QRegularExpression &regexp = tsRegex.localData();
t = t.remove(regexp);