integration phase

gui/include/bitcoinaddressvalidator.h

@@ -11,7 +11,7 @@ class BitcoinAddressValidator : public QRegExpValidator
 public:
     explicit BitcoinAddressValidator(QObject *parent = 0);
 
-    static const QString valid_chars;
+    static const int MaxAddressLength = 34;
 signals:
 
 public slots:

gui/src/bitcoinaddressvalidator.cpp

@@ -1,8 +1,8 @@
 #include "bitcoinaddressvalidator.h"
 
-const QString BitcoinAddressValidator::valid_chars = "123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ";
+#include "base58.h"
 
 BitcoinAddressValidator::BitcoinAddressValidator(QObject *parent) :
-    QRegExpValidator(QRegExp("^["+valid_chars+"]+"), parent)
+    QRegExpValidator(QRegExp(QString("^[")+QString(pszBase58)+QString("]+")), parent)
 {
 }

gui/src/sendcoinsdialog.cpp

@@ -12,6 +12,7 @@ SendCoinsDialog::SendCoinsDialog(QWidget *parent) :
     ui(new Ui::SendCoinsDialog)
 {
     ui->setupUi(this);
+    ui->payTo->setMaxLength(BitcoinAddressValidator::MaxAddressLength);
     ui->payTo->setValidator(new BitcoinAddressValidator(this));
     ui->payAmount->setValidator(new QDoubleValidator(this));
 }