From 83608be3324f98732a8312e5157b9f59bd160d48 Mon Sep 17 00:00:00 2001 From: xarkes Date: Sun, 1 Oct 2017 21:09:42 +0200 Subject: [PATCH] Renamed files to CamelCase --- src/{mainwindow.cpp => MainWindow.cpp} | 28 +++---- src/{mainwindow.h => MainWindow.h} | 0 src/{mainwindow.ui => MainWindow.ui} | 0 src/{settings.h => Settings.h} | 0 src/analthread.cpp | 8 +- src/cutter.cpp | 2 +- src/cutter.pro | 84 +++++++++---------- .../{aboutdialog.cpp => AboutDialog.cpp} | 4 +- src/dialogs/{aboutdialog.h => AboutDialog.h} | 0 .../{aboutdialog.ui => AboutDialog.ui} | 0 ...{asmoptionsdialog.h => AsmOptionsDialog.h} | 0 ...smoptionsdialog.ui => AsmOptionsDialog.ui} | 0 ...optionsdialog.cpp => AsmoptionsDialog.cpp} | 8 +- ...{commentsdialog.cpp => CommentsDialog.cpp} | 4 +- .../{commentsdialog.h => CommentsDialog.h} | 0 .../{commentsdialog.ui => CommentsDialog.ui} | 0 .../CreatenewDialog.cpp} | 6 +- .../CreatenewDialog.h} | 2 +- .../CreatenewDialog.ui} | 0 .../{flagdialog.cpp => FlagDialog.cpp} | 4 +- src/dialogs/{flagdialog.h => FlagDialog.h} | 0 src/dialogs/{flagdialog.ui => FlagDialog.ui} | 0 .../NewfileDialog.cpp} | 8 +- .../NewfileDialog.h} | 0 .../NewfileDialog.ui} | 0 .../OptionsDialog.cpp} | 12 +-- .../OptionsDialog.h} | 0 .../OptionsDialog.ui} | 0 .../{renamedialog.cpp => RenameDialog.cpp} | 4 +- .../{renamedialog.h => RenameDialog.h} | 0 .../{renamedialog.ui => RenameDialog.ui} | 0 .../{xrefsdialog.cpp => XrefsDialog.cpp} | 6 +- src/dialogs/{xrefsdialog.h => XrefsDialog.h} | 2 +- .../{xrefsdialog.ui => XrefsDialog.ui} | 0 src/main.cpp | 6 +- src/{helpers.cpp => utils/Helpers.cpp} | 2 +- src/{helpers.h => utils/Helpers.h} | 0 .../HexAsciiHighlighter.cpp} | 2 +- .../HexAsciiHighlighter.h} | 0 .../HexHighlighter.cpp} | 2 +- .../HexHighlighter.h} | 0 .../Highlighter.cpp} | 4 +- src/{highlighter.h => utils/Highlighter.h} | 0 .../MdHighlighter.cpp} | 2 +- .../MdHighlighter.h} | 0 src/widgets/MemoryWidget.cpp | 12 +-- src/widgets/MemoryWidget.h | 6 +- src/widgets/codegraphic.cpp | 2 +- src/widgets/commentswidget.cpp | 4 +- src/widgets/consolewidget.cpp | 2 +- src/widgets/dashboard.cpp | 2 +- src/widgets/entrypointwidget.cpp | 4 +- src/widgets/exportswidget.cpp | 4 +- src/widgets/flagswidget.cpp | 4 +- src/widgets/functionswidget.cpp | 10 +-- src/widgets/importswidget.cpp | 4 +- src/widgets/notepad.cpp | 6 +- src/widgets/omnibar.cpp | 2 +- src/widgets/relocswidget.cpp | 4 +- src/widgets/sdbdock.cpp | 2 +- src/widgets/sectionsdock.cpp | 2 +- src/widgets/sectionswidget.cpp | 4 +- src/widgets/sidebar.cpp | 2 +- src/widgets/stringswidget.cpp | 4 +- src/widgets/symbolswidget.cpp | 4 +- 65 files changed, 142 insertions(+), 142 deletions(-) rename src/{mainwindow.cpp => MainWindow.cpp} (98%) rename src/{mainwindow.h => MainWindow.h} (100%) rename src/{mainwindow.ui => MainWindow.ui} (100%) rename src/{settings.h => Settings.h} (100%) rename src/dialogs/{aboutdialog.cpp => AboutDialog.cpp} (93%) rename src/dialogs/{aboutdialog.h => AboutDialog.h} (100%) rename src/dialogs/{aboutdialog.ui => AboutDialog.ui} (100%) rename src/dialogs/{asmoptionsdialog.h => AsmOptionsDialog.h} (100%) rename src/dialogs/{asmoptionsdialog.ui => AsmOptionsDialog.ui} (100%) rename src/dialogs/{asmoptionsdialog.cpp => AsmoptionsDialog.cpp} (98%) rename src/dialogs/{commentsdialog.cpp => CommentsDialog.cpp} (89%) rename src/dialogs/{commentsdialog.h => CommentsDialog.h} (100%) rename src/dialogs/{commentsdialog.ui => CommentsDialog.ui} (100%) rename src/{createnewdialog.cpp => dialogs/CreatenewDialog.cpp} (98%) rename src/{createnewdialog.h => dialogs/CreatenewDialog.h} (95%) rename src/{createnewdialog.ui => dialogs/CreatenewDialog.ui} (100%) rename src/dialogs/{flagdialog.cpp => FlagDialog.cpp} (93%) rename src/dialogs/{flagdialog.h => FlagDialog.h} (100%) rename src/dialogs/{flagdialog.ui => FlagDialog.ui} (100%) rename src/{newfiledialog.cpp => dialogs/NewfileDialog.cpp} (97%) rename src/{newfiledialog.h => dialogs/NewfileDialog.h} (100%) rename src/{newfiledialog.ui => dialogs/NewfileDialog.ui} (100%) rename src/{optionsdialog.cpp => dialogs/OptionsDialog.cpp} (97%) rename src/{optionsdialog.h => dialogs/OptionsDialog.h} (100%) rename src/{optionsdialog.ui => dialogs/OptionsDialog.ui} (100%) rename src/dialogs/{renamedialog.cpp => RenameDialog.cpp} (91%) rename src/dialogs/{renamedialog.h => RenameDialog.h} (100%) rename src/dialogs/{renamedialog.ui => RenameDialog.ui} (100%) rename src/dialogs/{xrefsdialog.cpp => XrefsDialog.cpp} (98%) rename src/dialogs/{xrefsdialog.h => XrefsDialog.h} (97%) rename src/dialogs/{xrefsdialog.ui => XrefsDialog.ui} (100%) rename src/{helpers.cpp => utils/Helpers.cpp} (99%) rename src/{helpers.h => utils/Helpers.h} (100%) rename src/{hexascii_highlighter.cpp => utils/HexAsciiHighlighter.cpp} (97%) rename src/{hexascii_highlighter.h => utils/HexAsciiHighlighter.h} (100%) rename src/{hexhighlighter.cpp => utils/HexHighlighter.cpp} (99%) rename src/{hexhighlighter.h => utils/HexHighlighter.h} (100%) rename src/{highlighter.cpp => utils/Highlighter.cpp} (98%) rename src/{highlighter.h => utils/Highlighter.h} (100%) rename src/{mdhighlighter.cpp => utils/MdHighlighter.cpp} (97%) rename src/{mdhighlighter.h => utils/MdHighlighter.h} (100%) diff --git a/src/mainwindow.cpp b/src/MainWindow.cpp similarity index 98% rename from src/mainwindow.cpp rename to src/MainWindow.cpp index 356b8a87..57ef8692 100644 --- a/src/mainwindow.cpp +++ b/src/MainWindow.cpp @@ -1,11 +1,11 @@ -#include "mainwindow.h" -#include "ui_mainwindow.h" -#include "createnewdialog.h" -#include "dialogs/commentsdialog.h" -#include "dialogs/aboutdialog.h" -#include "dialogs/renamedialog.h" -#include "dialogs/asmoptionsdialog.h" -#include "helpers.h" +#include "MainWindow.h" +#include "ui_MainWindow.h" +#include "dialogs/CreatenewDialog.h" +#include "dialogs/CommentsDialog.h" +#include "dialogs/AboutDialog.h" +#include "dialogs/RenameDialog.h" +#include "dialogs/AsmOptionsDialog.h" +#include "utils/Helpers.h" #include #include @@ -35,10 +35,10 @@ #include #include -#include "highlighter.h" -#include "hexascii_highlighter.h" -#include "newfiledialog.h" -#include "helpers.h" +#include "utils/Highlighter.h" +#include "utils/HexAsciiHighlighter.h" +#include "utils/Helpers.h" +#include "dialogs/NewfileDialog.h" #include "widgets/MemoryWidget.h" #include "widgets/functionswidget.h" @@ -58,8 +58,8 @@ #include "widgets/sdbdock.h" #include "widgets/omnibar.h" #include "widgets/consolewidget.h" -#include "settings.h" -#include "optionsdialog.h" +#include "Settings.h" +#include "dialogs/OptionsDialog.h" #include "widgets/entrypointwidget.h" #include "widgets/DisassemblerGraphView.h" diff --git a/src/mainwindow.h b/src/MainWindow.h similarity index 100% rename from src/mainwindow.h rename to src/MainWindow.h diff --git a/src/mainwindow.ui b/src/MainWindow.ui similarity index 100% rename from src/mainwindow.ui rename to src/MainWindow.ui diff --git a/src/settings.h b/src/Settings.h similarity index 100% rename from src/settings.h rename to src/Settings.h diff --git a/src/analthread.cpp b/src/analthread.cpp index b63e92d4..bdcd379c 100644 --- a/src/analthread.cpp +++ b/src/analthread.cpp @@ -1,10 +1,10 @@ #include -#include "ui_optionsdialog.h" #include "cutter.h" #include "analthread.h" -#include "mainwindow.h" -#include "settings.h" -#include "optionsdialog.h" +#include "MainWindow.h" +#include "Settings.h" +#include "ui_OptionsDialog.h" +#include "dialogs/OptionsDialog.h" AnalThread::AnalThread(OptionsDialog *parent) : QThread(parent), diff --git a/src/cutter.cpp b/src/cutter.cpp index 34fe0f3b..532c52fb 100644 --- a/src/cutter.cpp +++ b/src/cutter.cpp @@ -2,7 +2,7 @@ #include #include "cutter.h" #include "sdb.h" -#include "settings.h" +#include "Settings.h" #define DB this->db diff --git a/src/cutter.pro b/src/cutter.pro index b906124b..97c08f99 100644 --- a/src/cutter.pro +++ b/src/cutter.pro @@ -35,21 +35,12 @@ unix:exists(/usr/local/include/libr) { SOURCES += \ main.cpp \ - mainwindow.cpp \ - newfiledialog.cpp \ - optionsdialog.cpp \ - highlighter.cpp \ cutter.cpp \ - createnewdialog.cpp \ - hexascii_highlighter.cpp \ widgets/pieview.cpp \ widgets/sectionswidget.cpp \ widgets/codegraphic.cpp \ widgets/notepad.cpp \ - mdhighlighter.cpp \ widgets/functionswidget.cpp \ - dialogs/renamedialog.cpp \ - dialogs/aboutdialog.cpp \ widgets/importswidget.cpp \ widgets/symbolswidget.cpp \ widgets/relocswidget.cpp \ @@ -59,38 +50,38 @@ SOURCES += \ widgets/exportswidget.cpp \ widgets/sdbdock.cpp \ analthread.cpp \ - dialogs/commentsdialog.cpp \ widgets/sidebar.cpp \ - helpers.cpp \ widgets/omnibar.cpp \ widgets/dashboard.cpp \ - dialogs/xrefsdialog.cpp \ - hexhighlighter.cpp \ widgets/sectionsdock.cpp \ widgets/consolewidget.cpp \ radarewebserver.cpp \ widgets/entrypointwidget.cpp \ - dialogs/flagdialog.cpp \ widgets/DisassemblerGraphView.cpp \ widgets/MemoryWidget.cpp \ utils/RichTextPainter.cpp \ - dialogs/asmoptionsdialog.cpp + dialogs/OptionsDialog.cpp \ + dialogs/AboutDialog.cpp \ + dialogs/AsmoptionsDialog.cpp \ + dialogs/CommentsDialog.cpp \ + dialogs/FlagDialog.cpp \ + dialogs/NewfileDialog.cpp \ + dialogs/RenameDialog.cpp \ + dialogs/XrefsDialog.cpp \ + MainWindow.cpp \ + utils/Helpers.cpp \ + utils/HexAsciiHighlighter.cpp \ + utils/HexHighlighter.cpp \ + utils/Highlighter.cpp \ + dialogs/CreatenewDialog.cpp \ + utils/MdHighlighter.cpp HEADERS += \ - mainwindow.h \ - newfiledialog.h \ - optionsdialog.h \ - highlighter.h \ - createnewdialog.h \ - hexascii_highlighter.h \ widgets/pieview.h \ widgets/sectionswidget.h \ widgets/codegraphic.h \ widgets/notepad.h \ - mdhighlighter.h \ widgets/functionswidget.h \ - dialogs/renamedialog.h \ - dialogs/aboutdialog.h \ widgets/importswidget.h \ widgets/symbolswidget.h \ widgets/relocswidget.h \ @@ -100,36 +91,39 @@ HEADERS += \ widgets/exportswidget.h \ widgets/sdbdock.h \ analthread.h \ - dialogs/commentsdialog.h \ widgets/sidebar.h \ - helpers.h \ widgets/omnibar.h \ widgets/dashboard.h \ - dialogs/xrefsdialog.h \ - hexhighlighter.h \ widgets/sectionsdock.h \ widgets/dockwidget.h \ widgets/consolewidget.h \ radarewebserver.h \ - settings.h \ widgets/entrypointwidget.h \ cutter.h \ - dialogs/flagdialog.h \ widgets/DisassemblerGraphView.h \ widgets/MemoryWidget.h \ utils/RichTextPainter.h \ utils/CachedFontMetrics.h \ - dialogs/asmoptionsdialog.h + dialogs/AboutDialog.h \ + dialogs/AsmOptionsDialog.h \ + dialogs/CommentsDialog.h \ + dialogs/FlagDialog.h \ + dialogs/RenameDialog.h \ + dialogs/XrefsDialog.h \ + dialogs/CreatenewDialog.h \ + utils/Helpers.h \ + utils/HexAsciiHighlighter.h \ + utils/HexHighlighter.h \ + MainWindow.h \ + utils/Highlighter.h \ + utils/MdHighlighter.h \ + dialogs/NewfileDialog.h \ + Settings.h \ + dialogs/OptionsDialog.h FORMS += \ - mainwindow.ui \ - newfiledialog.ui \ - optionsdialog.ui \ - createnewdialog.ui \ widgets/notepad.ui \ widgets/functionswidget.ui \ - dialogs/aboutdialog.ui \ - dialogs/renamedialog.ui \ widgets/importswidget.ui \ widgets/symbolswidget.ui \ widgets/relocswidget.ui \ @@ -138,16 +132,22 @@ FORMS += \ widgets/flagswidget.ui \ widgets/exportswidget.ui \ widgets/sdbdock.ui \ - dialogs/commentsdialog.ui \ widgets/sidebar.ui \ widgets/dashboard.ui \ - dialogs/xrefsdialog.ui \ widgets/sectionsdock.ui \ widgets/consolewidget.ui \ widgets/entrypointwidget.ui \ - dialogs/flagdialog.ui \ - dialogs/asmoptionsdialog.ui \ - widgets/MemoryWidget.ui + widgets/MemoryWidget.ui \ + dialogs/AboutDialog.ui \ + dialogs/AsmOptionsDialog.ui \ + dialogs/CommentsDialog.ui \ + dialogs/FlagDialog.ui \ + dialogs/RenameDialog.ui \ + dialogs/XrefsDialog.ui \ + dialogs/CreatenewDialog.ui \ + dialogs/NewfileDialog.ui \ + dialogs/OptionsDialog.ui \ + MainWindow.ui RESOURCES += \ resources.qrc diff --git a/src/dialogs/aboutdialog.cpp b/src/dialogs/AboutDialog.cpp similarity index 93% rename from src/dialogs/aboutdialog.cpp rename to src/dialogs/AboutDialog.cpp index 11be3cdd..49883045 100644 --- a/src/dialogs/aboutdialog.cpp +++ b/src/dialogs/AboutDialog.cpp @@ -1,5 +1,5 @@ -#include "aboutdialog.h" -#include "ui_aboutdialog.h" +#include "AboutDialog.h" +#include "ui_AboutDialog.h" #include "r_version.h" AboutDialog::AboutDialog(QWidget *parent) : diff --git a/src/dialogs/aboutdialog.h b/src/dialogs/AboutDialog.h similarity index 100% rename from src/dialogs/aboutdialog.h rename to src/dialogs/AboutDialog.h diff --git a/src/dialogs/aboutdialog.ui b/src/dialogs/AboutDialog.ui similarity index 100% rename from src/dialogs/aboutdialog.ui rename to src/dialogs/AboutDialog.ui diff --git a/src/dialogs/asmoptionsdialog.h b/src/dialogs/AsmOptionsDialog.h similarity index 100% rename from src/dialogs/asmoptionsdialog.h rename to src/dialogs/AsmOptionsDialog.h diff --git a/src/dialogs/asmoptionsdialog.ui b/src/dialogs/AsmOptionsDialog.ui similarity index 100% rename from src/dialogs/asmoptionsdialog.ui rename to src/dialogs/AsmOptionsDialog.ui diff --git a/src/dialogs/asmoptionsdialog.cpp b/src/dialogs/AsmoptionsDialog.cpp similarity index 98% rename from src/dialogs/asmoptionsdialog.cpp rename to src/dialogs/AsmoptionsDialog.cpp index 6b75d07a..cdcad472 100644 --- a/src/dialogs/asmoptionsdialog.cpp +++ b/src/dialogs/AsmoptionsDialog.cpp @@ -1,9 +1,9 @@ -#include "settings.h" -#include "asmoptionsdialog.h" -#include "ui_asmoptionsdialog.h" +#include "Settings.h" +#include "AsmOptionsDialog.h" +#include "ui_AsmOptionsDialog.h" -#include "helpers.h" +#include "utils/Helpers.h" AsmOptionsDialog::AsmOptionsDialog(CutterCore *core, QWidget *parent) : QDialog(parent), ui(new Ui::AsmOptionsDialog) { diff --git a/src/dialogs/commentsdialog.cpp b/src/dialogs/CommentsDialog.cpp similarity index 89% rename from src/dialogs/commentsdialog.cpp rename to src/dialogs/CommentsDialog.cpp index f61f737d..230be50e 100644 --- a/src/dialogs/commentsdialog.cpp +++ b/src/dialogs/CommentsDialog.cpp @@ -1,5 +1,5 @@ -#include "commentsdialog.h" -#include "ui_commentsdialog.h" +#include "CommentsDialog.h" +#include "ui_CommentsDialog.h" CommentsDialog::CommentsDialog(QWidget *parent) : QDialog(parent), diff --git a/src/dialogs/commentsdialog.h b/src/dialogs/CommentsDialog.h similarity index 100% rename from src/dialogs/commentsdialog.h rename to src/dialogs/CommentsDialog.h diff --git a/src/dialogs/commentsdialog.ui b/src/dialogs/CommentsDialog.ui similarity index 100% rename from src/dialogs/commentsdialog.ui rename to src/dialogs/CommentsDialog.ui diff --git a/src/createnewdialog.cpp b/src/dialogs/CreatenewDialog.cpp similarity index 98% rename from src/createnewdialog.cpp rename to src/dialogs/CreatenewDialog.cpp index a93b17e8..d1322b9e 100644 --- a/src/createnewdialog.cpp +++ b/src/dialogs/CreatenewDialog.cpp @@ -1,7 +1,7 @@ -#include "createnewdialog.h" -#include "ui_createnewdialog.h" #include -#include "newfiledialog.h" +#include "dialogs/NewfileDialog.h" +#include "dialogs/CreatenewDialog.h" +#include "ui_CreatenewDialog.h" #include "r_util.h" createNewDialog::createNewDialog(QWidget *parent) : diff --git a/src/createnewdialog.h b/src/dialogs/CreatenewDialog.h similarity index 95% rename from src/createnewdialog.h rename to src/dialogs/CreatenewDialog.h index e01890ec..a6655494 100644 --- a/src/createnewdialog.h +++ b/src/dialogs/CreatenewDialog.h @@ -2,7 +2,7 @@ #define CREATENEWDIALOG_H #include -#include "mainwindow.h" +#include "MainWindow.h" namespace Ui { diff --git a/src/createnewdialog.ui b/src/dialogs/CreatenewDialog.ui similarity index 100% rename from src/createnewdialog.ui rename to src/dialogs/CreatenewDialog.ui diff --git a/src/dialogs/flagdialog.cpp b/src/dialogs/FlagDialog.cpp similarity index 93% rename from src/dialogs/flagdialog.cpp rename to src/dialogs/FlagDialog.cpp index 758db663..8ccadec9 100644 --- a/src/dialogs/flagdialog.cpp +++ b/src/dialogs/FlagDialog.cpp @@ -1,5 +1,5 @@ -#include "flagdialog.h" -#include "ui_flagdialog.h" +#include "FlagDialog.h" +#include "ui_FlagDialog.h" FlagDialog::FlagDialog(CutterCore *core, RVA offset, QWidget *parent) : QDialog(parent), diff --git a/src/dialogs/flagdialog.h b/src/dialogs/FlagDialog.h similarity index 100% rename from src/dialogs/flagdialog.h rename to src/dialogs/FlagDialog.h diff --git a/src/dialogs/flagdialog.ui b/src/dialogs/FlagDialog.ui similarity index 100% rename from src/dialogs/flagdialog.ui rename to src/dialogs/FlagDialog.ui diff --git a/src/newfiledialog.cpp b/src/dialogs/NewfileDialog.cpp similarity index 97% rename from src/newfiledialog.cpp rename to src/dialogs/NewfileDialog.cpp index c3cde6f4..b73c0788 100644 --- a/src/newfiledialog.cpp +++ b/src/dialogs/NewfileDialog.cpp @@ -1,7 +1,7 @@ -#include "newfiledialog.h" -#include "optionsdialog.h" -#include "ui_newfiledialog.h" -#include "createnewdialog.h" +#include "OptionsDialog.h" +#include "dialogs/CreatenewDialog.h" +#include "dialogs/NewfileDialog.h" +#include "ui_NewfileDialog.h" #include #include diff --git a/src/newfiledialog.h b/src/dialogs/NewfileDialog.h similarity index 100% rename from src/newfiledialog.h rename to src/dialogs/NewfileDialog.h diff --git a/src/newfiledialog.ui b/src/dialogs/NewfileDialog.ui similarity index 100% rename from src/newfiledialog.ui rename to src/dialogs/NewfileDialog.ui diff --git a/src/optionsdialog.cpp b/src/dialogs/OptionsDialog.cpp similarity index 97% rename from src/optionsdialog.cpp rename to src/dialogs/OptionsDialog.cpp index 4f12d05b..19158f89 100644 --- a/src/optionsdialog.cpp +++ b/src/dialogs/OptionsDialog.cpp @@ -1,13 +1,13 @@ -#include "optionsdialog.h" -#include "ui_optionsdialog.h" -#include "mainwindow.h" -#include "newfiledialog.h" -#include "helpers.h" +#include "OptionsDialog.h" +#include "ui_OptionsDialog.h" +#include "MainWindow.h" +#include "dialogs/NewfileDialog.h" +#include "utils/Helpers.h" // TODO: remove us #include "widgets/MemoryWidget.h" #include "widgets/notepad.h" -#include "settings.h" +#include "Settings.h" #include #include diff --git a/src/optionsdialog.h b/src/dialogs/OptionsDialog.h similarity index 100% rename from src/optionsdialog.h rename to src/dialogs/OptionsDialog.h diff --git a/src/optionsdialog.ui b/src/dialogs/OptionsDialog.ui similarity index 100% rename from src/optionsdialog.ui rename to src/dialogs/OptionsDialog.ui diff --git a/src/dialogs/renamedialog.cpp b/src/dialogs/RenameDialog.cpp similarity index 91% rename from src/dialogs/renamedialog.cpp rename to src/dialogs/RenameDialog.cpp index 83e46f09..ed8d1e34 100644 --- a/src/dialogs/renamedialog.cpp +++ b/src/dialogs/RenameDialog.cpp @@ -1,5 +1,5 @@ -#include "renamedialog.h" -#include "ui_renamedialog.h" +#include "RenameDialog.h" +#include "ui_RenameDialog.h" RenameDialog::RenameDialog(QWidget *parent) : QDialog(parent), diff --git a/src/dialogs/renamedialog.h b/src/dialogs/RenameDialog.h similarity index 100% rename from src/dialogs/renamedialog.h rename to src/dialogs/RenameDialog.h diff --git a/src/dialogs/renamedialog.ui b/src/dialogs/RenameDialog.ui similarity index 100% rename from src/dialogs/renamedialog.ui rename to src/dialogs/RenameDialog.ui diff --git a/src/dialogs/xrefsdialog.cpp b/src/dialogs/XrefsDialog.cpp similarity index 98% rename from src/dialogs/xrefsdialog.cpp rename to src/dialogs/XrefsDialog.cpp index 12db2529..5793358d 100644 --- a/src/dialogs/xrefsdialog.cpp +++ b/src/dialogs/XrefsDialog.cpp @@ -1,7 +1,7 @@ -#include "xrefsdialog.h" -#include "ui_xrefsdialog.h" +#include "XrefsDialog.h" +#include "ui_XrefsDialog.h" -#include "mainwindow.h" +#include "MainWindow.h" #include diff --git a/src/dialogs/xrefsdialog.h b/src/dialogs/XrefsDialog.h similarity index 97% rename from src/dialogs/xrefsdialog.h rename to src/dialogs/XrefsDialog.h index 46c62c86..8cdda980 100644 --- a/src/dialogs/xrefsdialog.h +++ b/src/dialogs/XrefsDialog.h @@ -3,7 +3,7 @@ #include #include -#include "highlighter.h" +#include "utils/Highlighter.h" #include "cutter.h" class MainWindow; diff --git a/src/dialogs/xrefsdialog.ui b/src/dialogs/XrefsDialog.ui similarity index 100% rename from src/dialogs/xrefsdialog.ui rename to src/dialogs/XrefsDialog.ui diff --git a/src/main.cpp b/src/main.cpp index c5bdb166..c166acec 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,9 +3,9 @@ #include #include -#include "mainwindow.h" -#include "newfiledialog.h" -#include "optionsdialog.h" +#include "MainWindow.h" +#include "dialogs/NewfileDialog.h" +#include "dialogs/OptionsDialog.h" int main(int argc, char *argv[]) { diff --git a/src/helpers.cpp b/src/utils/Helpers.cpp similarity index 99% rename from src/helpers.cpp rename to src/utils/Helpers.cpp index 293d5e45..cfd79cf9 100644 --- a/src/helpers.cpp +++ b/src/utils/Helpers.cpp @@ -1,4 +1,4 @@ -#include "helpers.h" +#include "utils/Helpers.h" #include #include diff --git a/src/helpers.h b/src/utils/Helpers.h similarity index 100% rename from src/helpers.h rename to src/utils/Helpers.h diff --git a/src/hexascii_highlighter.cpp b/src/utils/HexAsciiHighlighter.cpp similarity index 97% rename from src/hexascii_highlighter.cpp rename to src/utils/HexAsciiHighlighter.cpp index 8bef810d..059bbacf 100644 --- a/src/hexascii_highlighter.cpp +++ b/src/utils/HexAsciiHighlighter.cpp @@ -1,6 +1,6 @@ #include -#include "hexascii_highlighter.h" +#include "utils/HexAsciiHighlighter.h" AsciiHighlighter::AsciiHighlighter(QTextDocument *parent) : QSyntaxHighlighter(parent) diff --git a/src/hexascii_highlighter.h b/src/utils/HexAsciiHighlighter.h similarity index 100% rename from src/hexascii_highlighter.h rename to src/utils/HexAsciiHighlighter.h diff --git a/src/hexhighlighter.cpp b/src/utils/HexHighlighter.cpp similarity index 99% rename from src/hexhighlighter.cpp rename to src/utils/HexHighlighter.cpp index 98031fe4..ba99bb78 100644 --- a/src/hexhighlighter.cpp +++ b/src/utils/HexHighlighter.cpp @@ -1,6 +1,6 @@ #include -#include "hexhighlighter.h" +#include "utils/HexHighlighter.h" HexHighlighter::HexHighlighter(QTextDocument *parent) : QSyntaxHighlighter(parent) diff --git a/src/hexhighlighter.h b/src/utils/HexHighlighter.h similarity index 100% rename from src/hexhighlighter.h rename to src/utils/HexHighlighter.h diff --git a/src/highlighter.cpp b/src/utils/Highlighter.cpp similarity index 98% rename from src/highlighter.cpp rename to src/utils/Highlighter.cpp index e0d1a260..8a45d74e 100644 --- a/src/highlighter.cpp +++ b/src/utils/Highlighter.cpp @@ -1,7 +1,7 @@ #include -#include "highlighter.h" -#include "mainwindow.h" +#include "Highlighter.h" +#include "MainWindow.h" Highlighter::Highlighter(MainWindow *main, QTextDocument *parent) : QSyntaxHighlighter(parent) diff --git a/src/highlighter.h b/src/utils/Highlighter.h similarity index 100% rename from src/highlighter.h rename to src/utils/Highlighter.h diff --git a/src/mdhighlighter.cpp b/src/utils/MdHighlighter.cpp similarity index 97% rename from src/mdhighlighter.cpp rename to src/utils/MdHighlighter.cpp index 93dcd508..617ee649 100644 --- a/src/mdhighlighter.cpp +++ b/src/utils/MdHighlighter.cpp @@ -1,6 +1,6 @@ #include -#include "mdhighlighter.h" +#include "utils/MdHighlighter.h" MdHighlighter::MdHighlighter(QTextDocument *parent) : QSyntaxHighlighter(parent) diff --git a/src/mdhighlighter.h b/src/utils/MdHighlighter.h similarity index 100% rename from src/mdhighlighter.h rename to src/utils/MdHighlighter.h diff --git a/src/widgets/MemoryWidget.cpp b/src/widgets/MemoryWidget.cpp index 9c0fda73..834948fa 100644 --- a/src/widgets/MemoryWidget.cpp +++ b/src/widgets/MemoryWidget.cpp @@ -2,12 +2,12 @@ #include "ui_MemoryWidget.h" #include "DisassemblerGraphView.h" -#include "mainwindow.h" -#include "helpers.h" -#include "dialogs/xrefsdialog.h" -#include "dialogs/renamedialog.h" -#include "dialogs/commentsdialog.h" -#include "dialogs/flagdialog.h" +#include "MainWindow.h" +#include "utils/Helpers.h" +#include "dialogs/XrefsDialog.h" +#include "dialogs/RenameDialog.h" +#include "dialogs/CommentsDialog.h" +#include "dialogs/FlagDialog.h" #include #include diff --git a/src/widgets/MemoryWidget.h b/src/widgets/MemoryWidget.h index 50b966f3..56620555 100644 --- a/src/widgets/MemoryWidget.h +++ b/src/widgets/MemoryWidget.h @@ -11,9 +11,9 @@ #include #include #include "cutter.h" -#include "highlighter.h" -#include "hexascii_highlighter.h" -#include "hexhighlighter.h" +#include "utils/Highlighter.h" +#include "utils/HexAsciiHighlighter.h" +#include "utils/HexHighlighter.h" #include "dashboard.h" #include "widgets/DisassemblerGraphView.h" diff --git a/src/widgets/codegraphic.cpp b/src/widgets/codegraphic.cpp index f6993679..e3997901 100644 --- a/src/widgets/codegraphic.cpp +++ b/src/widgets/codegraphic.cpp @@ -1,6 +1,6 @@ #include "codegraphic.h" -#include "mainwindow.h" +#include "MainWindow.h" #include #include diff --git a/src/widgets/commentswidget.cpp b/src/widgets/commentswidget.cpp index cf2266b1..c4d5bcec 100644 --- a/src/widgets/commentswidget.cpp +++ b/src/widgets/commentswidget.cpp @@ -4,8 +4,8 @@ #include "commentswidget.h" #include "ui_commentswidget.h" -#include "mainwindow.h" -#include "helpers.h" +#include "MainWindow.h" +#include "utils/Helpers.h" CommentsWidget::CommentsWidget(MainWindow *main, QWidget *parent) : DockWidget(parent), diff --git a/src/widgets/consolewidget.cpp b/src/widgets/consolewidget.cpp index 61cfad4a..29729503 100644 --- a/src/widgets/consolewidget.cpp +++ b/src/widgets/consolewidget.cpp @@ -7,7 +7,7 @@ #include "cutter.h" #include "consolewidget.h" #include "ui_consolewidget.h" -#include "helpers.h" +#include "utils/Helpers.h" // TODO: Find a way to get to this without copying it here diff --git a/src/widgets/dashboard.cpp b/src/widgets/dashboard.cpp index 21e12381..16d49bdb 100644 --- a/src/widgets/dashboard.cpp +++ b/src/widgets/dashboard.cpp @@ -1,7 +1,7 @@ #include "dashboard.h" #include "ui_dashboard.h" -#include "mainwindow.h" +#include "MainWindow.h" #include #include diff --git a/src/widgets/entrypointwidget.cpp b/src/widgets/entrypointwidget.cpp index 7fce48b1..83d10408 100644 --- a/src/widgets/entrypointwidget.cpp +++ b/src/widgets/entrypointwidget.cpp @@ -1,8 +1,8 @@ #include "entrypointwidget.h" #include "ui_entrypointwidget.h" -#include "mainwindow.h" -#include "helpers.h" +#include "MainWindow.h" +#include "utils/Helpers.h" #include #include diff --git a/src/widgets/exportswidget.cpp b/src/widgets/exportswidget.cpp index 2a0780d6..0f9b48f1 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 "helpers.h" +#include "MainWindow.h" +#include "utils/Helpers.h" ExportsModel::ExportsModel(QList *exports, QObject *parent) : QAbstractListModel(parent), diff --git a/src/widgets/flagswidget.cpp b/src/widgets/flagswidget.cpp index 15810552..3a4002c6 100644 --- a/src/widgets/flagswidget.cpp +++ b/src/widgets/flagswidget.cpp @@ -3,8 +3,8 @@ #include #include "flagswidget.h" #include "ui_flagswidget.h" -#include "mainwindow.h" -#include "helpers.h" +#include "MainWindow.h" +#include "utils/Helpers.h" FlagsModel::FlagsModel(QList *flags, QObject *parent) : QAbstractListModel(parent), diff --git a/src/widgets/functionswidget.cpp b/src/widgets/functionswidget.cpp index 8676d48a..4745631a 100644 --- a/src/widgets/functionswidget.cpp +++ b/src/widgets/functionswidget.cpp @@ -1,11 +1,11 @@ #include "functionswidget.h" #include "ui_functionswidget.h" -#include "mainwindow.h" -#include "helpers.h" -#include "dialogs/commentsdialog.h" -#include "dialogs/renamedialog.h" -#include "dialogs/xrefsdialog.h" +#include "MainWindow.h" +#include "utils/Helpers.h" +#include "dialogs/CommentsDialog.h" +#include "dialogs/RenameDialog.h" +#include "dialogs/XrefsDialog.h" #include #include diff --git a/src/widgets/importswidget.cpp b/src/widgets/importswidget.cpp index 85883179..d3d9f966 100644 --- a/src/widgets/importswidget.cpp +++ b/src/widgets/importswidget.cpp @@ -1,8 +1,8 @@ #include "importswidget.h" #include "ui_importswidget.h" -#include "mainwindow.h" -#include "helpers.h" +#include "MainWindow.h" +#include "utils/Helpers.h" #include #include diff --git a/src/widgets/notepad.cpp b/src/widgets/notepad.cpp index 57b8d887..43f65df2 100644 --- a/src/widgets/notepad.cpp +++ b/src/widgets/notepad.cpp @@ -1,10 +1,10 @@ #include "notepad.h" #include "ui_notepad.h" -#include "mainwindow.h" +#include "MainWindow.h" -#include "mdhighlighter.h" -#include "highlighter.h" +#include "utils/MdHighlighter.h" +#include "utils/Highlighter.h" #include #include diff --git a/src/widgets/omnibar.cpp b/src/widgets/omnibar.cpp index 521bbdc8..4b0eccb2 100644 --- a/src/widgets/omnibar.cpp +++ b/src/widgets/omnibar.cpp @@ -1,5 +1,5 @@ #include "omnibar.h" -#include "mainwindow.h" +#include "MainWindow.h" #include #include diff --git a/src/widgets/relocswidget.cpp b/src/widgets/relocswidget.cpp index 8d965c0d..a39bbe2c 100644 --- a/src/widgets/relocswidget.cpp +++ b/src/widgets/relocswidget.cpp @@ -1,8 +1,8 @@ #include #include "relocswidget.h" #include "ui_relocswidget.h" -#include "mainwindow.h" -#include "helpers.h" +#include "MainWindow.h" +#include "utils/Helpers.h" RelocsWidget::RelocsWidget(MainWindow *main, QWidget *parent) : DockWidget(parent), diff --git a/src/widgets/sdbdock.cpp b/src/widgets/sdbdock.cpp index 83e5cde5..0c2abb94 100644 --- a/src/widgets/sdbdock.cpp +++ b/src/widgets/sdbdock.cpp @@ -1,7 +1,7 @@ #include "sdbdock.h" #include "ui_sdbdock.h" -#include "mainwindow.h" +#include "MainWindow.h" #include #include diff --git a/src/widgets/sectionsdock.cpp b/src/widgets/sectionsdock.cpp index 5eac96ea..105fa498 100644 --- a/src/widgets/sectionsdock.cpp +++ b/src/widgets/sectionsdock.cpp @@ -1,7 +1,7 @@ #include "sectionsdock.h" #include "ui_sectionsdock.h" -#include "mainwindow.h" +#include "MainWindow.h" #include "widgets/sectionswidget.h" #include diff --git a/src/widgets/sectionswidget.cpp b/src/widgets/sectionswidget.cpp index 355908fa..c1045e5b 100644 --- a/src/widgets/sectionswidget.cpp +++ b/src/widgets/sectionswidget.cpp @@ -1,8 +1,8 @@ #include "widgets/sectionswidget.h" #include "widgets/pieview.h" -#include "mainwindow.h" -#include "helpers.h" +#include "MainWindow.h" +#include "utils/Helpers.h" #include #include diff --git a/src/widgets/sidebar.cpp b/src/widgets/sidebar.cpp index dad8bb41..e6a274c2 100644 --- a/src/widgets/sidebar.cpp +++ b/src/widgets/sidebar.cpp @@ -1,7 +1,7 @@ #include "sidebar.h" #include "ui_sidebar.h" -#include "mainwindow.h" +#include "MainWindow.h" #include diff --git a/src/widgets/stringswidget.cpp b/src/widgets/stringswidget.cpp index f035a2bf..4f406fbd 100644 --- a/src/widgets/stringswidget.cpp +++ b/src/widgets/stringswidget.cpp @@ -3,8 +3,8 @@ #include "stringswidget.h" #include "ui_stringswidget.h" -#include "mainwindow.h" -#include "helpers.h" +#include "MainWindow.h" +#include "utils/Helpers.h" StringsWidget::StringsWidget(MainWindow *main, QWidget *parent) : diff --git a/src/widgets/symbolswidget.cpp b/src/widgets/symbolswidget.cpp index c941259f..188586ae 100644 --- a/src/widgets/symbolswidget.cpp +++ b/src/widgets/symbolswidget.cpp @@ -1,8 +1,8 @@ #include "symbolswidget.h" #include "ui_symbolswidget.h" -#include "mainwindow.h" -#include "helpers.h" +#include "MainWindow.h" +#include "utils/Helpers.h" #include