Normalizing some file names and paths

AppleSAWS.pro

@@ -34,7 +34,7 @@ DEFINES += WS_VIDEO
 
 SOURCES += \
     src/intbasic/IntBasicFile.cxx \
-    src/main.cpp \
+    src/main.cxx \
     src/diskfiles/dos33/diskfile.cxx \
     src/diskfiles/dos33/sector.cxx \
     src/diskfiles/dos33/vtoc.cxx \
@@ -42,22 +42,22 @@ SOURCES += \
     src/diskfiles/dos33/tracksectorlist.cxx \
     src/diskfiles/dos33/filedescriptiveentry.cxx \
     src/diskfiles/dos33/genericfile.cxx \
-    src/memory/attributedmemory.cpp \
-    src/memory/memorycell.cpp \
-    src/memory/memrole.cpp \
-    src/memory/roles/role_asm_opcode.cpp \
-    src/memory/roles/role_asm_operand.cpp \
-    src/ui/startupdialog.cpp \
+    src/memory/attributedmemory.cxx \
+    src/memory/memorycell.cxx \
+    src/memory/memrole.cxx \
+    src/memory/roles/role_asm_opcode.cxx \
+    src/memory/roles/role_asm_operand.cxx \
+    src/ui/widgets/startupdialog.cxx \
     src/ui/viewers/intbasicfileviewer.cxx \
-    src/ui/widgets/notesdialog.cpp \
+    src/ui/widgets/notesdialog.cxx \
     src/util/applestring.cxx \
-    src/applesoftfile/applesoftfile.cxx \
-    src/applesoftfile/applesofttoken.cxx \
-    src/applesoftfile/applesoftformatter.cxx \
+    src/applesoftfile/ApplesoftFile.cxx \
+    src/applesoftfile/ApplesoftToken.cxx \
+    src/applesoftfile/ApplesoftFormatter.cxx \
     src/binaryfile/disassembler.cxx \
     src/binaryfile/binaryfile.cxx \
     src/textfile/textfile.cxx \
-    src/ui/catalogwidget.cxx \
+    src/ui/widgets/catalogwidget.cxx \
     src/ui/widgets/hiresviewwidget.cxx \
     src/ui/viewers/applesoftfileviewer.cxx \
     src/ui/viewers/disassemblerviewer.cpp \
@@ -69,7 +69,7 @@ SOURCES += \
     src/binaryfile/binaryfilemetadata.cpp \
     src/util/charset.cpp \
     src/ui/widgets/characterwidget.cpp \
-    src/ui/viewers/applesoftfiledetailviewer.cpp \
+    src/ui/viewers/ApplesoftFileDetailViewer.cxx \
     src/ui/widgets/hexconverter.cpp \
     src/ui/viewers/viewerbase.cpp \
     src/ui/widgets/CharacterSetExplorer.cpp \
@@ -78,11 +78,11 @@ SOURCES += \
     src/binaryfile/EntryPointModel.cpp \
     src/ui/widgets/LocationInfoDialog.cpp \
     src/binaryfile/EntryPoints.cpp \
-    src/binaryfile/AssemblerSymbols.cpp \
-    src/binaryfile/AssemblerSymbolModel.cpp \
+    src/binaryfile/AssemblerSymbols.cxx \
+    src/binaryfile/AssemblerSymbolModel.cxx \
     src/ui/diskexplorer/DiskExplorer.cpp \
     src/ui/diskexplorer/DiskExplorerMapWidget.cpp \
-    src/applesoftfile/ApplesoftRetokenizer.cpp \
+    src/applesoftfile/ApplesoftRetokenizer.cxx \
     src/internals/JumpLineManager.cpp \
     src/ui/widgets/FlowLineTextBrowser.cpp \
     src/util/opcodes.cpp
@@ -102,22 +102,22 @@ HEADERS += \
     src/memory/memrole.h \
     src/memory/roles/role_asm_opcode.h \
     src/memory/roles/role_asm_operand.h \
-    src/ui/startupdialog.h \
+    src/ui/widgets/startupdialog.h \
     src/ui/viewers/intbasicfileviewer.h \
     src/ui/widgets/notesdialog.h \
     src/util/opcodes.h \
     src/util/util.h \
     src/util/applestring.h \
-    src/applesoftfile/applesoftfile.h \
-    src/applesoftfile/applesofttoken.h \
+    src/applesoftfile/ApplesoftFile.h \
+    src/applesoftfile/ApplesoftToken.h \
     src/binaryfile/disassembler.h \
     src/binaryfile/binaryfile.h \
     src/textfile/textfile.h \
-    src/ui/catalogwidget.h \
+    src/ui/widgets/catalogwidget.h \
     src/ui/widgets/hiresviewwidget.h \
     src/ui/viewers/applesoftfileviewer.h \
-    src/applesoftfile/applesoftformatter.h \
-    src/applesoftfile/applesoftline.h  \
+    src/applesoftfile/ApplesoftFormatter.h \
+    src/applesoftfile/ApplesoftLine.h  \
     src/ui/viewers/disassemblerviewer.h \
     src/ui/viewers/hexdumpviewer.h \
     src/ui/viewers/texthexdumpviewer.h \
@@ -127,7 +127,7 @@ HEADERS += \
     src/ui/widgets/characterwidget.h \
     src/util/charset.h \
     src/ui/viewers/charsetviewer.h \
-    src/ui/viewers/applesoftfiledetailviewer.h \
+    src/ui/viewers/ApplesoftFileDetailViewer.h \
     src/ui/widgets/hexconverter.h \
     src/ui/widgets/hrcgcontrolsinfo.h \
     src/ui/viewers/viewerbase.h \
@@ -150,14 +150,14 @@ HEADERS += \
     src/ui/widgets/asciiinfodialog.h
 
 FORMS += \
-    src/ui/catalogwidget.ui \
-    src/ui/startupdialog.ui \
+    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/applesoftfiledetailviewer.ui \
+    src/ui/viewers/ApplesoftFileDetailViewer.ui \
     src/ui/widgets/hexconverter.ui \
     src/ui/widgets/hrcgcontrolsinfo.ui \
     src/ui/viewers/viewerbase.ui \

src/applesoftfile/ApplesoftFile.cxx

@@ -1,4 +1,4 @@
-#include "applesoftfile.h"
+#include "ApplesoftFile.h"
 #include "util.h"
 #include <QDebug>
 #include <QRegularExpression>

src/applesoftfile/ApplesoftFile.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "applesoftline.h"
+#include "ApplesoftLine.h"
 #include "genericfile.h"
-#include "applesofttoken.h"
+#include "ApplesoftToken.h"
 #include "ApplesoftRetokenizer.h"
 
 #include <QByteArray>

src/applesoftfile/ApplesoftFormatter.cxx

@@ -1,4 +1,4 @@
-#include "applesoftformatter.h"
+#include "ApplesoftFormatter.h"
 #include "util.h"
 #include <QTextCursor>
 #include <QTextCharFormat>

src/applesoftfile/ApplesoftFormatter.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "applesoftfile.h"
+#include "ApplesoftFile.h"
 
 #include <QObject>
 #include <QFlags>

src/applesoftfile/ApplesoftRetokenizer.cxx

@@ -1,5 +1,5 @@
 #include "ApplesoftRetokenizer.h"
-#include "applesofttoken.h"
+#include "ApplesoftToken.h"
 #include "util.h"
 
 #include <QDebug>

src/applesoftfile/ApplesoftRetokenizer.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "applesoftline.h"
+#include "ApplesoftLine.h"
 
 #include <QByteArray>
 #include <QVector>

src/applesoftfile/ApplesoftToken.cxx

@@ -1,4 +1,4 @@
-#include "applesofttoken.h"
+#include "ApplesoftToken.h"
 
 QMap<quint16, QString> ApplesoftToken::m_tokens = QMap<quint16, QString>();
 

src/diskfiles/dos33/diskfile.cxx

@@ -7,7 +7,7 @@
 #include <QDir>
 
 #include "tracksectorlist.h"
-#include "applesoftfile.h"
+#include "ApplesoftFile.h"
 #include "binaryfile.h"
 #include "IntBasicFile.h"
 #include "relocatablefile.h"

src/main.cxx

@@ -4,11 +4,11 @@
 #include <QFontDatabase>
 #include <QDebug>
 
-#include "binaryfile.h"
-#include "genericfile.h"
-#include "diskfile.h"
-#include "catalogsector.h"
-#include "applesoftfile.h"
+// #include "binaryfile.h"
+// #include "genericfile.h"
+// #include "diskfile.h"
+// #include "catalogsector.h"
+// //#include "ApplesoftFile.h"
 #include "startupdialog.h"
 
 int main(int argc, char** argv)

src/ui/viewers/ApplesoftFileDetailViewer.cxx

@@ -1,5 +1,5 @@
-#include "applesoftfiledetailviewer.h"
-#include "ui_applesoftfiledetailviewer.h"
+#include "ApplesoftFileDetailViewer.h"
+#include "ui_ApplesoftFileDetailViewer.h"
 
 #include <QMap>
 #include <QString>

src/ui/viewers/ApplesoftFileDetailViewer.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "applesoftline.h"
-#include "applesofttoken.h"
-#include "applesoftfile.h"
+#include "ApplesoftLine.h"
+#include "ApplesoftToken.h"
+#include "ApplesoftFile.h"
 
 #include <QWidget>
 #include <QDebug>

src/ui/viewers/applesoftfileviewer.cxx

@@ -1,6 +1,5 @@
 #include "applesoftfileviewer.h"
 #include "ui_applesoftfileviewer.h"
-#include "applesoftformatter.h"
 #include "util.h"
 #include <QDebug>
 #include <QSettings>

src/ui/viewers/applesoftfileviewer.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "applesoftfile.h"
-#include "applesoftformatter.h"
+#include "ApplesoftFile.h"
+#include "ApplesoftFormatter.h"
 #include "viewerbase.h"
-#include "applesoftfiledetailviewer.h"
+#include "ApplesoftFileDetailViewer.h"
 
 #include <QAction>
 #include <QWidget>

src/ui/widgets/catalogwidget.cxx

@@ -2,7 +2,7 @@
 #include "ui_catalogwidget.h"
 #include "filedescriptiveentry.h"
 #include "binaryfile.h"
-#include "applesoftfile.h"
+#include "ApplesoftFile.h"
 #include "genericfile.h"
 #include "IntBasicFile.h"
 #include <QUrl>