Finishing normalizing filename capitalization

src/applesoftfile/applesoftfile.cpp

@@ -1,4 +1,3 @@
-
 /*****************************************************************************
 *    AppleSAWS - The Apple Software Analysis WorkShop                        *
 *    Copyright (C) 2015-2021  Mark D. Long                                   *
@@ -17,9 +16,9 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
 #include "applesoftfile.h"
 #include "util.h"
+
 #include <QDebug>
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>

src/applesoftfile/applesoftfile.h

@@ -29,7 +29,7 @@
 #include "applesoftline.h"
 #include "genericfile.h"
 #include "applesofttoken.h"
-#include "ApplesoftRetokenizer.h"
+#include "applesoftretokenizer.h"
 
 
 class ApplesoftFile : public GenericFile

src/applesoftfile/applesoftformatter.cpp

@@ -1,4 +1,3 @@
-
 /*****************************************************************************
 *    AppleSAWS - The Apple Software Analysis WorkShop                        *
 *    Copyright (C) 2015-2021  Mark D. Long                                   *
@@ -17,9 +16,9 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
 #include "applesoftformatter.h"
 #include "util.h"
+
 #include <QTextCursor>
 #include <QTextCharFormat>
 #include <QChar>

src/applesoftfile/applesofttoken.cpp

@@ -17,7 +17,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
 #include "applesofttoken.h"
 
 QMap<quint16, QString> ApplesoftToken::m_tokens = QMap<quint16, QString>();

src/binaryfile/assemblersymbolmodel.cpp

@@ -18,7 +18,7 @@
 *****************************************************************************/
 
 
-#include "AssemblerSymbolModel.h"
+#include "assemblersymbolmodel.h"
 #include "util.h"
 
 #include <QDebug>

src/binaryfile/assemblersymbolmodel.h

@@ -19,7 +19,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "AssemblerSymbols.h"
+#include "assemblersymbols.h"
 
 #include <QDataStream>
 #include <QAbstractTableModel>

src/binaryfile/assemblersymbols.cpp

@@ -17,7 +17,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "AssemblerSymbols.h"
+#include "assemblersymbols.h"
 
 
 AssemblerSymbols::AssemblerSymbols(QObject *parent) : QObject(parent)

src/binaryfile/binaryfile.cpp

@@ -16,10 +16,11 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include <QDebug>
 #include "binaryfile.h"
 #include "util.h"
 
+#include <QDebug>
+
 BinaryFile::BinaryFile(Dos33DiskImage *image, FileDescriptiveEntry &fde)
     : GenericFile(image,fde)
 {

src/binaryfile/binaryfilemetadata.cpp

@@ -18,9 +18,11 @@
 
 #include "binaryfilemetadata.h"
 #include "genericfile.h"
+
 #include <QFile>
 #include <QDataStream>
 #include <QDebug>
+
 BinaryFileMetadata::BinaryFileMetadata(GenericFile *file, quint16 defaultAddress, QObject *parent)
     : QObject(parent)
 {

src/binaryfile/binaryfilemetadata.h

@@ -21,8 +21,8 @@
 
 
 
-#include "EntryPoints.h"
+#include "entrypoints.h"
-#include "AssemblerSymbols.h"
+#include "assemblersymbols.h"
 #include "genericfile.h"
 #include "binaryfile.h"
 

src/binaryfile/disassembler.cpp

@@ -21,9 +21,11 @@
 #include "role_asm_opcode.h"
 #include "role_asm_operand.h"
 #include "util.h"
+
 #include <QByteArray>
 #include <QDebug>
 #include <QList>
+
 #include <math.h>
 
 

src/binaryfile/disassembler.h

@@ -19,9 +19,9 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "MemoryUsageMap.h"
+#include "memoryusagemap.h"
 #include "util.h"
-#include "JumpLineManager.h"
+#include "jumplinemanager.h"
 #include "opcodes.h"
 #include "attributedmemory.h"
 

src/binaryfile/entrypointmodel.cpp

@@ -16,7 +16,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "EntryPointModel.h"
+#include "entrypointmodel.h"
 #include "util.h"
 
 #include <QDebug>

src/binaryfile/entrypointmodel.h

@@ -21,7 +21,7 @@
 
 
 
-#include "EntryPoints.h"
+#include "entrypoints.h"
 
 #include <QDataStream>
 #include <QAbstractTableModel>

src/binaryfile/entrypoints.cpp

@@ -16,7 +16,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "EntryPoints.h"
+#include "entrypoints.h"
 #include <QDebug>
 
 EntryPoints::EntryPoints(QObject *parent) : QObject(parent)

src/diskfiles/cpressdiskfs.h

@@ -22,7 +22,6 @@
 #include <QObject>
 #include "DiskImg.h"
 
-
 class CPressDiskFS : public QObject
 {
     Q_OBJECT

src/diskfiles/diskstore/asdiskimporter.cpp

@@ -17,6 +17,7 @@
 *****************************************************************************/
 
 #include "asdiskimporter.h"
+
 #include "DiskImg.h"
 
 #include <QDir>

src/diskfiles/diskstore/asdiskimporter.h

@@ -19,10 +19,10 @@
 #ifndef ASDISKIMPORTER_H
 #define ASDISKIMPORTER_H
 
-#include <QObject>
-
 #include "asdiskdata.h"
 
+#include <QObject>
+
 class ASDiskImporter : public QObject
 {
     Q_OBJECT

src/diskfiles/dos33/dos33diskimage.cpp

@@ -18,21 +18,21 @@
 
 #include "dos33diskimage.h"
 
+#include "tracksectorlist.h"
+#include "genericfile.h"
+#include "applesoftfile.h"
+#include "binaryfile.h"
+#include "intbasicfile.h"
+#include "relocatablefile.h"
+#include "textfile.h"
+#include "sector.h"
+
 #include <QFile>
 #include <QDataStream>
 #include <QFileInfo>
 #include <QDebug>
 #include <QDir>
 
-#include "tracksectorlist.h"
-#include "genericfile.h"
-#include "applesoftfile.h"
-#include "binaryfile.h"
-#include "IntBasicFile.h"
-#include "relocatablefile.h"
-#include "textfile.h"
-#include "sector.h"
-
 Dos33DiskImage::Dos33DiskImage(QString filename)
 {
    m_disk_image = new ASDiskData();

src/diskfiles/dos33/dos33imagemodel.cpp

@@ -17,11 +17,10 @@
 *****************************************************************************/
 
 #include "dos33imagemodel.h"
+#include "tspair.h"
 
 #include <QIcon>
 
-#include "tspair.h"
-
 Dos33ImageModel::Dos33ImageModel(QObject *parent) : QStandardItemModel(parent)
 {
     setHorizontalHeaderLabels({"Disk Images"});

src/diskfiles/dos33/filedescriptiveentry.h

@@ -19,12 +19,11 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "tspair.h"
-#include <QDebug>
 #include "applestring.h"
 
+#include <QDebug>
+
 class GenericFile;
 
 

src/diskfiles/dos33/genericfile.cpp

@@ -18,7 +18,6 @@
 
 #include "genericfile.h"
 
-
 quint8 GenericFile::rawDataAt(int offset)
 {
     return rawData().at(offset);

src/diskfiles/dos33/genericfile.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "dos33diskimage.h"
 #include "filedescriptiveentry.h"
 

src/diskfiles/dos33/sector.h

@@ -21,7 +21,6 @@
 
 #include <QByteArray>
 #include <QSharedPointer>
-//#include "rawdiskimage.h"
 
 #include "vtoc.h"
 #include "catalogsector.h"

src/diskfiles/dos33/tracksectorlist.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "tspair.h"
 
 #include <QSharedPointer>

src/diskfiles/dos33/vtoc.cpp

@@ -17,13 +17,12 @@
 *****************************************************************************/
 
 #include "vtoc.h"
+#include "sector.h"
+#include "util.h"
 
 #include <QDebug>
 #include <QString>
 
-#include "sector.h"
-#include "util.h"
-
 VTOC::VTOC(QSharedPointer<const Sector> data)
 {
     m_data = data;

src/diskfiles/dos33/vtoc.h

@@ -19,16 +19,11 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <Qt>
 #include "util.h"
 #include "tspair.h"
 
 class Sector;
-
-
-
 class QString;
 
 class VTOC

src/intbasic/intbasicfile.cpp

@@ -16,7 +16,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "IntBasicFile.h"
+#include "intbasicfile.h"
 #include <QDebug>
 
 #include "util.h"

src/intbasic/intbasicfile.h

@@ -1,7 +1,5 @@
-#ifndef INTBASICFILE_H
-#define INTBASICFILE_H
-
 /*****************************************************************************
+
 *    AppleSAWS - The Apple Software Analysis WorkShop                        *
 *    Copyright (C) 2015-2021  Mark D. Long                                   *
 *                                                                            *
@@ -19,7 +17,8 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
+#ifndef INTBASICFILE_H
+#define INTBASICFILE_H
 
 #include "genericfile.h"
 

src/internals/jumplinemanager.cpp

@@ -16,7 +16,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "JumpLineManager.h"
+#include "jumplinemanager.h"
 
 JumpLineManager::JumpLineManager(quint16 from, quint16 to)
     : m_start(from),

src/internals/jumplinemanager.h

@@ -1,7 +1,5 @@
-#ifndef JUMPLINEMANAGER_H
-#define JUMPLINEMANAGER_H
-
 /*****************************************************************************
+
 *    AppleSAWS - The Apple Software Analysis WorkShop                        *
 *    Copyright (C) 2015-2021  Mark D. Long                                   *
 *                                                                            *
@@ -18,8 +16,8 @@
 *    You should have received a copy of the GNU General Public License       *
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
-
+#ifndef JUMPLINEMANAGER_H
-
+#define JUMPLINEMANAGER_H
 
 #include <QPair>
 #include <QMap>

src/main.cpp

@@ -29,22 +29,9 @@
 #include "applesoftfile.h"
 #include "startupdialog.h"
 
-//#include <QByteArray>
-//#include "sector.h"
 
 int main(int argc, char** argv)
 {
-//    QByteArray ba(256,0xff);
-//    Sector s(ba,1,2);
-//    s.dump();
-//    Sector t(s);
-//    t.dump();
-
-//qDebug () << "S at 1: " << s.at(1);
-//qDebug () << "T at 1: " << s.at(1);
-//qDebug () << "S at 2: " << s.at(2);
-//qDebug () << "T at 2: " << s.at(2);
-//    return 0;
 
 
     QCoreApplication::setOrganizationName("LydianScaleSoftware");

src/memory/attributedmemory.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "memorycell.h"
 
 

src/memory/memorycell.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "memrole.h"
 
 #include <Qt>

src/memory/memrole.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QString>
 
 // IDs:

src/memory/roles/role_asm_opcode.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "memrole.h"
 #include "opcodes.h"
 

src/memory/roles/role_asm_operand.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QString>
 #include "memrole.h"
 

src/relocatablefile/relocatablefile.cpp

@@ -16,10 +16,11 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include <QDebug>
 #include "relocatablefile.h"
 #include "util.h"
 
+#include <QDebug>
+
 RelocatableFile::RelocatableFile(Dos33DiskImage *image, FileDescriptiveEntry &fde)
                                  : GenericFile(image,fde)
 {

src/relocatablefile/relocatablefile.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QPair>
 #include <QByteArray>
 

src/sequence/sequenceevent.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QString>
 
 class SequenceEvent

src/sequence/sequenceeventlist.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "sequenceevent.h"
 
 #include <QAbstractListModel>

src/sequence/sequenceeventlistwidget.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QListView>
 
 class SequenceEventListWidget : public QListView

src/sequence/sequenceoutputview.cpp

@@ -34,7 +34,7 @@ SequenceOutputView::SequenceOutputView(QWidget *parent) : QPlainTextEdit(parent)
     updateLineNumberAreaWidth(0);
     highlightCurrentLine();
 
-    auto hl = new TestHighlighter(document());
+    /*auto hl = */new TestHighlighter(document());
 }
 
 void SequenceOutputView::lineNumberAreaPaintEvent(QPaintEvent *event)

src/sequence/sequenceoutputview.h

@@ -26,8 +26,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 class SOVNumberPanel;
 
 

src/sequence/sequencetool.cpp

@@ -35,7 +35,7 @@ void SequenceTool::setSequenceEvent(SequenceEvent *event)
 
 }
 
-void SequenceTool::mousePressEvent(QMouseEvent *event)
+void SequenceTool::mousePressEvent(QMouseEvent * /*event*/)
 {
 
 }

src/sequence/sequencetool.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "sequenceevent.h"
 
 #include <QWidget>

src/sequence/sequencetoolbox.h

@@ -28,8 +28,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 class SequenceToolBoxHeader : public QCheckBox
 {
     Q_OBJECT

src/sequence/sequenceviewer.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QWidget>
 
 namespace Ui {

src/sequence/textblockuserdata.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QTextBlockUserData>
 #include <QSyntaxHighlighter>
 

src/textfile/textfile.cpp

@@ -16,9 +16,10 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include <QDebug>
 #include "textfile.h"
 
+#include <QDebug>
+
 TextFile::TextFile(Dos33DiskImage *image, FileDescriptiveEntry &fde)
     : GenericFile(image,fde)
 {

src/textfile/textfile.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "genericfile.h"
 
 class TextFile : public GenericFile

src/ui/catalogwidget.cpp

@@ -22,7 +22,8 @@
 #include "binaryfile.h"
 #include "applesoftfile.h"
 #include "genericfile.h"
-#include "IntBasicFile.h"
+#include "intbasicfile.h"
+
 #include <QUrl>
 #include <QDebug>
 #include <QMenu>

src/ui/catalogwidget.h

@@ -22,8 +22,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "dos33diskimage.h"
 
 namespace Ui {

src/ui/central/centralappwindow.cpp

@@ -23,7 +23,7 @@
 #include "dos33imagemodel.h"
 #include "dos33disktreeview.h"
 #include "sequencetoolbox.h"
-#include "DiskExplorerMapWidget.h"
+#include "diskexplorermapwidget.h"
 
 #include <QTreeView>
 #include <QAction>
@@ -108,7 +108,7 @@ void CentralAppWindow::initMenuBar()
     filemenu->addAction(m_quitAction);
 
 
-    auto toolsmenu = menuBar()->addMenu(tr("&Tools"));
+    /*auto toolsmenu =*/ menuBar()->addMenu(tr("&Tools"));
 }
 
 void CentralAppWindow::initStatusBar()

src/ui/central/centralappwindow.h

@@ -20,10 +20,8 @@
 *****************************************************************************/
 
 
-
-#include <QMainWindow>
-
 #include "mainapptoolbar.h"
+
 class QTreeView;
 class QAction;
 class QStatusBar;
@@ -34,6 +32,7 @@ class QStackedWidget;
 #include "DockWidget.h"
 #include "DockManager.h"
 #include <QActionGroup>
+#include <QMainWindow>
 
 
 class CentralAppWindow : public QMainWindow

src/ui/central/mainapptoolbar.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QToolBar>
 
 class MainAppToolbar : public QToolBar

src/ui/diskexplorer/diskexplorer.cpp

@@ -16,7 +16,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "DiskExplorer.h"
+#include "diskexplorer.h"
 
 #include <QGridLayout>
 #include <QMenuBar>

src/ui/diskexplorer/diskexplorer.h

@@ -24,13 +24,14 @@
 #include <QMainWindow>
 
 #include "catalogwidget.h"
-#include "DiskExplorerMapWidget.h"
+#include "diskexplorermapwidget.h"
 #include "dos33diskimage.h"
 #include "hrcgcontrolsinfo.h"
 #include "hexconverter.h"
-//#include "hexdumpviewer.h"
 #include "viewerbase.h"
 #include "asciiinfodialog.h"
+
+//#include "hexdumpviewer.h"
 //#include "notesdialog.h"
 
 #include "viewwidgetstack.h"

src/ui/diskexplorer/diskexplorermapwidget.cpp

@@ -16,10 +16,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "DiskExplorerMapWidget.h"
+#include "diskexplorermapwidget.h"
-
-//#include "vtoc.h"
-//#include "catalogsector.h"
 #include "util.h"
 
 #include <QPushButton>

src/ui/diskexplorer/tslistview.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QTextBrowser>
 
 class Sector;

src/ui/diskexplorer/viewwidgetstack.cpp

@@ -21,7 +21,7 @@
 #include "vtocview.h"
 #include "catalogsectorview.h"
 #include "tslistview.h"
-#include "DiskExplorerMapWidget.h"
+#include "diskexplorermapwidget.h"
 
 ViewWidgetStack::ViewWidgetStack(QWidget *parent) : QTabWidget(parent)
 {

src/ui/diskexplorer/viewwidgetstack.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QTabWidget>
 
 class Sector;

src/ui/diskexplorer/vtocview.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QWidget>
 
 class Sector;

src/ui/startupdialog.cpp

@@ -19,7 +19,7 @@
 #include "startupdialog.h"
 #include "ui_startupdialog.h"
 
-#include "diskexplorer/DiskExplorer.h"
+#include "diskexplorer.h"
 
 #include <QFileDialog>
 #include "centralappwindow.h"

src/ui/startupdialog.h

@@ -19,15 +19,14 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "notesdialog.h"
 #include "hrcgcontrolsinfo.h"
 #include "hexconverter.h"
 #include "hexdumpviewer.h"
-#include <QDialog>
 #include "asciiinfodialog.h"
 
+#include <QDialog>
+
 namespace Ui {
 class StartupDialog;
 }

src/ui/viewers/applesoftfiledetailviewer.h

@@ -19,13 +19,12 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
-#include <QWidget>
 #include "applesoftline.h"
 #include "applesofttoken.h"
 #include "applesoftfile.h"
+
 #include <QDebug>
+#include <QWidget>
 
 namespace Ui {
 class ApplesoftFileDetailViewer;

src/ui/viewers/applesoftfileviewer.cpp

@@ -20,6 +20,7 @@
 #include "ui_applesoftfileviewer.h"
 #include "applesoftformatter.h"
 #include "util.h"
+
 #include <QDebug>
 #include <QSettings>
 #include <QPrinter>

src/ui/viewers/applesoftfileviewer.h

@@ -19,17 +19,15 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
-#include <QWidget>
-#include <QMenu>
-#include <QAction>
-
 #include "applesoftfile.h"
 #include "applesoftformatter.h"
 #include "viewerbase.h"
 #include "applesoftfiledetailviewer.h"
 
+#include <QWidget>
+#include <QMenu>
+#include <QAction>
+
 
 namespace Ui {
 class ApplesoftFileViewer;

src/ui/viewers/charsetviewer.cpp

@@ -17,6 +17,7 @@
 *****************************************************************************/
 
 #include "charsetviewer.h"
+
 #include <QGridLayout>
 #include <QSettings>
 #include <QAction>

src/ui/viewers/charsetviewer.h

@@ -19,12 +19,10 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "binaryfile.h"
 #include "characterwidget.h"
 #include "fileviewerinterface.h"
-#include "CharacterSetExplorer.h"
+#include "charactersetexplorer.h"
 
 #include <QWidget>
 

src/ui/viewers/disassemblerviewer.cpp

@@ -24,7 +24,6 @@
 #include "relocatablefile.h"
 #include "opcodes.h"
 
-
 #include <QSettings>
 #include <QMenu>
 #include <QAction>

src/ui/viewers/disassemblerviewer.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QWidget>
 #include <QByteArray>
 
@@ -28,8 +26,8 @@
 #include "binaryfile.h"
 #include "relocatablefile.h"
 #include "fileviewerinterface.h"
-#include "DisassemblerMetadataDialog.h"
+#include "disassemblermetadatadialog.h"
-#include "JumpLineManager.h"
+#include "jumplinemanager.h"
 
 namespace Ui {
 class DisassemblerViewer;

src/ui/viewers/fileviewerinterface.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QWidget>
 #include <QString>
 #include <QPrinter>

src/ui/viewers/hiresviewwidget.h

@@ -19,11 +19,9 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "binaryfile.h"
 #include "fileviewerinterface.h"
-#include "HiresScreenWidget.h"
+#include "hiresscreenwidget.h"
 
 #include <QWidget>
 #include <QPixmap>

src/ui/viewers/intbasicfileviewer.h

@@ -19,10 +19,8 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "fileviewerinterface.h"
-#include "IntBasicFile.h"
+#include "intbasicfile.h"
 
 namespace Ui {
 class IntBasicFileViewer;

src/ui/viewers/mazeviewer.cpp

@@ -17,12 +17,12 @@
 *****************************************************************************/
 
 #include "mazeviewer.h"
+#include "memory.h"
+
 #include <QPainter>
 #include <QResizeEvent>
 #include <QDebug>
 
-#include "memory.h"
-
 MazeViewer::MazeViewer(QWidget *parent) : FileViewerInterface(parent)
 {
     //setMinimumSize(480,600);

src/ui/viewers/viewerbase.cpp

@@ -19,6 +19,17 @@
 #include "viewerbase.h"
 #include "ui_viewerbase.h"
 
+#include "applesoftfileviewer.h"
+#include "hexdumpviewer.h"
+#include "texthexdumpviewer.h"
+#include "charsetviewer.h"
+#include "intbasicfile.h"
+#include "intbasicfileviewer.h"
+#include "hiresviewwidget.h"
+#include "disassemblerviewer.h"
+#include "textfile.h"
+#include "mazeviewer.h"
+
 #include <QCloseEvent>
 #include <QToolBar>
 #include <QComboBox>
@@ -26,17 +37,6 @@
 #include <QDebug>
 #include <QScrollArea>
 
-#include "applesoftfileviewer.h"
-#include "hexdumpviewer.h"
-#include "texthexdumpviewer.h"
-#include "charsetviewer.h"
-#include "IntBasicFile.h"
-#include "intbasicfileviewer.h"
-#include "hiresviewwidget.h"
-#include "disassemblerviewer.h"
-#include "textfile.h"
-#include "mazeviewer.h"
-
 ViewerBase::ViewerBase(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::ViewerBase)

src/ui/viewers/viewerbase.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QMainWindow>
 #include <QStackedWidget>
 #include <QToolBar>

src/ui/widgets/asciiinfodialog.h

@@ -19,10 +19,9 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
+#include "ui_asciiinfodialog.h"
 
 #include <QDialog>
-#include "ui_asciiinfodialog.h"
 
 namespace Ui {
 class AsciiInfoDialog;

src/ui/widgets/charactersetexplorer.cpp

@@ -16,8 +16,8 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "CharacterSetExplorer.h"
+#include "charactersetexplorer.h"
-#include "ui_CharacterSetExplorer.h"
+#include "ui_charactersetexplorer.h"
 
 CharacterSetExplorer::CharacterSetExplorer(QWidget *parent) :
     QDialog(parent),

src/ui/widgets/charactersetexplorer.h

@@ -19,12 +19,10 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
+#include "charset.h"
 
 #include <QDialog>
 
-#include "charset.h"
-
 namespace Ui {
 class CharacterSetExplorer;
 }

src/ui/widgets/characterwidget.h

@@ -18,8 +18,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QWidget>
 #include <QColor>
 #include <QPixmap>

src/ui/widgets/disassemblermetadatadialog.cpp

@@ -16,9 +16,10 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "DisassemblerMetadataDialog.h"
+#include "disassemblermetadatadialog.h"
-#include "ui_DisassemblerMetadataDialog.h"
+#include "ui_disassemblermetadatadialog.h"
 #include "util.h"
+
 #include <QDebug>
 
 

src/ui/widgets/disassemblermetadatadialog.h

@@ -19,14 +19,12 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "binaryfilemetadata.h"
-#include "EntryPoints.h"
+#include "entrypoints.h"
-#include "EntryPointModel.h"
+#include "entrypointmodel.h"
-#include "AssemblerSymbolModel.h"
+#include "assemblersymbolmodel.h"
-#include "AssemblerSymbols.h"
+#include "assemblersymbols.h"
-#include "LocationInfoDialog.h"
+#include "locationinfodialog.h"
 
 #include <QDialog>
 #include <QItemSelection>

src/ui/widgets/flowlinetextbrowser.cpp

@@ -16,7 +16,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "FlowLineTextBrowser.h"
+#include "flowlinetextbrowser.h"
 
 #include <QPainter>
 #include <QTextBlock>

src/ui/widgets/flowlinetextbrowser.h

@@ -19,9 +19,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
+#include "jumplinemanager.h"
-
-#include "JumpLineManager.h"
 
 #include <QTextBrowser>
 #include <QObject>

src/ui/widgets/hexconverter.cpp

@@ -18,6 +18,7 @@
 
 #include "hexconverter.h"
 #include "ui_hexconverter.h"
+
 #include <QString>
 #include <QIntValidator>
 

src/ui/widgets/hexconverter.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QDialog>
 
 namespace Ui {

src/ui/widgets/hiresscreenwidget.cpp

@@ -16,7 +16,7 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "HiresScreenWidget.h"
+#include "hiresscreenwidget.h"
 
 #include "binaryfile.h"
 

src/ui/widgets/hiresscreenwidget.h

@@ -19,10 +19,8 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include "binaryfile.h"
-#include "AppleColors.h"
+#include "applecolors.h"
 
 #include <QWidget>
 #include <QPixmap>

src/ui/widgets/hrcgcontrolsinfo.h

@@ -19,11 +19,9 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
-#include <QDialog>
 #include "ui_hrcgcontrolsinfo.h"
 
+#include <QDialog>
 
 namespace Ui {
 class HRCGControlsInfo;

src/ui/widgets/locationinfodialog.cpp

@@ -16,8 +16,8 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-#include "LocationInfoDialog.h"
+#include "locationinfodialog.h"
-#include "ui_LocationInfoDialog.h"
+#include "ui_locationinfodialog.h"
 
 LocationInfoDialog::LocationInfoDialog(QWidget *parent) :
     QDialog(parent,  Qt::CustomizeWindowHint | Qt::WindowTitleHint ),

src/ui/widgets/locationinfodialog.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QDialog>
 #include <QLabel>
 

src/ui/widgets/notesdialog.cpp

@@ -18,6 +18,7 @@
 
 #include "notesdialog.h"
 #include "ui_notesdialog.h"
+
 #include <QFile>
 
 NotesDialog::NotesDialog(QWidget *parent) :

src/ui/widgets/notesdialog.h

@@ -19,8 +19,6 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *
 *****************************************************************************/
 
-
-
 #include <QDialog>
 
 namespace Ui {