diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-06-25 23:14:10 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-06-25 23:14:10 +0200 |
| commit | 0030c1bd6cdee44d9f59af9a023cd39cbd335bd5 (patch) | |
| tree | e73548790782aacb7be421d8beb60031e03afdf7 | |
| parent | a404b1512a0938091770e1f0de45412f4df12923 (diff) | |
| download | bitcoin-0030c1bd6cdee44d9f59af9a023cd39cbd335bd5.tar.xz | |
compile fixes by Unthinkingbit
| -rw-r--r-- | src/qt/bitcoinamountfield.cpp | 2 | ||||
| -rw-r--r-- | src/qt/forms/sendcoinsdialog.ui | 4 | ||||
| -rw-r--r-- | src/qt/guiutil.cpp | 2 | ||||
| -rw-r--r-- | src/qt/transactiondesc.cpp | 2 | ||||
| -rw-r--r-- | src/qtui.h | 1 |
5 files changed, 6 insertions, 5 deletions
diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp index 935bd13a44..8166ce6e6e 100644 --- a/src/qt/bitcoinamountfield.cpp +++ b/src/qt/bitcoinamountfield.cpp @@ -13,7 +13,7 @@ BitcoinAmountField::BitcoinAmountField(QWidget *parent): amount->setValidator(new QRegExpValidator(QRegExp("[0-9]+"), this)); amount->setAlignment(Qt::AlignRight|Qt::AlignVCenter); amount->installEventFilter(this); - amount->setMaximumWidth(80); + amount->setMaximumWidth(100); decimals = new QLineEdit(this); decimals->setValidator(new QRegExpValidator(QRegExp("[0-9]+"), this)); decimals->setMaxLength(8); diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui index 3212424896..efefe6ab9c 100644 --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>736</width> - <height>193</height> + <width>660</width> + <height>151</height> </rect> </property> <property name="windowTitle"> diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index a81cc14fe8..ec8b43526d 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -9,7 +9,7 @@ QString GUIUtil::DateTimeStr(qint64 nTime) { - QDateTime date = QDateTime::fromMSecsSinceEpoch(nTime*1000); + QDateTime date = QDateTime::fromTime_t((qint32)nTime); return date.date().toString(Qt::SystemLocaleShortDate) + QString(" ") + date.toString("hh:mm"); } diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 9120f19c7a..84b617b7c4 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -2,7 +2,7 @@ #include "guiutil.h" #include "main.h" -#include "externui.h" +#include "qtui.h" #include <QString> diff --git a/src/qtui.h b/src/qtui.h index 3243164c10..42f44e0d04 100644 --- a/src/qtui.h +++ b/src/qtui.h @@ -5,6 +5,7 @@ #define BITCOIN_EXTERNUI_H #include <string> +#include <boost/function/function0.hpp> typedef void wxWindow; #define wxYES 0x00000002 |