#include <QDialog>
#include <QMessageBox>
#include <QScrollBar>
+#include <QKeyEvent>
#include <vector>
#include "addresstablemodel.h"
#include "txdb-bdb.h"
#endif
-#ifdef _MSC_VER
-#pragma warning( disable : 4101)
-#endif
-
-MultisigDialog::MultisigDialog(QWidget *parent) : QDialog(parent), ui(new Ui::MultisigDialog), model(0)
+MultisigDialog::MultisigDialog(QWidget *parent) : QWidget(parent), ui(new Ui::MultisigDialog), model(0)
{
ui->setupUi(this);
if(!model)
return;
- std::vector<CKey> pubkeys;
+ std::vector<CPubKey> pubkeys;
pubkeys.resize(ui->pubkeyEntries->count());
unsigned int required = ui->requiredSignatures->text().toUInt();
CPubKey vchPubKey(ParseHex(str.toStdString().c_str()));
if(!vchPubKey.IsValid())
return;
- pubkeys[i].SetPubKey(vchPubKey);
+ pubkeys[i] = vchPubKey;
}
if(pubkeys.size() > 16)
LOCK(wallet->cs_wallet);
if(!wallet->HaveCScript(scriptID))
wallet->AddCScript(script);
- if(!wallet->mapAddressBook.count(CBitcoinAddress(address).Get()))
- wallet->SetAddressBookName(CBitcoinAddress(address).Get(), label);
+ if(!wallet->mapAddressBook.count(CBitcoinAddress(address)))
+ wallet->SetAddressBookName(CBitcoinAddress(address), label);
}
void MultisigDialog::clear()
SendCoinsRecipient recipient = entry->getValue();
CBitcoinAddress address(recipient.address.toStdString());
CScript scriptPubKey;
- scriptPubKey.SetDestination(address.Get());
+ scriptPubKey.SetAddress(address);
int64_t amount = recipient.amount;
CTxOut output(amount, scriptPubKey);
transaction.vout.push_back(output);
{
ss >> tx;
}
- catch(std::exception &e)
+ catch(const std::exception&)
{
return;
}
{
ss >> tx;
}
- catch(std::exception &e)
+ catch(const std::exception&)
{
return;
}
{
ssData >> tx;
}
- catch(std::exception &e)
+ catch(const std::exception&)
{
return;
}
QString feeStr;
feeStr.sprintf("%.6f", (double) fee / COIN);
ui->fee->setText(feeStr);
-}
\ No newline at end of file
+}
+
+void MultisigDialog::keyPressEvent(QKeyEvent *event)
+{
+#ifdef ANDROID
+ if(windowType() != Qt::Widget && event->key() == Qt::Key_Back)
+ {
+ close();
+ }
+#else
+ if(windowType() != Qt::Widget && event->key() == Qt::Key_Escape)
+ {
+ close();
+ }
+#endif
+}