Imported Upstream version 2.5

2 files changed, 12 insertions, 0 deletions

diff --git a/src/frontend/settingsdialogs/btshortcutseditor.cpp b/src/frontend/settingsdialogs/btshortcutseditor.cpp
index 3c9027d..f92a27e 100644
--- a/src/frontend/settingsdialogs/btshortcutseditor.cpp
+++ b/src/frontend/settingsdialogs/btshortcutseditor.cpp
@@ -155,6 +155,8 @@ void BtShortcutsEditor::commitChanges() {
 
 // puts actions and shortcut keys into QTableWidget
 void BtShortcutsEditor::addCollection(BtActionCollection* collection, const QString& title) {
+    Q_UNUSED(title); /// \todo Is this correct?
+
     QList<QAction*> actionList = collection->actions();
     int count;
     count = actionList.count();
@@ -217,6 +219,8 @@ QTableWidget* BtShortcutsEditor::createShortcutsTable() {
 
 // called when a different action name row is selected
 void BtShortcutsEditor::changeRow(int row, int column) {
+    Q_UNUSED(column); /// \todo Is this correct?
+
     BtShortcutsEditorItem* item = getShortcutsEditor(row);
     m_currentRow = row;
     QKeySequence defaultKeys = item->getDefaultKeys();
@@ -290,6 +294,8 @@ QWidget* BtShortcutsEditor::createShortcutChooser() {
 
 // called when the none radio button is clicked
 void BtShortcutsEditor::noneButtonClicked(bool checked) {
+    Q_UNUSED(checked); /// \todo Is this correct?
+
     if (m_currentRow < 0)
         return;
     BtShortcutsEditorItem* item = getShortcutsEditor(m_currentRow);
@@ -302,6 +308,8 @@ void BtShortcutsEditor::noneButtonClicked(bool checked) {
 
 // called when the default radio button is clicked
 void BtShortcutsEditor::defaultButtonClicked(bool checked) {
+    Q_UNUSED(checked); /// \todo Is this correct?
+
     if (m_currentRow < 0)
         return;
     BtShortcutsEditorItem* item = getShortcutsEditor(m_currentRow);
@@ -315,6 +323,8 @@ void BtShortcutsEditor::defaultButtonClicked(bool checked) {
 
 // called when the custom radio button is clicked
 void BtShortcutsEditor::customButtonClicked(bool checked) {
+    Q_UNUSED(checked); /// \todo Is this correct?
+
     if (m_currentRow < 0)
         return;
 
diff --git a/src/frontend/settingsdialogs/cacceleratorsettings.cpp b/src/frontend/settingsdialogs/cacceleratorsettings.cpp
index 9fe7a9b..636b9cc 100644
--- a/src/frontend/settingsdialogs/cacceleratorsettings.cpp
+++ b/src/frontend/settingsdialogs/cacceleratorsettings.cpp
@@ -239,6 +239,8 @@ void CAcceleratorSettingsPage::save() {
 }
 
 void CAcceleratorSettingsPage::slotKeyChooserTypeChanged(const QString& title) {
+    Q_UNUSED(title); /// \todo Is this correct?
+
     int index = m_typeChooser->currentIndex();
     m_keyChooserStack->setCurrentIndex(index);