Skip to content

Commit b730993

Browse files
itagagakiitagagaki
committed
Refactoring around clipboard
1 parent 99eb122 commit b730993

File tree

4 files changed

+15
-38
lines changed

4 files changed

+15
-38
lines changed

‎Charu3.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ bool CCharu3App::init()
291291
}
292292

293293
//クリップボードクラスの初期化 変更検知を設定(メインフレームでメッセージ処理をしてます)
294-
m_clipboard.GetClipboardText(m_strSavedClipboard, m_ini.m_nClipboardRetryTimes, m_ini.m_nClipboardRetryInterval);
294+
GetClipboardText(m_strSavedClipboard);
295295
m_clipboard.SetParent(this->m_pMainWnd->m_hWnd);
296296
m_keySet = m_ini.m_defKeySet;
297297

@@ -444,7 +444,7 @@ void CCharu3App::closeTreeWindow(int nRet)
444444
//アクティブウィンドウを復帰
445445
if (nRet == IDOK) {
446446
CString strClip, strSelect;
447-
m_clipboard.GetClipboardText(strClip, m_ini.m_nClipboardRetryTimes, m_ini.m_nClipboardRetryInterval);//クリップボードを保存
447+
GetClipboardText(strClip);
448448

449449
setAppendKeyInit(m_focusInfo.m_hActiveWnd, &m_keySet);//キー設定を変更
450450
//キーが離されるのを待つ
@@ -876,7 +876,7 @@ void CCharu3App::playData(const STRING_DATA* dataPtr, CString strClip, CString s
876876
//クリップボード復帰
877877
if (m_ini.m_bPutBackClipboard && strClip != "") {
878878
m_strSavedClipboard = strClip;
879-
m_clipboard.SetClipboardText(strClip.GetString(), m_ini.m_nClipboardRetryTimes, m_ini.m_nClipboardRetryInterval);
879+
SetClipboardText(strClip.GetString());
880880
}
881881
if (isChange) {
882882
//貼り付けデータをフォルダの先頭に移動
@@ -900,7 +900,7 @@ void CCharu3App::playData(const STRING_DATA* dataPtr, CString strClip, CString s
900900
}
901901
}
902902
else {
903-
m_clipboard.SetClipboardText(strPaste, m_ini.m_nClipboardRetryTimes, m_ini.m_nClipboardRetryInterval);
903+
SetClipboardText(strPaste);
904904
}
905905
}
906906

@@ -975,7 +975,7 @@ void CCharu3App::playHotItem(int nTarget)
975975
UnregisterAdditionalHotkeys();//追加ホットキーを停止
976976

977977
CString strClip, strPaste;
978-
m_clipboard.GetClipboardText(strClip, m_ini.m_nClipboardRetryTimes, m_ini.m_nClipboardRetryInterval);//クリップボードを保存
978+
GetClipboardText(strClip);
979979
strPaste = data.m_strData;
980980

981981
POINT pos;
@@ -1036,7 +1036,7 @@ void CCharu3App::playHotItem(int nTarget)
10361036
}
10371037
//クリップボード復帰
10381038
if (m_ini.m_bPutBackClipboard && strClip != "") {
1039-
m_clipboard.SetClipboardText(strClip.GetString(), m_ini.m_nClipboardRetryTimes, m_ini.m_nClipboardRetryInterval);
1039+
SetClipboardText(strClip.GetString());
10401040
}
10411041
//一時項目は消す
10421042
if (m_pTree->getDatakind(keyData.m_hItem) & KIND_ONETIME) {
@@ -1053,7 +1053,7 @@ void CCharu3App::playHotItem(int nTarget)
10531053

10541054
CString CCharu3App::GetSelectedText()
10551055
{
1056-
m_clipboard.SetClipboardText(CString(), m_ini.m_nClipboardRetryTimes, m_ini.m_nClipboardRetryInterval);
1056+
SetClipboardText(CString());
10571057

10581058
// Instructs the window that has the keyboard focus to copy the selected text to the clipboard.
10591059
TCHAR windowName[1024] = _T("");
@@ -1096,7 +1096,7 @@ CString CCharu3App::GetSelectedText()
10961096

10971097
// Get from the clipboard.
10981098
CString strSelect;
1099-
if (m_clipboard.GetClipboardText(strSelect, m_ini.m_nClipboardRetryTimes, m_ini.m_nClipboardRetryInterval)) {
1099+
if (GetClipboardText(strSelect)) {
11001100
if (m_ini.m_bDebug) {
11011101
LOG(_T("GetSelectedText \"%s\""), strSelect.GetString());
11021102
}
@@ -1249,7 +1249,7 @@ void CCharu3App::pasteData(CString strPaste, COPYPASTE_KEY key, HWND hWnd)
12491249
if (m_isStockMode) {
12501250
m_strSavedClipboard = strPaste;
12511251
}
1252-
m_clipboard.SetClipboardText(strPaste, m_ini.m_nClipboardRetryTimes, m_ini.m_nClipboardRetryInterval);
1252+
SetClipboardText(strPaste);
12531253

12541254
if (key.m_nMessage == 0) {//イベント方式
12551255
keyUpDown(key.m_uMod_Paste, key.m_uVK_Paste, KEY_DOWN);
@@ -1739,7 +1739,7 @@ void CCharu3App::PullOneTimeData()
17391739
if (m_ini.m_bDebug) {
17401740
LOG(_T("fifoClipboard text:%s"), text.GetString());
17411741
}
1742-
if (m_clipboard.SetClipboardText(text, m_ini.m_nClipboardRetryTimes, m_ini.m_nClipboardRetryInterval)) {
1742+
if (SetClipboardText(text)) {
17431743
if (m_ini.m_strPasteSound != _T("")) {
17441744
PlaySound(m_ini.m_strPasteSound, NULL, SND_ASYNC | SND_FILENAME);
17451745
}

‎Charu3.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@ class CCharu3App : public CWinApp
105105
void BeForeground();
106106
void RedrawDataTreeView();
107107

108+
bool SetClipboardText(const CString sData) {
109+
return m_clipboard.SetClipboardText(sData, m_ini.m_nClipboardRetryTimes, m_ini.m_nClipboardRetryInterval);
110+
}
108111
bool GetClipboardText(CString& sData) {
109112
return m_clipboard.GetClipboardText(sData, m_ini.m_nClipboardRetryTimes, m_ini.m_nClipboardRetryInterval);
110113
}

‎clipboard.cpp

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,6 @@ static char THIS_FILE[] = __FILE__;
1212

1313
#include "clipboard.h"
1414

15-
//---------------------------------------------------
16-
//関数名 setClipboardText(const TCHAR* sData)
17-
//機能 クリップボードにテキストを設定
18-
//---------------------------------------------------
19-
bool CClipBoard::SetClipboardText(const CString sData)
20-
{
21-
return SetClipboardText(sData, m_nRetryCount, m_nRetryInterval);
22-
}
23-
2415
bool CClipBoard::SetClipboardText(const CString sData, int retryCount, int retryInterval)
2516
{
2617
size_t len = sData.GetLength() + 1;
@@ -69,15 +60,6 @@ bool CClipBoard::SetClipboardText(const CString sData, int retryCount, int retry
6960
return isRet;
7061
}
7162

72-
//---------------------------------------------------
73-
//関数名 getClipboardText(CString& sData)
74-
//機能 クリップボードのテキストを取得
75-
//---------------------------------------------------
76-
bool CClipBoard::GetClipboardText(CString& sData)
77-
{
78-
return GetClipboardText(sData, m_nRetryCount, m_nRetryInterval);
79-
}
80-
8163
bool CClipBoard::GetClipboardText(CString& sData, int retryCount, int retryInterval)
8264
{
8365
bool isRet = false;

‎clipboard.h

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,12 @@ class CClipBoard
2121
CClipBoard()
2222
: m_hParentWnd(nullptr)
2323
, m_bListening(false)
24-
, m_nRetryCount(0)
25-
, m_nRetryInterval(0)
2624
{
2725
}
2826

29-
CClipBoard(int retryCount, int retryInterval)
27+
CClipBoard(int retryTimes, int retryInterval)
3028
: m_hParentWnd(nullptr)
3129
, m_bListening(false)
32-
, m_nRetryCount(retryCount)
33-
, m_nRetryInterval(retryInterval)
3430
{
3531
}
3632

@@ -50,16 +46,12 @@ class CClipBoard
5046
::RemoveClipboardFormatListener(m_hParentWnd);
5147
m_bListening = false;
5248
}
53-
bool GetClipboardText(CString& sData);
54-
bool SetClipboardText(const CString sData);
55-
bool GetClipboardText(CString& sData, int retryCount, int retryInterval);
5649
bool SetClipboardText(const CString sData, int retryCount, int retryInterval);
50+
bool GetClipboardText(CString& sData, int retryCount, int retryInterval);
5751

5852
private:
5953
HWND m_hParentWnd;
6054
bool m_bListening;
61-
int m_nRetryCount;
62-
int m_nRetryInterval;
6355
};
6456

6557
#endif // !defined(AFX_CLIPBOARD_H__582AEB30_7E55_42E1_8D77_A28FAD0F7294__INCLUDED_)

0 commit comments

Comments
 (0)