From 52987f395d423203fbb1a417961408804832c258 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Fri, 24 Aug 2018 14:28:25 +0200
Subject: Make filename more consistent

---
 include/astra/AstraObjectFactory.h     |  2 +-
 include/astra/PluginAlgorithm.h        | 64 ----------------------------------
 include/astra/PluginAlgorithmFactory.h | 64 ++++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 65 deletions(-)
 delete mode 100644 include/astra/PluginAlgorithm.h
 create mode 100644 include/astra/PluginAlgorithmFactory.h

(limited to 'include')

diff --git a/include/astra/AstraObjectFactory.h b/include/astra/AstraObjectFactory.h
index c963e35..91efa61 100644
--- a/include/astra/AstraObjectFactory.h
+++ b/include/astra/AstraObjectFactory.h
@@ -40,7 +40,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
 #include "AlgorithmTypelist.h"
 
 #ifdef ASTRA_PYTHON
-#include "PluginAlgorithm.h"
+#include "PluginAlgorithmFactory.h"
 #endif
 
 
diff --git a/include/astra/PluginAlgorithm.h b/include/astra/PluginAlgorithm.h
deleted file mode 100644
index afaaf05..0000000
--- a/include/astra/PluginAlgorithm.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
------------------------------------------------------------------------
-Copyright: 2010-2018, imec Vision Lab, University of Antwerp
-           2014-2018, CWI, Amsterdam
-
-Contact: astra@astra-toolbox.com
-Website: http://www.astra-toolbox.com/
-
-This file is part of the ASTRA Toolbox.
-
-
-The ASTRA Toolbox is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-The ASTRA Toolbox is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
-
------------------------------------------------------------------------
-*/
-
-#ifndef _INC_ASTRA_PLUGINALGORITHM
-#define _INC_ASTRA_PLUGINALGORITHM
-
-#include "astra/Globals.h"
-
-#include <map>
-#include <string>
-
-namespace astra {
-
-class CAlgorithm;
-
-class _AstraExport CPluginAlgorithmFactory {
-
-public:
-    CPluginAlgorithmFactory() { }
-    virtual ~CPluginAlgorithmFactory() { }
-
-    virtual CAlgorithm * getPlugin(const std::string &name) = 0;
-
-    virtual bool registerPlugin(std::string name, std::string className) = 0;
-    virtual bool registerPlugin(std::string className) = 0;
-
-    virtual std::map<std::string, std::string> getRegisteredMap() = 0;
-    
-    virtual std::string getHelp(const std::string &name) = 0;
-
-    static void registerFactory(CPluginAlgorithmFactory *factory) { m_factory = factory; }
-	static CPluginAlgorithmFactory* getFactory() { return m_factory; }
-
-private:
-    static CPluginAlgorithmFactory *m_factory;
-};
-
-}
-
-#endif
diff --git a/include/astra/PluginAlgorithmFactory.h b/include/astra/PluginAlgorithmFactory.h
new file mode 100644
index 0000000..afaaf05
--- /dev/null
+++ b/include/astra/PluginAlgorithmFactory.h
@@ -0,0 +1,64 @@
+/*
+-----------------------------------------------------------------------
+Copyright: 2010-2018, imec Vision Lab, University of Antwerp
+           2014-2018, CWI, Amsterdam
+
+Contact: astra@astra-toolbox.com
+Website: http://www.astra-toolbox.com/
+
+This file is part of the ASTRA Toolbox.
+
+
+The ASTRA Toolbox is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+The ASTRA Toolbox is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
+
+-----------------------------------------------------------------------
+*/
+
+#ifndef _INC_ASTRA_PLUGINALGORITHM
+#define _INC_ASTRA_PLUGINALGORITHM
+
+#include "astra/Globals.h"
+
+#include <map>
+#include <string>
+
+namespace astra {
+
+class CAlgorithm;
+
+class _AstraExport CPluginAlgorithmFactory {
+
+public:
+    CPluginAlgorithmFactory() { }
+    virtual ~CPluginAlgorithmFactory() { }
+
+    virtual CAlgorithm * getPlugin(const std::string &name) = 0;
+
+    virtual bool registerPlugin(std::string name, std::string className) = 0;
+    virtual bool registerPlugin(std::string className) = 0;
+
+    virtual std::map<std::string, std::string> getRegisteredMap() = 0;
+    
+    virtual std::string getHelp(const std::string &name) = 0;
+
+    static void registerFactory(CPluginAlgorithmFactory *factory) { m_factory = factory; }
+	static CPluginAlgorithmFactory* getFactory() { return m_factory; }
+
+private:
+    static CPluginAlgorithmFactory *m_factory;
+};
+
+}
+
+#endif
-- 
cgit v1.2.3