From 45acb83d3219d1162f7ea81c7eb60288ecabb747 Mon Sep 17 00:00:00 2001
From: Kristian Flikka <kristian.flikka@gmail.com>
Date: Thu, 14 Mar 2013 16:05:35 +0100
Subject: [PATCH] Refactoring casing and naming

---
 eclipse/src/EclipseDeck.cpp       | 12 ++++++------
 eclipse/src/EclipseDeck.hpp       | 10 +++++-----
 eclipse/src/Parser.cpp            | 24 ++++++++++++------------
 eclipse/src/Parser.hpp            |  9 +++++----
 eclipse/src/tests/ParserTests.cpp | 12 ++++++------
 5 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/eclipse/src/EclipseDeck.cpp b/eclipse/src/EclipseDeck.cpp
index f0280cbc0..8661f88a8 100644
--- a/eclipse/src/EclipseDeck.cpp
+++ b/eclipse/src/EclipseDeck.cpp
@@ -10,16 +10,16 @@
 EclipseDeck::EclipseDeck() {
 }
 
-int EclipseDeck::GetNumberOfKeywords() {
-    return keywords.size();
+int EclipseDeck::getNumberOfKeywords() {
+    return m_keywords.size();
 }
 
-const std::vector<std::string> EclipseDeck::GetKeywords() {
-    return keywords;
+const std::vector<std::string> EclipseDeck::getKeywords() {
+    return m_keywords;
 }
 
-void EclipseDeck::AddKeyword(const std::string &keyword) {
-    keywords.push_back(keyword);
+void EclipseDeck::addKeyword(const std::string &keyword) {
+    m_keywords.push_back(keyword);
 }
 
 EclipseDeck::~EclipseDeck() {
diff --git a/eclipse/src/EclipseDeck.hpp b/eclipse/src/EclipseDeck.hpp
index 6b4fe0e47..07ca73a32 100644
--- a/eclipse/src/EclipseDeck.hpp
+++ b/eclipse/src/EclipseDeck.hpp
@@ -13,13 +13,13 @@
 class EclipseDeck {
 public:
     EclipseDeck();
-    int GetNumberOfKeywords();
-    const std::vector<std::string> GetKeywords();
-    void AddKeyword(const std::string &keyword);
+    int getNumberOfKeywords();
+    const std::vector<std::string> getKeywords();
+    void addKeyword(const std::string &keyword);
     virtual ~EclipseDeck();
 private:
-    int numberOfKeywords;
-    std::vector<std::string> keywords; 
+    int m_numberOfKeywords;
+    std::vector<std::string> m_keywords; 
 };
 
 #endif	/* ECLIPSEDECK_H */
diff --git a/eclipse/src/Parser.cpp b/eclipse/src/Parser.cpp
index 318870d47..8b661a464 100644
--- a/eclipse/src/Parser.cpp
+++ b/eclipse/src/Parser.cpp
@@ -15,39 +15,39 @@ Parser::Parser() {
 }
 
 Parser::Parser(const std::string &path) {
-    dataFilePath = path;
+    m_dataFilePath = path;
 }
 
-EclipseDeck Parser::Parse() {
+EclipseDeck Parser::parse() {
     EclipseDeck deck;
-
-    log.append("Initializing inputstream from file: " + dataFilePath + "\n");
+    m_log.append("Initializing inputstream from file: " + m_dataFilePath + "\n");
 
     ifstream inputstream;
-    inputstream.open(dataFilePath.c_str());
+    inputstream.open(m_dataFilePath.c_str());
 
     if (!inputstream.is_open()) {
-        log.append("ERROR: unable to open file");
+        m_log.append("ERROR: unable to open file");
         return deck;
     }
+    
     std::string line;
-
     while (!inputstream.eof()) {
         std::getline(inputstream, line);
         if (line.substr(0, 2) != "--") {
-            deck.AddKeyword(line);
+            deck.addKeyword(line);
         }
-        log.append("Linje: " + line + "\n");
+        m_log.append("Line: " + line + "\n");
     }
 
     inputstream.close();
+    return deck;
+}
 
+void Parser::writeLogToFile() {
     std::ofstream logfile;
     logfile.open("log.txt");
-    logfile << log;
+    logfile << m_log;
     logfile.close();
-
-    return deck;
 }
 
 Parser::~Parser() {
diff --git a/eclipse/src/Parser.hpp b/eclipse/src/Parser.hpp
index 3f588a88e..4ce72cd9f 100644
--- a/eclipse/src/Parser.hpp
+++ b/eclipse/src/Parser.hpp
@@ -14,13 +14,14 @@ class Parser {
 public:
     Parser();
     Parser(const std::string &path);
-    EclipseDeck Parse();
-    std::string GetLog();
+    EclipseDeck parse();
+    std::string getLog();
     virtual ~Parser();
 private:
     //EclipseDeck deck;
-    std::string dataFilePath;
-    std::string log;
+    std::string m_dataFilePath;
+    std::string m_log;
+    void writeLogToFile();
 };
 
 #endif	/* PARSER_H */
diff --git a/eclipse/src/tests/ParserTests.cpp b/eclipse/src/tests/ParserTests.cpp
index 8e24fb288..a7d998517 100644
--- a/eclipse/src/tests/ParserTests.cpp
+++ b/eclipse/src/tests/ParserTests.cpp
@@ -16,9 +16,9 @@ TEST(ParserTest, Initializing) {
 
 TEST(ParserTest, ParseEmptyFileKeywordVectorEmpty) {
     Parser * parser = new Parser();
-    EclipseDeck deck = parser->Parse();
-    ASSERT_EQ(0, deck.GetNumberOfKeywords());
-    ASSERT_EQ((unsigned int)0, deck.GetKeywords().size());
+    EclipseDeck deck = parser->parse();
+    ASSERT_EQ(0, deck.getNumberOfKeywords());
+    ASSERT_EQ((unsigned int)0, deck.getKeywords().size());
     delete parser;
 }
 
@@ -26,10 +26,10 @@ TEST(ParserTest, ParseFileWithOneKeyword) {
     boost::filesystem::path singleKeywordFile("testdata/single.data");
 
     Parser * parser = new Parser(singleKeywordFile.string());
-    EclipseDeck deck = parser->Parse();
+    EclipseDeck deck = parser->parse();
 
-    ASSERT_EQ(1, deck.GetNumberOfKeywords());
-    ASSERT_EQ((unsigned int)1, deck.GetKeywords().size());
+    ASSERT_EQ(1, deck.getNumberOfKeywords());
+    ASSERT_EQ((unsigned int)1, deck.getKeywords().size());
 
     delete parser;
 }