Skip to content

Commit 0eb8c5b

Browse files
itagagakiitagagaki
committed
rename and refactor
1 parent b9e4871 commit 0eb8c5b

File tree

6 files changed

+63
-88
lines changed

6 files changed

+63
-88
lines changed

‎Charu3.cpp

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,6 @@ void CCharu3App::adjustLocation(POINT* pos)
434434
void CCharu3App::closeTreeWindow(int nRet)
435435
{
436436
m_pTreeDlg->ShowWindow(SW_HIDE);
437-
STRING_DATA data;
438437
bool isPaste = true;
439438
if (::GetAsyncKeyState(VK_SHIFT) < 0) isPaste = false;
440439

@@ -458,7 +457,7 @@ void CCharu3App::closeTreeWindow(int nRet)
458457
}
459458

460459
//貼り付け処理
461-
if (m_pTree->m_ltCheckItems.size() > 0) {//複数選択データがある
460+
if (m_pTree->m_ltCheckItems.size() > 0) { //複数選択データがある
462461
strSelect = GetSelectedText(m_keySet, m_focusInfo.m_hFocusWnd); // TODO: Doing unconditional copy action. Does not consider the necessity.
463462

464463
if (m_ini.m_bDebug) {
@@ -468,12 +467,12 @@ void CCharu3App::closeTreeWindow(int nRet)
468467
std::list<HTREEITEM>::iterator it;
469468
for (it = m_pTree->m_ltCheckItems.begin(); it != m_pTree->m_ltCheckItems.end(); it++) {
470469
if (m_pTree->GetItemState(*it, TVIF_HANDLE)) {
471-
data = m_pTree->getData(*it);
472-
if (data.m_cKind & KIND_DATA_ALL) {
470+
const STRING_DATA* dataPtr = m_pTree->getDataPtr(*it);
471+
if (dataPtr->m_cKind & KIND_DATA_ALL) {
473472
if (m_ini.m_bDebug) {
474-
LOG(_T("closeTreeWindow check paste %s"), data.m_strTitle.GetString());
473+
LOG(_T("closeTreeWindow check paste %s"), dataPtr->m_strTitle.GetString());
475474
}
476-
playData(data, strClip, strSelect, isPaste, false);
475+
playData(dataPtr, strClip, strSelect, isPaste, false);
477476
}
478477
}
479478
}
@@ -488,15 +487,17 @@ void CCharu3App::closeTreeWindow(int nRet)
488487
}
489488
}
490489
}
491-
else if (m_pTreeDlg->m_selectDataPtr != nullptr) {//通常選択データ
492-
bool requiresSelectionText = (m_pTreeDlg->m_selectDataPtr->m_strData.Find(_T("$SEL")) != -1); // TODO: This test is true even if $SEL is outside <charu3MACRO>
493-
strSelect = requiresSelectionText ? GetSelectedText(m_keySet, m_focusInfo.m_hFocusWnd) : "";
494-
data = *(m_pTreeDlg->m_selectDataPtr);
490+
else {
491+
const STRING_DATA* dataPtr = m_pTreeDlg->GetSelectedDataPtr();
492+
if (nullptr != dataPtr) {
493+
bool requiresSelectionText = (dataPtr->m_strData.Find(_T("$SEL")) != -1); // TODO: This test is true even if $SEL is outside <charu3MACRO>
494+
strSelect = requiresSelectionText ? GetSelectedText(m_keySet, m_focusInfo.m_hFocusWnd) : "";
495495

496-
if (m_ini.m_bDebug) {
497-
LOG(_T("closeTreeWindow sel:%s clip:%s title:%s"), strSelect.GetString(), strClip.GetString(), data.m_strTitle.GetString());
496+
if (m_ini.m_bDebug) {
497+
LOG(_T("closeTreeWindow sel:%s clip:%s title:%s"), strSelect.GetString(), strClip.GetString(), dataPtr->m_strTitle.GetString());
498+
}
499+
playData(dataPtr, strClip, strSelect, isPaste);
498500
}
499-
playData(data, strClip, strSelect, isPaste);
500501
}
501502
}
502503
else if (::GetForegroundWindow() == m_focusInfo.m_hActiveWnd) {
@@ -845,7 +846,7 @@ bool CCharu3App::setAppendKeyInit(HWND hTopWindow, COPYPASTE_KEY* keySet)
845846
//関数名 playData(STRING_DATA data,CString strClip)
846847
//機能 データの展開処理をする
847848
//---------------------------------------------------
848-
void CCharu3App::playData(STRING_DATA data, CString strClip, CString strSelect, bool isPaste, bool isChange)
849+
void CCharu3App::playData(const STRING_DATA* dataPtr, CString strClip, CString strSelect, bool isPaste, bool isChange)
849850
{
850851
HTREEITEM hSelectItem = m_pTree->GetSelectedItem();
851852
CString strPaste;
@@ -861,7 +862,7 @@ void CCharu3App::playData(STRING_DATA data, CString strClip, CString strSelect,
861862
STRING_DATA* macroDataPtr = m_pTree->getDataPtr(hMacroItem);
862863
strMacro = m_pTree->getDataOptionStr(macroDataPtr->m_strMacro, _T("macro"));
863864
}
864-
strPaste = convertMacro(&data, strSelect, strClip, strMacro);
865+
strPaste = convertMacro(dataPtr, strSelect, strClip, strMacro);
865866
}
866867

867868
//テキストを貼り付け処理
@@ -1354,15 +1355,15 @@ void CCharu3App::keyUpDownMessage(UINT uMod, UINT uVKCode, int nFlag, HWND hWnd)
13541355
//関数名 convertMacro(CString strSourceData)
13551356
//機能 マクロ文字列を置換
13561357
//---------------------------------------------------
1357-
CString CCharu3App::convertMacro(STRING_DATA* SourceData, CString strSelect, CString strClip, CString strSoftName)
1358+
CString CCharu3App::convertMacro(const STRING_DATA* sourceDataPtr, CString strSelect, CString strClip, CString strSoftName)
13581359
{
13591360
SetCurrentDirectory(m_ini.m_strAppPath);
13601361

1361-
if (strSoftName == _T("no")) return SourceData->m_strData;
1362+
if (strSoftName == _T("no")) return sourceDataPtr->m_strData;
13621363

13631364
CString strSourceData;
13641365
if (strSoftName != DAT_FORMAT) {
1365-
if (m_pTree->convertMacroPlugin(SourceData, &strSourceData, strSelect, strClip, strSoftName))
1366+
if (m_pTree->convertMacroPlugin(sourceDataPtr, &strSourceData, strSelect, strClip, strSoftName))
13661367
return strSourceData;
13671368
}
13681369

@@ -1386,15 +1387,15 @@ CString CCharu3App::convertMacro(STRING_DATA* SourceData, CString strSelect, CSt
13861387
strRepBuff4 = _T(">@c3m$@PLUG-IN");
13871388
strRepBuff5 = _T("@c3m$@CLIP");
13881389

1389-
if (SourceData->m_strData.Find(_T("$SEL")) != -1) {
1390+
if (sourceDataPtr->m_strData.Find(_T("$SEL")) != -1) {
13901391
strSelect.Replace(MACRO_START, strRepBuff1);
13911392
strSelect.Replace(MACRO_END, strRepBuff2);
13921393
strSelect.Replace(strPlugStart, strRepBuff3);
13931394
strSelect.Replace(strPlugEnd, strRepBuff4);
13941395
strSelect.Replace(_T("$CLIP"), strRepBuff5);
13951396
isSelect = true;
13961397
}
1397-
if (SourceData->m_strData.Find(_T("$CLIP")) != -1) {
1398+
if (sourceDataPtr->m_strData.Find(_T("$CLIP")) != -1) {
13981399
strClip.Replace(MACRO_START, strRepBuff1);
13991400
strClip.Replace(MACRO_END, strRepBuff2);
14001401
strClip.Replace(strPlugStart, strRepBuff3);
@@ -1403,7 +1404,7 @@ CString CCharu3App::convertMacro(STRING_DATA* SourceData, CString strSelect, CSt
14031404
}
14041405

14051406
CTime cTime = CTime::GetCurrentTime();
1406-
strSourceData = SourceData->m_strData;
1407+
strSourceData = sourceDataPtr->m_strData;
14071408

14081409
strSourceData.Replace(_T("<charu2MACRO>"), MACRO_START);
14091410
strSourceData.Replace(_T("</charu2MACRO>"), MACRO_END);
@@ -1545,7 +1546,7 @@ CString CCharu3App::convertMacro(STRING_DATA* SourceData, CString strSelect, CSt
15451546
}
15461547
// int nBuffSize = nSize * sizeof(TCHAR);
15471548

1548-
pPlugIn(strTmp.GetBuffer(strTmp.GetLength() + 1), strRet, nSize, SourceData, (void*)&m_focusInfo);
1549+
pPlugIn(strTmp.GetBuffer(strTmp.GetLength() + 1), strRet, nSize, sourceDataPtr, (void*)&m_focusInfo);
15491550
strPluginRet = strRet;
15501551
strPluginRet.Replace(MACRO_START, strRepBuff1);
15511552
strPluginRet.Replace(MACRO_END, strRepBuff2);

‎Charu3.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ enum {
6161
#define PHASE_LOCK 0x08
6262

6363
//プラグイン関数宣言
64-
typedef bool(*CharuPlugIn)(TCHAR*, TCHAR*, int, STRING_DATA*, void*);
64+
typedef bool(*CharuPlugIn)(TCHAR*, TCHAR*, int, const STRING_DATA*, void*);
6565

6666
typedef bool (*setHook)(const HWND hWnd, const int msg);
6767
typedef void (*unHook)(void);
@@ -139,8 +139,8 @@ class CCharu3App : public CWinApp
139139
void execData(CString strPaste, COPYPASTE_KEY key, HTREEITEM hTargetItem, HWND hWnd);
140140
void execKeyMacro(CString strKeyMacro);
141141
void playHotItem(int nTarget);
142-
void playData(STRING_DATA data, CString strClip, CString strSelect, bool isPaste, bool isChange = true);
143-
CString convertMacro(STRING_DATA* SourceData, CString strSelect, CString strClip, CString strSoftName);
142+
void playData(const STRING_DATA* dataPtr, CString strClip, CString strSelect, bool isPaste, bool isChange = true);
143+
CString convertMacro(const STRING_DATA* sourceDataPtr, CString strSelect, CString strClip, CString strSoftName);
144144

145145
CString GetSelectedText(COPYPASTE_KEY key, HWND hWnd = NULL);
146146

‎Charu3Tree.cpp

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -486,18 +486,13 @@ HTREEITEM CCharu3Tree::searchMyRoots(HTREEITEM hStartItem)
486486
//---------------------------------------------------
487487
HTREEITEM CCharu3Tree::searchParentOption(HTREEITEM hStartItem, CString strOption)
488488
{
489-
HTREEITEM hRet = nullptr;
490-
STRING_DATA data;
491-
int nFound;
492-
493489
strOption.MakeLower();
494-
hRet = hStartItem;
490+
HTREEITEM hRet = hStartItem;
495491
while (hRet) {
496492
if (hRet) {
497-
data = getData(hRet);
498-
493+
STRING_DATA data = getData(hRet);
499494
data.m_strMacro.MakeLower();
500-
nFound = data.m_strMacro.Find(strOption);
495+
int nFound = data.m_strMacro.Find(strOption);
501496
if (nFound >= 0) {
502497
nFound = data.m_strMacro.Find(_T("="), nFound);
503498
if (nFound >= 0) {
@@ -517,7 +512,6 @@ HTREEITEM CCharu3Tree::searchParentOption(HTREEITEM hStartItem, CString strOptio
517512
bool CCharu3Tree::saveDataToFile(CString strFileName, CString strPlugin, HTREEITEM hStartItem)
518513
{
519514
std::list<STRING_DATA> tmplist;
520-
STRING_DATA Data;
521515

522516
//全データを出力
523517
if (!hStartItem) {
@@ -527,9 +521,9 @@ bool CCharu3Tree::saveDataToFile(CString strFileName, CString strPlugin, HTREEIT
527521
}
528522
//エクスポートの場合
529523
else {
530-
Data = getData(hStartItem);
531-
Data.m_nParentID = dataTree::ROOT;
532-
tmplist.insert(tmplist.end(), Data);
524+
STRING_DATA data = getData(hStartItem);
525+
data.m_nParentID = dataTree::ROOT;
526+
tmplist.insert(tmplist.end(), data);
533527
if (ItemHasChildren(hStartItem)) tree2List(GetChildItem(hStartItem), &tmplist);
534528
}
535529

@@ -999,7 +993,7 @@ void CCharu3Tree::normalizationID(std::list<STRING_DATA>* pList, int nParentID)
999993
//関数名 convertMacroPlugin(CString strSourceData)
1000994
//機能 マクロ文字列を置換
1001995
//---------------------------------------------------
1002-
bool CCharu3Tree::convertMacroPlugin(STRING_DATA* SourceData, CString* strRet, CString strSelect, CString strClip, CString strSoftName)
996+
bool CCharu3Tree::convertMacroPlugin(const STRING_DATA* sourceDataPtr, CString* strRet, CString strSelect, CString strClip, CString strSoftName)
1003997
{
1004998
RW_PLUGIN plugin;
1005999
TCHAR* szRet;
@@ -1023,10 +1017,10 @@ bool CCharu3Tree::convertMacroPlugin(STRING_DATA* SourceData, CString* strRet, C
10231017
pConvertMacro = (convertMacro)GetProcAddress(hDLL, "convertMacro");
10241018

10251019
if (pConvertMacro) {
1026-
int nSize = SourceData->m_strData.GetLength() * 10 + 10240;
1020+
int nSize = sourceDataPtr->m_strData.GetLength() * 10 + 10240;
10271021
szRet = new TCHAR[nSize];
10281022
if (szRet) {
1029-
isRet = pConvertMacro((TCHAR*)LPCTSTR(SourceData->m_strData), szRet, nSize,
1023+
isRet = pConvertMacro((TCHAR*)LPCTSTR(sourceDataPtr->m_strData), szRet, nSize,
10301024
(TCHAR*)LPCTSTR(strSelect), (TCHAR*)LPCTSTR(strClip));
10311025
*strRet = CString(szRet);
10321026
delete[] szRet;
@@ -1084,8 +1078,7 @@ void CCharu3Tree::moveChildren(HTREEITEM hFromItem, HTREEITEM hToItem)
10841078
hFromItem = GetChildItem(hFromItem);
10851079
do {
10861080
//データを取得
1087-
STRING_DATA dataF;
1088-
dataF = getData(hFromItem);
1081+
STRING_DATA dataF = getData(hFromItem);
10891082

10901083
//ツリーデータを取得
10911084
TV_ITEM TreeCtrlItemFrom;
@@ -1129,8 +1122,7 @@ void CCharu3Tree::copyChildren(HTREEITEM hFromItem, HTREEITEM hToItem)
11291122
HTREEITEM hAddtItem = nullptr;
11301123
while (hFromItem) {
11311124
//データを取得
1132-
STRING_DATA dataF;
1133-
dataF = getData(hFromItem);
1125+
STRING_DATA dataF = getData(hFromItem);
11341126

11351127
//同じデータを挿入
11361128
if (hAddtItem)
@@ -1151,15 +1143,13 @@ void CCharu3Tree::copyChildren(HTREEITEM hFromItem, HTREEITEM hToItem)
11511143
HTREEITEM CCharu3Tree::mergeTreeData(HTREEITEM hTreeItem, std::list<STRING_DATA>* pList, bool isRoot)
11521144
{
11531145
if (pList->size() > 0) {
1154-
STRING_DATA folder;
11551146
int nParentID;
1156-
CString strRes;
11571147
if (!isRoot) {//インポートフォルダを作る
1148+
CString strRes;
11581149
(void)strRes.LoadString(APP_INF_IMPORT_FOLDERNAME);
11591150
hTreeItem = AddFolder(hTreeItem, strRes);//親フォルダを作る
11601151
if (!hTreeItem) return nullptr;
1161-
folder = getData(hTreeItem);
1162-
nParentID = folder.m_nMyID;
1152+
nParentID = getDataPtr(hTreeItem)->m_nMyID;
11631153
}
11641154
else {//ルートに展開する
11651155
nParentID = dataTree::ROOT;
@@ -1269,11 +1259,9 @@ void CCharu3Tree::deleteData(HTREEITEM hTreeItem)
12691259
void CCharu3Tree::tree2List(HTREEITEM hStartItem, std::list<STRING_DATA>* tmplist, bool isAll /* = false */)
12701260
{
12711261
if (!hStartItem) return;
1272-
STRING_DATA data;
12731262
HTREEITEM hItem = hStartItem;
12741263
do {
1275-
data = getData(hItem);
1276-
1264+
STRING_DATA data = getData(hItem);
12771265
tmplist->insert(tmplist->end(), data);
12781266
if (ItemHasChildren(hItem) && (getDataOption(data.m_strMacro, "clearrec") != 1 || isAll)) tree2List(GetChildItem(hItem), tmplist);
12791267
hItem = GetNextItem(hItem, TVGN_NEXT);

‎Charu3Tree.h

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,18 +142,15 @@ class CCharu3Tree : public CTreeCtrl
142142
STRING_DATA getData(HTREEITEM hTreeItem);
143143
STRING_DATA* getDataPtr(HTREEITEM hTreeItem);
144144

145+
bool convertMacroPlugin(const STRING_DATA* sourceDataPtr, CString* strRet, CString strSelect, CString strClip, CString strSoftName);
146+
145147
HTREEITEM searchItem(HTREEITEM hStartItem, bool backward = false);
146148
HTREEITEM searchTitle(HTREEITEM hStartItem, CString strKey, bool makeLower = false);
147149

148150
void copyChildren(HTREEITEM hFromItem, HTREEITEM hToItem);
149151

150152
char getDatakind(HTREEITEM hTreeItem) {
151-
char cRet = 0;
152-
if (hTreeItem) {
153-
STRING_DATA data = getData(hTreeItem);
154-
cRet = data.m_cKind;
155-
}
156-
return cRet;
153+
return hTreeItem ? getDataPtr(hTreeItem)->m_cKind : 0;
157154
}
158155

159156
void copyData(int nParentID, HTREEITEM hParentTreeItem, std::list<STRING_DATA>* pList);
@@ -162,7 +159,6 @@ class CCharu3Tree : public CTreeCtrl
162159
bool loadDataFileDef(CString strFileName, CString strPlugin);
163160
bool loadDataFile(CString strFileName, CString strPlugin, std::list<STRING_DATA>* tmplist);
164161
bool saveDataToFile(CString strFileName, CString strPlugin, HTREEITEM hStartItem);
165-
bool convertMacroPlugin(STRING_DATA* SourceData, CString* strRet, CString strSelect, CString strClip, CString strSoftName);
166162

167163
void setInitInfo(int* pMaxID, int* pSelectID, int* pRecNumber) {
168164
m_pMaxID = pMaxID;

0 commit comments

Comments
 (0)