qtmoc fix + support for variables + goroot fix

core/core.cpp

@@ -75,6 +75,7 @@
 #include <QMargins>
 #include <QMarginsF>
 #include <QMessageAuthenticationCode>
+#include <QMessageLogContext>
 #include <QMessageLogger>
 #include <QMetaClassInfo>
 #include <QMetaEnum>
@@ -4180,6 +4181,16 @@ int QChildEvent_Removed(void* ptr)
 	return static_cast<QChildEvent*>(ptr)->removed();
 }
 
+void* QChildEvent_C(void* ptr)
+{
+	return static_cast<QChildEvent*>(ptr)->c;
+}
+
+void QChildEvent_SetC(void* ptr, void* vqo)
+{
+	static_cast<QChildEvent*>(ptr)->c = static_cast<QObject*>(vqo);
+}
+
 int QCollator_CaseSensitivity(void* ptr)
 {
 	return static_cast<QCollator*>(ptr)->caseSensitivity();
@@ -4768,6 +4779,11 @@ void QCoreApplication_DestroyQCoreApplication(void* ptr)
 	static_cast<QCoreApplication*>(ptr)->~QCoreApplication();
 }
 
+int QCoreApplication_QCoreApplication_ApplicationFlags()
+{
+	return QCoreApplication::ApplicationFlags;
+}
+
 void QCoreApplication_TimerEvent(void* ptr, void* event)
 {
 	static_cast<QCoreApplication*>(ptr)->timerEvent(static_cast<QTimerEvent*>(event));
@@ -9662,6 +9678,26 @@ char* QJsonParseError_ErrorString(void* ptr)
 	return static_cast<QJsonParseError*>(ptr)->errorString().toUtf8().data();
 }
 
+int QJsonParseError_Error(void* ptr)
+{
+	return static_cast<QJsonParseError*>(ptr)->error;
+}
+
+void QJsonParseError_SetError(void* ptr, int vpa)
+{
+	static_cast<QJsonParseError*>(ptr)->error = static_cast<QJsonParseError::ParseError>(vpa);
+}
+
+int QJsonParseError_Offset(void* ptr)
+{
+	return static_cast<QJsonParseError*>(ptr)->offset;
+}
+
+void QJsonParseError_SetOffset(void* ptr, int vin)
+{
+	static_cast<QJsonParseError*>(ptr)->offset = vin;
+}
+
 void* QJsonValue_NewQJsonValue7(void* s)
 {
 	return new QJsonValue(*static_cast<QLatin1String*>(s));
@@ -10817,6 +10853,41 @@ void QMessageAuthenticationCode_DestroyQMessageAuthenticationCode(void* ptr)
 	static_cast<QMessageAuthenticationCode*>(ptr)->~QMessageAuthenticationCode();
 }
 
+char* QMessageLogContext_Category(void* ptr)
+{
+	return QString(static_cast<QMessageLogContext*>(ptr)->category).toUtf8().data();
+}
+
+char* QMessageLogContext_File(void* ptr)
+{
+	return QString(static_cast<QMessageLogContext*>(ptr)->file).toUtf8().data();
+}
+
+char* QMessageLogContext_Function(void* ptr)
+{
+	return QString(static_cast<QMessageLogContext*>(ptr)->function).toUtf8().data();
+}
+
+int QMessageLogContext_Line(void* ptr)
+{
+	return static_cast<QMessageLogContext*>(ptr)->line;
+}
+
+void QMessageLogContext_SetLine(void* ptr, int vin)
+{
+	static_cast<QMessageLogContext*>(ptr)->line = vin;
+}
+
+int QMessageLogContext_Version(void* ptr)
+{
+	return static_cast<QMessageLogContext*>(ptr)->version;
+}
+
+void QMessageLogContext_SetVersion(void* ptr, int vin)
+{
+	static_cast<QMessageLogContext*>(ptr)->version = vin;
+}
+
 void* QMessageLogger_NewQMessageLogger()
 {
 	return new QMessageLogger();
@@ -18895,6 +18966,11 @@ int QSysInfo_QSysInfo_WindowsVersion()
 	return QSysInfo::windowsVersion();
 }
 
+int QSysInfo_QSysInfo_MacintoshVersion()
+{
+	return QSysInfo::MacintoshVersion;
+}
+
 void* QSystemSemaphore_NewQSystemSemaphore(char* key, int initialValue, int mode)
 {
 	return new QSystemSemaphore(QString(key), initialValue, static_cast<QSystemSemaphore::AccessMode>(mode));
@@ -21016,6 +21092,16 @@ int QTimerEvent_TimerId(void* ptr)
 	return static_cast<QTimerEvent*>(ptr)->timerId();
 }
 
+int QTimerEvent_Id(void* ptr)
+{
+	return static_cast<QTimerEvent*>(ptr)->id;
+}
+
+void QTimerEvent_SetId(void* ptr, int vin)
+{
+	static_cast<QTimerEvent*>(ptr)->id = vin;
+}
+
 class MyQTranslator: public QTranslator
 {
 public:

core/core.go

@@ -15610,6 +15610,23 @@ func (ptr *QChildEvent) Removed() bool {
 	return false
 }
 
+func (ptr *QChildEvent) C() *QObject {
+	defer qt.Recovering("QChildEvent::c")
+
+	if ptr.Pointer() != nil {
+		return NewQObjectFromPointer(C.QChildEvent_C(ptr.Pointer()))
+	}
+	return nil
+}
+
+func (ptr *QChildEvent) SetC(vqo QObject_ITF) {
+	defer qt.Recovering("QChildEvent::setC")
+
+	if ptr.Pointer() != nil {
+		C.QChildEvent_SetC(ptr.Pointer(), PointerFromQObject(vqo))
+	}
+}
+
 type QCollator struct {
 	ptr unsafe.Pointer
 }
@@ -17033,6 +17050,18 @@ func (ptr *QCoreApplication) DestroyQCoreApplication() {
 	}
 }
 
+func QCoreApplication_ApplicationFlags() int {
+	defer qt.Recovering("QCoreApplication::ApplicationFlags")
+
+	return int(C.QCoreApplication_QCoreApplication_ApplicationFlags())
+}
+
+func (ptr *QCoreApplication) ApplicationFlags() int {
+	defer qt.Recovering("QCoreApplication::ApplicationFlags")
+
+	return int(C.QCoreApplication_QCoreApplication_ApplicationFlags())
+}
+
 //export callbackQCoreApplication_TimerEvent
 func callbackQCoreApplication_TimerEvent(ptr unsafe.Pointer, ptrName *C.char, event unsafe.Pointer) {
 	defer qt.Recovering("callback QCoreApplication::timerEvent")
@@ -33846,6 +33875,40 @@ func (ptr *QJsonParseError) ErrorString() string {
 	return ""
 }
 
+func (ptr *QJsonParseError) Error() QJsonParseError__ParseError {
+	defer qt.Recovering("QJsonParseError::error")
+
+	if ptr.Pointer() != nil {
+		return QJsonParseError__ParseError(C.QJsonParseError_Error(ptr.Pointer()))
+	}
+	return 0
+}
+
+func (ptr *QJsonParseError) SetError(vpa QJsonParseError__ParseError) {
+	defer qt.Recovering("QJsonParseError::setError")
+
+	if ptr.Pointer() != nil {
+		C.QJsonParseError_SetError(ptr.Pointer(), C.int(vpa))
+	}
+}
+
+func (ptr *QJsonParseError) Offset() int {
+	defer qt.Recovering("QJsonParseError::offset")
+
+	if ptr.Pointer() != nil {
+		return int(C.QJsonParseError_Offset(ptr.Pointer()))
+	}
+	return 0
+}
+
+func (ptr *QJsonParseError) SetOffset(vin int) {
+	defer qt.Recovering("QJsonParseError::setOffset")
+
+	if ptr.Pointer() != nil {
+		C.QJsonParseError_SetOffset(ptr.Pointer(), C.int(vin))
+	}
+}
+
 //QJsonValue::Type
 type QJsonValue__Type int64
 
@@ -37815,6 +37878,67 @@ func newQMessageLogContextFromPointer(ptr unsafe.Pointer) *QMessageLogContext {
 	return n
 }
 
+func (ptr *QMessageLogContext) Category() string {
+	defer qt.Recovering("QMessageLogContext::category")
+
+	if ptr.Pointer() != nil {
+		return C.GoString(C.QMessageLogContext_Category(ptr.Pointer()))
+	}
+	return ""
+}
+
+func (ptr *QMessageLogContext) File() string {
+	defer qt.Recovering("QMessageLogContext::file")
+
+	if ptr.Pointer() != nil {
+		return C.GoString(C.QMessageLogContext_File(ptr.Pointer()))
+	}
+	return ""
+}
+
+func (ptr *QMessageLogContext) Function() string {
+	defer qt.Recovering("QMessageLogContext::function")
+
+	if ptr.Pointer() != nil {
+		return C.GoString(C.QMessageLogContext_Function(ptr.Pointer()))
+	}
+	return ""
+}
+
+func (ptr *QMessageLogContext) Line() int {
+	defer qt.Recovering("QMessageLogContext::line")
+
+	if ptr.Pointer() != nil {
+		return int(C.QMessageLogContext_Line(ptr.Pointer()))
+	}
+	return 0
+}
+
+func (ptr *QMessageLogContext) SetLine(vin int) {
+	defer qt.Recovering("QMessageLogContext::setLine")
+
+	if ptr.Pointer() != nil {
+		C.QMessageLogContext_SetLine(ptr.Pointer(), C.int(vin))
+	}
+}
+
+func (ptr *QMessageLogContext) Version() int {
+	defer qt.Recovering("QMessageLogContext::version")
+
+	if ptr.Pointer() != nil {
+		return int(C.QMessageLogContext_Version(ptr.Pointer()))
+	}
+	return 0
+}
+
+func (ptr *QMessageLogContext) SetVersion(vin int) {
+	defer qt.Recovering("QMessageLogContext::setVersion")
+
+	if ptr.Pointer() != nil {
+		C.QMessageLogContext_SetVersion(ptr.Pointer(), C.int(vin))
+	}
+}
+
 type QMessageLogger struct {
 	ptr unsafe.Pointer
 }
@@ -63979,6 +64103,18 @@ func (ptr *QSysInfo) WindowsVersion() QSysInfo__WinVersion {
 	return QSysInfo__WinVersion(C.QSysInfo_QSysInfo_WindowsVersion())
 }
 
+func QSysInfo_MacintoshVersion() QSysInfo__MacVersion {
+	defer qt.Recovering("QSysInfo::MacintoshVersion")
+
+	return QSysInfo__MacVersion(C.QSysInfo_QSysInfo_MacintoshVersion())
+}
+
+func (ptr *QSysInfo) MacintoshVersion() QSysInfo__MacVersion {
+	defer qt.Recovering("QSysInfo::MacintoshVersion")
+
+	return QSysInfo__MacVersion(C.QSysInfo_QSysInfo_MacintoshVersion())
+}
+
 //QSystemSemaphore::AccessMode
 type QSystemSemaphore__AccessMode int64
 
@@ -70679,6 +70815,23 @@ func (ptr *QTimerEvent) TimerId() int {
 	return 0
 }
 
+func (ptr *QTimerEvent) Id() int {
+	defer qt.Recovering("QTimerEvent::id")
+
+	if ptr.Pointer() != nil {
+		return int(C.QTimerEvent_Id(ptr.Pointer()))
+	}
+	return 0
+}
+
+func (ptr *QTimerEvent) SetId(vin int) {
+	defer qt.Recovering("QTimerEvent::setId")
+
+	if ptr.Pointer() != nil {
+		C.QTimerEvent_SetId(ptr.Pointer(), C.int(vin))
+	}
+}
+
 type QTranslator struct {
 	QObject
 }

core/core.h

@@ -739,6 +739,8 @@ int QChildEvent_Added(void* ptr);
 void* QChildEvent_Child(void* ptr);
 int QChildEvent_Polished(void* ptr);
 int QChildEvent_Removed(void* ptr);
+void* QChildEvent_C(void* ptr);
+void QChildEvent_SetC(void* ptr, void* vqo);
 int QCollator_CaseSensitivity(void* ptr);
 int QCollator_IgnorePunctuation(void* ptr);
 int QCollator_NumericMode(void* ptr);
@@ -852,6 +854,7 @@ int QCoreApplication_QCoreApplication_StartingUp();
 int QCoreApplication_QCoreApplication_TestAttribute(int attribute);
 char* QCoreApplication_QCoreApplication_Translate(char* context, char* sourceText, char* disambiguation, int n);
 void QCoreApplication_DestroyQCoreApplication(void* ptr);
+int QCoreApplication_QCoreApplication_ApplicationFlags();
 void QCoreApplication_TimerEvent(void* ptr, void* event);
 void QCoreApplication_TimerEventDefault(void* ptr, void* event);
 void QCoreApplication_ChildEvent(void* ptr, void* event);
@@ -1774,6 +1777,10 @@ void* QJsonObject_Take(void* ptr, char* key);
 void* QJsonObject_Value(void* ptr, char* key);
 void QJsonObject_DestroyQJsonObject(void* ptr);
 char* QJsonParseError_ErrorString(void* ptr);
+int QJsonParseError_Error(void* ptr);
+void QJsonParseError_SetError(void* ptr, int vpa);
+int QJsonParseError_Offset(void* ptr);
+void QJsonParseError_SetOffset(void* ptr, int vin);
 void* QJsonValue_NewQJsonValue7(void* s);
 void* QJsonValue_NewQJsonValue(int ty);
 void* QJsonValue_NewQJsonValue2(int b);
@@ -2005,6 +2012,13 @@ void QMessageAuthenticationCode_Reset(void* ptr);
 char* QMessageAuthenticationCode_Result(void* ptr);
 void QMessageAuthenticationCode_SetKey(void* ptr, char* key);
 void QMessageAuthenticationCode_DestroyQMessageAuthenticationCode(void* ptr);
+char* QMessageLogContext_Category(void* ptr);
+char* QMessageLogContext_File(void* ptr);
+char* QMessageLogContext_Function(void* ptr);
+int QMessageLogContext_Line(void* ptr);
+void QMessageLogContext_SetLine(void* ptr, int vin);
+int QMessageLogContext_Version(void* ptr);
+void QMessageLogContext_SetVersion(void* ptr, int vin);
 void* QMessageLogger_NewQMessageLogger();
 void* QMessageLogger_NewQMessageLogger2(char* file, int line, char* function);
 void* QMessageLogger_NewQMessageLogger3(char* file, int line, char* function, char* category);
@@ -3537,6 +3551,7 @@ char* QSysInfo_QSysInfo_PrettyProductName();
 char* QSysInfo_QSysInfo_ProductType();
 char* QSysInfo_QSysInfo_ProductVersion();
 int QSysInfo_QSysInfo_WindowsVersion();
+int QSysInfo_QSysInfo_MacintoshVersion();
 void* QSystemSemaphore_NewQSystemSemaphore(char* key, int initialValue, int mode);
 int QSystemSemaphore_Acquire(void* ptr);
 int QSystemSemaphore_Error(void* ptr);
@@ -3934,6 +3949,8 @@ void* QTimer_MetaObject(void* ptr);
 void* QTimer_MetaObjectDefault(void* ptr);
 void* QTimerEvent_NewQTimerEvent(int timerId);
 int QTimerEvent_TimerId(void* ptr);
+int QTimerEvent_Id(void* ptr);
+void QTimerEvent_SetId(void* ptr, int vin);
 void* QTranslator_NewQTranslator(void* parent);
 int QTranslator_IsEmpty(void* ptr);
 int QTranslator_IsEmptyDefault(void* ptr);