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

cutter => Cutter

Browse Source
This commit is contained in:
xarkes 2018-03-04 18:42:02 +01:00 committed by Florian Märkl
parent ad1946cae4
commit 08c2ac54c4
42 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AnalThread.cpp
View File

@ -1,5 +1,5 @@
#include <QDebug> #include <QDebug>
#include "cutter.h" #include "Cutter.h"
#include "AnalThread.h" #include "AnalThread.h"
#include "MainWindow.h" #include "MainWindow.h"
#include "dialogs/OptionsDialog.h" #include "dialogs/OptionsDialog.h"

30
src/CMakeLists.txt
View File

@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.1)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
include(DisallowInSource) include(DisallowInSource)
project(cutter VERSION 1.2) project(Cutter VERSION 1.2)
option(CUTTER_ENABLE_JUPYTER "Enable Jupyter integration. Requires Python >= 3.3." ON) option(CUTTER_ENABLE_JUPYTER "Enable Jupyter integration. Requires Python >= 3.3." ON)
option(CUTTER_ENABLE_QTWEBENGINE "Use QtWebEngine for in-app Jupyter Browser. Unused if CUTTER_ENABLE_JUPYTER=OFF." ON) option(CUTTER_ENABLE_QTWEBENGINE "Use QtWebEngine for in-app Jupyter Browser. Unused if CUTTER_ENABLE_JUPYTER=OFF." ON)
@ -64,21 +64,21 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
endif() endif()
# Parse cutter.pro to get filenames # Parse Cutter.pro to get filenames
include(QMakeProParse) include(QMakeProParse)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cutter.pro" configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Cutter.pro"
"${CMAKE_CURRENT_BINARY_DIR}/cutter.pro" "${CMAKE_CURRENT_BINARY_DIR}/Cutter.pro"
COPYONLY) # trigger reconfigure if cutter.pro changes COPYONLY) # trigger reconfigure if Cutter.pro changes
parse_qmake_pro("${CMAKE_CURRENT_BINARY_DIR}/cutter.pro" CUTTER_PRO) parse_qmake_pro("${CMAKE_CURRENT_BINARY_DIR}/Cutter.pro" CUTTER_PRO)
set(SOURCE_FILES ${CUTTER_PRO_SOURCES}) set(SOURCE_FILES ${CUTTER_PRO_SOURCES})
set(HEADER_FILES ${CUTTER_PRO_HEADERS}) set(HEADER_FILES ${CUTTER_PRO_HEADERS})
set(UI_FILES ${CUTTER_PRO_FORMS}) set(UI_FILES ${CUTTER_PRO_FORMS})
set(QRC_FILES ${CUTTER_PRO_RESOURCES}) set(QRC_FILES ${CUTTER_PRO_RESOURCES})
message(STATUS "sources from cutter.pro: ${SOURCE_FILES}") message(STATUS "sources from Cutter.pro: ${SOURCE_FILES}")
message(STATUS "headers from cutter.pro: ${HEADER_FILES}") message(STATUS "headers from Cutter.pro: ${HEADER_FILES}")
message(STATUS "forms from cutter.pro: ${UI_FILES}") message(STATUS "forms from Cutter.pro: ${UI_FILES}")
message(STATUS "resources from cutter.pro: ${QRC_FILES}") message(STATUS "resources from Cutter.pro: ${QRC_FILES}")
set(CUTTER_VERSION_SUFFIX "-dev") set(CUTTER_VERSION_SUFFIX "-dev")
@ -87,13 +87,13 @@ message(STATUS "Building Cutter version ${CUTTER_VERSION_FULL}")
add_definitions("-DAPP_VERSION=\"${CUTTER_VERSION_FULL}\"") add_definitions("-DAPP_VERSION=\"${CUTTER_VERSION_FULL}\"")
add_executable(cutter ${UI_FILES} ${QRC_FILES} ${SOURCE_FILES} ${HEADER_FILES}) add_executable(Cutter ${UI_FILES} ${QRC_FILES} ${SOURCE_FILES} ${HEADER_FILES})
qt5_use_modules(cutter Core Widgets Gui Svg) qt5_use_modules(Cutter Core Widgets Gui Svg)
target_link_libraries(cutter ${RADARE2_LIBRARIES}) target_link_libraries(Cutter ${RADARE2_LIBRARIES})
if(CUTTER_ENABLE_JUPYTER) if(CUTTER_ENABLE_JUPYTER)
target_link_libraries(cutter ${PYTHON_LIBRARIES}) target_link_libraries(Cutter ${PYTHON_LIBRARIES})
if(CUTTER_ENABLE_QTWEBENGINE) if(CUTTER_ENABLE_QTWEBENGINE)
qt5_use_modules(cutter WebEngineWidgets) qt5_use_modules(Cutter WebEngineWidgets)
endif() endif()
endif() endif()

0
src/cutter.astylerc → src/Cutter.astylerc
View File

2
src/cutter.cpp → src/Cutter.cpp
View File

@ -2,7 +2,7 @@
#include <QJsonObject> #include <QJsonObject>
#include <utils/TempConfig.h> #include <utils/TempConfig.h>
#include "utils/Configuration.h" #include "utils/Configuration.h"
#include "cutter.h" #include "Cutter.h"
#include "sdb.h" #include "sdb.h"
Q_GLOBAL_STATIC(ccClass, uniqueInstance) Q_GLOBAL_STATIC(ccClass, uniqueInstance)

0
src/cutter.desktop → src/Cutter.desktop
View File

0
src/cutter.h → src/Cutter.h
View File

10
src/cutter.pro → src/Cutter.pro
View File

@ -69,8 +69,8 @@ unix:CUTTER_ENABLE_JUPYTER|macx:CUTTER_ENABLE_JUPYTER {
} }
SOURCES += \ SOURCES += \
main.cpp \ Main.cpp \
cutter.cpp \ Cutter.cpp \
widgets/DisassemblerGraphView.cpp \ widgets/DisassemblerGraphView.cpp \
utils/RichTextPainter.cpp \ utils/RichTextPainter.cpp \
dialogs/OptionsDialog.cpp \ dialogs/OptionsDialog.cpp \
@ -133,7 +133,7 @@ SOURCES += \
utils/NestedIPyKernel.cpp utils/NestedIPyKernel.cpp
HEADERS += \ HEADERS += \
cutter.h \ Cutter.h \
widgets/DisassemblerGraphView.h \ widgets/DisassemblerGraphView.h \
utils/RichTextPainter.h \ utils/RichTextPainter.h \
utils/CachedFontMetrics.h \ utils/CachedFontMetrics.h \
@ -238,7 +238,7 @@ RESOURCES += \
themes/qdarkstyle/style.qrc themes/qdarkstyle/style.qrc
DISTFILES += cutter.astylerc DISTFILES += Cutter.astylerc
# 'make install' for AppImage # 'make install' for AppImage
unix { unix {
@ -252,7 +252,7 @@ unix {
share_pixmaps.files = $$icon_file share_pixmaps.files = $$icon_file
desktop_file = cutter.desktop desktop_file = Cutter.desktop
# built-in no need for files atm # built-in no need for files atm
target.path = $$PREFIX/bin target.path = $$PREFIX/bin

0
src/main.cpp → src/Main.cpp
View File

2
src/MainWindow.h
View File

@ -3,7 +3,7 @@
#include <memory> #include <memory>
#include "cutter.h" // only needed for ut64 #include "Cutter.h" // only needed for ut64
#include "widgets/DisassemblyWidget.h" #include "widgets/DisassemblyWidget.h"
#include "widgets/SidebarWidget.h" #include "widgets/SidebarWidget.h"
#include "widgets/HexdumpWidget.h" #include "widgets/HexdumpWidget.h"

2
src/dialogs/AboutDialog.cpp
View File

@ -1,4 +1,4 @@
#include <cutter.h> #include <Cutter.h>
#include "AboutDialog.h" #include "AboutDialog.h"
#include "ui_AboutDialog.h" #include "ui_AboutDialog.h"
#include "r_version.h" #include "r_version.h"

2
src/dialogs/FlagDialog.h
View File

@ -3,7 +3,7 @@
#include <QDialog> #include <QDialog>
#include <memory> #include <memory>
#include "cutter.h" #include "Cutter.h"
namespace Ui namespace Ui
{ {

2
src/dialogs/OptionsDialog.h
View File

@ -6,7 +6,7 @@
#include <QTimer> #include <QTimer>
#include <QElapsedTimer> #include <QElapsedTimer>
#include <memory> #include <memory>
#include "cutter.h" #include "Cutter.h"
#include "AnalThread.h" #include "AnalThread.h"
#include "ui_OptionsDialog.h" #include "ui_OptionsDialog.h"

2
src/dialogs/SaveProjectDialog.cpp
View File

@ -1,7 +1,7 @@
#include <QFileDialog> #include <QFileDialog>
#include <cutter.h> #include <Cutter.h>
#include "SaveProjectDialog.h" #include "SaveProjectDialog.h"
#include "ui_SaveProjectDialog.h" #include "ui_SaveProjectDialog.h"

2
src/dialogs/XrefsDialog.h
View File

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

2
src/dialogs/preferences/AsmOptionsWidget.h
View File

@ -6,7 +6,7 @@
#include <QPushButton> #include <QPushButton>
#include <memory> #include <memory>
#include "cutter.h" #include "Cutter.h"
class PreferencesDialog; class PreferencesDialog;

2
src/dialogs/preferences/GeneralOptionsWidget.h
View File

@ -6,7 +6,7 @@
#include <QPushButton> #include <QPushButton>
#include <memory> #include <memory>
#include "cutter.h" #include "Cutter.h"
class PreferencesDialog; class PreferencesDialog;

2
src/dialogs/preferences/GraphOptionsWidget.h
View File

@ -6,7 +6,7 @@
#include <QPushButton> #include <QPushButton>
#include <memory> #include <memory>
#include "cutter.h" #include "Cutter.h"
class PreferencesDialog; class PreferencesDialog;

2
src/dialogs/preferences/PreferencesDialog.h
View File

@ -6,7 +6,7 @@
#include <QPushButton> #include <QPushButton>
#include <memory> #include <memory>
#include "cutter.h" #include "Cutter.h"
namespace Ui namespace Ui
{ {

2
src/menus/DisassemblyContextMenu.h
View File

@ -1,7 +1,7 @@
#ifndef DISASSEMBLYCONTEXTMENU_H #ifndef DISASSEMBLYCONTEXTMENU_H
#define DISASSEMBLYCONTEXTMENU_H #define DISASSEMBLYCONTEXTMENU_H
#include "cutter.h" #include "Cutter.h"
#include <QMenu> #include <QMenu>
#include <QKeySequence> #include <QKeySequence>

2
src/meson.build
View File

@ -1,5 +1,5 @@
#TODO: icon #TODO: icon
project('cutter', 'cpp', default_options: 'cpp_std=c++11') project('Cutter', 'cpp', default_options: 'cpp_std=c++11')
feature_define_args = [] feature_define_args = []
if get_option('enable_jupyter') if get_option('enable_jupyter')

2
src/utils/Colors.h
View File

@ -1,7 +1,7 @@
#ifndef COLORS_H #ifndef COLORS_H
#define COLORS_H #define COLORS_H
#include "cutter.h" #include "Cutter.h"
#include "utils/RichTextPainter.h" #include "utils/RichTextPainter.h"
#include <r_anal.h> #include <r_anal.h>

2
src/utils/Configuration.h
View File

@ -3,7 +3,7 @@
#include <QSettings> #include <QSettings>
#include <QFont> #include <QFont>
#include <cutter.h> #include <Cutter.h>
#define Config() (Configuration::instance()) #define Config() (Configuration::instance())
#define ConfigColor(x) Config()->getColor(x) #define ConfigColor(x) Config()->getColor(x)

2
src/utils/Highlighter.h
View File

@ -1,7 +1,7 @@
#ifndef HIGHLIGHTER_H #ifndef HIGHLIGHTER_H
#define HIGHLIGHTER_H #define HIGHLIGHTER_H
#include "cutter.h" #include "Cutter.h"
#include <QSyntaxHighlighter> #include <QSyntaxHighlighter>
#include <QHash> #include <QHash>

2
src/utils/NestedIPyKernel.cpp
View File

@ -6,7 +6,7 @@
#include <QFile> #include <QFile>
#include <csignal> #include <csignal>
#include "cutter.h" #include "Cutter.h"
#include "NestedIPyKernel.h" #include "NestedIPyKernel.h"
NestedIPyKernel *NestedIPyKernel::start(const QStringList &argv) NestedIPyKernel *NestedIPyKernel::start(const QStringList &argv)

2
src/utils/PythonAPI.cpp
View File

@ -2,7 +2,7 @@
#ifdef CUTTER_ENABLE_JUPYTER #ifdef CUTTER_ENABLE_JUPYTER
#include "PythonAPI.h" #include "PythonAPI.h"
#include "cutter.h" #include "Cutter.h"
#include "JupyterConnection.h" #include "JupyterConnection.h"
#include "NestedIPyKernel.h" #include "NestedIPyKernel.h"

2
src/utils/TempConfig.cpp
View File

@ -1,7 +1,7 @@
#include <cassert> #include <cassert>
#include "cutter.h" #include "Cutter.h"
#include "TempConfig.h" #include "TempConfig.h"
TempConfig::~TempConfig() TempConfig::~TempConfig()

2
src/widgets/ClassesWidget.h
View File

@ -3,7 +3,7 @@
#include <memory> #include <memory>
#include "cutter.h" #include "Cutter.h"
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>

2
src/widgets/ConsoleWidget.cpp
View File

@ -4,7 +4,7 @@
#include <QAction> #include <QAction>
#include <QShortcut> #include <QShortcut>
#include <QStringListModel> #include <QStringListModel>
#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 "utils/Helpers.h"

2
src/widgets/DisassemblerGraphView.cpp
View File

@ -11,7 +11,7 @@
#include <QFileDialog> #include <QFileDialog>
#include <QFile> #include <QFile>
#include "cutter.h" #include "Cutter.h"
#include "utils/Colors.h" #include "utils/Colors.h"
#include "utils/Configuration.h" #include "utils/Configuration.h"
#include "utils/CachedFontMetrics.h" #include "utils/CachedFontMetrics.h"

2
src/widgets/DisassemblyWidget.h
View File

@ -1,7 +1,7 @@
#ifndef DISASSEMBLYWIDGET_H #ifndef DISASSEMBLYWIDGET_H
#define DISASSEMBLYWIDGET_H #define DISASSEMBLYWIDGET_H
#include "cutter.h" #include "Cutter.h"
#include <QDockWidget> #include <QDockWidget>
#include <QTextEdit> #include <QTextEdit>
#include <QPlainTextEdit> #include <QPlainTextEdit>

2
src/widgets/ExportsWidget.h
View File

@ -3,7 +3,7 @@
#include <memory> #include <memory>
#include "cutter.h" #include "Cutter.h"
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>

2
src/widgets/FlagsWidget.h
View File

@ -7,7 +7,7 @@
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
#include <QDockWidget> #include <QDockWidget>
#include "cutter.h" #include "Cutter.h"
class MainWindow; class MainWindow;
class QTreeWidgetItem; class QTreeWidgetItem;

2
src/widgets/FunctionsWidget.h
View File

@ -7,7 +7,7 @@
#include <QTreeView> #include <QTreeView>
#include <QDockWidget> #include <QDockWidget>
#include "cutter.h" #include "Cutter.h"
class MainWindow; class MainWindow;
class QTreeWidgetItem; class QTreeWidgetItem;

2
src/widgets/GraphView.h
View File

@ -13,7 +13,7 @@
#include <unordered_set> #include <unordered_set>
#include <queue> #include <queue>
#include "cutter.h" #include "Cutter.h"
class GraphView : public QAbstractScrollArea class GraphView : public QAbstractScrollArea
{ {

2
src/widgets/HexdumpWidget.h
View File

@ -9,7 +9,7 @@
#include <array> #include <array>
#include <memory> #include <memory>
#include "cutter.h" #include "Cutter.h"
#include "utils/Highlighter.h" #include "utils/Highlighter.h"
#include "utils/HexAsciiHighlighter.h" #include "utils/HexAsciiHighlighter.h"
#include "utils/HexHighlighter.h" #include "utils/HexHighlighter.h"

2
src/widgets/PieView.cpp
View File

@ -38,7 +38,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include "cutter.h" #include "Cutter.h"
#include <math.h> #include <math.h>
#include <QtWidgets> #include <QtWidgets>
#include <QDebug> #include <QDebug>

2
src/widgets/PseudocodeWidget.h
View File

@ -4,7 +4,7 @@
#include <QDockWidget> #include <QDockWidget>
#include <memory> #include <memory>
#include "cutter.h" #include "Cutter.h"
namespace Ui namespace Ui
{ {

2
src/widgets/ResourcesWidget.h
View File

@ -1,7 +1,7 @@
#ifndef RESOURCESWIDGET_H #ifndef RESOURCESWIDGET_H
#define RESOURCESWIDGET_H #define RESOURCESWIDGET_H
#include "cutter.h" #include "Cutter.h"
#include <QDockWidget> #include <QDockWidget>
#include <QAbstractListModel> #include <QAbstractListModel>

2
src/widgets/SidebarWidget.h
View File

@ -12,7 +12,7 @@
#include <QPlainTextEdit> #include <QPlainTextEdit>
#include <QMouseEvent> #include <QMouseEvent>
#include <memory> #include <memory>
#include "cutter.h" #include "Cutter.h"
#include "utils/Highlighter.h" #include "utils/Highlighter.h"
#include "utils/HexAsciiHighlighter.h" #include "utils/HexAsciiHighlighter.h"
#include "utils/HexHighlighter.h" #include "utils/HexHighlighter.h"

2
src/widgets/StringsWidget.h
View File

@ -3,7 +3,7 @@
#include <memory> #include <memory>
#include "cutter.h" #include "Cutter.h"
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>

2
src/widgets/VTablesWidget.h
View File

@ -7,7 +7,7 @@
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
#include <QDockWidget> #include <QDockWidget>
#include "cutter.h" #include "Cutter.h"
namespace Ui namespace Ui
{ {

2
src/widgets/VisualNavbar.h
View File

@ -4,7 +4,7 @@
#include <QToolBar> #include <QToolBar>
#include <QGraphicsScene> #include <QGraphicsScene>
#include "cutter.h" #include "Cutter.h"
class MainWindow; class MainWindow;
class QGraphicsView; class QGraphicsView;