Skip to content

Commit 9faa187

Browse files
committed
Fixed formatting.
1 parent d7df1f6 commit 9faa187

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

common/lc_shortcuts.cpp

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,14 @@ bool lcKeyboardShortcuts::Load(QTextStream& Stream)
128128
return true;
129129
}
130130

131-
void lcMouseShortcuts::Clear() {
132-
for (int ToolIdx = 0; ToolIdx < static_cast<int>(lcTool::Count); ToolIdx++) {
133-
mShortcuts[ToolIdx].Modifiers1 = Qt::NoModifier;
134-
mShortcuts[ToolIdx].Button1 = Qt::NoButton;
135-
mShortcuts[ToolIdx].Modifiers2 = Qt::NoModifier;
136-
mShortcuts[ToolIdx].Button2 = Qt::NoButton;
131+
void lcMouseShortcuts::Clear()
132+
{
133+
for (int ShortcutIndex = 0; ShortcutIndex < static_cast<int>(lcTool::Count); ShortcutIndex++)
134+
{
135+
mShortcuts[ShortcutIndex].Modifiers1 = Qt::NoModifier;
136+
mShortcuts[ShortcutIndex].Button1 = Qt::NoButton;
137+
mShortcuts[ShortcutIndex].Modifiers2 = Qt::NoModifier;
138+
mShortcuts[ShortcutIndex].Button2 = Qt::NoButton;
137139
}
138140
}
139141

@@ -183,25 +185,25 @@ bool lcMouseShortcuts::Save(QStringList& Shortcuts)
183185
{
184186
Shortcuts.clear();
185187

186-
for (int ToolIdx = 0; ToolIdx < static_cast<int>(lcTool::Count); ToolIdx++)
188+
for (int ShortcutIndex = 0; ShortcutIndex < static_cast<int>(lcTool::Count); ShortcutIndex++)
187189
{
188190
int ButtonIndex1 = 0;
189-
for (int Button1 = mShortcuts[ToolIdx].Button1; Button1; Button1 >>= 1)
191+
for (int Button1 = mShortcuts[ShortcutIndex].Button1; Button1; Button1 >>= 1)
190192
ButtonIndex1++;
191193

192194
if (!ButtonIndex1)
193195
continue;
194196

195-
QString Shortcut = QKeySequence(mShortcuts[ToolIdx].Modifiers1 | (Qt::Key_0 + ButtonIndex1)).toString(QKeySequence::PortableText);
197+
QString Shortcut = QKeySequence(mShortcuts[ShortcutIndex].Modifiers1 | (Qt::Key_0 + ButtonIndex1)).toString(QKeySequence::PortableText);
196198

197199
int ButtonIndex2 = 0;
198-
for (int Button2 = mShortcuts[ToolIdx].Button2; Button2; Button2 >>= 1)
200+
for (int Button2 = mShortcuts[ShortcutIndex].Button2; Button2; Button2 >>= 1)
199201
ButtonIndex2++;
200202

201203
if (ButtonIndex2)
202-
Shortcut += ',' + QKeySequence(mShortcuts[ToolIdx].Modifiers2 | (Qt::Key_0 + ButtonIndex2)).toString(QKeySequence::PortableText);
204+
Shortcut += ',' + QKeySequence(mShortcuts[ShortcutIndex].Modifiers2 | (Qt::Key_0 + ButtonIndex2)).toString(QKeySequence::PortableText);
203205

204-
Shortcuts << QString::fromLatin1(gToolNames[ToolIdx]) + QLatin1String("=") + Shortcut;
206+
Shortcuts << QString::fromLatin1(gToolNames[ShortcutIndex]) + QLatin1String("=") + Shortcut;
205207
}
206208

207209
return true;

common/lc_shortcuts.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ class lcMouseShortcuts
4040
};
4141

4242
lcToolShortcut mShortcuts[static_cast<int>(lcTool::Count)];
43+
4344
private:
4445
void Clear();
4546
};

0 commit comments

Comments
 (0)