Per review cleaned up sloppy spacing; made global variables static in…

… cnetedit.cpp to avoid issues when linking libisis. Addresses DOI-USGS#5346.
kledmundson · Nov 29, 2023 · 540a00f · 540a00f
1 parent e0863c2
commit 540a00f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git 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
@@ -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"));