From f5c476a2bef4a195d8eea66ae231eb4cf399a41a Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 31 Jan 2009 18:30:42 +0000
Subject: [PATCH] more etags cleanups
---
Common/Gmsh.cpp | 2 +-
Common/Options.cpp | 4 ++--
Fltk/GUI.cpp | 2 +-
Fltk/Main.cpp | 2 +-
Fltk/pluginWindow.cpp | 8 ++++----
Parser/Gmsh.tab.cpp | 6 +++---
Parser/Gmsh.y | 6 +++---
Plugin/Annotate.h | 2 +-
Plugin/Curl.h | 2 +-
Plugin/CutGrid.h | 2 +-
Plugin/CutParametric.h | 2 +-
Plugin/Divergence.h | 2 +-
Plugin/Eigenvalues.h | 2 +-
Plugin/Eigenvectors.h | 2 +-
Plugin/Evaluate.h | 2 +-
Plugin/Extract.h | 2 +-
Plugin/ExtractEdges.h | 2 +-
Plugin/ExtractElements.h | 2 +-
Plugin/FieldView.h | 2 +-
Plugin/GSHHS.cpp | 4 ++--
Plugin/Gradient.h | 2 +-
Plugin/HarmonicToTime.h | 2 +-
Plugin/Integrate.h | 2 +-
Plugin/Lambda2.h | 2 +-
Plugin/Levelset.h | 2 +-
Plugin/LongitudeLatitude.h | 2 +-
Plugin/MakeSimplex.h | 2 +-
Plugin/ModulusPhase.h | 2 +-
Plugin/Plugin.cpp | 4 ++--
Plugin/Plugin.h | 8 ++++----
Plugin/PluginManager.cpp | 34 +++++++++++++++++-----------------
Plugin/PluginManager.h | 14 +++++++-------
Plugin/Probe.h | 2 +-
Plugin/Remove.h | 2 +-
Plugin/Skin.h | 2 +-
Plugin/Smooth.h | 2 +-
Plugin/SphericalRaise.h | 2 +-
Plugin/StreamLines.h | 2 +-
Plugin/Transform.h | 2 +-
Plugin/Triangulate.h | 2 +-
Plugin/Warp.h | 2 +-
Post/PView.h | 2 +-
Post/adaptiveData.cpp | 6 +++---
Post/adaptiveData.h | 8 ++++----
doc/texinfo/gmsh.texi | 8 ++++----
45 files changed, 88 insertions(+), 88 deletions(-)
diff --git a/Common/Gmsh.cpp b/Common/Gmsh.cpp
index 4f68ad5668..89fb2b680a 100644
--- a/Common/Gmsh.cpp
+++ b/Common/Gmsh.cpp
@@ -45,7 +45,7 @@ int GmshInitialize(int argc, char **argv)
#if !defined(HAVE_NO_POST)
// Initialize the default plugins
- GMSH_PluginManager::instance()->registerDefaultPlugins();
+ PluginManager::instance()->registerDefaultPlugins();
#endif
// Initialize numeric library (gsl, robust predicates)
diff --git a/Common/Options.cpp b/Common/Options.cpp
index 1cb11ae164..f9a0856b5d 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -762,8 +762,8 @@ void Print_OptionsDoc()
}
fprintf(file, "%s@ftable @code\n", warn);
char author[256], copyright[256], help[4096];
- for(GMSH_PluginManager::iter it = GMSH_PluginManager::instance()->begin();
- it != GMSH_PluginManager::instance()->end(); ++it) {
+ for(PluginManager::iter it = PluginManager::instance()->begin();
+ it != PluginManager::instance()->end(); ++it) {
GMSH_Plugin *p = (*it).second;
if(p->getType() == GMSH_Plugin::GMSH_POST_PLUGIN) {
p->getInfos(author, copyright, help);
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index eccb8e6f48..0d3d705134 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -647,7 +647,7 @@ void GUI::storeCurrentWindowsInfo()
void GUI::callForSolverPlugin(int dim)
{
- GMSH_Solve_Plugin *sp = GMSH_PluginManager::instance()->findSolverPlugin();
+ GMSH_SolverPlugin *sp = PluginManager::instance()->findSolverPlugin();
if(sp) sp->popupPropertiesForPhysicalEntity(dim);
}
diff --git a/Fltk/Main.cpp b/Fltk/Main.cpp
index fc287a20c3..138a271b6c 100644
--- a/Fltk/Main.cpp
+++ b/Fltk/Main.cpp
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
// user-defined options)
if(argc == 2 && std::string(argv[1]) == "-doc"){
Init_Options(0);
- GMSH_PluginManager::instance()->registerDefaultPlugins();
+ PluginManager::instance()->registerDefaultPlugins();
Print_OptionsDoc();
exit(0);
}
diff --git a/Fltk/pluginWindow.cpp b/Fltk/pluginWindow.cpp
index 65c80b3189..7431b4f5b1 100644
--- a/Fltk/pluginWindow.cpp
+++ b/Fltk/pluginWindow.cpp
@@ -102,7 +102,7 @@ static void plugin_browser_cb(Fl_Widget *w, void *data)
static void plugin_run_cb(Fl_Widget *w, void *data)
{
- GMSH_Post_Plugin *p = (GMSH_Post_Plugin*)data;
+ GMSH_PostPlugin *p = (GMSH_PostPlugin*)data;
// get the values from the GUI
int m = p->getNbOptionsStr();
@@ -251,8 +251,8 @@ pluginWindow::pluginWindow(int deltaFontSize)
view_browser->has_scrollbar(Fl_Browser_::VERTICAL);
view_browser->callback(plugin_browser_cb);
- for(GMSH_PluginManager::iter it = GMSH_PluginManager::instance()->begin();
- it != GMSH_PluginManager::instance()->end(); ++it) {
+ for(PluginManager::iter it = PluginManager::instance()->begin();
+ it != PluginManager::instance()->end(); ++it) {
GMSH_Plugin *p = (*it).second;
if(p->getType() == GMSH_Plugin::GMSH_POST_PLUGIN) {
char name[256];
@@ -261,7 +261,7 @@ pluginWindow::pluginWindow(int deltaFontSize)
_createDialogBox(p, 2 * WB + L1 + L2, WB, width - L1 - L2 - 3 * WB,
height - 2 * WB);
// select first plugin by default
- if(it == GMSH_PluginManager::instance()->begin()){
+ if(it == PluginManager::instance()->begin()){
browser->select(1);
p->dialogBox->group->show();
}
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 658eab604e..5c28815330 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -4613,7 +4613,7 @@ yyreduce:
{
#if !defined(HAVE_NO_POST)
try {
- GMSH_PluginManager::instance()->setPluginOption((yyvsp[(3) - (9)].c), (yyvsp[(6) - (9)].c), (yyvsp[(8) - (9)].d));
+ PluginManager::instance()->setPluginOption((yyvsp[(3) - (9)].c), (yyvsp[(6) - (9)].c), (yyvsp[(8) - (9)].d));
}
catch (...) {
yymsg(0, "Unknown option '%s' or plugin '%s'", (yyvsp[(6) - (9)].c), (yyvsp[(3) - (9)].c));
@@ -4628,7 +4628,7 @@ yyreduce:
{
#if !defined(HAVE_NO_POST)
try {
- GMSH_PluginManager::instance()->setPluginOption((yyvsp[(3) - (9)].c), (yyvsp[(6) - (9)].c), (yyvsp[(8) - (9)].c));
+ PluginManager::instance()->setPluginOption((yyvsp[(3) - (9)].c), (yyvsp[(6) - (9)].c), (yyvsp[(8) - (9)].c));
}
catch (...) {
yymsg(0, "Unknown option '%s' or plugin '%s'", (yyvsp[(6) - (9)].c), (yyvsp[(3) - (9)].c));
@@ -5726,7 +5726,7 @@ yyreduce:
{
#if !defined(HAVE_NO_POST)
try {
- GMSH_PluginManager::instance()->action((yyvsp[(3) - (7)].c), (yyvsp[(6) - (7)].c), 0);
+ PluginManager::instance()->action((yyvsp[(3) - (7)].c), (yyvsp[(6) - (7)].c), 0);
}
catch(...) {
yymsg(0, "Unknown action '%s' or plugin '%s'", (yyvsp[(6) - (7)].c), (yyvsp[(3) - (7)].c));
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index 6105e4ee8f..5dd0bf6e2e 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -958,7 +958,7 @@ Affectation :
{
#if !defined(HAVE_NO_POST)
try {
- GMSH_PluginManager::instance()->setPluginOption($3, $6, $8);
+ PluginManager::instance()->setPluginOption($3, $6, $8);
}
catch (...) {
yymsg(0, "Unknown option '%s' or plugin '%s'", $6, $3);
@@ -970,7 +970,7 @@ Affectation :
{
#if !defined(HAVE_NO_POST)
try {
- GMSH_PluginManager::instance()->setPluginOption($3, $6, $8);
+ PluginManager::instance()->setPluginOption($3, $6, $8);
}
catch (...) {
yymsg(0, "Unknown option '%s' or plugin '%s'", $6, $3);
@@ -1938,7 +1938,7 @@ Command :
{
#if !defined(HAVE_NO_POST)
try {
- GMSH_PluginManager::instance()->action($3, $6, 0);
+ PluginManager::instance()->action($3, $6, 0);
}
catch(...) {
yymsg(0, "Unknown action '%s' or plugin '%s'", $6, $3);
diff --git a/Plugin/Annotate.h b/Plugin/Annotate.h
index 5ae512f441..d52e273095 100644
--- a/Plugin/Annotate.h
+++ b/Plugin/Annotate.h
@@ -14,7 +14,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterAnnotatePlugin();
}
-class GMSH_AnnotatePlugin : public GMSH_Post_Plugin
+class GMSH_AnnotatePlugin : public GMSH_PostPlugin
{
private:
static double callback(int num, int action, double value, double *opt,
diff --git a/Plugin/Curl.h b/Plugin/Curl.h
index e584e1adab..9127bb6118 100644
--- a/Plugin/Curl.h
+++ b/Plugin/Curl.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterCurlPlugin();
}
-class GMSH_CurlPlugin : public GMSH_Post_Plugin
+class GMSH_CurlPlugin : public GMSH_PostPlugin
{
public:
GMSH_CurlPlugin(){}
diff --git a/Plugin/CutGrid.h b/Plugin/CutGrid.h
index e4e875e758..fd87b08f70 100644
--- a/Plugin/CutGrid.h
+++ b/Plugin/CutGrid.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterCutGridPlugin ();
}
-class GMSH_CutGridPlugin : public GMSH_Post_Plugin
+class GMSH_CutGridPlugin : public GMSH_PostPlugin
{
static double callback(int num, int action, double value, double *opt,
double step, double min, double max);
diff --git a/Plugin/CutParametric.h b/Plugin/CutParametric.h
index cfe3a4494d..875ce30950 100644
--- a/Plugin/CutParametric.h
+++ b/Plugin/CutParametric.h
@@ -15,7 +15,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterCutParametricPlugin ();
}
-class GMSH_CutParametricPlugin : public GMSH_Post_Plugin
+class GMSH_CutParametricPlugin : public GMSH_PostPlugin
{
private:
static double callback(int num, int action, double value, double *opt,
diff --git a/Plugin/Divergence.h b/Plugin/Divergence.h
index 067a943d72..184aeaa6c3 100644
--- a/Plugin/Divergence.h
+++ b/Plugin/Divergence.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterDivergencePlugin();
}
-class GMSH_DivergencePlugin : public GMSH_Post_Plugin
+class GMSH_DivergencePlugin : public GMSH_PostPlugin
{
public:
GMSH_DivergencePlugin(){}
diff --git a/Plugin/Eigenvalues.h b/Plugin/Eigenvalues.h
index e536761fe6..88ed35ee88 100644
--- a/Plugin/Eigenvalues.h
+++ b/Plugin/Eigenvalues.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterEigenvaluesPlugin();
}
-class GMSH_EigenvaluesPlugin : public GMSH_Post_Plugin
+class GMSH_EigenvaluesPlugin : public GMSH_PostPlugin
{
public:
GMSH_EigenvaluesPlugin(){}
diff --git a/Plugin/Eigenvectors.h b/Plugin/Eigenvectors.h
index 1e67306752..b68e861536 100644
--- a/Plugin/Eigenvectors.h
+++ b/Plugin/Eigenvectors.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterEigenvectorsPlugin();
}
-class GMSH_EigenvectorsPlugin : public GMSH_Post_Plugin
+class GMSH_EigenvectorsPlugin : public GMSH_PostPlugin
{
public:
GMSH_EigenvectorsPlugin(){}
diff --git a/Plugin/Evaluate.h b/Plugin/Evaluate.h
index b023816209..28b5306220 100644
--- a/Plugin/Evaluate.h
+++ b/Plugin/Evaluate.h
@@ -14,7 +14,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterEvaluatePlugin();
}
-class GMSH_EvaluatePlugin : public GMSH_Post_Plugin
+class GMSH_EvaluatePlugin : public GMSH_PostPlugin
{
private:
OctreePost *_octree;
diff --git a/Plugin/Extract.h b/Plugin/Extract.h
index 2cb966cdb0..90bc5a128c 100644
--- a/Plugin/Extract.h
+++ b/Plugin/Extract.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterExtractPlugin();
}
-class GMSH_ExtractPlugin : public GMSH_Post_Plugin
+class GMSH_ExtractPlugin : public GMSH_PostPlugin
{
public:
GMSH_ExtractPlugin(){}
diff --git a/Plugin/ExtractEdges.h b/Plugin/ExtractEdges.h
index 4d13b2ccd0..278c105004 100644
--- a/Plugin/ExtractEdges.h
+++ b/Plugin/ExtractEdges.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterExtractEdgesPlugin();
}
-class GMSH_ExtractEdgesPlugin : public GMSH_Post_Plugin
+class GMSH_ExtractEdgesPlugin : public GMSH_PostPlugin
{
public:
GMSH_ExtractEdgesPlugin();
diff --git a/Plugin/ExtractElements.h b/Plugin/ExtractElements.h
index 790f0781fd..d2278b215f 100644
--- a/Plugin/ExtractElements.h
+++ b/Plugin/ExtractElements.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterExtractElementsPlugin();
}
-class GMSH_ExtractElementsPlugin : public GMSH_Post_Plugin
+class GMSH_ExtractElementsPlugin : public GMSH_PostPlugin
{
public:
GMSH_ExtractElementsPlugin(){}
diff --git a/Plugin/FieldView.h b/Plugin/FieldView.h
index 7fedc3936e..ed692f32a5 100644
--- a/Plugin/FieldView.h
+++ b/Plugin/FieldView.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterFieldViewPlugin();
}
-class GMSH_FieldViewPlugin : public GMSH_Post_Plugin
+class GMSH_FieldViewPlugin : public GMSH_PostPlugin
{
public:
void getName(char *name) const;
diff --git a/Plugin/GSHHS.cpp b/Plugin/GSHHS.cpp
index 76fbf58ab0..4c0abc7f85 100644
--- a/Plugin/GSHHS.cpp
+++ b/Plugin/GSHHS.cpp
@@ -9,7 +9,7 @@
#include "GSHHS.h"
#include "GModel.h"
-class GMSH_GSHHSPlugin:public GMSH_Post_Plugin
+class GMSH_GSHHSPlugin:public GMSH_PostPlugin
{
public:
// ************** Inputs (readers) *************
@@ -51,7 +51,7 @@ class GMSH_GSHHSPlugin:public GMSH_Post_Plugin
}
};
class reader_gshhs:public reader{
- /* $Id: GSHHS.cpp,v 1.27 2009-01-31 00:28:27 geuzaine Exp $
+ /* $Id: GSHHS.cpp,v 1.28 2009-01-31 18:30:40 geuzaine Exp $
*
* Include file defining structures used in gshhs.c
*
diff --git a/Plugin/Gradient.h b/Plugin/Gradient.h
index 6640580062..fb367dddef 100644
--- a/Plugin/Gradient.h
+++ b/Plugin/Gradient.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterGradientPlugin();
}
-class GMSH_GradientPlugin : public GMSH_Post_Plugin
+class GMSH_GradientPlugin : public GMSH_PostPlugin
{
public:
GMSH_GradientPlugin(){}
diff --git a/Plugin/HarmonicToTime.h b/Plugin/HarmonicToTime.h
index da0c5404fa..2507adddc4 100644
--- a/Plugin/HarmonicToTime.h
+++ b/Plugin/HarmonicToTime.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterHarmonicToTimePlugin();
}
-class GMSH_HarmonicToTimePlugin : public GMSH_Post_Plugin
+class GMSH_HarmonicToTimePlugin : public GMSH_PostPlugin
{
public:
GMSH_HarmonicToTimePlugin();
diff --git a/Plugin/Integrate.h b/Plugin/Integrate.h
index 7afaa789e9..0ed2e6935b 100644
--- a/Plugin/Integrate.h
+++ b/Plugin/Integrate.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterIntegratePlugin();
}
-class GMSH_IntegratePlugin : public GMSH_Post_Plugin
+class GMSH_IntegratePlugin : public GMSH_PostPlugin
{
public:
GMSH_IntegratePlugin();
diff --git a/Plugin/Lambda2.h b/Plugin/Lambda2.h
index 743a8cc552..814e820dd1 100644
--- a/Plugin/Lambda2.h
+++ b/Plugin/Lambda2.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterLambda2Plugin();
}
-class GMSH_Lambda2Plugin : public GMSH_Post_Plugin
+class GMSH_Lambda2Plugin : public GMSH_PostPlugin
{
public:
GMSH_Lambda2Plugin();
diff --git a/Plugin/Levelset.h b/Plugin/Levelset.h
index 0d39dead85..6f471824c9 100644
--- a/Plugin/Levelset.h
+++ b/Plugin/Levelset.h
@@ -8,7 +8,7 @@
#include "Plugin.h"
-class GMSH_LevelsetPlugin : public GMSH_Post_Plugin
+class GMSH_LevelsetPlugin : public GMSH_PostPlugin
{
private:
double _invert;
diff --git a/Plugin/LongitudeLatitude.h b/Plugin/LongitudeLatitude.h
index fc720d0eb1..44470b7e00 100644
--- a/Plugin/LongitudeLatitude.h
+++ b/Plugin/LongitudeLatitude.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterLongituteLatitudePlugin();
}
-class GMSH_LongituteLatitudePlugin : public GMSH_Post_Plugin
+class GMSH_LongituteLatitudePlugin : public GMSH_PostPlugin
{
public:
void getName(char *name) const;
diff --git a/Plugin/MakeSimplex.h b/Plugin/MakeSimplex.h
index 762b9db571..2a4531b0ce 100644
--- a/Plugin/MakeSimplex.h
+++ b/Plugin/MakeSimplex.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterMakeSimplexPlugin();
}
-class GMSH_MakeSimplexPlugin : public GMSH_Post_Plugin
+class GMSH_MakeSimplexPlugin : public GMSH_PostPlugin
{
public:
GMSH_MakeSimplexPlugin();
diff --git a/Plugin/ModulusPhase.h b/Plugin/ModulusPhase.h
index 16b65185a3..3af0142b30 100644
--- a/Plugin/ModulusPhase.h
+++ b/Plugin/ModulusPhase.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterModulusPhasePlugin();
}
-class GMSH_ModulusPhasePlugin : public GMSH_Post_Plugin
+class GMSH_ModulusPhasePlugin : public GMSH_PostPlugin
{
public:
GMSH_ModulusPhasePlugin(){}
diff --git a/Plugin/Plugin.cpp b/Plugin/Plugin.cpp
index 31d48c6f73..37b63f40ab 100644
--- a/Plugin/Plugin.cpp
+++ b/Plugin/Plugin.cpp
@@ -5,7 +5,7 @@
#include "Plugin.h"
-PView *GMSH_Post_Plugin::getView(int index, PView *view)
+PView *GMSH_PostPlugin::getView(int index, PView *view)
{
if(index < 0)
index = view ? view->getIndex() : 0;
@@ -19,7 +19,7 @@ PView *GMSH_Post_Plugin::getView(int index, PView *view)
}
}
-PViewDataList *GMSH_Post_Plugin::getDataList(PView *view)
+PViewDataList *GMSH_PostPlugin::getDataList(PView *view)
{
if(!view) return 0;
diff --git a/Plugin/Plugin.h b/Plugin/Plugin.h
index b450c1690f..81ab29cea5 100644
--- a/Plugin/Plugin.h
+++ b/Plugin/Plugin.h
@@ -32,7 +32,7 @@ class GMSH_Plugin
GMSH_CAD_PLUGIN,
GMSH_MESH_PLUGIN,
GMSH_POST_PLUGIN,
- GMSH_SOLVE_PLUGIN
+ GMSH_SOLVER_PLUGIN
} GMSH_PLUGIN_TYPE;
// a dialog box for the user interface
@@ -67,7 +67,7 @@ class GMSH_Plugin
// The base class for post-processing plugins. The user can either
// modify or duplicate a post-processing view
-class GMSH_Post_Plugin : public GMSH_Plugin
+class GMSH_PostPlugin : public GMSH_Plugin
{
public:
inline GMSH_PLUGIN_TYPE getType() const { return GMSH_Plugin::GMSH_POST_PLUGIN; }
@@ -90,14 +90,14 @@ class GMSH_Post_Plugin : public GMSH_Plugin
// associate some properties to physical entities, so that we can
// interface gmsh with a solver (ABAQUS...), i.e., create the input
// file for the solver
-class GMSH_Solve_Plugin : public GMSH_Plugin
+class GMSH_SolverPlugin : public GMSH_Plugin
{
public:
virtual int getNbOptionsStr() const { return 0; }
virtual StringXString *getOptionStr(int iopt) { return 0; }
virtual int getNbOptions() const { return 0; }
virtual StringXNumber *getOption(int iopt) { return 0; };
- inline GMSH_PLUGIN_TYPE getType() const { return GMSH_Plugin::GMSH_SOLVE_PLUGIN; }
+ inline GMSH_PLUGIN_TYPE getType() const { return GMSH_Plugin::GMSH_SOLVER_PLUGIN; }
virtual void run() {} // do nothing
// popup dialog box
virtual void popupPropertiesForPhysicalEntity(int dim) = 0;
diff --git a/Plugin/PluginManager.cpp b/Plugin/PluginManager.cpp
index a5af1d8948..ccdecc79e9 100644
--- a/Plugin/PluginManager.cpp
+++ b/Plugin/PluginManager.cpp
@@ -52,19 +52,19 @@
const char *GMSH_PluginEntry = "GMSH_RegisterPlugin";
-GMSH_PluginManager *GMSH_PluginManager::_instance = 0;
+PluginManager *PluginManager::_instance = 0;
-GMSH_PluginManager::GMSH_PluginManager()
+PluginManager::PluginManager()
{
}
-GMSH_PluginManager::~GMSH_PluginManager()
+PluginManager::~PluginManager()
{
for(iter it = allPlugins.begin(); it != allPlugins.end(); ++it)
delete(*it).second;
}
-GMSH_Plugin *GMSH_PluginManager::find(char *pluginName)
+GMSH_Plugin *PluginManager::find(char *pluginName)
{
iter it = allPlugins.find(pluginName);
if(it == allPlugins.end())
@@ -72,20 +72,20 @@ GMSH_Plugin *GMSH_PluginManager::find(char *pluginName)
return (*it).second;
}
-GMSH_Solve_Plugin *GMSH_PluginManager::findSolverPlugin()
+GMSH_SolverPlugin *PluginManager::findSolverPlugin()
{
iter it = allPlugins.begin();
iter ite = allPlugins.end();
for (; it != ite; ++it) {
GMSH_Plugin *p = (*it).second;
- if(p->getType() == GMSH_Plugin::GMSH_SOLVE_PLUGIN) {
- return (GMSH_Solve_Plugin*)(p);
+ if(p->getType() == GMSH_Plugin::GMSH_SOLVER_PLUGIN) {
+ return (GMSH_SolverPlugin*)(p);
}
}
return 0;
}
-void GMSH_PluginManager::action(char *pluginName, char *action, void *data)
+void PluginManager::action(char *pluginName, char *action, void *data)
{
GMSH_Plugin *plugin = find(pluginName);
if(!plugin)
@@ -97,8 +97,8 @@ void GMSH_PluginManager::action(char *pluginName, char *action, void *data)
throw "Unknown plugin action";
}
-void GMSH_PluginManager::setPluginOption(char *pluginName, char *option,
- char *value)
+void PluginManager::setPluginOption(char *pluginName, char *option,
+ char *value)
{
GMSH_Plugin *plugin = find(pluginName);
@@ -119,8 +119,8 @@ void GMSH_PluginManager::setPluginOption(char *pluginName, char *option,
throw "Unknown plugin option name";
}
-void GMSH_PluginManager::setPluginOption(char *pluginName, char *option,
- double value)
+void PluginManager::setPluginOption(char *pluginName, char *option,
+ double value)
{
GMSH_Plugin *plugin = find(pluginName);
@@ -140,15 +140,15 @@ void GMSH_PluginManager::setPluginOption(char *pluginName, char *option,
throw "Unknown plugin option name";
}
-GMSH_PluginManager *GMSH_PluginManager::instance()
+PluginManager *PluginManager::instance()
{
if(!_instance) {
- _instance = new GMSH_PluginManager;
+ _instance = new PluginManager;
}
return _instance;
}
-void GMSH_PluginManager::registerDefaultPlugins()
+void PluginManager::registerDefaultPlugins()
{
if(CTX::instance()->solver.plugins){
// nothing here yet
@@ -248,7 +248,7 @@ void GMSH_PluginManager::registerDefaultPlugins()
#endif
}
-void GMSH_PluginManager::addPlugin(char *dirName, char *pluginName)
+void PluginManager::addPlugin(char *dirName, char *pluginName)
{
#if defined(HAVE_NO_DLL) || !defined(HAVE_FLTK)
Msg::Warning("No dynamic plugin loading on this platform");
@@ -271,7 +271,7 @@ void GMSH_PluginManager::addPlugin(char *dirName, char *pluginName)
err = dlerror();
if(err){
Msg::Warning("Symbol '%s' missing in plugin '%s' (dlerror = %s)",
- GMSH_PluginEntry, pluginName, err);
+ GMSH_PluginEntry, pluginName, err);
return;
}
diff --git a/Plugin/PluginManager.h b/Plugin/PluginManager.h
index 4b8e3dde1a..c43d2e0638 100644
--- a/Plugin/PluginManager.h
+++ b/Plugin/PluginManager.h
@@ -10,7 +10,7 @@
#include <map>
class GMSH_Plugin;
-class GMSH_Solve_Plugin;
+class GMSH_SolverPlugin;
struct ltstrpg
{
@@ -20,15 +20,15 @@ struct ltstrpg
}
};
-class GMSH_PluginManager
+class PluginManager
{
private:
- GMSH_PluginManager();
- static GMSH_PluginManager *_instance;
+ PluginManager();
+ static PluginManager *_instance;
std::map<const char*, GMSH_Plugin*, ltstrpg> allPlugins;
public :
- virtual ~GMSH_PluginManager();
+ virtual ~PluginManager();
typedef std::map<const char*, GMSH_Plugin*, ltstrpg>::iterator iter;
// register all the plugins that are in $(GMSHPLUGINSHOME). (Note
@@ -36,7 +36,7 @@ class GMSH_PluginManager
// should call the plugins 'modules'... A plugin is an executable,
// but that can only be executed from inside another program.)
void registerDefaultPlugins();
- static GMSH_PluginManager *instance();
+ static PluginManager *instance();
// Dynamically add a plugin pluginName.so in dirName
void addPlugin(char *dirName, char *pluginName);
@@ -56,7 +56,7 @@ class GMSH_PluginManager
GMSH_Plugin *find(char *pluginName);
// Get The ONLY Solver Plugin
- GMSH_Solve_Plugin *findSolverPlugin();
+ GMSH_SolverPlugin *findSolverPlugin();
// Perform an action on the plugin. Default action are Run and
// Save. Other plugins may perform other actions.
diff --git a/Plugin/Probe.h b/Plugin/Probe.h
index 4a38cce27b..cdf7670ab5 100644
--- a/Plugin/Probe.h
+++ b/Plugin/Probe.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterProbePlugin();
}
-class GMSH_ProbePlugin : public GMSH_Post_Plugin
+class GMSH_ProbePlugin : public GMSH_PostPlugin
{
double levelset(double x, double y, double z, double val) const;
static double callback(int num, int action, double value, double *opt);
diff --git a/Plugin/Remove.h b/Plugin/Remove.h
index 58bd6e5685..a617c583bb 100644
--- a/Plugin/Remove.h
+++ b/Plugin/Remove.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterRemovePlugin();
}
-class GMSH_RemovePlugin : public GMSH_Post_Plugin
+class GMSH_RemovePlugin : public GMSH_PostPlugin
{
public:
GMSH_RemovePlugin(){}
diff --git a/Plugin/Skin.h b/Plugin/Skin.h
index 46513077aa..169931c80e 100644
--- a/Plugin/Skin.h
+++ b/Plugin/Skin.h
@@ -15,7 +15,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterSkinPlugin();
}
-class GMSH_SkinPlugin : public GMSH_Post_Plugin
+class GMSH_SkinPlugin : public GMSH_PostPlugin
{
typedef struct{
double coord[12];
diff --git a/Plugin/Smooth.h b/Plugin/Smooth.h
index 49d5b95849..fe77c462c3 100644
--- a/Plugin/Smooth.h
+++ b/Plugin/Smooth.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterSmoothPlugin();
}
-class GMSH_SmoothPlugin : public GMSH_Post_Plugin
+class GMSH_SmoothPlugin : public GMSH_PostPlugin
{
public:
GMSH_SmoothPlugin(){}
diff --git a/Plugin/SphericalRaise.h b/Plugin/SphericalRaise.h
index 97bef18b6c..b5680baf1d 100644
--- a/Plugin/SphericalRaise.h
+++ b/Plugin/SphericalRaise.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterSphericalRaisePlugin();
}
-class GMSH_SphericalRaisePlugin : public GMSH_Post_Plugin
+class GMSH_SphericalRaisePlugin : public GMSH_PostPlugin
{
public:
GMSH_SphericalRaisePlugin(){}
diff --git a/Plugin/StreamLines.h b/Plugin/StreamLines.h
index 142bcfe3c9..a5e2063cf4 100644
--- a/Plugin/StreamLines.h
+++ b/Plugin/StreamLines.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterStreamLinesPlugin ();
}
-class GMSH_StreamLinesPlugin : public GMSH_Post_Plugin
+class GMSH_StreamLinesPlugin : public GMSH_PostPlugin
{
static double callback(int num, int action, double value, double *opt,
double step, double min, double max);
diff --git a/Plugin/Transform.h b/Plugin/Transform.h
index cba8b8ddf8..cac10abc87 100644
--- a/Plugin/Transform.h
+++ b/Plugin/Transform.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterTransformPlugin();
}
-class GMSH_TransformPlugin : public GMSH_Post_Plugin
+class GMSH_TransformPlugin : public GMSH_PostPlugin
{
public:
GMSH_TransformPlugin(){}
diff --git a/Plugin/Triangulate.h b/Plugin/Triangulate.h
index 5bec55b1c0..9b84903be1 100644
--- a/Plugin/Triangulate.h
+++ b/Plugin/Triangulate.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterTriangulatePlugin();
}
-class GMSH_TriangulatePlugin : public GMSH_Post_Plugin
+class GMSH_TriangulatePlugin : public GMSH_PostPlugin
{
public:
GMSH_TriangulatePlugin(){}
diff --git a/Plugin/Warp.h b/Plugin/Warp.h
index c214fbf225..eb6ef7226b 100644
--- a/Plugin/Warp.h
+++ b/Plugin/Warp.h
@@ -13,7 +13,7 @@ extern "C"
GMSH_Plugin *GMSH_RegisterWarpPlugin();
}
-class GMSH_WarpPlugin : public GMSH_Post_Plugin
+class GMSH_WarpPlugin : public GMSH_PostPlugin
{
public:
GMSH_WarpPlugin(){}
diff --git a/Post/PView.h b/Post/PView.h
index 2b868a35f4..51e3e7e2eb 100644
--- a/Post/PView.h
+++ b/Post/PView.h
@@ -16,7 +16,7 @@ class PViewOptions;
class VertexArray;
class smooth_normals;
class GModel;
-class GMSH_Post_Plugin;
+class GMSH_PostPlugin;
// A post-processing view.
class PView{
diff --git a/Post/adaptiveData.cpp b/Post/adaptiveData.cpp
index da901c19d6..e642d5764f 100644
--- a/Post/adaptiveData.cpp
+++ b/Post/adaptiveData.cpp
@@ -911,7 +911,7 @@ void adaptiveElements<T>::adapt(double tol, int numComp,
std::vector<PCoords> &coords,
std::vector<PValues> &values,
double &minVal, double &maxVal,
- GMSH_Post_Plugin *plug,
+ GMSH_PostPlugin *plug,
bool onlyComputeMinMax)
{
if(numComp != 1 && numComp != 3){
@@ -1038,7 +1038,7 @@ void adaptiveElements<T>::adapt(double tol, int numComp,
template <class T>
void adaptiveElements<T>::addInView(double tol, int step,
PViewData *in, PViewDataList *out,
- GMSH_Post_Plugin *plug)
+ GMSH_PostPlugin *plug)
{
int numComp = in->getNumComponents(0, 0, 0);
if(numComp != 1 && numComp != 3) return;
@@ -1176,7 +1176,7 @@ double adaptiveData::timerInit = 0.;
double adaptiveData::timerAdapt = 0.;
void adaptiveData::changeResolution(int step, int level, double tol,
- GMSH_Post_Plugin *plug)
+ GMSH_PostPlugin *plug)
{
timerInit = timerAdapt = 0.;
diff --git a/Post/adaptiveData.h b/Post/adaptiveData.h
index a2512c1b26..2bcd2a6604 100644
--- a/Post/adaptiveData.h
+++ b/Post/adaptiveData.h
@@ -13,7 +13,7 @@
class PViewData;
class PViewDataList;
-class GMSH_Post_Plugin;
+class GMSH_PostPlugin;
class adaptivePoint {
public:
@@ -297,13 +297,13 @@ class adaptiveElements {
// elements in coords/values
void adapt(double tol, int numComp,
std::vector<PCoords> &coords, std::vector<PValues> &values,
- double &minVal, double &maxVal, GMSH_Post_Plugin *plug=0,
+ double &minVal, double &maxVal, GMSH_PostPlugin *plug=0,
bool onlyComputeMinMax=false);
// adapt all the T-type elements in the input view and add the
// refined elements in the output view (we will remove this when we
// switch to true on-the-fly local refinement in drawPost())
void addInView(double tol, int step, PViewData *in, PViewDataList *out,
- GMSH_Post_Plugin *plug=0);
+ GMSH_PostPlugin *plug=0);
};
class adaptiveData {
@@ -323,7 +323,7 @@ class adaptiveData {
adaptiveData(PViewData *data);
~adaptiveData();
PViewData *getData(){ return (PViewData*)_outData; }
- void changeResolution(int step, int level, double tol, GMSH_Post_Plugin *plug=0);
+ void changeResolution(int step, int level, double tol, GMSH_PostPlugin *plug=0);
};
#endif
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index 5acfdc6718..3ebbf0f0f9 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -4140,10 +4140,10 @@ To add a new option in Gmsh:
@enumerate
@item
-create the option in the @code{Context_T} class
-(@file{Common/Context.h}) if it's a classical option, or in the
-@code{PViewOptions} class (@file{Post/PViewOptions.h}) if it's a
-post-processing view-dependent option;
+create the option in the @code{CTX} class (@file{Common/Context.h}) if
+it's a classical option, or in the @code{PViewOptions} class
+(@file{Post/PViewOptions.h}) if it's a post-processing view-dependent
+option;
@item
in @file{Common/DefaultOptions.h}, give a name (for the parser to be able to
access it), a reference to a handling routine (i.e. @code{opt_XXX}) and a
--
GitLab