Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.3, 2.0.4, and 2.0.5

stable cmenu: rename CShellExtCMenu::MenuIdMap to myMenuIdMap

Changeset f2902ab382a1…

Parent 06cd980eee1f…

by Adrian Buehlmann

Changes to 2 files · Browse files at f2902ab382a1 Showing diff from parent 06cd980eee1f Diff from another changeset...

Change 1 of 4 Show Entire File win32/​shellext/​CShellExtCMenu.cpp Stacked
 
125
126
127
128
 
129
130
131
 
192
193
194
195
 
196
197
198
 
569
570
571
572
573
 
 
574
575
576
 
622
623
624
625
626
 
 
627
628
629
 
125
126
127
 
128
129
130
131
 
192
193
194
 
195
196
197
198
 
569
570
571
 
 
572
573
574
575
576
 
622
623
624
 
 
625
626
627
628
629
@@ -125,7 +125,7 @@
 void CShellExtCMenu::AddMenuList(UINT idCmd, const std::string& name)  {   TDEBUG_TRACE("AddMenuList: idCmd = " << idCmd << " name = " << name); - MenuIdMap[idCmd] = myDescMap[name]; + myMenuIdMap[idCmd] = myDescMap[name];  }     @@ -192,7 +192,7 @@
    }   - MenuIdMap.clear(); + myMenuIdMap.clear();  }     @@ -569,8 +569,8 @@
  {   UINT idCmd = LOWORD(lpcmi->lpVerb);   TDEBUG_TRACE("CShellExtCMenu::InvokeCommand: idCmd = " << idCmd); - MenuIdCmdMap::iterator iter = MenuIdMap.find(idCmd); - if (iter != MenuIdMap.end()) + MenuIdCmdMap::iterator iter = myMenuIdMap.find(idCmd); + if (iter != myMenuIdMap.end())   {   RunDialog(iter->second.name);   hr = S_OK; @@ -622,8 +622,8 @@
  << ", cchMax = " << cchMax   );   - MenuIdCmdMap::iterator iter = MenuIdMap.find(static_cast<UINT>(idCmd)); - if (iter == MenuIdMap.end()) + MenuIdCmdMap::iterator iter = myMenuIdMap.find(static_cast<UINT>(idCmd)); + if (iter == myMenuIdMap.end())   {   TDEBUG_TRACE("***** CShellExtCMenu::GetCommandString: idCmd not found");   }
Change 1 of 1 Show Entire File win32/​shellext/​CShellExtCMenu.h Stacked
 
27
28
29
30
 
31
32
33
 
27
28
29
 
30
31
32
33
@@ -27,7 +27,7 @@
  std::vector<std::string> myFiles;   std::string myFolder;   MenuDescriptionMap myDescMap; - MenuIdCmdMap MenuIdMap; + MenuIdCmdMap myMenuIdMap;     virtual void RunDialog(const std::string&);