Fixed warnings.

leozide · leozide · commit 2c8926563baa · 2025-07-05T20:07:32.000-07:00
diff --git a/common/lc_model.cpp b/common/lc_model.cpp
@@ -2401,7 +2401,6 @@ void lcModel::FocusNextTrainTrack()
 		return;
 
 	quint32 FocusSection = FocusPiece->GetFocusSection();
-	std::optional<lcMatrix44> Transform;
 	int ConnectionIndex = 0;
 
 	if (FocusSection != LC_PIECE_SECTION_INVALID && FocusSection != LC_PIECE_SECTION_POSITION)
@@ -2430,7 +2429,6 @@ void lcModel::FocusPreviousTrainTrack()
 		return;
 
 	quint32 FocusSection = FocusPiece->GetFocusSection();
-	std::optional<lcMatrix44> Transform;
 	int ConnectionIndex = 0;
 
 	if (FocusSection != LC_PIECE_SECTION_INVALID && FocusSection != LC_PIECE_SECTION_POSITION)
diff --git a/common/project.cpp b/common/project.cpp
@@ -1859,7 +1859,7 @@ bool Project::ExportPOVRay(const QString& FileName)
 	lcPiecesLibrary* Library = lcGetPiecesLibrary();
 	std::map<const PieceInfo*, std::pair<char[LC_PIECE_NAME_LEN + 1], int>> PieceTable;
 	size_t NumColors = gColorList.size();
-	std::vector<std::array<char, LC_MAX_COLOR_NAME + 3>> LgeoColorTable(NumColors);
+	std::vector<std::string> LgeoColorTable(NumColors);
 	std::vector<std::array<char, LC_MAX_COLOR_NAME + 3>> ColorTable(NumColors);
 
 	const std::vector<std::unique_ptr<lcLight>>& Lights = gMainWindow->GetActiveModel()->GetLights();
@@ -2291,12 +2291,12 @@ bool Project::ExportPOVRay(const QString& FileName)
 			if (sscanf(Line,"%d%s%s", &Code, Name, Flags) != 3)
 				continue;
 
-			size_t ColorIdx = lcGetColorIndex(Code);
-			if (ColorIdx >= NumColors)
+			size_t ColorIndex = lcGetColorIndex(Code);
+
+			if (ColorIndex >= NumColors)
 				continue;
 
-			strncpy(LgeoColorTable[ColorIdx].data(), Name, LgeoColorTable[ColorIdx].size());
-			LgeoColorTable[ColorIdx][LgeoColorTable[ColorIdx].size() - 1] = 0;
+			LgeoColorTable[ColorIndex] = Name;
 		}
 	}
 
@@ -2308,7 +2308,7 @@ bool Project::ExportPOVRay(const QString& FileName)
 		{
 			lcColor* Color = &gColorList[ColorIdx];
 
-			if (!LgeoColorTable[ColorIdx][0])
+			if (LgeoColorTable[ColorIdx].empty())
 			{
 				sprintf(ColorTable[ColorIdx].data(), "lc_%s", Color->SafeName);
 
@@ -2339,7 +2339,7 @@ bool Project::ExportPOVRay(const QString& FileName)
 				sprintf(ColorTable[ColorIdx].data(), "LDXColor%i", Color->Code);
 
 				sprintf(Line,"#ifndef (LDXColor%i) // %s\n#declare LDXColor%i = material { texture { %s } }\n#end\n\n",
-						Color->Code, Color->Name, Color->Code, LgeoColorTable[ColorIdx].data());
+						Color->Code, Color->Name, Color->Code, LgeoColorTable[ColorIdx].c_str());
 			}
 
 			POVFile.WriteLine(Line);
@@ -2354,12 +2354,12 @@ bool Project::ExportPOVRay(const QString& FileName)
 
 		sprintf(ColorTable[ColorIdx].data(), "LDXColor%i", Color->Code);
 
-		if (!LgeoColorTable[ColorIdx][0])
+		if (LgeoColorTable[ColorIdx].empty())
 			sprintf(Line, "#ifndef (lc_%s)\n#declare lc_%s = OpaqueColor(%g, %g, %g)\n#end\n\n",
 					Color->SafeName, Color->SafeName, Color->Value[0], Color->Value[1], Color->Value[2]);
 		else
 			sprintf(Line,"#ifndef (LDXColor%i) // %s\n#declare LDXColor%i = material { texture { %s } }\n#end\n\n",
-					Color->Code, Color->Name, Color->Code, LgeoColorTable[ColorIdx].data());
+					Color->Code, Color->Name, Color->Code, LgeoColorTable[ColorIdx].c_str());
 
 		POVFile.WriteLine(Line);
 	}
diff --git a/qt/lc_qutils.h b/qt/lc_qutils.h
@@ -134,7 +134,7 @@ class lcElidableToolButton : public QToolButton
 	}
 
 protected:
-	void paintEvent(QPaintEvent*)
+	void paintEvent(QPaintEvent*) override
 	{
 		QStylePainter Painter(this);
 		QStyleOptionToolButton Option;

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ class lcElidableToolButton : public QToolButton`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`protected:`
`137`		`- void paintEvent(QPaintEvent*)`
	`137`	`+ void paintEvent(QPaintEvent*) override`
`138`	`138`	`{`
`139`	`139`	`QStylePainter Painter(this);`
`140`	`140`	`QStyleOptionToolButton Option;`