Refactoring

shmuz · Jan 11, 2025 · 3b86cb5 · 3b86cb5
1 parent 47f4f63
commit 3b86cb5
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 37 deletions.
diff --git a/far/src/fileedit.cpp b/far/src/fileedit.cpp
@@ -442,26 +442,23 @@ void FileEditor::Init(
 		private:
 			Editor *editor;
 		public:
-			SmartLock() {editor=nullptr;}
-			~SmartLock() {if (editor) editor->Unlock();}
-
-			void Set(Editor *e) {editor=e; editor->Lock();}
+			SmartLock(Editor *e) : editor(e) { editor->Lock(); }
+			~SmartLock() { editor->Unlock(); }
 	};
-	SmartLock __smartlock;
 	SysErrorCode=0;
 	int BlankFileName=!StrCmp(Name,Msg::NewFileName);
 	//AY: флаг оповещающий закрытие редактора.
 	m_bClosing = false;
 	bEE_READ_Sent = false;
 	m_AddSignature = FB_NO;
-	m_editor = new Editor;
-	__smartlock.Set(m_editor);
 
+	m_editor = new(std::nothrow) Editor;
 	if (!m_editor)
 	{
 		ExitCode=XC_OPEN_ERROR;
 		return;
 	}
+	SCOPED_ACTION(SmartLock)(m_editor);
 
 	m_codepage = codepage;
 	m_editor->SetOwner(this);
@@ -1807,20 +1804,17 @@ int FileEditor::SaveFile(const wchar_t *Name,int Ask, bool bSaveAs, int TextForm
 		if (!m_editor->Flags.Check(FEDITOR_MODIFIED))
 			return SAVEFILE_SUCCESS;
 
-		if (Ask)
+		switch (Message(MSG_WARNING,3,&EditAskSaveId,Msg::EditTitle,Msg::EditAskSave,Msg::HYes,Msg::HNo,Msg::HCancel))
 		{
-			switch (Message(MSG_WARNING,3,&EditAskSaveId,Msg::EditTitle,Msg::EditAskSave,Msg::HYes,Msg::HNo,Msg::HCancel))
-			{
-				case -1:
-				case -2:
-				case 2:  // Continue Edit
-					return SAVEFILE_CANCEL;
-				case 0:  // Save
-					break;
-				case 1:  // Not Save
-					m_editor->TextChanged(0); // 10.08.2000 skv: TextChanged() support;
-					return SAVEFILE_SUCCESS;
-			}
+			case -1:
+			case -2:
+			case 2:  // Continue Edit
+				return SAVEFILE_CANCEL;
+			case 0:  // Save
+				break;
+			case 1:  // Not Save
+				m_editor->TextChanged(0); // 10.08.2000 skv: TextChanged() support;
+				return SAVEFILE_SUCCESS;
 		}
 	}
 

diff --git a/far/src/macro/macro.cpp b/far/src/macro/macro.cpp
@@ -125,7 +125,7 @@ std::string GuidToString(const GUID& Guid)
 }
 
 // для диалога назначения клавиши
-struct DlgParam
+struct MacroDlgParam
 {
 	bool Changed;
 	FarKey MacroKey;
@@ -487,7 +487,7 @@ bool KeyMacro::ProcessKey(FarKey dwKey, const INPUT_RECORD *Rec)
 		if (ctrldot||ctrlshiftdot) // признак конца записи?
 		{
 			m_InternalInput = 1;
-			DlgParam Param {false, 0, 0};
+			MacroDlgParam Param {false, 0, 0};
 			bool AssignRet = AssignMacroKey(&Param);
 
 			if (AssignRet && !Param.Changed && !m_RecCode.IsEmpty())
@@ -779,12 +779,12 @@ LONG_PTR WINAPI KeyMacro::AssignMacroDlgProc(HANDLE hDlg, int Msg, int Param1, L
 	FARString strKeyText;
 	static int Recurse;
 	static FarKey LastKey;
-	static DlgParam *KMParam;
+	static MacroDlgParam *KMParam;
 	bool KeyIsValid = false;
 
 	if (Msg == DN_INITDIALOG)
 	{
-		KMParam = reinterpret_cast<DlgParam*>(Param2);
+		KMParam = reinterpret_cast<MacroDlgParam*>(Param2);
 		LastKey = 0;
 		Recurse = 0;
 		// <Клавиши, которые не введешь в диалоге назначения>
@@ -935,7 +935,7 @@ LONG_PTR WINAPI KeyMacro::AssignMacroDlgProc(HANDLE hDlg, int Msg, int Param1, L
 	return DefDlgProc(hDlg, Msg, Param1, Param2);
 }
 
-bool KeyMacro::AssignMacroKey(DlgParam *Param)
+bool KeyMacro::AssignMacroKey(MacroDlgParam *Param)
 {
 	/*
 	  +------ Define macro ------+

diff --git a/far/src/macro/macro.hpp b/far/src/macro/macro.hpp
@@ -60,7 +60,7 @@ struct MacroPanelSelect {
 	const wchar_t *Item;
 };
 
-struct DlgParam;
+struct MacroDlgParam;
 
 class KeyMacro
 {
@@ -100,7 +100,7 @@ class KeyMacro
 	static FARMACROSTATE GetExecutingState();
 	static bool GetMacroSettings(FarKey Key, DWORD &Flags, const wchar_t* Src, const wchar_t* Descr);
 
-	bool AssignMacroKey(DlgParam *Param);
+	bool AssignMacroKey(MacroDlgParam *Param);
 	void RestoreMacroChar() const;
 
 	static FARString m_RecCode;

diff --git a/far/src/modal.cpp b/far/src/modal.cpp
@@ -44,7 +44,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Modal::Modal():
 	WriteKey(KEY_INVALID),
-	ExitCode(-1),
 	EndLoop(0)
 {
 }
@@ -128,12 +127,6 @@ void Modal::ClearDone()
 }
 
 
-int Modal::GetExitCode()
-{
-	return(ExitCode);
-}
-
-
 void Modal::SetExitCode(int Code)
 {
 	ExitCode=Code;

diff --git a/far/src/modal.hpp b/far/src/modal.hpp
@@ -47,7 +47,6 @@ class Modal: public Frame
 	protected:
 		INPUT_RECORD ReadRec;
 		FARString strHelpTopic;
-		int  ExitCode;
 		int  EndLoop;
 
 	public:
@@ -58,7 +57,6 @@ class Modal: public Frame
 		virtual void GetDialogObjectsData() {};
 		int Done();
 		void ClearDone();
-		int  GetExitCode();
 		virtual void SetExitCode(int Code);
 
 		virtual void Process();

diff --git a/far/src/plug/PluginA.hpp b/far/src/plug/PluginA.hpp
@@ -66,7 +66,6 @@ typedef void (WINAPI *PLUGINGETGLOBALINFO)(GlobalInfo *gi);
 class PluginA: public Plugin
 {
 	private:
-		FARString strRootKey;
 		std::string mbRootKey;
 
 		PluginInfo PI;