Renamed DiskConsts.h to DiskDefs.h + other header refactoring

This commit is contained in:
tomcw 2014-08-14 17:48:38 +01:00
parent 77d4ac81a1
commit 4d40590fbf
18 changed files with 17 additions and 14 deletions

View File

@ -803,7 +803,7 @@
> >
</File> </File>
<File <File
RelativePath=".\source\DiskConsts.h" RelativePath=".\source\DiskDefs.h"
> >
</File> </File>
<File <File

View File

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "Structs.h" #include "Structs.h"
#include "Common.h"
void SetCurrentCLK6502(); void SetCurrentCLK6502();
void SetCurrentImageDir(const char* pszImageDir); void SetCurrentImageDir(const char* pszImageDir);

View File

@ -66,9 +66,6 @@ enum AppMode_e
#define TITLE_PAUSED TEXT("* PAUSED *") #define TITLE_PAUSED TEXT("* PAUSED *")
#define TITLE_STEPPING TEXT("Stepping") #define TITLE_STEPPING TEXT("Stepping")
#define REGLOAD(a,b) RegLoadValue(TEXT(REG_CONFIG),a,1,b)
#define REGSAVE(a,b) RegSaveValue(TEXT(REG_CONFIG),a,1,b)
// Configuration // Configuration
#define REG_CONFIG "Configuration" #define REG_CONFIG "Configuration"
#define REGVALUE_APPLE2_TYPE "Apple2 Type" #define REGVALUE_APPLE2_TYPE "Apple2 Type"

View File

@ -1,7 +1,8 @@
#pragma once #pragma once
#include "..\AppleWin.h" #include "..\AppleWin.h"
#include "..\HardDisk.h" #include "..\Disk.h" // BOOL enhancedisk
#include "..\HardDisk.h" // HD_CardIsEnabled()
class CConfigNeedingRestart class CConfigNeedingRestart
{ {

View File

@ -23,8 +23,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "StdAfx.h" #include "StdAfx.h"
#include "..\Structs.h" #include "..\Structs.h"
#include "..\Common.h"
#include "..\Disk.h"
#include "..\ParallelPrinter.h" #include "..\ParallelPrinter.h"
#include "..\Registry.h" #include "..\Registry.h"
#include "..\SaveState.h" #include "..\SaveState.h"

View File

@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "StdAfx.h" #include "StdAfx.h"
#include "..\AppleWin.h" #include "..\AppleWin.h"
#include "..\Disk.h"
#include "..\Frame.h" #include "..\Frame.h"
#include "..\Registry.h" #include "..\Registry.h"
#include "..\SerialComms.h" #include "..\SerialComms.h"

View File

@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "StdAfx.h" #include "StdAfx.h"
#include "..\AppleWin.h" #include "..\AppleWin.h"
#include "..\Disk.h"
#include "..\Frame.h" #include "..\Frame.h"
#include "..\Registry.h" #include "..\Registry.h"
#include "..\resource\resource.h" #include "..\resource\resource.h"

View File

@ -23,8 +23,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "StdAfx.h" #include "StdAfx.h"
#include "..\Structs.h" #include "..\Structs.h"
#include "..\Common.h"
#include "..\Disk.h"
#include "..\Keyboard.h" #include "..\Keyboard.h"
#include "..\Registry.h" #include "..\Registry.h"
#include "..\resource\resource.h" #include "..\resource\resource.h"

View File

@ -23,8 +23,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "StdAfx.h" #include "StdAfx.h"
#include "..\Structs.h" #include "..\Structs.h"
#include "..\Common.h"
#include "..\Disk.h"
#include "..\Mockingboard.h" #include "..\Mockingboard.h"
#include "..\Registry.h" #include "..\Registry.h"
#include "..\Speaker.h" #include "..\Speaker.h"

View File

@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "StdAfx.h" #include "StdAfx.h"
#include "..\AppleWin.h" #include "..\AppleWin.h"
#include "..\Disk.h"
#include "..\Frame.h" #include "..\Frame.h"
#include "..\resource\resource.h" #include "..\resource\resource.h"
#include "PropertySheet.h" #include "PropertySheet.h"

View File

@ -6,6 +6,7 @@
using namespace std; using namespace std;
#include "..\Structs.h" #include "..\Structs.h"
#include "..\Common.h"
#include "Debugger_Types.h" #include "Debugger_Types.h"
#include "Debugger_DisassemblerData.h" #include "Debugger_DisassemblerData.h"

View File

@ -28,6 +28,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "StdAfx.h" #include "StdAfx.h"
#include "Structs.h" #include "Structs.h"
#include "Common.h"
#include "DiskImage.h" #include "DiskImage.h"
#include "DiskImageHelper.h" #include "DiskImageHelper.h"

View File

@ -23,7 +23,7 @@ along with AppleWin; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "DiskConsts.h" #include "DiskDefs.h"
#define TRACK_DENIBBLIZED_SIZE (16 * 256) // #Sectors x Sector-size #define TRACK_DENIBBLIZED_SIZE (16 * 256) // #Sectors x Sector-size

View File

@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "stdafx.h" #include "stdafx.h"
#include "Structs.h" #include "Structs.h"
#include "Common.h"
#include "zlib.h" #include "zlib.h"
#include "unzip.h" #include "unzip.h"

View File

@ -42,6 +42,7 @@ Etc.
#include "stdafx.h" #include "stdafx.h"
#include "Structs.h" #include "Structs.h"
#include "Common.h"
#include "CPU.h" #include "CPU.h"
#include "Frame.h" // FrameSetCursorPosByMousePos() #include "Frame.h" // FrameSetCursorPosByMousePos()

View File

@ -1,5 +1,8 @@
#pragma once #pragma once
#define REGLOAD(a,b) RegLoadValue(TEXT(REG_CONFIG),a,1,b)
#define REGSAVE(a,b) RegSaveValue(TEXT(REG_CONFIG),a,1,b)
BOOL RegLoadString (LPCTSTR,LPCTSTR,BOOL,LPTSTR,DWORD); BOOL RegLoadString (LPCTSTR,LPCTSTR,BOOL,LPTSTR,DWORD);
BOOL RegLoadValue (LPCTSTR,LPCTSTR,BOOL,DWORD *); BOOL RegLoadValue (LPCTSTR,LPCTSTR,BOOL,DWORD *);
void RegSaveString (LPCTSTR,LPCTSTR,BOOL,LPCTSTR); void RegSaveString (LPCTSTR,LPCTSTR,BOOL,LPCTSTR);

View File

@ -1,7 +1,6 @@
#pragma once #pragma once
#include "Common.h" #include "DiskDefs.h"
#include "DiskConsts.h"
// Structs used by save-state file // Structs used by save-state file