diff --git a/src/AnalThread.cpp b/src/AnalThread.cpp index 8a669144..49ae64f2 100644 --- a/src/AnalThread.cpp +++ b/src/AnalThread.cpp @@ -1,5 +1,5 @@ #include -#include "cutter.h" +#include "Cutter.h" #include "AnalThread.h" #include "MainWindow.h" #include "dialogs/OptionsDialog.h" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3e2aa0ae..6209fbe2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.1) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") 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_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() -# Parse cutter.pro to get filenames +# Parse Cutter.pro to get filenames include(QMakeProParse) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cutter.pro" - "${CMAKE_CURRENT_BINARY_DIR}/cutter.pro" - COPYONLY) # trigger reconfigure if cutter.pro changes -parse_qmake_pro("${CMAKE_CURRENT_BINARY_DIR}/cutter.pro" CUTTER_PRO) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Cutter.pro" + "${CMAKE_CURRENT_BINARY_DIR}/Cutter.pro" + COPYONLY) # trigger reconfigure if Cutter.pro changes +parse_qmake_pro("${CMAKE_CURRENT_BINARY_DIR}/Cutter.pro" CUTTER_PRO) set(SOURCE_FILES ${CUTTER_PRO_SOURCES}) set(HEADER_FILES ${CUTTER_PRO_HEADERS}) set(UI_FILES ${CUTTER_PRO_FORMS}) set(QRC_FILES ${CUTTER_PRO_RESOURCES}) -message(STATUS "sources from cutter.pro: ${SOURCE_FILES}") -message(STATUS "headers from cutter.pro: ${HEADER_FILES}") -message(STATUS "forms from cutter.pro: ${UI_FILES}") -message(STATUS "resources from cutter.pro: ${QRC_FILES}") +message(STATUS "sources from Cutter.pro: ${SOURCE_FILES}") +message(STATUS "headers from Cutter.pro: ${HEADER_FILES}") +message(STATUS "forms from Cutter.pro: ${UI_FILES}") +message(STATUS "resources from Cutter.pro: ${QRC_FILES}") 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_executable(cutter ${UI_FILES} ${QRC_FILES} ${SOURCE_FILES} ${HEADER_FILES}) -qt5_use_modules(cutter Core Widgets Gui Svg) -target_link_libraries(cutter ${RADARE2_LIBRARIES}) +add_executable(Cutter ${UI_FILES} ${QRC_FILES} ${SOURCE_FILES} ${HEADER_FILES}) +qt5_use_modules(Cutter Core Widgets Gui Svg) +target_link_libraries(Cutter ${RADARE2_LIBRARIES}) if(CUTTER_ENABLE_JUPYTER) - target_link_libraries(cutter ${PYTHON_LIBRARIES}) + target_link_libraries(Cutter ${PYTHON_LIBRARIES}) if(CUTTER_ENABLE_QTWEBENGINE) - qt5_use_modules(cutter WebEngineWidgets) + qt5_use_modules(Cutter WebEngineWidgets) endif() endif() diff --git a/src/cutter.astylerc b/src/Cutter.astylerc similarity index 100% rename from src/cutter.astylerc rename to src/Cutter.astylerc diff --git a/src/cutter.cpp b/src/Cutter.cpp similarity index 99% rename from src/cutter.cpp rename to src/Cutter.cpp index 1a34d573..4c60e938 100644 --- a/src/cutter.cpp +++ b/src/Cutter.cpp @@ -2,7 +2,7 @@ #include #include #include "utils/Configuration.h" -#include "cutter.h" +#include "Cutter.h" #include "sdb.h" Q_GLOBAL_STATIC(ccClass, uniqueInstance) diff --git a/src/cutter.desktop b/src/Cutter.desktop similarity index 100% rename from src/cutter.desktop rename to src/Cutter.desktop diff --git a/src/cutter.h b/src/Cutter.h similarity index 100% rename from src/cutter.h rename to src/Cutter.h diff --git a/src/cutter.pro b/src/Cutter.pro similarity index 98% rename from src/cutter.pro rename to src/Cutter.pro index a3f658b8..5c7698bd 100644 --- a/src/cutter.pro +++ b/src/Cutter.pro @@ -69,8 +69,8 @@ unix:CUTTER_ENABLE_JUPYTER|macx:CUTTER_ENABLE_JUPYTER { } SOURCES += \ - main.cpp \ - cutter.cpp \ + Main.cpp \ + Cutter.cpp \ widgets/DisassemblerGraphView.cpp \ utils/RichTextPainter.cpp \ dialogs/OptionsDialog.cpp \ @@ -133,7 +133,7 @@ SOURCES += \ utils/NestedIPyKernel.cpp HEADERS += \ - cutter.h \ + Cutter.h \ widgets/DisassemblerGraphView.h \ utils/RichTextPainter.h \ utils/CachedFontMetrics.h \ @@ -238,7 +238,7 @@ RESOURCES += \ themes/qdarkstyle/style.qrc -DISTFILES += cutter.astylerc +DISTFILES += Cutter.astylerc # 'make install' for AppImage unix { @@ -252,7 +252,7 @@ unix { share_pixmaps.files = $$icon_file - desktop_file = cutter.desktop + desktop_file = Cutter.desktop # built-in no need for files atm target.path = $$PREFIX/bin diff --git a/src/main.cpp b/src/Main.cpp similarity index 100% rename from src/main.cpp rename to src/Main.cpp diff --git a/src/MainWindow.h b/src/MainWindow.h index 2f7756a0..7f098fb9 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -3,7 +3,7 @@ #include -#include "cutter.h" // only needed for ut64 +#include "Cutter.h" // only needed for ut64 #include "widgets/DisassemblyWidget.h" #include "widgets/SidebarWidget.h" #include "widgets/HexdumpWidget.h" diff --git a/src/dialogs/AboutDialog.cpp b/src/dialogs/AboutDialog.cpp index a754ae62..42521533 100644 --- a/src/dialogs/AboutDialog.cpp +++ b/src/dialogs/AboutDialog.cpp @@ -1,4 +1,4 @@ -#include +#include #include "AboutDialog.h" #include "ui_AboutDialog.h" #include "r_version.h" diff --git a/src/dialogs/FlagDialog.h b/src/dialogs/FlagDialog.h index ddbeabee..9a9c6b83 100644 --- a/src/dialogs/FlagDialog.h +++ b/src/dialogs/FlagDialog.h @@ -3,7 +3,7 @@ #include #include -#include "cutter.h" +#include "Cutter.h" namespace Ui { diff --git a/src/dialogs/OptionsDialog.h b/src/dialogs/OptionsDialog.h index ef1ab174..12ef3b99 100644 --- a/src/dialogs/OptionsDialog.h +++ b/src/dialogs/OptionsDialog.h @@ -6,7 +6,7 @@ #include #include #include -#include "cutter.h" +#include "Cutter.h" #include "AnalThread.h" #include "ui_OptionsDialog.h" diff --git a/src/dialogs/SaveProjectDialog.cpp b/src/dialogs/SaveProjectDialog.cpp index 3bec6115..8985098d 100644 --- a/src/dialogs/SaveProjectDialog.cpp +++ b/src/dialogs/SaveProjectDialog.cpp @@ -1,7 +1,7 @@ #include -#include +#include #include "SaveProjectDialog.h" #include "ui_SaveProjectDialog.h" diff --git a/src/dialogs/XrefsDialog.h b/src/dialogs/XrefsDialog.h index 8faaf0ae..d3bf5c6a 100644 --- a/src/dialogs/XrefsDialog.h +++ b/src/dialogs/XrefsDialog.h @@ -5,7 +5,7 @@ #include #include #include "utils/Highlighter.h" -#include "cutter.h" +#include "Cutter.h" class MainWindow; diff --git a/src/dialogs/preferences/AsmOptionsWidget.h b/src/dialogs/preferences/AsmOptionsWidget.h index e041ab3a..4dbf294a 100644 --- a/src/dialogs/preferences/AsmOptionsWidget.h +++ b/src/dialogs/preferences/AsmOptionsWidget.h @@ -6,7 +6,7 @@ #include #include -#include "cutter.h" +#include "Cutter.h" class PreferencesDialog; diff --git a/src/dialogs/preferences/GeneralOptionsWidget.h b/src/dialogs/preferences/GeneralOptionsWidget.h index 3cb91a90..4d880163 100644 --- a/src/dialogs/preferences/GeneralOptionsWidget.h +++ b/src/dialogs/preferences/GeneralOptionsWidget.h @@ -6,7 +6,7 @@ #include #include -#include "cutter.h" +#include "Cutter.h" class PreferencesDialog; diff --git a/src/dialogs/preferences/GraphOptionsWidget.h b/src/dialogs/preferences/GraphOptionsWidget.h index f48aacc8..d4840ea4 100644 --- a/src/dialogs/preferences/GraphOptionsWidget.h +++ b/src/dialogs/preferences/GraphOptionsWidget.h @@ -6,7 +6,7 @@ #include #include -#include "cutter.h" +#include "Cutter.h" class PreferencesDialog; diff --git a/src/dialogs/preferences/PreferencesDialog.h b/src/dialogs/preferences/PreferencesDialog.h index afec7d43..c4016bf2 100644 --- a/src/dialogs/preferences/PreferencesDialog.h +++ b/src/dialogs/preferences/PreferencesDialog.h @@ -6,7 +6,7 @@ #include #include -#include "cutter.h" +#include "Cutter.h" namespace Ui { diff --git a/src/menus/DisassemblyContextMenu.h b/src/menus/DisassemblyContextMenu.h index 9dd5f705..693ad1e9 100644 --- a/src/menus/DisassemblyContextMenu.h +++ b/src/menus/DisassemblyContextMenu.h @@ -1,7 +1,7 @@ #ifndef DISASSEMBLYCONTEXTMENU_H #define DISASSEMBLYCONTEXTMENU_H -#include "cutter.h" +#include "Cutter.h" #include #include diff --git a/src/meson.build b/src/meson.build index 411a8124..cc90dcc0 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,5 +1,5 @@ #TODO: icon -project('cutter', 'cpp', default_options: 'cpp_std=c++11') +project('Cutter', 'cpp', default_options: 'cpp_std=c++11') feature_define_args = [] if get_option('enable_jupyter') diff --git a/src/utils/Colors.h b/src/utils/Colors.h index 477f2f70..edb4810e 100644 --- a/src/utils/Colors.h +++ b/src/utils/Colors.h @@ -1,7 +1,7 @@ #ifndef COLORS_H #define COLORS_H -#include "cutter.h" +#include "Cutter.h" #include "utils/RichTextPainter.h" #include diff --git a/src/utils/Configuration.h b/src/utils/Configuration.h index aff99d80..bf39b3be 100644 --- a/src/utils/Configuration.h +++ b/src/utils/Configuration.h @@ -3,7 +3,7 @@ #include #include -#include +#include #define Config() (Configuration::instance()) #define ConfigColor(x) Config()->getColor(x) diff --git a/src/utils/Highlighter.h b/src/utils/Highlighter.h index dfc5deee..06f347ea 100644 --- a/src/utils/Highlighter.h +++ b/src/utils/Highlighter.h @@ -1,7 +1,7 @@ #ifndef HIGHLIGHTER_H #define HIGHLIGHTER_H -#include "cutter.h" +#include "Cutter.h" #include #include diff --git a/src/utils/NestedIPyKernel.cpp b/src/utils/NestedIPyKernel.cpp index a7288863..7e13c85b 100644 --- a/src/utils/NestedIPyKernel.cpp +++ b/src/utils/NestedIPyKernel.cpp @@ -6,7 +6,7 @@ #include #include -#include "cutter.h" +#include "Cutter.h" #include "NestedIPyKernel.h" NestedIPyKernel *NestedIPyKernel::start(const QStringList &argv) diff --git a/src/utils/PythonAPI.cpp b/src/utils/PythonAPI.cpp index b83e9e2d..9b1b7624 100644 --- a/src/utils/PythonAPI.cpp +++ b/src/utils/PythonAPI.cpp @@ -2,7 +2,7 @@ #ifdef CUTTER_ENABLE_JUPYTER #include "PythonAPI.h" -#include "cutter.h" +#include "Cutter.h" #include "JupyterConnection.h" #include "NestedIPyKernel.h" diff --git a/src/utils/TempConfig.cpp b/src/utils/TempConfig.cpp index 5c27617a..53106fc2 100644 --- a/src/utils/TempConfig.cpp +++ b/src/utils/TempConfig.cpp @@ -1,7 +1,7 @@ #include -#include "cutter.h" +#include "Cutter.h" #include "TempConfig.h" TempConfig::~TempConfig() diff --git a/src/widgets/ClassesWidget.h b/src/widgets/ClassesWidget.h index 2a0bb737..9a21f230 100644 --- a/src/widgets/ClassesWidget.h +++ b/src/widgets/ClassesWidget.h @@ -3,7 +3,7 @@ #include -#include "cutter.h" +#include "Cutter.h" #include #include diff --git a/src/widgets/ConsoleWidget.cpp b/src/widgets/ConsoleWidget.cpp index 5c6377ac..bb87afe7 100644 --- a/src/widgets/ConsoleWidget.cpp +++ b/src/widgets/ConsoleWidget.cpp @@ -4,7 +4,7 @@ #include #include #include -#include "cutter.h" +#include "Cutter.h" #include "ConsoleWidget.h" #include "ui_ConsoleWidget.h" #include "utils/Helpers.h" diff --git a/src/widgets/DisassemblerGraphView.cpp b/src/widgets/DisassemblerGraphView.cpp index 9470919f..7d323001 100644 --- a/src/widgets/DisassemblerGraphView.cpp +++ b/src/widgets/DisassemblerGraphView.cpp @@ -11,7 +11,7 @@ #include #include -#include "cutter.h" +#include "Cutter.h" #include "utils/Colors.h" #include "utils/Configuration.h" #include "utils/CachedFontMetrics.h" diff --git a/src/widgets/DisassemblyWidget.h b/src/widgets/DisassemblyWidget.h index db277614..96b8592a 100644 --- a/src/widgets/DisassemblyWidget.h +++ b/src/widgets/DisassemblyWidget.h @@ -1,7 +1,7 @@ #ifndef DISASSEMBLYWIDGET_H #define DISASSEMBLYWIDGET_H -#include "cutter.h" +#include "Cutter.h" #include #include #include diff --git a/src/widgets/ExportsWidget.h b/src/widgets/ExportsWidget.h index 53af5f1b..c0467925 100644 --- a/src/widgets/ExportsWidget.h +++ b/src/widgets/ExportsWidget.h @@ -3,7 +3,7 @@ #include -#include "cutter.h" +#include "Cutter.h" #include #include diff --git a/src/widgets/FlagsWidget.h b/src/widgets/FlagsWidget.h index add0d660..153a7cac 100644 --- a/src/widgets/FlagsWidget.h +++ b/src/widgets/FlagsWidget.h @@ -7,7 +7,7 @@ #include #include -#include "cutter.h" +#include "Cutter.h" class MainWindow; class QTreeWidgetItem; diff --git a/src/widgets/FunctionsWidget.h b/src/widgets/FunctionsWidget.h index 257414ad..38f44ed7 100644 --- a/src/widgets/FunctionsWidget.h +++ b/src/widgets/FunctionsWidget.h @@ -7,7 +7,7 @@ #include #include -#include "cutter.h" +#include "Cutter.h" class MainWindow; class QTreeWidgetItem; diff --git a/src/widgets/GraphView.h b/src/widgets/GraphView.h index 12f00af3..b2d68ce1 100644 --- a/src/widgets/GraphView.h +++ b/src/widgets/GraphView.h @@ -13,7 +13,7 @@ #include #include -#include "cutter.h" +#include "Cutter.h" class GraphView : public QAbstractScrollArea { diff --git a/src/widgets/HexdumpWidget.h b/src/widgets/HexdumpWidget.h index fc0f69af..a36aa0c7 100644 --- a/src/widgets/HexdumpWidget.h +++ b/src/widgets/HexdumpWidget.h @@ -9,7 +9,7 @@ #include #include -#include "cutter.h" +#include "Cutter.h" #include "utils/Highlighter.h" #include "utils/HexAsciiHighlighter.h" #include "utils/HexHighlighter.h" diff --git a/src/widgets/PieView.cpp b/src/widgets/PieView.cpp index de290cda..0bca4023 100644 --- a/src/widgets/PieView.cpp +++ b/src/widgets/PieView.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include "cutter.h" +#include "Cutter.h" #include #include #include diff --git a/src/widgets/PseudocodeWidget.h b/src/widgets/PseudocodeWidget.h index 300704b1..f2830eaa 100644 --- a/src/widgets/PseudocodeWidget.h +++ b/src/widgets/PseudocodeWidget.h @@ -4,7 +4,7 @@ #include #include -#include "cutter.h" +#include "Cutter.h" namespace Ui { diff --git a/src/widgets/ResourcesWidget.h b/src/widgets/ResourcesWidget.h index 7ff16b12..f20ddb99 100644 --- a/src/widgets/ResourcesWidget.h +++ b/src/widgets/ResourcesWidget.h @@ -1,7 +1,7 @@ #ifndef RESOURCESWIDGET_H #define RESOURCESWIDGET_H -#include "cutter.h" +#include "Cutter.h" #include #include diff --git a/src/widgets/SidebarWidget.h b/src/widgets/SidebarWidget.h index 33c7a50b..2e77158b 100644 --- a/src/widgets/SidebarWidget.h +++ b/src/widgets/SidebarWidget.h @@ -12,7 +12,7 @@ #include #include #include -#include "cutter.h" +#include "Cutter.h" #include "utils/Highlighter.h" #include "utils/HexAsciiHighlighter.h" #include "utils/HexHighlighter.h" diff --git a/src/widgets/StringsWidget.h b/src/widgets/StringsWidget.h index cbc55c81..77d28ba5 100644 --- a/src/widgets/StringsWidget.h +++ b/src/widgets/StringsWidget.h @@ -3,7 +3,7 @@ #include -#include "cutter.h" +#include "Cutter.h" #include #include diff --git a/src/widgets/VTablesWidget.h b/src/widgets/VTablesWidget.h index ceeb13c2..7c727c7f 100644 --- a/src/widgets/VTablesWidget.h +++ b/src/widgets/VTablesWidget.h @@ -7,7 +7,7 @@ #include #include -#include "cutter.h" +#include "Cutter.h" namespace Ui { diff --git a/src/widgets/VisualNavbar.h b/src/widgets/VisualNavbar.h index 4221b117..4769bffc 100644 --- a/src/widgets/VisualNavbar.h +++ b/src/widgets/VisualNavbar.h @@ -4,7 +4,7 @@ #include #include -#include "cutter.h" +#include "Cutter.h" class MainWindow; class QGraphicsView;