# HG changeset patch
# User Wuzzy <Wuzzy2@mail.ru>
# Date 1570660135 -7200
# Node ID 1ee2736de636d6966513246dec4d6eafee973025
# Parent  85653290114fb0f157eb129c4275c04aab980473
Backed out changeset 5a934f83d5eb

diff -r 85653290114f -r 1ee2736de636 QTfrontend/ui/widget/keybinder.cpp
--- a/QTfrontend/ui/widget/keybinder.cpp	Thu Oct 10 17:18:42 2019 +0200
+++ b/QTfrontend/ui/widget/keybinder.cpp	Thu Oct 10 00:28:55 2019 +0200
@@ -209,12 +209,7 @@
         curTable->insertRow(row);
         curTable->setItem(row, 0, nameCell);
         QTableWidgetItem * bindCell;
-        // Check if the bind text is bad. This was discovered after the 1.0.0,
-        // so we need a little workaround.
-        bool is_broken_strbind = cbinds[i].strbind == "precise + switch + toggle hedgehog tags";
-                                                    // ^ should be "precise + switch + toggle team bars"
-        // TODO: Remove is_broken_strbind after 1.0.0 release.
-        if (cbinds[i].action != "!MULTI" && (!is_broken_strbind))
+        if (cbinds[i].action != "!MULTI")
         {
             bindCell = new QTableWidgetItem(comboBox->currentText());
             nameCell->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
@@ -223,19 +218,7 @@
         }
         else
         {
-            // Apply workaround for the broken 1.0.0 strbind
-            // TODO: Remove the workaround after 1.0.0 release and fix binds.cpp accordingly.
-            if (is_broken_strbind)
-            {
-                // We simply construct the string from other strings we *do* have. :-)
-                QString cellText =
-                    HWApplication::translate("binds", "precise aim") + " + " +
-                    HWApplication::translate("binds", "switch") + " + " +
-                    HWApplication::translate("binds", "toggle team bars");
-                bindCell = new QTableWidgetItem(cellText);
-            }
-            else
-                bindCell = new QTableWidgetItem(HWApplication::translate("binds (combination)", cbinds[i].strbind.toUtf8().constData()));
+            bindCell = new QTableWidgetItem(HWApplication::translate("binds (combination)", cbinds[i].strbind.toUtf8().constData()));
             nameCell->setFlags(Qt::NoItemFlags);
             bindCell->setFlags(Qt::NoItemFlags);
             bindCell->setIcon(emptyIcon);