Renamed files to CamelCase

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 <QComboBox>
 #include <QCompleter>
@@ -35,10 +35,10 @@
 #include <QToolTip>
 #include <QTreeWidgetItem>
 
-#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"
 

src/analthread.cpp

@@ -1,10 +1,10 @@
 #include <QDebug>
-#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),

src/cutter.cpp

@@ -2,7 +2,7 @@
 #include <QJsonObject>
 #include "cutter.h"
 #include "sdb.h"
-#include "settings.h"
+#include "Settings.h"
 
 
 #define DB this->db

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

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) :

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)
 {

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),

src/dialogs/CreatenewDialog.cpp

@@ -1,7 +1,7 @@
-#include "createnewdialog.h"
-#include "ui_createnewdialog.h"
 #include <QMessageBox>
-#include "newfiledialog.h"
+#include "dialogs/NewfileDialog.h"
+#include "dialogs/CreatenewDialog.h"
+#include "ui_CreatenewDialog.h"
 #include "r_util.h"
 
 createNewDialog::createNewDialog(QWidget *parent) :

src/dialogs/CreatenewDialog.h

@@ -2,7 +2,7 @@
 #define CREATENEWDIALOG_H
 
 #include <QDialog>
-#include "mainwindow.h"
+#include "MainWindow.h"
 
 namespace Ui
 {

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),

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 <QFileDialog>
 #include <QtGui>

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 <QSettings>
 #include <QFileInfo>

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),

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 <QJsonArray>
 

src/dialogs/XrefsDialog.h

@@ -3,7 +3,7 @@
 
 #include <QDialog>
 #include <QTreeWidgetItem>
-#include "highlighter.h"
+#include "utils/Highlighter.h"
 #include "cutter.h"
 
 class MainWindow;

src/main.cpp

@@ -3,9 +3,9 @@
 #include <QTextCodec>
 #include <QMessageBox>
 
-#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[])
 {

src/utils/Helpers.cpp

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

src/utils/HexAsciiHighlighter.cpp

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

src/utils/HexHighlighter.cpp

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

src/utils/Highlighter.cpp

@@ -1,7 +1,7 @@
 #include <QtGui>
 
-#include "highlighter.h"
-#include "mainwindow.h"
+#include "Highlighter.h"
+#include "MainWindow.h"
 
 Highlighter::Highlighter(MainWindow *main, QTextDocument *parent) :
     QSyntaxHighlighter(parent)

src/utils/MdHighlighter.cpp

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

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 <QTemporaryFile>
 #include <QFontDialog>

src/widgets/MemoryWidget.h

@@ -11,9 +11,9 @@
 #include <QPlainTextEdit>
 #include <QMouseEvent>
 #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"
 

src/widgets/codegraphic.cpp

@@ -1,6 +1,6 @@
 #include "codegraphic.h"
 
-#include "mainwindow.h"
+#include "MainWindow.h"
 
 #include <QGraphicsView>
 #include <QComboBox>

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),

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

src/widgets/dashboard.cpp

@@ -1,7 +1,7 @@
 #include "dashboard.h"
 #include "ui_dashboard.h"
 
-#include "mainwindow.h"
+#include "MainWindow.h"
 
 #include <QDebug>
 #include <QJsonArray>

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 <QTreeWidget>
 #include <QPen>

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<ExportDescription> *exports, QObject *parent)
     : QAbstractListModel(parent),

src/widgets/flagswidget.cpp

@@ -3,8 +3,8 @@
 #include <QComboBox>
 #include "flagswidget.h"
 #include "ui_flagswidget.h"
-#include "mainwindow.h"
-#include "helpers.h"
+#include "MainWindow.h"
+#include "utils/Helpers.h"
 
 FlagsModel::FlagsModel(QList<FlagDescription> *flags, QObject *parent)
     : QAbstractListModel(parent),

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 <algorithm>
 #include <QMenu>

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 <QTreeWidget>
 #include <QPen>

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 <QPlainTextEdit>
 #include <QFont>

src/widgets/omnibar.cpp

@@ -1,5 +1,5 @@
 #include "omnibar.h"
-#include "mainwindow.h"
+#include "MainWindow.h"
 
 #include <QStringListModel>
 #include <QCompleter>

src/widgets/relocswidget.cpp

@@ -1,8 +1,8 @@
 #include <QTreeWidget>
 #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),

src/widgets/sdbdock.cpp

@@ -1,7 +1,7 @@
 #include "sdbdock.h"
 #include "ui_sdbdock.h"
 
-#include "mainwindow.h"
+#include "MainWindow.h"
 
 #include <QDebug>
 #include <QTreeWidget>

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 <QMenu>

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 <QtWidgets>
 #include <QTreeWidget>

src/widgets/sidebar.cpp

@@ -1,7 +1,7 @@
 #include "sidebar.h"
 #include "ui_sidebar.h"
 
-#include "mainwindow.h"
+#include "MainWindow.h"
 
 #include <QSettings>
 

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) :

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 <QTreeWidget>