code clean up

jafl · Jan 5, 2024 · ef9dd4e · ef9dd4e
1 parent 0e3a20b
commit ef9dd4e
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 58 deletions.
diff --git a/libjcore/Make.files b/libjcore/Make.files
@@ -132,7 +132,6 @@
 .cpp ./code/JBroadcastSnooper
 .cpp ./code/JMDIServer
 .cpp ./code/JUpdateChecker
-.cpp ./code/jMouseUtil
 .cpp ./code/JStopWatch
 .cpp ./code/jSysUtil_UNIX
 .cpp ./code/jTime

diff --git a/libjcore/code/JCoreLibVersion.h b/libjcore/code/JCoreLibVersion.h
@@ -43,6 +43,7 @@ static const char* kCurrentJCoreLibVersionStr = "4.1.0";
 //	jMath:
 //		*** Removed kJPi & kJE in favor of std::numbers.
 //		Removed unused constant kJLog10ToLog2.
+//		Removed JLAbs() in favor of labs().
 //	JString:
 //		Switched to an exponential reallocation model.
 //		*** Adjusted ctor to use NormalizeData enum instead of bool.

diff --git a/libjcore/code/jMath.h b/libjcore/code/jMath.h
@@ -45,15 +45,6 @@ JLCeil
 	return JRound( ceil(x) );
 }
 
-inline long
-JLAbs
-	(
-	const long x
-	)
-{
-	return (x >= 0 ? x : -x);
-}
-
 inline long
 JTruncate
 	(

diff --git a/libjcore/code/jMouseUtil.cpp b/libjcore/code/jMouseUtil.cpp
diff --git a/libjcore/code/jMouseUtil.h b/libjcore/code/jMouseUtil.h
@@ -10,7 +10,23 @@
 
 #include "JPoint.h"
 
-bool	JMouseMoved(const JPoint& pt1, const JPoint& pt2,
-						const JCoordinate debounceWidth = 3);
+/******************************************************************************
+ JMouseMoved
+
+	Returns true if the points are further apart than the debounce width.
+
+ ******************************************************************************/
+
+inline bool
+JMouseMoved
+	(
+	const JPoint&		pt1,
+	const JPoint&		pt2,
+	const JCoordinate	debounceWidth = 3
+	)
+{
+	return (labs(pt2.x - pt1.x) > debounceWidth ||
+			labs(pt2.y - pt1.y) > debounceWidth);
+}
 
 #endif
diff --git a/libjcore/libjcore.jcc b/libjcore/libjcore.jcc
@@ -733,10 +733,6 @@ T
 F
 "./code/JUpdateChecker.cpp"
 T
-2 "jMouseUtil.cpp"
-F
-"./code/jMouseUtil.cpp"
-T
 2 "JStopWatch.cpp"
 F
 "./code/JStopWatch.cpp"

diff --git a/libjcore/test/code/test_jMath.cpp b/libjcore/test/code/test_jMath.cpp
@@ -56,9 +56,3 @@ JTEST(Truncate)
 	JAssertEqual(4, JTruncate(4.3));
 	JAssertEqual(4, JTruncate(4.9));
 }
-
-JTEST(Abs)
-{
-	JAssertEqual(5, JLAbs(5));
-	JAssertEqual(5, JLAbs(-5));
-}
diff --git a/libjx/code/JXMenuTable.cpp b/libjx/code/JXMenuTable.cpp
@@ -686,8 +686,8 @@ JXMenuTable::MenuSelectItem
 
 		if (submenu != nullptr &&
 			(!checkMovement ||
-			 (JLAbs(itsCurrPt.x - itsPrevPt.x) <= kMoveSlowDelta &&
-			  JLAbs(itsCurrPt.y - itsPrevPt.y) <= kMoveSlowDelta)))
+			 (labs(itsCurrPt.x - itsPrevPt.x) <= kMoveSlowDelta &&
+			  labs(itsCurrPt.y - itsPrevPt.y) <= kMoveSlowDelta)))
 		{
 			if (itsOpenSubmenu != nullptr)
 			{

diff --git a/libjx/code/JXWindow.cpp b/libjx/code/JXWindow.cpp
@@ -1384,8 +1384,8 @@ JXWindow::AnalyzeWindowManager
 		WaitForWM(d, w);
 		assert( w->itsIsMappedFlag );
 
-		if (JLAbs(w->itsWMFrameLoc.x - p) > kWMFrameSlop ||
-			JLAbs(w->itsWMFrameLoc.y - p) > kWMFrameSlop)
+		if (labs(w->itsWMFrameLoc.x - p) > kWMFrameSlop ||
+			labs(w->itsWMFrameLoc.y - p) > kWMFrameSlop)
 		{
 			behavior.frameCompensateFlag = !behavior.frameCompensateFlag;
 			d->SetWMBehavior(behavior);

diff --git a/tools/jx_layout_editor/code/LayoutContainer.cpp b/tools/jx_layout_editor/code/LayoutContainer.cpp
@@ -413,7 +413,7 @@ LayoutContainer::EnclosingBoundsResized
 	const JCoordinate dhb
 	)
 {
-	if ((JLAbs(dwb) >= itsGridSpacing || JLAbs(dhb) >= itsGridSpacing) &&
+	if ((labs(dwb) >= JCoordinate(itsGridSpacing) || labs(dhb) >= JCoordinate(itsGridSpacing)) &&
 		!itsIgnoreResizeFlag && !CurrentUndoIs(LayoutUndo::kWindowResizeType))
 	{
 		auto* newUndo = jnew LayoutUndo(itsDoc, LayoutUndo::kWindowResizeType);
@@ -436,7 +436,7 @@ LayoutContainer::BoundsResized
 	)
 {
 	JXWidget::BoundsResized(dw,dh);
-	if (JLAbs(dw) >= itsGridSpacing || JLAbs(dh) >= itsGridSpacing)
+	if (labs(dw) >= JCoordinate(itsGridSpacing) || labs(dh) >= JCoordinate(itsGridSpacing))
 	{
 		itsDoc->DataModified();
 	}