Browse Source

compile fixes by Unthinkingbit

miguelfreitas
Wladimir J. van der Laan 14 years ago
parent
commit
0030c1bd6c
  1. 2
      src/qt/bitcoinamountfield.cpp
  2. 4
      src/qt/forms/sendcoinsdialog.ui
  3. 2
      src/qt/guiutil.cpp
  4. 2
      src/qt/transactiondesc.cpp
  5. 1
      src/qtui.h

2
src/qt/bitcoinamountfield.cpp

@ -13,7 +13,7 @@ BitcoinAmountField::BitcoinAmountField(QWidget *parent):
amount->setValidator(new QRegExpValidator(QRegExp("[0-9]+"), this)); amount->setValidator(new QRegExpValidator(QRegExp("[0-9]+"), this));
amount->setAlignment(Qt::AlignRight|Qt::AlignVCenter); amount->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
amount->installEventFilter(this); amount->installEventFilter(this);
amount->setMaximumWidth(80); amount->setMaximumWidth(100);
decimals = new QLineEdit(this); decimals = new QLineEdit(this);
decimals->setValidator(new QRegExpValidator(QRegExp("[0-9]+"), this)); decimals->setValidator(new QRegExpValidator(QRegExp("[0-9]+"), this));
decimals->setMaxLength(8); decimals->setMaxLength(8);

4
src/qt/forms/sendcoinsdialog.ui

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>736</width> <width>660</width>
<height>193</height> <height>151</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">

2
src/qt/guiutil.cpp

@ -9,7 +9,7 @@
QString GUIUtil::DateTimeStr(qint64 nTime) 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"); return date.date().toString(Qt::SystemLocaleShortDate) + QString(" ") + date.toString("hh:mm");
} }

2
src/qt/transactiondesc.cpp

@ -2,7 +2,7 @@
#include "guiutil.h" #include "guiutil.h"
#include "main.h" #include "main.h"
#include "externui.h" #include "qtui.h"
#include <QString> #include <QString>

1
src/qtui.h

@ -5,6 +5,7 @@
#define BITCOIN_EXTERNUI_H #define BITCOIN_EXTERNUI_H
#include <string> #include <string>
#include <boost/function/function0.hpp>
typedef void wxWindow; typedef void wxWindow;
#define wxYES 0x00000002 #define wxYES 0x00000002

Loading…
Cancel
Save