From d4a77d9c972a42451a93f788bf11335f42e92755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=A4rkl?= Date: Wed, 17 Oct 2018 09:55:53 +0200 Subject: [PATCH] Rename src/utils to src/common --- src/AnalTask.h | 4 +- src/Cutter.cpp | 8 +- src/Cutter.pro | 92 +++++++++---------- src/CutterApplication.cpp | 2 +- src/MainWindow.cpp | 14 +-- src/MainWindow.h | 4 +- src/{utils => common}/AsyncTask.cpp | 0 src/{utils => common}/AsyncTask.h | 0 src/{utils => common}/CachedFontMetrics.h | 0 .../ColorSchemeFileSaver.cpp | 4 +- src/{utils => common}/ColorSchemeFileSaver.h | 0 src/{utils => common}/Colors.cpp | 2 +- src/{utils => common}/Colors.h | 2 +- src/{utils => common}/CommandTask.cpp | 0 src/{utils => common}/CommandTask.h | 2 +- src/{utils => common}/Configuration.cpp | 2 +- src/{utils => common}/Configuration.h | 0 src/{utils => common}/FunctionsTask.h | 2 +- src/{utils => common}/Helpers.cpp | 2 +- src/{utils => common}/Helpers.h | 0 src/{utils => common}/HexAsciiHighlighter.cpp | 2 +- src/{utils => common}/HexAsciiHighlighter.h | 0 src/{utils => common}/HexHighlighter.cpp | 2 +- src/{utils => common}/HexHighlighter.h | 0 src/{utils => common}/Highlighter.cpp | 0 src/{utils => common}/Highlighter.h | 0 src/{utils => common}/InitialOptions.h | 0 src/{utils => common}/JsonModel.cpp | 0 src/{utils => common}/JsonModel.h | 0 src/{utils => common}/JsonTreeItem.cpp | 0 src/{utils => common}/JsonTreeItem.h | 0 src/{utils => common}/JupyterConnection.cpp | 0 src/{utils => common}/JupyterConnection.h | 0 src/{utils => common}/MdHighlighter.cpp | 2 +- src/{utils => common}/MdHighlighter.h | 0 src/{utils => common}/NestedIPyKernel.cpp | 0 src/{utils => common}/NestedIPyKernel.h | 0 src/{utils => common}/ProgressIndicator.cpp | 0 src/{utils => common}/ProgressIndicator.h | 0 src/{utils => common}/PythonAPI.cpp | 0 src/{utils => common}/PythonAPI.h | 0 src/{utils => common}/R2Task.cpp | 0 src/{utils => common}/R2Task.h | 0 src/{utils => common}/RichTextPainter.cpp | 2 +- src/{utils => common}/RichTextPainter.h | 0 src/{utils => common}/StringsTask.h | 2 +- src/{utils => common}/SvgIconEngine.cpp | 0 src/{utils => common}/SvgIconEngine.h | 0 src/{utils => common}/SyntaxHighlighter.cpp | 0 src/{utils => common}/SyntaxHighlighter.h | 0 src/{utils => common}/TempConfig.cpp | 0 src/{utils => common}/TempConfig.h | 0 src/dialogs/AboutDialog.cpp | 2 +- src/dialogs/AsyncTaskDialog.cpp | 2 +- src/dialogs/AsyncTaskDialog.h | 2 +- src/dialogs/AttachProcDialog.cpp | 2 +- src/dialogs/InitialOptionsDialog.cpp | 4 +- src/dialogs/InitialOptionsDialog.h | 2 +- src/dialogs/NewFileDialog.cpp | 2 +- src/dialogs/R2PluginsDialog.cpp | 2 +- src/dialogs/SaveProjectDialog.cpp | 4 +- src/dialogs/VersionInfoDialog.cpp | 2 +- src/dialogs/XrefsDialog.cpp | 4 +- src/dialogs/XrefsDialog.h | 2 +- .../preferences/AppearanceOptionsWidget.cpp | 6 +- src/dialogs/preferences/AsmOptionsWidget.cpp | 4 +- .../preferences/DebugOptionsWidget.cpp | 4 +- .../preferences/GraphOptionsWidget.cpp | 4 +- src/dialogs/preferences/PreferencesDialog.cpp | 4 +- src/plugins/CutterSamplePlugin.cpp | 4 +- src/widgets/BacktraceWidget.cpp | 2 +- src/widgets/BreakpointWidget.cpp | 2 +- src/widgets/ClassesWidget.cpp | 2 +- src/widgets/ColorSchemePrefWidget.cpp | 6 +- src/widgets/CommentsWidget.cpp | 2 +- src/widgets/ConsoleWidget.cpp | 4 +- src/widgets/ConsoleWidget.h | 2 +- src/widgets/Dashboard.cpp | 8 +- src/widgets/DisassemblerGraphView.cpp | 10 +- src/widgets/DisassemblerGraphView.h | 2 +- src/widgets/DisassemblyWidget.cpp | 10 +- src/widgets/EntrypointWidget.cpp | 2 +- src/widgets/ExportsWidget.cpp | 2 +- src/widgets/FlagsWidget.cpp | 2 +- src/widgets/FunctionsWidget.cpp | 6 +- src/widgets/HeadersWidget.cpp | 2 +- src/widgets/HexdumpWidget.cpp | 6 +- src/widgets/HexdumpWidget.h | 8 +- src/widgets/ImportsWidget.cpp | 2 +- src/widgets/JupyterWidget.h | 2 +- src/widgets/MemoryMapWidget.cpp | 2 +- src/widgets/PseudocodeWidget.cpp | 8 +- src/widgets/RegisterRefsWidget.cpp | 2 +- src/widgets/RegistersWidget.cpp | 2 +- src/widgets/RelocsWidget.cpp | 2 +- src/widgets/ResourcesWidget.cpp | 2 +- src/widgets/SdbDock.cpp | 2 +- src/widgets/SearchWidget.cpp | 2 +- src/widgets/SectionsWidget.cpp | 2 +- src/widgets/SidebarWidget.cpp | 4 +- src/widgets/SidebarWidget.h | 6 +- src/widgets/StackWidget.cpp | 4 +- src/widgets/StringsWidget.cpp | 2 +- src/widgets/StringsWidget.h | 2 +- src/widgets/SymbolsWidget.cpp | 2 +- src/widgets/TypesWidget.cpp | 2 +- src/widgets/VTablesWidget.cpp | 2 +- src/widgets/VisualNavbar.cpp | 2 +- src/widgets/ZignaturesWidget.cpp | 2 +- 109 files changed, 170 insertions(+), 170 deletions(-) rename src/{utils => common}/AsyncTask.cpp (100%) rename src/{utils => common}/AsyncTask.h (100%) rename src/{utils => common}/CachedFontMetrics.h (100%) rename src/{utils => common}/ColorSchemeFileSaver.cpp (98%) rename src/{utils => common}/ColorSchemeFileSaver.h (100%) rename src/{utils => common}/Colors.cpp (98%) rename src/{utils => common}/Colors.h (88%) rename src/{utils => common}/CommandTask.cpp (100%) rename src/{utils => common}/CommandTask.h (92%) rename src/{utils => common}/Configuration.cpp (99%) rename src/{utils => common}/Configuration.h (100%) rename src/{utils => common}/FunctionsTask.h (93%) rename src/{utils => common}/Helpers.cpp (99%) rename src/{utils => common}/Helpers.h (100%) rename src/{utils => common}/HexAsciiHighlighter.cpp (97%) rename src/{utils => common}/HexAsciiHighlighter.h (100%) rename src/{utils => common}/HexHighlighter.cpp (99%) rename src/{utils => common}/HexHighlighter.h (100%) rename src/{utils => common}/Highlighter.cpp (100%) rename src/{utils => common}/Highlighter.h (100%) rename src/{utils => common}/InitialOptions.h (100%) rename src/{utils => common}/JsonModel.cpp (100%) rename src/{utils => common}/JsonModel.h (100%) rename src/{utils => common}/JsonTreeItem.cpp (100%) rename src/{utils => common}/JsonTreeItem.h (100%) rename src/{utils => common}/JupyterConnection.cpp (100%) rename src/{utils => common}/JupyterConnection.h (100%) rename src/{utils => common}/MdHighlighter.cpp (97%) rename src/{utils => common}/MdHighlighter.h (100%) rename src/{utils => common}/NestedIPyKernel.cpp (100%) rename src/{utils => common}/NestedIPyKernel.h (100%) rename src/{utils => common}/ProgressIndicator.cpp (100%) rename src/{utils => common}/ProgressIndicator.h (100%) rename src/{utils => common}/PythonAPI.cpp (100%) rename src/{utils => common}/PythonAPI.h (100%) rename src/{utils => common}/R2Task.cpp (100%) rename src/{utils => common}/R2Task.h (100%) rename src/{utils => common}/RichTextPainter.cpp (97%) rename src/{utils => common}/RichTextPainter.h (100%) rename src/{utils => common}/StringsTask.h (94%) rename src/{utils => common}/SvgIconEngine.cpp (100%) rename src/{utils => common}/SvgIconEngine.h (100%) rename src/{utils => common}/SyntaxHighlighter.cpp (100%) rename src/{utils => common}/SyntaxHighlighter.h (100%) rename src/{utils => common}/TempConfig.cpp (100%) rename src/{utils => common}/TempConfig.h (100%) diff --git a/src/AnalTask.h b/src/AnalTask.h index d7879da7..a04964d0 100644 --- a/src/AnalTask.h +++ b/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; diff --git a/src/Cutter.cpp b/src/Cutter.cpp index 2d728ea2..0e04aee4 100644 --- a/src/Cutter.cpp +++ b/src/Cutter.cpp @@ -4,10 +4,10 @@ #include #include -#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" diff --git a/src/Cutter.pro b/src/Cutter.pro index fefc79a1..d33b7ba3 100644 --- a/src/Cutter.pro +++ b/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 += \ diff --git a/src/CutterApplication.cpp b/src/CutterApplication.cpp index c98a75bd..f7ff9bbb 100644 --- a/src/CutterApplication.cpp +++ b/src/CutterApplication.cpp @@ -12,7 +12,7 @@ #include #ifdef CUTTER_ENABLE_JUPYTER -#include "utils/JupyterConnection.h" +#include "common/JupyterConnection.h" #endif #include "plugins/CutterPlugin.h" diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 697151ba..63169669 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -1,6 +1,6 @@ #include "MainWindow.h" #include "ui_MainWindow.h" -#include "utils/Helpers.h" +#include "common/Helpers.h" #include #include @@ -32,12 +32,12 @@ #include #include -#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" diff --git a/src/MainWindow.h b/src/MainWindow.h index 2b34d8b1..4a26ec3c 100644 --- a/src/MainWindow.h +++ b/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 #include diff --git a/src/utils/AsyncTask.cpp b/src/common/AsyncTask.cpp similarity index 100% rename from src/utils/AsyncTask.cpp rename to src/common/AsyncTask.cpp diff --git a/src/utils/AsyncTask.h b/src/common/AsyncTask.h similarity index 100% rename from src/utils/AsyncTask.h rename to src/common/AsyncTask.h diff --git a/src/utils/CachedFontMetrics.h b/src/common/CachedFontMetrics.h similarity index 100% rename from src/utils/CachedFontMetrics.h rename to src/common/CachedFontMetrics.h diff --git a/src/utils/ColorSchemeFileSaver.cpp b/src/common/ColorSchemeFileSaver.cpp similarity index 98% rename from src/utils/ColorSchemeFileSaver.cpp rename to src/common/ColorSchemeFileSaver.cpp index 2663af10..29c82d22 100644 --- a/src/utils/ColorSchemeFileSaver.cpp +++ b/src/common/ColorSchemeFileSaver.cpp @@ -1,4 +1,4 @@ -#include "utils/ColorSchemeFileSaver.h" +#include "common/ColorSchemeFileSaver.h" #include #include @@ -6,7 +6,7 @@ #include #include #include -#include "utils/Configuration.h" +#include "common/Configuration.h" static const QStringList cutterSpecificOptions = { "gui.main", diff --git a/src/utils/ColorSchemeFileSaver.h b/src/common/ColorSchemeFileSaver.h similarity index 100% rename from src/utils/ColorSchemeFileSaver.h rename to src/common/ColorSchemeFileSaver.h diff --git a/src/utils/Colors.cpp b/src/common/Colors.cpp similarity index 98% rename from src/utils/Colors.cpp rename to src/common/Colors.cpp index 1f221cfe..62a922ad 100644 --- a/src/utils/Colors.cpp +++ b/src/common/Colors.cpp @@ -1,5 +1,5 @@ #include "Colors.h" -#include "utils/Configuration.h" +#include "common/Configuration.h" Colors::Colors() { diff --git a/src/utils/Colors.h b/src/common/Colors.h similarity index 88% rename from src/utils/Colors.h rename to src/common/Colors.h index edb4810e..63560ab1 100644 --- a/src/utils/Colors.h +++ b/src/common/Colors.h @@ -2,7 +2,7 @@ #define COLORS_H #include "Cutter.h" -#include "utils/RichTextPainter.h" +#include "common/RichTextPainter.h" #include class Colors diff --git a/src/utils/CommandTask.cpp b/src/common/CommandTask.cpp similarity index 100% rename from src/utils/CommandTask.cpp rename to src/common/CommandTask.cpp diff --git a/src/utils/CommandTask.h b/src/common/CommandTask.h similarity index 92% rename from src/utils/CommandTask.h rename to src/common/CommandTask.h index 7b29ed39..bc38a5bc 100644 --- a/src/utils/CommandTask.h +++ b/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 diff --git a/src/utils/Configuration.cpp b/src/common/Configuration.cpp similarity index 99% rename from src/utils/Configuration.cpp rename to src/common/Configuration.cpp index acf896ae..ca6dcee1 100644 --- a/src/utils/Configuration.cpp +++ b/src/common/Configuration.cpp @@ -5,7 +5,7 @@ #include #include -#include "utils/ColorSchemeFileSaver.h" +#include "common/ColorSchemeFileSaver.h" Configuration *Configuration::mPtr = nullptr; diff --git a/src/utils/Configuration.h b/src/common/Configuration.h similarity index 100% rename from src/utils/Configuration.h rename to src/common/Configuration.h diff --git a/src/utils/FunctionsTask.h b/src/common/FunctionsTask.h similarity index 93% rename from src/utils/FunctionsTask.h rename to src/common/FunctionsTask.h index d6f8f82a..9f5d8f4e 100644 --- a/src/utils/FunctionsTask.h +++ b/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 diff --git a/src/utils/Helpers.cpp b/src/common/Helpers.cpp similarity index 99% rename from src/utils/Helpers.cpp rename to src/common/Helpers.cpp index f984490e..577a166d 100644 --- a/src/utils/Helpers.cpp +++ b/src/common/Helpers.cpp @@ -1,4 +1,4 @@ -#include "utils/Helpers.h" +#include "common/Helpers.h" #include #include diff --git a/src/utils/Helpers.h b/src/common/Helpers.h similarity index 100% rename from src/utils/Helpers.h rename to src/common/Helpers.h diff --git a/src/utils/HexAsciiHighlighter.cpp b/src/common/HexAsciiHighlighter.cpp similarity index 97% rename from src/utils/HexAsciiHighlighter.cpp rename to src/common/HexAsciiHighlighter.cpp index 4b552b08..4b46500a 100644 --- a/src/utils/HexAsciiHighlighter.cpp +++ b/src/common/HexAsciiHighlighter.cpp @@ -1,6 +1,6 @@ #include -#include "utils/HexAsciiHighlighter.h" +#include "common/HexAsciiHighlighter.h" AsciiHighlighter::AsciiHighlighter(QTextDocument *parent) : QSyntaxHighlighter(parent) diff --git a/src/utils/HexAsciiHighlighter.h b/src/common/HexAsciiHighlighter.h similarity index 100% rename from src/utils/HexAsciiHighlighter.h rename to src/common/HexAsciiHighlighter.h diff --git a/src/utils/HexHighlighter.cpp b/src/common/HexHighlighter.cpp similarity index 99% rename from src/utils/HexHighlighter.cpp rename to src/common/HexHighlighter.cpp index 667b0c92..c9f5e050 100644 --- a/src/utils/HexHighlighter.cpp +++ b/src/common/HexHighlighter.cpp @@ -1,6 +1,6 @@ #include -#include "utils/HexHighlighter.h" +#include "common/HexHighlighter.h" HexHighlighter::HexHighlighter(QTextDocument *parent) : QSyntaxHighlighter(parent) diff --git a/src/utils/HexHighlighter.h b/src/common/HexHighlighter.h similarity index 100% rename from src/utils/HexHighlighter.h rename to src/common/HexHighlighter.h diff --git a/src/utils/Highlighter.cpp b/src/common/Highlighter.cpp similarity index 100% rename from src/utils/Highlighter.cpp rename to src/common/Highlighter.cpp diff --git a/src/utils/Highlighter.h b/src/common/Highlighter.h similarity index 100% rename from src/utils/Highlighter.h rename to src/common/Highlighter.h diff --git a/src/utils/InitialOptions.h b/src/common/InitialOptions.h similarity index 100% rename from src/utils/InitialOptions.h rename to src/common/InitialOptions.h diff --git a/src/utils/JsonModel.cpp b/src/common/JsonModel.cpp similarity index 100% rename from src/utils/JsonModel.cpp rename to src/common/JsonModel.cpp diff --git a/src/utils/JsonModel.h b/src/common/JsonModel.h similarity index 100% rename from src/utils/JsonModel.h rename to src/common/JsonModel.h diff --git a/src/utils/JsonTreeItem.cpp b/src/common/JsonTreeItem.cpp similarity index 100% rename from src/utils/JsonTreeItem.cpp rename to src/common/JsonTreeItem.cpp diff --git a/src/utils/JsonTreeItem.h b/src/common/JsonTreeItem.h similarity index 100% rename from src/utils/JsonTreeItem.h rename to src/common/JsonTreeItem.h diff --git a/src/utils/JupyterConnection.cpp b/src/common/JupyterConnection.cpp similarity index 100% rename from src/utils/JupyterConnection.cpp rename to src/common/JupyterConnection.cpp diff --git a/src/utils/JupyterConnection.h b/src/common/JupyterConnection.h similarity index 100% rename from src/utils/JupyterConnection.h rename to src/common/JupyterConnection.h diff --git a/src/utils/MdHighlighter.cpp b/src/common/MdHighlighter.cpp similarity index 97% rename from src/utils/MdHighlighter.cpp rename to src/common/MdHighlighter.cpp index 940c8ac1..4ae0d839 100644 --- a/src/utils/MdHighlighter.cpp +++ b/src/common/MdHighlighter.cpp @@ -1,6 +1,6 @@ #include -#include "utils/MdHighlighter.h" +#include "common/MdHighlighter.h" MdHighlighter::MdHighlighter(QTextDocument *parent) : QSyntaxHighlighter(parent) diff --git a/src/utils/MdHighlighter.h b/src/common/MdHighlighter.h similarity index 100% rename from src/utils/MdHighlighter.h rename to src/common/MdHighlighter.h diff --git a/src/utils/NestedIPyKernel.cpp b/src/common/NestedIPyKernel.cpp similarity index 100% rename from src/utils/NestedIPyKernel.cpp rename to src/common/NestedIPyKernel.cpp diff --git a/src/utils/NestedIPyKernel.h b/src/common/NestedIPyKernel.h similarity index 100% rename from src/utils/NestedIPyKernel.h rename to src/common/NestedIPyKernel.h diff --git a/src/utils/ProgressIndicator.cpp b/src/common/ProgressIndicator.cpp similarity index 100% rename from src/utils/ProgressIndicator.cpp rename to src/common/ProgressIndicator.cpp diff --git a/src/utils/ProgressIndicator.h b/src/common/ProgressIndicator.h similarity index 100% rename from src/utils/ProgressIndicator.h rename to src/common/ProgressIndicator.h diff --git a/src/utils/PythonAPI.cpp b/src/common/PythonAPI.cpp similarity index 100% rename from src/utils/PythonAPI.cpp rename to src/common/PythonAPI.cpp diff --git a/src/utils/PythonAPI.h b/src/common/PythonAPI.h similarity index 100% rename from src/utils/PythonAPI.h rename to src/common/PythonAPI.h diff --git a/src/utils/R2Task.cpp b/src/common/R2Task.cpp similarity index 100% rename from src/utils/R2Task.cpp rename to src/common/R2Task.cpp diff --git a/src/utils/R2Task.h b/src/common/R2Task.h similarity index 100% rename from src/utils/R2Task.h rename to src/common/R2Task.h diff --git a/src/utils/RichTextPainter.cpp b/src/common/RichTextPainter.cpp similarity index 97% rename from src/utils/RichTextPainter.cpp rename to src/common/RichTextPainter.cpp index 85e4a33e..61438b8b 100644 --- a/src/utils/RichTextPainter.cpp +++ b/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 #include #include diff --git a/src/utils/RichTextPainter.h b/src/common/RichTextPainter.h similarity index 100% rename from src/utils/RichTextPainter.h rename to src/common/RichTextPainter.h diff --git a/src/utils/StringsTask.h b/src/common/StringsTask.h similarity index 94% rename from src/utils/StringsTask.h rename to src/common/StringsTask.h index b01e5c2b..d64b6549 100644 --- a/src/utils/StringsTask.h +++ b/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 diff --git a/src/utils/SvgIconEngine.cpp b/src/common/SvgIconEngine.cpp similarity index 100% rename from src/utils/SvgIconEngine.cpp rename to src/common/SvgIconEngine.cpp diff --git a/src/utils/SvgIconEngine.h b/src/common/SvgIconEngine.h similarity index 100% rename from src/utils/SvgIconEngine.h rename to src/common/SvgIconEngine.h diff --git a/src/utils/SyntaxHighlighter.cpp b/src/common/SyntaxHighlighter.cpp similarity index 100% rename from src/utils/SyntaxHighlighter.cpp rename to src/common/SyntaxHighlighter.cpp diff --git a/src/utils/SyntaxHighlighter.h b/src/common/SyntaxHighlighter.h similarity index 100% rename from src/utils/SyntaxHighlighter.h rename to src/common/SyntaxHighlighter.h diff --git a/src/utils/TempConfig.cpp b/src/common/TempConfig.cpp similarity index 100% rename from src/utils/TempConfig.cpp rename to src/common/TempConfig.cpp diff --git a/src/utils/TempConfig.h b/src/common/TempConfig.h similarity index 100% rename from src/utils/TempConfig.h rename to src/common/TempConfig.h diff --git a/src/dialogs/AboutDialog.cpp b/src/dialogs/AboutDialog.cpp index 638461e5..3e4e9ed2 100644 --- a/src/dialogs/AboutDialog.cpp +++ b/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 #include diff --git a/src/dialogs/AsyncTaskDialog.cpp b/src/dialogs/AsyncTaskDialog.cpp index 6f805013..8de49c17 100644 --- a/src/dialogs/AsyncTaskDialog.cpp +++ b/src/dialogs/AsyncTaskDialog.cpp @@ -1,6 +1,6 @@ #include "AsyncTaskDialog.h" -#include "utils/AsyncTask.h" +#include "common/AsyncTask.h" #include "ui_AsyncTaskDialog.h" diff --git a/src/dialogs/AsyncTaskDialog.h b/src/dialogs/AsyncTaskDialog.h index 314d38e0..855f9b1a 100644 --- a/src/dialogs/AsyncTaskDialog.h +++ b/src/dialogs/AsyncTaskDialog.h @@ -7,7 +7,7 @@ #include #include -#include "utils/AsyncTask.h" +#include "common/AsyncTask.h" namespace Ui { class AsyncTaskDialog; diff --git a/src/dialogs/AttachProcDialog.cpp b/src/dialogs/AttachProcDialog.cpp index 3c2c91a9..88c341c2 100644 --- a/src/dialogs/AttachProcDialog.cpp +++ b/src/dialogs/AttachProcDialog.cpp @@ -3,7 +3,7 @@ #include "AttachProcDialog.h" #include "ui_AttachProcDialog.h" -#include "utils/Helpers.h" +#include "common/Helpers.h" #include diff --git a/src/dialogs/InitialOptionsDialog.cpp b/src/dialogs/InitialOptionsDialog.cpp index 142628f4..a9ff0ee9 100644 --- a/src/dialogs/InitialOptionsDialog.cpp +++ b/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 #include diff --git a/src/dialogs/InitialOptionsDialog.h b/src/dialogs/InitialOptionsDialog.h index 8f9bc45e..4ae2c7a0 100644 --- a/src/dialogs/InitialOptionsDialog.h +++ b/src/dialogs/InitialOptionsDialog.h @@ -8,7 +8,7 @@ #include #include "Cutter.h" #include "AnalTask.h" -#include "utils/InitialOptions.h" +#include "common/InitialOptions.h" namespace Ui { class InitialOptionsDialog; diff --git a/src/dialogs/NewFileDialog.cpp b/src/dialogs/NewFileDialog.cpp index 945a7538..b75b7a87 100644 --- a/src/dialogs/NewFileDialog.cpp +++ b/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 #include diff --git a/src/dialogs/R2PluginsDialog.cpp b/src/dialogs/R2PluginsDialog.cpp index d50174e0..1310b65f 100644 --- a/src/dialogs/R2PluginsDialog.cpp +++ b/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), diff --git a/src/dialogs/SaveProjectDialog.cpp b/src/dialogs/SaveProjectDialog.cpp index 49a4b539..9c64acb6 100644 --- a/src/dialogs/SaveProjectDialog.cpp +++ b/src/dialogs/SaveProjectDialog.cpp @@ -4,8 +4,8 @@ #include #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), diff --git a/src/dialogs/VersionInfoDialog.cpp b/src/dialogs/VersionInfoDialog.cpp index ec6ed1f7..c62052ec 100644 --- a/src/dialogs/VersionInfoDialog.cpp +++ b/src/dialogs/VersionInfoDialog.cpp @@ -1,7 +1,7 @@ #include "VersionInfoDialog.h" #include "ui_VersionInfoDialog.h" -#include "utils/Helpers.h" +#include "common/Helpers.h" #include #include diff --git a/src/dialogs/XrefsDialog.cpp b/src/dialogs/XrefsDialog.cpp index c106f26c..c73d3732 100644 --- a/src/dialogs/XrefsDialog.cpp +++ b/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" diff --git a/src/dialogs/XrefsDialog.h b/src/dialogs/XrefsDialog.h index 080e420f..c5579379 100644 --- a/src/dialogs/XrefsDialog.h +++ b/src/dialogs/XrefsDialog.h @@ -4,7 +4,7 @@ #include #include #include -#include "utils/Highlighter.h" +#include "common/Highlighter.h" #include "Cutter.h" class MainWindow; diff --git a/src/dialogs/preferences/AppearanceOptionsWidget.cpp b/src/dialogs/preferences/AppearanceOptionsWidget.cpp index 846bcdb4..a4b7b087 100644 --- a/src/dialogs/preferences/AppearanceOptionsWidget.cpp +++ b/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) diff --git a/src/dialogs/preferences/AsmOptionsWidget.cpp b/src/dialogs/preferences/AsmOptionsWidget.cpp index 9c1e4c95..76d77299 100644 --- a/src/dialogs/preferences/AsmOptionsWidget.cpp +++ b/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), diff --git a/src/dialogs/preferences/DebugOptionsWidget.cpp b/src/dialogs/preferences/DebugOptionsWidget.cpp index 549f256c..d4b2646e 100644 --- a/src/dialogs/preferences/DebugOptionsWidget.cpp +++ b/src/dialogs/preferences/DebugOptionsWidget.cpp @@ -7,8 +7,8 @@ #include #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), diff --git a/src/dialogs/preferences/GraphOptionsWidget.cpp b/src/dialogs/preferences/GraphOptionsWidget.cpp index e8180a7b..edb24fa6 100644 --- a/src/dialogs/preferences/GraphOptionsWidget.cpp +++ b/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), diff --git a/src/dialogs/preferences/PreferencesDialog.cpp b/src/dialogs/preferences/PreferencesDialog.cpp index a0d22fdf..b076ce35 100644 --- a/src/dialogs/preferences/PreferencesDialog.cpp +++ b/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) diff --git a/src/plugins/CutterSamplePlugin.cpp b/src/plugins/CutterSamplePlugin.cpp index 29680cec..d6068c75 100644 --- a/src/plugins/CutterSamplePlugin.cpp +++ b/src/plugins/CutterSamplePlugin.cpp @@ -3,8 +3,8 @@ #include #include "CutterSamplePlugin.h" -#include "utils/TempConfig.h" -#include "utils/Configuration.h" +#include "common/TempConfig.h" +#include "common/Configuration.h" void CutterSamplePlugin::setupPlugin(CutterCore *core) { diff --git a/src/widgets/BacktraceWidget.cpp b/src/widgets/BacktraceWidget.cpp index 9fcb04e4..87dc609b 100644 --- a/src/widgets/BacktraceWidget.cpp +++ b/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" diff --git a/src/widgets/BreakpointWidget.cpp b/src/widgets/BreakpointWidget.cpp index 9317e6fb..772d447b 100644 --- a/src/widgets/BreakpointWidget.cpp +++ b/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 BreakpointModel::BreakpointModel(QList *breakpoints, QObject *parent) diff --git a/src/widgets/ClassesWidget.cpp b/src/widgets/ClassesWidget.cpp index 47436222..2897846f 100644 --- a/src/widgets/ClassesWidget.cpp +++ b/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 *classes, QObject *parent) : QAbstractItemModel(parent), diff --git a/src/widgets/ColorSchemePrefWidget.cpp b/src/widgets/ColorSchemePrefWidget.cpp index 3bd3f4a9..562c1a87 100644 --- a/src/widgets/ColorSchemePrefWidget.cpp +++ b/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 #include diff --git a/src/widgets/CommentsWidget.cpp b/src/widgets/CommentsWidget.cpp index c68e2546..f22ff9c1 100644 --- a/src/widgets/CommentsWidget.cpp +++ b/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 *comments, QMap > *nestedComments, diff --git a/src/widgets/ConsoleWidget.cpp b/src/widgets/ConsoleWidget.cpp index 1bf0d56d..845df584 100644 --- a/src/widgets/ConsoleWidget.cpp +++ b/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 diff --git a/src/widgets/ConsoleWidget.h b/src/widgets/ConsoleWidget.h index 3b32630d..dfc2a84c 100644 --- a/src/widgets/ConsoleWidget.h +++ b/src/widgets/ConsoleWidget.h @@ -4,7 +4,7 @@ #include #include "MainWindow.h" #include "CutterDockWidget.h" -#include "utils/CommandTask.h" +#include "common/CommandTask.h" namespace Ui { class ConsoleWidget; diff --git a/src/widgets/Dashboard.cpp b/src/widgets/Dashboard.cpp index 2b173f00..111229fa 100644 --- a/src/widgets/Dashboard.cpp +++ b/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" diff --git a/src/widgets/DisassemblerGraphView.cpp b/src/widgets/DisassemblerGraphView.cpp index 4966be96..3a964200 100644 --- a/src/widgets/DisassemblerGraphView.cpp +++ b/src/widgets/DisassemblerGraphView.cpp @@ -16,11 +16,11 @@ #include #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), diff --git a/src/widgets/DisassemblerGraphView.h b/src/widgets/DisassemblerGraphView.h index da69285e..0b8c455f 100644 --- a/src/widgets/DisassemblerGraphView.h +++ b/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; diff --git a/src/widgets/DisassemblyWidget.cpp b/src/widgets/DisassemblyWidget.cpp index fe4c937a..95fb206b 100644 --- a/src/widgets/DisassemblyWidget.cpp +++ b/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 #include diff --git a/src/widgets/EntrypointWidget.cpp b/src/widgets/EntrypointWidget.cpp index fcd798a0..f8a80c26 100644 --- a/src/widgets/EntrypointWidget.cpp +++ b/src/widgets/EntrypointWidget.cpp @@ -2,7 +2,7 @@ #include "ui_EntrypointWidget.h" #include "MainWindow.h" -#include "utils/Helpers.h" +#include "common/Helpers.h" #include #include diff --git a/src/widgets/ExportsWidget.cpp b/src/widgets/ExportsWidget.cpp index 01911d0b..ea3e0a1f 100644 --- a/src/widgets/ExportsWidget.cpp +++ b/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" diff --git a/src/widgets/FlagsWidget.cpp b/src/widgets/FlagsWidget.cpp index d62daa89..b46a8d9e 100644 --- a/src/widgets/FlagsWidget.cpp +++ b/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 *flags, QObject *parent) : QAbstractListModel(parent), diff --git a/src/widgets/FunctionsWidget.cpp b/src/widgets/FunctionsWidget.cpp index b4588483..b48a8545 100644 --- a/src/widgets/FunctionsWidget.cpp +++ b/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 #include diff --git a/src/widgets/HeadersWidget.cpp b/src/widgets/HeadersWidget.cpp index 0b45ba01..6522afca 100644 --- a/src/widgets/HeadersWidget.cpp +++ b/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 *headers, QObject *parent) : QAbstractListModel(parent), diff --git a/src/widgets/HexdumpWidget.cpp b/src/widgets/HexdumpWidget.cpp index d07b95e9..92ddb98b 100644 --- a/src/widgets/HexdumpWidget.cpp +++ b/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 #include diff --git a/src/widgets/HexdumpWidget.h b/src/widgets/HexdumpWidget.h index 8c929bec..919c0cb3 100644 --- a/src/widgets/HexdumpWidget.h +++ b/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" diff --git a/src/widgets/ImportsWidget.cpp b/src/widgets/ImportsWidget.cpp index 67c422ae..245de5a7 100644 --- a/src/widgets/ImportsWidget.cpp +++ b/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" diff --git a/src/widgets/JupyterWidget.h b/src/widgets/JupyterWidget.h index 19037332..bcb211c2 100644 --- a/src/widgets/JupyterWidget.h +++ b/src/widgets/JupyterWidget.h @@ -9,7 +9,7 @@ #include #include "CutterDockWidget.h" -#include "utils/JupyterConnection.h" +#include "common/JupyterConnection.h" namespace Ui { class JupyterWidget; diff --git a/src/widgets/MemoryMapWidget.cpp b/src/widgets/MemoryMapWidget.cpp index 3d591f58..61249657 100644 --- a/src/widgets/MemoryMapWidget.cpp +++ b/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 *memoryMaps, QObject *parent) : QAbstractListModel(parent), diff --git a/src/widgets/PseudocodeWidget.cpp b/src/widgets/PseudocodeWidget.cpp index 8c7eb1c8..38e5a035 100644 --- a/src/widgets/PseudocodeWidget.cpp +++ b/src/widgets/PseudocodeWidget.cpp @@ -3,10 +3,10 @@ #include -#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), diff --git a/src/widgets/RegisterRefsWidget.cpp b/src/widgets/RegisterRefsWidget.cpp index 3f4980ec..e13e0be6 100644 --- a/src/widgets/RegisterRefsWidget.cpp +++ b/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 #include diff --git a/src/widgets/RegistersWidget.cpp b/src/widgets/RegistersWidget.cpp index 94070252..392065e6 100644 --- a/src/widgets/RegistersWidget.cpp +++ b/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" diff --git a/src/widgets/RelocsWidget.cpp b/src/widgets/RelocsWidget.cpp index a05744f0..a663a1f6 100644 --- a/src/widgets/RelocsWidget.cpp +++ b/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 *relocs, QObject *parent) : QAbstractTableModel(parent), diff --git a/src/widgets/ResourcesWidget.cpp b/src/widgets/ResourcesWidget.cpp index 9f4d8175..95796a19 100644 --- a/src/widgets/ResourcesWidget.cpp +++ b/src/widgets/ResourcesWidget.cpp @@ -1,4 +1,4 @@ -#include "utils/Helpers.h" +#include "common/Helpers.h" #include "ResourcesWidget.h" #include "MainWindow.h" #include diff --git a/src/widgets/SdbDock.cpp b/src/widgets/SdbDock.cpp index 92d84f64..3affa103 100644 --- a/src/widgets/SdbDock.cpp +++ b/src/widgets/SdbDock.cpp @@ -2,7 +2,7 @@ #include "ui_SdbDock.h" #include "MainWindow.h" -#include "utils/Helpers.h" +#include "common/Helpers.h" #include #include diff --git a/src/widgets/SearchWidget.cpp b/src/widgets/SearchWidget.cpp index 6632217f..1fcd7ac3 100644 --- a/src/widgets/SearchWidget.cpp +++ b/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 *search, QObject *parent) : QAbstractListModel(parent), diff --git a/src/widgets/SectionsWidget.cpp b/src/widgets/SectionsWidget.cpp index 4ee3804a..a212ea6a 100644 --- a/src/widgets/SectionsWidget.cpp +++ b/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 *sections, QObject *parent) : QAbstractListModel(parent), diff --git a/src/widgets/SidebarWidget.cpp b/src/widgets/SidebarWidget.cpp index 53901f46..16cca483 100644 --- a/src/widgets/SidebarWidget.cpp +++ b/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 #include diff --git a/src/widgets/SidebarWidget.h b/src/widgets/SidebarWidget.h index 4835898b..140145e7 100644 --- a/src/widgets/SidebarWidget.h +++ b/src/widgets/SidebarWidget.h @@ -14,9 +14,9 @@ #include "Cutter.h" #include "CutterDockWidget.h" -#include "utils/Highlighter.h" -#include "utils/HexAsciiHighlighter.h" -#include "utils/HexHighlighter.h" +#include "common/Highlighter.h" +#include "common/HexAsciiHighlighter.h" +#include "common/HexHighlighter.h" #include "Dashboard.h" diff --git a/src/widgets/StackWidget.cpp b/src/widgets/StackWidget.cpp index 8531e1b6..d188fdeb 100644 --- a/src/widgets/StackWidget.cpp +++ b/src/widgets/StackWidget.cpp @@ -1,7 +1,7 @@ #include "StackWidget.h" #include "ui_StackWidget.h" -#include "utils/JsonModel.h" -#include "utils/Helpers.h" +#include "common/JsonModel.h" +#include "common/Helpers.h" #include "dialogs/EditInstructionDialog.h" #include "MainWindow.h" diff --git a/src/widgets/StringsWidget.cpp b/src/widgets/StringsWidget.cpp index b4a5d4d0..f314f421 100644 --- a/src/widgets/StringsWidget.cpp +++ b/src/widgets/StringsWidget.cpp @@ -5,7 +5,7 @@ #include "ui_StringsWidget.h" #include "MainWindow.h" -#include "utils/Helpers.h" +#include "common/Helpers.h" #include "dialogs/XrefsDialog.h" #include "WidgetShortcuts.h" diff --git a/src/widgets/StringsWidget.h b/src/widgets/StringsWidget.h index e7aa0725..4eb98a42 100644 --- a/src/widgets/StringsWidget.h +++ b/src/widgets/StringsWidget.h @@ -5,7 +5,7 @@ #include "Cutter.h" #include "CutterDockWidget.h" -#include "utils/StringsTask.h" +#include "common/StringsTask.h" #include "CutterTreeWidget.h" #include diff --git a/src/widgets/SymbolsWidget.cpp b/src/widgets/SymbolsWidget.cpp index 87210044..12c6af46 100644 --- a/src/widgets/SymbolsWidget.cpp +++ b/src/widgets/SymbolsWidget.cpp @@ -2,7 +2,7 @@ #include "ui_SymbolsWidget.h" #include "MainWindow.h" -#include "utils/Helpers.h" +#include "common/Helpers.h" SymbolsModel::SymbolsModel(QList *symbols, QObject *parent) : QAbstractListModel(parent), diff --git a/src/widgets/TypesWidget.cpp b/src/widgets/TypesWidget.cpp index bdb00a78..1af49793 100644 --- a/src/widgets/TypesWidget.cpp +++ b/src/widgets/TypesWidget.cpp @@ -1,7 +1,7 @@ #include "TypesWidget.h" #include "ui_TypesWidget.h" #include "MainWindow.h" -#include "utils/Helpers.h" +#include "common/Helpers.h" TypesModel::TypesModel(QList *types, QObject *parent) : QAbstractListModel(parent), diff --git a/src/widgets/VTablesWidget.cpp b/src/widgets/VTablesWidget.cpp index 474c7c21..8ca33f06 100644 --- a/src/widgets/VTablesWidget.cpp +++ b/src/widgets/VTablesWidget.cpp @@ -2,7 +2,7 @@ #include #include "MainWindow.h" -#include "utils/Helpers.h" +#include "common/Helpers.h" #include "VTablesWidget.h" #include "ui_VTablesWidget.h" diff --git a/src/widgets/VisualNavbar.cpp b/src/widgets/VisualNavbar.cpp index 274b18db..d78e2e65 100644 --- a/src/widgets/VisualNavbar.cpp +++ b/src/widgets/VisualNavbar.cpp @@ -1,7 +1,7 @@ #include "VisualNavbar.h" #include "MainWindow.h" -#include "utils/TempConfig.h" +#include "common/TempConfig.h" #include #include diff --git a/src/widgets/ZignaturesWidget.cpp b/src/widgets/ZignaturesWidget.cpp index ab760e0b..0d893798 100644 --- a/src/widgets/ZignaturesWidget.cpp +++ b/src/widgets/ZignaturesWidget.cpp @@ -1,7 +1,7 @@ #include "ZignaturesWidget.h" #include "ui_ZignaturesWidget.h" #include "MainWindow.h" -#include "utils/Helpers.h" +#include "common/Helpers.h" ZignaturesModel::ZignaturesModel(QList *zignatures, QObject *parent) : QAbstractListModel(parent),