shithub: openh264

Info  •  Files  •  Log  •  Branches

Wheader-hygiene

--- a/codec/console/common/inc/read_config.h

+++ b/codec/console/common/inc/read_config.h

@@ -42,7 +42,6 @@

 #include <stdlib.h>

 #include <string>

-using namespace std;

 class CReadConfig {

@@ -49,19 +48,19 @@

  public:

   CReadConfig();

   CReadConfig (const char* pConfigFileName);

-  CReadConfig (const string& pConfigFileName);

+  CReadConfig (const std::string& pConfigFileName);

   virtual ~CReadConfig();

   void Openf (const char* strFile);

-  long ReadLine (string* strVal, const int iValSize = 4);

+  long ReadLine (std::string* strVal, const int iValSize = 4);

   const bool EndOfFile();

   const int GetLines();

   const bool ExistFile();

-  const string& GetFileName();

+  const std::string& GetFileName();

  private:

   FILE*			m_pCfgFile;

-  string			m_strCfgFileName;

+  std::string			m_strCfgFileName;

   unsigned int	m_iLines;

 };

--- a/codec/console/common/src/read_config.cpp

+++ b/codec/console/common/src/read_config.cpp

@@ -58,7 +58,7 @@

   }

 }

-CReadConfig::CReadConfig (const string& kpConfigFileName)

+CReadConfig::CReadConfig (const std::string& kpConfigFileName)

   : m_pCfgFile (0)

   , m_strCfgFileName (kpConfigFileName)

   , m_iLines (0) {

@@ -81,11 +81,11 @@

   }

 }

-long CReadConfig::ReadLine (string* pVal, const int kiValSize/* = 4*/) {

+long CReadConfig::ReadLine (std::string* pVal, const int kiValSize/* = 4*/) {

   if (m_pCfgFile == NULL || pVal == NULL || kiValSize <= 1)

     return 0;

-  string* strTags = &pVal[0];

+  std::string* strTags = &pVal[0];

   int nTagNum = 0, n = 0;

   bool bCommentFlag = false;

@@ -134,6 +134,6 @@

   return (m_pCfgFile != NULL);

 }

-const string& CReadConfig::GetFileName() {

+const std::string& CReadConfig::GetFileName() {

   return m_strCfgFileName;

 }