Skip to content

Commit a02c970

Browse files
committed
qt, refactor: Revert explicit including QStringBuilder
1 parent 3fd3a0f commit a02c970

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

src/qt/bitcoin.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
#include <QLocale>
5151
#include <QMessageBox>
5252
#include <QSettings>
53-
#include <QStringBuilder>
5453
#include <QThread>
5554
#include <QTimer>
5655
#include <QTranslator>
@@ -419,8 +418,8 @@ void BitcoinApplication::handleRunawayException(const QString &message)
419418
{
420419
QMessageBox::critical(
421420
nullptr, tr("Runaway exception"),
422-
tr("A fatal error occurred. %1 can no longer continue safely and will quit.").arg(PACKAGE_NAME) %
423-
QLatin1String("<br><br>") % GUIUtil::MakeHtmlLink(message, PACKAGE_BUGREPORT));
421+
tr("A fatal error occurred. %1 can no longer continue safely and will quit.").arg(PACKAGE_NAME) +
422+
QLatin1String("<br><br>") + GUIUtil::MakeHtmlLink(message, PACKAGE_BUGREPORT));
424423
::exit(EXIT_FAILURE);
425424
}
426425

@@ -430,8 +429,8 @@ void BitcoinApplication::handleNonFatalException(const QString& message)
430429
QMessageBox::warning(
431430
nullptr, tr("Internal error"),
432431
tr("An internal error occurred. %1 will attempt to continue safely. This is "
433-
"an unexpected bug which can be reported as described below.").arg(PACKAGE_NAME) %
434-
QLatin1String("<br><br>") % GUIUtil::MakeHtmlLink(message, PACKAGE_BUGREPORT));
432+
"an unexpected bug which can be reported as described below.").arg(PACKAGE_NAME) +
433+
QLatin1String("<br><br>") + GUIUtil::MakeHtmlLink(message, PACKAGE_BUGREPORT));
435434
}
436435

437436
WId BitcoinApplication::getMainWinId() const

src/qt/guiutil.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
#include <QShortcut>
5656
#include <QSize>
5757
#include <QString>
58-
#include <QStringBuilder>
5958
#include <QTextDocument> // for Qt::mightBeRichText
6059
#include <QThread>
6160
#include <QUrlQuery>
@@ -902,7 +901,7 @@ QString MakeHtmlLink(const QString& source, const QString& link)
902901
{
903902
return QString(source).replace(
904903
link,
905-
QLatin1String("<a href=\"") % link % QLatin1String("\">") % link % QLatin1String("</a>"));
904+
QLatin1String("<a href=\"") + link + QLatin1String("\">") + link + QLatin1String("</a>"));
906905
}
907906

908907
void PrintSlotException(

0 commit comments

Comments
 (0)