Skip to content

Commit

Permalink
compile fixes by Unthinkingbit
Browse files Browse the repository at this point in the history
  • Loading branch information
laanwj committed Jun 25, 2011
1 parent a404b15 commit 0030c1b
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/qt/bitcoinamountfield.cpp
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/qt/forms/sendcoinsdialog.ui
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion src/qt/guiutil.cpp
Expand Up @@ -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");
}

Expand Down
2 changes: 1 addition & 1 deletion src/qt/transactiondesc.cpp
Expand Up @@ -2,7 +2,7 @@

#include "guiutil.h"
#include "main.h"
#include "externui.h"
#include "qtui.h"

#include <QString>

Expand Down
1 change: 1 addition & 0 deletions src/qtui.h
Expand Up @@ -5,6 +5,7 @@
#define BITCOIN_EXTERNUI_H

#include <string>
#include <boost/function/function0.hpp>

typedef void wxWindow;
#define wxYES 0x00000002
Expand Down

0 comments on commit 0030c1b

Please sign in to comment.