feat: Remove preprocessor directives from all files

felipebz · Jan 4, 2024 · 9d728ef · 9d728ef
1 parent 601b4fc
commit 9d728ef
Show file tree

Hide file tree

Showing 22 changed files with 274 additions and 329 deletions.
diff --git a/Ndapi/Alert.cs b/Ndapi/Alert.cs
@@ -203,7 +203,6 @@ public string Title
         set => SetStringProperty(NdapiConstant.D2FP_TITLE, value);
     }
 
-#if FORMS_6
     /// <summary>
     /// Gets or sets the white-on-black property.
     /// </summary>
@@ -213,5 +212,4 @@ public bool IsWhiteOnBlack
         get => GetBooleanProperty(NdapiConstant.D2FP_WHITE_ON_BLACK);
         set => SetBooleanProperty(NdapiConstant.D2FP_WHITE_ON_BLACK, value);
     }
-#endif
 }
diff --git a/Ndapi/AttachedLibrary.cs b/Ndapi/AttachedLibrary.cs
@@ -16,11 +16,10 @@ public class AttachedLibrary : NdapiObject<AttachedLibrary>
     /// <param name="location">Library location.</param>
     public AttachedLibrary(FormModule module, string location)
     {
-#if FORMS_6
-            var status = NativeMethods.d2falbat_Attach(NdapiContext.GetContext(), module._handle, out _handle, false, location);
-#else
-        var status = NativeMethods.d2falbat_Attach(NdapiContext.GetContext(), module._handle, out _handle, location);
-#endif
+        var status = NdapiContext.BuilderVersion.MajorVersion == 6
+            ? NativeMethods.d2falbat_Attach(NdapiContext.GetContext(), module._handle, out _handle, false, location)
+            : NativeMethods.d2falbat_Attach(NdapiContext.GetContext(), module._handle, out _handle, location);
+
         Ensure.Success(status);
     }
 
@@ -31,11 +30,10 @@ public AttachedLibrary(FormModule module, string location)
     /// <param name="location">Library location.</param>
     public AttachedLibrary(MenuModule module, string location)
     {
-#if FORMS_6
-            var status = NativeMethods.d2falbat_Attach(NdapiContext.GetContext(), module._handle, out _handle, false, location);
-#else
-        var status = NativeMethods.d2falbat_Attach(NdapiContext.GetContext(), module._handle, out _handle, location);
-#endif
+        var status = NdapiContext.BuilderVersion.MajorVersion == 6
+            ? NativeMethods.d2falbat_Attach(NdapiContext.GetContext(), module._handle, out _handle, false, location)
+            : NativeMethods.d2falbat_Attach(NdapiContext.GetContext(), module._handle, out _handle, location);
+
         Ensure.Success(status);
     }
 

diff --git a/Ndapi/Block.cs b/Ndapi/Block.cs
@@ -41,17 +41,15 @@ public string BackgroundColor
         set => SetStringProperty(NdapiConstant.D2FP_BACK_COLOR, value);
     }
 
-#if FORMS_6
-        /// <summary>
-        /// Gets or sets the description.
-        /// </summary>
-        [Property(NdapiConstant.D2FP_BLK_DESCRIPTION)]
-        public string Description
-        {
-            get => GetStringProperty(NdapiConstant.D2FP_BLK_DESCRIPTION);
-            set => SetStringProperty(NdapiConstant.D2FP_BLK_DESCRIPTION, value);
-        }
-#endif
+    /// <summary>
+    /// Gets or sets the description.
+    /// </summary>
+    [Property(NdapiConstant.D2FP_BLK_DESCRIPTION)]
+    public string Description
+    {
+        get => GetStringProperty(NdapiConstant.D2FP_BLK_DESCRIPTION);
+        set => SetStringProperty(NdapiConstant.D2FP_BLK_DESCRIPTION, value);
+    }
 
     /// <summary>
     /// Gets or sets the comment.
@@ -278,17 +276,15 @@ public string LockProcedureName
         set => SetStringProperty(NdapiConstant.D2FP_LOCK_PROC_NAM, value);
     }
 
-#if FORMS_6
-        /// <summary>
-        /// Gets or sets whether the block should be listed in the block menu. 
-        /// </summary>
-        [Property(NdapiConstant.D2FP_LST_IN_BLK_MNU)]
-        public bool IsListedInBlockMenu
-        {
-            get => GetBooleanProperty(NdapiConstant.D2FP_LST_IN_BLK_MNU);
-            set => SetBooleanProperty(NdapiConstant.D2FP_LST_IN_BLK_MNU, value);
-        }
-#endif
+    /// <summary>
+    /// Gets or sets whether the block should be listed in the block menu. 
+    /// </summary>
+    [Property(NdapiConstant.D2FP_LST_IN_BLK_MNU)]
+    public bool IsListedInBlockMenu
+    {
+        get => GetBooleanProperty(NdapiConstant.D2FP_LST_IN_BLK_MNU);
+        set => SetBooleanProperty(NdapiConstant.D2FP_LST_IN_BLK_MNU, value);
+    }
 
     /// <summary>
     /// Gets or sets the timeout to abort a query.
@@ -615,19 +611,16 @@ public string WhereClause
         set => SetStringProperty(NdapiConstant.D2FP_WHERE_CLAUSE, value);
     }
 
-#if FORMS_6
-        /// <summary>
-        /// Gets or sets the white-on-black property.
-        /// </summary>
-        [Property(NdapiConstant.D2FP_WHITE_ON_BLACK)]
-        public bool IsWhiteOnBlack
-        {
-            get => GetBooleanProperty(NdapiConstant.D2FP_WHITE_ON_BLACK);
-            set => SetBooleanProperty(NdapiConstant.D2FP_WHITE_ON_BLACK, value);
-        }
-#endif
+    /// <summary>
+    /// Gets or sets the white-on-black property.
+    /// </summary>
+    [Property(NdapiConstant.D2FP_WHITE_ON_BLACK)]
+    public bool IsWhiteOnBlack
+    {
+        get => GetBooleanProperty(NdapiConstant.D2FP_WHITE_ON_BLACK);
+        set => SetBooleanProperty(NdapiConstant.D2FP_WHITE_ON_BLACK, value);
+    }
 
-#if FORMS_12_OR_GREATER
     /// <summary>
     /// Gets or sets the row banding frequency. When row banding is set, every n-th instance of
     /// the record would appear in a different background color.
@@ -638,7 +631,6 @@ public int RowBandingFrequency
         get => GetNumberProperty(NdapiConstant.D2FP_ROW_BANDING_FREQ);
         set => SetNumberProperty(NdapiConstant.D2FP_ROW_BANDING_FREQ, value);
     }
-#endif
 
     /// <summary>
     /// Gets the delete data source arguments.

diff --git a/Ndapi/Canvas.cs b/Ndapi/Canvas.cs
@@ -297,17 +297,15 @@ public int ViewportYPositionOnCanvas
         set => SetNumberProperty(NdapiConstant.D2FP_VPRT_Y_POS_ON_CNV, value);
     }
 
-#if FORMS_6
-        /// <summary>
-        /// Gets or sets the white-on-black property.
-        /// </summary>
-        [Property(NdapiConstant.D2FP_WHITE_ON_BLACK)]
-        public bool IsWhiteOnBlack
-        {
-            get => GetBooleanProperty(NdapiConstant.D2FP_WHITE_ON_BLACK);
-            set => SetBooleanProperty(NdapiConstant.D2FP_WHITE_ON_BLACK, value);
-        }
-#endif
+    /// <summary>
+    /// Gets or sets the white-on-black property.
+    /// </summary>
+    [Property(NdapiConstant.D2FP_WHITE_ON_BLACK)]
+    public bool IsWhiteOnBlack
+    {
+        get => GetBooleanProperty(NdapiConstant.D2FP_WHITE_ON_BLACK);
+        set => SetBooleanProperty(NdapiConstant.D2FP_WHITE_ON_BLACK, value);
+    }
 
     /// <summary>
     /// Gets or sets the width.
@@ -339,7 +337,6 @@ public string WindowName
         set => SetStringProperty(NdapiConstant.D2FP_WND_NAM, value);
     }
 
-#if FORMS_12_OR_GREATER
     /// <summary>
     /// Gets or sets the side of the canvas from where the gradient color begins
     /// or that there should be no gradient color used.
@@ -350,7 +347,6 @@ public GradientStartSide GradientStartSide
         get => GetNumberProperty<GradientStartSide>(NdapiConstant.D2FP_GRADIENT_START);
         set => SetNumberProperty(NdapiConstant.D2FP_GRADIENT_START, value);
     }
-#endif
 
     /// <summary>
     /// Gets all the graphics objects attached to the canvas.

diff --git a/Ndapi/Editor.cs b/Ndapi/Editor.cs
@@ -182,17 +182,15 @@ public string VisualAttributeName
         set => SetStringProperty(NdapiConstant.D2FP_VAT_NAM, value);
     }
 
-#if FORMS_6
-        /// <summary>
-        /// Gets or sets the white-on-black property.
-        /// </summary>
-        [Property(NdapiConstant.D2FP_WHITE_ON_BLACK)]
-        public bool IsWhiteOnBlack
-        {
-            get => GetBooleanProperty(NdapiConstant.D2FP_WHITE_ON_BLACK);
-            set => SetBooleanProperty(NdapiConstant.D2FP_WHITE_ON_BLACK, value);
-        }
-#endif
+    /// <summary>
+    /// Gets or sets the white-on-black property.
+    /// </summary>
+    [Property(NdapiConstant.D2FP_WHITE_ON_BLACK)]
+    public bool IsWhiteOnBlack
+    {
+        get => GetBooleanProperty(NdapiConstant.D2FP_WHITE_ON_BLACK);
+        set => SetBooleanProperty(NdapiConstant.D2FP_WHITE_ON_BLACK, value);
+    }
 
     /// <summary>
     /// Gets or sets the width.

diff --git a/Ndapi/Enums/NdapiEnums.cs b/Ndapi/Enums/NdapiEnums.cs
@@ -86,10 +86,8 @@ public enum DataSourceColumnType
     Blob = NdapiConstant.D2FC_DSTY_BLOB,
     Clob = NdapiConstant.D2FC_DSTY_CLOB,
     Bfile = NdapiConstant.D2FC_DSTY_BFILE,
-#if FORMS_6
     Cfile = NdapiConstant.D2FC_DSTY_CFILE,
     Unknown = NdapiConstant.D2FC_DSTY_UNKNOWN
-#endif
 }
 
 public enum CommunicationMode

diff --git a/Ndapi/Enums/ObjectType.cs b/Ndapi/Enums/ObjectType.cs
@@ -62,12 +62,10 @@ public enum ObjectType
     /// </summary>
     Editor = NdapiConstant.D2FFO_EDITOR,
 
-#if FORMS_12_OR_GREATER
     /// <summary>
     /// Event.
     /// </summary>
     Event = NdapiConstant.D2FFO_EVENT,
-#endif
 
     /// <summary>
     /// Font declaration.
@@ -129,12 +127,10 @@ public enum ObjectType
     /// </summary>
     MenuModule = NdapiConstant.D2FFO_MENU_MODULE,
 
-#if FORMS_6
-        /// <summary>
-        /// Menu module parameter.
-        /// </summary>
-        MenuParameter = NdapiConstant.D2FFO_MENU_PARAM,
-#endif
+    /// <summary>
+    /// Menu module parameter.
+    /// </summary>
+    MenuParameter = NdapiConstant.D2FFO_MENU_PARAM,
 
     /// <summary>
     /// Object group.

diff --git a/Ndapi/Event.cs b/Ndapi/Event.cs
@@ -1,5 +1,4 @@
-#if FORMS_12_OR_GREATER
-using Ndapi.Core;
+using Ndapi.Core;
 using Ndapi.Core.Handles;
 using Ndapi.Enums;
 
@@ -112,4 +111,3 @@ public EventViewMode EventViewMode
         set => SetNumberProperty(NdapiConstant.D2FP_EVENT_VIEW_MODE, value);
     }
 }
-#endif