Andy Cedilnik пре 23 година
родитељ
комит
f6a1218e10
2 измењених фајлова са 8 додато и 8 уклоњено
  1. 2 5
      Source/WXDialog/cmWXMainFrame.cxx
  2. 6 3
      Source/cmSetCommand.cxx

+ 2 - 5
Source/WXDialog/cmWXMainFrame.cxx

@@ -521,7 +521,7 @@ void cmMainFrame::ResizeInternal()
 }
 
 void cmMainFrame::OnBrowseSource(wxCommandEvent&)
-{
+{  
   std::string path = this->m_PathSource->GetValue().c_str();
   if ( path == "PathSource" )
     {
@@ -1193,7 +1193,7 @@ void cmMainFrame::ClearCache()
 
 }
 
-void cmMainFrame::OnBinaryAccepted(wxCommandEvent& event)
+void cmMainFrame::OnBinaryAccepted(wxCommandEvent&)
 {
   std::cout << "Pressed enter in binary field" << std::endl;
 }
@@ -1308,14 +1308,11 @@ void cmMainFrame::LoadFromRegistry()
         }
       }
     }
-  
   delete conf;
-
 }
 
 void cmMainFrame::SaveToRegistry()
 {
-
   //wxConfigBase *conf = (wxConfigBase*) wxConfigBase::Get();//new wxConfig("CMakeSetup");
   wxConfig *conf = new wxConfig("CMakeSetup");
   conf->SetPath("Settings/StartPath");

+ 6 - 3
Source/cmSetCommand.cxx

@@ -60,25 +60,28 @@ bool cmSetCommand::InitialPass(std::vector<std::string> const& args)
       return true;
       }
     }
-  
+
   // look for FORCE argument
   if (args.size() > 4 && args[args.size()-1] == "FORCE")
     {
     force = true;
     }
   
+  std::vector<std::string>::size_type arg4, arg5;
+  arg4 = 4 + (force ? 1 : 0);
+  arg5 = 5 + (force ? 1 : 0);
   if(args.size() == 2)
     {
     // SET (VAR value )
     value= args[1];
     }
-  else if(args.size() == 4 + (force ? 1 : 0))
+  else if(args.size() == arg4)
     {
     // SET (VAR CACHE TYPE "doc String")
     cache = true;
     cacheStart = 1;
     }
-  else if(args.size() == 5 + (force ? 1 : 0))
+  else if(args.size() == arg5)
     {
     //  SET (VAR value CACHE TYPE "doc string")
     cache = true;