From 3fc251b326249c6ed51ea65b6d259c45a3e1f06b Mon Sep 17 00:00:00 2001
From: Kim Kulling <kim.kulling@googlemail.com>
Date: Thu, 24 Sep 2015 00:57:47 +0200
Subject: [PATCH] BaseImporter: fix typo and rename attributes for better
 readability.

---
 code/BaseImporter.cpp | 10 +++++-----
 code/BaseImporter.h   |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/BaseImporter.cpp b/code/BaseImporter.cpp
index 3c8d9e39b..071411642 100644
--- a/code/BaseImporter.cpp
+++ b/code/BaseImporter.cpp
@@ -63,7 +63,7 @@ using namespace Assimp;
 // ------------------------------------------------------------------------------------------------
 // Constructor to be privately used by Importer
 BaseImporter::BaseImporter()
-: progress()
+: m_progress()
 {
     // nothing to do here
 }
@@ -79,8 +79,8 @@ BaseImporter::~BaseImporter()
 // Imports the given file and returns the imported data.
 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
     SetupProperties( pImp );
@@ -98,8 +98,8 @@ aiScene* BaseImporter::ReadFile(const Importer* pImp, const std::string& pFile,
 
     } catch( const std::exception& err )    {
         // extract error description
-        mErrorText = err.what();
-        DefaultLogger::get()->error(mErrorText);
+        m_ErrorText = err.what();
+        DefaultLogger::get()->error(m_ErrorText);
         return NULL;
     }
 
diff --git a/code/BaseImporter.h b/code/BaseImporter.h
index 2234d7116..e8ed7460d 100644
--- a/code/BaseImporter.h
+++ b/code/BaseImporter.h
@@ -181,7 +181,7 @@ public:
      * string if there was no error.
      */
     const std::string& GetErrorText() const {
-        return mErrorText;
+        return m_ErrorText;
     }
 
     // -------------------------------------------------------------------
@@ -362,10 +362,10 @@ public: // static utilities
 protected:
 
     /** Error description in case there was one. */
-    std::string mErrorText;
+    std::string m_ErrorText;
 
     /** Currently set progress handler */
-    ProgressHandler* progress;
+    ProgressHandler* m_progress;
 };