fixed more resharper issues

janwilmans · janwilmans · commit 014ad8fbebce · 2017-08-30T00:14:20.000+02:00
diff --git a/DebugView++/LogView.cpp b/DebugView++/LogView.cpp
@@ -278,7 +278,7 @@ void CLogView::UpdateColumns()
 
 ColumnInfo MakeColumn(Column::type column, const wchar_t* name, int format, int width)
 {
-	ColumnInfo info = {0};
+	auto info = ColumnInfo();
 	info.enable = true;
 	info.column.iSubItem = column;
 	info.column.iOrder = column;
@@ -1801,6 +1801,7 @@ bool FilterSupportsColor(FilterType::type value)
 	case FilterType::Stop:
 	case FilterType::Once:
 		return true;
+	default: break;
 	}
 	return false;
 }
diff --git a/DebugView++/PropertyColorItem.h b/DebugView++/PropertyColorItem.h
@@ -106,7 +106,7 @@ class CPropertyColorItem : public CPropertyItem
 		m_dlg.ShowAuto(show);
 	}
 
-    virtual BOOL Activate(UINT action, LPARAM /*lParam*/) override
+	virtual BOOL Activate(UINT action, LPARAM /*lParam*/) override
 	{
 		if (!IsEnabled())
 			return FALSE;
@@ -119,15 +119,16 @@ class CPropertyColorItem : public CPropertyItem
 			if (m_dlg.DoModal(m_hWndOwner) == IDOK)
 			{
 				// Let control owner know
-				NMPROPERTYITEM nmh = { m_hWndOwner, ::GetDlgCtrlID(m_hWndOwner), PIN_ITEMCHANGED, this };
-				::SendMessage(::GetParent(m_hWndOwner), WM_NOTIFY, nmh.hdr.idFrom, (LPARAM) &nmh);
+				NMPROPERTYITEM nmh = {m_hWndOwner, ::GetDlgCtrlID(m_hWndOwner), PIN_ITEMCHANGED, this};
+				::SendMessage(::GetParent(m_hWndOwner), WM_NOTIFY, nmh.hdr.idFrom, reinterpret_cast<LPARAM>(&nmh));
 			}
 			break;
+		default: break;
 		}
 		return TRUE;
 	}
 
-    virtual void DrawValue(PROPERTYDRAWINFO& di) override
+	virtual void DrawValue(PROPERTYDRAWINFO& di) override
 	{
 		CDCHandle dc(di.hDC);
 		RECT rect = di.rcItem;
@@ -152,13 +153,13 @@ class CPropertyColorItem : public CPropertyItem
 		}
 	}
 
-    virtual BOOL GetValue(VARIANT* pValue) const override
+	virtual BOOL GetValue(VARIANT* pValue) const override
 	{
 		CComVariant var(GetColor());
 		return SUCCEEDED(var.Detach(pValue));
 	}
 
-    virtual BOOL SetValue(const VARIANT& value) override
+	virtual BOOL SetValue(const VARIANT& value) override
 	{
 		CComVariant var;
 		if (FAILED(VariantChangeType(&var, &value, 0, VT_COLOR)))
diff --git a/DebugView++/SourceDlg.cpp b/DebugView++/SourceDlg.cpp
@@ -68,7 +68,7 @@ void CSourceDlg::OnException(const std::exception& ex)
 BOOL CSourceDlg::OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/)
 {
 	CenterWindow(GetParent());
-	CComboBox combo = GetDlgItem(IDC_TYPE);
+	CComboBox combo(GetDlgItem(IDC_TYPE));
 	combo.AddString(WStr(SourceTypeToString(SourceType::Udp)));
 	combo.AddString(WStr(SourceTypeToString(SourceType::Tcp)));
 	combo.AddString(WStr(SourceTypeToString(SourceType::DebugViewAgent)));
diff --git a/DebugView++Lib/Colors.cpp b/DebugView++Lib/Colors.cpp
@@ -41,6 +41,7 @@ COLORREF HsvToRgb(double h, double s, double v)
 	case 3: return RGB(pi, qi, vi);
 	case 4: return RGB(ti, pi, vi);
 	case 5: return RGB(vi, pi, qi);
+	default: break;
 	}
 	return 0;
 }
diff --git a/DebugView++Lib/DbgviewReader.cpp b/DebugView++Lib/DbgviewReader.cpp
@@ -64,7 +64,7 @@ std::string ToHex(const T& s)
 	result << "[" << s.size() << "] ";
 
 	for (size_t i = 0; i < s.size(); ++i)
-		result << std::hex << std::setfill('0') << std::setw(2) << std::uppercase << ((int)s[i] & 0xff) << " ";
+		result << std::hex << std::setfill('0') << std::setw(2) << std::uppercase << (static_cast<int>(s[i]) & 0xff) << " ";
 	return result.str();
 }
 
@@ -78,7 +78,7 @@ std::string ToChar(const T& s)
 	{
 		if (s[i] > 32)
 		{
-			result << std::setfill(' ') << std::setw(2) << (char)s[i] << " ";
+			result << std::setfill(' ') << std::setw(2) << static_cast<char>(s[i]) << " ";
 		}
 		else
 		{
diff --git a/DebugView++Lib/FileIO.cpp b/DebugView++Lib/FileIO.cpp
@@ -119,7 +119,7 @@ FileType::type IdentifyFile(const std::wstring& filename)
 		// Encoding detection is very complex, see #107
 		std::ifstream fs(filename, std::ios::binary);
 		std::vector<unsigned char> buffer(3);
-		fs.read((char*)buffer.data(), buffer.size());
+		fs.read(reinterpret_cast<char*>(buffer.data()), buffer.size());
 		if (buffer[0] == 0xfe && buffer[1] == 0xff)
 		{
 			return FileType::UTF16BE;
diff --git a/DebugView++Lib/PolledLogSource.cpp b/DebugView++Lib/PolledLogSource.cpp
@@ -57,7 +57,7 @@ PolledLogSource::PolledLogSource(Timer& timer, SourceType::type sourceType, ILin
 
 PolledLogSource::~PolledLogSource()
 {
-	Abort();
+	PolledLogSource::Abort();
 }
 
 void PolledLogSource::StartThread()
diff --git a/DebugViewConsole/DebugViewConsole.cpp b/DebugViewConsole/DebugViewConsole.cpp
@@ -291,11 +291,11 @@ fusion::debugviewpp::Settings CreateSettings(const std::map<std::string, docopt:
 	settings.tabs = args.at("-q").asBool();
 	settings.pid = args.at("-p").asBool();
 	settings.processName = args.at("-n").asBool();
-    settings.include = args.at("--include").asStringList();
-    settings.exclude = args.at("--exclude").asStringList();
-    settings.includeprocesses = args.at("--include-process").asStringList();
-    settings.excludeprocesses = args.at("--exclude-process").asStringList();
-    auto quitmessageEntry = args.at("--quit-message");
+	settings.include = args.at("--include").asStringList();
+	settings.exclude = args.at("--exclude").asStringList();
+	settings.includeprocesses = args.at("--include-process").asStringList();
+	settings.excludeprocesses = args.at("--exclude-process").asStringList();
+	auto quitmessageEntry = args.at("--quit-message");
 	settings.quitmessage = (quitmessageEntry) ? quitmessageEntry.asString() : "";
 	return settings;
 }
diff --git a/plugins/cs/HttpMonitor/Program.cs b/plugins/cs/HttpMonitor/Program.cs
@@ -126,7 +126,7 @@ public List<string> Get()
 
 	static class Util
 	{
-		static public void DebugWrite(string msg)
+		public static void DebugWrite(string msg)
 		{
 			Console.WriteLine(msg);
 			Trace.WriteLine(msg);
@@ -135,9 +135,9 @@ static public void DebugWrite(string msg)
 
 	static class Settings
 	{
-		static public bool Verbose;
-		static public int PollInterval = 5000;
-		static public int HttpTimeout = 5000;
+		public static bool Verbose;
+		public static int PollInterval = 5000;
+		public static int HttpTimeout = 5000;
 	}
 
 	class DebugViewPlugin

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ void CLogView::UpdateColumns()`
`278`	`278`
`279`	`279`	`ColumnInfo MakeColumn(Column::type column, const wchar_t* name, int format, int width)`
`280`	`280`	`{`
`281`		`- ColumnInfo info = {0};`
	`281`	`+ auto info = ColumnInfo();`
`282`	`282`	`info.enable = true;`
`283`	`283`	`info.column.iSubItem = column;`
`284`	`284`	`info.column.iOrder = column;`
`@@ -1801,6 +1801,7 @@ bool FilterSupportsColor(FilterType::type value)`
`1801`	`1801`	`case FilterType::Stop:`
`1802`	`1802`	`case FilterType::Once:`
`1803`	`1803`	`return true;`
	`1804`	`+ default: break;`
`1804`	`1805`	`}`
`1805`	`1806`	`return false;`
`1806`	`1807`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ class CPropertyColorItem : public CPropertyItem`
`106`	`106`	`m_dlg.ShowAuto(show);`
`107`	`107`	`}`
`108`	`108`
`109`		`- virtual BOOL Activate(UINT action, LPARAM /lParam/) override`
	`109`	`+ virtual BOOL Activate(UINT action, LPARAM /lParam/) override`
`110`	`110`	`{`
`111`	`111`	`if (!IsEnabled())`
`112`	`112`	`return FALSE;`
`@@ -119,15 +119,16 @@ class CPropertyColorItem : public CPropertyItem`
`119`	`119`	`if (m_dlg.DoModal(m_hWndOwner) == IDOK)`
`120`	`120`	`{`
`121`	`121`	`// Let control owner know`
`122`		`- NMPROPERTYITEM nmh = { m_hWndOwner, ::GetDlgCtrlID(m_hWndOwner), PIN_ITEMCHANGED, this };`
`123`		`- ::SendMessage(::GetParent(m_hWndOwner), WM_NOTIFY, nmh.hdr.idFrom, (LPARAM) &nmh);`
	`122`	`+ NMPROPERTYITEM nmh = {m_hWndOwner, ::GetDlgCtrlID(m_hWndOwner), PIN_ITEMCHANGED, this};`
	`123`	`+ ::SendMessage(::GetParent(m_hWndOwner), WM_NOTIFY, nmh.hdr.idFrom, reinterpret_cast<LPARAM>(&nmh));`
`124`	`124`	`}`
`125`	`125`	`break;`
	`126`	`+ default: break;`
`126`	`127`	`}`
`127`	`128`	`return TRUE;`
`128`	`129`	`}`
`129`	`130`
`130`		`- virtual void DrawValue(PROPERTYDRAWINFO& di) override`
	`131`	`+ virtual void DrawValue(PROPERTYDRAWINFO& di) override`
`131`	`132`	`{`
`132`	`133`	`CDCHandle dc(di.hDC);`
`133`	`134`	`RECT rect = di.rcItem;`
`@@ -152,13 +153,13 @@ class CPropertyColorItem : public CPropertyItem`
`152`	`153`	`}`
`153`	`154`	`}`
`154`	`155`
`155`		`- virtual BOOL GetValue(VARIANT* pValue) const override`
	`156`	`+ virtual BOOL GetValue(VARIANT* pValue) const override`
`156`	`157`	`{`
`157`	`158`	`CComVariant var(GetColor());`
`158`	`159`	`return SUCCEEDED(var.Detach(pValue));`
`159`	`160`	`}`
`160`	`161`
`161`		`- virtual BOOL SetValue(const VARIANT& value) override`
	`162`	`+ virtual BOOL SetValue(const VARIANT& value) override`
`162`	`163`	`{`
`163`	`164`	`CComVariant var;`
`164`	`165`	`if (FAILED(VariantChangeType(&var, &value, 0, VT_COLOR)))`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ void CSourceDlg::OnException(const std::exception& ex)`
`68`	`68`	`BOOL CSourceDlg::OnInitDialog(CWindow /wndFocus/, LPARAM /lInitParam/)`
`69`	`69`	`{`
`70`	`70`	`CenterWindow(GetParent());`
`71`		`- CComboBox combo = GetDlgItem(IDC_TYPE);`
	`71`	`+ CComboBox combo(GetDlgItem(IDC_TYPE));`
`72`	`72`	`combo.AddString(WStr(SourceTypeToString(SourceType::Udp)));`
`73`	`73`	`combo.AddString(WStr(SourceTypeToString(SourceType::Tcp)));`
`74`	`74`	`combo.AddString(WStr(SourceTypeToString(SourceType::DebugViewAgent)));`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ COLORREF HsvToRgb(double h, double s, double v)`
`41`	`41`	`case 3: return RGB(pi, qi, vi);`
`42`	`42`	`case 4: return RGB(ti, pi, vi);`
`43`	`43`	`case 5: return RGB(vi, pi, qi);`
	`44`	`+ default: break;`
`44`	`45`	`}`
`45`	`46`	`return 0;`
`46`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ std::string ToHex(const T& s)`
`64`	`64`	`result << "[" << s.size() << "] ";`
`65`	`65`
`66`	`66`	`for (size_t i = 0; i < s.size(); ++i)`
`67`		`- result << std::hex << std::setfill('0') << std::setw(2) << std::uppercase << ((int)s[i] & 0xff) << " ";`
	`67`	`+ result << std::hex << std::setfill('0') << std::setw(2) << std::uppercase << (static_cast<int>(s[i]) & 0xff) << " ";`
`68`	`68`	`return result.str();`
`69`	`69`	`}`
`70`	`70`
`@@ -78,7 +78,7 @@ std::string ToChar(const T& s)`
`78`	`78`	`{`
`79`	`79`	`if (s[i] > 32)`
`80`	`80`	`{`
`81`		`- result << std::setfill(' ') << std::setw(2) << (char)s[i] << " ";`
	`81`	`+ result << std::setfill(' ') << std::setw(2) << static_cast<char>(s[i]) << " ";`
`82`	`82`	`}`
`83`	`83`	`else`
`84`	`84`	`{`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ FileType::type IdentifyFile(const std::wstring& filename)`
`119`	`119`	`// Encoding detection is very complex, see #107`
`120`	`120`	`std::ifstream fs(filename, std::ios::binary);`
`121`	`121`	`std::vector<unsigned char> buffer(3);`
`122`		`- fs.read((char*)buffer.data(), buffer.size());`
	`122`	`+ fs.read(reinterpret_cast<char*>(buffer.data()), buffer.size());`
`123`	`123`	`if (buffer[0] == 0xfe && buffer[1] == 0xff)`
`124`	`124`	`{`
`125`	`125`	`return FileType::UTF16BE;`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ PolledLogSource::PolledLogSource(Timer& timer, SourceType::type sourceType, ILin`
`57`	`57`
`58`	`58`	`PolledLogSource::~PolledLogSource()`
`59`	`59`	`{`
`60`		`- Abort();`
	`60`	`+ PolledLogSource::Abort();`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`void PolledLogSource::StartThread()`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public List<string> Get()`
`126`	`126`
`127`	`127`	`static class Util`
`128`	`128`	`{`
`129`		`- static public void DebugWrite(string msg)`
	`129`	`+ public static void DebugWrite(string msg)`
`130`	`130`	`{`
`131`	`131`	`Console.WriteLine(msg);`
`132`	`132`	`Trace.WriteLine(msg);`
`@@ -135,9 +135,9 @@ static public void DebugWrite(string msg)`
`135`	`135`
`136`	`136`	`static class Settings`
`137`	`137`	`{`
`138`		`- static public bool Verbose;`
`139`		`- static public int PollInterval = 5000;`
`140`		`- static public int HttpTimeout = 5000;`
	`138`	`+ public static bool Verbose;`
	`139`	`+ public static int PollInterval = 5000;`
	`140`	`+ public static int HttpTimeout = 5000;`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`class DebugViewPlugin`