comparison src/Support/Parameters.cc @ 8:fcbf85ce59fb

- Lots of changes to make cpplint happy. It still complains about header guards, but that's pretty much it now.

 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-//!
-//! \file
-//! \brief Main parameters store
-//!
-//! \author Willem van Engen <[e-mail]>
-//! \date created 2006/09/21
-//! \version \$Id: Parameters.cc 4 2010-02-03 18:44:58Z tcw $
+/*!
+ * \file
+ * \brief Main parameters store
+ *
+ * \author Willem van Engen <[e-mail]>
+ * \date created 2006/09/21
+ * \version \$Id: Parameters.cc 4 2010-02-03 18:44:58Z tcw $
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

 unsigned int Parameters::GetUInt(const char *sName) {
   return atoi(GetString(sName));
 }
 
 float Parameters::GetFloat(const char *sName) {
-  return (float)atof(GetString(sName));
+  return atof(GetString(sName));
 }
 
 bool Parameters::GetBool(const char *sName) {
   const char *sVal = GetString(sName);
-  if (strcmp(sVal, "true")==0 || strcmp(sVal, "on")==0 ||
-      strcmp(sVal, "yes")==0 || strcmp(sVal, "1")==0 ||
-      strcmp(sVal, "y")==0 || strcmp(sVal, "t")==0)
+  if (strcmp(sVal, "true") == 0 || strcmp(sVal, "on") == 0 ||
+      strcmp(sVal, "yes") == 0 || strcmp(sVal, "1") == 0 ||
+      strcmp(sVal, "y") == 0 || strcmp(sVal, "t") == 0)
     return true;
   else
     return false;
 }
 
 bool Parameters::IsSet(const char *sName) {
   AIM_ASSERT(m_pIni);
-  return m_pIni->GetValue(m_SDefaultIniSection, sName, NULL)!=NULL;
+  return m_pIni->GetValue(m_SDefaultIniSection, sName, NULL) != NULL;
 }
 
 bool Parameters::Parse(const char *sCmd) {
-  //! \todo There is some code duplication here from Parameters::Merge()
+  /*! \todo There is some code duplication here from Parameters::Merge()
+   */
 
   CSimpleIniCase *pIni2 = new CSimpleIniCase(false, false, true);
   AIM_ASSERT(pIni2);
   if (pIni2->Load(sCmd, strlen(sCmd)) < 0) {
     LOG_ERROR(_T("Could not parse option '%s'"), sCmd);

              sParamFilename, m_iNestCount);
     return false;
   }
   m_iNestCount++;
 
-  if ( (siErr=m_pIni->LoadFile(sParamFilename))<0 ) {
+  if ((siErr=m_pIni->LoadFile(sParamFilename)) < 0) {
     // Don't complain if file not found, but do return error
-    if (siErr!=SI_FILE)
+    if (siErr != SI_FILE)
       LOG_ERROR(_T("Couldn't parse parameters from '%s'"), sParamFilename);
     m_iNestCount--;
     return false;
   }
 

       LOG_ERROR(_T("Couldn't create parameters file '%s' to save to"),
                 sParamFilename);
       return false;
     }
 
-  if ((siErr = m_pIni->SaveFile(pSaveFile)) < 0 ) {
+  if ((siErr = m_pIni->SaveFile(pSaveFile)) < 0) {
     LOG_ERROR(_T("Couldn't save parameters in file '%s'"), sParamFilename);
     return false;
   }
 
   fclose(pSaveFile);

 std::string Parameters::WriteString() {
   AIM_ASSERT(m_pIni);
   SI_Error siErr;
   std::string output_string;
 
-  if ((siErr = m_pIni->Save(output_string)) < 0 ) {
+  if ((siErr = m_pIni->Save(output_string)) < 0) {
     LOG_ERROR(_T("Couldn't write parameters to string"));
     return false;
   }
   return output_string;
 }