From 194ec7ceb02498593f49f77ec1b36162fc5c89bd Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@uliege.be>
Date: Thu, 24 Sep 2020 11:27:18 +0200
Subject: [PATCH] refactoring

---
 Fltk/contextWindow.cpp                                    | 2 +-
 Fltk/fieldWindow.cpp                                      | 2 +-
 Fltk/graphicWindow.cpp                                    | 2 +-
 Fltk/pluginWindow.cpp                                     | 2 +-
 Fltk/visibilityWindow.cpp                                 | 2 +-
 Geo/CMakeLists.txt                                        | 4 ++--
 Geo/GeoInterpolation.cpp                                  | 1 -
 Geo/{GeoStringInterface.cpp => scriptStringInterface.cpp} | 2 +-
 Geo/{GeoStringInterface.h => scriptStringInterface.h}     | 4 ++--
 utils/wrappers/java/WrapGmsh.i                            | 2 +-
 10 files changed, 11 insertions(+), 12 deletions(-)
 rename Geo/{GeoStringInterface.cpp => scriptStringInterface.cpp} (99%)
 rename Geo/{GeoStringInterface.h => scriptStringInterface.h} (99%)

diff --git a/Fltk/contextWindow.cpp b/Fltk/contextWindow.cpp
index 408e5e99ec..2ea5d1cc41 100644
--- a/Fltk/contextWindow.cpp
+++ b/Fltk/contextWindow.cpp
@@ -18,7 +18,7 @@
 #undef Convex
 #endif
 #include "GModelIO_OCC.h"
-#include "GeoStringInterface.h"
+#include "scriptStringInterface.h"
 #include "OpenFile.h"
 #include "Context.h"
 #include "Options.h"
diff --git a/Fltk/fieldWindow.cpp b/Fltk/fieldWindow.cpp
index 9a54704bb5..0f8d713c6a 100644
--- a/Fltk/fieldWindow.cpp
+++ b/Fltk/fieldWindow.cpp
@@ -25,7 +25,7 @@
 #include "PView.h"
 #include "GmshMessage.h"
 #include "Field.h"
-#include "GeoStringInterface.h"
+#include "scriptStringInterface.h"
 #include "StringUtils.h"
 #include "Options.h"
 #include "Context.h"
diff --git a/Fltk/graphicWindow.cpp b/Fltk/graphicWindow.cpp
index c2ce39ace4..0bd89e85b7 100644
--- a/Fltk/graphicWindow.cpp
+++ b/Fltk/graphicWindow.cpp
@@ -53,7 +53,7 @@ typedef unsigned long intptr_t;
 #include "OpenFile.h"
 #include "CreateFile.h"
 #include "findLinks.h"
-#include "GeoStringInterface.h"
+#include "scriptStringInterface.h"
 #include "CommandLine.h"
 #include "Options.h"
 #include "Context.h"
diff --git a/Fltk/pluginWindow.cpp b/Fltk/pluginWindow.cpp
index 72c8df26e4..3ae15cfa36 100644
--- a/Fltk/pluginWindow.cpp
+++ b/Fltk/pluginWindow.cpp
@@ -29,7 +29,7 @@ typedef unsigned long intptr_t;
 #include "GModel.h"
 #include "MVertex.h"
 #include "Context.h"
-#include "GeoStringInterface.h"
+#include "scriptStringInterface.h"
 #include "StringUtils.h"
 #include "OS.h"
 
diff --git a/Fltk/visibilityWindow.cpp b/Fltk/visibilityWindow.cpp
index 2779201c73..cf8b2b4abc 100644
--- a/Fltk/visibilityWindow.cpp
+++ b/Fltk/visibilityWindow.cpp
@@ -33,7 +33,7 @@ typedef unsigned long intptr_t;
 #include "MElement.h"
 #include "PView.h"
 #include "PViewData.h"
-#include "GeoStringInterface.h"
+#include "scriptStringInterface.h"
 #include "Options.h"
 #include "Context.h"
 #include "StringUtils.h"
diff --git a/Geo/CMakeLists.txt b/Geo/CMakeLists.txt
index f922335a2f..9ba8d3995e 100644
--- a/Geo/CMakeLists.txt
+++ b/Geo/CMakeLists.txt
@@ -29,8 +29,8 @@ set(SRC
     GModelIO_CELUM.cpp GModelIO_NEU.cpp GModelIO_ACTRAN.cpp GModelIO_SU2.cpp
     GModelIO_SAMCEF.cpp GModelIO_MATLAB.cpp GModelIO_POS.cpp GModelIO_X3D.cpp
   ExtrudeParams.cpp
-  Geo.cpp
-  GeoStringInterface.cpp GeoInterpolation.cpp
+  Geo.cpp GeoInterpolation.cpp
+  scriptStringInterface.cpp
   gmshLevelset.cpp
   findLinks.cpp
   SOrientedBoundingBox.cpp
diff --git a/Geo/GeoInterpolation.cpp b/Geo/GeoInterpolation.cpp
index c252c91ab7..5098bb43d6 100644
--- a/Geo/GeoInterpolation.cpp
+++ b/Geo/GeoInterpolation.cpp
@@ -6,7 +6,6 @@
 #include "GmshMessage.h"
 #include "Geo.h"
 #include "GeoInterpolation.h"
-#include "GeoStringInterface.h"
 #include "Numeric.h"
 #include "Context.h"
 
diff --git a/Geo/GeoStringInterface.cpp b/Geo/scriptStringInterface.cpp
similarity index 99%
rename from Geo/GeoStringInterface.cpp
rename to Geo/scriptStringInterface.cpp
index 04d3f570c9..c6cb6aaf94 100644
--- a/Geo/GeoStringInterface.cpp
+++ b/Geo/scriptStringInterface.cpp
@@ -13,7 +13,7 @@
 #include "Numeric.h"
 #include "StringUtils.h"
 #include "Geo.h"
-#include "GeoStringInterface.h"
+#include "scriptStringInterface.h"
 #include "OpenFile.h"
 #include "Context.h"
 #include "OS.h"
diff --git a/Geo/GeoStringInterface.h b/Geo/scriptStringInterface.h
similarity index 99%
rename from Geo/GeoStringInterface.h
rename to Geo/scriptStringInterface.h
index 877ebe68e7..afd56d8d1d 100644
--- a/Geo/GeoStringInterface.h
+++ b/Geo/scriptStringInterface.h
@@ -3,8 +3,8 @@
 // See the LICENSE.txt file for license information. Please report all
 // issues on https://gitlab.onelab.info/gmsh/gmsh/issues.
 
-#ifndef GEO_STRING_INTERFACE_H
-#define GEO_STRING_INTERFACE_H
+#ifndef SCRIPT_STRING_INTERFACE_H
+#define SCRIPT_STRING_INTERFACE_H
 
 #include <string>
 #include <vector>
diff --git a/utils/wrappers/java/WrapGmsh.i b/utils/wrappers/java/WrapGmsh.i
index 0a6b19596c..66fe1945aa 100644
--- a/utils/wrappers/java/WrapGmsh.i
+++ b/utils/wrappers/java/WrapGmsh.i
@@ -11,7 +11,7 @@
 #include "GEdge.h"
 #include "GFace.h"
 #include "GRegion.h"
-#include "GeoStringInterface.h"
+#include "scriptStringInterface.h"
 #include "GEntity.h"
 #include "setWrapperGmsh.h"
 #include "listWrapperGmsh.h"
-- 
GitLab