ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-18 19:06:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename src/utils to src/common

Browse Source
This commit is contained in:
Florian Märkl 2018-10-17 09:55:53 +02:00
parent a13a620017
commit d4a77d9c97
109 changed files with 170 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/AnalTask.h
View File

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

8
src/Cutter.cpp
View File

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

92
src/Cutter.pro
View File

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

2
src/CutterApplication.cpp
View File

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

14
src/MainWindow.cpp
View File

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

4
src/MainWindow.h
View File

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

0
src/utils/AsyncTask.cpp → src/common/AsyncTask.cpp
View File

0
src/utils/AsyncTask.h → src/common/AsyncTask.h
View File

0
src/utils/CachedFontMetrics.h → src/common/CachedFontMetrics.h
View File

4
src/utils/ColorSchemeFileSaver.cpp → src/common/ColorSchemeFileSaver.cpp
View File

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

0
src/utils/ColorSchemeFileSaver.h → src/common/ColorSchemeFileSaver.h
View File

2
src/utils/Colors.cpp → src/common/Colors.cpp
View File

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

2
src/utils/Colors.h → src/common/Colors.h
View File

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

0
src/utils/CommandTask.cpp → src/common/CommandTask.cpp
View File

2
src/utils/CommandTask.h → src/common/CommandTask.h
View File

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

2
src/utils/Configuration.cpp → src/common/Configuration.cpp
View File

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

0
src/utils/Configuration.h → src/common/Configuration.h
View File

2
src/utils/FunctionsTask.h → src/common/FunctionsTask.h
View File

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

2
src/utils/Helpers.cpp → src/common/Helpers.cpp
View File

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

0
src/utils/Helpers.h → src/common/Helpers.h
View File

2
src/utils/HexAsciiHighlighter.cpp → src/common/HexAsciiHighlighter.cpp
View File

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

0
src/utils/HexAsciiHighlighter.h → src/common/HexAsciiHighlighter.h
View File

2
src/utils/HexHighlighter.cpp → src/common/HexHighlighter.cpp
View File

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

0
src/utils/HexHighlighter.h → src/common/HexHighlighter.h
View File

0
src/utils/Highlighter.cpp → src/common/Highlighter.cpp
View File

0
src/utils/Highlighter.h → src/common/Highlighter.h
View File

0
src/utils/InitialOptions.h → src/common/InitialOptions.h
View File

0
src/utils/JsonModel.cpp → src/common/JsonModel.cpp
View File

0
src/utils/JsonModel.h → src/common/JsonModel.h
View File

0
src/utils/JsonTreeItem.cpp → src/common/JsonTreeItem.cpp
View File

0
src/utils/JsonTreeItem.h → src/common/JsonTreeItem.h
View File

0
src/utils/JupyterConnection.cpp → src/common/JupyterConnection.cpp
View File

0
src/utils/JupyterConnection.h → src/common/JupyterConnection.h
View File

2
src/utils/MdHighlighter.cpp → src/common/MdHighlighter.cpp
View File

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

0
src/utils/MdHighlighter.h → src/common/MdHighlighter.h
View File

0
src/utils/NestedIPyKernel.cpp → src/common/NestedIPyKernel.cpp
View File

0
src/utils/NestedIPyKernel.h → src/common/NestedIPyKernel.h
View File

0
src/utils/ProgressIndicator.cpp → src/common/ProgressIndicator.cpp
View File

0
src/utils/ProgressIndicator.h → src/common/ProgressIndicator.h
View File

0
src/utils/PythonAPI.cpp → src/common/PythonAPI.cpp
View File

0
src/utils/PythonAPI.h → src/common/PythonAPI.h
View File

0
src/utils/R2Task.cpp → src/common/R2Task.cpp
View File

0
src/utils/R2Task.h → src/common/R2Task.h
View File

2
src/utils/RichTextPainter.cpp → src/common/RichTextPainter.cpp
View File

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

0
src/utils/RichTextPainter.h → src/common/RichTextPainter.h
View File

2
src/utils/StringsTask.h → src/common/StringsTask.h
View File

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

0
src/utils/SvgIconEngine.cpp → src/common/SvgIconEngine.cpp
View File

0
src/utils/SvgIconEngine.h → src/common/SvgIconEngine.h
View File

0
src/utils/SyntaxHighlighter.cpp → src/common/SyntaxHighlighter.cpp
View File

0
src/utils/SyntaxHighlighter.h → src/common/SyntaxHighlighter.h
View File

0
src/utils/TempConfig.cpp → src/common/TempConfig.cpp
View File

0
src/utils/TempConfig.h → src/common/TempConfig.h
View File

2
src/dialogs/AboutDialog.cpp
View File

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

2
src/dialogs/AsyncTaskDialog.cpp
View File

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

2
src/dialogs/AsyncTaskDialog.h
View File

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

2
src/dialogs/AttachProcDialog.cpp
View File

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

4
src/dialogs/InitialOptionsDialog.cpp
View File

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

2
src/dialogs/InitialOptionsDialog.h
View File

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

2
src/dialogs/NewFileDialog.cpp
View File

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

2
src/dialogs/R2PluginsDialog.cpp
View File

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

4
src/dialogs/SaveProjectDialog.cpp
View File

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

2
src/dialogs/VersionInfoDialog.cpp
View File

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

4
src/dialogs/XrefsDialog.cpp
View File

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

2
src/dialogs/XrefsDialog.h
View File

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

6
src/dialogs/preferences/AppearanceOptionsWidget.cpp
View File

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

4
src/dialogs/preferences/AsmOptionsWidget.cpp
View File

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

4
src/dialogs/preferences/DebugOptionsWidget.cpp
View File

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

4
src/dialogs/preferences/GraphOptionsWidget.cpp
View File

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

4
src/dialogs/preferences/PreferencesDialog.cpp
View File

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

4
src/plugins/CutterSamplePlugin.cpp
View File

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

2
src/widgets/BacktraceWidget.cpp
View File

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

2
src/widgets/BreakpointWidget.cpp
View File

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

2
src/widgets/ClassesWidget.cpp
View File

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

6
src/widgets/ColorSchemePrefWidget.cpp
View File

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

2
src/widgets/CommentsWidget.cpp
View File

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

4
src/widgets/ConsoleWidget.cpp
View File

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

2
src/widgets/ConsoleWidget.h
View File

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

8
src/widgets/Dashboard.cpp
View File

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

10
src/widgets/DisassemblerGraphView.cpp
View File

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

2
src/widgets/DisassemblerGraphView.h
View File

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

10
src/widgets/DisassemblyWidget.cpp
View File

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

2
src/widgets/EntrypointWidget.cpp
View File

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

2
src/widgets/ExportsWidget.cpp
View File

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

2
src/widgets/FlagsWidget.cpp
View File

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

6
src/widgets/FunctionsWidget.cpp
View File

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

2
src/widgets/HeadersWidget.cpp
View File

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

6
src/widgets/HexdumpWidget.cpp
View File

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

8
src/widgets/HexdumpWidget.h
View File

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

2
src/widgets/ImportsWidget.cpp
View File

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

2
src/widgets/JupyterWidget.h
View File

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

2
src/widgets/MemoryMapWidget.cpp
View File

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

8
src/widgets/PseudocodeWidget.cpp
View File

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

2
src/widgets/RegisterRefsWidget.cpp
View File

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

2
src/widgets/RegistersWidget.cpp
View File

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

2
src/widgets/RelocsWidget.cpp
View File

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

2
src/widgets/ResourcesWidget.cpp
View File

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

2
src/widgets/SdbDock.cpp
View File

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

2
src/widgets/SearchWidget.cpp
View File

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

2
src/widgets/SectionsWidget.cpp
View File

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

4
src/widgets/SidebarWidget.cpp
View File

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

Some files were not shown because too many files have changed in this diff Show More