Revert "refactor: Remove never used default parameter"
This reverts commit 7d0a8f4f53.
This commit is contained in:
2 files changed
+6
-3
No files matched your search
@@ -1027,7 +1027,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
|
|||||||
progressBar->setToolTip(tooltip);
|
progressBar->setToolTip(tooltip);
|
||||||
}
|
}
|
||||||
|
|
||||||
void BitcoinGUI::message(const QString& title, QString message, unsigned int style)
|
void BitcoinGUI::message(const QString& title, QString message, unsigned int style, bool* ret)
|
||||||
{
|
{
|
||||||
// Default title. On macOS, the window title is ignored (as required by the macOS Guidelines).
|
// Default title. On macOS, the window title is ignored (as required by the macOS Guidelines).
|
||||||
QString strTitle{PACKAGE_NAME};
|
QString strTitle{PACKAGE_NAME};
|
||||||
@@ -1081,7 +1081,9 @@ void BitcoinGUI::message(const QString& title, QString message, unsigned int sty
|
|||||||
showNormalIfMinimized();
|
showNormalIfMinimized();
|
||||||
QMessageBox mBox(static_cast<QMessageBox::Icon>(nMBoxIcon), strTitle, message, buttons, this);
|
QMessageBox mBox(static_cast<QMessageBox::Icon>(nMBoxIcon), strTitle, message, buttons, this);
|
||||||
mBox.setTextFormat(Qt::PlainText);
|
mBox.setTextFormat(Qt::PlainText);
|
||||||
mBox.exec();
|
int r = mBox.exec();
|
||||||
|
if (ret != nullptr)
|
||||||
|
*ret = r == QMessageBox::Ok;
|
||||||
} else {
|
} else {
|
||||||
notificator->notify(static_cast<Notificator::Class>(nNotifyIcon), strTitle, message);
|
notificator->notify(static_cast<Notificator::Class>(nNotifyIcon), strTitle, message);
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -219,8 +219,9 @@ public Q_SLOTS:
|
|||||||
@param[in] message the displayed text
|
@param[in] message the displayed text
|
||||||
@param[in] style modality and style definitions (icon and used buttons - buttons only for message boxes)
|
@param[in] style modality and style definitions (icon and used buttons - buttons only for message boxes)
|
||||||
@see CClientUIInterface::MessageBoxFlags
|
@see CClientUIInterface::MessageBoxFlags
|
||||||
|
@param[in] ret pointer to a bool that will be modified to whether Ok was clicked (modal only)
|
||||||
*/
|
*/
|
||||||
void message(const QString& title, QString message, unsigned int style);
|
void message(const QString& title, QString message, unsigned int style, bool* ret = nullptr);
|
||||||
|
|
||||||
#ifdef ENABLE_WALLET
|
#ifdef ENABLE_WALLET
|
||||||
void setCurrentWallet(WalletModel* wallet_model);
|
void setCurrentWallet(WalletModel* wallet_model);
|
||||||
|
|||||||
Reference in new issue
Block a user