From 3b87389d07235b68a09311f4f774c92d3edbeffe Mon Sep 17 00:00:00 2001
From: xarkes <antide.petit@gmail.com>
Date: Thu, 14 Mar 2019 11:03:15 +0100
Subject: [PATCH] Removed stackptr because the result is meaningless (#1285)

---
 src/common/Configuration.cpp                 | 1 -
 src/dialogs/preferences/AsmOptionsWidget.cpp | 8 --------
 src/dialogs/preferences/AsmOptionsWidget.h   | 1 -
 src/dialogs/preferences/AsmOptionsWidget.ui  | 7 -------
 src/widgets/FunctionsWidget.cpp              | 3 +--
 5 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/common/Configuration.cpp b/src/common/Configuration.cpp
index f1d27e3a..a68e8b4d 100644
--- a/src/common/Configuration.cpp
+++ b/src/common/Configuration.cpp
@@ -26,7 +26,6 @@ static const QHash<QString, QVariant> asmOptions = {
     { "asm.xrefs",          false },
     { "asm.indent",         false },
     { "asm.describe",       false },
-    { "asm.stackptr",       false },
     { "asm.slow",           true },
     { "asm.lines",          true },
     { "asm.lines.fcn",      true },
diff --git a/src/dialogs/preferences/AsmOptionsWidget.cpp b/src/dialogs/preferences/AsmOptionsWidget.cpp
index 55be318a..357ab2ee 100644
--- a/src/dialogs/preferences/AsmOptionsWidget.cpp
+++ b/src/dialogs/preferences/AsmOptionsWidget.cpp
@@ -38,8 +38,6 @@ void AsmOptionsWidget::updateAsmOptionsFromVars()
     qhelpers::setCheckedWithoutSignals(ui->xrefCheckBox, Config()->getConfigBool("asm.xrefs"));
     qhelpers::setCheckedWithoutSignals(ui->indentCheckBox, Config()->getConfigBool("asm.indent"));
     qhelpers::setCheckedWithoutSignals(ui->describeCheckBox, Config()->getConfigBool("asm.describe"));
-    qhelpers::setCheckedWithoutSignals(ui->stackpointerCheckBox,
-                                       Config()->getConfigBool("asm.stackptr"));
     qhelpers::setCheckedWithoutSignals(ui->slowCheckBox, Config()->getConfigBool("asm.slow"));
     qhelpers::setCheckedWithoutSignals(ui->linesCheckBox, Config()->getConfigBool("asm.lines"));
     qhelpers::setCheckedWithoutSignals(ui->fcnlinesCheckBox, Config()->getConfigBool("asm.lines.fcn"));
@@ -156,12 +154,6 @@ void AsmOptionsWidget::on_describeCheckBox_toggled(bool checked)
     triggerAsmOptionsChanged();
 }
 
-void AsmOptionsWidget::on_stackpointerCheckBox_toggled(bool checked)
-{
-    Config()->setConfig("asm.stackptr", checked);
-    triggerAsmOptionsChanged();
-}
-
 void AsmOptionsWidget::on_slowCheckBox_toggled(bool checked)
 {
     Config()->setConfig("asm.slow", checked);
diff --git a/src/dialogs/preferences/AsmOptionsWidget.h b/src/dialogs/preferences/AsmOptionsWidget.h
index abb5b591..5c9a88c8 100644
--- a/src/dialogs/preferences/AsmOptionsWidget.h
+++ b/src/dialogs/preferences/AsmOptionsWidget.h
@@ -38,7 +38,6 @@ private slots:
     void on_xrefCheckBox_toggled(bool checked);
     void on_indentCheckBox_toggled(bool checked);
     void on_describeCheckBox_toggled(bool checked);
-    void on_stackpointerCheckBox_toggled(bool checked);
     void on_slowCheckBox_toggled(bool checked);
     void on_linesCheckBox_toggled(bool checked);
     void on_fcnlinesCheckBox_toggled(bool checked);
diff --git a/src/dialogs/preferences/AsmOptionsWidget.ui b/src/dialogs/preferences/AsmOptionsWidget.ui
index 9a02b35b..bbca573a 100644
--- a/src/dialogs/preferences/AsmOptionsWidget.ui
+++ b/src/dialogs/preferences/AsmOptionsWidget.ui
@@ -204,13 +204,6 @@
        <string>Metadata</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_5">
-       <item>
-        <widget class="QCheckBox" name="stackpointerCheckBox">
-         <property name="text">
-          <string>Show stack pointer (asm.stackptr)</string>
-         </property>
-        </widget>
-       </item>
        <item>
         <widget class="QCheckBox" name="slowCheckBox">
          <property name="text">
diff --git a/src/widgets/FunctionsWidget.cpp b/src/widgets/FunctionsWidget.cpp
index eff4bfe3..f7c595b5 100644
--- a/src/widgets/FunctionsWidget.cpp
+++ b/src/widgets/FunctionsWidget.cpp
@@ -209,8 +209,7 @@ QVariant FunctionModel::data(const QModelIndex &index, int role) const
                 .set("asm.lines.fcn", false)
                 .set("asm.lines.out", false)
                 .set("asm.lines.bb", false)
-                .set("asm.bbline", false)
-                .set("asm.stackptr", false);
+                .set("asm.bbline", false);
 
             disassemblyLines = Core()->disassembleLines(function.offset, kMaxTooltipDisasmPreviewLines + 1);
         }