SGPath: typo...

diff --git a/simgear/misc/path_test.cxx b/simgear/misc/path_test.cxx
index 3eeccbeb9833b93a993a2c061a02ee37e0e641e6..94f9eaad296087a327e8669ecee9b157c45b9e9d 100644 (file)
--- a/simgear/misc/path_test.cxx
+++ b/simgear/misc/path_test.cxx
@@ -192,12 +192,12 @@ int main(int argc, char* argv[])
     pp.append("./test-dir/file.txt");
     COMPARE(pp.create_dir(0700), -3);
 
-    pp.setPermissonChecker(&validateRead);
+    pp.setPermissionChecker(&validateRead);
     COMPARE(pp.canRead(), true);
     COMPARE(pp.canWrite(), false);
     COMPARE(pp.create_dir(0700), -3);
 
-    pp.setPermissonChecker(&validateWrite);
+    pp.setPermissionChecker(&validateWrite);
     COMPARE(pp.canRead(), false);
     COMPARE(pp.canWrite(), true);
 

diff --git a/simgear/misc/sg_path.cxx b/simgear/misc/sg_path.cxx
index e38c67ee1b484f6b2c459708dc849661bbe2ce2c..befb41a2e6cad487b0a33207d0464eaa7b1c02b7 100644 (file)
--- a/simgear/misc/sg_path.cxx
+++ b/simgear/misc/sg_path.cxx
@@ -75,7 +75,7 @@ static SGPath pathForCSIDL(int csidl, const SGPath& def)
 
        char path[MAX_PATH];
        if (SHGetSpecialFolderPath(0, path, csidl, false)) {
-               return SGPath(path, def.getPermissonChecker());
+               return SGPath(path, def.getPermissionChecker());
        }
 
        return def;
@@ -95,7 +95,7 @@ static SGPath appleSpecialFolder(OSType type, const SGPath& def)
   if( FSRefMakePath(&ref, path, 1024) != noErr )
     return def;
 
-  return SGPath((const char*) path, def.getPermissonChecker());
+  return SGPath((const char*) path, def.getPermissionChecker());
 }
 #else
 static SGPath getXDGDir( const std::string& name,
@@ -131,7 +131,7 @@ static SGPath getXDGDir( const std::string& name,
       return SGPath::home(def)
            / simgear::strutils::unescape(line.substr(HOME.length()));
 
-    return SGPath(line, def.getPermissonChecker());
+    return SGPath(line, def.getPermissionChecker());
   }
 
   if( def.isNull() )
@@ -160,7 +160,7 @@ SGPath::fix()
 
 
 // default constructor
-SGPath::SGPath(PermissonChecker validator)
+SGPath::SGPath(PermissionChecker validator)
     : path(""),
     _permission_checker(validator),
     _cached(false),
@@ -171,7 +171,7 @@ SGPath::SGPath(PermissonChecker validator)
 
 
 // create a path based on "path"
-SGPath::SGPath( const std::string& p, PermissonChecker validator )
+SGPath::SGPath( const std::string& p, PermissionChecker validator )
     : path(p),
     _permission_checker(validator),
     _cached(false),
@@ -184,7 +184,7 @@ SGPath::SGPath( const std::string& p, PermissonChecker validator )
 // create a path based on "path" and a "subpath"
 SGPath::SGPath( const SGPath& p,
                 const std::string& r,
-                PermissonChecker validator )
+                PermissionChecker validator )
     : path(p.path),
     _permission_checker(validator),
     _cached(false),
@@ -240,14 +240,14 @@ void SGPath::set( const string& p ) {
 }
 
 //------------------------------------------------------------------------------
-void SGPath::setPermissonChecker(PermissonChecker validator)
+void SGPath::setPermissionChecker(PermissionChecker validator)
 {
   _permission_checker = validator;
   _rwCached = false;
 }
 
 //------------------------------------------------------------------------------
-SGPath::PermissonChecker SGPath::getPermissonChecker() const
+SGPath::PermissionChecker SGPath::getPermissionChecker() const
 {
   return _permission_checker;
 }

diff --git a/simgear/misc/sg_path.hxx b/simgear/misc/sg_path.hxx
index 377a0b01663593a0b914617eacb55b1a4c78a023..cce05ebc36a8fd9e9d7499a64974f91583683b67 100644 (file)
--- a/simgear/misc/sg_path.hxx
+++ b/simgear/misc/sg_path.hxx
@@ -57,10 +57,10 @@ public:
       bool read : 1;
       bool write : 1;
     };
-    typedef Permissions (*PermissonChecker)(const SGPath&);
+    typedef Permissions (*PermissionChecker)(const SGPath&);
 
     /** Default constructor */
-    explicit SGPath(PermissonChecker validator = NULL);
+    explicit SGPath(PermissionChecker validator = NULL);
 
     /** Copy contructor */
     SGPath(const SGPath& p);
@@ -71,7 +71,7 @@ public:
      * Construct a path based on the starting path provided.
      * @param p initial path
      */
-    SGPath( const std::string& p, PermissonChecker validator = NULL );
+    SGPath( const std::string& p, PermissionChecker validator = NULL );
 
     /**
      * Construct a path based on the starting path provided and a relative subpath
@@ -80,7 +80,7 @@ public:
      */
     SGPath( const SGPath& p,
             const std::string& r,
-            PermissonChecker validator = NULL );
+            PermissionChecker validator = NULL );
 
     /** Destructor */
     ~SGPath();
@@ -95,8 +95,8 @@ public:
     bool operator==(const SGPath& other) const;
     bool operator!=(const SGPath& other) const;
 
-    void setPermissonChecker(PermissonChecker validator);
-    PermissonChecker getPermissonChecker() const;
+    void setPermissionChecker(PermissionChecker validator);
+    PermissionChecker getPermissionChecker() const;
 
     /**
      * Set if file information (exists, type, mod-time) is cached or
@@ -301,7 +301,7 @@ private:
     void checkAccess() const;
 
     std::string path;
-    PermissonChecker _permission_checker;
+    PermissionChecker _permission_checker;
 
     mutable bool _cached : 1;
     mutable bool _rwCached : 1;