Renamed files

stardot · Dec 31, 2023 · 8c7b08a · 8c7b08a
1 parent 5b31437
commit 8c7b08a
Show file tree

Hide file tree

Showing 85 changed files with 454 additions and 413 deletions.
diff --git a/Src/6502core.cpp b/Src/6502core.cpp
@@ -20,43 +20,41 @@ Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 Boston, MA  02110-1301, USA.
 ****************************************************************/
 
-#ifdef WIN32
 #include <windows.h>
-#endif
 
-#include <iostream>
-#include <fstream>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <fstream>
+#include <iostream>
+
 #include "6502core.h"
-#include "beebmem.h"
-#include "beebsound.h"
-#include "music5000.h"
-#include "disc8271.h"
-#include "Teletext.h"
-#include "via.h"
-#include "SysVia.h"
-#include "uservia.h"
-#include "video.h"
-#include "atodconv.h"
-#include "Log.h"
-#include "Main.h"
-#include "disc1770.h"
-#include "Serial.h"
-#include "tube.h"
+#include "Arm.h"
+#include "AtoDConv.h"
+#include "BeebMem.h"
 #include "Debug.h"
-#include "UEFState.h"
-#include "z80mem.h"
-#include "z80.h"
+#include "Disc1770.h"
+#include "Disc8271.h"
 #include "Econet.h"
-#include "scsi.h"
-#include "ide.h"
-#include "Arm.h"
-#include "SprowCoPro.h"
+#include "Ide.h"
+#include "Log.h"
+#include "Main.h"
 #include "Master512CoPro.h"
+#include "Music5000.h"
+#include "Sound.h"
+#include "Teletext.h"
+#include "Scsi.h"
+#include "Serial.h"
 #include "Speech.h"
+#include "SprowCoPro.h"
+#include "SysVia.h"
+#include "Tube.h"
+#include "UserVia.h"
+#include "Video.h"
+#include "UefState.h"
+#include "Z80mem.h"
+#include "Z80.h"
 
 #ifdef WIN32
 #define INLINE inline

diff --git a/Src/6502core.h b/Src/6502core.h
@@ -25,9 +25,10 @@ Boston, MA  02110-1301, USA.
 #ifndef CORE6502_HEADER
 #define CORE6502_HEADER
 
-#include "port.h"
 #include <stdio.h>
 
+#include "Port.h"
+
 enum IRQ_Nums {
   sysVia,
   userVia,

diff --git a/Src/AVIWriter.h b/Src/AVIWriter.h
@@ -28,7 +28,8 @@ Boston, MA  02110-1301, USA.
 #define AVI_WRITER_HEADER
 
 #include <vfw.h>
-#include "beebwin.h"
+
+#include "BeebWin.h"
 
 class AVIWriter
 {

diff --git a/Src/Arm.cpp b/Src/Arm.cpp
@@ -29,12 +29,11 @@ Boston, MA  02110-1301, USA.
 #include <stdlib.h>
 #include <string.h>
 
-#include "Log.h"
-#include "tube.h"
-#include "beebmem.h"
-
 #include "Arm.h"
 #include "ArmDisassembler.h"	// gives access to disassembler
+#include "BeebMem.h"
+#include "Log.h"
+#include "Tube.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

diff --git a/Src/ArmDisassembler.cpp b/Src/ArmDisassembler.cpp
@@ -27,6 +27,7 @@ Boston, MA  02110-1301, USA.
 
 #include <stdio.h>
 #include <string.h>
+
 #include "ArmDisassembler.h"
 
 char *Arm_disassemble(uint32 address, uint32 instruction, char *buff)

diff --git a/Src/atodconv.cpp → Src/AtoDConv.cpp b/Src/atodconv.cpp → Src/AtoDConv.cpp
@@ -21,16 +21,14 @@ Boston, MA  02110-1301, USA.
 /* Analogue to digital converter support file for the beeb emulator -
    Mike Wyatt 7/6/97 */
 
-#ifdef WIN32
 #include <windows.h>
-#endif
 
 #include <stdio.h>
 
 #include "6502core.h"
-#include "atodconv.h"
+#include "AtoDConv.h"
 #include "SysVia.h"
-#include "UEFState.h"
+#include "UefState.h"
 
 bool JoystickEnabled = false;
 

diff --git a/Src/atodconv.h → Src/AtoDConv.h b/Src/atodconv.h → Src/AtoDConv.h
diff --git a/Src/BeebEm.vcxproj b/Src/BeebEm.vcxproj
@@ -175,23 +175,23 @@
     <ClCompile Include="ARMulator\arminit.cpp" />
     <ClCompile Include="ARMulator\armsupp.cpp" />
     <ClCompile Include="ARMulator\thumbemu.cpp" />
-    <ClCompile Include="atodconv.cpp" />
-    <ClCompile Include="AVIWriter.cpp" />
+    <ClCompile Include="AtoDConv.cpp" />
+    <ClCompile Include="AviWriter.cpp" />
     <ClCompile Include="Bcd.cpp" />
-    <ClCompile Include="beebmem.cpp" />
-    <ClCompile Include="beebsound.cpp" />
-    <ClCompile Include="beebwin.cpp" />
-    <ClCompile Include="beebwindx.cpp" />
-    <ClCompile Include="beebwinio.cpp" />
-    <ClCompile Include="beebwinprefs.cpp" />
-    <ClCompile Include="beebwinspeech.cpp" />
-    <ClCompile Include="csw.cpp" />
+    <ClCompile Include="BeebMem.cpp" />
+    <ClCompile Include="Sound.cpp" />
+    <ClCompile Include="BeebWin.cpp" />
+    <ClCompile Include="BeebWinDx.cpp" />
+    <ClCompile Include="BeebWinIo.cpp" />
+    <ClCompile Include="BeebWinPrefs.cpp" />
+    <ClCompile Include="BeebWinSpeech.cpp" />
+    <ClCompile Include="Csw.cpp" />
     <ClCompile Include="Debug.cpp" />
     <ClCompile Include="DebugTrace.cpp" />
     <ClCompile Include="Dialog.cpp" />
     <ClCompile Include="DirectSoundStreamer.cpp" />
-    <ClCompile Include="disc1770.cpp" />
-    <ClCompile Include="disc8271.cpp" />
+    <ClCompile Include="Disc1770.cpp" />
+    <ClCompile Include="Disc8271.cpp" />
     <ClCompile Include="DiscEdit.cpp" />
     <ClCompile Include="DiscInfo.cpp" />
     <ClCompile Include="Econet.cpp" />
@@ -200,21 +200,21 @@
     <ClCompile Include="FileUtils.cpp" />
     <ClCompile Include="FolderSelectDialog.cpp" />
     <ClCompile Include="IC32Latch.cpp" />
-    <ClCompile Include="ide.cpp" />
+    <ClCompile Include="Ide.cpp" />
     <ClCompile Include="KeyboardLinksDialog.cpp" />
     <ClCompile Include="KeyMap.cpp" />
     <ClCompile Include="IP232.cpp" />
     <ClCompile Include="ListView.cpp" />
     <ClCompile Include="Log.cpp" />
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="Master512CoPro.cpp" />
-    <ClCompile Include="music5000.cpp" />
-    <ClCompile Include="preferences.cpp" />
+    <ClCompile Include="Music5000.cpp" />
+    <ClCompile Include="Preferences.cpp" />
     <ClCompile Include="RenameFileDialog.cpp" />
     <ClCompile Include="RingBuffer.cpp" />
     <ClCompile Include="RomConfig.cpp" />
-    <ClCompile Include="sasi.cpp" />
-    <ClCompile Include="scsi.cpp" />
+    <ClCompile Include="Sasi.cpp" />
+    <ClCompile Include="Scsi.cpp" />
     <ClCompile Include="SelectKeyDialog.cpp" />
     <ClCompile Include="Serial.cpp" />
     <ClCompile Include="SerialPortDialog.cpp" />
@@ -228,18 +228,18 @@
     <ClCompile Include="Teletext.cpp" />
     <ClCompile Include="Thread.cpp" />
     <ClCompile Include="TouchScreen.cpp" />
-    <ClCompile Include="tube.cpp" />
-    <ClCompile Include="uef.cpp" />
-    <ClCompile Include="UEFState.cpp" />
+    <ClCompile Include="Tube.cpp" />
+    <ClCompile Include="Uef.cpp" />
+    <ClCompile Include="UefState.cpp" />
     <ClCompile Include="UserKeyboardDialog.cpp" />
     <ClCompile Include="UserPortBreakoutBox.cpp" />
-    <ClCompile Include="uservia.cpp" />
-    <ClCompile Include="via.cpp" />
-    <ClCompile Include="video.cpp" />
+    <ClCompile Include="UserVia.cpp" />
+    <ClCompile Include="Via.cpp" />
+    <ClCompile Include="Video.cpp" />
     <ClCompile Include="XAudio2Streamer.cpp" />
-    <ClCompile Include="z80.cpp" />
-    <ClCompile Include="z80dis.cpp" />
-    <ClCompile Include="z80_support.cpp" />
+    <ClCompile Include="Z80.cpp" />
+    <ClCompile Include="Z80dis.cpp" />
+    <ClCompile Include="Z80Support.cpp" />
     <ClCompile Include="zlib\adler32.c">
       <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4131</DisableSpecificWarnings>
       <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4131</DisableSpecificWarnings>
@@ -324,6 +324,7 @@
     <ClInclude Include="AboutDialog.h" />
     <ClInclude Include="Arm.h" />
     <ClInclude Include="ArmDisassembler.h" />
+    <ClInclude Include="ARMulator.h" />
     <ClInclude Include="ARMulator\ansidecl.h" />
     <ClInclude Include="ARMulator\armdefs.h" />
     <ClInclude Include="ARMulator\armdis.h" />
@@ -332,48 +333,48 @@
     <ClInclude Include="ARMulator\armos.h" />
     <ClInclude Include="ARMulator\dbg_rdi.h" />
     <ClInclude Include="ARMulator\iwmmxt.h" />
-    <ClInclude Include="atodconv.h" />
-    <ClInclude Include="AVIWriter.h" />
+    <ClInclude Include="AtoDConv.h" />
+    <ClInclude Include="AviWriter.h" />
     <ClInclude Include="Bcd.h" />
-    <ClInclude Include="beebmem.h" />
-    <ClInclude Include="beebsound.h" />
-    <ClInclude Include="beebwin.h" />
-    <ClInclude Include="csw.h" />
+    <ClInclude Include="BeebMem.h" />
+    <ClInclude Include="Sound.h" />
+    <ClInclude Include="BeebWin.h" />
+    <ClInclude Include="Csw.h" />
     <ClInclude Include="Debug.h" />
     <ClInclude Include="DebugTrace.h" />
     <ClInclude Include="Dialog.h" />
     <ClInclude Include="DirectSoundStreamer.h" />
-    <ClInclude Include="disc1770.h" />
-    <ClInclude Include="disc8271.h" />
+    <ClInclude Include="Disc1770.h" />
+    <ClInclude Include="Disc8271.h" />
     <ClInclude Include="DiscEdit.h" />
     <ClInclude Include="DiscInfo.h" />
     <ClInclude Include="DiscType.h" />
     <ClInclude Include="Econet.h" />
     <ClInclude Include="ExportFileDialog.h" />
-    <ClInclude Include="ext1770.h" />
+    <ClInclude Include="Ext1770.h" />
     <ClInclude Include="FileDialog.h" />
     <ClInclude Include="FileUtils.h" />
     <ClInclude Include="FolderSelectDialog.h" />
     <ClInclude Include="IC32Latch.h" />
     <ClInclude Include="KeyboardLinksDialog.h" />
     <ClInclude Include="ListView.h" />
     <ClInclude Include="Master512CoPro.h" />
-    <ClInclude Include="ide.h" />
+    <ClInclude Include="Ide.h" />
     <ClInclude Include="IP232.h" />
     <ClInclude Include="KeyMap.h" />
     <ClInclude Include="Log.h" />
     <ClInclude Include="Main.h" />
     <ClInclude Include="Messages.h" />
-    <ClInclude Include="ml675001.h" />
-    <ClInclude Include="model.h" />
-    <ClInclude Include="music5000.h" />
-    <ClInclude Include="port.h" />
-    <ClInclude Include="preferences.h" />
+    <ClInclude Include="ML675001.h" />
+    <ClInclude Include="Model.h" />
+    <ClInclude Include="Music5000.h" />
+    <ClInclude Include="Port.h" />
+    <ClInclude Include="Preferences.h" />
     <ClInclude Include="RenameFileDialog.h" />
     <ClInclude Include="Resource.h" />
     <ClInclude Include="RingBuffer.h" />
-    <ClInclude Include="sasi.h" />
-    <ClInclude Include="scsi.h" />
+    <ClInclude Include="Sasi.h" />
+    <ClInclude Include="Scsi.h" />
     <ClInclude Include="SelectKeyDialog.h" />
     <ClInclude Include="Serial.h" />
     <ClInclude Include="SerialPortDialog.h" />
@@ -388,18 +389,18 @@
     <ClInclude Include="Teletext.h" />
     <ClInclude Include="Thread.h" />
     <ClInclude Include="TouchScreen.h" />
-    <ClInclude Include="tube.h" />
-    <ClInclude Include="uef.h" />
-    <ClInclude Include="UEFState.h" />
+    <ClInclude Include="Tube.h" />
+    <ClInclude Include="Uef.h" />
+    <ClInclude Include="UefState.h" />
     <ClInclude Include="UserKeyboardDialog.h" />
     <ClInclude Include="UserPortBreakoutBox.h" />
-    <ClInclude Include="uservia.h" />
+    <ClInclude Include="UserVia.h" />
     <ClInclude Include="Version.h" />
-    <ClInclude Include="via.h" />
-    <ClInclude Include="video.h" />
+    <ClInclude Include="Via.h" />
+    <ClInclude Include="Video.h" />
     <ClInclude Include="XAudio2Streamer.h" />
-    <ClInclude Include="z80.h" />
-    <ClInclude Include="z80mem.h" />
+    <ClInclude Include="Z80.h" />
+    <ClInclude Include="Z80mem.h" />
     <ClInclude Include="zlib\crc32.h" />
     <ClInclude Include="zlib\deflate.h" />
     <ClInclude Include="zlib\gzguts.h" />