From 713fd8a57b0f2b5f8f8158542e51f1c51919eb32 Mon Sep 17 00:00:00 2001 From: fsb4000 Date: Fri, 13 Feb 2015 11:37:46 +0600 Subject: [PATCH] =?utf8?q?=D1=83=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D0=BB=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D0=B5=20=D0=BF=D1=80=D0=B5=D0=B4=D1=83=D0=BF=D1=80=D0=B5=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=B8=D0=BB=D1=8F=D1=82=D0=BE=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/allocators.h | 4 ++-- src/init.cpp | 1 + src/qt/bitcoingui.cpp | 15 ++------------- src/qt/bitcoingui.h | 1 - src/qt/multisigdialog.cpp | 7 +++---- src/qt/optionsmodel.cpp | 1 + src/txdb-leveldb.h | 1 + 7 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/allocators.h b/src/allocators.h index 99afa10..31ab21b 100644 --- a/src/allocators.h +++ b/src/allocators.h @@ -143,7 +143,7 @@ public: bool Lock(const void *addr, size_t len) { #ifdef WIN32 - return VirtualLock(const_cast(addr), len); + return VirtualLock(const_cast(addr), len) != 0; #else return mlock(addr, len) == 0; #endif @@ -154,7 +154,7 @@ public: bool Unlock(const void *addr, size_t len) { #ifdef WIN32 - return VirtualUnlock(const_cast(addr), len); + return VirtualUnlock(const_cast(addr), len) != 0; #else return munlock(addr, len) == 0; #endif diff --git a/src/init.cpp b/src/init.cpp index b1dec89..395527e 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -784,6 +784,7 @@ bool AppInit2() break; } } catch(std::exception &e) { + (void)e; strLoadError = _("Error opening block database"); break; } diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 3171647..c25f833 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -735,17 +735,6 @@ void BitcoinGUI::updateMining() labelMiningIcon->setToolTip(tr("No suitable inputs were found")); } -void BitcoinGUI::error(const QString &title, const QString &message, bool modal) -{ - // Report errors from network/worker thread - if(modal) - { - QMessageBox::critical(this, title, message, QMessageBox::Ok, QMessageBox::Ok); - } else { - notificator->notify(Notificator::Critical, title, message); - } -} - void BitcoinGUI::message(const QString &title, const QString &message, unsigned int style, const QString &detail) { QString strTitle = tr("NovaCoin") + " - "; @@ -1116,7 +1105,7 @@ void BitcoinGUI::dumpWallet() QString filename = QFileDialog::getSaveFileName(this, tr("Dump Wallet"), saveDir, tr("Wallet dump (*.txt)")); if(!filename.isEmpty()) { if(!walletModel->dumpWallet(filename)) { - error(tr("Dump failed"), + message(tr("Dump failed"), tr("An error happened while trying to save the keys to your location.\n" "Keys were not saved.") ,CClientUIInterface::MSG_ERROR); @@ -1149,7 +1138,7 @@ void BitcoinGUI::importWallet() QString filename = QFileDialog::getOpenFileName(this, tr("Import Wallet"), openDir, tr("Wallet dump (*.txt)")); if(!filename.isEmpty()) { if(!walletModel->importWallet(filename)) { - error(tr("Import Failed"), + message(tr("Import Failed"), tr("An error happened while trying to import the keys.\n" "Some or all keys from:\n %1,\n were not imported into your wallet.") .arg(filename) diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index d27151a..de83a58 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -138,7 +138,6 @@ public slots: void setEncryptionStatus(int status); /** Notify the user of an error in the network or transaction handling code. */ - void error(const QString &title, const QString &message, bool modal); void message(const QString &title, const QString &message, unsigned int style, const QString &detail=QString()); /** Asks the user whether to pay the transaction fee or to cancel the transaction. diff --git a/src/qt/multisigdialog.cpp b/src/qt/multisigdialog.cpp index 56d1674..6013c79 100644 --- a/src/qt/multisigdialog.cpp +++ b/src/qt/multisigdialog.cpp @@ -25,10 +25,6 @@ #include "txdb-bdb.h" #endif -#ifdef _MSC_VER -#pragma warning( disable : 4101) -#endif - MultisigDialog::MultisigDialog(QWidget *parent) : QWidget(parent), ui(new Ui::MultisigDialog), model(0) { ui->setupUi(this); @@ -353,6 +349,7 @@ void MultisigDialog::on_transaction_textChanged() } catch(std::exception &e) { + (void)e; return; } @@ -423,6 +420,7 @@ void MultisigDialog::on_signTransactionButton_clicked() } catch(std::exception &e) { + (void)e; return; } CTransaction mergedTx(tx); @@ -542,6 +540,7 @@ void MultisigDialog::on_sendTransactionButton_clicked() } catch(std::exception &e) { + (void)e; return; } uint256 txHash = tx.GetHash(); diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 71203f5..5e59f47 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -158,6 +158,7 @@ bool OptionsModel::Upgrade() } catch (std::ios_base::failure &e) { + (void)e; // 0.6.0rc1 saved this as a CService, which causes failure when parsing as a CAddress CService addrProxy, addrTor; if (walletdb.ReadSetting("addrProxy", addrProxy)) diff --git a/src/txdb-leveldb.h b/src/txdb-leveldb.h index 67a8b7a..c73dda6 100644 --- a/src/txdb-leveldb.h +++ b/src/txdb-leveldb.h @@ -92,6 +92,7 @@ protected: ssValue >> value; } catch (std::exception &e) { + (void)e; return false; } return true; -- 1.7.1