- avoid usage of additional _DebugMode in FTPSettings by making FTPSettings::m_debugMode and corresponding setter/getter static

chcg · chcg · commit 39cda2fc7ed3 · 2026-01-03T14:07:53.000+01:00
- make further methods const
diff --git a/src/FTPSettings.cpp b/src/FTPSettings.cpp
@@ -1,19 +1,19 @@
 /*
-    NppFTP: FTP/SFTP functionality for Notepad++
-    Copyright (C) 2010  Harry (harrybharry@users.sourceforge.net)
+	NppFTP: FTP/SFTP functionality for Notepad++
+	Copyright (C) 2010  Harry (harrybharry@users.sourceforge.net)
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "StdInc.h"
@@ -22,7 +22,7 @@
 #include "Encryption.h"
 #include "InputDialog.h"
 
-bool	_DebugMode = false;
+bool	FTPSettings::m_debugMode = false;
 
 FTPSettings::FTPSettings() :
 	m_clearCache(false),
@@ -32,7 +32,7 @@ FTPSettings::FTPSettings() :
 {
 	m_globalCachePath = SU::DupString(TEXT("%CONFIGDIR%\\Cache\\%USERNAME%@%HOSTNAME%"));
 
-	PathMap globalPathmap;
+	PathMap globalPathmap{};
 	globalPathmap.localpath = SU::DupString(m_globalCachePath);
 	globalPathmap.externalpath = SU::strdup("/");
 	m_globalCache.Clear();
@@ -53,7 +53,7 @@ int FTPSettings::SetGlobalCachePath(const TCHAR * path) {
 		path = TEXT("%CONFIGDIR%\\Cache\\%USERNAME%@%HOSTNAME%\\%PORT%");
 	}
 
-	PathMap globalPathmap;
+	PathMap globalPathmap{};
 	globalPathmap.localpath = SU::DupString(path);
 	globalPathmap.externalpath = SU::strdup("/");
 	m_globalCache.Clear();
@@ -78,13 +78,12 @@ int FTPSettings::SetEncryptionKey(const char * key) {
 	return 0;
 }
 
-bool FTPSettings::GetDebugMode() const {
+bool FTPSettings::GetDebugMode() {
 	return m_debugMode;
 }
 
 int FTPSettings::SetDebugMode(bool debugMode) {
 	m_debugMode = debugMode;
-	_DebugMode = m_debugMode;	
 	return 0;
 }
 
@@ -187,14 +186,13 @@ int FTPSettings::LoadSettings(const TiXmlElement * settingsElem) {
 		clearState = 0;
 	}
 	m_clearCache = (clearState != 0);
-	
+
 	int debugModeState = 0;
 	const char * debugModeStr = settingsElem->Attribute("debugMode", &debugModeState);
 	if (!debugModeStr) {
 		debugModeState = 0;
 	}
 	m_debugMode = (debugModeState != 0);
-	_DebugMode = m_debugMode;
 
 
 	clearState = 0;
@@ -207,7 +205,7 @@ int FTPSettings::LoadSettings(const TiXmlElement * settingsElem) {
 	return 0;
 }
 
-int FTPSettings::SaveSettings(TiXmlElement * settingsElem) {
+int FTPSettings::SaveSettings(TiXmlElement * settingsElem) const {
 	char * defaultCacheutf8 = SU::TCharToUtf8(m_globalCachePath);
 	settingsElem->SetAttribute("defaultCache", defaultCacheutf8);
 	SU::FreeChar(defaultCacheutf8);
diff --git a/src/FTPSettings.h b/src/FTPSettings.h
@@ -1,19 +1,19 @@
 /*
-    NppFTP: FTP/SFTP functionality for Notepad++
-    Copyright (C) 2010  Harry (harrybharry@users.sourceforge.net)
+	NppFTP: FTP/SFTP functionality for Notepad++
+	Copyright (C) 2010  Harry (harrybharry@users.sourceforge.net)
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef FTPSETTINGS_H
@@ -36,8 +36,8 @@ class FTPSettings {
 	const char*				GetEncryptionKey() const;	//array of size 8
 	int						SetEncryptionKey(const char * key);	//key must array of size 8
 
-	bool					GetDebugMode() const;
-	int						SetDebugMode(bool debugMode);
+	static bool				GetDebugMode();
+	static int				SetDebugMode(bool debugMode);
 
 	bool					GetClearCache() const;
 	int						SetClearCache(bool clearCache);
@@ -52,15 +52,15 @@ class FTPSettings {
 	int						SetSplitRatio(double splitRatio);
 
 	int						LoadSettings(const TiXmlElement * settingsElem);
-	int						SaveSettings(TiXmlElement * settingsElem);
+	int						SaveSettings(TiXmlElement * settingsElem) const;
 private:
 	TCHAR*					m_globalCachePath;
 	FTPCache				m_globalCache;
 	bool					m_clearCache;
 	bool					m_clearCachePermanent;
 	bool					m_showOutput;
 	double					m_splitRatio;
-	bool					m_debugMode;
+	static bool				m_debugMode;
 };
 
 #endif //FTPSETTINGS_H
diff --git a/src/Output.cpp b/src/Output.cpp
@@ -1,31 +1,32 @@
 /*
-    NppFTP: FTP/SFTP functionality for Notepad++
-    Copyright (C) 2010  Harry (harrybharry@users.sourceforge.net)
+	NppFTP: FTP/SFTP functionality for Notepad++
+	Copyright (C) 2010  Harry (harrybharry@users.sourceforge.net)
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "StdInc.h"
 //#include "Output.h"
+#include "FTPSettings.h"
 
 
 int OutputDebug(const TCHAR * msg, ...) {
 
-	if (!_DebugMode) {
+	if (!FTPSettings::GetDebugMode()) {
 		return 0;
 	}
-	
+
 	va_list vaList;
 	va_start(vaList, msg);
 	int ret = -1;
@@ -50,7 +51,7 @@ int OutputMsg(const TCHAR * msg, ...) {
 
 int OutputClnt(const TCHAR * msg, ...) {
 
-	if (!_DebugMode) {
+	if (!FTPSettings::GetDebugMode()) {
 		return 0;
 	}
 
diff --git a/src/Output.h b/src/Output.h
@@ -1,19 +1,19 @@
 /*
-    NppFTP: FTP/SFTP functionality for Notepad++
-    Copyright (C) 2010  Harry (harrybharry@users.sourceforge.net)
+	NppFTP: FTP/SFTP functionality for Notepad++
+	Copyright (C) 2010  Harry (harrybharry@users.sourceforge.net)
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef OUTPUT_H
@@ -31,7 +31,6 @@ class Output {
 
 extern Output* _MainOutput;
 extern HWND _MainOutputWindow;
-extern bool _DebugMode;
 
 int OutputDebug(const TCHAR * msg, ...);
 int OutputMsg(const TCHAR * msg, ...);
diff --git a/src/QueueOperation.cpp b/src/QueueOperation.cpp
@@ -377,7 +377,7 @@ const char* QueueCopyFile::GetExternalPath() {
 	return m_externalFile;
 }
 
-const char* QueueCopyFile::GetExternalOriginParent() {
+const char* QueueCopyFile::GetExternalOriginParent() const {
 	char* basepath = SU::strdup(m_externalFile);
 	char * lastSlash=strrchr(basepath, '/');
 	lastSlash[0] = '\0';
@@ -387,7 +387,7 @@ const char* QueueCopyFile::GetExternalOriginParent() {
 		return basepath;
 }
 
-const char* QueueCopyFile::GetExternalNewParent() {
+const char* QueueCopyFile::GetExternalNewParent() const {
 	char* basepath = SU::strdup(m_target);
 	char* lastSlash = strrchr(basepath, '/');
 	lastSlash[0] = '\0';
diff --git a/src/QueueOperation.h b/src/QueueOperation.h
@@ -177,8 +177,8 @@ class QueueCopyFile : public QueueOperation {
 	virtual bool			Equals(const QueueOperation& other);
 
 	virtual const char* GetExternalPath();
-	const char* GetExternalOriginParent();
-	const char* GetExternalNewParent();
+	const char* GetExternalOriginParent() const;
+	const char* GetExternalNewParent() const;
 protected:
 	char* m_externalFile;
 	char* m_target;
