diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-12-03 04:43:18 -0800 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-12-03 04:43:18 -0800 |
| commit | 2e2fca4439b4651e28c13237999ab84e06481c9d (patch) | |
| tree | 8fe4a7164440556b6e43fd41d2287d93428c32e3 /src/qt/bitcoingui.cpp | |
| parent | 7a8dd988638e197e13c8faf366cfb81aa4d67783 (diff) | |
| parent | 3675588a30eae39921afbf00f32f86913d5d2bd5 (diff) | |
Merge pull request #2065 from Diapolo/remove_modal_flag
Bitcoin-Qt: remove obsolete modal flag from GUI APIs
Diffstat (limited to 'src/qt/bitcoingui.cpp')
| -rw-r--r-- | src/qt/bitcoingui.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index aa45716c48..3fe86501f6 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -373,7 +373,7 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel) connect(clientModel, SIGNAL(numBlocksChanged(int,int)), this, SLOT(setNumBlocks(int,int))); // Receive and report messages from network/worker thread - connect(clientModel, SIGNAL(message(QString,QString,bool,unsigned int)), this, SLOT(message(QString,QString,bool,unsigned int))); + connect(clientModel, SIGNAL(message(QString,QString,unsigned int)), this, SLOT(message(QString,QString,unsigned int))); overviewPage->setClientModel(clientModel); rpcConsole->setClientModel(clientModel); @@ -388,7 +388,7 @@ void BitcoinGUI::setWalletModel(WalletModel *walletModel) if(walletModel) { // Receive and report messages from wallet thread - connect(walletModel, SIGNAL(message(QString,QString,bool,unsigned int)), this, SLOT(message(QString,QString,bool,unsigned int))); + connect(walletModel, SIGNAL(message(QString,QString,unsigned int)), this, SLOT(message(QString,QString,unsigned int))); // Put transaction list in tabs transactionView->setModel(walletModel); @@ -606,7 +606,7 @@ void BitcoinGUI::setNumBlocks(int count, int nTotalBlocks) progressBar->setToolTip(tooltip); } -void BitcoinGUI::message(const QString &title, const QString &message, bool modal, unsigned int style) +void BitcoinGUI::message(const QString &title, const QString &message, unsigned int style) { QString strTitle = tr("Bitcoin") + " - "; // Default to information icon @@ -639,7 +639,7 @@ void BitcoinGUI::message(const QString &title, const QString &message, bool moda } // Display message - if (modal) { + if (style & CClientUIInterface::MODAL) { // Check for buttons, use OK as default, if none was supplied QMessageBox::StandardButton buttons; if (!(buttons = (QMessageBox::StandardButton)(style & CClientUIInterface::BTN_MASK))) |