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

Fixed the way headers are included

Browse Source
This commit is contained in:
xarkes 2019-03-14 10:28:42 +01:00 committed by Florian Märkl
parent 3b87389d07
commit 46bb07d725
19 changed files with 109 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/CutterApplication.cpp
View File

@ -4,6 +4,7 @@
#include "common/JupyterConnection.h"
#endif
#include "plugins/PluginManager.h"
#include "CutterConfig.h"
#include <QApplication>
#include <QFileOpenEvent>
@ -18,15 +19,13 @@
#include <QDir>
#include <QTranslator>
#include <QLibraryInfo>
#include "CutterConfig.h"
#include <cstdlib>
#include <QFontDatabase>
#ifdef Q_OS_WIN
#include <QtNetwork/QtNetwork>
#endif // Q_OS_WIN
#include <cstdlib>
CutterApplication::CutterApplication(int &argc, char **argv) : QApplication(argc, argv)
{
// Setup application information

82
src/core/MainWindow.cpp
View File

@ -1,43 +1,5 @@
#include "common/PythonManager.h"
#include "core/MainWindow.h"
#include "ui_MainWindow.h"
#include "common/Helpers.h"
#include "CutterConfig.h"
#include "plugins/PluginManager.h"
// Qt Headers
#include <QApplication>
#include <QComboBox>
#include <QCompleter>
#include <QDebug>
#include <QDesktopServices>
#include <QDir>
#include <QDockWidget>
#include <QFile>
#include <QFileDialog>
#include <QFont>
#include <QFontDialog>
#include <QLabel>
#include <QLineEdit>
#include <QList>
#include <QMessageBox>
#include <QProcess>
#include <QPropertyAnimation>
#include <QSysInfo>
#include <QJsonObject>
#include <QScrollBar>
#include <QSettings>
#include <QShortcut>
#include <QStringListModel>
#include <QStyledItemDelegate>
#include <QStyleFactory>
#include <QTextCursor>
#include <QtGlobal>
#include <QToolButton>
#include <QToolTip>
#include <QTreeWidgetItem>
#include <QSvgRenderer>
// Common Headers
#include "common/Highlighter.h"
@ -46,6 +8,10 @@
#include "common/SvgIconEngine.h"
#include "common/ProgressIndicator.h"
#include "common/TempConfig.h"
#include "common/RunScriptTask.h"
#include "common/PythonManager.h"
#include "plugins/PluginManager.h"
#include "CutterConfig.h"
// Dialogs
#include "dialogs/WelcomeDialog.h"
@ -93,8 +59,46 @@
#include "widgets/MemoryMapWidget.h"
#include "widgets/BreakpointWidget.h"
#include "widgets/RegisterRefsWidget.h"
#include "widgets/DisassemblyWidget.h"
#include "widgets/StackWidget.h"
#include "widgets/RegistersWidget.h"
#include "widgets/BacktraceWidget.h"
#include "widgets/HexdumpWidget.h"
#include "widgets/PseudocodeWidget.h"
#include "common/RunScriptTask.h"
// Qt Headers
#include <QApplication>
#include <QComboBox>
#include <QCompleter>
#include <QDebug>
#include <QDesktopServices>
#include <QDir>
#include <QDockWidget>
#include <QFile>
#include <QFileDialog>
#include <QFont>
#include <QFontDialog>
#include <QLabel>
#include <QLineEdit>
#include <QList>
#include <QMessageBox>
#include <QProcess>
#include <QPropertyAnimation>
#include <QSysInfo>
#include <QJsonObject>
#include <QScrollBar>
#include <QSettings>
#include <QShortcut>
#include <QStringListModel>
#include <QStyledItemDelegate>
#include <QStyleFactory>
#include <QTextCursor>
#include <QtGlobal>
#include <QToolButton>
#include <QToolTip>
#include <QTreeWidgetItem>
#include <QSvgRenderer>
// Graphics
#include <QGraphicsEllipseItem>

17
src/core/MainWindow.h
View File

@ -1,22 +1,14 @@
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
#include <memory>
#include "core/Cutter.h" // only needed for ut64
#include "widgets/DisassemblyWidget.h"
#include "widgets/GraphWidget.h"
#include "widgets/OverviewWidget.h"
#include "widgets/StackWidget.h"
#include "widgets/RegistersWidget.h"
#include "widgets/BacktraceWidget.h"
#include "widgets/HexdumpWidget.h"
#include "widgets/PseudocodeWidget.h"
#include "dialogs/NewFileDialog.h"
#include "dialogs/WelcomeDialog.h"
#include "common/Configuration.h"
#include "common/InitialOptions.h"
#include <memory>
#include <QMainWindow>
#include <QList>
@ -55,6 +47,11 @@ class SearchWidget;
class JupyterWidget;
#endif
class QDockWidget;
class DisassemblyWidget;
class GraphWidget;
class HexdumpWidget;
class PseudocodeWidget;
class OverviewWidget;
namespace Ui {
class MainWindow;

4
src/dialogs/InitialOptionsDialog.cpp
View File

@ -1,8 +1,7 @@
#include "common/AsyncTask.h"
#include "InitialOptionsDialog.h"
#include "ui_InitialOptionsDialog.h"
#include "core/MainWindow.h"
#include "dialogs/NewFileDialog.h"
#include "dialogs/AsyncTaskDialog.h"
@ -11,6 +10,7 @@
#include <QSettings>
#include <QFileInfo>
#include <QFileDialog>
#include <QCloseEvent>
InitialOptionsDialog::InitialOptionsDialog(MainWindow *main):
QDialog(0), // parent must not be main

7
src/widgets/ClassesWidget.cpp
View File

@ -1,15 +1,14 @@
#include <QList>
#include "ClassesWidget.h"
#include "core/MainWindow.h"
#include "ui_ClassesWidget.h"
#include "common/Helpers.h"
#include "common/SvgIconEngine.h"
#include "dialogs/EditMethodDialog.h"
#include "dialogs/RenameDialog.h"
#include <QList>
#include <QMenu>
#include <QMouseEvent>
QVariant ClassesModel::headerData(int section, Qt::Orientation, int role) const
{

7
src/widgets/CommentsWidget.cpp
View File

@ -1,11 +1,12 @@
#include <QMenu>
#include <QResizeEvent>
#include "CommentsWidget.h"
#include "ui_CommentsWidget.h"
#include "core/MainWindow.h"
#include "common/Helpers.h"
#include <QMenu>
#include <QResizeEvent>
#include <QShortcut>
CommentsModel::CommentsModel(QList<CommentDescription> *comments,
QMap<QString, QList<CommentDescription> > *nestedComments,
QObject *parent)

2
src/widgets/CutterDockWidget.cpp
View File

@ -1,6 +1,8 @@
#include "CutterDockWidget.h"
#include "core/MainWindow.h"
#include <QAction>
#include <QEvent>
CutterDockWidget::CutterDockWidget(MainWindow *parent, QAction *action) :
QDockWidget(parent),

3
src/widgets/ExportsWidget.cpp
View File

@ -2,9 +2,10 @@
#include "ui_ExportsWidget.h"
#include "core/MainWindow.h"
#include "common/Helpers.h"
#include "WidgetShortcuts.h"
#include <QShortcut>
ExportsModel::ExportsModel(QList<ExportDescription> *exports, QObject *parent)
: QAbstractListModel(parent),
exports(exports)

9
src/widgets/FlagsWidget.cpp
View File

@ -1,13 +1,14 @@
#include <QTreeWidget>
#include <QComboBox>
#include <QMenu>
#include "FlagsWidget.h"
#include "ui_FlagsWidget.h"
#include "core/MainWindow.h"
#include "dialogs/RenameDialog.h"
#include "common/Helpers.h"
#include <QComboBox>
#include <QMenu>
#include <QShortcut>
#include <QTreeWidget>
FlagsModel::FlagsModel(QList<FlagDescription> *flags, QObject *parent)
: QAbstractListModel(parent),
flags(flags)

9
src/widgets/ImportsWidget.cpp
View File

@ -1,14 +1,13 @@
#include "ImportsWidget.h"
#include "ui_ImportsWidget.h"
#include "WidgetShortcuts.h"
#include "core/MainWindow.h"
#include "common/Helpers.h"
#include "WidgetShortcuts.h"
#include <QTreeWidget>
#include <QPen>
#include <QPainter>
#include <QPen>
#include <QShortcut>
#include <QTreeWidget>
ImportsModel::ImportsModel(QList<ImportDescription> *imports, QObject *parent) :
QAbstractTableModel(parent),

2
src/widgets/RegisterRefsWidget.cpp
View File

@ -2,8 +2,10 @@
#include "ui_RegisterRefsWidget.h"
#include "core/MainWindow.h"
#include "common/Helpers.h"
#include <QMenu>
#include <QClipboard>
#include <QShortcut>
RegisterRefModel::RegisterRefModel(QList<RegisterRefDescription> *registerRefs, QObject *parent)
: QAbstractListModel(parent),

4
src/widgets/RelocsWidget.cpp
View File

@ -1,9 +1,11 @@
#include <QTreeWidget>
#include "RelocsWidget.h"
#include "ui_RelocsWidget.h"
#include "core/MainWindow.h"
#include "common/Helpers.h"
#include <QShortcut>
#include <QTreeWidget>
RelocsModel::RelocsModel(QList<RelocDescription> *relocs, QObject *parent) :
QAbstractTableModel(parent),
relocs(relocs)

8
src/widgets/SearchWidget.cpp
View File

@ -1,11 +1,13 @@
#include <QDockWidget>
#include <QTreeWidget>
#include <QComboBox>
#include "SearchWidget.h"
#include "ui_SearchWidget.h"
#include "core/MainWindow.h"
#include "common/Helpers.h"
#include <QDockWidget>
#include <QTreeWidget>
#include <QComboBox>
#include <QShortcut>
static const QMap<QString, QString> kSearchBoundariesValues {
{"io.maps", "All maps"},
{"io.map", "Current map"},

18
src/widgets/SectionsWidget.cpp
View File

@ -1,18 +1,18 @@
#include <QGraphicsTextItem>
#include <QGraphicsView>
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QGraphicsSceneMouseEvent>
#include <QToolTip>
#include "common/Configuration.h"
#include "SectionsWidget.h"
#include "CutterTreeView.h"
#include "core/MainWindow.h"
#include "QuickFilterView.h"
#include "core/MainWindow.h"
#include "common/Helpers.h"
#include "common/Configuration.h"
#include <QGraphicsSceneMouseEvent>
#include <QGraphicsTextItem>
#include <QGraphicsView>
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QShortcut>
#include <QToolTip>
SectionsModel::SectionsModel(QList<SectionDescription> *sections, QObject *parent)
: QAbstractListModel(parent),
sections(sections)

4
src/widgets/SegmentsWidget.cpp
View File

@ -1,10 +1,12 @@
#include "SegmentsWidget.h"
#include "CutterTreeView.h"
#include "core/MainWindow.h"
#include "QuickFilterView.h"
#include "common/Helpers.h"
#include <QVBoxLayout>
#include <QShortcut>
SegmentsModel::SegmentsModel(QList<SegmentDescription> *segments, QObject *parent)
: QAbstractListModel(parent),
segments(segments)

9
src/widgets/StringsWidget.cpp
View File

@ -1,17 +1,14 @@
#include <QModelIndex>
#include "StringsWidget.h"
#include "ui_StringsWidget.h"
#include "core/MainWindow.h"
#include "common/Helpers.h"
#include "dialogs/XrefsDialog.h"
#include "WidgetShortcuts.h"
#include <QMenu>
#include <QClipboard>
#include <QMenu>
#include <QModelIndex>
#include <QShortcut>
StringsModel::StringsModel(QList<StringDescription> *strings, QObject *parent)
: QAbstractListModel(parent),

3
src/widgets/SymbolsWidget.cpp
View File

@ -1,9 +1,10 @@
#include "SymbolsWidget.h"
#include "ui_SymbolsWidget.h"
#include "core/MainWindow.h"
#include "common/Helpers.h"
#include <QShortcut>
SymbolsModel::SymbolsModel(QList<SymbolDescription> *symbols, QObject *parent)
: QAbstractListModel(parent),
symbols(symbols)

3
src/widgets/TypesWidget.cpp
View File

@ -2,12 +2,13 @@
#include "ui_TypesWidget.h"
#include "core/MainWindow.h"
#include "common/Helpers.h"
#include "dialogs/LoadNewTypesDialog.h"
#include "dialogs/LinkTypeDialog.h"
#include <QMenu>
#include <QFileDialog>
#include <QShortcut>
#include <QIcon>
TypesModel::TypesModel(QList<TypeDescription> *types, QObject *parent)
: QAbstractListModel(parent),

6
src/widgets/VisualNavbar.cpp
View File

@ -1,9 +1,7 @@
#include "VisualNavbar.h"
#include "core/MainWindow.h"
#include "common/TempConfig.h"
#include <cmath>
#include <QGraphicsView>
#include <QComboBox>
#include <QGraphicsScene>
@ -13,6 +11,10 @@
#include <QJsonArray>
#include <QJsonParseError>
#include <QToolTip>
#include <QMouseEvent>
#include <array>
#include <cmath>
VisualNavbar::VisualNavbar(MainWindow *main, QWidget *parent) :
QToolBar(main),