napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamaresui] Move the format-string closer to where it is used

Browse Source
This commit is contained in:
Adriaan de Groot 2021-03-09 14:31:46 +01:00
parent 844831751d
commit 260862fabc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libcalamaresui/utils/Paste.cpp
View File

@ -52,7 +52,6 @@ ficheLogUpload( QObject* parent )
const QString& ficheHost = Calamares::Branding::instance()->uploadServer( Calamares::Branding::URL ); const QString& ficheHost = Calamares::Branding::instance()->uploadServer( Calamares::Branding::URL );
quint16 fichePort = Calamares::Branding::instance()->uploadServer( Calamares::Branding::Port ).toInt(); quint16 fichePort = Calamares::Branding::instance()->uploadServer( Calamares::Branding::Port ).toInt();
QString pasteUrlFmt = parent->tr( "Install log posted to\n\n%1\n\nLink copied to clipboard" );
QByteArray pasteData = logFileContents(); QByteArray pasteData = logFileContents();
if ( pasteData.isEmpty() ) if ( pasteData.isEmpty() )
@ -101,7 +100,9 @@ ficheLogUpload( QObject* parent )
QUrl pasteUrl = QUrl( QString( resp ).trimmed(), QUrl::StrictMode ); QUrl pasteUrl = QUrl( QString( resp ).trimmed(), QUrl::StrictMode );
QString pasteUrlStr = pasteUrl.toString(); QString pasteUrlStr = pasteUrl.toString();
QRegularExpression pasteUrlRegex( "^http[s]?://" + ficheHost ); QRegularExpression pasteUrlRegex( "^http[s]?://" + ficheHost );
QString pasteUrlMsg = QString( pasteUrlFmt ).arg( pasteUrlStr );
QString pasteUrlFmt = parent->tr( "Install log posted to\n\n%1\n\nLink copied to clipboard" );
QString pasteUrlMsg = pasteUrlFmt.arg( pasteUrlStr );
if ( nBytesRead >= 8 && pasteUrl.isValid() && pasteUrlRegex.match( pasteUrlStr ).hasMatch() ) if ( nBytesRead >= 8 && pasteUrl.isValid() && pasteUrlRegex.match( pasteUrlStr ).hasMatch() )
{ {