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.

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

final 指定子 と override 指定子の適用 #1090

Merged
merged 2 commits into from
Nov 16, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
6 changes: 3 additions & 3 deletions sakura_core/CAutoReloadAgent.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ enum WatchUpdate {
class CAutoReloadAgent : public CDocListenerEx{
public:
CAutoReloadAgent();
void OnBeforeSave(const SSaveInfo& sSaveInfo);
void OnAfterSave(const SSaveInfo& sSaveInfo);
void OnAfterLoad(const SLoadInfo& sLoadInfo);
void OnBeforeSave(const SSaveInfo& sSaveInfo) override;
void OnAfterSave(const SSaveInfo& sSaveInfo) override;
void OnAfterLoad(const SLoadInfo& sLoadInfo) override;

//監視の一時停止
void PauseWatching(){ m_nPauseCount++; }
Expand Down
2 changes: 1 addition & 1 deletion sakura_core/CBackupAgent.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

class CBackupAgent : public CDocListenerEx{
public:
ECallbackResult OnPreBeforeSave(SSaveInfo* pSaveInfo);
ECallbackResult OnPreBeforeSave(SSaveInfo* pSaveInfo) override;

protected:
int MakeBackUp( const WCHAR* target_file ); //!< バックアップの作成
Expand Down
6 changes: 3 additions & 3 deletions sakura_core/CCodeChecker.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ class CCodeChecker : public CDocListenerEx, public TSingleton<CCodeChecker>{

public:
//セーブ時チェック
ECallbackResult OnCheckSave(SSaveInfo* pSaveInfo);
void OnFinalSave(ESaveResult eSaveResult);
ECallbackResult OnCheckSave(SSaveInfo* pSaveInfo) override;
void OnFinalSave(ESaveResult eSaveResult) override;

//ロード時チェック
void OnFinalLoad(ELoadResult eLoadResult);
void OnFinalLoad(ELoadResult eLoadResult) override;
};

#endif /* SAKURA_CCODECHECKER_4EBAEA37_FC62_4206_A9DD_82DDB8CDE44E9_H_ */
Expand Down
4 changes: 2 additions & 2 deletions sakura_core/CGrepAgent.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ class CGrepAgent : public CDocListenerEx{
CGrepAgent();

// イベント
ECallbackResult OnBeforeClose();
void OnAfterSave(const SSaveInfo& sSaveInfo);
ECallbackResult OnBeforeClose() override;
void OnAfterSave(const SSaveInfo& sSaveInfo) override;

static void CreateFolders( const WCHAR* pszPath, std::vector<std::wstring>& vPaths );
static std::wstring ChopYen( const std::wstring& str );
Expand Down
2 changes: 1 addition & 1 deletion sakura_core/CGrepEnumFiles.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class CGrepEnumFiles : public CGrepEnumFileBase {
virtual ~CGrepEnumFiles(){
}

virtual BOOL IsValid( WIN32_FIND_DATA& w32fd, LPCWSTR pFile = NULL ){
virtual BOOL IsValid( WIN32_FIND_DATA& w32fd, LPCWSTR pFile = NULL ) override {
berryzplus marked this conversation as resolved.
Show resolved Hide resolved
if( ! ( w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) ){
if( CGrepEnumFileBase::IsValid( w32fd, pFile ) ){
return TRUE;
Expand Down
4 changes: 2 additions & 2 deletions sakura_core/CGrepEnumFilterFiles.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include "CGrepEnumFiles.h"

class CGrepEnumFilterFiles : public CGrepEnumFiles {
class CGrepEnumFilterFiles final : public CGrepEnumFiles {
private:

public:
Expand All @@ -45,7 +45,7 @@ class CGrepEnumFilterFiles : public CGrepEnumFiles {
virtual ~CGrepEnumFilterFiles(){
}

virtual BOOL IsValid( WIN32_FIND_DATA& w32fd, LPCWSTR pFile = NULL ){
BOOL IsValid( WIN32_FIND_DATA& w32fd, LPCWSTR pFile = NULL ) override {
if( CGrepEnumFiles::IsValid( w32fd, pFile ) ){
if( m_cGrepEnumExceptFiles.IsValid( w32fd, pFile ) ){
return TRUE;
Expand Down
4 changes: 2 additions & 2 deletions sakura_core/CGrepEnumFilterFolders.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include "CGrepEnumFolders.h"

class CGrepEnumFilterFolders : public CGrepEnumFolders {
class CGrepEnumFilterFolders final : public CGrepEnumFolders {
private:

public:
Expand All @@ -45,7 +45,7 @@ class CGrepEnumFilterFolders : public CGrepEnumFolders {
virtual ~CGrepEnumFilterFolders(){
}

virtual BOOL IsValid( WIN32_FIND_DATA& w32fd, LPCWSTR pFile = NULL ){
BOOL IsValid( WIN32_FIND_DATA& w32fd, LPCWSTR pFile = NULL ) override{
if( CGrepEnumFolders::IsValid( w32fd, pFile ) ){
if( m_cGrepEnumExceptFolders.IsValid( w32fd, pFile ) ){
return TRUE;
Expand Down
14 changes: 7 additions & 7 deletions sakura_core/CHokanMgr.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

@date 2003.06.25 Moca ファイル内からの補完機能を追加
*/
class CHokanMgr : public CDialog
class CHokanMgr final : public CDialog
{
public:
/*
Expand Down Expand Up @@ -56,11 +56,11 @@ class CHokanMgr : public CDialog
BOOL DoHokan(int nVKey);
void ChangeView(LPARAM pcEditView);/* モードレス時:対象となるビューの変更 */

INT_PTR DispatchEvent( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam );
BOOL OnInitDialog( HWND, WPARAM wParam, LPARAM lParam );
BOOL OnDestroy( void );
BOOL OnSize( WPARAM wParam, LPARAM lParam );
BOOL OnLbnSelChange( HWND hwndCtl, int wID );
INT_PTR DispatchEvent( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) override;
BOOL OnInitDialog( HWND, WPARAM wParam, LPARAM lParam ) override;
BOOL OnDestroy( void ) override;
BOOL OnSize( WPARAM wParam, LPARAM lParam ) override;
BOOL OnLbnSelChange( HWND hwndCtl, int wID ) override;

int KeyProc(WPARAM wParam, LPARAM lParam);

Expand All @@ -84,7 +84,7 @@ class CHokanMgr : public CDialog
/*
|| 実装ヘルパ関数
*/
LPVOID GetHelpIdTable(void); //@@@ 2002.01.18 add
LPVOID GetHelpIdTable(void) override; //@@@ 2002.01.18 add
};

///////////////////////////////////////////////////////////////////////
Expand Down
10 changes: 5 additions & 5 deletions sakura_core/CLoadAgent.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@

class CLoadAgent : public CDocListenerEx{
public:
ECallbackResult OnCheckLoad(SLoadInfo* pLoadInfo);
void OnBeforeLoad(SLoadInfo* sLoadInfo);
ELoadResult OnLoad(const SLoadInfo& sLoadInfo);
void OnAfterLoad(const SLoadInfo& sLoadInfo);
void OnFinalLoad(ELoadResult eLoadResult);
ECallbackResult OnCheckLoad(SLoadInfo* pLoadInfo) override;
void OnBeforeLoad(SLoadInfo* sLoadInfo) override;
ELoadResult OnLoad(const SLoadInfo& sLoadInfo) override;
void OnAfterLoad(const SLoadInfo& sLoadInfo) override;
void OnFinalLoad(ELoadResult eLoadResult) override;
};

#endif /* SAKURA_CLOADAGENT_780AC971_71A8_4495_BE95_C8786311D1489_H_ */
Expand Down
6 changes: 3 additions & 3 deletions sakura_core/CMarkMgr.h
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@ class CMarkMgr {

CMarkMgr を継承し、動作が規定されていない部分を実装する。
*/
class CAutoMarkMgr : public CMarkMgr{
class CAutoMarkMgr final : public CMarkMgr{
public:
virtual void Add(const CMark& m); //!< 要素の追加
virtual void Expire(void); //!< 要素数の調整
void Add(const CMark& m) override; //!< 要素の追加
void Expire(void) override; //!< 要素数の調整
};

#endif
Expand Down
12 changes: 6 additions & 6 deletions sakura_core/COpe.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,31 +68,31 @@ class COpe {
};

//!削除
class CDeleteOpe : public COpe{
class CDeleteOpe final : public COpe{
public:
CDeleteOpe() : COpe(OPE_DELETE)
{
m_ptCaretPos_PHY_To.Set(CLogicInt(0),CLogicInt(0));
}
virtual void DUMP( void ); /* 編集操作要素のダンプ */
void DUMP( void ) override; /* 編集操作要素のダンプ */
public:
CLogicPoint m_ptCaretPos_PHY_To; //!< 操作前のキャレット位置。文字単位。 [DELETE]
COpeLineData m_cOpeLineData; //!< 操作に関連するデータ [DELETE/INSERT]
int m_nOrgSeq;
};

//!挿入
class CInsertOpe : public COpe{
class CInsertOpe final : public COpe{
public:
CInsertOpe() : COpe(OPE_INSERT) { }
virtual void DUMP( void ); /* 編集操作要素のダンプ */
void DUMP( void ) override; /* 編集操作要素のダンプ */
public:
COpeLineData m_cOpeLineData; //!< 操作に関連するデータ [DELETE/INSERT]
int m_nOrgSeq;
};

//!置換
class CReplaceOpe : public COpe{
class CReplaceOpe final : public COpe{
public:
CReplaceOpe() : COpe(OPE_REPLACE)
{
Expand All @@ -107,7 +107,7 @@ class CReplaceOpe : public COpe{
};

//!キャレット移動
class CMoveCaretOpe : public COpe{
class CMoveCaretOpe final : public COpe{
public:
CMoveCaretOpe() : COpe(OPE_MOVECARET) { }
CMoveCaretOpe(const CLogicPoint& ptBefore, const CLogicPoint& ptAfter)
Expand Down
10 changes: 5 additions & 5 deletions sakura_core/CSaveAgent.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
class CSaveAgent : public CDocListenerEx{
public:
CSaveAgent();
ECallbackResult OnCheckSave(SSaveInfo* pSaveInfo);
void OnBeforeSave(const SSaveInfo& sSaveInfo);
void OnSave(const SSaveInfo& sSaveInfo);
void OnAfterSave(const SSaveInfo& sSaveInfo);
void OnFinalSave(ESaveResult eSaveResult);
ECallbackResult OnCheckSave(SSaveInfo* pSaveInfo) override;
void OnBeforeSave(const SSaveInfo& sSaveInfo) override;
void OnSave(const SSaveInfo& sSaveInfo) override;
void OnAfterSave(const SSaveInfo& sSaveInfo) override;
void OnFinalSave(ESaveResult eSaveResult) override;
private:
SSaveInfo m_sSaveInfoForRollback;
};
Expand Down
2 changes: 1 addition & 1 deletion sakura_core/_main/CAppMode.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class CAppMode : public TSingleton<CAppMode>, public CDocListenerEx{ //###仮
void SetDebugModeOFF(); //!< デバッグモニタモード解除

//イベント
void OnAfterSave(const SSaveInfo& sSaveInfo);
void OnAfterSave(const SSaveInfo& sSaveInfo) override;

protected:
void _SetDebugMode(bool bDebugMode){ m_bDebugMode = bDebugMode; }
Expand Down
10 changes: 5 additions & 5 deletions sakura_core/_main/CControlProcess.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class CControlTray;

@date 2002.2.17 YAZAKI CShareDataのインスタンスは、CProcessにひとつあるのみ。
*/
class CControlProcess : public CProcess {
class CControlProcess final : public CProcess {
public:
CControlProcess( HINSTANCE hInstance, LPCWSTR lpCmdLine ) :
CProcess( hInstance, lpCmdLine ),
Expand All @@ -41,12 +41,12 @@ class CControlProcess : public CProcess {
m_pcTray( 0 )
{}

virtual ~CControlProcess();
~CControlProcess() override;
berryzplus marked this conversation as resolved.
Show resolved Hide resolved
protected:
CControlProcess();
virtual bool InitializeProcess();
virtual bool MainLoop();
virtual void OnExitProcess();
bool InitializeProcess() override;
bool MainLoop() override;
virtual void OnExitProcess() override;
berryzplus marked this conversation as resolved.
Show resolved Hide resolved

private:
HANDLE m_hMutex; //!< アプリケーション実行検出用ミューテックス
Expand Down
10 changes: 5 additions & 5 deletions sakura_core/_main/CNormalProcess.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ class CEditWnd;

エディタプロセスはCEditWndクラスのインスタンスを作る。
*/
class CNormalProcess : public CProcess {
class CNormalProcess final : public CProcess {
public:
//コンストラクタ・デストラクタ
CNormalProcess( HINSTANCE hInstance, LPCWSTR lpCmdLine );
virtual ~CNormalProcess();
~CNormalProcess() override;
berryzplus marked this conversation as resolved.
Show resolved Hide resolved

protected:
//プロセスハンドラ
virtual bool InitializeProcess();
virtual bool MainLoop();
virtual void OnExitProcess();
bool InitializeProcess() override;
bool MainLoop() override;
void OnExitProcess() override;

protected:
//実装補助
Expand Down
6 changes: 3 additions & 3 deletions sakura_core/charset/CCesu8.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ class CCesu8 : public CCodeBase {
public:

//CCodeBaseインターフェース
EConvertResult CodeToUnicode(const CMemory& cSrc, CNativeW* pDst){ //!< 特定コード → UNICODE 変換
EConvertResult CodeToUnicode(const CMemory& cSrc, CNativeW* pDst) override{ //!< 特定コード → UNICODE 変換
return CUtf8::CESU8ToUnicode(cSrc, pDst);
}
EConvertResult UnicodeToCode(const CNativeW& cSrc, CMemory* pDst){ //!< UNICODE → 特定コード 変換
EConvertResult UnicodeToCode(const CNativeW& cSrc, CMemory* pDst) override{ //!< UNICODE → 特定コード 変換
return CUtf8::UnicodeToCESU8(cSrc, pDst);
}
void GetBom(CMemory* pcmemBom); //!< BOMデータ取得
void GetBom(CMemory* pcmemBom) override; //!< BOMデータ取得
// GetEolはCCodeBaseに移動 2010/6/13 Uchi
EConvertResult UnicodeToHex(const wchar_t* cSrc, const int iSLen, WCHAR* pDst, const CommonSetting_Statusbar* psStatusbar){ //!< UNICODE → Hex 変換
return CUtf8()._UnicodeToHex( cSrc, iSLen, pDst, psStatusbar, true );
Expand Down
8 changes: 4 additions & 4 deletions sakura_core/charset/CCodePage.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ class CCodePage : public CCodeBase{
CCodePage(int codepageEx) : m_nCodePageEx(codepageEx) { }

//CCodeBaseインターフェース
EConvertResult CodeToUnicode(const CMemory& cSrc, CNativeW* pDst){ return CPToUnicode(cSrc, pDst, m_nCodePageEx); } //!< 特定コード → UNICODE 変換
EConvertResult UnicodeToCode(const CNativeW& cSrc, CMemory* pDst){ return UnicodeToCP(cSrc, pDst, m_nCodePageEx); } //!< UNICODE → 特定コード 変換
void GetEol(CMemory* pcmemEol, EEolType eEolType); //!< 改行データ取得
void GetBom(CMemory* pcmemBom); //!< BOMデータ取得
EConvertResult CodeToUnicode(const CMemory& cSrc, CNativeW* pDst) override{ return CPToUnicode(cSrc, pDst, m_nCodePageEx); } //!< 特定コード → UNICODE 変換
EConvertResult UnicodeToCode(const CNativeW& cSrc, CMemory* pDst) override{ return UnicodeToCP(cSrc, pDst, m_nCodePageEx); } //!< UNICODE → 特定コード 変換
void GetEol(CMemory* pcmemEol, EEolType eEolType) override; //!< 改行データ取得
void GetBom(CMemory* pcmemBom) override; //!< BOMデータ取得
EConvertResult UnicodeToHex(const wchar_t* cSrc, const int iSLen, WCHAR* pDst, const CommonSetting_Statusbar* psStatusbar); //!< UNICODE → Hex 変換

public:
Expand Down
4 changes: 2 additions & 2 deletions sakura_core/charset/CEuc.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
class CEuc : public CCodeBase{
public:
//CCodeBaseインターフェース
EConvertResult CodeToUnicode(const CMemory& cSrc, CNativeW* pDst){ return EUCToUnicode(cSrc, pDst); } //!< 特定コード → UNICODE 変換
EConvertResult UnicodeToCode(const CNativeW& cSrc, CMemory* pDst){ return UnicodeToEUC(cSrc, pDst); } //!< UNICODE → 特定コード 変換
EConvertResult CodeToUnicode(const CMemory& cSrc, CNativeW* pDst) override{ return EUCToUnicode(cSrc, pDst); } //!< 特定コード → UNICODE 変換
EConvertResult UnicodeToCode(const CNativeW& cSrc, CMemory* pDst) override{ return UnicodeToEUC(cSrc, pDst); } //!< UNICODE → 特定コード 変換
// GetEolはCCodeBaseに移動 2010/6/13 Uchi
EConvertResult UnicodeToHex(const wchar_t* cSrc, const int iSLen, WCHAR* pDst, const CommonSetting_Statusbar* psStatusbar); //!< UNICODE → Hex 変換

Expand Down
4 changes: 2 additions & 2 deletions sakura_core/charset/CJis.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class CJis : public CCodeBase{
CJis(bool base64decode = true) : m_base64decode(base64decode) { }
public:
//CCodeBaseインターフェース
EConvertResult CodeToUnicode(const CMemory& cSrc, CNativeW* pDst){ return JISToUnicode(cSrc, pDst, m_base64decode); } //!< 特定コード → UNICODE 変換
EConvertResult UnicodeToCode(const CNativeW& cSrc, CMemory* pDst){ return UnicodeToJIS(cSrc, pDst); } //!< UNICODE → 特定コード 変換
EConvertResult CodeToUnicode(const CMemory& cSrc, CNativeW* pDst) override{ return JISToUnicode(cSrc, pDst, m_base64decode); } //!< 特定コード → UNICODE 変換
EConvertResult UnicodeToCode(const CNativeW& cSrc, CMemory* pDst) override{ return UnicodeToJIS(cSrc, pDst); } //!< UNICODE → 特定コード 変換
// GetEolはCCodeBaseに移動 2010/6/13 Uchi
EConvertResult UnicodeToHex(const wchar_t* cSrc, const int iSLen, WCHAR* pDst, const CommonSetting_Statusbar* psStatusbar); //!< UNICODE → Hex 変換

Expand Down
6 changes: 3 additions & 3 deletions sakura_core/charset/CLatin1.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ class CLatin1 : public CCodeBase{

public:
//CCodeBaseインターフェース
EConvertResult CodeToUnicode(const CMemory& cSrc, CNativeW* pDst){ return Latin1ToUnicode(cSrc, pDst); } //!< 特定コード → UNICODE 変換
EConvertResult UnicodeToCode(const CNativeW& cSrc, CMemory* pDst){ return UnicodeToLatin1(cSrc, pDst); } //!< UNICODE → 特定コード 変換
EConvertResult UnicodeToHex(const wchar_t* cSrc, const int iSLen, WCHAR* pDst, const CommonSetting_Statusbar* psStatusbar); //!< UNICODE → Hex 変換
EConvertResult CodeToUnicode(const CMemory& cSrc, CNativeW* pDst) override{ return Latin1ToUnicode(cSrc, pDst); } //!< 特定コード → UNICODE 変換
EConvertResult UnicodeToCode(const CNativeW& cSrc, CMemory* pDst) override{ return UnicodeToLatin1(cSrc, pDst); } //!< UNICODE → 特定コード 変換
EConvertResult UnicodeToHex(const wchar_t* cSrc, const int iSLen, WCHAR* pDst, const CommonSetting_Statusbar* psStatusbar) override; //!< UNICODE → Hex 変換

public:
//実装
Expand Down
6 changes: 3 additions & 3 deletions sakura_core/charset/CShiftJis.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ class CShiftJis : public CCodeBase{

public:
//CCodeBaseインターフェース
EConvertResult CodeToUnicode(const CMemory& cSrc, CNativeW* pDst){ return SJISToUnicode(cSrc, pDst); } //!< 特定コード → UNICODE 変換
EConvertResult UnicodeToCode(const CNativeW& cSrc, CMemory* pDst){ return UnicodeToSJIS(cSrc, pDst); } //!< UNICODE → 特定コード 変換
EConvertResult CodeToUnicode(const CMemory& cSrc, CNativeW* pDst) override{ return SJISToUnicode(cSrc, pDst); } //!< 特定コード → UNICODE 変換
EConvertResult UnicodeToCode(const CNativeW& cSrc, CMemory* pDst) override{ return UnicodeToSJIS(cSrc, pDst); } //!< UNICODE → 特定コード 変換
// GetEolはCCodeBaseに移動 2010/6/13 Uchi
EConvertResult UnicodeToHex(const wchar_t* cSrc, const int iSLen, WCHAR* pDst, const CommonSetting_Statusbar* psStatusbar); //!< UNICODE → Hex 変換
EConvertResult UnicodeToHex(const wchar_t* cSrc, const int iSLen, WCHAR* pDst, const CommonSetting_Statusbar* psStatusbar) override; //!< UNICODE → Hex 変換

public:
//実装
Expand Down
8 changes: 4 additions & 4 deletions sakura_core/charset/CUnicode.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@

class CUnicode : public CCodeBase{
public:
EConvertResult CodeToUnicode(const CMemory& cSrc, CNativeW* pDst){ //!< 特定コード → UNICODE 変換
EConvertResult CodeToUnicode(const CMemory& cSrc, CNativeW* pDst) override{ //!< 特定コード → UNICODE 変換
return UnicodeToUnicode_in(cSrc, pDst);
}
EConvertResult UnicodeToCode(const CNativeW& cSrc, CMemory* pDst){ //!< UNICODE → 特定コード 変換
EConvertResult UnicodeToCode(const CNativeW& cSrc, CMemory* pDst) override{ //!< UNICODE → 特定コード 変換
return UnicodeToUnicode_out(cSrc, pDst);
}
void GetBom(CMemory* pcmemBom); //!< BOMデータ取得
void GetEol(CMemory* pcmemEol, EEolType eEolType); //!< 改行データ取得
void GetBom(CMemory* pcmemBom) override; //!< BOMデータ取得
void GetEol(CMemory* pcmemEol, EEolType eEolType) override; //!< 改行データ取得

public:
//実装
Expand Down
8 changes: 4 additions & 4 deletions sakura_core/charset/CUnicodeBe.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
class CUnicodeBe : public CCodeBase{
public:
//CCodeBaseインターフェース
EConvertResult CodeToUnicode(const CMemory& cSrc, CNativeW* pDst){ return UnicodeBEToUnicode(cSrc, pDst); } //!< 特定コード → UNICODE 変換
EConvertResult UnicodeToCode(const CNativeW& cSrc, CMemory* pDst){ return UnicodeToUnicodeBE(cSrc, pDst); } //!< UNICODE → 特定コード 変換
void GetBom(CMemory* pcmemBom); //!< BOMデータ取得
void GetEol(CMemory* pcmemEol, EEolType eEolType); //!< 改行データ取得
EConvertResult CodeToUnicode(const CMemory& cSrc, CNativeW* pDst) override{ return UnicodeBEToUnicode(cSrc, pDst); } //!< 特定コード → UNICODE 変換
EConvertResult UnicodeToCode(const CNativeW& cSrc, CMemory* pDst) override{ return UnicodeToUnicodeBE(cSrc, pDst); } //!< UNICODE → 特定コード 変換
void GetBom(CMemory* pcmemBom) override; //!< BOMデータ取得
void GetEol(CMemory* pcmemEol, EEolType eEolType) override; //!< 改行データ取得

public:

Expand Down
Loading