Bernie Bright:

Could the file(), dir(), base() and extension() functions be made const member
functions.  As it stands they cannot be applied to const reference/pointer
values which limits their usefulness.

Curt:

Yes.

diff --git a/simgear/misc/sg_path.cxx b/simgear/misc/sg_path.cxx
index f18543a7bc172f3a31b24271c88ac1a8876df27d..dc9be8eb627350b7e06b6c5e03bc5255f940d73a 100644 (file)
--- a/simgear/misc/sg_path.cxx
+++ b/simgear/misc/sg_path.cxx
@@ -105,7 +105,7 @@ void SGPath::concat( const string& p ) {
 
 
 // Get the file part of the path (everything after the last path sep)
-string SGPath::file() {
+string SGPath::file() const {
     int index = path.rfind(SG_PATH_SEP);
     if (index >= 0) {
        return path.substr(index + 1);
@@ -116,7 +116,7 @@ string SGPath::file() {
   
 
 // get the directory part of the path.
-string SGPath::dir() {
+string SGPath::dir() const {
     int index = path.rfind(SG_PATH_SEP);
     if (index >= 0) {
        return path.substr(0, index);
@@ -126,7 +126,7 @@ string SGPath::dir() {
 }
 
 // get the base part of the path (everything but the extension.)
-string SGPath::base() {
+string SGPath::base() const {
     int index = path.rfind(".");
     if (index >= 0) {
        return path.substr(0, index);
@@ -136,7 +136,7 @@ string SGPath::base() {
 }
 
 // get the extention (everything after the final ".")
-string SGPath::extension() {
+string SGPath::extension() const {
     int index = path.rfind(".");
     if (index >= 0) {
        return path.substr(index + 1);

diff --git a/simgear/misc/sg_path.hxx b/simgear/misc/sg_path.hxx
index 045f584a794920eb8643dbfe8f3c57c90f18c29a..9b0e5939472d158e6df2e58f698ec39f6d969b5b 100644 (file)
--- a/simgear/misc/sg_path.hxx
+++ b/simgear/misc/sg_path.hxx
@@ -98,25 +98,25 @@ public:
      * Get the file part of the path (everything after the last path sep)
      * @return file string
      */
-    string file();
+    string file() const;
   
     /**
      * Get the directory part of the path.
      * @return directory string
      */
-    string dir();
+    string dir() const;
   
     /**
      * Get the base part of the path (everything but the extension.)
      * @return the base string
      */
-    string base();
+    string base() const;
 
     /**
      * Get the extention part of the path (everything after the final ".")
      * @return the extention string
      */
-    string extension();
+    string extension() const;
 
     /** Get the path string
      * @return path string