code clean up

libj2dplot/code/J2DPlotData.cpp

@@ -27,7 +27,6 @@ J2DPlotData::Create
 	if (OKToCreate(x,y))
 	{
 		*plotData = jnew J2DPlotData(x,y,listen);
-		assert( *plotData != nullptr );
 		return true;
 	}
 	else
@@ -61,7 +60,7 @@ J2DPlotData::J2DPlotData
 	(
 	const JArray<JFloat>&	x,
 	const JArray<JFloat>&	y,
-	const bool			listen
+	const bool				listen
 	)
 	:
 	J2DPlotDataBase(kScatterPlot)
@@ -74,19 +73,15 @@ J2DPlotData::J2DPlotData
 	if (listen)
 	{
 		itsXData = const_cast< JArray<JFloat>* >(&x);
-		assert( itsXData != nullptr );
 		ListenTo(itsXData);
 
 		itsYData = const_cast< JArray<JFloat>* >(&y);
-		assert( itsYData != nullptr );
 		ListenTo(itsYData);
 	}
 	else
 	{
 		itsXData = jnew JArray<JFloat>(x);
-		assert( itsXData != nullptr );
 		itsYData = jnew JArray<JFloat>(y);
-		assert( itsYData != nullptr );
 	}
 
 	itsXPErrorData = nullptr;
@@ -278,36 +273,30 @@ J2DPlotData::IgnoreDataChanges()
 	{
 		StopListening(itsXData);
 		itsXData = jnew JArray<JFloat>(*itsXData);
-		assert( itsXData != nullptr );
 
 		if (itsXPErrorData != nullptr)
 		{
 			StopListening(itsXPErrorData);
 			itsXPErrorData = jnew JArray<JFloat>(*itsXPErrorData);
-			assert( itsXPErrorData != nullptr );
 		}
 		if (itsXMErrorData != nullptr)
 		{
 			StopListening(itsXMErrorData);
 			itsXMErrorData = jnew JArray<JFloat>(*itsXMErrorData);
-			assert( itsXMErrorData != nullptr );
 		}
 
 		StopListening(itsYData);
 		itsYData = jnew JArray<JFloat>(*itsYData);
-		assert( itsYData != nullptr );
 
 		if (itsYPErrorData != nullptr)
 		{
 			StopListening(itsYPErrorData);
 			itsYPErrorData = jnew JArray<JFloat>(*itsYPErrorData);
-			assert( itsYPErrorData != nullptr );
 		}
 		if (itsYMErrorData != nullptr)
 		{
 			StopListening(itsYMErrorData);
 			itsYMErrorData = jnew JArray<JFloat>(*itsYMErrorData);
-			assert( itsYMErrorData != nullptr );
 		}
 
 		itsIsListeningFlag = false;
@@ -351,7 +340,6 @@ J2DPlotData::SetXErrors
 
 		jdelete itsXPErrorData;
 		itsXPErrorData = jnew JArray<JFloat>(xErr);
-		assert( itsXPErrorData != nullptr );
 	}
 
 	BroadcastCurveChanged();
@@ -395,11 +383,9 @@ J2DPlotData::SetXErrors
 	{
 		jdelete itsXPErrorData;
 		itsXPErrorData = jnew JArray<JFloat>(xPErr);
-		assert( itsXPErrorData != nullptr );
 
 		jdelete itsXMErrorData;
 		itsXMErrorData = jnew JArray<JFloat>(xMErr);
-		assert( itsXMErrorData != nullptr );
 	}
 
 	BroadcastCurveChanged();
@@ -443,7 +429,6 @@ J2DPlotData::SetYErrors
 
 		jdelete itsYPErrorData;
 		itsYPErrorData = jnew JArray<JFloat>(yErr);
-		assert( itsYPErrorData != nullptr );
 	}
 
 	BroadcastCurveChanged();
@@ -487,11 +472,9 @@ J2DPlotData::SetYErrors
 	{
 		jdelete itsYPErrorData;
 		itsYPErrorData = jnew JArray<JFloat>(yPErr);
-		assert( itsYPErrorData != nullptr );
 
 		jdelete itsYMErrorData;
 		itsYMErrorData = jnew JArray<JFloat>(yMErr);
-		assert( itsYMErrorData != nullptr );
 	}
 
 	BroadcastCurveChanged();

libj2dplot/code/J2DPlotFunction.cpp

@@ -164,33 +164,29 @@ J2DPlotFunction::Receive
 {
 	if (sender == itsVarList && message.Is(JVariableList::kVarInserted))
 	{
-		const auto* info =
-			dynamic_cast<const JVariableList::VarInserted*>(&message);
+		const auto* info = dynamic_cast<const JVariableList::VarInserted*>(&message);
 		assert( info != nullptr );
 		info->AdjustIndex(&itsXIndex);
 	}
 
 	else if (sender == itsVarList && message.Is(JVariableList::kVarRemoved))
 	{
-		const auto* info =
-			dynamic_cast<const JVariableList::VarRemoved*>(&message);
+		const auto* info = dynamic_cast<const JVariableList::VarRemoved*>(&message);
 		assert( info != nullptr );
 		const bool ok = info->AdjustIndex(&itsXIndex);
 		assert( ok );	// client must ensure this
 	}
 
 	else if (sender == itsVarList && message.Is(JVariableList::kVarMoved))
 	{
-		const auto* info =
-			dynamic_cast<const JVariableList::VarMoved*>(&message);
+		const auto* info = dynamic_cast<const JVariableList::VarMoved*>(&message);
 		assert( info != nullptr );
 		info->AdjustIndex(&itsXIndex);
 	}
 
 	else if (sender == itsVarList && message.Is(JVariableList::kVarValueChanged))
 	{
-		const auto* info =
-			dynamic_cast<const JVariableList::VarValueChanged*>(&message);
+		const auto* info = dynamic_cast<const JVariableList::VarValueChanged*>(&message);
 		assert( info != nullptr );
 		if (info->GetVarIndex() != itsXIndex)
 		{

libj2dplot/code/J2DPlotFunctionBase.cpp

@@ -34,8 +34,6 @@ J2DPlotFunctionBase::J2DPlotFunctionBase
 	itsXMax = JMax(xMin, xMax);
 
 	itsValues = jnew JArray<Point>(kDefSampleCount);
-	assert( itsValues != nullptr );
-
 	ListenTo(itsPlot);
 }
 

libj2dplot/code/J2DPlotWidget.cpp

@@ -131,17 +131,10 @@ J2DPlotWidget::J2DPlotWidget
 	itsYCursor1InitFlag(false),
 	itsYCursor2InitFlag(false)
 {
-	itsCurves = jnew JPtrArray<J2DPlotDataBase>(JPtrArrayT::kForgetAll);
-	assert(itsCurves != nullptr);
-
-	itsCurveInfo = jnew JArray<J2DCurveInfo>;
-	assert(itsCurveInfo != nullptr);
-
-	itsColors = jnew JArray<JColorID>;
-	assert(itsColors != nullptr);
-
+	itsCurves     = jnew JPtrArray<J2DPlotDataBase>(JPtrArrayT::kForgetAll);
+	itsCurveInfo  = jnew JArray<J2DCurveInfo>;
+	itsColors     = jnew JArray<JColorID>;
 	itsColorUsage = jnew JArray<JSize>;
-	assert(itsColorUsage != nullptr);
 
 	AddColor(itsBlackColor);
 
@@ -151,11 +144,7 @@ J2DPlotWidget::J2DPlotWidget
 	}
 
 	itsXMarks = jnew JArray<JFloat>;
-	assert(itsXMarks != nullptr);
-
 	itsYMarks = jnew JArray<JFloat>;
-	assert(itsYMarks != nullptr);
-
 	ResetScale(true);
 }
 
@@ -462,7 +451,6 @@ J2DPlotWidget::SetCurveInfoArray
 	{
 		J2DCurveInfo info = infoArray.GetItem(i);
 		info.name = jnew JString(*info.name);
-		assert(info.name != nullptr);
 		itsCurveInfo->SetItem(i, info);
 	}
 	UpdatePlot(true);
@@ -3763,7 +3751,6 @@ J2DPlotWidget::PWReadCurveSetup
 	{
 		J2DCurveInfo info;
 		info.name = jnew JString;
-		assert(info.name != nullptr);
 		input >> info;
 
 		if (setData)

libj2dplot/code/J2DVectorData.cpp

@@ -30,7 +30,6 @@ J2DVectorData::Create
 	if (OKToCreate(x,y, vx,vy))
 	{
 		*plotData = jnew J2DVectorData(x,y, vx,vy, listen);
-		assert( *plotData != nullptr );
 		return true;
 	}
 	else
@@ -54,9 +53,9 @@ J2DVectorData::OKToCreate
 	const JArray<JFloat>& vy
 	)
 {
-	return x.GetItemCount()  == y.GetItemCount() &&
-				y.GetItemCount()  == vx.GetItemCount() &&
-				vx.GetItemCount() == vy.GetItemCount();
+	return (x.GetItemCount()  == y.GetItemCount() &&
+			y.GetItemCount()  == vx.GetItemCount() &&
+			vx.GetItemCount() == vy.GetItemCount());
 }
 
 /*********************************************************************************
@@ -70,14 +69,10 @@ J2DVectorData::J2DVectorData()
 {
 	J2DVectorDataX();
 
-	itsXData = jnew JArray<JFloat>(100);
-	assert( itsXData != nullptr );
-	itsYData = jnew JArray<JFloat>(100);
-	assert( itsYData != nullptr );
+	itsXData  = jnew JArray<JFloat>(100);
+	itsYData  = jnew JArray<JFloat>(100);
 	itsVXData = jnew JArray<JFloat>(100);
-	assert( itsVXData != nullptr );
 	itsVYData = jnew JArray<JFloat>(100);
-	assert( itsVYData != nullptr );
 
 	itsIsListeningFlag = false;
 }
@@ -106,31 +101,23 @@ J2DVectorData::J2DVectorData
 	if (listen)
 	{
 		itsXData = const_cast< JArray<JFloat>* >(&x);
-		assert( itsXData != nullptr );
 		ListenTo(itsXData);
 
 		itsYData = const_cast< JArray<JFloat>* >(&y);
-		assert( itsYData != nullptr );
 		ListenTo(itsYData);
 
 		itsVXData = const_cast< JArray<JFloat>* >(&vx);
-		assert( itsVXData != nullptr );
 		ListenTo(itsVXData);
 
 		itsVYData = const_cast< JArray<JFloat>* >(&vy);
-		assert( itsVYData != nullptr );
 		ListenTo(itsVYData);
 	}
 	else
 	{
-		itsXData = jnew JArray<JFloat>(x);
-		assert( itsXData != nullptr );
-		itsYData = jnew JArray<JFloat>(y);
-		assert( itsYData != nullptr );
+		itsXData  = jnew JArray<JFloat>(x);
+		itsYData  = jnew JArray<JFloat>(y);
 		itsVXData = jnew JArray<JFloat>(vx);
-		assert( itsVXData != nullptr );
 		itsVYData = jnew JArray<JFloat>(vy);
-		assert( itsVYData != nullptr );
 	}
 }
 
@@ -378,19 +365,15 @@ J2DVectorData::IgnoreDataChanges()
 	{
 		StopListening(itsXData);
 		itsXData = jnew JArray<JFloat>(*itsXData);
-		assert( itsXData != nullptr );
 
 		StopListening(itsYData);
 		itsYData = jnew JArray<JFloat>(*itsYData);
-		assert( itsYData != nullptr );
 
 		StopListening(itsVXData);
 		itsVXData = jnew JArray<JFloat>(*itsVXData);
-		assert( itsVXData != nullptr );
 
 		StopListening(itsVYData);
 		itsVYData = jnew JArray<JFloat>(*itsVYData);
-		assert( itsVYData != nullptr );
 
 		itsIsListeningFlag = false;
 	}

libj2dplot/code/JX2DCurveNameList.cpp

@@ -55,7 +55,6 @@ JX2DCurveNameList::JX2DCurveNameList
 	const JSize count = curveInfo.GetItemCount();
 
 	itsNameList = jnew JPtrArray<JString>(JPtrArrayT::kForgetAll, count);
-	assert(itsNameList != nullptr);
 
 	AppendRows(count);
 	for (JIndex i=1; i<=count; i++)

libj2dplot/code/JX2DCurveOptionsDialog.cpp

@@ -40,28 +40,19 @@ JX2DCurveOptionsDialog::JX2DCurveOptionsDialog
 	assert( array.IndexValid(startIndex) );
 
 	itsCurveInfo = jnew JArray<J2DCurveInfo>;
-	assert(itsCurveInfo != nullptr);
 
 	const JSize count = array.GetItemCount();
 	for (JIndex i=1; i<=count; i++)
 	{
 		J2DCurveInfo info = array.GetItem(i);
 		info.name = jnew JString(*info.name);
-		assert(info.name != nullptr);
 		itsCurveInfo->AppendItem(info);
 	}
 
 	itsHasXErrors = jnew JArray<bool>(hasXErrors);
-	assert( itsHasXErrors != nullptr );
-
 	itsHasYErrors = jnew JArray<bool>(hasYErrors);
-	assert( itsHasYErrors != nullptr );
-
 	itsIsFunction = jnew JArray<bool>(isFunction);
-	assert( itsIsFunction != nullptr );
-
-	itsIsScatter = jnew JArray<bool>(isScatter);
-	assert( itsIsScatter != nullptr );
+	itsIsScatter  = jnew JArray<bool>(isScatter);
 
 	BuildWindow();
 }
@@ -180,8 +171,7 @@ JX2DCurveOptionsDialog::Receive
 {
 	if (sender == itsNameList && message.Is(JX2DCurveNameList::kNameSelected))
 	{
-		const auto* info =
-			dynamic_cast<const JX2DCurveNameList::NameSelected*>(&message);
+		const auto* info = dynamic_cast<const JX2DCurveNameList::NameSelected*>(&message);
 		assert(info != nullptr);
 		SaveSettings();
 		itsCurrentIndex = info->GetIndex();

libj2dplot/code/JX2DPlotWidget.cpp

@@ -71,7 +71,6 @@ JX2DPlotWidget::JX2DPlotWidget
 	itsIsSharingMenusFlag(false)
 {
 	itsOptionsMenu = menuBar->AppendTextMenu(JGetString("MenuTitle::JX2DPlotWidget_Options"));
-	assert( itsOptionsMenu != nullptr );
 	itsOptionsMenu->SetMenuItems(kOptionsMenuStr);
 	itsOptionsMenu->SetUpdateAction(JXMenu::kDisableNone);
 	ConfigureOptionsMenu(itsOptionsMenu);
@@ -138,7 +137,6 @@ JX2DPlotWidget::JX2DPlotWidgetX()
 	AddColor(JColorManager::GetLightBlueColor());
 
 	itsMarkDir = jnew JX2DCursorMarkTableDir(GetWindow()->GetDirector(), this);
-	assert(itsMarkDir != nullptr);
 
 	JXDisplay* display = GetDisplay();
 	itsDragXCursor     = JXGetDragVertLineCursor(display);
@@ -488,7 +486,6 @@ JX2DPlotWidget::ChangeLabels
 	auto* dlog =
 		jnew JX2DPlotLabelDialog(GetTitle(), GetXLabel(), GetYLabel(),
 								 GetFontName(), GetFontSize(), selection);
-	assert (dlog != nullptr);
 
 	if (dlog->DoDialog())
 	{
@@ -523,7 +520,6 @@ JX2DPlotWidget::ChangeScale
 		jnew JX2DPlotScaleDialog(xmin, xmax, xinc, XAxisIsLinear(),
 								 ymin, ymax, yinc, YAxisIsLinear(),
 								 editXAxis);
-	assert( dlog != nullptr );
 	if (dlog->DoDialog())
 	{
 		bool xLinear, yLinear;
@@ -700,8 +696,6 @@ JX2DPlotWidget::ChangeCurveOptions
 	auto* dlog =
 		jnew JX2DCurveOptionsDialog(GetCurveInfoArray(),
 									hasXErrors, hasYErrors, isFunction, isScatter, index);
-	assert( dlog != nullptr );
-
 	if (dlog->DoDialog())
 	{
 		SetCurveInfoArray(dlog->GetCurveInfoArray());