Changeset 1044 for trunk/source/intercoms/src

Timestamp:

May 15, 2009, 12:25:18 PM (17 years ago)

Author:

garnier

Message:

maj en aussi sur CVS

File:

• trunk/source/intercoms/src/G4UIcommandTree.cc (modified) (7 diffs)

trunk/source/intercoms/src/G4UIcommandTree.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4UIcommandTree.cc,v 1.14 2008/01/30 11:20:03 lgarnier Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4UIcommandTree.cc,v 1.15 2009/05/07 09:33:51 lgarnier Exp $
+// GEANT4 tag $Name:  $
 //
 
@@ -229 +229 @@
   G4String pathName = aCommandPath;
   G4String remainingPath = aCommandPath;
+  G4String empty = "";
+  G4String matchingPath = empty;
 
   // find the tree
@@ -235 +237 @@
   G4UIcommandTree* aTree = FindCommandTree(pathName);
 
-  G4String empty = "";
   if (!aTree) {
     return empty;
@@ -245 +246 @@
 
   // list matched directories/commands
-  G4String stream, strtmp;
+  G4String strtmp;
   G4int nMatch= 0;
 
@@ -257 +258 @@
     if( fpdir.index(remainingPath, 0) == 0) {
       if(nMatch==0) {
-        stream = fpdir;
+        matchingPath = fpdir;
       } else {
-        stream = GetFirstMatchedString(fpdir,stream);
+        matchingPath = GetFirstMatchedString(fpdir,matchingPath);
       }
       nMatch++;
@@ -282 +283 @@
     if( fpcmd.index(remainingPath, 0) ==0) {
       if(nMatch==0) {
-        stream= fpcmd + " ";
+        matchingPath= fpcmd + " ";
       } else {
         strtmp= fpcmd + " ";
-        stream= GetFirstMatchedString(stream, strtmp);
+        matchingPath= GetFirstMatchedString(matchingPath, strtmp);
       }
       nMatch++;
@@ -299 +300 @@
   }
 
-  return stream;
+  return matchingPath;
 }