Merge pull request #35 from fsb4000/Qt5
author0xDEADFACE <masmfan@gmail.com>
Fri, 24 Oct 2014 16:12:22 +0000 (20:12 +0400)
committer0xDEADFACE <masmfan@gmail.com>
Fri, 24 Oct 2014 16:12:22 +0000 (20:12 +0400)
Qt5 compatibility

1  2 
src/qt/sendcoinsdialog.cpp

@@@ -11,6 -11,7 +11,7 @@@
  #include "optionsmodel.h"
  #include "sendcoinsentry.h"
  #include "guiutil.h"
+ #include "dialogwindowflags.h"
  #include "askpassphrasedialog.h"
  
  #include "coincontrol.h"
@@@ -23,7 -24,7 +24,7 @@@
  #include <QClipboard>
  
  SendCoinsDialog::SendCoinsDialog(QWidget *parent) :
-     QDialog(parent),
+     QDialog(parent, DIALOGWINDOWHINTS),
      ui(new Ui::SendCoinsDialog),
      model(0)
  {
@@@ -157,7 -158,11 +158,11 @@@ void SendCoinsDialog::on_sendButton_cli
      QStringList formatted;
      foreach(const SendCoinsRecipient &rcp, recipients)
      {
+ #if QT_VERSION < 0x050000
          formatted.append(tr("<b>%1</b> to %2 (%3)").arg(BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, rcp.amount), Qt::escape(rcp.label), rcp.address));
+ #else
+         formatted.append(tr("<b>%1</b> to %2 (%3)").arg(BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, rcp.amount), rcp.label.toHtmlEscaped(), rcp.address));
+ #endif
      }
  
      fNewRecipientAllowed = false;
@@@ -472,7 -477,7 +477,7 @@@ void SendCoinsDialog::on_addressBookBut
  {
      if(!model)
          return;
 -    AddressBookPage dlg(AddressBookPage::ForSending, AddressBookPage::SendingTab, this);
 +    AddressBookPage dlg(AddressBookPage::ForSending, AddressBookPage::ReceivingTab, this);
      dlg.setModel(model->getAddressTableModel());
      if(dlg.exec())
      {