From 540a00ffd0028dd5ee5796c03064ced4d7b4eb6b Mon Sep 17 00:00:00 2001
From: kledmundson <k.l.edmundson@gmail.com>
Date: Wed, 29 Nov 2023 08:52:26 -0700
Subject: [PATCH] Per review cleaned up sloppy spacing; made global variables
 static in cnetedit.cpp to avoid issues when linking libisis. Addresses #5346.

---
 isis/src/control/apps/cnetedit/cnetedit.cpp | 32 ++++++++++-----------
 isis/tests/FunctionalTestsCnetedit.cpp      |  4 +--
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/isis/src/control/apps/cnetedit/cnetedit.cpp b/isis/src/control/apps/cnetedit/cnetedit.cpp
index 1ce8c87ae1..2e290ddafd 100644
--- a/isis/src/control/apps/cnetedit/cnetedit.cpp
+++ b/isis/src/control/apps/cnetedit/cnetedit.cpp
@@ -78,22 +78,22 @@ namespace Isis {
       QMap<QString, QString> *pointsMap, QMap<QString, PvlGroup> *measuresMap);
 
   // Global variables
-  int numPointsDeleted;
-  int numMeasuresDeleted;
-
-  bool deleteIgnored;
-  bool preservePoints;
-  bool retainRef;
-  bool keepLog;
-  bool ignoreAll;
-
-  QMap<QString, QString> *ignoredPoints;
-  QMap<QString, PvlGroup> *ignoredMeasures;
-  QMap<QString, QString> *retainedReferences;
-  QMap<QString, QString> *editLockedPoints;
-  QMap<QString, PvlGroup> *editLockedMeasures;
-
-  ControlNetValidMeasure *cneteditValidator;
+  static int numPointsDeleted;
+  static int numMeasuresDeleted;
+
+  static bool deleteIgnored;
+  static bool preservePoints;
+  static bool retainRef;
+  static bool keepLog;
+  static bool ignoreAll;
+
+  static QMap<QString, QString> *ignoredPoints;
+  static QMap<QString, PvlGroup> *ignoredMeasures;
+  static QMap<QString, QString> *retainedReferences;
+  static QMap<QString, QString> *editLockedPoints;
+  static QMap<QString, PvlGroup> *editLockedMeasures;
+
+  static ControlNetValidMeasure *cneteditValidator;
 
   /**
    * Edit a control network
diff --git a/isis/tests/FunctionalTestsCnetedit.cpp b/isis/tests/FunctionalTestsCnetedit.cpp
index 1b168b8bd0..a7cca587e7 100644
--- a/isis/tests/FunctionalTestsCnetedit.cpp
+++ b/isis/tests/FunctionalTestsCnetedit.cpp
@@ -78,8 +78,8 @@ class CneteditCheckValid : public TempTestingFiles {
 
       // set up pvl def file
       PvlGroup validMeasureGroup("ValidMeasure");
-     validMeasureGroup.addKeyword(PvlKeyword("MinDN", "-1000000")); 
-     validMeasureGroup.addKeyword(PvlKeyword("MaxDN", "1000000")); 
+      validMeasureGroup.addKeyword(PvlKeyword("MinDN", "-1000000")); 
+      validMeasureGroup.addKeyword(PvlKeyword("MaxDN", "1000000")); 
       validMeasureGroup.addKeyword(PvlKeyword("MinEmission", "0")); 
       validMeasureGroup.addKeyword(PvlKeyword("MaxEmission", "135")); 
       validMeasureGroup.addKeyword(PvlKeyword("MinIncidence", "0"));