Merge pull request #974 from tweksteen/b_747

leozide · web-flow · commit 2c29cb1bbf9e · 2025-07-05T12:01:40.000-07:00
Add lcMouseShortcuts::Clear()
diff --git a/common/lc_shortcuts.cpp b/common/lc_shortcuts.cpp
@@ -128,9 +128,20 @@ bool lcKeyboardShortcuts::Load(QTextStream& Stream)
 	return true;
 }
 
+void lcMouseShortcuts::Clear()
+{
+	for (int ShortcutIndex = 0; ShortcutIndex < static_cast<int>(lcTool::Count); ShortcutIndex++)
+	{
+		mShortcuts[ShortcutIndex].Modifiers1 = Qt::NoModifier;
+		mShortcuts[ShortcutIndex].Button1 = Qt::NoButton;
+		mShortcuts[ShortcutIndex].Modifiers2 = Qt::NoModifier;
+		mShortcuts[ShortcutIndex].Button2 = Qt::NoButton;
+	}
+}
+
 void lcMouseShortcuts::Reset()
 {
-	memset(mShortcuts, 0, sizeof(mShortcuts));
+	Clear();
 
 	lcToolShortcut& RotateViewShortcut = mShortcuts[static_cast<int>(lcTool::RotateView)];
 	RotateViewShortcut.Modifiers1 = Qt::AltModifier;
@@ -174,25 +185,25 @@ bool lcMouseShortcuts::Save(QStringList& Shortcuts)
 {
 	Shortcuts.clear();
 
-	for (int ToolIdx = 0; ToolIdx < static_cast<int>(lcTool::Count); ToolIdx++)
+	for (int ShortcutIndex = 0; ShortcutIndex < static_cast<int>(lcTool::Count); ShortcutIndex++)
 	{
 		int ButtonIndex1 = 0;
-		for (int Button1 = mShortcuts[ToolIdx].Button1; Button1; Button1 >>= 1)
+		for (int Button1 = mShortcuts[ShortcutIndex].Button1; Button1; Button1 >>= 1)
 			ButtonIndex1++;
 
 		if (!ButtonIndex1)
 			continue;
 
-		QString Shortcut = QKeySequence(mShortcuts[ToolIdx].Modifiers1 | (Qt::Key_0 + ButtonIndex1)).toString(QKeySequence::PortableText);
+		QString Shortcut = QKeySequence(mShortcuts[ShortcutIndex].Modifiers1 | (Qt::Key_0 + ButtonIndex1)).toString(QKeySequence::PortableText);
 
 		int ButtonIndex2 = 0;
-		for (int Button2 = mShortcuts[ToolIdx].Button2; Button2; Button2 >>= 1)
+		for (int Button2 = mShortcuts[ShortcutIndex].Button2; Button2; Button2 >>= 1)
 			ButtonIndex2++;
 
 		if (ButtonIndex2)
-			Shortcut += ',' + QKeySequence(mShortcuts[ToolIdx].Modifiers2 | (Qt::Key_0 + ButtonIndex2)).toString(QKeySequence::PortableText);
+			Shortcut += ',' + QKeySequence(mShortcuts[ShortcutIndex].Modifiers2 | (Qt::Key_0 + ButtonIndex2)).toString(QKeySequence::PortableText);
 
-		Shortcuts << QString::fromLatin1(gToolNames[ToolIdx]) + QLatin1String("=") + Shortcut;
+		Shortcuts << QString::fromLatin1(gToolNames[ShortcutIndex]) + QLatin1String("=") + Shortcut;
 	}
 
 	return true;
@@ -216,7 +227,7 @@ bool lcMouseShortcuts::Load(const QString& FileName)
 
 bool lcMouseShortcuts::Load(const QStringList& FullShortcuts)
 {
-	memset(mShortcuts, 0, sizeof(mShortcuts));
+	Clear();
 
 	for (const QString& FullShortcut : FullShortcuts)
 	{
diff --git a/common/lc_shortcuts.h b/common/lc_shortcuts.h
@@ -40,6 +40,9 @@ class lcMouseShortcuts
 	};
 
 	lcToolShortcut mShortcuts[static_cast<int>(lcTool::Count)];
+
+private:
+	void Clear();
 };
 
 extern lcMouseShortcuts gMouseShortcuts;
