Renamed Visitor to SettingsVisitor to avoid naming confusion

openscad · Jun 13, 2016 · 9f89991 · 9f89991
1 parent 7800683
commit 9f89991
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/Preferences.cc b/src/Preferences.cc
@@ -46,7 +46,7 @@ Preferences *Preferences::instance = NULL;
 const char * Preferences::featurePropertyName = "FeatureProperty";
 Q_DECLARE_METATYPE(Feature *);
 
-class SettingsReader : public Settings::Visitor
+class SettingsReader : public Settings::SettingsVisitor
 {
     QSettings settings;
     Value getValue(const Settings::SettingsEntry& entry, const std::string& value) const {
@@ -90,7 +90,7 @@ class SettingsReader : public Settings::Visitor
     }
 };
 
-class SettingsWriter : public Settings::Visitor
+class SettingsWriter : public Settings::SettingsVisitor
 {
     virtual void handle(Settings::SettingsEntry& entry) const {
 	Settings::Settings *s = Settings::Settings::inst();

diff --git a/src/settings.cc b/src/settings.cc
@@ -87,7 +87,7 @@ Settings::~Settings()
 {
 }
 
-void Settings::visit(Visitor& visitor)
+void Settings::visit(SettingsVisitor& visitor)
 {
 	for (std::list<SettingsEntry *>::iterator it = entries.begin();it != entries.end();it++) {
 		visitor.handle(*(*it));
@@ -109,11 +109,11 @@ void Settings::set(SettingsEntry& entry, const Value &val)
     entry._value = val;
 }
 
-Visitor::Visitor()
+SettingsVisitor::SettingsVisitor()
 {
 }
 
-Visitor::~Visitor()
+SettingsVisitor::~SettingsVisitor()
 {
 }
 

diff --git a/src/settings.h b/src/settings.h
@@ -55,7 +55,7 @@ class Settings
 
     static Settings *inst(bool erase = false);
 
-    void visit(class Visitor& visitor);
+    void visit(class SettingsVisitor& visitor);
 
     const Value &defaultValue(const SettingsEntry& entry);
     const Value &get(const SettingsEntry& entry);
@@ -66,11 +66,11 @@ class Settings
     virtual ~Settings();
 };
 
-class Visitor
+class SettingsVisitor
 {
 public:
-    Visitor();
-    virtual ~Visitor();
+    SettingsVisitor();
+    virtual ~SettingsVisitor();
 
     virtual void handle(SettingsEntry& entry) const = 0;
 };