Rename src/utils to src/common

src/AnalTask.h

@@ -1,9 +1,9 @@
 #ifndef ANALTHREAD_H
 #define ANALTHREAD_H
 
-#include "utils/AsyncTask.h"
+#include "common/AsyncTask.h"
 #include "Cutter.h"
-#include "utils/InitialOptions.h"
+#include "common/InitialOptions.h"
 
 class CutterCore;
 class MainWindow;

src/Cutter.cpp

@@ -4,10 +4,10 @@
 #include <QDir>
 #include <QCoreApplication>
 
-#include "utils/TempConfig.h"
-#include "utils/Configuration.h"
-#include "utils/AsyncTask.h"
-#include "utils/R2Task.h"
+#include "common/TempConfig.h"
+#include "common/Configuration.h"
+#include "common/AsyncTask.h"
+#include "common/R2Task.h"
 #include "Cutter.h"
 #include "sdb.h"
 

src/Cutter.pro

@@ -109,7 +109,7 @@ SOURCES += \
     Main.cpp \
     Cutter.cpp \
     widgets/DisassemblerGraphView.cpp \
-    utils/RichTextPainter.cpp \
+    common/RichTextPainter.cpp \
     dialogs/InitialOptionsDialog.cpp \
     dialogs/AboutDialog.cpp \
     dialogs/CommentsDialog.cpp \
@@ -118,11 +118,11 @@ SOURCES += \
     dialogs/RenameDialog.cpp \
     dialogs/XrefsDialog.cpp \
     MainWindow.cpp \
-    utils/Helpers.cpp \
-    utils/HexAsciiHighlighter.cpp \
-    utils/HexHighlighter.cpp \
-    utils/Highlighter.cpp \
-    utils/MdHighlighter.cpp \
+    common/Helpers.cpp \
+    common/HexAsciiHighlighter.cpp \
+    common/HexHighlighter.cpp \
+    common/Highlighter.cpp \
+    common/MdHighlighter.cpp \
     dialogs/preferences/AsmOptionsWidget.cpp \
     dialogs/NewFileDialog.cpp \
     AnalTask.cpp \
@@ -145,12 +145,12 @@ SOURCES += \
     widgets/DisassemblyWidget.cpp \
     widgets/SidebarWidget.cpp \
     widgets/HexdumpWidget.cpp \
-    utils/Configuration.cpp \
-    utils/Colors.cpp \
+    common/Configuration.cpp \
+    common/Colors.cpp \
     dialogs/SaveProjectDialog.cpp \
-    utils/TempConfig.cpp \
-    utils/SvgIconEngine.cpp \
-    utils/SyntaxHighlighter.cpp \
+    common/TempConfig.cpp \
+    common/SvgIconEngine.cpp \
+    common/SyntaxHighlighter.cpp \
     widgets/PseudocodeWidget.cpp \
     widgets/VisualNavbar.cpp \
     widgets/GraphView.cpp \
@@ -166,28 +166,28 @@ SOURCES += \
     widgets/HeadersWidget.cpp \
     widgets/SearchWidget.cpp \
     CutterApplication.cpp \
-    utils/JupyterConnection.cpp \
+    common/JupyterConnection.cpp \
     widgets/JupyterWidget.cpp \
-    utils/PythonAPI.cpp \
-    utils/NestedIPyKernel.cpp \
+    common/PythonAPI.cpp \
+    common/NestedIPyKernel.cpp \
     dialogs/R2PluginsDialog.cpp \
     widgets/CutterDockWidget.cpp \
     widgets/CutterSeekableWidget.cpp \
     widgets/CutterTreeWidget.cpp \
     widgets/GraphWidget.cpp \
-    utils/JsonTreeItem.cpp \
-    utils/JsonModel.cpp \
+    common/JsonTreeItem.cpp \
+    common/JsonModel.cpp \
     dialogs/VersionInfoDialog.cpp \
     widgets/ZignaturesWidget.cpp \
-    utils/AsyncTask.cpp \
+    common/AsyncTask.cpp \
     dialogs/AsyncTaskDialog.cpp \
     widgets/StackWidget.cpp \
     widgets/RegistersWidget.cpp \
     widgets/BacktraceWidget.cpp \
     dialogs/OpenFileDialog.cpp \
-    utils/CommandTask.cpp \
-    utils/ProgressIndicator.cpp \
-    utils/R2Task.cpp \
+    common/CommandTask.cpp \
+    common/ProgressIndicator.cpp \
+    common/R2Task.cpp \
     widgets/DebugToolbar.cpp \
     widgets/MemoryMapWidget.cpp \
     dialogs/preferences/DebugOptionsWidget.cpp \
@@ -198,13 +198,13 @@ SOURCES += \
     dialogs/SetToDataDialog.cpp \
     dialogs/SetFunctionVarTypes.cpp \
     widgets/ColorSchemePrefWidget.cpp \
-    utils/ColorSchemeFileSaver.cpp
+    common/ColorSchemeFileSaver.cpp
 
 HEADERS  += \
     Cutter.h \
     widgets/DisassemblerGraphView.h \
-    utils/RichTextPainter.h \
-    utils/CachedFontMetrics.h \
+    common/RichTextPainter.h \
+    common/CachedFontMetrics.h \
     dialogs/AboutDialog.h \
     dialogs/preferences/AsmOptionsWidget.h \
     dialogs/CommentsDialog.h \
@@ -212,12 +212,12 @@ HEADERS  += \
     dialogs/FlagDialog.h \
     dialogs/RenameDialog.h \
     dialogs/XrefsDialog.h \
-    utils/Helpers.h \
-    utils/HexAsciiHighlighter.h \
-    utils/HexHighlighter.h \
+    common/Helpers.h \
+    common/HexAsciiHighlighter.h \
+    common/HexHighlighter.h \
     MainWindow.h \
-    utils/Highlighter.h \
-    utils/MdHighlighter.h \
+    common/Highlighter.h \
+    common/MdHighlighter.h \
     dialogs/InitialOptionsDialog.h \
     dialogs/NewFileDialog.h \
     AnalTask.h \
@@ -240,12 +240,12 @@ HEADERS  += \
     widgets/DisassemblyWidget.h \
     widgets/SidebarWidget.h \
     widgets/HexdumpWidget.h \
-    utils/Configuration.h \
-    utils/Colors.h \
+    common/Configuration.h \
+    common/Colors.h \
     dialogs/SaveProjectDialog.h \
-    utils/TempConfig.h \
-    utils/SvgIconEngine.h \
-    utils/SyntaxHighlighter.h \
+    common/TempConfig.h \
+    common/SvgIconEngine.h \
+    common/SyntaxHighlighter.h \
     widgets/PseudocodeWidget.h \
     widgets/VisualNavbar.h \
     widgets/GraphView.h \
@@ -261,31 +261,31 @@ HEADERS  += \
     widgets/TypesWidget.h \
     widgets/HeadersWidget.h \
     widgets/SearchWidget.h \
-    utils/JupyterConnection.h \
+    common/JupyterConnection.h \
     widgets/JupyterWidget.h \
-    utils/PythonAPI.h \
-    utils/NestedIPyKernel.h \
+    common/PythonAPI.h \
+    common/NestedIPyKernel.h \
     dialogs/R2PluginsDialog.h \
     widgets/CutterDockWidget.h \
     widgets/CutterTreeWidget.h \
     widgets/CutterSeekableWidget.h \
     widgets/GraphWidget.h \
-    utils/JsonTreeItem.h \
-    utils/JsonModel.h \
+    common/JsonTreeItem.h \
+    common/JsonModel.h \
     dialogs/VersionInfoDialog.h \
     widgets/ZignaturesWidget.h \
-    utils/AsyncTask.h \
+    common/AsyncTask.h \
     dialogs/AsyncTaskDialog.h \
     widgets/StackWidget.h \
     widgets/RegistersWidget.h \
     widgets/BacktraceWidget.h \
     dialogs/OpenFileDialog.h \
-    utils/StringsTask.h \
-    utils/FunctionsTask.h \
-    utils/CommandTask.h \
-    utils/ProgressIndicator.h \
+    common/StringsTask.h \
+    common/FunctionsTask.h \
+    common/CommandTask.h \
+    common/ProgressIndicator.h \
     plugins/CutterPlugin.h \
-    utils/R2Task.h \
+    common/R2Task.h \
     widgets/DebugToolbar.h \
     widgets/MemoryMapWidget.h \
     dialogs/preferences/DebugOptionsWidget.h \
@@ -294,9 +294,9 @@ HEADERS  += \
     dialogs/AttachProcDialog.h \
     widgets/RegisterRefsWidget.h \
     dialogs/SetToDataDialog.h \
-    utils/InitialOptions.h \
+    common/InitialOptions.h \
     dialogs/SetFunctionVarTypes.h \
-    utils/ColorSchemeFileSaver.h \
+    common/ColorSchemeFileSaver.h \
     widgets/ColorSchemePrefWidget.h 
 
 FORMS    += \

src/CutterApplication.cpp

@@ -12,7 +12,7 @@
 #include <QDir>
 
 #ifdef CUTTER_ENABLE_JUPYTER
-#include "utils/JupyterConnection.h"
+#include "common/JupyterConnection.h"
 #endif
 #include "plugins/CutterPlugin.h"
 

src/MainWindow.cpp

@@ -1,6 +1,6 @@
 #include "MainWindow.h"
 #include "ui_MainWindow.h"
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 
 #include <QApplication>
 #include <QComboBox>
@@ -32,12 +32,12 @@
 #include <QTreeWidgetItem>
 #include <QSvgRenderer>
 
-#include "utils/Highlighter.h"
-#include "utils/HexAsciiHighlighter.h"
-#include "utils/Helpers.h"
-#include "utils/SvgIconEngine.h"
-#include "utils/ProgressIndicator.h"
-#include "utils/TempConfig.h"
+#include "common/Highlighter.h"
+#include "common/HexAsciiHighlighter.h"
+#include "common/Helpers.h"
+#include "common/SvgIconEngine.h"
+#include "common/ProgressIndicator.h"
+#include "common/TempConfig.h"
 
 #include "dialogs/NewFileDialog.h"
 #include "dialogs/InitialOptionsDialog.h"

src/MainWindow.h

@@ -12,8 +12,8 @@
 #include "widgets/HexdumpWidget.h"
 #include "widgets/PseudocodeWidget.h"
 #include "dialogs/NewFileDialog.h"
-#include "utils/Configuration.h"
-#include "utils/InitialOptions.h"
+#include "common/Configuration.h"
+#include "common/InitialOptions.h"
 
 #include <QMainWindow>
 #include <QList>

src/common/ColorSchemeFileSaver.cpp

@@ -1,4 +1,4 @@
-#include "utils/ColorSchemeFileSaver.h"
+#include "common/ColorSchemeFileSaver.h"
 
 #include <QDir>
 #include <QDebug>
@@ -6,7 +6,7 @@
 #include <QJsonArray>
 #include <QJsonObject>
 #include <QStandardPaths>
-#include "utils/Configuration.h"
+#include "common/Configuration.h"
 
 static const QStringList cutterSpecificOptions = {
     "gui.main",

src/common/Colors.cpp

@@ -1,5 +1,5 @@
 #include "Colors.h"
-#include "utils/Configuration.h"
+#include "common/Configuration.h"
 
 Colors::Colors()
 {

src/common/Colors.h

@@ -2,7 +2,7 @@
 #define COLORS_H
 
 #include "Cutter.h"
-#include "utils/RichTextPainter.h"
+#include "common/RichTextPainter.h"
 #include <r_anal.h>
 
 class Colors

src/common/CommandTask.h

@@ -2,7 +2,7 @@
 #ifndef COMMANDTASK_H
 #define COMMANDTASK_H
 
-#include "utils/AsyncTask.h"
+#include "common/AsyncTask.h"
 #include "Cutter.h"
 
 class CommandTask : public AsyncTask

src/common/Configuration.cpp

@@ -5,7 +5,7 @@
 #include <QFile>
 #include <QApplication>
 
-#include "utils/ColorSchemeFileSaver.h"
+#include "common/ColorSchemeFileSaver.h"
 
 Configuration *Configuration::mPtr = nullptr;
 

src/common/FunctionsTask.h

@@ -2,7 +2,7 @@
 #ifndef FUNCTIONSTASK_H
 #define FUNCTIONSTASK_H
 
-#include "utils/AsyncTask.h"
+#include "common/AsyncTask.h"
 #include "Cutter.h"
 
 class FunctionsTask : public AsyncTask

src/common/Helpers.cpp

@@ -1,4 +1,4 @@
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 
 #include <cmath>
 #include <QPlainTextEdit>

src/common/HexAsciiHighlighter.cpp

@@ -1,6 +1,6 @@
 #include <QtGui>
 
-#include "utils/HexAsciiHighlighter.h"
+#include "common/HexAsciiHighlighter.h"
 
 AsciiHighlighter::AsciiHighlighter(QTextDocument *parent)
     : QSyntaxHighlighter(parent)

src/common/HexHighlighter.cpp

@@ -1,6 +1,6 @@
 #include <QtGui>
 
-#include "utils/HexHighlighter.h"
+#include "common/HexHighlighter.h"
 
 HexHighlighter::HexHighlighter(QTextDocument *parent)
     : QSyntaxHighlighter(parent)

src/common/MdHighlighter.cpp

@@ -1,6 +1,6 @@
 #include <QtGui>
 
-#include "utils/MdHighlighter.h"
+#include "common/MdHighlighter.h"
 
 MdHighlighter::MdHighlighter(QTextDocument *parent)
     : QSyntaxHighlighter(parent)

src/common/RichTextPainter.cpp

@@ -1,7 +1,7 @@
 /* x64dbg RichTextPainter */
 #include "RichTextPainter.h"
 #include "CachedFontMetrics.h"
-#include "utils/Configuration.h"
+#include "common/Configuration.h"
 #include <QPainter>
 #include <QTextBlock>
 #include <QTextFragment>

src/common/StringsTask.h

@@ -2,7 +2,7 @@
 #ifndef STRINGSASYNCTASK_H
 #define STRINGSASYNCTASK_H
 
-#include "utils/AsyncTask.h"
+#include "common/AsyncTask.h"
 #include "Cutter.h"
 
 class StringsTask : public AsyncTask

src/dialogs/AboutDialog.cpp

@@ -3,7 +3,7 @@
 #include "ui_AboutDialog.h"
 #include "R2PluginsDialog.h"
 #include "r_version.h"
-#include "utils/Configuration.h"
+#include "common/Configuration.h"
 
 #include <QUrl>
 #include <QTimer>

src/dialogs/AsyncTaskDialog.cpp

@@ -1,6 +1,6 @@
 
 #include "AsyncTaskDialog.h"
-#include "utils/AsyncTask.h"
+#include "common/AsyncTask.h"
 
 #include "ui_AsyncTaskDialog.h"
 

src/dialogs/AsyncTaskDialog.h

@@ -7,7 +7,7 @@
 #include <QDialog>
 #include <QTimer>
 
-#include "utils/AsyncTask.h"
+#include "common/AsyncTask.h"
 
 namespace Ui {
 class AsyncTaskDialog;

src/dialogs/AttachProcDialog.cpp

@@ -3,7 +3,7 @@
 #include "AttachProcDialog.h"
 #include "ui_AttachProcDialog.h"
 
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 
 #include <QScrollBar>
 

src/dialogs/InitialOptionsDialog.cpp

@@ -1,12 +1,12 @@
 
-#include "utils/AsyncTask.h"
+#include "common/AsyncTask.h"
 
 #include "InitialOptionsDialog.h"
 #include "ui_InitialOptionsDialog.h"
 #include "MainWindow.h"
 #include "dialogs/NewFileDialog.h"
 #include "dialogs/AsyncTaskDialog.h"
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 
 #include <QSettings>
 #include <QFileInfo>

src/dialogs/InitialOptionsDialog.h

@@ -8,7 +8,7 @@
 #include <memory>
 #include "Cutter.h"
 #include "AnalTask.h"
-#include "utils/InitialOptions.h"
+#include "common/InitialOptions.h"
 
 namespace Ui {
 class InitialOptionsDialog;

src/dialogs/NewFileDialog.cpp

@@ -3,7 +3,7 @@
 #include "dialogs/NewFileDialog.h"
 #include "dialogs/AboutDialog.h"
 #include "ui_NewfileDialog.h"
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 
 #include <QFileDialog>
 #include <QtGui>

src/dialogs/R2PluginsDialog.cpp

@@ -2,7 +2,7 @@
 #include "ui_R2PluginsDialog.h"
 
 #include "Cutter.h"
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 
 R2PluginsDialog::R2PluginsDialog(QWidget *parent) :
     QDialog(parent),

src/dialogs/SaveProjectDialog.cpp

@@ -4,8 +4,8 @@
 #include <Cutter.h>
 #include "SaveProjectDialog.h"
 #include "ui_SaveProjectDialog.h"
-#include "utils/TempConfig.h"
-#include "utils/Configuration.h"
+#include "common/TempConfig.h"
+#include "common/Configuration.h"
 
 SaveProjectDialog::SaveProjectDialog(bool quit, QWidget *parent) :
     QDialog(parent),

src/dialogs/VersionInfoDialog.cpp

@@ -1,7 +1,7 @@
 #include "VersionInfoDialog.h"
 #include "ui_VersionInfoDialog.h"
 
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 
 #include <QJsonArray>
 #include <QStringList>

src/dialogs/XrefsDialog.cpp

@@ -1,8 +1,8 @@
 #include "XrefsDialog.h"
 #include "ui_XrefsDialog.h"
 
-#include "utils/TempConfig.h"
-#include "utils/Helpers.h"
+#include "common/TempConfig.h"
+#include "common/Helpers.h"
 
 #include "MainWindow.h"
 

src/dialogs/XrefsDialog.h

@@ -4,7 +4,7 @@
 #include <QDialog>
 #include <QTreeWidgetItem>
 #include <memory>
-#include "utils/Highlighter.h"
+#include "common/Highlighter.h"
 #include "Cutter.h"
 
 class MainWindow;

src/dialogs/preferences/AppearanceOptionsWidget.cpp

@@ -8,10 +8,10 @@
 #include "AppearanceOptionsWidget.h"
 #include "ui_AppearanceOptionsWidget.h"
 
-#include "utils/Helpers.h"
-#include "utils/Configuration.h"
+#include "common/Helpers.h"
+#include "common/Configuration.h"
 
-#include "utils/ColorSchemeFileSaver.h"
+#include "common/ColorSchemeFileSaver.h"
 #include "widgets/ColorSchemePrefWidget.h"
 
 AppearanceOptionsWidget::AppearanceOptionsWidget(PreferencesDialog *dialog, QWidget *parent)

src/dialogs/preferences/AsmOptionsWidget.cpp

@@ -6,8 +6,8 @@
 
 #include "PreferencesDialog.h"
 
-#include "utils/Helpers.h"
-#include "utils/Configuration.h"
+#include "common/Helpers.h"
+#include "common/Configuration.h"
 
 AsmOptionsWidget::AsmOptionsWidget(PreferencesDialog */*dialog*/, QWidget *parent)
     : QDialog(parent),

src/dialogs/preferences/DebugOptionsWidget.cpp

@@ -7,8 +7,8 @@
 #include <QFontDialog>
 #include "PreferencesDialog.h"
 
-#include "utils/Helpers.h"
-#include "utils/Configuration.h"
+#include "common/Helpers.h"
+#include "common/Configuration.h"
 
 DebugOptionsWidget::DebugOptionsWidget(PreferencesDialog *dialog, QWidget *parent)
     : QDialog(parent),

src/dialogs/preferences/GraphOptionsWidget.cpp

@@ -6,8 +6,8 @@
 
 #include "PreferencesDialog.h"
 
-#include "utils/Helpers.h"
-#include "utils/Configuration.h"
+#include "common/Helpers.h"
+#include "common/Configuration.h"
 
 GraphOptionsWidget::GraphOptionsWidget(PreferencesDialog */*dialog*/, QWidget *parent)
     : QDialog(parent),

src/dialogs/preferences/PreferencesDialog.cpp

@@ -10,8 +10,8 @@
 
 #include "PreferenceCategory.h"
 
-#include "utils/Helpers.h"
-#include "utils/Configuration.h"
+#include "common/Helpers.h"
+#include "common/Configuration.h"
 
 
 PreferencesDialog::PreferencesDialog(QWidget *parent)

src/plugins/CutterSamplePlugin.cpp

@@ -3,8 +3,8 @@
 #include <QPushButton>
 
 #include "CutterSamplePlugin.h"
-#include "utils/TempConfig.h"
-#include "utils/Configuration.h"
+#include "common/TempConfig.h"
+#include "common/Configuration.h"
 
 void CutterSamplePlugin::setupPlugin(CutterCore *core)
 {

src/widgets/BacktraceWidget.cpp

@@ -1,6 +1,6 @@
 #include "BacktraceWidget.h"
 #include "ui_BacktraceWidget.h"
-#include "utils/JsonModel.h"
+#include "common/JsonModel.h"
 
 #include "MainWindow.h"
 

src/widgets/BreakpointWidget.cpp

@@ -2,7 +2,7 @@
 #include "ui_BreakpointWidget.h"
 #include "dialogs/BreakpointsDialog.h"
 #include "MainWindow.h"
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 #include <QMenu>
 
 BreakpointModel::BreakpointModel(QList<BreakpointDescription> *breakpoints, QObject *parent)

src/widgets/ClassesWidget.cpp

@@ -4,7 +4,7 @@
 #include "ClassesWidget.h"
 #include "MainWindow.h"
 #include "ui_ClassesWidget.h"
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 
 ClassesModel::ClassesModel(QList<ClassDescription> *classes, QObject *parent)
     : QAbstractItemModel(parent),

src/widgets/ColorSchemePrefWidget.cpp

@@ -1,8 +1,8 @@
-#include "utils/Configuration.h"
-#include "utils/Configuration.h"
+#include "common/Configuration.h"
+#include "common/Configuration.h"
 #include "ColorSchemePrefWidget.h"
 #include "ui_ColorSchemePrefWidget.h"
-#include "utils/ColorSchemeFileSaver.h"
+#include "common/ColorSchemeFileSaver.h"
 
 #include <QMap>
 #include <QFile>

src/widgets/CommentsWidget.cpp

@@ -4,7 +4,7 @@
 #include "CommentsWidget.h"
 #include "ui_CommentsWidget.h"
 #include "MainWindow.h"
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 
 CommentsModel::CommentsModel(QList<CommentDescription> *comments,
                              QMap<QString, QList<CommentDescription> > *nestedComments,

src/widgets/ConsoleWidget.cpp

@@ -8,8 +8,8 @@
 #include "Cutter.h"
 #include "ConsoleWidget.h"
 #include "ui_ConsoleWidget.h"
-#include "utils/Helpers.h"
-#include "utils/SvgIconEngine.h"
+#include "common/Helpers.h"
+#include "common/SvgIconEngine.h"
 
 
 // TODO: Find a way to get to this without copying it here

src/widgets/ConsoleWidget.h

@@ -4,7 +4,7 @@
 #include <memory>
 #include "MainWindow.h"
 #include "CutterDockWidget.h"
-#include "utils/CommandTask.h"
+#include "common/CommandTask.h"
 
 namespace Ui {
 class ConsoleWidget;

src/widgets/Dashboard.cpp

@@ -1,9 +1,9 @@
 #include "Dashboard.h"
 #include "ui_Dashboard.h"
-#include "utils/Helpers.h"
-#include "utils/JsonModel.h"
-#include "utils/JsonTreeItem.h"
-#include "utils/TempConfig.h"
+#include "common/Helpers.h"
+#include "common/JsonModel.h"
+#include "common/JsonTreeItem.h"
+#include "common/TempConfig.h"
 #include "dialogs/VersionInfoDialog.h"
 
 

src/widgets/DisassemblerGraphView.cpp

@@ -16,11 +16,11 @@
 #include <QStandardPaths>
 
 #include "Cutter.h"
-#include "utils/Colors.h"
-#include "utils/Configuration.h"
-#include "utils/CachedFontMetrics.h"
-#include "utils/TempConfig.h"
-#include "utils/SyntaxHighlighter.h"
+#include "common/Colors.h"
+#include "common/Configuration.h"
+#include "common/CachedFontMetrics.h"
+#include "common/TempConfig.h"
+#include "common/SyntaxHighlighter.h"
 
 DisassemblerGraphView::DisassemblerGraphView(QWidget *parent)
     : GraphView(parent),

src/widgets/DisassemblerGraphView.h

@@ -10,7 +10,7 @@
 
 #include "widgets/GraphView.h"
 #include "menus/DisassemblyContextMenu.h"
-#include "utils/RichTextPainter.h"
+#include "common/RichTextPainter.h"
 #include "CutterSeekableWidget.h"
 
 class QTextEdit;

src/widgets/DisassemblyWidget.cpp

@@ -1,10 +1,10 @@
 #include "DisassemblyWidget.h"
 #include "menus/DisassemblyContextMenu.h"
-#include "utils/HexAsciiHighlighter.h"
-#include "utils/HexHighlighter.h"
-#include "utils/Configuration.h"
-#include "utils/Helpers.h"
-#include "utils/TempConfig.h"
+#include "common/HexAsciiHighlighter.h"
+#include "common/HexHighlighter.h"
+#include "common/Configuration.h"
+#include "common/Helpers.h"
+#include "common/TempConfig.h"
 
 #include <QScrollBar>
 #include <QJsonArray>

src/widgets/EntrypointWidget.cpp

@@ -2,7 +2,7 @@
 #include "ui_EntrypointWidget.h"
 
 #include "MainWindow.h"
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 
 #include <QTreeWidget>
 #include <QPen>

src/widgets/ExportsWidget.cpp

@@ -1,7 +1,7 @@
 #include "ExportsWidget.h"
 #include "ui_ExportsWidget.h"
 #include "MainWindow.h"
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 
 #include "WidgetShortcuts.h"
 

src/widgets/FlagsWidget.cpp

@@ -6,7 +6,7 @@
 #include "ui_FlagsWidget.h"
 #include "MainWindow.h"
 #include "dialogs/RenameDialog.h"
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 
 FlagsModel::FlagsModel(QList<FlagDescription> *flags, QObject *parent)
     : QAbstractListModel(parent),

src/widgets/FunctionsWidget.cpp

@@ -2,12 +2,12 @@
 #include "ui_FunctionsWidget.h"
 
 #include "MainWindow.h"
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 #include "dialogs/CommentsDialog.h"
 #include "dialogs/RenameDialog.h"
 #include "dialogs/XrefsDialog.h"
-#include "utils/FunctionsTask.h"
-#include "utils/TempConfig.h"
+#include "common/FunctionsTask.h"
+#include "common/TempConfig.h"
 
 #include <algorithm>
 #include <QMenu>

src/widgets/HeadersWidget.cpp

@@ -1,7 +1,7 @@
 #include "HeadersWidget.h"
 #include "ui_HeadersWidget.h"
 #include "MainWindow.h"
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 
 HeadersModel::HeadersModel(QList<HeaderDescription> *headers, QObject *parent)
     : QAbstractListModel(parent),

src/widgets/HexdumpWidget.cpp

@@ -1,9 +1,9 @@
 #include "HexdumpWidget.h"
 #include "ui_HexdumpWidget.h"
 
-#include "utils/Helpers.h"
-#include "utils/Configuration.h"
-#include "utils/TempConfig.h"
+#include "common/Helpers.h"
+#include "common/Configuration.h"
+#include "common/TempConfig.h"
 
 #include <QJsonObject>
 #include <QJsonArray>

src/widgets/HexdumpWidget.h

@@ -11,10 +11,10 @@
 #include "Cutter.h"
 #include "CutterDockWidget.h"
 #include "CutterSeekableWidget.h"
-#include "utils/Highlighter.h"
-#include "utils/HexAsciiHighlighter.h"
-#include "utils/HexHighlighter.h"
-#include "utils/SvgIconEngine.h"
+#include "common/Highlighter.h"
+#include "common/HexAsciiHighlighter.h"
+#include "common/HexHighlighter.h"
+#include "common/SvgIconEngine.h"
 
 #include "Dashboard.h"
 

src/widgets/ImportsWidget.cpp

@@ -2,7 +2,7 @@
 #include "ui_ImportsWidget.h"
 
 #include "MainWindow.h"
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 
 #include "WidgetShortcuts.h"
 

src/widgets/JupyterWidget.h

@@ -9,7 +9,7 @@
 #include <QAbstractButton>
 
 #include "CutterDockWidget.h"
-#include "utils/JupyterConnection.h"
+#include "common/JupyterConnection.h"
 
 namespace Ui {
 class JupyterWidget;

src/widgets/MemoryMapWidget.cpp

@@ -1,7 +1,7 @@
 #include "MemoryMapWidget.h"
 #include "ui_MemoryMapWidget.h"
 #include "MainWindow.h"
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 
 MemoryMapModel::MemoryMapModel(QList<MemoryMapDescription> *memoryMaps, QObject *parent)
     : QAbstractListModel(parent),

src/widgets/PseudocodeWidget.cpp

@@ -3,10 +3,10 @@
 
 #include <QTextEdit>
 
-#include "utils/Configuration.h"
-#include "utils/Helpers.h"
-#include "utils/SyntaxHighlighter.h"
-#include "utils/TempConfig.h"
+#include "common/Configuration.h"
+#include "common/Helpers.h"
+#include "common/SyntaxHighlighter.h"
+#include "common/TempConfig.h"
 
 PseudocodeWidget::PseudocodeWidget(MainWindow *main, QAction *action) :
     CutterDockWidget(main, action),

src/widgets/RegisterRefsWidget.cpp

@@ -1,7 +1,7 @@
 #include "RegisterRefsWidget.h"
 #include "ui_RegisterRefsWidget.h"
 #include "MainWindow.h"
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 #include <QMenu>
 #include <QClipboard>
 

src/widgets/RegistersWidget.cpp

@@ -1,6 +1,6 @@
 #include "RegistersWidget.h"
 #include "ui_RegistersWidget.h"
-#include "utils/JsonModel.h"
+#include "common/JsonModel.h"
 
 #include "MainWindow.h"
 

src/widgets/RelocsWidget.cpp

@@ -2,7 +2,7 @@
 #include "RelocsWidget.h"
 #include "ui_RelocsWidget.h"
 #include "MainWindow.h"
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 
 RelocsModel::RelocsModel(QList<RelocDescription> *relocs, QObject *parent) :
     QAbstractTableModel(parent),

src/widgets/ResourcesWidget.cpp

@@ -1,4 +1,4 @@
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 #include "ResourcesWidget.h"
 #include "MainWindow.h"
 #include <QVBoxLayout>

src/widgets/SdbDock.cpp

@@ -2,7 +2,7 @@
 #include "ui_SdbDock.h"
 
 #include "MainWindow.h"
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 
 #include <QDebug>
 #include <QTreeWidget>

src/widgets/SearchWidget.cpp

@@ -4,7 +4,7 @@
 #include "SearchWidget.h"
 #include "ui_SearchWidget.h"
 #include "MainWindow.h"
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 
 SearchModel::SearchModel(QList<SearchDescription> *search, QObject *parent)
     : QAbstractListModel(parent),

src/widgets/SectionsWidget.cpp

@@ -3,7 +3,7 @@
 #include "SectionsWidget.h"
 
 #include "MainWindow.h"
-#include "utils/Helpers.h"
+#include "common/Helpers.h"
 
 SectionsModel::SectionsModel(QList<SectionDescription> *sections, QObject *parent)
     : QAbstractListModel(parent),

src/widgets/SidebarWidget.cpp

@@ -2,8 +2,8 @@
 #include "ui_SidebarWidget.h"
 #include "DisassemblerGraphView.h"
 
-#include "utils/Helpers.h"
-#include "utils/TempConfig.h"
+#include "common/Helpers.h"
+#include "common/TempConfig.h"
 
 #include <QTemporaryFile>
 #include <QFontDialog>