refactoring

itagagaki · Dec 6, 2023 · 512fcf4 · 512fcf4
1 parent 24791eb
commit 512fcf4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Charu3.h b/Charu3.h
@@ -103,10 +103,12 @@ class CCharu3App : public CWinApp
     void BeForeground();
     void RedrawDataTreeView();
 
+    bool GetClipboardText(CString& sData) {
+        return m_clipboard.GetClipboardText(sData, m_ini.m_nClipboardRetryTimes, m_ini.m_nClipboardRetryInterval);
+    }
     void Record(CString text);
 
     CInit m_ini;
-    CClipBoard m_clipboard;
     CCharu3Tree* m_pTree;
 
     // オーバーライド
@@ -167,6 +169,8 @@ class CCharu3App : public CWinApp
     BOOL m_isImeStatus;
     int m_nPhase;
 
+    CClipBoard m_clipboard;
+
     CMyTreeDialog* m_pTreeDlg;
     HTREEITEM m_hSelectItemBkup;
     DWORD m_dwDoubleKeyPopTime, m_dwDoubleKeyFifoTime;

diff --git a/MainFrm.cpp b/MainFrm.cpp
@@ -14,7 +14,6 @@ static char THIS_FILE[] = __FILE__;
 
 #include "MainFrm.h"
 #include "Charu3.h"
-#include "clipboard.h"
 #include "log.h"
 #include "resource.h"
 
@@ -183,7 +182,7 @@ void CMainFrame::OnClipboardChanged()
         if (theApp.m_ini.m_nClipboardOpenDelay > 0) {
             Sleep(theApp.m_ini.m_nClipboardOpenDelay);
         }
-        theApp.m_clipboard.GetClipboardText(strClipboard, theApp.m_ini.m_nClipboardRetryTimes, theApp.m_ini.m_nClipboardRetryInterval);
+        theApp.GetClipboardText(strClipboard);
         theApp.Record(strClipboard);
     }