ObjQt  Check-in [6de2243af6]

Overview
Comment:Ownership fix for QtChildEvent

When created using initWithType:child:, it should take ownership of the
underlying QChildEvent.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 6de2243af69775f5eab27b52e9393f1e0a9db14481d84cb2d2af80f392f27e9e
User & Date: js on 2017-04-09 12:20:40
Other Links: manifest | tags
Context
2017-04-12
09:17
Add a license check-in: 01e4161d3e user: js tags: trunk
2017-04-09
12:20
Ownership fix for QtChildEvent check-in: 6de2243af6 user: js tags: trunk
12:19
Add OFString (QString) check-in: ed8ed56b3a user: js tags: trunk
Changes

Modified ObjQt.pro from [209f0c7bf9] to [ca2d60cd6c].

20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
	   QtGui/QtGuiApplication.h	\
	   QtGui/QtPaintDevice.h	\
	   QtWidgets/QtApplication.h	\
	   QtWidgets/QtWidget.h

SOURCES += common/OFString+QString.mm	\
	   QtCore/QtChildEvent.mm	\
           QtCore/QtCoreApplication.mm	\
	   QtCore/QtEvent.mm  		\
	   QtCore/QtObject.mm		\
	   QtCore/QtThread.mm		\
	   QtGui/QtGuiApplication.mm	\
	   QtGui/QtPaintDevice.mm	\
	   QtWidgets/QtApplication.mm	\
	   QtWidgets/QtWidget.mm







|







20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
	   QtGui/QtGuiApplication.h	\
	   QtGui/QtPaintDevice.h	\
	   QtWidgets/QtApplication.h	\
	   QtWidgets/QtWidget.h

SOURCES += common/OFString+QString.mm	\
	   QtCore/QtChildEvent.mm	\
	   QtCore/QtCoreApplication.mm	\
	   QtCore/QtEvent.mm  		\
	   QtCore/QtObject.mm		\
	   QtCore/QtThread.mm		\
	   QtGui/QtGuiApplication.mm	\
	   QtGui/QtPaintDevice.mm	\
	   QtWidgets/QtApplication.mm	\
	   QtWidgets/QtWidget.mm

Modified QtCore/QtChildEvent.mm from [3e5461799b] to [ef11711dc6].

12
13
14
15
16
17
18
19
20




21
22
23
24
25
26
27
	return [super initWithQEvent: event];
}

- initWithType: (QChildEvent::Type)type
	 child: (QtObject*)child
{
	try {
		return [self initWithQChildEvent:
		    new QChildEvent(type, [child qObject])];




	} catch (const std::bad_alloc &e) {
		self = [super initWithQEvent: NULL];
		[self release];
		throw;
	}
}








|

>
>
>
>







12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
	return [super initWithQEvent: event];
}

- initWithType: (QChildEvent::Type)type
	 child: (QtObject*)child
{
	try {
		self = [self initWithQChildEvent:
		    new QChildEvent(type, [child qObject])];

		[self takeOwnership];

		return self;
	} catch (const std::bad_alloc &e) {
		self = [super initWithQEvent: NULL];
		[self release];
		throw;
	}
}