From 5bde1c3e8c6096424b0385fa8f4dda3e72567bcb Mon Sep 17 00:00:00 2001
From: xarkes <antide.petit@gmail.com>
Date: Tue, 26 Mar 2019 20:40:41 +0100
Subject: [PATCH] Renamed asm.bbline to asm.bb.line (#1400)

---
 src/common/Configuration.cpp                 | 2 +-
 src/dialogs/preferences/AsmOptionsWidget.cpp | 4 ++--
 src/dialogs/preferences/AsmOptionsWidget.ui  | 2 +-
 src/widgets/DisassemblerGraphView.cpp        | 2 +-
 src/widgets/FunctionsWidget.cpp              | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/common/Configuration.cpp b/src/common/Configuration.cpp
index a68e8b4d..18083993 100644
--- a/src/common/Configuration.cpp
+++ b/src/common/Configuration.cpp
@@ -41,7 +41,7 @@ static const QHash<QString, QVariant> asmOptions = {
     { "asm.nbytes",         10 },
     { "asm.syntax",         "intel" },
     { "asm.ucase",          false },
-    { "asm.bbline",         false },
+    { "asm.bb.line",         false },
     { "asm.capitalize",     false },
     { "asm.var.sub",        true },
     { "asm.var.subonly",    true },
diff --git a/src/dialogs/preferences/AsmOptionsWidget.cpp b/src/dialogs/preferences/AsmOptionsWidget.cpp
index bf2a5d2d..d6442c90 100644
--- a/src/dialogs/preferences/AsmOptionsWidget.cpp
+++ b/src/dialogs/preferences/AsmOptionsWidget.cpp
@@ -94,7 +94,7 @@ void AsmOptionsWidget::updateAsmOptionsFromVars()
     ui->asmTabsOffSpinBox->setValue(Config()->getConfigInt("asm.tabs.off"));
     ui->asmTabsOffSpinBox->blockSignals(false);
 
-    qhelpers::setCheckedWithoutSignals(ui->bblineCheckBox, Config()->getConfigBool("asm.bbline"));
+    qhelpers::setCheckedWithoutSignals(ui->bblineCheckBox, Config()->getConfigBool("asm.bb.line"));
 
     bool varsubEnabled = Config()->getConfigBool("asm.var.sub");
     qhelpers::setCheckedWithoutSignals(ui->varsubCheckBox, varsubEnabled);
@@ -295,7 +295,7 @@ void AsmOptionsWidget::on_asmTabsOffSpinBox_valueChanged(int value)
 
 void AsmOptionsWidget::on_bblineCheckBox_toggled(bool checked)
 {
-    Config()->setConfig("asm.bbline", checked);
+    Config()->setConfig("asm.bb.line", checked);
     triggerAsmOptionsChanged();
 }
 
diff --git a/src/dialogs/preferences/AsmOptionsWidget.ui b/src/dialogs/preferences/AsmOptionsWidget.ui
index 6663f97b..4457445c 100644
--- a/src/dialogs/preferences/AsmOptionsWidget.ui
+++ b/src/dialogs/preferences/AsmOptionsWidget.ui
@@ -165,7 +165,7 @@
        <item>
         <widget class="QCheckBox" name="bblineCheckBox">
          <property name="text">
-          <string>Show empty line after every basic block (asm.bbline)</string>
+          <string>Show empty line after every basic block (asm.bb.line)</string>
          </property>
         </widget>
        </item>
diff --git a/src/widgets/DisassemblerGraphView.cpp b/src/widgets/DisassemblerGraphView.cpp
index 7765157d..6a7eb1a3 100644
--- a/src/widgets/DisassemblerGraphView.cpp
+++ b/src/widgets/DisassemblerGraphView.cpp
@@ -178,7 +178,7 @@ void DisassemblerGraphView::loadCurrentGraph()
 {
     TempConfig tempConfig;
     tempConfig.set("scr.color", COLOR_MODE_16M)
-    .set("asm.bbline", false)
+    .set("asm.bb.line", false)
     .set("asm.lines", false)
     .set("asm.lines.fcn", false);
 
diff --git a/src/widgets/FunctionsWidget.cpp b/src/widgets/FunctionsWidget.cpp
index 54fd3b80..b6d1794c 100644
--- a/src/widgets/FunctionsWidget.cpp
+++ b/src/widgets/FunctionsWidget.cpp
@@ -211,7 +211,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.bb.line", false);
 
             disassemblyLines = Core()->disassembleLines(function.offset, kMaxTooltipDisasmPreviewLines + 1);
         }