More cppcheck fixes around initialization and references

azonenberg · azonenberg · commit e0e9bfcae49e · 2026-05-08T20:41:29.000-07:00
diff --git a/lib b/lib
@@ -1 +1 @@
-Subproject commit 5ee264c7710af041aac783a460773812002522a6
+Subproject commit 3e69ba312a04423758e4524bb175f05fbd718d0d
diff --git a/src/ngscopeclient/AboutDialog.cpp b/src/ngscopeclient/AboutDialog.cpp
@@ -50,13 +50,12 @@ using namespace std;
 AboutDialog::AboutDialog(MainWindow* parent)
 	: Dialog("About ngscopeclient", to_string_hex(reinterpret_cast<uintptr_t>(this)), ImVec2(600, 400))
 	, m_parent(parent)
-{
+
 	//this file is currently maintained by hand and updated for each release
 	//TODO: make a script for this using https://api.github.com/repos/ngscopeclient/scopehal-apps/contributors
-	m_authorsMarkdown = ReadDataFile("md/authors.md");
-
-	m_licenseMarkdown = ReadDataFile("md/licenses.md");
-
+	, m_authorsMarkdown(ReadDataFile("md/authors.md"))
+	, m_licenseMarkdown(ReadDataFile("md/licenses.md"))
+{
 	InitVulkanInfo();
 }
 
diff --git a/src/ngscopeclient/AddInstrumentDialog.cpp b/src/ngscopeclient/AddInstrumentDialog.cpp
@@ -76,7 +76,7 @@ AddInstrumentDialog::AddInstrumentDialog(
 	if(!driver.empty())
 	{
 		int i = 0;
-		for(auto driverName: m_drivers)
+		for(auto& driverName : m_drivers)
 		{
 			if(driverName == driver)
 			{
@@ -92,7 +92,7 @@ AddInstrumentDialog::AddInstrumentDialog(
 	if(!transport.empty())
 	{
 		int i = 0;
-		for(auto transportName: m_transports)
+		for(auto& transportName : m_transports)
 		{
 			if(transportName == transport)
 			{
@@ -325,7 +325,7 @@ void AddInstrumentDialog::UpdateCombos()
 		int modelIndex = 0;
 		auto selectedModel = supportedModels[0];
 		// Model list
-		for(auto model : supportedModels)
+		for(auto& model : supportedModels)
 		{
 			m_models.push_back(model.modelName);
 			if(modelIndex == m_selectedModel)
@@ -343,7 +343,7 @@ void AddInstrumentDialog::UpdateCombos()
 
 		// Transport list
 		int transportIndex = 0;
-		for(auto transport : selectedModel.supportedTransports)
+		for(auto& transport : selectedModel.supportedTransports)
 		{
 			string transportName = to_string(transport.transportType);
 			// Prepare transport type for default value
@@ -372,7 +372,7 @@ void AddInstrumentDialog::UpdateCombos()
 		// Update endpoint list
 		auto endpoints = SCPITransport::EnumEndpoints(m_transports[m_selectedTransport]);
 		int endpointIndex = 0;
-		for(auto endpoint : endpoints)
+		for(auto& endpoint : endpoints)
 		{
 			m_endpoints.push_back(endpoint);
 			m_endpointNames.push_back(endpoint.path + " ("+ endpoint.description +")");
diff --git a/src/ngscopeclient/Dialog.cpp b/src/ngscopeclient/Dialog.cpp
@@ -223,7 +223,7 @@ void Dialog::HelpMarker(const string& header, const vector<string>& bullets)
 		ImGui::BeginTooltip();
 		ImGui::PushTextWrapPos(ImGui::GetFontSize() * 50);
 		ImGui::TextUnformatted(header.c_str());
-		for(auto s : bullets)
+		for(auto& s : bullets)
 			ImGui::BulletText("%s", s.c_str());
 		ImGui::PopTextWrapPos();
 		ImGui::EndTooltip();
diff --git a/src/ngscopeclient/EmbeddedTriggerPropertiesDialog.cpp b/src/ngscopeclient/EmbeddedTriggerPropertiesDialog.cpp
@@ -42,12 +42,11 @@ EmbeddedTriggerPropertiesDialog::EmbeddedTriggerPropertiesDialog(shared_ptr<Osci
 		ImVec2(300, 400),
 		nullptr,
 		true)
+	, m_page(make_unique<TriggerPropertiesPage>(scope))
+	, m_triggerTypeIndex(0)
 	, m_scope(scope)
 {
-	m_page = make_unique<TriggerPropertiesPage>(scope);
-
 	//Figure out combo index for active trigger
-	m_triggerTypeIndex = 0;
 	vector<string> types = scope->GetTriggerTypes();
 	auto trig = scope->GetTrigger();
 	string ttype;
diff --git a/src/ngscopeclient/FilterGraphEditor.cpp b/src/ngscopeclient/FilterGraphEditor.cpp
@@ -53,9 +53,9 @@ using namespace std;
 
 FilterGraphGroup::FilterGraphGroup(FilterGraphEditor& ed)
 	: m_parent(ed)
+	, m_outputId(ed.AllocateID())
+	, m_inputId(ed.AllocateID())
 {
-	m_outputId = ed.AllocateID();
-	m_inputId = ed.AllocateID();
 }
 
 /**
@@ -2616,7 +2616,7 @@ void FilterGraphEditor::DoAddMenu()
 		ImGui::PushFont(nullptr, 0);
 
 		//Do all of the menu items
-		for(auto fname : sortedNames)
+		for(auto& fname : sortedNames)
 		{
 			//Hide everything but import filters
 			if(fname.find("Import") == string::npos)
diff --git a/src/ngscopeclient/MeasurementsDialog.cpp b/src/ngscopeclient/MeasurementsDialog.cpp
@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ngscopeclient                                                                                                        *
 *                                                                                                                      *
-* Copyright (c) 2012-2023 Andrew D. Zonenberg                                                                          *
+* Copyright (c) 2012-2026 Andrew D. Zonenberg and contributors                                                         *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -42,15 +42,14 @@ using namespace std;
 // Construction / destruction
 
 MeasurementsDialog::MeasurementsDialog(Session& session)
-	: Dialog("Measurements", "Measurements", ImVec2(300, 400))
-	, m_session(session)
+	: Dialog("Measurements", "Measurements", ImVec2(300, 400), &session)
 {
 
 }
 
 MeasurementsDialog::~MeasurementsDialog()
 {
-	for(auto s : m_streams)
+	for(auto& s : m_streams)
 	{
 		auto ochan = dynamic_cast<OscilloscopeChannel*>(s.m_channel);
 		if(ochan)
diff --git a/src/ngscopeclient/MeasurementsDialog.h b/src/ngscopeclient/MeasurementsDialog.h
@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ngscopeclient                                                                                                        *
 *                                                                                                                      *
-* Copyright (c) 2012-2023 Andrew D. Zonenberg                                                                          *
+* Copyright (c) 2012-2026 Andrew D. Zonenberg and contributors                                                                         *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -55,7 +55,6 @@ class MeasurementsDialog : public Dialog
 	{ return (m_streamset.find(stream) != m_streamset.end()); }
 
 protected:
-	Session& m_session;
 
 	void RemoveStream(size_t i);
 

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ AddInstrumentDialog::AddInstrumentDialog(`
`76`	`76`	`if(!driver.empty())`
`77`	`77`	`{`
`78`	`78`	`int i = 0;`
`79`		`- for(auto driverName: m_drivers)`
	`79`	`+ for(auto& driverName : m_drivers)`
`80`	`80`	`{`
`81`	`81`	`if(driverName == driver)`
`82`	`82`	`{`
`@@ -92,7 +92,7 @@ AddInstrumentDialog::AddInstrumentDialog(`
`92`	`92`	`if(!transport.empty())`
`93`	`93`	`{`
`94`	`94`	`int i = 0;`
`95`		`- for(auto transportName: m_transports)`
	`95`	`+ for(auto& transportName : m_transports)`
`96`	`96`	`{`
`97`	`97`	`if(transportName == transport)`
`98`	`98`	`{`
`@@ -325,7 +325,7 @@ void AddInstrumentDialog::UpdateCombos()`
`325`	`325`	`int modelIndex = 0;`
`326`	`326`	`auto selectedModel = supportedModels[0];`
`327`	`327`	`// Model list`
`328`		`- for(auto model : supportedModels)`
	`328`	`+ for(auto& model : supportedModels)`
`329`	`329`	`{`
`330`	`330`	`m_models.push_back(model.modelName);`
`331`	`331`	`if(modelIndex == m_selectedModel)`
`@@ -343,7 +343,7 @@ void AddInstrumentDialog::UpdateCombos()`
`343`	`343`
`344`	`344`	`// Transport list`
`345`	`345`	`int transportIndex = 0;`
`346`		`- for(auto transport : selectedModel.supportedTransports)`
	`346`	`+ for(auto& transport : selectedModel.supportedTransports)`
`347`	`347`	`{`
`348`	`348`	`string transportName = to_string(transport.transportType);`
`349`	`349`	`// Prepare transport type for default value`
`@@ -372,7 +372,7 @@ void AddInstrumentDialog::UpdateCombos()`
`372`	`372`	`// Update endpoint list`
`373`	`373`	`auto endpoints = SCPITransport::EnumEndpoints(m_transports[m_selectedTransport]);`
`374`	`374`	`int endpointIndex = 0;`
`375`		`- for(auto endpoint : endpoints)`
	`375`	`+ for(auto& endpoint : endpoints)`
`376`	`376`	`{`
`377`	`377`	`m_endpoints.push_back(endpoint);`
`378`	`378`	`m_endpointNames.push_back(endpoint.path + " ("+ endpoint.description +")");`
Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,9 @@ using namespace std;`
`53`	`53`
`54`	`54`	`FilterGraphGroup::FilterGraphGroup(FilterGraphEditor& ed)`
`55`	`55`	`: m_parent(ed)`
	`56`	`+ , m_outputId(ed.AllocateID())`
	`57`	`+ , m_inputId(ed.AllocateID())`
`56`	`58`	`{`
`57`		`- m_outputId = ed.AllocateID();`
`58`		`- m_inputId = ed.AllocateID();`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`/**`
`@@ -2616,7 +2616,7 @@ void FilterGraphEditor::DoAddMenu()`
`2616`	`2616`	`ImGui::PushFont(nullptr, 0);`
`2617`	`2617`
`2618`	`2618`	`//Do all of the menu items`
`2619`		`- for(auto fname : sortedNames)`
	`2619`	`+ for(auto& fname : sortedNames)`
`2620`	`2620`	`{`
`2621`	`2621`	`//Hide everything but import filters`
`2622`	`2622`	`if(fname.find("Import") == string::npos)`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`* *`
`3`	`3`	`* ngscopeclient *`
`4`	`4`	`* *`
`5`		`-* Copyright (c) 2012-2023 Andrew D. Zonenberg *`
	`5`	`+* Copyright (c) 2012-2026 Andrew D. Zonenberg and contributors *`
`6`	`6`	`* All rights reserved. *`
`7`	`7`	`* *`
`8`	`8`	`* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the *`
`@@ -42,15 +42,14 @@ using namespace std;`
`42`	`42`	`// Construction / destruction`
`43`	`43`
`44`	`44`	`MeasurementsDialog::MeasurementsDialog(Session& session)`
`45`		`- : Dialog("Measurements", "Measurements", ImVec2(300, 400))`
`46`		`- , m_session(session)`
	`45`	`+ : Dialog("Measurements", "Measurements", ImVec2(300, 400), &session)`
`47`	`46`	`{`
`48`	`47`
`49`	`48`	`}`
`50`	`49`
`51`	`50`	`MeasurementsDialog::~MeasurementsDialog()`
`52`	`51`	`{`
`53`		`- for(auto s : m_streams)`
	`52`	`+ for(auto& s : m_streams)`
`54`	`53`	`{`
`55`	`54`	`auto ochan = dynamic_cast<OscilloscopeChannel*>(s.m_channel);`
`56`	`55`	`if(ochan)`