Changeset 659 for CMT/HEAD/source/cmt_symbol.cxx

Timestamp:

Dec 11, 2013, 10:48:59 AM (11 years ago)

Author:

rybkin

Message:

See C.L. 518

File:

• CMT/HEAD/source/cmt_symbol.cxx (modified) (9 diffs)

CMT/HEAD/source/cmt_symbol.cxx

@@ -50 +50 @@
                           CmtSystem::cmt_string_vector& value,
                           const cmt_string& tag_name = "") const;
-  inline const bool& get_path_strip () const;
-  inline void set_path_strip (const bool& path_strip);
+  inline const bool& get_strip_path () const;
+  inline void set_strip_path (const bool& strip_path);
 
   PathBuilder ();
-  PathBuilder (bool path_strip);
+  PathBuilder (bool strip_path);
 
 private:
-  bool m_path_strip;
+  bool m_strip_path;
 };
 //-------------------------------------------------------------
@@ -754 +754 @@
 {
   static SetBuilder Set;
-  static PathBuilder Path (Cmt::get_path_strip ());
+  static PathBuilder Path (Cmt::get_strip_path ());
   //static PathBuilder Path;
   static MacroBuilder Macro;
@@ -1255 +1255 @@
 
 //-------------------------------------------------------------
-bool Symbol::set_path_strip (const bool& path_strip)
+bool Symbol::set_strip_path (const bool& strip_path)
 {
   // searching for a path symbol
@@ -1264 +1264 @@
       if (symbol.type == Symbol::SymbolPath)
         {
-          static_cast<PathBuilder*> (symbol.builder)->set_path_strip (path_strip);
+          static_cast<PathBuilder*> (symbol.builder)->set_strip_path (strip_path);
           return true;
         }
@@ -2570 +2570 @@
 //-------------------------------------------------------------
 PathBuilder::PathBuilder ()
-  : m_path_strip (false)
-{
-}
-
-//-------------------------------------------------------------
-PathBuilder::PathBuilder (bool path_strip)
+  : m_strip_path (false)
+{
+}
+
+//-------------------------------------------------------------
+PathBuilder::PathBuilder (bool strip_path)
 {
   PathBuilder ();
-  m_path_strip = path_strip;
+  m_strip_path = strip_path;
 }
 
@@ -3033 +3033 @@
       if (!exists)
         {
-          if (m_path_strip)
+          if (m_strip_path)
             {
               if (!reg.match (v))
@@ -3084 +3084 @@
 
 //-------------------------------------------------------------
-inline const bool& PathBuilder::get_path_strip () const
-{
-  return m_path_strip;
-}
-
-//-------------------------------------------------------------
-inline void PathBuilder::set_path_strip (const bool& path_strip)
-{
-  m_path_strip = path_strip;
+inline const bool& PathBuilder::get_strip_path () const
+{
+  return m_strip_path;
+}
+
+//-------------------------------------------------------------
+inline void PathBuilder::set_strip_path (const bool& strip_path)
+{
+  m_strip_path = strip_path;
 }
 
@@ -3712 +3712 @@
         if (!pb)
           pb = static_cast<PathBuilder*> (symbol.builder);
-        if (pb->get_path_strip ())
+        if (pb->get_strip_path ())
           {
             /*
@@ -3784 +3784 @@
               }
           }
-        else // (!pb->get_path_strip ())
+        else // (!pb->get_strip_path ())
           {
             if (CmtError::has_pending_error ())