Browse Source

BaseImporter: fix typo and rename attributes for better readability.

Kim Kulling 10 years ago
parent
commit
3fc251b326
2 changed files with 8 additions and 8 deletions
  1. 5 5
      code/BaseImporter.cpp
  2. 3 3
      code/BaseImporter.h

+ 5 - 5
code/BaseImporter.cpp

@@ -63,7 +63,7 @@ using namespace Assimp;
 // ------------------------------------------------------------------------------------------------
 // ------------------------------------------------------------------------------------------------
 // Constructor to be privately used by Importer
 // Constructor to be privately used by Importer
 BaseImporter::BaseImporter()
 BaseImporter::BaseImporter()
-: progress()
+: m_progress()
 {
 {
     // nothing to do here
     // nothing to do here
 }
 }
@@ -79,8 +79,8 @@ BaseImporter::~BaseImporter()
 // Imports the given file and returns the imported data.
 // Imports the given file and returns the imported data.
 aiScene* BaseImporter::ReadFile(const Importer* pImp, const std::string& pFile, IOSystem* pIOHandler)
 aiScene* BaseImporter::ReadFile(const Importer* pImp, const std::string& pFile, IOSystem* pIOHandler)
 {
 {
-    progress = pImp->GetProgressHandler();
-    ai_assert(progress);
+    m_progress = pImp->GetProgressHandler();
+    ai_assert(m_progress);
 
 
     // Gather configuration properties for this run
     // Gather configuration properties for this run
     SetupProperties( pImp );
     SetupProperties( pImp );
@@ -98,8 +98,8 @@ aiScene* BaseImporter::ReadFile(const Importer* pImp, const std::string& pFile,
 
 
     } catch( const std::exception& err )    {
     } catch( const std::exception& err )    {
         // extract error description
         // extract error description
-        mErrorText = err.what();
-        DefaultLogger::get()->error(mErrorText);
+        m_ErrorText = err.what();
+        DefaultLogger::get()->error(m_ErrorText);
         return NULL;
         return NULL;
     }
     }
 
 

+ 3 - 3
code/BaseImporter.h

@@ -181,7 +181,7 @@ public:
      * string if there was no error.
      * string if there was no error.
      */
      */
     const std::string& GetErrorText() const {
     const std::string& GetErrorText() const {
-        return mErrorText;
+        return m_ErrorText;
     }
     }
 
 
     // -------------------------------------------------------------------
     // -------------------------------------------------------------------
@@ -362,10 +362,10 @@ public: // static utilities
 protected:
 protected:
 
 
     /** Error description in case there was one. */
     /** Error description in case there was one. */
-    std::string mErrorText;
+    std::string m_ErrorText;
 
 
     /** Currently set progress handler */
     /** Currently set progress handler */
-    ProgressHandler* progress;
+    ProgressHandler* m_progress;
 };
 };