Continuing to normalize filenames and extentions

2026-04-20 05:16:40 +00:00 · 2025-09-28 12:55:36 -05:00
parent f8e1d5bbb4
commit c89b625437
32 changed files with 71 additions and 72 deletions
@@ -48,7 +48,7 @@ SOURCES += \
    src/memory/roles/RoleAsmOpcode.cxx \
    src/memory/roles/RoleAsmOperand.cxx \
    src/ui/widgets/startupdialog.cxx \
-    src/ui/viewers/intbasicfileviewer.cxx \
+    src/ui/viewers/IntBasicFileViewer.cxx \
    src/ui/widgets/notesdialog.cxx \
    src/util/applestring.cxx \
    src/applesoftfile/ApplesoftFile.cxx \
@@ -56,22 +56,22 @@ SOURCES += \
    src/applesoftfile/ApplesoftFormatter.cxx \
    src/binaryfile/Disassembler.cxx \
    src/binaryfile/BinaryFile.cxx \
-    src/textfile/textfile.cxx \
+    src/textfile/TextFile.cxx \
    src/ui/widgets/catalogwidget.cxx \
    src/ui/widgets/hiresviewwidget.cxx \
-    src/ui/viewers/applesoftfileviewer.cxx \
-    src/ui/viewers/disassemblerviewer.cpp \
-    src/ui/viewers/hexdumpviewer.cpp \
-    src/ui/viewers/texthexdumpviewer.cpp \
-    src/ui/viewers/mazeviewer.cpp \
-    src/ui/viewers/charsetviewer.cpp \
+    src/ui/viewers/ApplesoftFileViewer.cxx \
+    src/ui/viewers/DisassemblerViewer.cxx \
+    src/ui/viewers/HexDumpViewer.cxx \
+    src/ui/viewers/TextHexDumpViewer.cxx \
+    src/ui/viewers/MazeViewer.cxx \
+    src/ui/viewers/CharSetViewer.cxx \
    src/relocatablefile/RelocatableFile.cxx \
    src/binaryfile/BinaryFileMetadata.cxx \
    src/util/charset.cpp \
    src/ui/widgets/characterwidget.cpp \
    src/ui/viewers/ApplesoftFileDetailViewer.cxx \
    src/ui/widgets/hexconverter.cpp \
-    src/ui/viewers/viewerbase.cpp \
+    src/ui/viewers/ViewerBase.cxx \
    src/ui/widgets/CharacterSetExplorer.cpp \
    src/ui/widgets/HiresScreenWidget.cpp \
    src/ui/widgets/DisassemblerMetadataDialog.cpp \
@@ -80,8 +80,8 @@ SOURCES += \
    src/binaryfile/EntryPoints.cxx \
    src/binaryfile/AssemblerSymbols.cxx \
    src/binaryfile/AssemblerSymbolModel.cxx \
-    src/ui/diskexplorer/DiskExplorer.cpp \
-    src/ui/diskexplorer/DiskExplorerMapWidget.cpp \
+    src/ui/diskexplorer/DiskExplorer.cxx \
+    src/ui/diskexplorer/DiskExplorerMapWidget.cxx \
    src/applesoftfile/ApplesoftRetokenizer.cxx \
    src/internals/JumpLineManager.cxx \
    src/ui/widgets/FlowLineTextBrowser.cpp \
@@ -103,7 +103,7 @@ HEADERS += \
    src/memory/roles/RoleAsmOpcode.h \
    src/memory/roles/RoleAsmOperand.h \
    src/ui/widgets/startupdialog.h \
-    src/ui/viewers/intbasicfileviewer.h \
+    src/ui/viewers/IntBasicFileViewer.h \
    src/ui/widgets/notesdialog.h \
    src/util/opcodes.h \
    src/util/util.h \
@@ -112,26 +112,26 @@ HEADERS += \
    src/applesoftfile/ApplesoftToken.h \
    src/binaryfile/Disassembler.h \
    src/binaryfile/BinaryFile.h \
-    src/textfile/textfile.h \
+    src/textfile/TextFile.h \
    src/ui/widgets/catalogwidget.h \
    src/ui/widgets/hiresviewwidget.h \
-    src/ui/viewers/applesoftfileviewer.h \
+    src/ui/viewers/ApplesoftFileViewer.h \
    src/applesoftfile/ApplesoftFormatter.h \
    src/applesoftfile/ApplesoftLine.h  \
    src/ui/viewers/disassemblerviewer.h \
-    src/ui/viewers/hexdumpviewer.h \
-    src/ui/viewers/texthexdumpviewer.h \
+    src/ui/viewers/HexDumpViewer.h \
+    src/ui/viewers/TextHexDumpViewer.h \
    src/relocatablefile/RelocatableFile.h \
-    src/ui/viewers/mazeviewer.h \
+    src/ui/viewers/MazeViewer.h \
    src/binaryfile/BinaryFileMetadata.h \
    src/ui/widgets/characterwidget.h \
    src/util/charset.h \
-    src/ui/viewers/charsetviewer.h \
+    src/ui/viewers/CharSetViewer.h \
    src/ui/viewers/ApplesoftFileDetailViewer.h \
    src/ui/widgets/hexconverter.h \
    src/ui/widgets/hrcgcontrolsinfo.h \
-    src/ui/viewers/viewerbase.h \
-    src/ui/viewers/fileviewerinterface.h \
+    src/ui/viewers/ViewerBase.h \
+    src/ui/viewers/FileViewerInterface.h \
    src/ui/widgets/CharacterSetExplorer.h \
    src/ui/widgets/HiresScreenWidget.h \
    src/ui/widgets/DisassemblerMetadataDialog.h \
@@ -152,15 +152,15 @@ HEADERS += \
 FORMS += \
    src/ui/widgets/catalogwidget.ui \
    src/ui/widgets/startupdialog.ui \
-    src/ui/viewers/applesoftfileviewer.ui \
-    src/ui/viewers/disassemblerviewer.ui \
-    src/ui/viewers/hexdumpviewer.ui \
-    src/ui/viewers/intbasicfileviewer.ui \
-    src/ui/viewers/texthexdumpviewer.ui \
+    src/ui/viewers/ApplesoftFileViewer.ui \
+    src/ui/viewers/DisassemblerViewer.ui \
+    src/ui/viewers/HexDumpViewer.ui \
+    src/ui/viewers/IntBasicFileViewer.ui \
+    src/ui/viewers/TextHexDumpViewer.ui \
    src/ui/viewers/ApplesoftFileDetailViewer.ui \
    src/ui/widgets/hexconverter.ui \
    src/ui/widgets/hrcgcontrolsinfo.ui \
-    src/ui/viewers/viewerbase.ui \
+    src/ui/viewers/ViewerBase.ui \
    src/ui/widgets/CharacterSetExplorer.ui \
    src/ui/widgets/DisassemblerMetadataDialog.ui \
    src/ui/widgets/LocationInfoDialog.ui \
@@ -5,7 +5,7 @@
 #include "BinaryFile.h"
 #include "IntBasicFile.h"
 #include "RelocatableFile.h"
-#include "textfile.h"
+#include "TextFile.h"

 #include <QFile>
 #include <QDataStream>
@@ -1,5 +1,5 @@
 #include <QDebug>
-#include "textfile.h"
+#include "TextFile.h"

 TextFile::TextFile(QByteArray data) : GenericFile(data)
 {
@@ -1,7 +1,7 @@
 #include "DiskExplorer.h"

 #include "GenericFile.h"
-#include "viewerbase.h"
+#include "ViewerBase.h"

 #include <QGridLayout>
 #include <QMenuBar>
@@ -6,8 +6,7 @@
 #include "DiskFile.h"
 #include "hrcgcontrolsinfo.h"
 #include "hexconverter.h"
-#include "hexdumpviewer.h"
-#include "viewerbase.h"
+#include "HexDumpViewer.h"
 #include "asciiinfodialog.h"
 //#include "notesdialog.h"

@@ -15,6 +14,7 @@
 #include <QFrame>
 #include <QTimer>

+class ViewerBase;

 class DiskExplorer : public QMainWindow
 {
@@ -1,5 +1,5 @@
-#include "applesoftfileviewer.h"
-#include "ui_applesoftfileviewer.h"
+#include "ApplesoftFileViewer.h"
+#include "ui_ApplesoftFileViewer.h"
 #include "util.h"
 #include <QDebug>
 #include <QSettings>
@@ -2,7 +2,7 @@

 #include "ApplesoftFile.h"
 #include "ApplesoftFormatter.h"
-#include "viewerbase.h"
+#include "ViewerBase.h"
 #include "ApplesoftFileDetailViewer.h"

 #include <QAction>
@@ -62,7 +62,7 @@
  <customwidget>
   <class>FileViewerInterface</class>
   <extends>QWidget</extends>
-   <header>viewerbase.h</header>
+   <header>ViewerBase.h</header>
   <container>1</container>
  </customwidget>
 </customwidgets>
@@ -1,4 +1,4 @@
-#include "charsetviewer.h"
+#include "CharSetViewer.h"
 #include "BinaryFile.h"
 #include <QGridLayout>
 #include <QSettings>
@@ -1,7 +1,7 @@
 #pragma once

 #include "characterwidget.h"
-#include "fileviewerinterface.h"
+#include "FileViewerInterface.h"
 #include "CharacterSetExplorer.h"

 #include <QWidget>
@@ -1,5 +1,5 @@
-#include "disassemblerviewer.h"
-#include "ui_disassemblerviewer.h"
+#include "DisassemblerViewer.h"
+#include "ui_DisassemblerViewer.h"
 #include "Disassembler.h"
 #include "memory.h"
 #include "util.h"
@@ -1,7 +1,7 @@
 #pragma once

 #include "AttributedMemory.h"
-#include "fileviewerinterface.h"
+#include "FileViewerInterface.h"
 #include "DisassemblerMetadataDialog.h"
 #include "JumpLineManager.h"

@@ -27,7 +27,7 @@
  <customwidget>
   <class>FileViewerInterface</class>
   <extends>QWidget</extends>
-   <header>viewerbase.h</header>
+   <header>ViewerBase.h</header>
   <container>1</container>
  </customwidget>
  <customwidget>
@@ -1,5 +1,5 @@
-#include "hexdumpviewer.h"
-#include "ui_hexdumpviewer.h"
+#include "HexDumpViewer.h"
+#include "ui_HexDumpViewer.h"
 #include "util.h"
 #include <QDebug>
 #include <QScrollBar>
@@ -1,7 +1,7 @@
 #pragma once

 #include "GenericFile.h"
-#include "fileviewerinterface.h"
+#include "FileViewerInterface.h"

 #include <QString>
 #include <QByteArray>
@@ -38,7 +38,7 @@
  <customwidget>
   <class>FileViewerInterface</class>
   <extends>QWidget</extends>
-   <header>viewerbase.h</header>
+   <header>ViewerBase.h</header>
   <container>1</container>
  </customwidget>
 </customwidgets>
@@ -1,6 +1,5 @@
-#include "intbasicfileviewer.h"
-#include "ui_intbasicfileviewer.h"
-#include "fileviewerinterface.h"
+#include "IntBasicFileViewer.h"
+#include "ui_IntBasicFileViewer.h"

 IntBasicFileViewer::IntBasicFileViewer(QWidget *parent) :
    FileViewerInterface(parent),
@@ -1,6 +1,6 @@
 #pragma once

-#include "fileviewerinterface.h"
+#include "FileViewerInterface.h"
 #include "IntBasicFile.h"

 namespace Ui {
@@ -23,7 +23,7 @@
  <customwidget>
   <class>FileViewerInterface</class>
   <extends>QWidget</extends>
-   <header>fileviewerinterface.h</header>
+   <header>FileViewerInterface.h</header>
   <container>1</container>
  </customwidget>
 </customwidgets>
@@ -1,4 +1,4 @@
-#include "mazeviewer.h"
+#include "MazeViewer.h"
 #include "BinaryFile.h"
 #include <QPainter>
 #include <QResizeEvent>
@@ -1,7 +1,7 @@
 #pragma once

 #include "AttributedMemory.h"
-#include "fileviewerinterface.h"
+#include "FileViewerInterface.h"

 #include <QObject>
 #include <QWidget>
@@ -1,5 +1,5 @@
-#include "texthexdumpviewer.h"
-#include "ui_texthexdumpviewer.h"
+#include "TextHexDumpViewer.h"
+#include "ui_TextHexDumpViewer.h"
 #include "applestring.h"

 #include <QVector>
@@ -1,7 +1,7 @@
 #pragma once

 #include "GenericFile.h"
-#include "fileviewerinterface.h"
+#include "FileViewerInterface.h"

 #include <QString>
 #include <QByteArray>
@@ -23,7 +23,7 @@
  <customwidget>
   <class>FileViewerInterface</class>
   <extends>QWidget</extends>
-   <header>viewerbase.h</header>
+   <header>ViewerBase.h</header>
   <container>1</container>
  </customwidget>
 </customwidgets>
@@ -1,5 +1,17 @@
-#include "viewerbase.h"
-#include "ui_viewerbase.h"
+#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 "RelocatableFile.h"
+#include "MazeViewer.h"

 #include <QCloseEvent>
 #include <QToolBar>
@@ -8,17 +20,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 "RelocatableFile.h"
-#include "mazeviewer.h"

 ViewerBase::ViewerBase(QWidget *parent) :
    QMainWindow(parent),
@@ -1,6 +1,6 @@
 #pragma once

-#include "fileviewerinterface.h"
+#include "FileViewerInterface.h"
 #include "GenericFile.h"

 #include <QMainWindow>
@@ -1,7 +1,7 @@
 #pragma once

 #include "BinaryFile.h"
-#include "fileviewerinterface.h"
+#include "FileViewerInterface.h"
 #include "HiresScreenWidget.h"

 #include <QWidget>
@@ -3,7 +3,6 @@
 #include "notesdialog.h"
 #include "hrcgcontrolsinfo.h"
 #include "hexconverter.h"
-#include "hexdumpviewer.h"
 #include "asciiinfodialog.h"

 #include <QDialog>