GNOME.org
 

[dasher: 19/43] Lots of little tidies

commit 894300b3fe7900d687ae1ec32e4c05b706fe340e
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date:   Mon Jun 13 18:26:05 2011 +0100

    Lots of little tidies
    
    Rewrite CAlphIO::GetInfo to work on const; pass around const CAlphIO*.
    ControlManager: use GetActiveInputMethod rather than SP_INPUT_FILTER
    GC declaration of CDasherInterfaceBase::SetContext (definition already removed)
    AlphabetManager makes own AlphabetMap, rather than making in NCManager
    Rm DashIntf::GetInfo, add GetActiveAlphabet & pass AlphIO to MandarinAlphMgr
    iPhone project file update to include ConvertingAlphMgr.{h,cpp}

 Src/DasherCore/Alphabet/AlphIO.cpp           |   14 +++++---------
 Src/DasherCore/Alphabet/AlphIO.h             |    2 +-
 Src/DasherCore/AlphabetManager.cpp           |    6 +++---
 Src/DasherCore/AlphabetManager.h             |    3 +--
 Src/DasherCore/ControlManager.cpp            |    2 +-
 Src/DasherCore/ConvertingAlphMgr.cpp         |    4 ++--
 Src/DasherCore/ConvertingAlphMgr.h           |    2 +-
 Src/DasherCore/DasherInterfaceBase.cpp       |    8 ++++----
 Src/DasherCore/DasherInterfaceBase.h         |   17 +----------------
 Src/DasherCore/MandarinAlphMgr.cpp           |    6 +++---
 Src/DasherCore/MandarinAlphMgr.h             |    2 +-
 Src/DasherCore/NodeCreationManager.cpp       |    7 +++----
 Src/DasherCore/NodeCreationManager.h         |    2 +-
 Src/MacOSX/COSXDasherControl.mm              |    2 +-
 Src/iPhone/Classes/CDasherInterfaceBridge.mm |    2 +-
 Src/iPhone/Dasher.xcodeproj/project.pbxproj  |    6 ++++++
 16 files changed, 35 insertions(+), 50 deletions(-)
---
diff --git a/Src/DasherCore/Alphabet/AlphIO.cpp b/Src/DasherCore/Alphabet/AlphIO.cpp
index 5339bd3..d854552 100644
--- a/Src/DasherCore/Alphabet/AlphIO.cpp
+++ b/Src/DasherCore/Alphabet/AlphIO.cpp
@@ -104,15 +104,11 @@ std::string CAlphIO::GetDefault() {
   }
 }
 
-const CAlphInfo *CAlphIO::GetInfo(const std::string &AlphID) {
-  if(Alphabets.count(AlphID)!=0) {
-    // if we have the alphabet they ask for, return it
-    return Alphabets[AlphID];
-  }
-  else {
-    // otherwise, give them default - it's better than nothing
-    return Alphabets["Default"];
-  }
+const CAlphInfo *CAlphIO::GetInfo(const std::string &AlphID) const {
+  map<string, const CAlphInfo*>::const_iterator it = Alphabets.find(AlphID);
+  if (it == Alphabets.end()) //if we don't have the alphabet they ask for,
+    it = Alphabets.find("Default"); //give them default - it's better than nothing
+  return it->second;
 }
 
 CAlphInfo *CAlphIO::CreateDefault() {
diff --git a/Src/DasherCore/Alphabet/AlphIO.h b/Src/DasherCore/Alphabet/AlphIO.h
index cd47489..7d969fc 100644
--- a/Src/DasherCore/Alphabet/AlphIO.h
+++ b/Src/DasherCore/Alphabet/AlphIO.h
@@ -54,7 +54,7 @@ public:
   ~CAlphIO();
   void GetAlphabets(std::vector < std::string > *AlphabetList) const;
   std::string GetDefault();
-  const CAlphInfo *GetInfo(const std::string & AlphID);
+  const CAlphInfo *GetInfo(const std::string & AlphID) const;
 private:
   CAlphInfo::character *SpaceCharacter, *ParagraphCharacter;
   std::vector<SGroupInfo *> m_vGroups;
diff --git a/Src/DasherCore/AlphabetManager.cpp b/Src/DasherCore/AlphabetManager.cpp
index 4992cc5..1a21635 100644
--- a/Src/DasherCore/AlphabetManager.cpp
+++ b/Src/DasherCore/AlphabetManager.cpp
@@ -50,12 +50,12 @@ static char THIS_FILE[] = __FILE__;
 #endif
 #endif
 
-CAlphabetManager::CAlphabetManager(CDasherInterfaceBase *pInterface, CNodeCreationManager *pNCManager, const CAlphInfo *pAlphabet, const CAlphabetMap *pAlphabetMap)
-  : m_pFirstGroup(NULL), m_pNCManager(pNCManager), m_pAlphabet(pAlphabet), m_pAlphabetMap(pAlphabetMap), m_pInterface(pInterface) {
+CAlphabetManager::CAlphabetManager(CDasherInterfaceBase *pInterface, CNodeCreationManager *pNCManager, const CAlphInfo *pAlphabet)
+  : m_pFirstGroup(NULL), m_pNCManager(pNCManager), m_pAlphabet(pAlphabet), m_pAlphabetMap(pAlphabet->MakeMap()), m_pInterface(pInterface) {
   //Look for a (single-octet) character not in the alphabet...
   for (char c=33; (c&0x80)==0; c++) {
     string s(&c,1);
-    if (pAlphabetMap->Get(s)==0) {
+    if (m_pAlphabetMap->Get(s)==0) {
       m_sDelim = s;
       break;
     }
diff --git a/Src/DasherCore/AlphabetManager.h b/Src/DasherCore/AlphabetManager.h
index 50d5f9a..528d183 100644
--- a/Src/DasherCore/AlphabetManager.h
+++ b/Src/DasherCore/AlphabetManager.h
@@ -47,8 +47,7 @@ namespace Dasher {
   class CAlphabetManager : public CNodeManager {
   public:
     ///Create a new AlphabetManager. Note, not usable until CreateLanguageModel() called.
-    CAlphabetManager(CDasherInterfaceBase *pInterface, CNodeCreationManager *pNCManager, const CAlphInfo *pAlphabet, const CAlphabetMap *pAlphabetMap);
-    
+    CAlphabetManager(CDasherInterfaceBase *pInterface, CNodeCreationManager *pNCManager, const CAlphInfo *pAlphabet);
     ///Creates the LM, and stores in m_pLanguageModel. Must be called after construction,
     /// before the AlphMgr is used. Default implementation switches on LP_LANGUAGE_MODEL_ID.
     virtual void CreateLanguageModel(CEventHandler *pEventHandler, CSettingsStore *pSets);
diff --git a/Src/DasherCore/ControlManager.cpp b/Src/DasherCore/ControlManager.cpp
index 74b8b25..1b2d7b9 100644
--- a/Src/DasherCore/ControlManager.cpp
+++ b/Src/DasherCore/ControlManager.cpp
@@ -407,7 +407,7 @@ void CControlManager::updateActions() {
 
   //filter is pauseable, and either 'stop' would do something (so pause is different),
   // or we're told to have a stop node but it would be indistinguishable from pause (=>have pause)
-  CInputFilter *pInput(static_cast<CInputFilter *>(m_pInterface->GetModuleByName(m_pInterface->GetStringParameter(SP_INPUT_FILTER))));
+  CInputFilter *pInput(m_pInterface->GetActiveInputMethod());
   if (pInput->supportsPause() && (m_pInterface->hasStopTriggers() || m_pInterface->GetBoolParameter(BP_CONTROL_MODE_HAS_HALT)))
     vRootSuccessors.push_back(m_pPause);
   if (it!=vOldRootSuccessors.end() && *it == m_pPause) it++;
diff --git a/Src/DasherCore/ConvertingAlphMgr.cpp b/Src/DasherCore/ConvertingAlphMgr.cpp
index 487fada..42c95d5 100644
--- a/Src/DasherCore/ConvertingAlphMgr.cpp
+++ b/Src/DasherCore/ConvertingAlphMgr.cpp
@@ -12,8 +12,8 @@
 
 using namespace Dasher;
 
-CConvertingAlphMgr::CConvertingAlphMgr(CDasherInterfaceBase *pInterface, CNodeCreationManager *pNCManager, CConversionManager *pConvMgr, const CAlphInfo *pAlphabet, const CAlphabetMap *pAlphabetMap)
- : CAlphabetManager(pInterface, pNCManager, pAlphabet, pAlphabetMap), m_pConvMgr(pConvMgr) {
+CConvertingAlphMgr::CConvertingAlphMgr(CDasherInterfaceBase *pInterface, CNodeCreationManager *pNCManager, CConversionManager *pConvMgr, const CAlphInfo *pAlphabet)
+ : CAlphabetManager(pInterface, pNCManager, pAlphabet), m_pConvMgr(pConvMgr) {
  }
 
 void CConvertingAlphMgr::MakeLabels(CDasherScreen *pScreen) {
diff --git a/Src/DasherCore/ConvertingAlphMgr.h b/Src/DasherCore/ConvertingAlphMgr.h
index 59dafc5..a30dcd9 100644
--- a/Src/DasherCore/ConvertingAlphMgr.h
+++ b/Src/DasherCore/ConvertingAlphMgr.h
@@ -22,7 +22,7 @@ namespace Dasher {
   //TODO do we also need to override GetProbs? Existing impl will add uniformity onto the conversion root too.
   class CConvertingAlphMgr : public CAlphabetManager {
   public:
-    CConvertingAlphMgr(CDasherInterfaceBase *pInterface, CNodeCreationManager *pNCManager, CConversionManager *pConvMgr, const CAlphInfo *pAlphabet, const CAlphabetMap *pAlphabetMap);
+    CConvertingAlphMgr(CDasherInterfaceBase *pInterface, CNodeCreationManager *pNCManager, CConversionManager *pConvMgr, const CAlphInfo *pAlphabet);
     ///Override to also tell the ConversionManager that the screen has changed.
     void MakeLabels(CDasherScreen *pScreen);
     virtual ~CConvertingAlphMgr();
diff --git a/Src/DasherCore/DasherInterfaceBase.cpp b/Src/DasherCore/DasherInterfaceBase.cpp
index d8f045e..02a4043 100644
--- a/Src/DasherCore/DasherInterfaceBase.cpp
+++ b/Src/DasherCore/DasherInterfaceBase.cpp
@@ -694,10 +694,6 @@ void CDasherInterfaceBase::ChangeView() {
   }
 }
 
-const CAlphInfo *CDasherInterfaceBase::GetInfo(const std::string &AlphID) {
-  return m_AlphIO->GetInfo(AlphID);
-}
-
 double CDasherInterfaceBase::GetCurCPM() {
   //
   return 0;
@@ -708,6 +704,10 @@ double CDasherInterfaceBase::GetCurFPS() {
   return 0;
 }
 
+const CAlphInfo *CDasherInterfaceBase::GetActiveAlphabet() {
+  return m_AlphIO->GetInfo(GetStringParameter(SP_ALPHABET_ID));
+}
+
 // int CDasherInterfaceBase::GetAutoOffset() {
 //   if(m_pDasherView != 0) {
 //     return m_pDasherView->GetAutoOffset();
diff --git a/Src/DasherCore/DasherInterfaceBase.h b/Src/DasherCore/DasherInterfaceBase.h
index f88c289..f5674c6 100644
--- a/Src/DasherCore/DasherInterfaceBase.h
+++ b/Src/DasherCore/DasherInterfaceBase.h
@@ -92,8 +92,6 @@ public:
     return m_pSettingsStore;
   }
 
-  const CAlphInfo *GetInfo(const std::string & AlphID);
-
   CUserLogBase* GetUserLogPtr();
 
   // @}
@@ -315,20 +313,6 @@ public:
   /// \param iOffset Document me
   //  int TrainFile(std::string Filename, int iTotalBytes, int iOffset);
 
-  /// Part of the mechanism by which the DasherCore part gets the surrounding
-  /// (preceding) characters from its context (i.e. the text edit box): an
-  /// EV_EDIT_CONTEXT_REQUEST event specifying the context required (i.e.
-  /// offset and length) is broadcast from the core, and picked up
-  /// by platform-dependent code, which must then call SetContext with the
-  /// requested text. TODO this is a ghastly mechanism: the
-  /// EditContextRequest event goes to every component, and any number (>=0)
-  /// of components (anywhere!) could call SetContext (at any time!), rather
-  /// than just exactly one, _only_ in response to such an event...suggest
-  /// sthg like "virtual std::string getContext(int off, int len)=0;" ???
-  /// \param strNewContext The requested part of the context (UTF-8)
-
-  void SetContext(std::string strNewContext);
-
   /// New control mechanisms:
 
   ///Equivalent to SetOffset(iOffset, true)
@@ -402,6 +386,7 @@ public:
   CDasherModule *GetModuleByName(const std::string &strName);
   CDasherInput *GetActiveInputDevice() {return m_pInput;}
   CInputFilter *GetActiveInputMethod() {return m_pInputFilter;}
+  const CAlphInfo *GetActiveAlphabet();
   void SetDefaultInputDevice(CDasherInput *);
   void SetDefaultInputMethod(CInputFilter *);
 
diff --git a/Src/DasherCore/MandarinAlphMgr.cpp b/Src/DasherCore/MandarinAlphMgr.cpp
index 0539d8b..e053bbf 100644
--- a/Src/DasherCore/MandarinAlphMgr.cpp
+++ b/Src/DasherCore/MandarinAlphMgr.cpp
@@ -46,13 +46,13 @@ static char THIS_FILE[] = __FILE__;
 #endif
 #endif
 
-CMandarinAlphMgr::CMandarinAlphMgr(CDasherInterfaceBase *pInterface, CNodeCreationManager *pNCManager, const CAlphInfo *pAlphabet, const CAlphabetMap *pAlphMap)
-  : CAlphabetManager(pInterface, pNCManager, pAlphabet, pAlphMap),
+CMandarinAlphMgr::CMandarinAlphMgr(CDasherInterfaceBase *pInterface, CNodeCreationManager *pNCManager, const CAlphInfo *pAlphabet, const CAlphIO *pAlphIO)
+  : CAlphabetManager(pInterface, pNCManager, pAlphabet),
     m_pConversionsBySymbol(new set<symbol>[GetAlphabet()->GetNumberTextSymbols()+1]) {
   DASHER_ASSERT(pAlphabet->m_iConversionID==2);
       
   //the CHAlphabet contains a group for each SPY syllable+tone, with symbols being chinese characters.      
-  const CAlphInfo *pCHAlphabet = pInterface->GetInfo(pAlphabet->m_strConversionTarget);
+  const CAlphInfo *pCHAlphabet = pAlphIO->GetInfo(pAlphabet->m_strConversionTarget);
       
   //Build a map from SPY group label, to set of chinese chars (represented as start & end of group in pCHAlphabet)
   map<string,pair<symbol,symbol> > conversions;
diff --git a/Src/DasherCore/MandarinAlphMgr.h b/Src/DasherCore/MandarinAlphMgr.h
index 5602743..28dff2a 100644
--- a/Src/DasherCore/MandarinAlphMgr.h
+++ b/Src/DasherCore/MandarinAlphMgr.h
@@ -66,7 +66,7 @@ namespace Dasher {
     /// together (i.e. by hashing on text). Hence, it is not possible to call makeMap() on
     /// the CHAlphabet (this requires the text attributes to be all different), so we rehash here.
     /// \param pAlphabetMap mapping from text to symbol# of the PY alphabet; used for training files.
-    CMandarinAlphMgr(CDasherInterfaceBase *pInterface, CNodeCreationManager *pNCManager, const CAlphInfo *pAlphabet, const CAlphabetMap *pAlphMap);
+    CMandarinAlphMgr(CDasherInterfaceBase *pInterface, CNodeCreationManager *pNCManager, const CAlphInfo *pAlphabet, const CAlphIO *pAlphIO);
     ~CMandarinAlphMgr();
     
     ///WZ: Mandarin Dasher Change. Sets language model to PPMPY.
diff --git a/Src/DasherCore/NodeCreationManager.cpp b/Src/DasherCore/NodeCreationManager.cpp
index 838ec4d..d0b50f5 100644
--- a/Src/DasherCore/NodeCreationManager.cpp
+++ b/Src/DasherCore/NodeCreationManager.cpp
@@ -35,11 +35,10 @@ private:
 CNodeCreationManager::CNodeCreationManager(Dasher::CDasherInterfaceBase *pInterface,
                                            Dasher::CEventHandler *pEventHandler, 
                                            CSettingsStore *pSettingsStore,
-                                           Dasher::CAlphIO *pAlphIO) : CDasherComponent(pEventHandler, pSettingsStore),
+                                           const Dasher::CAlphIO *pAlphIO) : CDasherComponent(pEventHandler, pSettingsStore),
   m_pInterface(pInterface), m_pControlManager(NULL), m_pScreen(NULL) {
 
   const Dasher::CAlphInfo *pAlphInfo(pAlphIO->GetInfo(pSettingsStore->GetStringParameter(SP_ALPHABET_ID)));
-  const CAlphabetMap *pAlphMap = pAlphInfo->MakeMap();
   
   pSettingsStore->SetStringParameter(SP_GAME_TEXT_FILE, pAlphInfo->GetGameModeFile());
   
@@ -52,7 +51,7 @@ CNodeCreationManager::CNodeCreationManager(Dasher::CDasherInterfaceBase *pInterf
       //TODO: Error reporting here
       //fall through to
     case 0: // No conversion required
-      m_pAlphabetManager = new CAlphabetManager(pInterface, this, pAlphInfo, pAlphMap);
+      m_pAlphabetManager = new CAlphabetManager(pInterface, this, pAlphInfo);
       break;      
 #ifdef JAPANESE
     case 1: {
@@ -71,7 +70,7 @@ CNodeCreationManager::CNodeCreationManager(Dasher::CDasherInterfaceBase *pInterf
     case 2:
       //Mandarin Dasher!
       //(ACL) Modify AlphabetManager for Mandarin Dasher
-      m_pAlphabetManager = new CMandarinAlphMgr(pInterface, this, pAlphInfo, pAlphMap);
+      m_pAlphabetManager = new CMandarinAlphMgr(pInterface, this, pAlphInfo, pAlphIO);
       break;
   }
   //all other configuration changes, etc., that might be necessary for a particular conversion mode,
diff --git a/Src/DasherCore/NodeCreationManager.h b/Src/DasherCore/NodeCreationManager.h
index b2ed99e..ed47cce 100644
--- a/Src/DasherCore/NodeCreationManager.h
+++ b/Src/DasherCore/NodeCreationManager.h
@@ -28,7 +28,7 @@ class CNodeCreationManager : public Dasher::CDasherComponent {
   CNodeCreationManager(Dasher::CDasherInterfaceBase *pInterface,
                        Dasher::CEventHandler * pEventHandler,
                        CSettingsStore * pSettingsStore,
-                       Dasher::CAlphIO *pAlphIO);
+                       const Dasher::CAlphIO *pAlphIO);
   ~CNodeCreationManager();
   
   ///Tells us the screen on which all created node labels must be rendered
diff --git a/Src/MacOSX/COSXDasherControl.mm b/Src/MacOSX/COSXDasherControl.mm
index 01fc71e..e50c849 100644
--- a/Src/MacOSX/COSXDasherControl.mm
+++ b/Src/MacOSX/COSXDasherControl.mm
@@ -213,7 +213,7 @@ unsigned int COSXDasherControl::ctrlDelete(bool bForwards, CControlManager::Edit
     else if (dist==CControlManager::EDIT_FILE)
       iStartOffset=0;
     else {
-      const CAlphInfo *pAlph(GetInfo(GetStringParameter(SP_ALPHABET_ID)));
+      const CAlphInfo *pAlph(GetActiveAlphabet());
       const string &target(pAlph->GetText(dist==CControlManager::EDIT_WORD ? pAlph->GetSpaceSymbol() : pAlph->GetParagraphSymbol()));
       NSRange range = [[dasherEdit allContext] rangeOfString:NSStringFromStdString(target) options:NSBackwardsSearch];
       iStartOffset = (range.length==0) ? 0 : range.location; //0=> not found, so go to beginning
diff --git a/Src/iPhone/Classes/CDasherInterfaceBridge.mm b/Src/iPhone/Classes/CDasherInterfaceBridge.mm
index e44636e..fa399a9 100644
--- a/Src/iPhone/Classes/CDasherInterfaceBridge.mm
+++ b/Src/iPhone/Classes/CDasherInterfaceBridge.mm
@@ -155,7 +155,7 @@ void CDasherInterfaceBridge::ExternalEventHandler(Dasher::CEvent *pEvent) {
 		if (pEvt->m_iParameter == LP_MAX_BITRATE || pEvt->m_iParameter == LP_BOOSTFACTOR)
 			[dasherApp notifySpeedChange];
     else if (pEvt->m_iParameter == SP_ALPHABET_ID)
-      [dasherApp setAlphabet:GetInfo(GetStringParameter(SP_ALPHABET_ID))];
+      [dasherApp setAlphabet:GetActiveAlphabet()];
     }
       break;
     case EV_EDIT:
diff --git a/Src/iPhone/Dasher.xcodeproj/project.pbxproj b/Src/iPhone/Dasher.xcodeproj/project.pbxproj
index 3994cca..53558e8 100755
--- a/Src/iPhone/Dasher.xcodeproj/project.pbxproj
+++ b/Src/iPhone/Dasher.xcodeproj/project.pbxproj
@@ -162,6 +162,7 @@
 		333F707811A8AA66002E2BDF /* us_pos_cart.c in Sources */ = {isa = PBXBuildFile; fileRef = 333F701411A8AA66002E2BDF /* us_pos_cart.c */; };
 		333F707911A8AA66002E2BDF /* us_text.c in Sources */ = {isa = PBXBuildFile; fileRef = 333F701711A8AA66002E2BDF /* us_text.c */; };
 		333F707A11A8AA66002E2BDF /* usenglish.c in Sources */ = {isa = PBXBuildFile; fileRef = 333F701911A8AA66002E2BDF /* usenglish.c */; };
+		333FDB5A139FB413009D018A /* ConvertingAlphMgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 333FDB58139FB413009D018A /* ConvertingAlphMgr.cpp */; };
 		3344FD5D0F716F7900506EAA /* CDasherInterfaceBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3344FD5C0F716F7900506EAA /* CDasherInterfaceBridge.mm */; };
 		3344FE150F71717C00506EAA /* ActionButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3344FD680F71717C00506EAA /* ActionButton.cpp */; };
 		3344FE170F71717C00506EAA /* AlphabetMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3344FD6D0F71717C00506EAA /* AlphabetMap.cpp */; };
@@ -529,6 +530,8 @@
 		333F701811A8AA66002E2BDF /* us_text.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = us_text.h; sourceTree = "<group>"; };
 		333F701911A8AA66002E2BDF /* usenglish.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = usenglish.c; sourceTree = "<group>"; };
 		333F701A11A8AA66002E2BDF /* usenglish.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = usenglish.h; sourceTree = "<group>"; };
+		333FDB58139FB413009D018A /* ConvertingAlphMgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConvertingAlphMgr.cpp; sourceTree = "<group>"; };
+		333FDB59139FB413009D018A /* ConvertingAlphMgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConvertingAlphMgr.h; sourceTree = "<group>"; };
 		3344FD5B0F716F7900506EAA /* CDasherInterfaceBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDasherInterfaceBridge.h; sourceTree = "<group>"; };
 		3344FD5C0F716F7900506EAA /* CDasherInterfaceBridge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CDasherInterfaceBridge.mm; sourceTree = "<group>"; };
 		3344FD680F71717C00506EAA /* ActionButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ActionButton.cpp; sourceTree = "<group>"; };
@@ -1181,6 +1184,8 @@
 				3344FD870F71717C00506EAA /* ConversionHelper.h */,
 				3344FD880F71717C00506EAA /* ConversionManager.cpp */,
 				3344FD890F71717C00506EAA /* ConversionManager.h */,
+				333FDB58139FB413009D018A /* ConvertingAlphMgr.cpp */,
+				333FDB59139FB413009D018A /* ConvertingAlphMgr.h */,
 				3344FD8C0F71717C00506EAA /* CustomColours.cpp */,
 				3344FD8D0F71717C00506EAA /* CustomColours.h */,
 				3344FD8E0F71717C00506EAA /* DasherButtons.cpp */,
@@ -1707,6 +1712,7 @@
 				3324F491129C119C00EE6A22 /* IPhoneFilters.mm in Sources */,
 				3324F7BF129D744D00EE6A22 /* ActionConfigurator.mm in Sources */,
 				3378A23F1335425300A96C5D /* AbstractXMLParser.cpp in Sources */,
+				333FDB5A139FB413009D018A /* ConvertingAlphMgr.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]