diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2011-06-07 17:04:14 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:54:28 -0300 |
| commit | 97da5d1574e89adbbb3bcda32210c3588419c502 (patch) | |
| tree | 1cdb38834549f748d84dde2a6a8e73adfcdebbf0 /PySide | |
| parent | 6f46c1fab5b8ed3311048db54625375adb8e9383 (diff) | |
Fix bug 869 - "QDateTimeEdit initial time problem"
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
Marcelo Lira <marcelo.lira@openbossa.org>
Diffstat (limited to 'PySide')
| -rw-r--r-- | PySide/QtCore/qdatetime_conversions.h | 4 | ||||
| -rw-r--r-- | PySide/QtCore/qtime_conversions.h | 4 | ||||
| -rw-r--r-- | PySide/QtCore/typesystem_core.xml | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/PySide/QtCore/qdatetime_conversions.h b/PySide/QtCore/qdatetime_conversions.h index 8ee4f4882..38c0336c3 100644 --- a/PySide/QtCore/qdatetime_conversions.h +++ b/PySide/QtCore/qdatetime_conversions.h @@ -39,8 +39,8 @@ inline QDateTime Converter<QDateTime>::toCpp(PyObject* pyObj) int hour = PyDateTime_DATE_GET_HOUR(pyObj); int min = PyDateTime_DATE_GET_MINUTE(pyObj); int sec = PyDateTime_DATE_GET_SECOND(pyObj); - int msec = PyDateTime_DATE_GET_MICROSECOND(pyObj); - return QDateTime(QDate(year, month, day), QTime(hour, min, sec, msec)); + int usec = PyDateTime_DATE_GET_MICROSECOND(pyObj); + return QDateTime(QDate(year, month, day), QTime(hour, min, sec, usec/1000)); } else { return ValueTypeConverter<QDateTime>::toCpp(pyObj); } diff --git a/PySide/QtCore/qtime_conversions.h b/PySide/QtCore/qtime_conversions.h index 080df5f2f..4600ef758 100644 --- a/PySide/QtCore/qtime_conversions.h +++ b/PySide/QtCore/qtime_conversions.h @@ -35,8 +35,8 @@ inline QTime Converter<QTime>::toCpp(PyObject* pyObj) int hour = PyDateTime_TIME_GET_HOUR(pyObj); int min = PyDateTime_TIME_GET_MINUTE(pyObj); int sec = PyDateTime_TIME_GET_SECOND(pyObj); - int msec = PyDateTime_TIME_GET_MICROSECOND(pyObj); - return QTime(hour, min, sec, msec); + int usec = PyDateTime_TIME_GET_MICROSECOND(pyObj); + return QTime(hour, min, sec, usec/1000); } else { return ValueTypeConverter<QTime>::toCpp(pyObj); } diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml index d13e3c762..c326d0812 100644 --- a/PySide/QtCore/typesystem_core.xml +++ b/PySide/QtCore/typesystem_core.xml @@ -653,7 +653,7 @@ QDate date = %CPPSELF.date(); QTime time = %CPPSELF.time(); if (!PyDateTimeAPI) PyDateTime_IMPORT; - %PYARG_0 = PyDateTime_FromDateAndTime(date.year(), date.month(), date.day(), time.hour(), time.minute(), time.second(), time.msec()); + %PYARG_0 = PyDateTime_FromDateAndTime(date.year(), date.month(), date.day(), time.hour(), time.minute(), time.second(), time.msec()*1000); </inject-code> </add-function> </value-type> @@ -978,7 +978,7 @@ <add-function signature="toPython()" return-type="PyObject"> <inject-code class="target" position="beginning"> if (!PyDateTimeAPI) PyDateTime_IMPORT; - %PYARG_0 = PyTime_FromTime(%CPPSELF.hour(), %CPPSELF.minute(), %CPPSELF.second(), %CPPSELF.msec()); + %PYARG_0 = PyTime_FromTime(%CPPSELF.hour(), %CPPSELF.minute(), %CPPSELF.second(), %CPPSELF.msec()*1000); </inject-code> </add-function> </value-type> |