ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Decided to take a little break from the debugger stuff, and clean up 

the various header files.  Basically, I'm following advice from
Effective C++, and including only what's absolutely necessary.  For
definitions that don't need to be included, the designation 'class xxx'
is used instead.  This could potentially lead to faster compile times.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2155 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2010-10-18 18:39:57 +00:00
parent bd06b3db1e
commit 7411867290
75 changed files with 182 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cheat/BankRomCheat.cxx
View File

@ -18,6 +18,8 @@
//============================================================================ //============================================================================
#include "Console.hxx" #include "Console.hxx"
#include "Cart.hxx"
#include "OSystem.hxx"
#include "BankRomCheat.hxx" #include "BankRomCheat.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

3
src/cheat/Cheat.hxx
View File

@ -20,8 +20,9 @@
#ifndef CHEAT_HXX #ifndef CHEAT_HXX
#define CHEAT_HXX #define CHEAT_HXX
class OSystem;
#include "StringList.hxx" #include "StringList.hxx"
#include "OSystem.hxx"
#include "bspf.hxx" #include "bspf.hxx"
class Cheat class Cheat

1
src/cheat/CheatCodeDialog.cxx
View File

@ -24,6 +24,7 @@
#include "bspf.hxx" #include "bspf.hxx"
#include "Cheat.hxx"
#include "CheatManager.hxx" #include "CheatManager.hxx"
#include "CheckListWidget.hxx" #include "CheckListWidget.hxx"
#include "DialogContainer.hxx" #include "DialogContainer.hxx"

9
src/cheat/CheatCodeDialog.hxx
View File

@ -25,19 +25,16 @@
class DialogContainer; class DialogContainer;
class CommandSender; class CommandSender;
class Widget;
class ButtonWidget; class ButtonWidget;
class StaticTextWidget; class StaticTextWidget;
class CheckListWidget; class CheckListWidget;
class EditTextWidget;
class InputTextDialog; class InputTextDialog;
class OptionsDialog; class OptionsDialog;
class OSystem;
#include "OSystem.hxx"
#include "Dialog.hxx" #include "Dialog.hxx"
#include "Widget.hxx"
#include "CheatManager.hxx"
#include "EditTextWidget.hxx"
#include "Props.hxx"
#include "bspf.hxx"
class CheatCodeDialog : public Dialog class CheatCodeDialog : public Dialog
{ {

1
src/cheat/CheatManager.cxx
View File

@ -17,6 +17,7 @@
// $Id$ // $Id$
//============================================================================ //============================================================================
#include <fstream>
#include <sstream> #include <sstream>
#include "OSystem.hxx" #include "OSystem.hxx"

6
src/cheat/CheatManager.hxx
View File

@ -22,12 +22,12 @@
#include <map> #include <map>
#include "OSystem.hxx" class Cheat;
class OSystem;
#include "bspf.hxx" #include "bspf.hxx"
#include "Array.hxx" #include "Array.hxx"
#include "Cheat.hxx"
typedef Common::Array<Cheat*> CheatList; typedef Common::Array<Cheat*> CheatList;
typedef map<string,string> CheatCodeMap; typedef map<string,string> CheatCodeMap;

2
src/cheat/CheetahCheat.cxx
View File

@ -18,6 +18,8 @@
//============================================================================ //============================================================================
#include "Console.hxx" #include "Console.hxx"
#include "Cart.hxx"
#include "OSystem.hxx"
#include "CheetahCheat.hxx" #include "CheetahCheat.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

1
src/cheat/RamCheat.cxx
View File

@ -19,6 +19,7 @@
#include "Console.hxx" #include "Console.hxx"
#include "System.hxx" #include "System.hxx"
#include "OSystem.hxx"
#include "CheatManager.hxx" #include "CheatManager.hxx"
#include "RamCheat.hxx" #include "RamCheat.hxx"

1
src/common/FrameBufferGL.cxx
View File

@ -23,6 +23,7 @@
#include <SDL_syswm.h> #include <SDL_syswm.h>
#include <sstream> #include <sstream>
#include <time.h> #include <time.h>
#include <fstream>
#include "bspf.hxx" #include "bspf.hxx"

1
src/common/PNGLibrary.cxx
View File

@ -20,6 +20,7 @@
#include <fstream> #include <fstream>
#include <cmath> #include <cmath>
#include "FrameBuffer.hxx"
#include "bspf.hxx" #include "bspf.hxx"
#include "PNGLibrary.hxx" #include "PNGLibrary.hxx"

5
src/common/PNGLibrary.hxx
View File

@ -22,9 +22,10 @@
#include <png.h> #include <png.h>
class FrameBuffer;
class FBSurface;
#include "bspf.hxx" #include "bspf.hxx"
#include "FrameBuffer.hxx"
#include "StringList.hxx"
/** /**
This class implements a thin wrapper around the libpng library, and This class implements a thin wrapper around the libpng library, and

3
src/debugger/CartDebug.cxx
View File

@ -20,8 +20,11 @@
#include "bspf.hxx" #include "bspf.hxx"
#include "Array.hxx" #include "Array.hxx"
#include "System.hxx" #include "System.hxx"
#include "FSNode.hxx"
#include "DiStella.hxx" #include "DiStella.hxx"
#include "Debugger.hxx"
#include "CpuDebug.hxx" #include "CpuDebug.hxx"
#include "OSystem.hxx"
#include "Settings.hxx" #include "Settings.hxx"
#include "CartDebug.hxx" #include "CartDebug.hxx"

4
src/debugger/CartDebug.hxx
View File

@ -21,7 +21,6 @@
#define CART_DEBUG_HXX #define CART_DEBUG_HXX
class Settings; class Settings;
class System;
#include <map> #include <map>
#include <set> #include <set>
@ -30,10 +29,11 @@ class System;
#include "bspf.hxx" #include "bspf.hxx"
#include "Array.hxx" #include "Array.hxx"
#include "Cart.hxx" #include "Cart.hxx"
#include "StringList.hxx"
#include "DebuggerSystem.hxx" #include "DebuggerSystem.hxx"
#include "System.hxx"
// pointer types for CartDebug instance methods // pointer types for CartDebug instance methods
class CartDebug;
typedef int (CartDebug::*CARTDEBUG_INT_METHOD)(); typedef int (CartDebug::*CARTDEBUG_INT_METHOD)();
// call the pointed-to method on the (global) CPU debugger object. // call the pointed-to method on the (global) CPU debugger object.

1
src/debugger/CpuDebug.cxx
View File

@ -21,6 +21,7 @@
#include "Array.hxx" #include "Array.hxx"
#include "M6502.hxx" #include "M6502.hxx"
#include "Debugger.hxx"
#include "CartDebug.hxx" #include "CartDebug.hxx"
#include "TIADebug.hxx" #include "TIADebug.hxx"

1
src/debugger/CpuDebug.hxx
View File

@ -23,6 +23,7 @@
class EquateList; class EquateList;
#include "Array.hxx" #include "Array.hxx"
#include "M6502.hxx"
#include "System.hxx" #include "System.hxx"
#include "DebuggerSystem.hxx" #include "DebuggerSystem.hxx"

3
src/debugger/Debugger.cxx
View File

@ -37,6 +37,7 @@
#include "System.hxx" #include "System.hxx"
#include "M6502.hxx" #include "M6502.hxx"
#include "Cart.hxx" #include "Cart.hxx"
#include "TIA.hxx"
#include "CartDebug.hxx" #include "CartDebug.hxx"
#include "CpuDebug.hxx" #include "CpuDebug.hxx"
@ -50,7 +51,7 @@
#include "RomWidget.hxx" #include "RomWidget.hxx"
#include "Expression.hxx" #include "Expression.hxx"
#include "PackedBitArray.hxx"
#include "YaccParser.hxx" #include "YaccParser.hxx"
#include "Debugger.hxx" #include "Debugger.hxx"

9
src/debugger/Debugger.hxx
View File

@ -22,11 +22,11 @@
class OSystem; class OSystem;
class Console; class Console;
class System;
class CartDebug; class CartDebug;
class CpuDebug; class CpuDebug;
class RiotDebug; class RiotDebug;
class TIADebug; class TIADebug;
class M6502;
class TiaInfoWidget; class TiaInfoWidget;
class TiaOutputWidget; class TiaOutputWidget;
class TiaZoomWidget; class TiaZoomWidget;
@ -34,15 +34,16 @@ class EditTextWidget;
class RomWidget; class RomWidget;
class Expression; class Expression;
class Serializer; class Serializer;
class PackedBitArray;
class PromptWidget;
class ButtonWidget;
#include <map> #include <map>
#include "Array.hxx" #include "Array.hxx"
#include "DialogContainer.hxx" #include "DialogContainer.hxx"
#include "M6502.hxx"
#include "DebuggerParser.hxx" #include "DebuggerParser.hxx"
#include "PackedBitArray.hxx" #include "System.hxx"
#include "PromptWidget.hxx"
#include "Rect.hxx" #include "Rect.hxx"
#include "Stack.hxx" #include "Stack.hxx"
#include "bspf.hxx" #include "bspf.hxx"

3
src/debugger/DebuggerParser.cxx
View File

@ -31,10 +31,13 @@
#include "M6502.hxx" #include "M6502.hxx"
#include "Expression.hxx" #include "Expression.hxx"
#include "FSNode.hxx" #include "FSNode.hxx"
#include "PromptWidget.hxx"
#include "RomWidget.hxx" #include "RomWidget.hxx"
#include "ProgressDialog.hxx" #include "ProgressDialog.hxx"
#include "PackedBitArray.hxx"
#ifdef CHEATCODE_SUPPORT #ifdef CHEATCODE_SUPPORT
#include "Cheat.hxx"
#include "CheatManager.hxx" #include "CheatManager.hxx"
#endif #endif

2
src/debugger/DebuggerParser.hxx
View File

@ -23,12 +23,12 @@
#include <sstream> #include <sstream>
class Debugger; class Debugger;
class FilesystemNode;
struct Command; struct Command;
#include "bspf.hxx" #include "bspf.hxx"
#include "Array.hxx" #include "Array.hxx"
#include "FrameBuffer.hxx" #include "FrameBuffer.hxx"
#include "FSNode.hxx"
typedef enum { typedef enum {
kBASE_16, kBASE_16,

3
src/debugger/DebuggerSystem.hxx
View File

@ -20,7 +20,8 @@
#ifndef DEBUGGER_SYSTEM_HXX #ifndef DEBUGGER_SYSTEM_HXX
#define DEBUGGER_SYSTEM_HXX #define DEBUGGER_SYSTEM_HXX
#include "Debugger.hxx" class Debugger;
#include "Console.hxx" #include "Console.hxx"
/** /**

2
src/debugger/DiStella.hxx
View File

@ -25,8 +25,8 @@
#include "Array.hxx" #include "Array.hxx"
#include "bspf.hxx" #include "bspf.hxx"
#include "CartDebug.hxx" #include "CartDebug.hxx"
#include "DebuggerParser.hxx"
/** /**
This class is a wrapper around the Distella code. Much of the code remains This class is a wrapper around the Distella code. Much of the code remains

1
src/debugger/RiotDebug.cxx
View File

@ -20,6 +20,7 @@
#include <sstream> #include <sstream>
#include "System.hxx" #include "System.hxx"
#include "M6532.hxx"
#include "Debugger.hxx" #include "Debugger.hxx"
#include "Switches.hxx" #include "Switches.hxx"

1
src/debugger/TIADebug.cxx
View File

@ -19,6 +19,7 @@
#include "System.hxx" #include "System.hxx"
#include "Debugger.hxx" #include "Debugger.hxx"
#include "TIA.hxx"
#include "TIADebug.hxx" #include "TIADebug.hxx"

3
src/debugger/TIADebug.hxx
View File

@ -22,13 +22,14 @@
class Debugger; class Debugger;
class TiaDebug; class TiaDebug;
class TIA;
#include "Array.hxx" #include "Array.hxx"
#include "DebuggerSystem.hxx" #include "DebuggerSystem.hxx"
#include "TIA.hxx"
// pointer types for TIADebug instance methods // pointer types for TIADebug instance methods
// (used by TiaMethodExpression) // (used by TiaMethodExpression)
class TIADebug;
typedef int (TIADebug::*TIADEBUG_INT_METHOD)(); typedef int (TIADebug::*TIADEBUG_INT_METHOD)();
// call the pointed-to method on the (global) debugger object. // call the pointed-to method on the (global) debugger object.

2
src/debugger/gui/ColorWidget.hxx
View File

@ -29,8 +29,6 @@ class GuiObject;
#include "Widget.hxx" #include "Widget.hxx"
#include "Command.hxx" #include "Command.hxx"
#include "bspf.hxx"
/** /**
Displays a color from the TIA palette. This class will eventually Displays a color from the TIA palette. This class will eventually
be expanded with a TIA palette table, to set the color visually. be expanded with a TIA palette table, to set the color visually.

5
src/debugger/gui/CpuWidget.hxx
View File

@ -25,14 +25,13 @@
class GuiObject; class GuiObject;
class ButtonWidget; class ButtonWidget;
class DataGridWidget;
class DataGridOpsWidget;
class EditTextWidget; class EditTextWidget;
class ToggleBitWidget; class ToggleBitWidget;
#include "Array.hxx"
#include "Widget.hxx" #include "Widget.hxx"
#include "Command.hxx" #include "Command.hxx"
#include "DataGridWidget.hxx"
class CpuWidget : public Widget, public CommandSender class CpuWidget : public Widget, public CommandSender
{ {

1
src/debugger/gui/DataGridOpsWidget.hxx
View File

@ -23,7 +23,6 @@
#ifndef DATA_GRID_OPS_WIDGET_HXX #ifndef DATA_GRID_OPS_WIDGET_HXX
#define DATA_GRID_OPS_WIDGET_HXX #define DATA_GRID_OPS_WIDGET_HXX
#include "GuiObject.hxx"
#include "Widget.hxx" #include "Widget.hxx"
#include "Command.hxx" #include "Command.hxx"

8
src/debugger/gui/DataGridWidget.cxx
View File

@ -26,7 +26,9 @@
#include "Debugger.hxx" #include "Debugger.hxx"
#include "FrameBuffer.hxx" #include "FrameBuffer.hxx"
#include "DataGridWidget.hxx" #include "DataGridWidget.hxx"
#include "DataGridOpsWidget.hxx"
#include "RamWidget.hxx" #include "RamWidget.hxx"
#include "ScrollBarWidget.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
DataGridWidget::DataGridWidget(GuiObject* boss, const GUI::Font& font, DataGridWidget::DataGridWidget(GuiObject* boss, const GUI::Font& font,
@ -593,6 +595,12 @@ GUI::Rect DataGridWidget::getEditRect() const
return r; return r;
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
int DataGridWidget::getWidth() const
{
return _w + (_scrollBar ? kScrollBarWidth : 0);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void DataGridWidget::startEditMode() void DataGridWidget::startEditMode()
{ {

9
src/debugger/gui/DataGridWidget.hxx
View File

@ -23,16 +23,15 @@
#ifndef DATA_GRID_WIDGET_HXX #ifndef DATA_GRID_WIDGET_HXX
#define DATA_GRID_WIDGET_HXX #define DATA_GRID_WIDGET_HXX
#include "GuiObject.hxx" class DataGridOpsWidget;
class ScrollBarWidget;
#include "Widget.hxx" #include "Widget.hxx"
#include "Command.hxx" #include "Command.hxx"
#include "Debugger.hxx" #include "Debugger.hxx"
#include "StringList.hxx"
#include "EditableWidget.hxx" #include "EditableWidget.hxx"
#include "Array.hxx" #include "Array.hxx"
#include "Rect.hxx" #include "Rect.hxx"
#include "DataGridOpsWidget.hxx"
#include "ScrollBarWidget.hxx"
// Some special commands // Some special commands
enum { enum {
@ -82,7 +81,7 @@ class DataGridWidget : public EditableWidget
virtual bool wantsFocus() { return true; } virtual bool wantsFocus() { return true; }
// Account for the extra width of embedded scrollbar // Account for the extra width of embedded scrollbar
virtual int getWidth() const { return _w + (_scrollBar ? kScrollBarWidth : 0); } virtual int getWidth() const;
void startEditMode(); void startEditMode();
void endEditMode(); void endEditMode();

2
src/debugger/gui/DebuggerDialog.hxx
View File

@ -28,6 +28,7 @@ class OSystem;
class DialogContainer; class DialogContainer;
class ButtonWidget; class ButtonWidget;
class CpuWidget; class CpuWidget;
class PromptWidget;
class RamWidget; class RamWidget;
class RomWidget; class RomWidget;
class TabWidget; class TabWidget;
@ -37,7 +38,6 @@ class TiaOutputWidget;
class TiaZoomWidget; class TiaZoomWidget;
#include "Dialog.hxx" #include "Dialog.hxx"
#include "PromptWidget.hxx"
class DebuggerDialog : public Dialog class DebuggerDialog : public Dialog
{ {

6
src/debugger/gui/PromptWidget.cxx
View File

@ -512,6 +512,12 @@ void PromptWidget::loadConfig()
} }
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
int PromptWidget::getWidth() const
{
return _w + kScrollBarWidth;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void PromptWidget::specialKeys(int keycode) void PromptWidget::specialKeys(int keycode)
{ {

6
src/debugger/gui/PromptWidget.hxx
View File

@ -25,10 +25,10 @@
#include <stdarg.h> #include <stdarg.h>
#include "GuiObject.hxx" class ScrollBarWidget;
#include "Widget.hxx" #include "Widget.hxx"
#include "Command.hxx" #include "Command.hxx"
#include "ScrollBarWidget.hxx"
#include "bspf.hxx" #include "bspf.hxx"
class PromptWidget : public Widget, public CommandSender class PromptWidget : public Widget, public CommandSender
@ -77,7 +77,7 @@ class PromptWidget : public Widget, public CommandSender
void handleCommand(CommandSender* sender, int cmd, int data, int id); void handleCommand(CommandSender* sender, int cmd, int data, int id);
// Account for the extra width of embedded scrollbar // Account for the extra width of embedded scrollbar
virtual int getWidth() const { return _w + kScrollBarWidth; } virtual int getWidth() const;
virtual bool wantsFocus() { return true; } virtual bool wantsFocus() { return true; }

6
src/debugger/gui/RamWidget.cxx
View File

@ -252,6 +252,12 @@ void RamWidget::handleCommand(CommandSender* sender, int cmd, int data, int id)
} }
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void RamWidget::setOpsWidget(DataGridOpsWidget* w)
{
myRamGrid->setOpsWidget(w);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void RamWidget::loadConfig() void RamWidget::loadConfig()
{ {

5
src/debugger/gui/RamWidget.hxx
View File

@ -26,14 +26,13 @@
class GuiObject; class GuiObject;
class InputTextDialog; class InputTextDialog;
class ButtonWidget; class ButtonWidget;
class DataGridOpsWidget;
class EditTextWidget; class EditTextWidget;
class StaticTextWidget; class StaticTextWidget;
#include "Array.hxx" #include "Array.hxx"
#include "Widget.hxx" #include "Widget.hxx"
#include "Command.hxx" #include "Command.hxx"
#include "DataGridWidget.hxx"
class RamWidget : public Widget, public CommandSender class RamWidget : public Widget, public CommandSender
{ {
@ -44,7 +43,7 @@ class RamWidget : public Widget, public CommandSender
void handleCommand(CommandSender* sender, int cmd, int data, int id); void handleCommand(CommandSender* sender, int cmd, int data, int id);
void loadConfig(); void loadConfig();
void setOpsWidget(DataGridOpsWidget* w) { myRamGrid->setOpsWidget(w); } void setOpsWidget(DataGridOpsWidget* w);
private: private:
void fillGrid(bool updateOld); void fillGrid(bool updateOld);

1
src/debugger/gui/RiotWidget.hxx
View File

@ -30,7 +30,6 @@ class PopUpWidget;
class ToggleBitWidget; class ToggleBitWidget;
#include "Array.hxx" #include "Array.hxx"
#include "Widget.hxx"
#include "Command.hxx" #include "Command.hxx"
class RiotWidget : public Widget, public CommandSender class RiotWidget : public Widget, public CommandSender

1
src/debugger/gui/RomListWidget.cxx
View File

@ -23,6 +23,7 @@
#include "bspf.hxx" #include "bspf.hxx"
#include "Debugger.hxx" #include "Debugger.hxx"
#include "ContextMenu.hxx" #include "ContextMenu.hxx"
#include "PackedBitArray.hxx"
#include "Widget.hxx" #include "Widget.hxx"
#include "ScrollBarWidget.hxx" #include "ScrollBarWidget.hxx"
#include "RomListWidget.hxx" #include "RomListWidget.hxx"

3
src/debugger/gui/RomListWidget.hxx
View File

@ -26,10 +26,9 @@
class ContextMenu; class ContextMenu;
class ScrollBarWidget; class ScrollBarWidget;
class PackedBitArray; class PackedBitArray;
class CheckListWidget;
#include "Array.hxx" #include "Array.hxx"
#include "StringList.hxx"
#include "CheckListWidget.hxx"
#include "CartDebug.hxx" #include "CartDebug.hxx"
#include "EditableWidget.hxx" #include "EditableWidget.hxx"

1
src/debugger/gui/TiaOutputWidget.cxx
View File

@ -31,6 +31,7 @@
#include "Debugger.hxx" #include "Debugger.hxx"
#include "DebuggerParser.hxx" #include "DebuggerParser.hxx"
#include "TIADebug.hxx" #include "TIADebug.hxx"
#include "TIA.hxx"
#include "TiaOutputWidget.hxx" #include "TiaOutputWidget.hxx"

1
src/debugger/gui/TiaZoomWidget.cxx
View File

@ -22,6 +22,7 @@
#include "OSystem.hxx" #include "OSystem.hxx"
#include "Console.hxx" #include "Console.hxx"
#include "TIA.hxx"
#include "FrameBuffer.hxx" #include "FrameBuffer.hxx"
#include "Widget.hxx" #include "Widget.hxx"
#include "GuiObject.hxx" #include "GuiObject.hxx"

1
src/debugger/gui/TogglePixelWidget.hxx
View File

@ -23,7 +23,6 @@
#ifndef TOGGLE_PIXEL_WIDGET_HXX #ifndef TOGGLE_PIXEL_WIDGET_HXX
#define TOGGLE_PIXEL_WIDGET_HXX #define TOGGLE_PIXEL_WIDGET_HXX
#include "FrameBuffer.hxx"
#include "ToggleWidget.hxx" #include "ToggleWidget.hxx"
/* TogglePixelWidget */ /* TogglePixelWidget */

1
src/debugger/gui/ToggleWidget.hxx
View File

@ -23,7 +23,6 @@
#ifndef TOGGLE_WIDGET_HXX #ifndef TOGGLE_WIDGET_HXX
#define TOGGLE_WIDGET_HXX #define TOGGLE_WIDGET_HXX
#include "GuiObject.hxx"
#include "Widget.hxx" #include "Widget.hxx"
#include "Command.hxx" #include "Command.hxx"
#include "Array.hxx" #include "Array.hxx"

1
src/emucore/Booster.hxx
View File

@ -20,7 +20,6 @@
#ifndef BOOSTERGRIP_HXX #ifndef BOOSTERGRIP_HXX
#define BOOSTERGRIP_HXX #define BOOSTERGRIP_HXX
#include "bspf.hxx"
#include "Control.hxx" #include "Control.hxx"
#include "Event.hxx" #include "Event.hxx"

1
src/emucore/CartAR.hxx
View File

@ -25,7 +25,6 @@ class System;
#include "bspf.hxx" #include "bspf.hxx"
#include "Cart.hxx" #include "Cart.hxx"
#include "Settings.hxx"
/** /**
This is the cartridge class for Arcadia (aka Starpath) Supercharger This is the cartridge class for Arcadia (aka Starpath) Supercharger

4
src/emucore/Console.cxx
View File

@ -25,8 +25,8 @@
#include "AtariVox.hxx" #include "AtariVox.hxx"
#include "Booster.hxx" #include "Booster.hxx"
#include "Cart.hxx" #include "Cart.hxx"
#include "Console.hxx"
#include "Control.hxx" #include "Control.hxx"
#include "Cart.hxx"
#include "Driving.hxx" #include "Driving.hxx"
#include "Event.hxx" #include "Event.hxx"
#include "EventHandler.hxx" #include "EventHandler.hxx"
@ -61,6 +61,8 @@
#include "CheatManager.hxx" #include "CheatManager.hxx"
#endif #endif
#include "Console.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Console::Console(OSystem* osystem, Cartridge* cart, const Properties& props) Console::Console(OSystem* osystem, Cartridge* cart, const Properties& props)
: myOSystem(osystem), : myOSystem(osystem),

9
src/emucore/Console.hxx
View File

@ -25,15 +25,14 @@ class Event;
class Switches; class Switches;
class System; class System;
class TIA; class TIA;
class M6532;
class Cartridge;
#include "bspf.hxx" #include "bspf.hxx"
#include "Control.hxx" #include "Control.hxx"
#include "Props.hxx" #include "Props.hxx"
#include "TIA.hxx" #include "TIATables.hxx"
#include "Cart.hxx"
#include "FrameBuffer.hxx" #include "FrameBuffer.hxx"
#include "M6532.hxx"
#include "AtariVox.hxx"
#include "Serializable.hxx" #include "Serializable.hxx"
/** /**
@ -87,7 +86,7 @@ class Console : public Serializable
@return The specified controller @return The specified controller
*/ */
Controller& controller(Controller::Jack jack) const inline Controller& controller(Controller::Jack jack) const
{ {
return (jack == Controller::Left) ? *myControllers[0] : *myControllers[1]; return (jack == Controller::Left) ? *myControllers[0] : *myControllers[1];
} }

1
src/emucore/EventHandler.cxx
View File

@ -45,6 +45,7 @@
#include "EventHandler.hxx" #include "EventHandler.hxx"
#ifdef CHEATCODE_SUPPORT #ifdef CHEATCODE_SUPPORT
#include "Cheat.hxx"
#include "CheatManager.hxx" #include "CheatManager.hxx"
#endif #endif
#ifdef DEBUGGER_SUPPORT #ifdef DEBUGGER_SUPPORT

5
src/emucore/EventHandler.hxx
View File

@ -26,14 +26,13 @@ class Console;
class OSystem; class OSystem;
class DialogContainer; class DialogContainer;
class EventMappingWidget; class EventMappingWidget;
class StringMap;
class StringList;
#include "Array.hxx" #include "Array.hxx"
#include "Event.hxx" #include "Event.hxx"
#include "Control.hxx"
#include "StringList.hxx"
#include "bspf.hxx" #include "bspf.hxx"
enum MouseButton { enum MouseButton {
EVENT_LBUTTONDOWN, EVENT_LBUTTONDOWN,
EVENT_LBUTTONUP, EVENT_LBUTTONUP,

3
src/emucore/FrameBuffer.hxx
View File

@ -26,6 +26,7 @@
class FBSurface; class FBSurface;
class OSystem; class OSystem;
class Console; class Console;
class Settings;
namespace GUI { namespace GUI {
class Font; class Font;
@ -33,8 +34,8 @@ namespace GUI {
} }
#include "EventHandler.hxx" #include "EventHandler.hxx"
#include "Settings.hxx"
#include "Rect.hxx" #include "Rect.hxx"
#include "StringList.hxx"
#include "bspf.hxx" #include "bspf.hxx"
// Different types of framebuffer derived objects // Different types of framebuffer derived objects

1
src/emucore/M6502.cxx
View File

@ -24,6 +24,7 @@
#include "Debugger.hxx" #include "Debugger.hxx"
#include "Expression.hxx" #include "Expression.hxx"
#include "CartDebug.hxx" #include "CartDebug.hxx"
#include "PackedBitArray.hxx"
// Flags for disassembly types // Flags for disassembly types
#define DISASM_SKIP CartDebug::SKIP #define DISASM_SKIP CartDebug::SKIP

2
src/emucore/OSystem.cxx
View File

@ -30,6 +30,7 @@
#include "bspf.hxx" #include "bspf.hxx"
#include "MediaFactory.hxx" #include "MediaFactory.hxx"
#include "Sound.hxx"
#ifdef DEBUGGER_SUPPORT #ifdef DEBUGGER_SUPPORT
#include "Debugger.hxx" #include "Debugger.hxx"
@ -51,6 +52,7 @@
#include "FSNode.hxx" #include "FSNode.hxx"
#include "unzip.h" #include "unzip.h"
#include "MD5.hxx" #include "MD5.hxx"
#include "Cart.hxx"
#include "Settings.hxx" #include "Settings.hxx"
#include "PropsSet.hxx" #include "PropsSet.hxx"
#include "EventHandler.hxx" #include "EventHandler.hxx"

1
src/emucore/OSystem.hxx
View File

@ -40,7 +40,6 @@ namespace GUI {
} }
#include "Array.hxx" #include "Array.hxx"
#include "EventHandler.hxx"
#include "FrameBuffer.hxx" #include "FrameBuffer.hxx"
#include "bspf.hxx" #include "bspf.hxx"

1
src/emucore/StateManager.cxx
View File

@ -22,6 +22,7 @@
#include "OSystem.hxx" #include "OSystem.hxx"
#include "Settings.hxx" #include "Settings.hxx"
#include "Console.hxx" #include "Console.hxx"
#include "Cart.hxx"
#include "Control.hxx" #include "Control.hxx"
#include "Switches.hxx" #include "Switches.hxx"
#include "System.hxx" #include "System.hxx"

2
src/emucore/TIA.hxx
View File

@ -22,9 +22,9 @@
class Console; class Console;
class Settings; class Settings;
class Sound;
#include "bspf.hxx" #include "bspf.hxx"
#include "Sound.hxx"
#include "Device.hxx" #include "Device.hxx"
#include "System.hxx" #include "System.hxx"
#include "TIATables.hxx" #include "TIATables.hxx"

2
src/gui/AudioDialog.hxx
View File

@ -30,8 +30,8 @@ class PopUpWidget;
class SliderWidget; class SliderWidget;
class StaticTextWidget; class StaticTextWidget;
class CheckboxWidget; class CheckboxWidget;
class OSystem;
#include "OSystem.hxx"
#include "bspf.hxx" #include "bspf.hxx"
class AudioDialog : public Dialog class AudioDialog : public Dialog

1
src/gui/ComboDialog.cxx
View File

@ -23,6 +23,7 @@
#include "Control.hxx" #include "Control.hxx"
#include "Dialog.hxx" #include "Dialog.hxx"
#include "DialogContainer.hxx"
#include "EventHandler.hxx" #include "EventHandler.hxx"
#include "OSystem.hxx" #include "OSystem.hxx"
#include "EditTextWidget.hxx" #include "EditTextWidget.hxx"

4
src/gui/ComboDialog.hxx
View File

@ -23,10 +23,10 @@
class PopUpWidget; class PopUpWidget;
class EditTextWidget; class EditTextWidget;
class StaticTextWidget; class StaticTextWidget;
class StringMap;
class OSystem;
#include "Dialog.hxx" #include "Dialog.hxx"
#include "DialogContainer.hxx"
#include "OSystem.hxx"
#include "bspf.hxx" #include "bspf.hxx"
class ComboDialog : public Dialog class ComboDialog : public Dialog

1
src/gui/CommandDialog.cxx
View File

@ -21,6 +21,7 @@
//============================================================================ //============================================================================
#include "Console.hxx" #include "Console.hxx"
#include "TIA.hxx"
#include "Switches.hxx" #include "Switches.hxx"
#include "DialogContainer.hxx" #include "DialogContainer.hxx"
#include "Dialog.hxx" #include "Dialog.hxx"

2
src/gui/CommandDialog.hxx
View File

@ -26,8 +26,8 @@
class Properties; class Properties;
class CommandSender; class CommandSender;
class DialogContainer; class DialogContainer;
class OSystem;
#include "OSystem.hxx"
#include "Dialog.hxx" #include "Dialog.hxx"
class CommandDialog : public Dialog class CommandDialog : public Dialog

2
src/gui/ContextMenu.hxx
View File

@ -24,8 +24,6 @@
#define CONTEXT_MENU_HXX #define CONTEXT_MENU_HXX
#include "bspf.hxx" #include "bspf.hxx"
#include "Array.hxx"
#include "Command.hxx" #include "Command.hxx"
#include "Dialog.hxx" #include "Dialog.hxx"

1
src/gui/FileSnapDialog.hxx
View File

@ -35,7 +35,6 @@ class StaticTextWidget;
#include "Dialog.hxx" #include "Dialog.hxx"
#include "Command.hxx" #include "Command.hxx"
#include "FSNode.hxx"
class FileSnapDialog : public Dialog, public CommandSender class FileSnapDialog : public Dialog, public CommandSender
{ {

2
src/gui/GameInfoDialog.hxx
View File

@ -31,11 +31,9 @@ class StaticTextWidget;
class TabWidget; class TabWidget;
class SliderWidget; class SliderWidget;
#include "Array.hxx"
#include "Dialog.hxx" #include "Dialog.hxx"
#include "Command.hxx" #include "Command.hxx"
#include "Props.hxx" #include "Props.hxx"
#include "StringList.hxx"
class GameInfoDialog : public Dialog, public CommandSender class GameInfoDialog : public Dialog, public CommandSender
{ {

2
src/gui/GlobalPropsDialog.hxx
View File

@ -27,8 +27,8 @@ class CommandSender;
class DialogContainer; class DialogContainer;
class CheckboxWidget; class CheckboxWidget;
class PopUpWidget; class PopUpWidget;
class OSystem;
#include "OSystem.hxx"
#include "Dialog.hxx" #include "Dialog.hxx"
#include "bspf.hxx" #include "bspf.hxx"

4
src/gui/HelpDialog.hxx
View File

@ -27,9 +27,9 @@ class DialogContainer;
class CommandSender; class CommandSender;
class ButtonWidget; class ButtonWidget;
class StaticTextWidget; class StaticTextWidget;
class OSystem;
#include "OSystem.hxx" #include "Dialog.hxx"
#include "Props.hxx"
#include "bspf.hxx" #include "bspf.hxx"
class HelpDialog : public Dialog class HelpDialog : public Dialog

4
src/gui/LauncherFilterDialog.hxx
View File

@ -27,11 +27,11 @@ class CommandSender;
class DialogContainer; class DialogContainer;
class CheckboxWidget; class CheckboxWidget;
class PopUpWidget; class PopUpWidget;
class OSystem;
class StringList;
#include "OSystem.hxx"
#include "Dialog.hxx" #include "Dialog.hxx"
#include "Settings.hxx" #include "Settings.hxx"
#include "StringList.hxx"
#include "bspf.hxx" #include "bspf.hxx"
class LauncherFilterDialog : public Dialog, public CommandSender class LauncherFilterDialog : public Dialog, public CommandSender

5
src/gui/ListWidget.hxx
View File

@ -23,14 +23,15 @@
#ifndef LIST_WIDGET_HXX #ifndef LIST_WIDGET_HXX
#define LIST_WIDGET_HXX #define LIST_WIDGET_HXX
#include "GuiObject.hxx" class GuiObject;
class StringList;
#include "Widget.hxx" #include "Widget.hxx"
#include "Command.hxx" #include "Command.hxx"
#include "EditableWidget.hxx" #include "EditableWidget.hxx"
#include "ScrollBarWidget.hxx" #include "ScrollBarWidget.hxx"
#include "Rect.hxx" #include "Rect.hxx"
class StringList;
// Some special commands // Some special commands
enum { enum {

2
src/gui/ProgressDialog.hxx
View File

@ -23,10 +23,10 @@
#ifndef PROGRESS_DIALOG_HXX #ifndef PROGRESS_DIALOG_HXX
#define PROGRESS_DIALOG_HXX #define PROGRESS_DIALOG_HXX
class GuiObject;
class StaticTextWidget; class StaticTextWidget;
class SliderWidget; class SliderWidget;
#include "GuiObject.hxx"
#include "bspf.hxx" #include "bspf.hxx"
class ProgressDialog : public Dialog class ProgressDialog : public Dialog

3
src/gui/ScrollBarWidget.hxx
View File

@ -23,7 +23,8 @@
#ifndef SCROLL_BAR_WIDGET_HXX #ifndef SCROLL_BAR_WIDGET_HXX
#define SCROLL_BAR_WIDGET_HXX #define SCROLL_BAR_WIDGET_HXX
#include "GuiObject.hxx" class GuiObject;
#include "Widget.hxx" #include "Widget.hxx"
#include "Command.hxx" #include "Command.hxx"
#include "bspf.hxx" #include "bspf.hxx"

2
src/gui/UIDialog.hxx
View File

@ -31,8 +31,8 @@ class PopUpWidget;
class SliderWidget; class SliderWidget;
class StaticTextWidget; class StaticTextWidget;
class TabWidget; class TabWidget;
class OSystem;
#include "OSystem.hxx"
#include "bspf.hxx" #include "bspf.hxx"
class UIDialog : public Dialog class UIDialog : public Dialog

1
src/gui/VideoDialog.cxx
View File

@ -31,6 +31,7 @@
#include "EditTextWidget.hxx" #include "EditTextWidget.hxx"
#include "PopUpWidget.hxx" #include "PopUpWidget.hxx"
#include "Console.hxx" #include "Console.hxx"
#include "TIA.hxx"
#include "Settings.hxx" #include "Settings.hxx"
#include "StringList.hxx" #include "StringList.hxx"
#include "Widget.hxx" #include "Widget.hxx"

2
src/gui/VideoDialog.hxx
View File

@ -31,8 +31,8 @@ class PopUpWidget;
class SliderWidget; class SliderWidget;
class StaticTextWidget; class StaticTextWidget;
class TabWidget; class TabWidget;
class OSystem;
#include "OSystem.hxx"
#include "Dialog.hxx" #include "Dialog.hxx"
#include "bspf.hxx" #include "bspf.hxx"

2
src/gui/Widget.hxx
View File

@ -25,7 +25,7 @@
#ifndef WIDGET_HXX #ifndef WIDGET_HXX
#define WIDGET_HXX #define WIDGET_HXX
#include <assert.h> #include <cassert>
#include "bspf.hxx" #include "bspf.hxx"

1
src/macosx/OSystemMACOSX.hxx
View File

@ -21,6 +21,7 @@
#define OSYSTEM_MACOSX_HXX #define OSYSTEM_MACOSX_HXX
#include "bspf.hxx" #include "bspf.hxx"
#include "OSystem.hxx"
/** /**

2
src/macosx/SettingsMACOSX.hxx
View File

@ -22,6 +22,8 @@
class OSystem; class OSystem;
#include "Settings.hxx"
/** /**
This class defines Macintosh OSX system specific settings. This class defines Macintosh OSX system specific settings.

2
src/yacc/YaccParser.hxx
View File

@ -23,7 +23,7 @@
#ifndef PARSER_HXX #ifndef PARSER_HXX
#define PARSER_HXX #define PARSER_HXX
#include "Expression.hxx" class Expression;
//#ifdef __cplusplus //#ifdef __cplusplus
//extern "C" { //extern "C" {