From 0030c1bd6cdee44d9f59af9a023cd39cbd335bd5 Mon Sep 17 00:00:00 2001 From: Wladimir J. van der Laan Date: Sat, 25 Jun 2011 23:14:10 +0200 Subject: [PATCH] compile fixes by Unthinkingbit --- src/qt/bitcoinamountfield.cpp | 2 +- src/qt/forms/sendcoinsdialog.ui | 4 ++-- src/qt/guiutil.cpp | 2 +- src/qt/transactiondesc.cpp | 2 +- src/qtui.h | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp index 935bd13..8166ce6 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 3212424..efefe6a 100644 --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -6,8 +6,8 @@ 0 0 - 736 - 193 + 660 + 151 diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index a81cc14..ec8b435 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 9120f19..84b617b 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 diff --git a/src/qtui.h b/src/qtui.h index 3243164..42f44e0 100644 --- a/src/qtui.h +++ b/src/qtui.h @@ -5,6 +5,7 @@ #define BITCOIN_EXTERNUI_H #include +#include typedef void wxWindow; #define wxYES 0x00000002 -- 1.7.1