Merge pull request #1104 from laanwj/2012_04_clang
Enable and fix most compilation warnings
This commit is contained in:
@@ -27,8 +27,9 @@ struct AddressTableEntry
|
||||
};
|
||||
|
||||
// Private implementation
|
||||
struct AddressTablePriv
|
||||
class AddressTablePriv
|
||||
{
|
||||
public:
|
||||
CWallet *wallet;
|
||||
QList<AddressTableEntry> cachedAddressTable;
|
||||
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
#include <QtGlobal>
|
||||
// Automatically generated by extract_strings.py
|
||||
static const char *bitcoin_strings[] = {QT_TRANSLATE_NOOP("bitcoin-core", ""
|
||||
#ifdef __GNUC__
|
||||
#define UNUSED __attribute__((unused))
|
||||
#else
|
||||
#define UNUSED
|
||||
#endif
|
||||
static const char UNUSED *bitcoin_strings[] = {QT_TRANSLATE_NOOP("bitcoin-core", ""
|
||||
"Unable to bind to port %d on this computer. Bitcoin is probably already "
|
||||
"running."),
|
||||
QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Disk space is low "),
|
||||
|
||||
@@ -106,6 +106,9 @@ void EditAddressDialog::accept()
|
||||
tr("New key generation failed."),
|
||||
QMessageBox::Ok, QMessageBox::Ok);
|
||||
return;
|
||||
case AddressTableModel::OK:
|
||||
// Failed with unknown reason. Just reject.
|
||||
break;
|
||||
}
|
||||
|
||||
return;
|
||||
|
||||
@@ -154,6 +154,8 @@ void SendCoinsDialog::on_sendButton_clicked()
|
||||
tr("Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."),
|
||||
QMessageBox::Ok, QMessageBox::Ok);
|
||||
break;
|
||||
case WalletModel::Aborted: // User aborted, nothing to do
|
||||
break;
|
||||
case WalletModel::OK:
|
||||
accept();
|
||||
break;
|
||||
|
||||
@@ -45,8 +45,9 @@ struct TxLessThan
|
||||
};
|
||||
|
||||
// Private implementation
|
||||
struct TransactionTablePriv
|
||||
class TransactionTablePriv
|
||||
{
|
||||
public:
|
||||
TransactionTablePriv(CWallet *wallet, TransactionTableModel *parent):
|
||||
wallet(wallet),
|
||||
parent(parent)
|
||||
|
||||
@@ -35,8 +35,7 @@ public:
|
||||
DuplicateAddress,
|
||||
TransactionCreationFailed, // Error returned when wallet is still locked
|
||||
TransactionCommitFailed,
|
||||
Aborted,
|
||||
MiscError
|
||||
Aborted
|
||||
};
|
||||
|
||||
enum EncryptionStatus
|
||||
|
||||
Reference in New Issue
Block a user