sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

update also htmlToMarkdown in the crash report fix #31629

Browse Source
This commit is contained in:
Etienne Trimaille 2020-03-28 09:42:40 +01:00 committed by Nyall Dawson
parent a6113f0789
commit 55ca2a4dde
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/qgsstringutils.cpp
View File

@ -556,7 +556,7 @@ QString QgsStringUtils::insertLinks( const QString &string, bool *foundLinks )
QString QgsStringUtils::htmlToMarkdown( const QString &html )
{
// Any changes in this function must be copied to qgscrashreport.cpp too
QString converted = html;
converted.replace( QLatin1String( "<br>" ), QLatin1String( "\n" ) );
converted.replace( QLatin1String( "<b>" ), QLatin1String( "**" ) );
@ -567,7 +567,7 @@ QString QgsStringUtils::htmlToMarkdown( const QString &html )
while ( hrefRegEx.indexIn( converted, offset ) != -1 )
{
QString url = hrefRegEx.cap( 1 ).replace( QStringLiteral( "\"" ), QString() );
url.replace( QStringLiteral( "'" ), QString() );
url.replace( '\'', QString() );
QString name = hrefRegEx.cap( 2 );
QString anchor = QStringLiteral( "[%1](%2)" ).arg( name, url );
converted.replace( hrefRegEx, anchor );

2
src/crashhandler/qgscrashreport.cpp
View File

@ -171,6 +171,7 @@ QString QgsCrashReport::crashReportFolder()
QString QgsCrashReport::htmlToMarkdown( const QString &html )
{
// Any changes in this function must be copied to qgsstringutils.cpp too
QString converted = html;
converted.replace( QLatin1String( "<br>" ), QLatin1String( "\n" ) );
converted.replace( QLatin1String( "<b>" ), QLatin1String( "**" ) );
@ -181,6 +182,7 @@ QString QgsCrashReport::htmlToMarkdown( const QString &html )
while ( hrefRegEx.indexIn( converted, offset ) != -1 )
{
QString url = hrefRegEx.cap( 1 ).replace( QStringLiteral( "\"" ), QString() );
url.replace( '\'', QString() );
QString name = hrefRegEx.cap( 2 );
QString anchor = QStringLiteral( "[%1](%2)" ).arg( name, url );
converted.replace( hrefRegEx, anchor );