chore: move FdoUi and Generic follow-ups out of render PR

Author: johnml1135

Src/FdoUi/FdoUiTests/FdoUiTests.cs

@@ -6,13 +6,10 @@
 // Responsibility: TE Team
 // ---------------------------------------------------------------------------------------------
 
-using System;
 using NUnit.Framework;
-using SIL.FieldWorks.Common.FwUtils;
 using SIL.LCModel.Core.Text;
 using SIL.LCModel;
 using SIL.LCModel.DomainServices;
-using XCore;
 
 namespace SIL.FieldWorks.FdoUi
 {
@@ -144,33 +141,5 @@ public void DeleteCmPictureObject_RelatedCleanUpDoesNotNegateDeletion()
 				Assert.That(obj.IsValidObject, Is.False);
 			}
 		}
-
-		[Test]
-		public void DeleteUnderlyingObject_PublishesDeleteRecordForCurrentObject()
-		{
-			var obj = Cache.ServiceLocator.GetInstance<ICmPictureFactory>().Create();
-			using (var propertyTable = new PropertyTable(null))
-			using (DummyCmObjectUi objectUi = DummyCmObjectUi.MakeDummyUi(obj))
-			{
-				propertyTable.SetProperty("ActiveClerkSelectedObject", obj, false);
-				objectUi.PropTable = propertyTable;
-
-				object published = null;
-				Action<object> deleteRecordHandler = data => published = data;
-				try
-				{
-					FwUtils.Subscriber.Subscribe(EventConstants.DeleteRecord, deleteRecordHandler);
-
-					objectUi.DeleteUnderlyingObject();
-
-					Assert.That(published, Is.SameAs(objectUi));
-					Assert.That(obj.IsValidObject, Is.True);
-				}
-				finally
-				{
-					FwUtils.Subscriber.Unsubscribe(EventConstants.DeleteRecord, deleteRecordHandler);
-				}
-			}
-		}
 	}
 }

Src/Generic/GenSmartPtr.h

@@ -92,10 +92,8 @@ class _Lock_GenRefObj
 	}
 };
 
-#define GENSMARTPTR_CONCAT_INNER(a, b) a##b
-#define GENSMARTPTR_CONCAT(a, b) GENSMARTPTR_CONCAT_INNER(a, b)
-#define GenLockThis() _Lock_GenRefObj GENSMARTPTR_CONCAT(_lock_this_, __LINE__)(this)
-#define GenLockObj(pobj) _Lock_GenRefObj GENSMARTPTR_CONCAT(_lock_obj_, __LINE__)(pobj)
+#define GenLockThis() _Lock_GenRefObj _lock_this_##__LINE__(this)
+#define GenLockObj(pobj) _Lock_GenRefObj _lock_obj_##__LINE__(pobj)
 
 
 

Src/Generic/UtilCom.h

@@ -351,10 +351,8 @@ class _Lock_Unknown
 	}
 };
 
-#define UTILCOM_CONCAT_INNER(a, b) a##b
-#define UTILCOM_CONCAT(a, b) UTILCOM_CONCAT_INNER(a, b)
-#define LockThis() _Lock_Unknown UTILCOM_CONCAT(_lock_this_, __LINE__)(this)
-#define LockObj(pobj) _Lock_Unknown UTILCOM_CONCAT(_lock_obj_, __LINE__)(pobj)
+#define LockThis() _Lock_Unknown _lock_this_##__LINE__(this)
+#define LockObj(pobj) _Lock_Unknown _lock_obj_##__LINE__(pobj)
 
 /*************************************************************************************
 	Miscellaneous COM related utility functions.

Src/Generic/UtilTime.h

@@ -468,9 +468,7 @@ At some convenient point set m_msMyMethod to zero, and later see what it contain
 You can also surround a smaller piece of code with braces and call this at the start.
 Hungarian: not needed
 ----------------------------------------------------------------------------------------------*/
-#define UTILTIME_CONCAT_INNER(a, b) a##b
-#define UTILTIME_CONCAT(a, b) UTILTIME_CONCAT_INNER(a, b)
-#define MeasureDuration(arg) _MeasureDuration UTILTIME_CONCAT(_measure_duration_, __LINE__)(&arg)
+#define MeasureDuration(arg) _MeasureDuration _measure_duration_##__LINE__(&arg)
 
 class _MeasureDuration
 {