Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMacro.cppでのconst_castをやめる #1949

Merged
merged 1 commit into from
May 4, 2024
Merged

CMacro.cppでのconst_castをやめる #1949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sakura_core/macro/CEditorIfObj.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
}
Expand Down
2 changes: 1 addition & 1 deletion sakura_core/macro/CEditorIfObj.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */
78 changes: 39 additions & 39 deletions sakura_core/macro/CMacro.cpp
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion sakura_core/macro/CMacro.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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の引数を少しそろえた

/*
Expand Down
2 changes: 1 addition & 1 deletion sakura_core/macro/CWSHIfObj.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; //関数情報を取得する
Expand Down
2 changes: 1 addition & 1 deletion sakura_core/plugin/CComplementIfObj.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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だと困るのでコピー用

Expand Down
2 changes: 1 addition & 1 deletion sakura_core/plugin/COutlineIfObj.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion sakura_core/plugin/CPluginIfObj.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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だと困るのでコピー用

Expand Down
2 changes: 1 addition & 1 deletion sakura_core/plugin/CSmartIndentIfObj.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) )
{
Expand Down
Loading