[dasher: 150/217] Minor cleanup in AlphIO.



commit a3c8132f45af5b5cdba5108be203eef87902f21a
Author: Ada Majorek <amajorek google com>
Date:   Mon Dec 21 11:40:49 2015 -0800

    Minor cleanup in AlphIO.

 Src/DasherCore/Alphabet/AlphIO.cpp |    5 +----
 Src/DasherCore/Alphabet/AlphIO.h   |    5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/Src/DasherCore/Alphabet/AlphIO.cpp b/Src/DasherCore/Alphabet/AlphIO.cpp
index a2caebb..9c17b81 100644
--- a/Src/DasherCore/Alphabet/AlphIO.cpp
+++ b/Src/DasherCore/Alphabet/AlphIO.cpp
@@ -66,10 +66,7 @@ CAlphIO::CAlphIO(CMessageDisplay *pMsgs) : AbstractXMLParser(pMsgs) {
 void CAlphIO::GetAlphabets(std::vector <std::string >*AlphabetList) const {
   AlphabetList->clear();
 
-  typedef std::map < std::string, const CAlphInfo* >::const_iterator CI;
-  CI End = Alphabets.end();
-
-  for(CI Cur = Alphabets.begin(); Cur != End; Cur++)
+  for(auto Cur = Alphabets.begin(); Cur != Alphabets.end(); Cur++)
     AlphabetList->push_back(Cur->second->AlphID);
 }
 
diff --git a/Src/DasherCore/Alphabet/AlphIO.h b/Src/DasherCore/Alphabet/AlphIO.h
index 2e305b3..929cd33 100644
--- a/Src/DasherCore/Alphabet/AlphIO.h
+++ b/Src/DasherCore/Alphabet/AlphIO.h
@@ -62,12 +62,9 @@ public:
 private:
   CAlphInfo::character *SpaceCharacter, *ParagraphCharacter;
   std::vector<SGroupInfo *> m_vGroups;
-  std::map < std::string, const CAlphInfo* > Alphabets; // map short names (file names) to descriptions. We 
own all the values but it's easier this way...
-
+  std::map < std::string, const CAlphInfo* > Alphabets; // map AlphabetID to AlphabetInfo. 
   CAlphInfo *CreateDefault();         // Give the user an English alphabet rather than nothing if anything 
goes horribly wrong.
 
-  void DeleteAlphabet(CAlphInfo *Alphabet);
-
   // XML handling:
   /////////////////////////
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]