Skip to content

Commit

Permalink
more fixes for js/wasm + fix ldFlags issue + fix minor iOS build issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@therecipe
therecipe committed Nov 17, 2018
1 parent c2524f5 commit de3f785
Show file tree
Hide file tree
Showing 47 changed files with 777 additions and 625 deletions.
64 changes: 32 additions & 32 deletions core/core.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4002,14 +4002,14 @@ void* QByteArray_Replace2(void* ptr, int pos, int l, char* after, int alen)
return new QByteArray(static_cast<QByteArray*>(ptr)->replace(pos, l, const_cast<const char*>(after), alen));
}

void* QByteArray_SetNum8(void* ptr, double n, char* fo, int prec)
void* QByteArray_SetNum8(void* ptr, double n, char* ff, int prec)
{
return new QByteArray(static_cast<QByteArray*>(ptr)->setNum(n, *fo, prec));
return new QByteArray(static_cast<QByteArray*>(ptr)->setNum(n, *ff, prec));
}

void* QByteArray_SetNum7(void* ptr, float n, char* fo, int prec)
void* QByteArray_SetNum7(void* ptr, float n, char* ff, int prec)
{
return new QByteArray(static_cast<QByteArray*>(ptr)->setNum(n, *fo, prec));
return new QByteArray(static_cast<QByteArray*>(ptr)->setNum(n, *ff, prec));
}

void* QByteArray_SetNum(void* ptr, int n, int base)
Expand Down Expand Up @@ -4072,9 +4072,9 @@ void* QByteArray_QByteArray_FromRawData(char* data, int size)
return new QByteArray(QByteArray::fromRawData(const_cast<const char*>(data), size));
}

void* QByteArray_QByteArray_Number5(double n, char* fo, int prec)
void* QByteArray_QByteArray_Number5(double n, char* ff, int prec)
{
return new QByteArray(QByteArray::number(n, *fo, prec));
return new QByteArray(QByteArray::number(n, *ff, prec));
}

void* QByteArray_QByteArray_Number(int n, int base)
Expand Down Expand Up @@ -6046,19 +6046,19 @@ void* QDateTime_NewQDateTime2(void* date)
return new QDateTime(*static_cast<QDate*>(date));
}

void* QDateTime_NewQDateTime3(void* date, void* time, long long spec)
void* QDateTime_NewQDateTime3(void* date, void* ti, long long spec)
{
return new QDateTime(*static_cast<QDate*>(date), *static_cast<QTime*>(time), static_cast<Qt::TimeSpec>(spec));
return new QDateTime(*static_cast<QDate*>(date), *static_cast<QTime*>(ti), static_cast<Qt::TimeSpec>(spec));
}

void* QDateTime_NewQDateTime4(void* date, void* time, long long spec, int offsetSeconds)
void* QDateTime_NewQDateTime4(void* date, void* ti, long long spec, int offsetSeconds)
{
return new QDateTime(*static_cast<QDate*>(date), *static_cast<QTime*>(time), static_cast<Qt::TimeSpec>(spec), offsetSeconds);
return new QDateTime(*static_cast<QDate*>(date), *static_cast<QTime*>(ti), static_cast<Qt::TimeSpec>(spec), offsetSeconds);
}

void* QDateTime_NewQDateTime5(void* date, void* time, void* timeZone)
void* QDateTime_NewQDateTime5(void* date, void* ti, void* timeZone)
{
return new QDateTime(*static_cast<QDate*>(date), *static_cast<QTime*>(time), *static_cast<QTimeZone*>(timeZone));
return new QDateTime(*static_cast<QDate*>(date), *static_cast<QTime*>(ti), *static_cast<QTimeZone*>(timeZone));
}

void* QDateTime_NewQDateTime6(void* other)
Expand Down Expand Up @@ -6096,9 +6096,9 @@ void QDateTime_SetSecsSinceEpoch(void* ptr, long long secs)
static_cast<QDateTime*>(ptr)->setSecsSinceEpoch(secs);
}

void QDateTime_SetTime(void* ptr, void* time)
void QDateTime_SetTime(void* ptr, void* ti)
{
static_cast<QDateTime*>(ptr)->setTime(*static_cast<QTime*>(time));
static_cast<QDateTime*>(ptr)->setTime(*static_cast<QTime*>(ti));
}

void QDateTime_SetTimeSpec(void* ptr, long long spec)
Expand Down Expand Up @@ -7726,9 +7726,9 @@ void QFileDevice_DestroyQFileDeviceDefault(void* ptr)

}

void* QFileDevice_FileTime(void* ptr, long long time)
void* QFileDevice_FileTime(void* ptr, long long ti)
{
return new QDateTime(static_cast<QFileDevice*>(ptr)->fileTime(static_cast<QFileDevice::FileTime>(time)));
return new QDateTime(static_cast<QFileDevice*>(ptr)->fileTime(static_cast<QFileDevice::FileTime>(ti)));
}

long long QFileDevice_Error(void* ptr)
Expand Down Expand Up @@ -11691,29 +11691,29 @@ struct QtCore_PackedString QLocale_ToString11(void* ptr, void* dateTime, struct
return ({ QByteArray t336e5f = static_cast<QLocale*>(ptr)->toString(*static_cast<QDateTime*>(dateTime), QString::fromUtf8(format.data, format.len)).toUtf8(); QtCore_PackedString { const_cast<char*>(t336e5f.prepend("WHITESPACE").constData()+10), t336e5f.size()-10 }; });
}

struct QtCore_PackedString QLocale_ToString16(void* ptr, void* time, long long format)
struct QtCore_PackedString QLocale_ToString16(void* ptr, void* ti, long long format)
{
return ({ QByteArray taedd07 = static_cast<QLocale*>(ptr)->toString(*static_cast<QTime*>(time), static_cast<QLocale::FormatType>(format)).toUtf8(); QtCore_PackedString { const_cast<char*>(taedd07.prepend("WHITESPACE").constData()+10), taedd07.size()-10 }; });
return ({ QByteArray tb6230e = static_cast<QLocale*>(ptr)->toString(*static_cast<QTime*>(ti), static_cast<QLocale::FormatType>(format)).toUtf8(); QtCore_PackedString { const_cast<char*>(tb6230e.prepend("WHITESPACE").constData()+10), tb6230e.size()-10 }; });
}

struct QtCore_PackedString QLocale_ToString13(void* ptr, void* time, void* format)
struct QtCore_PackedString QLocale_ToString13(void* ptr, void* ti, void* format)
{
return ({ QByteArray t0bdfb5 = static_cast<QLocale*>(ptr)->toString(*static_cast<QTime*>(time), *static_cast<QStringView*>(format)).toUtf8(); QtCore_PackedString { const_cast<char*>(t0bdfb5.prepend("WHITESPACE").constData()+10), t0bdfb5.size()-10 }; });
return ({ QByteArray t697961 = static_cast<QLocale*>(ptr)->toString(*static_cast<QTime*>(ti), *static_cast<QStringView*>(format)).toUtf8(); QtCore_PackedString { const_cast<char*>(t697961.prepend("WHITESPACE").constData()+10), t697961.size()-10 }; });
}

struct QtCore_PackedString QLocale_ToString10(void* ptr, void* time, struct QtCore_PackedString format)
struct QtCore_PackedString QLocale_ToString10(void* ptr, void* ti, struct QtCore_PackedString format)
{
return ({ QByteArray t30c966 = static_cast<QLocale*>(ptr)->toString(*static_cast<QTime*>(time), QString::fromUtf8(format.data, format.len)).toUtf8(); QtCore_PackedString { const_cast<char*>(t30c966.prepend("WHITESPACE").constData()+10), t30c966.size()-10 }; });
return ({ QByteArray t607af9 = static_cast<QLocale*>(ptr)->toString(*static_cast<QTime*>(ti), QString::fromUtf8(format.data, format.len)).toUtf8(); QtCore_PackedString { const_cast<char*>(t607af9.prepend("WHITESPACE").constData()+10), t607af9.size()-10 }; });
}

struct QtCore_PackedString QLocale_ToString7(void* ptr, double i, char* fo, int prec)
struct QtCore_PackedString QLocale_ToString7(void* ptr, double i, char* ff, int prec)
{
return ({ QByteArray tb2c8bc = static_cast<QLocale*>(ptr)->toString(i, *fo, prec).toUtf8(); QtCore_PackedString { const_cast<char*>(tb2c8bc.prepend("WHITESPACE").constData()+10), tb2c8bc.size()-10 }; });
return ({ QByteArray t07d146 = static_cast<QLocale*>(ptr)->toString(i, *ff, prec).toUtf8(); QtCore_PackedString { const_cast<char*>(t07d146.prepend("WHITESPACE").constData()+10), t07d146.size()-10 }; });
}

struct QtCore_PackedString QLocale_ToString8(void* ptr, float i, char* fo, int prec)
struct QtCore_PackedString QLocale_ToString8(void* ptr, float i, char* ff, int prec)
{
return ({ QByteArray tb2c8bc = static_cast<QLocale*>(ptr)->toString(i, *fo, prec).toUtf8(); QtCore_PackedString { const_cast<char*>(tb2c8bc.prepend("WHITESPACE").constData()+10), tb2c8bc.size()-10 }; });
return ({ QByteArray t07d146 = static_cast<QLocale*>(ptr)->toString(i, *ff, prec).toUtf8(); QtCore_PackedString { const_cast<char*>(t07d146.prepend("WHITESPACE").constData()+10), t07d146.size()-10 }; });
}

struct QtCore_PackedString QLocale_ToString5(void* ptr, int i)
Expand Down Expand Up @@ -21644,9 +21644,9 @@ void* QThread_NewQThread(void* parent)
}
}

char QThread_Wait(void* ptr, unsigned long time)
char QThread_Wait(void* ptr, unsigned long ti)
{
return static_cast<QThread*>(ptr)->wait(time);
return static_cast<QThread*>(ptr)->wait(ti);
}

int QThread_Exec(void* ptr)
Expand Down Expand Up @@ -24619,14 +24619,14 @@ void* QWaitCondition_NewQWaitCondition()
return new QWaitCondition();
}

char QWaitCondition_Wait(void* ptr, void* lockedMutex, unsigned long time)
char QWaitCondition_Wait(void* ptr, void* lockedMutex, unsigned long ti)
{
return static_cast<QWaitCondition*>(ptr)->wait(static_cast<QMutex*>(lockedMutex), time);
return static_cast<QWaitCondition*>(ptr)->wait(static_cast<QMutex*>(lockedMutex), ti);
}

char QWaitCondition_Wait2(void* ptr, void* lockedReadWriteLock, unsigned long time)
char QWaitCondition_Wait2(void* ptr, void* lockedReadWriteLock, unsigned long ti)
{
return static_cast<QWaitCondition*>(ptr)->wait(static_cast<QReadWriteLock*>(lockedReadWriteLock), time);
return static_cast<QWaitCondition*>(ptr)->wait(static_cast<QReadWriteLock*>(lockedReadWriteLock), ti);
}

void QWaitCondition_Notify_all(void* ptr)
Expand Down
116 changes: 58 additions & 58 deletions core/core.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7977,28 +7977,28 @@ func (ptr *QByteArray) Replace2(pos int, l int, after string, alen int) *QByteAr
return nil
}

func (ptr *QByteArray) SetNum8(n float64, fo string, prec int) *QByteArray {
func (ptr *QByteArray) SetNum8(n float64, ff string, prec int) *QByteArray {
if ptr.Pointer() != nil {
var foC *C.char
if fo != "" {
foC = C.CString(fo)
defer C.free(unsafe.Pointer(foC))
var ffC *C.char
if ff != "" {
ffC = C.CString(ff)
defer C.free(unsafe.Pointer(ffC))
}
tmpValue := NewQByteArrayFromPointer(C.QByteArray_SetNum8(ptr.Pointer(), C.double(n), foC, C.int(int32(prec))))
tmpValue := NewQByteArrayFromPointer(C.QByteArray_SetNum8(ptr.Pointer(), C.double(n), ffC, C.int(int32(prec))))
runtime.SetFinalizer(tmpValue, (*QByteArray).DestroyQByteArray)
return tmpValue
}
return nil
}

func (ptr *QByteArray) SetNum7(n float32, fo string, prec int) *QByteArray {
func (ptr *QByteArray) SetNum7(n float32, ff string, prec int) *QByteArray {
if ptr.Pointer() != nil {
var foC *C.char
if fo != "" {
foC = C.CString(fo)
defer C.free(unsafe.Pointer(foC))
var ffC *C.char
if ff != "" {
ffC = C.CString(ff)
defer C.free(unsafe.Pointer(ffC))
}
tmpValue := NewQByteArrayFromPointer(C.QByteArray_SetNum7(ptr.Pointer(), C.float(n), foC, C.int(int32(prec))))
tmpValue := NewQByteArrayFromPointer(C.QByteArray_SetNum7(ptr.Pointer(), C.float(n), ffC, C.int(int32(prec))))
runtime.SetFinalizer(tmpValue, (*QByteArray).DestroyQByteArray)
return tmpValue
}
Expand Down Expand Up @@ -8153,24 +8153,24 @@ func (ptr *QByteArray) FromRawData(data string, size int) *QByteArray {
return tmpValue
}

func QByteArray_Number5(n float64, fo string, prec int) *QByteArray {
var foC *C.char
if fo != "" {
foC = C.CString(fo)
defer C.free(unsafe.Pointer(foC))
func QByteArray_Number5(n float64, ff string, prec int) *QByteArray {
var ffC *C.char
if ff != "" {
ffC = C.CString(ff)
defer C.free(unsafe.Pointer(ffC))
}
tmpValue := NewQByteArrayFromPointer(C.QByteArray_QByteArray_Number5(C.double(n), foC, C.int(int32(prec))))
tmpValue := NewQByteArrayFromPointer(C.QByteArray_QByteArray_Number5(C.double(n), ffC, C.int(int32(prec))))
runtime.SetFinalizer(tmpValue, (*QByteArray).DestroyQByteArray)
return tmpValue
}

func (ptr *QByteArray) Number5(n float64, fo string, prec int) *QByteArray {
var foC *C.char
if fo != "" {
foC = C.CString(fo)
defer C.free(unsafe.Pointer(foC))
func (ptr *QByteArray) Number5(n float64, ff string, prec int) *QByteArray {
var ffC *C.char
if ff != "" {
ffC = C.CString(ff)
defer C.free(unsafe.Pointer(ffC))
}
tmpValue := NewQByteArrayFromPointer(C.QByteArray_QByteArray_Number5(C.double(n), foC, C.int(int32(prec))))
tmpValue := NewQByteArrayFromPointer(C.QByteArray_QByteArray_Number5(C.double(n), ffC, C.int(int32(prec))))
runtime.SetFinalizer(tmpValue, (*QByteArray).DestroyQByteArray)
return tmpValue
}
Expand Down Expand Up @@ -12680,20 +12680,20 @@ func NewQDateTime2(date QDate_ITF) *QDateTime {
return tmpValue
}

func NewQDateTime3(date QDate_ITF, time QTime_ITF, spec Qt__TimeSpec) *QDateTime {
tmpValue := NewQDateTimeFromPointer(C.QDateTime_NewQDateTime3(PointerFromQDate(date), PointerFromQTime(time), C.longlong(spec)))
func NewQDateTime3(date QDate_ITF, ti QTime_ITF, spec Qt__TimeSpec) *QDateTime {
tmpValue := NewQDateTimeFromPointer(C.QDateTime_NewQDateTime3(PointerFromQDate(date), PointerFromQTime(ti), C.longlong(spec)))
runtime.SetFinalizer(tmpValue, (*QDateTime).DestroyQDateTime)
return tmpValue
}

func NewQDateTime4(date QDate_ITF, time QTime_ITF, spec Qt__TimeSpec, offsetSeconds int) *QDateTime {
tmpValue := NewQDateTimeFromPointer(C.QDateTime_NewQDateTime4(PointerFromQDate(date), PointerFromQTime(time), C.longlong(spec), C.int(int32(offsetSeconds))))
func NewQDateTime4(date QDate_ITF, ti QTime_ITF, spec Qt__TimeSpec, offsetSeconds int) *QDateTime {
tmpValue := NewQDateTimeFromPointer(C.QDateTime_NewQDateTime4(PointerFromQDate(date), PointerFromQTime(ti), C.longlong(spec), C.int(int32(offsetSeconds))))
runtime.SetFinalizer(tmpValue, (*QDateTime).DestroyQDateTime)
return tmpValue
}

func NewQDateTime5(date QDate_ITF, time QTime_ITF, timeZone QTimeZone_ITF) *QDateTime {
tmpValue := NewQDateTimeFromPointer(C.QDateTime_NewQDateTime5(PointerFromQDate(date), PointerFromQTime(time), PointerFromQTimeZone(timeZone)))
func NewQDateTime5(date QDate_ITF, ti QTime_ITF, timeZone QTimeZone_ITF) *QDateTime {
tmpValue := NewQDateTimeFromPointer(C.QDateTime_NewQDateTime5(PointerFromQDate(date), PointerFromQTime(ti), PointerFromQTimeZone(timeZone)))
runtime.SetFinalizer(tmpValue, (*QDateTime).DestroyQDateTime)
return tmpValue
}
Expand Down Expand Up @@ -12744,9 +12744,9 @@ func (ptr *QDateTime) SetSecsSinceEpoch(secs int64) {
}
}

func (ptr *QDateTime) SetTime(time QTime_ITF) {
func (ptr *QDateTime) SetTime(ti QTime_ITF) {
if ptr.Pointer() != nil {
C.QDateTime_SetTime(ptr.Pointer(), PointerFromQTime(time))
C.QDateTime_SetTime(ptr.Pointer(), PointerFromQTime(ti))
}
}

Expand Down Expand Up @@ -16545,9 +16545,9 @@ func (ptr *QFileDevice) DestroyQFileDeviceDefault() {
}
}

func (ptr *QFileDevice) FileTime(time QFileDevice__FileTime) *QDateTime {
func (ptr *QFileDevice) FileTime(ti QFileDevice__FileTime) *QDateTime {
if ptr.Pointer() != nil {
tmpValue := NewQDateTimeFromPointer(C.QFileDevice_FileTime(ptr.Pointer(), C.longlong(time)))
tmpValue := NewQDateTimeFromPointer(C.QFileDevice_FileTime(ptr.Pointer(), C.longlong(ti)))
runtime.SetFinalizer(tmpValue, (*QDateTime).DestroyQDateTime)
return tmpValue
}
Expand Down Expand Up @@ -25921,52 +25921,52 @@ func (ptr *QLocale) ToString11(dateTime QDateTime_ITF, format string) string {
return ""
}

func (ptr *QLocale) ToString16(time QTime_ITF, format QLocale__FormatType) string {
func (ptr *QLocale) ToString16(ti QTime_ITF, format QLocale__FormatType) string {
if ptr.Pointer() != nil {
return cGoUnpackString(C.QLocale_ToString16(ptr.Pointer(), PointerFromQTime(time), C.longlong(format)))
return cGoUnpackString(C.QLocale_ToString16(ptr.Pointer(), PointerFromQTime(ti), C.longlong(format)))
}
return ""
}

func (ptr *QLocale) ToString13(time QTime_ITF, format QStringView_ITF) string {
func (ptr *QLocale) ToString13(ti QTime_ITF, format QStringView_ITF) string {
if ptr.Pointer() != nil {
return cGoUnpackString(C.QLocale_ToString13(ptr.Pointer(), PointerFromQTime(time), PointerFromQStringView(format)))
return cGoUnpackString(C.QLocale_ToString13(ptr.Pointer(), PointerFromQTime(ti), PointerFromQStringView(format)))
}
return ""
}

func (ptr *QLocale) ToString10(time QTime_ITF, format string) string {
func (ptr *QLocale) ToString10(ti QTime_ITF, format string) string {
if ptr.Pointer() != nil {
var formatC *C.char
if format != "" {
formatC = C.CString(format)
defer C.free(unsafe.Pointer(formatC))
}
return cGoUnpackString(C.QLocale_ToString10(ptr.Pointer(), PointerFromQTime(time), C.struct_QtCore_PackedString{data: formatC, len: C.longlong(len(format))}))
return cGoUnpackString(C.QLocale_ToString10(ptr.Pointer(), PointerFromQTime(ti), C.struct_QtCore_PackedString{data: formatC, len: C.longlong(len(format))}))
}
return ""
}

func (ptr *QLocale) ToString7(i float64, fo string, prec int) string {
func (ptr *QLocale) ToString7(i float64, ff string, prec int) string {
if ptr.Pointer() != nil {
var foC *C.char
if fo != "" {
foC = C.CString(fo)
defer C.free(unsafe.Pointer(foC))
var ffC *C.char
if ff != "" {
ffC = C.CString(ff)
defer C.free(unsafe.Pointer(ffC))
}
return cGoUnpackString(C.QLocale_ToString7(ptr.Pointer(), C.double(i), foC, C.int(int32(prec))))
return cGoUnpackString(C.QLocale_ToString7(ptr.Pointer(), C.double(i), ffC, C.int(int32(prec))))
}
return ""
}

func (ptr *QLocale) ToString8(i float32, fo string, prec int) string {
func (ptr *QLocale) ToString8(i float32, ff string, prec int) string {
if ptr.Pointer() != nil {
var foC *C.char
if fo != "" {
foC = C.CString(fo)
defer C.free(unsafe.Pointer(foC))
var ffC *C.char
if ff != "" {
ffC = C.CString(ff)
defer C.free(unsafe.Pointer(ffC))
}
return cGoUnpackString(C.QLocale_ToString8(ptr.Pointer(), C.float(i), foC, C.int(int32(prec))))
return cGoUnpackString(C.QLocale_ToString8(ptr.Pointer(), C.float(i), ffC, C.int(int32(prec))))
}
return ""
}
Expand Down Expand Up @@ -45061,9 +45061,9 @@ func NewQThread(parent QObject_ITF) *QThread {
return tmpValue
}

func (ptr *QThread) Wait(time uint) bool {
func (ptr *QThread) Wait(ti uint) bool {
if ptr.Pointer() != nil {
return int8(C.QThread_Wait(ptr.Pointer(), C.ulong(uint32(time)))) != 0
return int8(C.QThread_Wait(ptr.Pointer(), C.ulong(uint32(ti)))) != 0
}
return false
}
Expand Down Expand Up @@ -51715,16 +51715,16 @@ func NewQWaitCondition() *QWaitCondition {
return tmpValue
}

func (ptr *QWaitCondition) Wait(lockedMutex QMutex_ITF, time uint) bool {
func (ptr *QWaitCondition) Wait(lockedMutex QMutex_ITF, ti uint) bool {
if ptr.Pointer() != nil {
return int8(C.QWaitCondition_Wait(ptr.Pointer(), PointerFromQMutex(lockedMutex), C.ulong(uint32(time)))) != 0
return int8(C.QWaitCondition_Wait(ptr.Pointer(), PointerFromQMutex(lockedMutex), C.ulong(uint32(ti)))) != 0
}
return false
}

func (ptr *QWaitCondition) Wait2(lockedReadWriteLock QReadWriteLock_ITF, time uint) bool {
func (ptr *QWaitCondition) Wait2(lockedReadWriteLock QReadWriteLock_ITF, ti uint) bool {
if ptr.Pointer() != nil {
return int8(C.QWaitCondition_Wait2(ptr.Pointer(), PointerFromQReadWriteLock(lockedReadWriteLock), C.ulong(uint32(time)))) != 0
return int8(C.QWaitCondition_Wait2(ptr.Pointer(), PointerFromQReadWriteLock(lockedReadWriteLock), C.ulong(uint32(ti)))) != 0
}
return false
}
Expand Down
Loading

0 comments on commit de3f785

Please sign in to comment.