From c3c94cd2f6f49f2552652d4c46021b7150d64a09 Mon Sep 17 00:00:00 2001
From: Michael <zyqing601@163.com>
Date: Fri, 7 Jun 2024 11:00:57 +0800
Subject: [PATCH] resolve naming conflicts to 'backtrack'

udpate
---
 src/config/CMakeLists.txt                     |   2 +-
 ...backtrackingimpl.cpp => backtrackconf.cpp} | 113 +++++++++---------
 .../{backtrackingimpl.h => backtrackconf.h}   |  14 +--
 src/config/generalconf.cpp                    |  12 +-
 src/config/generalconf.h                      |  10 +-
 src/utils/CMakeLists.txt                      |   4 +-
 ...urehistoryutils.cpp => backtrackutils.cpp} |  45 ++++---
 ...capturehistoryutils.h => backtrackutils.h} |   6 +-
 src/utils/confighandler.cpp                   |   6 +-
 src/utils/confighandler.h                     |  10 +-
 src/utils/valuehandler.cpp                    |  17 +++
 src/utils/valuehandler.h                      |   7 ++
 src/widgets/capture/capturewidget.cpp         |  30 ++---
 src/widgets/capture/capturewidget.h           |   6 +-
 14 files changed, 149 insertions(+), 133 deletions(-)
 rename src/config/{backtrackingimpl.cpp => backtrackconf.cpp} (52%)
 rename src/config/{backtrackingimpl.h => backtrackconf.h} (67%)
 rename src/utils/{capturehistoryutils.cpp => backtrackutils.cpp} (85%)
 rename src/utils/{capturehistoryutils.h => backtrackutils.h} (92%)

diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt
index b6296269fb..cede551bb3 100644
--- a/src/config/CMakeLists.txt
+++ b/src/config/CMakeLists.txt
@@ -17,5 +17,5 @@ target_sources(
         styleoverride.cpp
         uicoloreditor.cpp
         visualseditor.cpp
-        backtrackingimpl.cpp
+        backtrackconf.cpp
 )
diff --git a/src/config/backtrackingimpl.cpp b/src/config/backtrackconf.cpp
similarity index 52%
rename from src/config/backtrackingimpl.cpp
rename to src/config/backtrackconf.cpp
index e5fad03565..ea28f8e0be 100644
--- a/src/config/backtrackingimpl.cpp
+++ b/src/config/backtrackconf.cpp
@@ -1,8 +1,7 @@
-#include "backtrackingimpl.h"
+#include "backtrackconf.h"
 
 #include "abstractlogger.h"
 
-#include <QLabel>
 #include <QVBoxLayout>
 #include <QtCore/qstandardpaths.h>
 #include <QtCore/qstring.h>
@@ -10,6 +9,7 @@
 #include <QtWidgets/qcheckbox.h>
 #include <QtWidgets/qfiledialog.h>
 #include <QtWidgets/qgroupbox.h>
+#include <QtWidgets/qlabel.h>
 #include <QtWidgets/qlayoutitem.h>
 #include <QtWidgets/qlineedit.h>
 #include <QtWidgets/qmessagebox.h>
@@ -20,58 +20,57 @@
 #include <cacheutils.h>
 #include <confighandler.h>
 
-namespace btk {
-class BackTrackerConfigPrivate
+class BacktrackConfigPrivate
 {
-    friend class BackTrackerConfigGroup;
+    friend class BacktrackConfigGroup;
     constexpr static int limits_max = 200;
     constexpr static int limits_min = 0;
 
 public:
-    QCheckBox* enableBackTrackerCheckBox;
-    QLineEdit* backTrackerPath;
+    QCheckBox* enableCheckBox;
+    QLineEdit* cachePath;
     QPushButton* choosePathBtn;
-    QPushButton* rollbackBtn;
+    QPushButton* setCachePath2DefaultBtn;
     QSpinBox* cacheNumbersSpinBox;
 };
 
-BackTrackerConfigGroup::BackTrackerConfigGroup(QWidget* parent)
+BacktrackConfigGroup::BacktrackConfigGroup(QWidget* parent)
   : QGroupBox(tr("BackTracking"), parent)
-  , p(new BackTrackerConfigPrivate)
+  , p(new BacktrackConfigPrivate)
+  , m_configHandler(ConfigHandler::getInstance())
 {
     init();
 }
-BackTrackerConfigGroup::~BackTrackerConfigGroup()
+BacktrackConfigGroup::~BacktrackConfigGroup()
 {
-    delete p;
     p = nullptr;
 }
-void BackTrackerConfigGroup::init()
+void BacktrackConfigGroup::init()
 {
-    p->enableBackTrackerCheckBox = new QCheckBox(tr("enable"), this);
-    p->enableBackTrackerCheckBox->setToolTip(tr("If enable the backtraking"));
-    p->enableBackTrackerCheckBox->setChecked(
-      ConfigHandler().backtrackingEnable());
-    connect(p->enableBackTrackerCheckBox,
+    p->enableCheckBox = new QCheckBox(tr("enable"), this);
+    p->enableCheckBox->setToolTip(tr("If enable the backtraking"));
+    p->enableCheckBox->setChecked(ConfigHandler().backtrackEnable());
+    connect(p->enableCheckBox,
             &QCheckBox::clicked,
             this,
-            &BackTrackerConfigGroup::setEnable);
+            &BacktrackConfigGroup::setEnable);
     setFlat(true);
     auto* vboxLayout = new QVBoxLayout();
     setLayout(vboxLayout);
 
     auto* firstHBoxLayout = new QHBoxLayout();
     vboxLayout->addLayout(firstHBoxLayout);
-    firstHBoxLayout->addWidget(p->enableBackTrackerCheckBox);
+    firstHBoxLayout->addWidget(p->enableCheckBox);
 
     auto* spinboxLabel = new QLabel(tr("cache size"));
     spinboxLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding);
 
     p->cacheNumbersSpinBox = new QSpinBox();
-    p->cacheNumbersSpinBox->setValue(ConfigHandler().backtrackingCacheLimits());
+    p->cacheNumbersSpinBox->setValue(
+      m_configHandler->backtrackCacheLimits());
     p->cacheNumbersSpinBox->setFixedWidth(50);
-    p->cacheNumbersSpinBox->setMinimum(BackTrackerConfigPrivate::limits_min);
-    p->cacheNumbersSpinBox->setMaximum(BackTrackerConfigPrivate::limits_max);
+    p->cacheNumbersSpinBox->setMinimum(BacktrackConfigPrivate::limits_min);
+    p->cacheNumbersSpinBox->setMaximum(BacktrackConfigPrivate::limits_max);
 
     connect(p->cacheNumbersSpinBox,
             &QSpinBox::textChanged,
@@ -86,24 +85,25 @@ void BackTrackerConfigGroup::init()
     auto* choosePathLayout = new QHBoxLayout();
     vboxLayout->addLayout(choosePathLayout);
 
-    p->backTrackerPath = new QLineEdit();
-    p->backTrackerPath->setReadOnly(true);
-    p->backTrackerPath->setPlaceholderText(
+    p->cachePath = new QLineEdit();
+    p->cachePath->setReadOnly(true);
+    p->cachePath->setPlaceholderText(
       tr("choose your path to save backtracking cache"));
-    p->backTrackerPath->setToolTip(
+    p->cachePath->setToolTip(
       tr("choose your path to save backtracking cache\ndefaults to: %1")
         .arg(getCachePath()));
-    p->backTrackerPath->setStyleSheet(R"(
+    p->cachePath->setStyleSheet(R"(
     border-right-width: 0px;
     )");
 
-    choosePathLayout->addWidget(p->backTrackerPath);
+    choosePathLayout->addWidget(p->cachePath);
 
-    p->rollbackBtn = new QPushButton(tr("↩️"));
-    p->rollbackBtn->setFixedWidth(20);
-    p->rollbackBtn->setToolTip(tr("set path to default"));
-    p->rollbackBtn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
-    p->rollbackBtn->setStyleSheet(QString(R"(
+    p->setCachePath2DefaultBtn = new QPushButton(tr("↩️"));
+    p->setCachePath2DefaultBtn->setFixedWidth(20);
+    p->setCachePath2DefaultBtn->setToolTip(tr("set path to default"));
+    p->setCachePath2DefaultBtn->setSizePolicy(QSizePolicy::Fixed,
+                                              QSizePolicy::Preferred);
+    p->setCachePath2DefaultBtn->setStyleSheet(QString(R"(
    QPushButton{
          margin-right: 14px;
         // margin-top: 0px;
@@ -111,11 +111,11 @@ void BackTrackerConfigGroup::init()
         border-width: 0px;
    }
     )"));
-    connect(p->rollbackBtn,
+    connect(p->setCachePath2DefaultBtn,
             &QPushButton::clicked,
             this,
-            &BackTrackerConfigGroup::pathRollBack);
-    choosePathLayout->addWidget(p->rollbackBtn);
+            &BacktrackConfigGroup::setPath2Default);
+    choosePathLayout->addWidget(p->setCachePath2DefaultBtn);
     choosePathLayout->setSpacing(0);
 
     p->choosePathBtn = new QPushButton(tr("Change.."));
@@ -123,14 +123,14 @@ void BackTrackerConfigGroup::init()
     connect(p->choosePathBtn,
             &QPushButton::clicked,
             this,
-            &BackTrackerConfigGroup::browseFolder);
+            &BacktrackConfigGroup::browseFolder);
 
-    if (ConfigHandler().backtrackingCachePath().isEmpty()) {
-        ConfigHandler().setBacktrackingCachePath(getCachePath());
+    if (ConfigHandler::getInstance()->backtrackCachePath().isEmpty()) {
+        ConfigHandler::getInstance()->setBacktrackCachePath(getCachePath());
     }
-    p->backTrackerPath->setText(ConfigHandler().backtrackingCachePath());
+    p->cachePath->setText(ConfigHandler::getInstance()->backtrackCachePath());
 }
-QString BackTrackerConfigGroup::chooseFolder(const QString& defaultPath)
+QString BacktrackConfigGroup::chooseFolder(const QString& defaultPath)
 {
     QString path = defaultPath;
     if (defaultPath.isEmpty()) {
@@ -153,32 +153,31 @@ QString BackTrackerConfigGroup::chooseFolder(const QString& defaultPath)
 
     return path;
 }
-void BackTrackerConfigGroup::browseFolder()
+void BacktrackConfigGroup::browseFolder()
 {
-    auto targetFolder = chooseFolder(ConfigHandler().backtrackingCachePath());
+    auto targetFolder = chooseFolder(ConfigHandler().backtrackCachePath());
     if (targetFolder.isEmpty()) {
         AbstractLogger::error()
           << "backtracking: cache folder path you choose is empty";
         return;
     }
-    p->backTrackerPath->setText(targetFolder);
-    ConfigHandler().setBacktrackingCachePath(targetFolder);
+    p->cachePath->setText(targetFolder);
+    ConfigHandler().setBacktrackCachePath(targetFolder);
 }
-void BackTrackerConfigGroup::setEnable(bool value)
+void BacktrackConfigGroup::setEnable(bool value)
 {
-    ConfigHandler().setBacktrackingEnable(value);
+    m_configHandler->setBacktrackEnable(value);
 }
-void BackTrackerConfigGroup::pathRollBack()
+void BacktrackConfigGroup::setPath2Default()
 {
-    ConfigHandler().setBacktrackingCachePath(getCachePath());
-    p->backTrackerPath->setText(getCachePath());
+    m_configHandler->setBacktrackCachePath(getCachePath());
+    p->cachePath->setText(getCachePath());
 }
-void BackTrackerConfigGroup::setCacheLimits(int val)
+void BacktrackConfigGroup::setCacheLimits(int val)
 {
-    if (val > BackTrackerConfigPrivate::limits_max ||
-        val < BackTrackerConfigPrivate::limits_min) {
+    if (val > BacktrackConfigPrivate::limits_max ||
+        val < BacktrackConfigPrivate::limits_min) {
         return;
     }
-    ConfigHandler().setBacktrackingCacheLimits(val);
-}
-} // btk
\ No newline at end of file
+    m_configHandler->setBacktrackCacheLimits(val);
+}
\ No newline at end of file
diff --git a/src/config/backtrackingimpl.h b/src/config/backtrackconf.h
similarity index 67%
rename from src/config/backtrackingimpl.h
rename to src/config/backtrackconf.h
index de49581057..9f9a663aa5 100644
--- a/src/config/backtrackingimpl.h
+++ b/src/config/backtrackconf.h
@@ -17,26 +17,24 @@ class QLabel;
 class QLineEdit;
 class QSpinBox;
 class QComboBox;
-namespace btk {
 
-class BackTrackerConfigPrivate;
-class BackTrackerConfigGroup : public QGroupBox
+class BacktrackConfigGroup : public QGroupBox
 {
     Q_OBJECT
 public:
-    explicit BackTrackerConfigGroup(QWidget* parent = nullptr);
-    ~BackTrackerConfigGroup() override;
+    explicit BacktrackConfigGroup(QWidget* parent = nullptr);
+    ~BacktrackConfigGroup() override;
 
 private:
-    BackTrackerConfigPrivate* p;
+    std::unique_ptr<class BacktrackConfigPrivate> p;
     void init();
     QString chooseFolder(const QString& defaultPath);
+    class ConfigHandler* m_configHandler;
 public slots:
     void browseFolder();
     void setEnable(bool value);
-    void pathRollBack();
+    void setPath2Default();
     void setCacheLimits(int val);
 };
-} // btk
 
 #endif // BACKTRACKINGIMPL_H
diff --git a/src/config/generalconf.cpp b/src/config/generalconf.cpp
index 94755c5dc3..ebc24cc6a0 100644
--- a/src/config/generalconf.cpp
+++ b/src/config/generalconf.cpp
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 // SPDX-FileCopyrightText: 2017-2019 Alejandro Sirgo Rica & Contributors
 #include "generalconf.h"
-#include "backtrackingimpl.h"
-#include "src/core/flameshot.h"
-#include "src/utils/confighandler.h"
+#include "backtrackconf.h"
+#include "confighandler.h"
+#include "flameshot.h"
 #include <QCheckBox>
 #include <QComboBox>
 #include <QFile>
@@ -50,7 +50,7 @@ GeneralConf::GeneralConf(QWidget* parent)
     initUseJpgForClipboard();
     initCopyOnDoubleClick();
     initSaveAfterCopy();
-    initBackTrackerSettings();
+    initBacktrackConfig();
     initCopyPathAfterSave();
     initCopyAndCloseAfterUpload();
     initUploadWithoutConfirmation();
@@ -800,9 +800,9 @@ void GeneralConf::initJpegQuality()
             this,
             &GeneralConf::setJpegQuality);
 }
-void GeneralConf::initBackTrackerSettings()
+void GeneralConf::initBacktrackConfig()
 {
-    m_backTrackingConfig = new btk::BackTrackerConfigGroup(this);
+    m_backTrackingConfig = new BacktrackConfigGroup(this);
     m_layout->addWidget(m_backTrackingConfig);
 }
 
diff --git a/src/config/generalconf.h b/src/config/generalconf.h
index 9aec63da00..0497420aa8 100644
--- a/src/config/generalconf.h
+++ b/src/config/generalconf.h
@@ -13,9 +13,9 @@ class QLabel;
 class QLineEdit;
 class QSpinBox;
 class QComboBox;
-namespace btk {
-class BackTrackerConfigGroup;
-}
+
+class BacktrackConfigGroup;
+
 class GeneralConf : public QWidget
 {
     Q_OBJECT
@@ -95,7 +95,7 @@ private slots:
     void initShowSelectionGeometry();
     void initJpegQuality();
 
-    void initBackTrackerSettings();
+    void initBacktrackConfig();
 
     void _updateComponents(bool allowEmptySavePath);
 
@@ -141,5 +141,5 @@ private slots:
     QSpinBox* m_xywhTimeout;
     QSpinBox* m_jpegQuality;
 
-    btk::BackTrackerConfigGroup* m_backTrackingConfig;
+    BacktrackConfigGroup* m_backTrackingConfig;
 };
diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
index fb18349e97..2406ed6cc5 100644
--- a/src/utils/CMakeLists.txt
+++ b/src/utils/CMakeLists.txt
@@ -8,7 +8,7 @@ target_sources(
           valuehandler.h
           request.h
           strfparse.h
-          capturehistoryutils.h
+        backtrackutils.h
 )
 
 target_sources(
@@ -28,7 +28,7 @@ target_sources(
           history.cpp
           strfparse.cpp
           request.cpp
-          capturehistoryutils.cpp
+        backtrackutils.cpp
 )
 
 IF (WIN32)
diff --git a/src/utils/capturehistoryutils.cpp b/src/utils/backtrackutils.cpp
similarity index 85%
rename from src/utils/capturehistoryutils.cpp
rename to src/utils/backtrackutils.cpp
index 13c29456ab..bbee48da0e 100644
--- a/src/utils/capturehistoryutils.cpp
+++ b/src/utils/backtrackutils.cpp
@@ -1,4 +1,4 @@
-#include "capturehistoryutils.h"
+#include "backtrackutils.h"
 
 #include "abstractlogger.h"
 
@@ -17,30 +17,29 @@
 #include <algorithm>
 #include <confighandler.h>
 
-QSharedPointer<CaptureHistoryUtils> CaptureHistoryUtils::getInstance()
+QSharedPointer<BacktrackUtils> BacktrackUtils::getInstance()
 {
-    static auto singleton =
-      QSharedPointer<CaptureHistoryUtils>(new CaptureHistoryUtils);
+    static auto singleton = QSharedPointer<BacktrackUtils>(new BacktrackUtils);
     singleton->deleteReduntantCache();
     return singleton;
 }
 
-QSharedPointer<QPixmap> CaptureHistoryUtils::currentScreenShot()
+QSharedPointer<QPixmap> BacktrackUtils::currentScreenShot()
 {
     return m_currentScreenShot;
 }
 
-QRect CaptureHistoryUtils::cureentSelection()
+QRect BacktrackUtils::cureentSelection()
 {
     return m_currentSelection;
 }
-bool CaptureHistoryUtils::isNewest() const noexcept
+bool BacktrackUtils::isNewest() const noexcept
 {
     return m_fileListIndex == -1;
 }
 
-void CaptureHistoryUtils::saveCapture(const QPixmap& currentScreen,
-                                      const QRect& selection)
+void BacktrackUtils::saveCapture(const QPixmap& currentScreen,
+                                 const QRect& selection)
 {
     auto currentTime = QDateTime::currentDateTime();
     auto selectionSerialize = QString("+%1x%2+%3+%4+")
@@ -48,7 +47,7 @@ void CaptureHistoryUtils::saveCapture(const QPixmap& currentScreen,
                                 .arg(selection.height())
                                 .arg(selection.x())
                                 .arg(selection.y());
-    auto cachePath = ConfigHandler().backtrackingCachePath() + "/cap.his." +
+    auto cachePath = ConfigHandler().backtrackCachePath() + "/cap.his." +
                      selectionSerialize + "." +
                      currentTime.toString("yyyy-MM-dd hh:mm:ss") + ".png";
     QFile file(cachePath);
@@ -62,7 +61,7 @@ void CaptureHistoryUtils::saveCapture(const QPixmap& currentScreen,
     }
 }
 
-void CaptureHistoryUtils::refreshValue()
+void BacktrackUtils::refreshValue()
 {
     if (m_fileList.empty()) {
         m_fileListIndex = -1;
@@ -189,7 +188,7 @@ void CaptureHistoryUtils::refreshValue()
         }
     }
     if (selParseState == PS_ERROR) {
-        AbstractLogger::error() << "cache pic selection parse errror";
+        AbstractLogger::error() << "cache pic selection parse error";
         return;
     }
     m_currentSelection.setX(xPos);
@@ -198,7 +197,7 @@ void CaptureHistoryUtils::refreshValue()
     m_currentSelection.setHeight(height);
 }
 
-void CaptureHistoryUtils::fetchOlder()
+void BacktrackUtils::fetchOlder()
 {
     if (m_fileListIndex < m_fileList.length() - 1) {
         m_fileListIndex++;
@@ -206,7 +205,7 @@ void CaptureHistoryUtils::fetchOlder()
     }
 }
 
-void CaptureHistoryUtils::fetchNewer()
+void BacktrackUtils::fetchNewer()
 {
     if (m_fileListIndex > 0) {
         m_fileListIndex--;
@@ -216,33 +215,33 @@ void CaptureHistoryUtils::fetchNewer()
     }
 }
 
-void CaptureHistoryUtils::fetchNewest()
+void BacktrackUtils::fetchNewest()
 {
     m_fileListIndex = 0;
     refreshValue();
 }
 
-CaptureHistoryUtils::CaptureHistoryUtils()
+BacktrackUtils::BacktrackUtils()
   : m_fileListIndex(-1)
 {
     checkCache();
 }
 
-void CaptureHistoryUtils::deleteReduntantCache()
+void BacktrackUtils::deleteReduntantCache()
 {
-    quint32 maxHis = ConfigHandler().backtrackingCacheLimits();
+    const quint32 maxHis = ConfigHandler::getInstance()->backtrackCacheLimits();
     if (m_fileList.length() >= maxHis) {
-        auto fileDeleteNum = m_fileList.length() - maxHis;
+        qint64 const fileDeleteNum = m_fileList.length() - maxHis;
         for (int i = 0; i < fileDeleteNum; i++) {
             QFile::remove(getLastCacheName());
         }
     }
 }
 
-void CaptureHistoryUtils::checkCache()
+void BacktrackUtils::checkCache()
 {
 
-    QDir dir(ConfigHandler().backtrackingCachePath());
+    QDir dir(ConfigHandler().backtrackCachePath());
     QStringList nameFilters;
     nameFilters.append("cap.his.*.png");
     dir.setNameFilters(nameFilters);
@@ -253,14 +252,14 @@ void CaptureHistoryUtils::checkCache()
                    m_fileList.end(),
                    m_fileList.begin(),
                    [](const auto& filename) {
-                       return ConfigHandler().backtrackingCachePath() +
+                       return ConfigHandler().backtrackCachePath() +
                               QDir::separator() + filename;
                    });
 
     refreshValue();
 }
 
-QString CaptureHistoryUtils::getLastCacheName()
+QString BacktrackUtils::getLastCacheName()
 {
     return m_fileList[m_fileList.length() - 1];
 }
diff --git a/src/utils/capturehistoryutils.h b/src/utils/backtrackutils.h
similarity index 92%
rename from src/utils/capturehistoryutils.h
rename to src/utils/backtrackutils.h
index e7e171792a..4a0e703112 100644
--- a/src/utils/capturehistoryutils.h
+++ b/src/utils/backtrackutils.h
@@ -8,7 +8,7 @@ class QPixmap;
 #include <QtCore/qrect.h>
 #include <QtCore/qsharedpointer.h>
 
-class CaptureHistoryUtils : public QObject
+class BacktrackUtils : public QObject
 {
     Q_OBJECT
 public:
@@ -16,7 +16,7 @@ class CaptureHistoryUtils : public QObject
      * get a singleton object method
      * @return singleton object
      */
-    static QSharedPointer<CaptureHistoryUtils> getInstance();
+    static QSharedPointer<BacktrackUtils> getInstance();
     /**
      *
      * @return a screenshot
@@ -48,7 +48,7 @@ class CaptureHistoryUtils : public QObject
     void fetchNewest();
 
 private:
-    CaptureHistoryUtils();
+    BacktrackUtils();
     void deleteReduntantCache();
     void checkCache();
     QStringList m_fileList;
diff --git a/src/utils/confighandler.cpp b/src/utils/confighandler.cpp
index 8caa8b16cc..d8f28e9758 100644
--- a/src/utils/confighandler.cpp
+++ b/src/utils/confighandler.cpp
@@ -124,9 +124,9 @@ static QMap<class QString, QSharedPointer<ValueHandler>>
     OPTION("showSelectionGeometry"  , BoundedInt               (0,5,4)),
     OPTION("showSelectionGeometryHideTime", LowerBoundedInt       (0, 3000)),
     OPTION("jpegQuality", BoundedInt     (0,100,75)),
-    OPTION("backtrackingEnable", Bool (false)),
-    OPTION("backtrackingCachePath", ExistingDir        (                )),
-    OPTION("backtrackingCacheLimits", BoundedInt        (0, 200, 5 ))
+    OPTION("backtrackEnable", Bool (false)),
+    OPTION("backtrackCachePath", ExistingCacheDir        (                )),
+    OPTION("backtrackCacheLimits", BoundedInt        (0, 200, 5 ))
 };
 
 static QMap<QString, QSharedPointer<KeySequence>> recognizedShortcuts = {
diff --git a/src/utils/confighandler.h b/src/utils/confighandler.h
index 8ed91d1dcb..6fe410539b 100644
--- a/src/utils/confighandler.h
+++ b/src/utils/confighandler.h
@@ -130,13 +130,9 @@ class ConfigHandler : public QObject
     CONFIG_GETTER_SETTER(showSelectionGeometryHideTime,
                          showSelectionGeometryHideTime,
                          int)
-    CONFIG_GETTER_SETTER(backtrackingEnable, setBacktrackingEnable, bool)
-    CONFIG_GETTER_SETTER(backtrackingCachePath,
-                         setBacktrackingCachePath,
-                         QString)
-    CONFIG_GETTER_SETTER(backtrackingCacheLimits,
-                         setBacktrackingCacheLimits,
-                         qint64)
+    CONFIG_GETTER_SETTER(backtrackEnable, setBacktrackEnable, bool)
+    CONFIG_GETTER_SETTER(backtrackCachePath, setBacktrackCachePath, QString)
+    CONFIG_GETTER_SETTER(backtrackCacheLimits, setBacktrackCacheLimits, qint64)
 
     // SPECIAL CASES
     bool startupLaunch();
diff --git a/src/utils/valuehandler.cpp b/src/utils/valuehandler.cpp
index 099255d623..0ef71bd49e 100644
--- a/src/utils/valuehandler.cpp
+++ b/src/utils/valuehandler.cpp
@@ -1,4 +1,5 @@
 #include "valuehandler.h"
+#include "cacheutils.h"
 #include "capturetool.h"
 #include "colorpickerwidget.h"
 #include "confighandler.h"
@@ -269,6 +270,22 @@ QString ExistingDir::expected()
 {
     return QStringLiteral("existing directory");
 }
+bool ExistingCacheDir::check(const QVariant& val)
+{
+    if (!val.canConvert(QVariant::String) || val.toString().isEmpty()) {
+        return false;
+    }
+    QFileInfo info(val.toString());
+    return info.isDir() && info.exists();
+}
+QVariant ExistingCacheDir::fallback()
+{
+    return getCachePath();
+}
+QString ExistingCacheDir::expected()
+{
+    return QStringLiteral("existing directory");
+}
 
 // FILENAME PATTERN
 
diff --git a/src/utils/valuehandler.h b/src/utils/valuehandler.h
index f17af6a559..92071714e3 100644
--- a/src/utils/valuehandler.h
+++ b/src/utils/valuehandler.h
@@ -169,6 +169,13 @@ class ExistingDir : public ValueHandler
     QString expected() override;
 };
 
+class ExistingCacheDir : public ValueHandler
+{
+    bool check(const QVariant& val) override;
+    QVariant fallback() override;
+    QString expected() override;
+};
+
 class FilenamePattern : public ValueHandler
 {
     bool check(const QVariant&) override;
diff --git a/src/widgets/capture/capturewidget.cpp b/src/widgets/capture/capturewidget.cpp
index 7cae309e77..acf8fc3463 100644
--- a/src/widgets/capture/capturewidget.cpp
+++ b/src/widgets/capture/capturewidget.cpp
@@ -279,9 +279,9 @@ CaptureWidget::~CaptureWidget()
         geometry.setTopLeft(geometry.topLeft() + m_context.widgetOffset);
         Flameshot::instance()->exportCapture(
           pixmap(), geometry, m_context.request);
-        if (ConfigHandler().backtrackingEnable()) {
-            CaptureHistoryUtils::getInstance()->saveCapture(
-              m_context.origScreenshot, geometry);
+        if (ConfigHandler().backtrackEnable()) {
+            BacktrackUtils::getInstance()->saveCapture(m_context.origScreenshot,
+                                                       geometry);
         }
     } else {
         emit Flameshot::instance() -> captureFailed();
@@ -441,9 +441,9 @@ void CaptureWidget::initHelpMessage()
     keyMap << QPair(ConfigHandler().shortcut("TYPE_TOGGLE_PANEL"),
                     tr("Open side panel"));
     keyMap << QPair(tr("Esc"), tr("Exit"));
-    if (ConfigHandler().backtrackingEnable()) {
-        keyMap << QPair(tr("Comma"), tr("Show screen history backward"));
-        keyMap << QPair(tr("Period"), tr("Show screen history forward"));
+    if (ConfigHandler().backtrackEnable()) {
+        keyMap << QPair(tr("Comma"), tr("Show screen backtrack backward"));
+        keyMap << QPair(tr("Period"), tr("Show screen backtrack forward"));
     }
 
     m_helpMessage = OverlayMessage::compileFromKeyMap(keyMap);
@@ -658,7 +658,7 @@ void CaptureWidget::paintEvent(QPaintEvent* paintEvent)
                             "gui` again to apply it."),
                          &painter);
     }
-    if (CaptureHistoryUtils::getInstance()
+    if (BacktrackUtils::getInstance()
           ->isNewest()) { // when current screenshot is not a history screenshot
         saveCurrentState();
     }
@@ -1587,9 +1587,9 @@ void CaptureWidget::initShortcuts()
                 SLOT(selectAll()));
 
     newShortcut(Qt::Key_Escape, this, SLOT(deleteToolWidgetOrClose()));
-    if (ConfigHandler().backtrackingEnable()) {
-        newShortcut(Qt::Key_Comma, this, SLOT(onHistoryBack()));
-        newShortcut(Qt::Key_Period, this, SLOT(onHistoryForward()));
+    if (ConfigHandler().backtrackEnable()) {
+        newShortcut(Qt::Key_Comma, this, SLOT(onBacktrackBackward()));
+        newShortcut(Qt::Key_Period, this, SLOT(onBacktrackForward()));
     }
 }
 
@@ -1603,12 +1603,12 @@ void CaptureWidget::deleteCurrentTool()
     }
 }
 
-void CaptureWidget::onHistoryBack()
+void CaptureWidget::onBacktrackBackward()
 {
     // m_context.selection.setHeight(m_context.selection.height() / 2);
-    auto cu = CaptureHistoryUtils::getInstance();
+    auto cu = BacktrackUtils::getInstance();
     cu->fetchOlder();
-    if (cu->currentScreenShot()) {
+    if (cu->currentScreenShot() != nullptr) {
         m_context.origScreenshot = cu->currentScreenShot()->copy();
         m_context.screenshot = m_context.origScreenshot;
         m_selection->setVisible(true);
@@ -1621,9 +1621,9 @@ void CaptureWidget::onHistoryBack()
         update();
     }
 }
-void CaptureWidget::onHistoryForward()
+void CaptureWidget::onBacktrackForward()
 {
-    auto cu = CaptureHistoryUtils::getInstance();
+    auto cu = BacktrackUtils::getInstance();
     cu->fetchNewer();
     if (cu->isNewest()) {
         m_context = m_currentContext;
diff --git a/src/widgets/capture/capturewidget.h b/src/widgets/capture/capturewidget.h
index bf9c9dbbfa..f2cdb1bc69 100644
--- a/src/widgets/capture/capturewidget.h
+++ b/src/widgets/capture/capturewidget.h
@@ -17,7 +17,7 @@
 #include "src/config/generalconf.h"
 #include "src/tools/capturecontext.h"
 #include "src/tools/capturetool.h"
-#include "src/utils/capturehistoryutils.h"
+#include "src/utils/backtrackutils.h"
 #include "src/utils/confighandler.h"
 #include "src/widgets/capture/magnifierwidget.h"
 #include "src/widgets/capture/selectionwidget.h"
@@ -75,8 +75,8 @@ private slots:
 
     void deleteCurrentTool();
 
-    void onHistoryBack();
-    void onHistoryForward();
+    void onBacktrackBackward();
+    void onBacktrackForward();
     void saveCurrentState();
 
     void setState(CaptureToolButton* b);