No comments

diff --git a/src/WOKMake/FILES b/src/WOKMake/FILES
index 766326d7ee69b7511624172600c7bc5869916b19..17ef25a65c4041f4679bfa063db2562232134b74 100755 (executable)
--- a/src/WOKMake/FILES
+++ b/src/WOKMake/FILES
@@ -2,3 +2,4 @@ WOKMake_Step_1.cxx
 WOKMake_AdmFileTypes.hxx
 WOKMake_StepAccessMacro.hxx
 WOKMake_StepConstructPtr.hxx
+

diff --git a/src/WOKMake/WOKMake_BuildProcess.cxx b/src/WOKMake/WOKMake_BuildProcess.cxx
index 31d9d3873938c89f1728ac5fc1955e5ad6fb2497..3007cad28d9cbf9ed630903cb7f4082557803f5a 100755 (executable)
--- a/src/WOKMake/WOKMake_BuildProcess.cxx
+++ b/src/WOKMake/WOKMake_BuildProcess.cxx
@@ -25,8 +25,10 @@
 WOKMake_BuildProcess::WOKMake_BuildProcess(const Handle(WOKernel_Locator)& alocator, 
                                           const Handle(WOKUtils_Shell)& ashell, 
                                           const Handle(WOKernel_UnitGraph)& agraph)
-: mylocator(alocator), myshell(ashell), myunitgraph(agraph), mycdlit(WOKBuilder_MSTool::GetMSchema())
-{
+: myunitgraph(agraph),
+  mylocator(alocator),
+  myshell(ashell),
+  mycdlit(WOKBuilder_MSTool::GetMSchema()){
 }
 
 //=======================================================================

diff --git a/src/WOKMake/WOKMake_BuildProcessIterator.cxx b/src/WOKMake/WOKMake_BuildProcessIterator.cxx
index 72cd143a5cbbd50f2822043e4ac3a0033d9e1dc6..7ba5f1742022810f1d16b07bdb4ee7ee28eddcca 100755 (executable)
--- a/src/WOKMake/WOKMake_BuildProcessIterator.cxx
+++ b/src/WOKMake/WOKMake_BuildProcessIterator.cxx
@@ -53,7 +53,11 @@ extern Standard_IMPORT MMgt_StorageManager aStorageManager;
 //=======================================================================
 WOKMake_BuildProcessIterator::WOKMake_BuildProcessIterator(const Handle(WOKMake_BuildProcess)& aprocess,
                                                           const Standard_Boolean alogflag)
-: myprocess(aprocess), mygrpidx(1), mystepidx(1), mystatus(WOKMake_Unprocessed), mylogflag(alogflag)
+: myprocess(aprocess),
+  mystatus(WOKMake_Unprocessed),
+  mygrpidx(1),
+  mystepidx(1),
+  mylogflag(alogflag)
 {
   Handle(WOKMake_Step) curstep = CurStep();
   

diff --git a/src/WOKMake/WOKMake_DepItem.cxx b/src/WOKMake/WOKMake_DepItem.cxx
index a92564d3776ae54274cf6f9791763889a360f5bb..75341cdbb76f20400add45d47766881d0f33782d 100755 (executable)
--- a/src/WOKMake/WOKMake_DepItem.cxx
+++ b/src/WOKMake/WOKMake_DepItem.cxx
@@ -12,7 +12,6 @@
 #include <WOKMake_DepItem.ixx>
 
 #define READBUF_SIZE 1024
-
 //=======================================================================
 //function : WOKMake_DepItem
 //purpose  : 
@@ -181,7 +180,7 @@ Standard_Integer WOKMake_DepItem::ReadFile(const Handle(WOKUtils_Path)& afile,
 
   if(afile->Exists())
     {
-      Standard_Integer i;
+      Standard_Integer i = 0;
       ifstream astream(afile->Name()->ToCString(), ios::in);
       Handle(WOKMake_DepItem) item, lastone;
       Handle(TCollection_HAsciiString) locatorname;

diff --git a/src/WOKMake/WOKMake_InputFile.cxx b/src/WOKMake/WOKMake_InputFile.cxx
index d9482aed85e04ba0ebc2d3872128cd6b39650434..909cbae0f98a8db986f60420e2429ae5899d751c 100755 (executable)
--- a/src/WOKMake/WOKMake_InputFile.cxx
+++ b/src/WOKMake/WOKMake_InputFile.cxx
@@ -196,7 +196,7 @@ Standard_Integer WOKMake_InputFile::ReadFile(const Handle(WOKUtils_Path)&    apa
 {
   if(apath->Exists())
     {
-      Standard_Integer i;
+      Standard_Integer i = 0;
       ifstream astream(apath->Name()->ToCString());
       Handle(WOKMake_InputFile) infile;
       Handle(TCollection_HAsciiString) locatorname;
@@ -260,7 +260,7 @@ Standard_Integer WOKMake_InputFile::ReadFile(const Handle(WOKUtils_Path)& apath,
 
   if(apath->Exists())
     {
-      Standard_Integer i;
+      Standard_Integer i = 0;
       ifstream astream(apath->Name()->ToCString(), ios::in);
       Handle(WOKMake_InputFile) infile;
       Handle(TCollection_HAsciiString) locatorname;

diff --git a/src/WOKMake/WOKMake_MetaStep.cxx b/src/WOKMake/WOKMake_MetaStep.cxx
index e9f4bf689b0e9cca8af6e25752677be2ae763782..c36af2246508d97b8a19557142f8bf9f9343526f 100755 (executable)
--- a/src/WOKMake/WOKMake_MetaStep.cxx
+++ b/src/WOKMake/WOKMake_MetaStep.cxx
@@ -190,8 +190,6 @@ Handle(TColStd_HSequenceOfHAsciiString) WOKMake_MetaStep::GetUnderlyingSteps()
 
          for(Standard_Integer k=1; k<=precsteps->Length() && !found; k++)
            {
-             const Handle(WOKMake_Step)& subprec     = BuildProcess()->Find(precsteps->Value(k));
-             const Standard_CString      subpreccode = subprec->Code()->ToCString();
              if(!strcmp(preccode, BuildProcess()->Find(precsteps->Value(k))->Code()->ToCString()))
                found = Standard_True;
            }
@@ -402,6 +400,7 @@ void WOKMake_MetaStep::Execute(const Handle(WOKMake_HSequenceOfInputFile)& execl
                         << "========> " << thestep->SubCode() << " is still unprocessed" << endm;
              ok=Standard_False;
              break;
+             default: break;
            }
        }
 
@@ -561,6 +560,7 @@ Standard_Boolean WOKMake_MetaStep::HandleOutputFile(const Handle(WOKMake_OutputF
              }
          }
          break;
+          default: break;
        }
     }
   return Standard_False;

diff --git a/src/WOKMake/WOKMake_OutputFile.cxx b/src/WOKMake/WOKMake_OutputFile.cxx
index d15a03cf1fb6bb30d93ade258fdbaaf415848952..3f704e136e0cf1931683b87d01ae3d79aefb2b3b 100755 (executable)
--- a/src/WOKMake/WOKMake_OutputFile.cxx
+++ b/src/WOKMake/WOKMake_OutputFile.cxx
@@ -207,7 +207,7 @@ Standard_Integer WOKMake_OutputFile::ReadFile(const Handle(WOKUtils_Path)&    ap
 {
   if(apath->Exists())
     {
-      Standard_Integer i;
+      Standard_Integer i = 0;
       ifstream astream(apath->Name()->ToCString());
       Handle(WOKMake_OutputFile) outfile;
 
@@ -268,7 +268,7 @@ Standard_Integer WOKMake_OutputFile::ReadFile(const Handle(WOKUtils_Path)& apath
 
   if(apath->Exists())
     {
-      Standard_Integer i;
+      Standard_Integer i = 0;
       ifstream astream(apath->Name()->ToCString(), ios::in);
       Handle(WOKMake_OutputFile) outfile;
 

diff --git a/src/WOKMake/WOKMake_Step.cxx b/src/WOKMake/WOKMake_Step.cxx
index b26fb78ea78b4b312e50afacbe86cc6ede3add3b..a4937ce72df7e3a4a3dc688a4162d255db4c2134 100755 (executable)
--- a/src/WOKMake/WOKMake_Step.cxx
+++ b/src/WOKMake/WOKMake_Step.cxx
@@ -63,8 +63,15 @@ WOKMake_Step::WOKMake_Step(const Handle(WOKMake_BuildProcess)& aprocess,
                           const Handle(TCollection_HAsciiString)& acode,
                           const Standard_Boolean checked,
                           const Standard_Boolean hidden) 
-: myprocess(aprocess.operator->()), myunit(aunit), mycode(acode), mycheck(checked), myhidden(hidden), 
-  mystatus(WOKMake_Unprocessed), myexecflag(Standard_False), mydeploaded(Standard_False), myinputcomp(Standard_False)
+: myunit(aunit),
+  mycode(acode),
+  myprocess(aprocess.operator->()),
+  myinputcomp(Standard_False),
+  mydeploaded(Standard_False),
+  mystatus(WOKMake_Unprocessed),
+  mycheck(checked),
+  myhidden(hidden), 
+  myexecflag(Standard_False)
 {
 }
 
@@ -1041,8 +1048,6 @@ void WOKMake_Step::AcquitExecution(const Handle(WOKMake_HSequenceOfInputFile)& e
              Standard_Boolean stillforexec  = Standard_False;
              out_index = outmap.FindIndex(mydepout.FindKey(i));
 
-             const Handle(WOKMake_OutputFile)& outfile = outmap(out_index);
-
              for (j = mydepmatrix->LowerCol(); j <= mydepmatrix->UpperCol(); j++)
                {
                  //in_index = inmap.FindIndex(mydepin.FindKey(j));
@@ -1542,6 +1547,7 @@ Standard_Boolean WOKMake_Step::HandleOutputFile(const Handle(WOKMake_OutputFile)
              }
          }
        break;
+        default: break;
        }
     }
   return Standard_False;

diff --git a/src/WOKMake/WOKMake_StepBuilder.cxx b/src/WOKMake/WOKMake_StepBuilder.cxx
index 21aaccfc666ba352431173349db6f78b0f209b25..830d6aba0a97416f5ce4b1cce0bb69e32b5bc39b 100755 (executable)
--- a/src/WOKMake/WOKMake_StepBuilder.cxx
+++ b/src/WOKMake/WOKMake_StepBuilder.cxx
@@ -101,7 +101,7 @@ Handle(WOKMake_Step) WOKMake_StepBuilder::BuildStep(const Handle(WOKMake_BuildPr
 {
   Handle(WOKMake_Step) result;
   WOKMake_DataMapOfHAsciiStringOfStepBuilder& knownsteps = WOKMake_StepBuilder::StepBuilders();
-  Standard_Integer i;
+  Standard_Integer i = 1;
 
   if(name.IsNull() || aunit.IsNull() || acode.IsNull())
     {
@@ -137,7 +137,6 @@ Handle(WOKMake_Step) WOKMake_StepBuilder::BuildStep(const Handle(WOKMake_BuildPr
   
   key->AssignCat("_");
   
-  i=1;
   Handle(TCollection_HAsciiString) alib = libs->Token(" ", i); 
   while(!alib->IsEmpty())
     {

diff --git a/src/WOKMake/WOKMake_StepFile.cxx b/src/WOKMake/WOKMake_StepFile.cxx
index c609e622271ba856f5bcbbb4fb816735c448c0c1..b57d12fb5535e3df2bd28f9914ea281e25ff654f 100755 (executable)
--- a/src/WOKMake/WOKMake_StepFile.cxx
+++ b/src/WOKMake/WOKMake_StepFile.cxx
@@ -12,7 +12,7 @@
 //purpose  : 
 //=======================================================================
 WOKMake_StepFile::WOKMake_StepFile()
-  : mystatus(WOKMake_Undetermined), myattr(0)
+  : myattr(0), mystatus(WOKMake_Undetermined)
 {
   SetPhysicFlag(Standard_True);
 }
@@ -26,7 +26,7 @@ WOKMake_StepFile::WOKMake_StepFile(const Handle(TCollection_HAsciiString)& anid,
                                   const Handle(WOKernel_File)&            afile, 
                                   const Handle(WOKBuilder_Entity)&        abuildent,
                                   const Handle(WOKUtils_Path)&            aoldpath)
-  : myid(anid), myfile(afile), myent(abuildent), mylastpath(aoldpath), mystatus(WOKMake_Undetermined), myattr(0)
+  : myattr(0), myfile(afile), myid(anid), myent(abuildent), mylastpath(aoldpath), mystatus(WOKMake_Undetermined)
 {
   SetPhysicFlag(Standard_True);
 }

diff --git a/src/WOKMake/WOKMake_TriggerStep.cxx b/src/WOKMake/WOKMake_TriggerStep.cxx
index 39fe7bafdf495b14af9e67a382bd92156cbf3289..67070fb4e26cad87b2287b3d909104b7c2148bad 100755 (executable)
--- a/src/WOKMake/WOKMake_TriggerStep.cxx
+++ b/src/WOKMake/WOKMake_TriggerStep.cxx
@@ -74,7 +74,7 @@ Handle(TCollection_HAsciiString) WOKMake_TriggerStep::AdmFileType() const
   Handle(TCollection_HAsciiString) result;
   Handle(TCollection_HAsciiString) trigname = new TCollection_HAsciiString(Name());
 
-  trigname->AssignCat("::AdmFileType");
+  trigname->AssignCat(":AdmFileType");
 
   WOKUtils_Trigger execute;
 
@@ -109,7 +109,7 @@ Handle(TCollection_HAsciiString) WOKMake_TriggerStep::OutputDirTypeName() const
   Handle(TCollection_HAsciiString) result;
   Handle(TCollection_HAsciiString) trigname = new TCollection_HAsciiString(Name());
 
-  trigname->AssignCat("::OutputDirTypeName");
+  trigname->AssignCat(":OutputDirTypeName");
 
   WOKUtils_Trigger execute;
 
@@ -146,7 +146,7 @@ Standard_Boolean WOKMake_TriggerStep::HandleInputFile(const Handle(WOKMake_Input
 
   Handle(TCollection_HAsciiString) trigname = new TCollection_HAsciiString(Name());
 
-  trigname->AssignCat("::HandleInputFile");
+  trigname->AssignCat(":HandleInputFile");
 
   execute(trigname) << infile->ID() << endt >> b;
 
@@ -266,7 +266,7 @@ void WOKMake_TriggerStep::Execute(const Handle(WOKMake_HSequenceOfInputFile)& ex
   WOKUtils_Trigger execute;
   
   Handle(TCollection_HAsciiString) trigname = new TCollection_HAsciiString(Name());
-  trigname->AssignCat("::Execute");
+  trigname->AssignCat(":Execute");
 
   execute(trigname) << Unit()->UserPathName();