code clean up & start using jnew_allow_null

libjcore/code/JRect.h

@@ -166,8 +166,8 @@ class JRect
 		)
 		const
 	{
-		return left <= x && x < right &&
-								  top  <= y && y < bottom;
+		return (left <= x && x < right &&
+				top  <= y && y < bottom);
 	};
 
 	bool
@@ -187,8 +187,8 @@ class JRect
 		)
 		const
 	{
-		return left <= r.left && r.left <= r.right && r.right <= right &&
-					top <= r.top && r.top <= r.bottom && r.bottom <= bottom;
+		return (left <= r.left && r.left <= r.right && r.right <= right &&
+				top <= r.top && r.top <= r.bottom && r.bottom <= bottom);
 	};
 
 	void

libjx/code/JXContainer.h

@@ -545,7 +545,7 @@ JXContainer::GetFrame()		// enclosure coordinates
 {
 	if (itsEnclosure != nullptr)
 	{
-		return (itsEnclosure->GlobalToLocal(GetFrameGlobal()));
+		return itsEnclosure->GlobalToLocal(GetFrameGlobal());
 	}
 	else
 	{
@@ -585,7 +585,7 @@ inline JRect
 JXContainer::GetAperture()
 	const
 {
-	return (GlobalToLocal(GetApertureGlobal()));
+	return GlobalToLocal(GetApertureGlobal());
 }
 
 inline JCoordinate

libjx/code/JXDSSSelection.cpp

@@ -119,7 +119,7 @@ JXDSSSelection::ConvertData
 
 		*returnType = XA_STRING;
 		*dataLength = 1;
-		*data = jnew unsigned char[ *dataLength ];
+		*data = jnew_allow_null unsigned char[ *dataLength ];
 		if (*data != nullptr)
 		{
 			**data = 0x45;	// E

libjx/code/JXDockDragData.cpp

@@ -50,8 +50,8 @@ JXDockDragData::AddTypes
 	const Atom selectionName
 	)
 {
-	AddType((JXGetDockManager())->GetDNDMinSizeAtom());
-	AddType((JXGetDockManager())->GetDNDWindowAtom());
+	AddType(JXGetDockManager()->GetDNDMinSizeAtom());
+	AddType(JXGetDockManager()->GetDNDWindowAtom());
 }
 
 /******************************************************************************
@@ -70,28 +70,28 @@ JXDockDragData::ConvertData
 	)
 	const
 {
-	if (requestType == (JXGetDockManager())->GetDNDMinSizeAtom())
+	if (requestType == JXGetDockManager()->GetDNDMinSizeAtom())
 	{
 		*returnType   = XA_POINT;
 		*bitsPerBlock = 16;
 		*dataLength   = sizeof(XPoint);
-		*data         = jnew unsigned char[ *dataLength ];
+		*data         = jnew_allow_null unsigned char[ *dataLength ];
 		if (*data != nullptr)
 		{
 			const JPoint minSize = itsWindow->GetMinSize();
-			auto* xpt          = (XPoint*) *data;
+			auto* xpt            = (XPoint*) *data;
 			xpt->x               = JMin(minSize.x, SHRT_MAX);
 			xpt->y               = JMin(minSize.y, SHRT_MAX);
 			return true;
 		}
 	}
 
-	else if (requestType == (JXGetDockManager())->GetDNDWindowAtom())
+	else if (requestType == JXGetDockManager()->GetDNDWindowAtom())
 	{
 		*returnType   = XA_WINDOW;
 		*bitsPerBlock = 32;
 		*dataLength   = sizeof(Window);
-		*data         = jnew unsigned char[ *dataLength ];
+		*data         = jnew_allow_null unsigned char[ *dataLength ];
 		if (*data != nullptr)
 		{
 			*((Window*) *data) = itsWindow->GetXWindow();

libjx/code/JXFileSelection.cpp

@@ -105,7 +105,6 @@ JXFileSelection::SetData
 	if (itsList == nullptr)
 	{
 		itsList = jnew JDCCPtrArray<JString>(list, JPtrArrayT::kDeleteAll);
-		assert( itsList != nullptr );
 	}
 	else
 	{

libjx/code/JXSelectionData.cpp

@@ -68,7 +68,6 @@ JXSelectionData::JXSelectionDataX()
 	itsEndTime       = CurrentTime;
 
 	itsTypeList = jnew JArray<Atom>;
-	assert( itsTypeList != nullptr );
 	itsTypeList->SetCompareFunction(CompareAtoms);
 
 	itsDataSourceID = nullptr;
@@ -220,7 +219,7 @@ JXSelectionData::Resolve()
 	Handles certain types and passes everything else off to ConvertData().
 
 	When adding special types to this function, remember to update
-	SetSelectionInfo() to add the jnew types.
+	SetSelectionInfo() to add the new types.
 
  ******************************************************************************/
 
@@ -248,7 +247,7 @@ JXSelectionData::Convert
 		*bitsPerBlock = 32;		// XXXATOM: sizeof(Atom)*8; -- fails on 64-bit systems
 		*dataLength   = sizeof(Atom)*atomCount;
 
-		*data = jnew unsigned char [ *dataLength ];
+		*data = jnew_allow_null unsigned char [ *dataLength ];
 		if (*data == nullptr)
 		{
 			return false;
@@ -271,7 +270,7 @@ JXSelectionData::Convert
 		*bitsPerBlock = 32;	// sizeof(Time)*8; -- fails on 64-bit systems
 		*dataLength   = sizeof(Time);
 
-		*data = jnew unsigned char [ *dataLength ];
+		*data = jnew_allow_null unsigned char [ *dataLength ];
 		if (*data == nullptr)
 		{
 			return false;

libjx/code/JXSelectionManager.cpp

@@ -64,12 +64,10 @@ JXSelectionManager::JXSelectionManager
 	(
 	JXDisplay* display
 	)
+	:
+	itsDisplay(display)
 {
-	itsDisplay = display;
-
-	itsDataList = jnew JPtrArray<JXSelectionData>(JPtrArrayT::kDeleteAll);
-	assert( itsDataList != nullptr );
-
+	itsDataList         = jnew JPtrArray<JXSelectionData>(JPtrArrayT::kDeleteAll);
 	itsMaxDataChunkSize = XMaxRequestSize(*display) * 4/5;
 
 	itsReceivedAllocErrorFlag  = false;

libjx/code/JXTEBase.cpp

@@ -404,8 +404,8 @@ JXTEBase::TEBeginDND()
 
 	auto* data = jnew JXTextSelection(this, kSelectionDataID);
 
-	return BeginDND(*(itsDNDDragInfo->pt), *(itsDNDDragInfo->buttonStates),
-					*(itsDNDDragInfo->modifiers), data);
+	return BeginDND(*itsDNDDragInfo->pt, *itsDNDDragInfo->buttonStates,
+					*itsDNDDragInfo->modifiers, data);
 }
 
 /******************************************************************************
@@ -416,7 +416,7 @@ JXTEBase::TEBeginDND()
 void
 JXTEBase::DNDFinish
 	(
-	const bool		isDrop,
+	const bool			isDrop,
 	const JXContainer*	target
 	)
 {
@@ -516,10 +516,8 @@ JXTEBase::GetSelectionData
 		auto* textData = dynamic_cast<JXTextSelection*>(data);
 		assert( textData != nullptr );
 
-		auto* text = jnew JString;
-
+		auto* text  = jnew JString;
 		auto* style = jnew JRunArray<JFont>;
-		assert( style != nullptr );
 
 		const bool ok = GetSelection(text, style);
 		assert( ok );
@@ -1457,8 +1455,6 @@ JXTEBase::TEUpdateClipboard
 	const
 {
 	auto* data = jnew JXTextSelection(GetDisplay(), text, &style);
-	assert( data != nullptr );
-
 	if (!GetSelectionManager()->SetData(kJXClipboardName, data))
 	{
 		JGetUserNotification()->ReportError(JGetString("UnableToCopy::JXTEBase"));
@@ -2771,7 +2767,7 @@ JXTEBase::GetPSPrintFileName()
 {
 	if (itsPSPrintName == nullptr)
 	{
-		auto* me = const_cast<JXTEBase*>(this);
+		auto* me           = const_cast<JXTEBase*>(this);
 		me->itsPSPrintName = jnew JString;
 	}
 
@@ -2898,7 +2894,7 @@ JXTEBase::GetPTPrintFileName()
 {
 	if (itsPTPrintName == nullptr)
 	{
-		auto* me = const_cast<JXTEBase*>(this);
+		auto* me           = const_cast<JXTEBase*>(this);
 		me->itsPTPrintName = jnew JString;
 	}
 
@@ -2970,8 +2966,6 @@ JXTEBase::AskForLine()
 	JIndex lineIndex = GetLineForChar(GetInsertionIndex().charIndex);
 
 	auto* dlog = jnew JXGoToLineDialog(lineIndex, GetLineCount());
-	assert( dlog != nullptr );
-
 	if (dlog->DoDialog())
 	{
 		bool physicalLineIndexFlag;

libjx/code/JXTextSelection.cpp

@@ -154,7 +154,6 @@ JXTextSelection::SetData
 	else if (style != nullptr && itsStyle == nullptr)
 	{
 		itsStyle = jnew JRunArray<JFont>(*style);
-		assert( itsStyle != nullptr );
 	}
 	else
 	{
@@ -282,7 +281,7 @@ JXTextSelection::ConvertData
 	{
 		*returnType = requestType;
 		*dataLength = itsText->GetByteCount();
-		*data       = jnew unsigned char[ *dataLength ];
+		*data       = jnew_allow_null unsigned char[ *dataLength ];
 		if (*data != nullptr)
 		{
 			memcpy(*data, itsText->GetRawBytes(), *dataLength);
@@ -301,7 +300,7 @@ JXTextSelection::ConvertData
 		const std::string s = dataStream.str();
 		*returnType         = itsStyledText0XAtom;
 		*dataLength         = s.length();
-		*data               = jnew unsigned char[ *dataLength ];
+		*data               = jnew_allow_null unsigned char[ *dataLength ];
 		if (*data != nullptr)
 		{
 			memcpy(*data, s.data(), *dataLength);

libjx/code/JXWidget.cpp

@@ -1260,8 +1260,6 @@ JXWidget::CreateDragPainter
 	assert( visible );
 
 	itsDragPainter = jnew JXDragPainter(GetDisplay(), GetWindow(), clipRect);
-	assert( itsDragPainter != nullptr );
-
 	itsDragPainter->SetOrigin(itsBoundsG.left, itsBoundsG.top);
 	itsDragPainter->ResetClipRect();	// do this last so clipRect matches with new origin
 	return itsDragPainter;
@@ -1379,7 +1377,7 @@ JXWidget::GetSelectionData
 void
 JXWidget::DNDFinish
 	(
-	const bool		isDrop,
+	const bool			isDrop,
 	const JXContainer*	target
 	)
 {

tutorial/14-DragAndDrop/DNDData.cpp

@@ -64,7 +64,6 @@ DNDData::SetData
 	if (itsPoints == nullptr)
 	{
 		itsPoints = jnew JArray<JPoint>;
-		assert(itsPoints != nullptr);
 	}
 
 	// if the data had been set previously, we want to remove all of
@@ -132,7 +131,7 @@ DNDData::ConvertData
 		// The following code gives X the data in the form that it needs.
 		*returnType = itsLinesXAtom;
 		*dataLength = itsBuffer->GetByteCount();
-		*data = jnew unsigned char[ *dataLength ];
+		*data = jnew_allow_null unsigned char[ *dataLength ];
 		if (*data != nullptr)
 		{
 			memcpy(*data, itsBuffer->GetRawBytes(), *dataLength);
@@ -197,7 +196,6 @@ DNDData::CreateBuffer()
 		}
 
 		// Create our buffer with the character pointer.
-		th->itsBuffer  = jnew JString(os.str());
-		assert( th->itsBuffer != nullptr );
+		th->itsBuffer = jnew JString(os.str());
 	}
 }

tutorial/14-DragAndDrop/DNDWidget.cpp

@@ -52,11 +52,10 @@ DNDWidget::DNDWidget
 	// See JCollection.h, JList.h, and JArray.h for functionality
 
 	itsPoints = jnew JArray<JPoint>;
-	assert( itsPoints != nullptr );
 
 	// We need to register the drag X Atom with the display. We will need
 	// to keep a copy of the atom to check in WillAcceptDrop.
-	itsLinesXAtom	= GetDisplay()->RegisterXAtom(DNDData::GetDNDAtomName());
+	itsLinesXAtom = GetDisplay()->RegisterXAtom(DNDData::GetDNDAtomName());
 }
 
 /******************************************************************************