Merge pull request #1949 from suconbu/feature/remove_constcast_in_han…

…dlefunction CMacro.cppでのconst_castをやめる
sakura-editor · May 4, 2024 · 2547a04 · 2547a04
2 parents 5def577 + 047c998
commit 2547a04
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 47 deletions.
diff --git a/sakura_core/macro/CEditorIfObj.cpp b/sakura_core/macro/CEditorIfObj.cpp
@@ -43,7 +43,7 @@ MacroFuncInfoArray CEditorIfObj::GetMacroFuncInfo() const
 }
 
 //関数を処理する
-bool CEditorIfObj::HandleFunction(CEditView* View, EFunctionCode ID, const VARIANT *Arguments, const int ArgSize, VARIANT &Result)
+bool CEditorIfObj::HandleFunction(CEditView* View, EFunctionCode ID, VARIANT *Arguments, const int ArgSize, VARIANT &Result)
 {
 	return CMacro::HandleFunction( View, ID, Arguments, ArgSize, Result );
 }

diff --git a/sakura_core/macro/CEditorIfObj.h b/sakura_core/macro/CEditorIfObj.h
@@ -42,7 +42,7 @@ class CEditorIfObj : public CWSHIfObj
 	// 実装
 	MacroFuncInfoArray GetMacroCommandInfo() const;	//コマンド情報を取得する
 	MacroFuncInfoArray GetMacroFuncInfo() const;	//関数情報を取得する
-	bool HandleFunction(CEditView* View, EFunctionCode ID, const VARIANT *Arguments, const int ArgSize, VARIANT &Result);	//関数を処理する
+	bool HandleFunction(CEditView* View, EFunctionCode ID, VARIANT *Arguments, const int ArgSize, VARIANT &Result);	//関数を処理する
 	bool HandleCommand(CEditView* View, EFunctionCode ID, const WCHAR* Arguments[], const int ArgLengths[], const int ArgSize);	//コマンドを処理する
 };
 #endif /* SAKURA_CEDITORIFOBJ_1C8AA37E_D9FB_4C26_AE83_22E62D9B7C3D_H_ */
diff --git a/sakura_core/macro/CMacro.cpp b/sakura_core/macro/CMacro.cpp
diff --git a/sakura_core/macro/CMacro.h b/sakura_core/macro/CMacro.h
@@ -124,7 +124,7 @@ class CMacro
 	int GetParamCount() const;
 
 	static bool HandleCommand( CEditView *View, EFunctionCode ID, const WCHAR* Argument[], const int ArgLengths[], const int ArgSize );
-	static bool HandleFunction( CEditView *View, EFunctionCode ID, const VARIANT *Arguments, const int ArgSize, VARIANT &Result);
+	static bool HandleFunction( CEditView *View, EFunctionCode ID, VARIANT *Arguments, const int ArgSize, VARIANT &Result);
 	//2009.10.29 syat HandleCommandとHandleFunctionの引数を少しそろえた
 
 	/*

diff --git a/sakura_core/macro/CWSHIfObj.h b/sakura_core/macro/CWSHIfObj.h
@@ -72,7 +72,7 @@ class CWSHIfObj
 	HRESULT MacroCommand(int ID, DISPPARAMS *Arguments, VARIANT* Result, void *Data);
 
 	// 非実装提供
-	virtual bool HandleFunction(CEditView* View, EFunctionCode ID, const VARIANT *Arguments, const int ArgSize, VARIANT &Result) = 0;	//関数を処理する
+	virtual bool HandleFunction(CEditView* View, EFunctionCode ID, VARIANT *Arguments, const int ArgSize, VARIANT &Result) = 0;	//関数を処理する
 	virtual bool HandleCommand(CEditView* View, EFunctionCode ID, const WCHAR* Arguments[], const int ArgLengths[], const int ArgSize) = 0;	//コマンドを処理する
 	virtual MacroFuncInfoArray GetMacroCommandInfo() const = 0;	//コマンド情報を取得する
 	virtual MacroFuncInfoArray GetMacroFuncInfo() const = 0;	//関数情報を取得する

diff --git a/sakura_core/plugin/CComplementIfObj.h b/sakura_core/plugin/CComplementIfObj.h
@@ -65,7 +65,7 @@ class CComplementIfObj : public CWSHIfObj {
 	//関数情報を取得する
 	MacroFuncInfoArray GetMacroFuncInfo() const{ return m_MacroFuncInfoArr; };
 	//関数を処理する
-	bool HandleFunction(CEditView* View, EFunctionCode ID, const VARIANT *Arguments, const int ArgSize, VARIANT &Result)
+	bool HandleFunction(CEditView* View, EFunctionCode ID, VARIANT *Arguments, const int ArgSize, VARIANT &Result)
 	{
 		Variant varCopy;	// VT_BYREFだと困るのでコピー用
 

diff --git a/sakura_core/plugin/COutlineIfObj.h b/sakura_core/plugin/COutlineIfObj.h
@@ -69,7 +69,7 @@ class COutlineIfObj : public CWSHIfObj {
 	//関数情報を取得する
 	MacroFuncInfoArray GetMacroFuncInfo() const{ return m_MacroFuncInfoArr; }
 	//関数を処理する
-	bool HandleFunction(CEditView* View, EFunctionCode ID, const VARIANT *Arguments, const int ArgSize, VARIANT &Result)
+	bool HandleFunction(CEditView* View, EFunctionCode ID, VARIANT *Arguments, const int ArgSize, VARIANT &Result)
 	{
 		return false;
 	}

diff --git a/sakura_core/plugin/CPluginIfObj.h b/sakura_core/plugin/CPluginIfObj.h
@@ -82,7 +82,7 @@ class CPluginIfObj : public CWSHIfObj {
 		return m_MacroFuncInfoArr;
 	}
 	//関数を処理する
-	bool HandleFunction(CEditView* View, EFunctionCode ID, const VARIANT *Arguments, const int ArgSize, VARIANT &Result)
+	bool HandleFunction(CEditView* View, EFunctionCode ID, VARIANT *Arguments, const int ArgSize, VARIANT &Result)
 	{
 		Variant varCopy;	// VT_BYREFだと困るのでコピー用
 

diff --git a/sakura_core/plugin/CSmartIndentIfObj.h b/sakura_core/plugin/CSmartIndentIfObj.h
@@ -78,7 +78,7 @@ class CSmartIndentIfObj final : public CWSHIfObj
 		return macroFuncInfoNotCommandArr;
 	}
 	//関数を処理する
-	bool HandleFunction(CEditView* View, EFunctionCode ID, const VARIANT *Arguments, const int ArgSize, VARIANT &Result)
+	bool HandleFunction(CEditView* View, EFunctionCode ID, VARIANT *Arguments, const int ArgSize, VARIANT &Result)
 	{
 		switch ( LOWORD(ID) ) 
 		{