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

More header file reorg/optimization.

This commit is contained in:
Stephen Anthony 2017-11-17 13:30:17 -03:30
parent 2dde406bb9
commit 522018d636
75 changed files with 138 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cheat/CheatCodeDialog.cxx
View File

@ -22,6 +22,7 @@
#include "CheckListWidget.hxx"
#include "DialogContainer.hxx"
#include "Dialog.hxx"
#include "Font.hxx"
#include "InputTextDialog.hxx"
#include "OSystem.hxx"
#include "Props.hxx"

1
src/common/FBSurfaceSDL2.hxx
View File

@ -19,6 +19,7 @@
#define FBSURFACE_SDL2_HXX
#include "bspf.hxx"
#include "FBSurface.hxx"
#include "FrameBufferSDL2.hxx"
/**

1
src/common/PNGLibrary.cxx
View File

@ -19,6 +19,7 @@
#include "bspf.hxx"
#include "FrameBuffer.hxx"
#include "FBSurface.hxx"
#include "Props.hxx"
#include "PNGLibrary.hxx"

2
src/common/tv_filters/AtariNTSC.hxx
View File

@ -41,6 +41,8 @@
#define ATARI_NTSC_HXX
#include <cmath>
#include <thread>
#include "bspf.hxx"
class AtariNTSC

2
src/debugger/gui/AudioWidget.cxx
View File

@ -16,8 +16,8 @@
//============================================================================
#include "DataGridWidget.hxx"
#include "FrameBuffer.hxx"
#include "GuiObject.hxx"
#include "Font.hxx"
#include "OSystem.hxx"
#include "Debugger.hxx"
#include "TIADebug.hxx"

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

@ -21,6 +21,7 @@
#include "CartDebug.hxx"
#include "StringParser.hxx"
#include "Widget.hxx"
#include "Font.hxx"
#include "StringListWidget.hxx"
#include "CartDebugWidget.hxx"
#include "CartRamWidget.hxx"

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

@ -21,6 +21,7 @@
class GuiObject;
class ButtonWidget;
#include "Font.hxx"
#include "Widget.hxx"
#include "Console.hxx"
#include "Command.hxx"

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

@ -23,6 +23,7 @@
#include "CartDebug.hxx"
#include "CpuDebug.hxx"
#include "Widget.hxx"
#include "Font.hxx"
#include "DataGridWidget.hxx"
#include "EditTextWidget.hxx"
#include "ToggleBitWidget.hxx"

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

@ -15,6 +15,7 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#include "Font.hxx"
#include "DataGridOpsWidget.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

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

@ -18,8 +18,10 @@
#include "OSystem.hxx"
#include "Widget.hxx"
#include "Dialog.hxx"
#include "Font.hxx"
#include "Debugger.hxx"
#include "FrameBuffer.hxx"
#include "FBSurface.hxx"
#include "DataGridWidget.hxx"
#include "DataGridOpsWidget.hxx"
#include "RamWidget.hxx"

2
src/debugger/gui/DelayQueueWidget.cxx
View File

@ -22,6 +22,8 @@
#include "Debugger.hxx"
#include "CartDebug.hxx"
#include "TIADebug.hxx"
#include "FBSurface.hxx"
#include "Font.hxx"
#include "Base.hxx"
#include "TIA.hxx"

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

@ -16,7 +16,8 @@
//============================================================================
#include "ScrollBarWidget.hxx"
#include "FrameBuffer.hxx"
#include "FBSurface.hxx"
#include "Font.hxx"
#include "EventHandler.hxx"
#include "Version.hxx"
#include "Debugger.hxx"

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

@ -22,6 +22,7 @@
#include "OSystem.hxx"
#include "Debugger.hxx"
#include "CartDebug.hxx"
#include "Font.hxx"
#include "Widget.hxx"
#include "RamWidget.hxx"

2
src/debugger/gui/RomListSettings.cxx
View File

@ -18,6 +18,8 @@
#include "OSystem.hxx"
#include "Settings.hxx"
#include "FrameBuffer.hxx"
#include "FBSurface.hxx"
#include "Font.hxx"
#include "Dialog.hxx"
#include "DialogContainer.hxx"
#include "RomListWidget.hxx"

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

@ -20,6 +20,8 @@
#include "DiStella.hxx"
#include "PackedBitArray.hxx"
#include "Widget.hxx"
#include "FBSurface.hxx"
#include "Font.hxx"
#include "ScrollBarWidget.hxx"
#include "RomListSettings.hxx"
#include "RomListWidget.hxx"

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

@ -21,6 +21,7 @@
#include "DiStella.hxx"
#include "CpuDebug.hxx"
#include "GuiObject.hxx"
#include "Font.hxx"
#include "DataGridWidget.hxx"
#include "EditTextWidget.hxx"
#include "PopUpWidget.hxx"

2
src/debugger/gui/TiaInfoWidget.cxx
View File

@ -16,8 +16,8 @@
//============================================================================
#include "Base.hxx"
#include "Font.hxx"
#include "OSystem.hxx"
#include "FrameBuffer.hxx"
#include "Debugger.hxx"
#include "TIADebug.hxx"
#include "Widget.hxx"

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

@ -19,6 +19,7 @@
#include "OSystem.hxx"
#include "FrameBuffer.hxx"
#include "FBSurface.hxx"
#include "Widget.hxx"
#include "GuiObject.hxx"
#include "ContextMenu.hxx"

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

@ -19,6 +19,7 @@
#include "DataGridWidget.hxx"
#include "EditTextWidget.hxx"
#include "FrameBuffer.hxx"
#include "Font.hxx"
#include "GuiObject.hxx"
#include "OSystem.hxx"
#include "Debugger.hxx"

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

@ -19,6 +19,7 @@
#include "Console.hxx"
#include "TIA.hxx"
#include "FrameBuffer.hxx"
#include "FBSurface.hxx"
#include "Widget.hxx"
#include "GuiObject.hxx"
#include "ContextMenu.hxx"

3
src/debugger/gui/ToggleBitWidget.cxx
View File

@ -19,7 +19,8 @@
#include "Widget.hxx"
#include "Dialog.hxx"
#include "Debugger.hxx"
#include "FrameBuffer.hxx"
#include "FBSurface.hxx"
#include "Font.hxx"
#include "ToggleBitWidget.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

4
src/debugger/gui/TogglePixelWidget.cxx
View File

@ -17,9 +17,9 @@
#include "OSystem.hxx"
#include "Widget.hxx"
#include "Dialog.hxx"
#include "Font.hxx"
#include "Debugger.hxx"
#include "FrameBuffer.hxx"
#include "FBSurface.hxx"
#include "TogglePixelWidget.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

1
src/emucore/AtariVox.hxx
View File

@ -22,7 +22,6 @@ class SerialPort;
#include "Control.hxx"
#include "SaveKey.hxx"
#include "MT24LC256.hxx"
/**
Richard Hutchinson's AtariVox "controller": A speech synthesizer and

1
src/emucore/Console.cxx
View File

@ -47,6 +47,7 @@
#include "AtariMouse.hxx"
#include "TrakBall.hxx"
#include "FrameBuffer.hxx"
#include "TIASurface.hxx"
#include "OSystem.hxx"
#include "Menu.hxx"
#include "CommandMenu.hxx"

1
src/emucore/Driving.hxx
View File

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

1
src/emucore/EventHandler.cxx
View File

@ -26,6 +26,7 @@
#include "DialogContainer.hxx"
#include "Event.hxx"
#include "FrameBuffer.hxx"
#include "TIASurface.hxx"
#include "FSNode.hxx"
#include "Launcher.hxx"
#include "Menu.hxx"

1
src/emucore/EventJoyHandler.cxx
View File

@ -15,7 +15,6 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#include <sstream>
#include <map>
#include "OSystem.hxx"

2
src/emucore/FBSurface.cxx
View File

@ -15,6 +15,8 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#include "Font.hxx"
#include "Rect.hxx"
#include "FrameBuffer.hxx"
#include "FBSurface.hxx"

21
src/emucore/FBSurface.hxx
View File

@ -21,9 +21,13 @@
class FrameBuffer;
class TIASurface;
namespace GUI {
class Font;
struct Rect;
}
#include "FrameBufferConstants.hxx"
#include "bspf.hxx"
#include "Font.hxx"
#include "Rect.hxx"
/**
This class is basically a thin wrapper around the video toolkit 'surface'
@ -35,19 +39,6 @@ class TIASurface;
@author Stephen Anthony
*/
// Text alignment modes for drawString()
enum TextAlignment {
kTextAlignLeft,
kTextAlignCenter,
kTextAlignRight
};
// Line types for drawing rectangular frames
enum FrameStyle {
kSolidLine,
kDashLine
};
class FBSurface
{
public:

5
src/emucore/FrameBuffer.cxx
View File

@ -51,6 +51,11 @@ FrameBuffer::FrameBuffer(OSystem& osystem)
myMsg.enabled = myStatsMsg.enabled = false;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
FrameBuffer::~FrameBuffer()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool FrameBuffer::initialize()
{

6
src/emucore/FrameBuffer.hxx
View File

@ -23,6 +23,8 @@
class OSystem;
class Console;
class Settings;
class FBSurface;
class TIASurface;
namespace GUI {
class Font;
@ -31,8 +33,6 @@ namespace GUI {
#include "EventHandler.hxx"
#include "Rect.hxx"
#include "Variant.hxx"
#include "FBSurface.hxx"
#include "TIASurface.hxx"
#include "TIAConstants.hxx"
#include "FrameBufferConstants.hxx"
#include "bspf.hxx"
@ -92,7 +92,7 @@ class FrameBuffer
Creates a new Frame Buffer
*/
FrameBuffer(OSystem& osystem);
virtual ~FrameBuffer() = default;
virtual ~FrameBuffer();
/**
Initialize the framebuffer object (set up the underlying hardware)

13
src/emucore/FrameBufferConstants.hxx
View File

@ -69,4 +69,17 @@ enum {
kNumColors
};
// Text alignment modes for drawString()
enum TextAlignment {
kTextAlignLeft,
kTextAlignCenter,
kTextAlignRight
};
// Line types for drawing rectangular frames
enum FrameStyle {
kSolidLine,
kDashLine
};
#endif // FRAMEBUFFER_CONSTANTS_HXX

1
src/emucore/OSystem.cxx
View File

@ -40,6 +40,7 @@
#include "Cart.hxx"
#include "CartDetector.hxx"
#include "FrameBuffer.hxx"
#include "TIASurface.hxx"
#include "Settings.hxx"
#include "PropsSet.hxx"
#include "EventHandler.hxx"

4
src/emucore/TIASurface.cxx
View File

@ -16,15 +16,13 @@
//============================================================================
#include <cmath>
#include <algorithm>
#include <math.h>
#include "FrameBuffer.hxx"
#include "FBSurface.hxx"
#include "Settings.hxx"
#include "OSystem.hxx"
#include "Console.hxx"
#include "TIA.hxx"
#include "TIASurface.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

2
src/gui/AboutDialog.cxx
View File

@ -19,7 +19,7 @@
#include "OSystem.hxx"
#include "Version.hxx"
#include "Widget.hxx"
#include "Font.hxx"
#include "AboutDialog.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

1
src/gui/AboutDialog.hxx
View File

@ -24,6 +24,7 @@ class CommandSender;
class ButtonWidget;
class StaticTextWidget;
#include "Dialog.hxx"
class AboutDialog : public Dialog
{

1
src/gui/AudioDialog.cxx
View File

@ -22,6 +22,7 @@
#include "Console.hxx"
#include "Control.hxx"
#include "Dialog.hxx"
#include "Font.hxx"
#include "Menu.hxx"
#include "OSystem.hxx"
#include "PopUpWidget.hxx"

5
src/gui/BrowserDialog.cxx
View File

@ -16,16 +16,14 @@
//============================================================================
#include "bspf.hxx"
#include "Dialog.hxx"
#include "DialogContainer.hxx"
#include "FSNode.hxx"
#include "GuiObject.hxx"
#include "OSystem.hxx"
#include "EditTextWidget.hxx"
#include "FileListWidget.hxx"
#include "Widget.hxx"
#include "Font.hxx"
#include "BrowserDialog.hxx"
/* We want to use this as a general directory selector at some point... possible uses
@ -33,7 +31,6 @@
* - to select the place where save games are stored
* - others???
*/
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
BrowserDialog::BrowserDialog(GuiObject* boss, const GUI::Font& font,
int max_w, int max_h)

3
src/gui/CheckListWidget.cxx
View File

@ -15,8 +15,9 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#include "Dialog.hxx"
#include "FBSurface.hxx"
#include "CheckListWidget.hxx"
#include "Widget.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CheckListWidget::CheckListWidget(GuiObject* boss, const GUI::Font& font,

5
src/gui/ColorWidget.cxx
View File

@ -16,12 +16,11 @@
//============================================================================
#include "bspf.hxx"
#include "Command.hxx"
#include "FrameBuffer.hxx"
#include "Dialog.hxx"
#include "FBSurface.hxx"
#include "GuiObject.hxx"
#include "OSystem.hxx"
#include "ColorWidget.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

6
src/gui/ComboDialog.cxx
View File

@ -15,19 +15,15 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#include <sstream>
#include "bspf.hxx"
#include "Control.hxx"
#include "Dialog.hxx"
#include "DialogContainer.hxx"
#include "EventHandler.hxx"
#include "OSystem.hxx"
#include "EditTextWidget.hxx"
#include "PopUpWidget.hxx"
#include "Widget.hxx"
#include "Font.hxx"
#include "ComboDialog.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

2
src/gui/CommandDialog.cxx
View File

@ -18,8 +18,8 @@
#include "Console.hxx"
#include "TIA.hxx"
#include "Switches.hxx"
#include "DialogContainer.hxx"
#include "Dialog.hxx"
#include "Font.hxx"
#include "EventHandler.hxx"
#include "OSystem.hxx"
#include "Widget.hxx"

3
src/gui/ConfigPathDialog.cxx
View File

@ -16,14 +16,13 @@
//============================================================================
#include "bspf.hxx"
#include "BrowserDialog.hxx"
#include "EditTextWidget.hxx"
#include "FSNode.hxx"
#include "Font.hxx"
#include "LauncherDialog.hxx"
#include "PopUpWidget.hxx"
#include "Settings.hxx"
#include "ConfigPathDialog.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

2
src/gui/ContextMenu.cxx
View File

@ -17,6 +17,8 @@
#include "OSystem.hxx"
#include "FrameBuffer.hxx"
#include "FBSurface.hxx"
#include "Font.hxx"
#include "Dialog.hxx"
#include "DialogContainer.hxx"
#include "ScrollBarWidget.hxx"

2
src/gui/Dialog.cxx
View File

@ -20,6 +20,8 @@
#include "OSystem.hxx"
#include "FrameBuffer.hxx"
#include "FBSurface.hxx"
#include "Font.hxx"
#include "Menu.hxx"
#include "Dialog.hxx"
#include "Widget.hxx"

1
src/gui/DialogContainer.cxx
View File

@ -20,6 +20,7 @@
#include "Stack.hxx"
#include "EventHandler.hxx"
#include "FrameBuffer.hxx"
#include "FBSurface.hxx"
#include "Joystick.hxx"
#include "bspf.hxx"
#include "DialogContainer.hxx"

6
src/gui/EditTextWidget.cxx
View File

@ -15,14 +15,12 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#include <sstream>
#include "OSystem.hxx"
#include "FrameBuffer.hxx"
#include "FBSurface.hxx"
#include "Dialog.hxx"
#include "Font.hxx"
#include "EditTextWidget.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
EditTextWidget::EditTextWidget(GuiObject* boss, const GUI::Font& font,
int x, int y, int w, int h, const string& text)

2
src/gui/EditableWidget.cxx
View File

@ -16,6 +16,8 @@
//============================================================================
#include "Dialog.hxx"
#include "FBSurface.hxx"
#include "Font.hxx"
#include "EditableWidget.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

1
src/gui/EventMappingWidget.cxx
View File

@ -25,6 +25,7 @@
#include "EditTextWidget.hxx"
#include "StringListWidget.hxx"
#include "Widget.hxx"
#include "Font.hxx"
#include "ComboDialog.hxx"
#include "Variant.hxx"
#include "EventMappingWidget.hxx"

1
src/gui/GameInfoDialog.cxx
View File

@ -29,6 +29,7 @@
#include "TabWidget.hxx"
#include "TIAConstants.hxx"
#include "Widget.hxx"
#include "Font.hxx"
#include "GameInfoDialog.hxx"

4
src/gui/GlobalPropsDialog.cxx
View File

@ -16,16 +16,16 @@
//============================================================================
#include "bspf.hxx"
#include "BSType.hxx"
#include "Control.hxx"
#include "Dialog.hxx"
#include "OSystem.hxx"
#include "FrameBuffer.hxx"
#include "PopUpWidget.hxx"
#include "Settings.hxx"
#include "Widget.hxx"
#include "Font.hxx"
#include "LauncherDialog.hxx"
#include "GlobalPropsDialog.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

4
src/gui/HelpDialog.cxx
View File

@ -16,11 +16,9 @@
//============================================================================
#include "bspf.hxx"
#include "Dialog.hxx"
#include "OSystem.hxx"
#include "Widget.hxx"
#include "Font.hxx"
#include "HelpDialog.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

4
src/gui/InputDialog.cxx
View File

@ -16,7 +16,6 @@
//============================================================================
#include "bspf.hxx"
#include "OSystem.hxx"
#include "Console.hxx"
#include "Joystick.hxx"
@ -30,10 +29,9 @@
#include "PopUpWidget.hxx"
#include "TabWidget.hxx"
#include "Widget.hxx"
#include "Font.hxx"
#include "InputDialog.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
InputDialog::InputDialog(OSystem& osystem, DialogContainer& parent,
const GUI::Font& font, int max_w, int max_h)

5
src/gui/InputTextDialog.cxx
View File

@ -16,14 +16,15 @@
//============================================================================
#include "bspf.hxx"
#include "Dialog.hxx"
#include "DialogContainer.hxx"
#include "EditTextWidget.hxx"
#include "GuiObject.hxx"
#include "OSystem.hxx"
#include "FrameBuffer.hxx"
#include "FBSurface.hxx"
#include "Font.hxx"
#include "Widget.hxx"
#include "InputTextDialog.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

2
src/gui/JoystickDialog.cxx
View File

@ -17,10 +17,10 @@
#include "OSystem.hxx"
#include "Widget.hxx"
#include "Font.hxx"
#include "EditTextWidget.hxx"
#include "StringListWidget.hxx"
#include "Variant.hxx"
#include "JoystickDialog.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

7
src/gui/LauncherDialog.cxx
View File

@ -15,10 +15,7 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#include <sstream>
#include "bspf.hxx"
#include "BrowserDialog.hxx"
#include "ContextMenu.hxx"
#include "DialogContainer.hxx"
@ -32,16 +29,16 @@
#include "LauncherFilterDialog.hxx"
#include "MessageBox.hxx"
#include "OSystem.hxx"
#include "FrameBuffer.hxx"
#include "Props.hxx"
#include "PropsSet.hxx"
#include "RomInfoWidget.hxx"
#include "Settings.hxx"
#include "StringListWidget.hxx"
#include "Widget.hxx"
#include "Font.hxx"
#include "LauncherDialog.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
LauncherDialog::LauncherDialog(OSystem& osystem, DialogContainer& parent,
int x, int y, int w, int h)

3
src/gui/LauncherDialog.hxx
View File

@ -18,8 +18,6 @@
#ifndef LAUNCHER_DIALOG_HXX
#define LAUNCHER_DIALOG_HXX
#include "bspf.hxx"
class ButtonWidget;
class CommandSender;
class ContextMenu;
@ -36,6 +34,7 @@ class RomInfoWidget;
class StaticTextWidget;
class StringListWidget;
#include "bspf.hxx"
#include "Dialog.hxx"
#include "FSNode.hxx"
#include "Stack.hxx"

7
src/gui/LauncherFilterDialog.cxx
View File

@ -15,19 +15,14 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#include <algorithm>
#include <sstream>
#include "bspf.hxx"
#include "Control.hxx"
#include "Dialog.hxx"
#include "OSystem.hxx"
#include "PopUpWidget.hxx"
#include "Settings.hxx"
#include "Widget.hxx"
#include "Font.hxx"
#include "LauncherDialog.hxx"
#include "LauncherFilterDialog.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

5
src/gui/LoggerDialog.cxx
View File

@ -16,18 +16,17 @@
//============================================================================
#include "bspf.hxx"
#include "Dialog.hxx"
#include "DialogContainer.hxx"
#include "FSNode.hxx"
#include "GuiObject.hxx"
#include "OSystem.hxx"
#include "FrameBuffer.hxx"
#include "Settings.hxx"
#include "PopUpWidget.hxx"
#include "StringListWidget.hxx"
#include "StringParser.hxx"
#include "Widget.hxx"
#include "Font.hxx"
#include "LoggerDialog.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

2
src/gui/MessageBox.cxx
View File

@ -19,8 +19,8 @@
#include "OSystem.hxx"
#include "Version.hxx"
#include "Widget.hxx"
#include "Font.hxx"
#include "StringParser.hxx"
#include "MessageBox.hxx"
namespace GUI {

6
src/gui/OptionsDialog.cxx
View File

@ -19,6 +19,7 @@
#include "Dialog.hxx"
#include "DialogContainer.hxx"
#include "Widget.hxx"
#include "Font.hxx"
#include "Control.hxx"
#include "VideoDialog.hxx"
#include "AudioDialog.hxx"
@ -149,6 +150,11 @@ OptionsDialog::OptionsDialog(OSystem& osystem, DialogContainer& parent,
}
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
OptionsDialog::~OptionsDialog()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void OptionsDialog::loadConfig()
{

2
src/gui/OptionsDialog.hxx
View File

@ -47,7 +47,7 @@ class OptionsDialog : public Dialog
public:
OptionsDialog(OSystem& osystem, DialogContainer& parent, GuiObject* boss,
int max_w, int max_h, bool global);
virtual ~OptionsDialog() = default;
virtual ~OptionsDialog();
private:
void loadConfig() override;

4
src/gui/PopUpWidget.cxx
View File

@ -16,11 +16,11 @@
//============================================================================
#include "bspf.hxx"
#include "FrameBuffer.hxx"
#include "FBSurface.hxx"
#include "Font.hxx"
#include "ContextMenu.hxx"
#include "DialogContainer.hxx"
#include "PopUpWidget.hxx"
// Little up/down arrow

5
src/gui/ProgressDialog.cxx
View File

@ -15,14 +15,15 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#include "bspf.hxx"
#include "OSystem.hxx"
#include "FrameBuffer.hxx"
#include "Widget.hxx"
#include "Dialog.hxx"
#include "Font.hxx"
#include "DialogContainer.hxx"
#include "ProgressDialog.hxx"
#include "bspf.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ProgressDialog::ProgressDialog(GuiObject* boss, const GUI::Font& font,
const string& message)

2
src/gui/RomAuditDialog.cxx
View File

@ -16,7 +16,6 @@
//============================================================================
#include "bspf.hxx"
#include "Launcher.hxx"
#include "LauncherFilterDialog.hxx"
#include "BrowserDialog.hxx"
@ -24,6 +23,7 @@
#include "EditTextWidget.hxx"
#include "ProgressDialog.hxx"
#include "FSNode.hxx"
#include "Font.hxx"
#include "MessageBox.hxx"
#include "MD5.hxx"
#include "Props.hxx"

3
src/gui/RomInfoWidget.cxx
View File

@ -16,6 +16,9 @@
//============================================================================
#include "FrameBuffer.hxx"
#include "Dialog.hxx"
#include "FBSurface.hxx"
#include "Font.hxx"
#include "OSystem.hxx"
#include "Settings.hxx"
#include "Props.hxx"

2
src/gui/ScrollBarWidget.cxx
View File

@ -17,7 +17,7 @@
#include "OSystem.hxx"
#include "Dialog.hxx"
#include "FrameBuffer.hxx"
#include "FBSurface.hxx"
#include "ScrollBarWidget.hxx"
#include "bspf.hxx"

3
src/gui/SnapshotDialog.cxx
View File

@ -16,14 +16,13 @@
//============================================================================
#include "bspf.hxx"
#include "BrowserDialog.hxx"
#include "EditTextWidget.hxx"
#include "FSNode.hxx"
#include "Font.hxx"
#include "LauncherDialog.hxx"
#include "PopUpWidget.hxx"
#include "Settings.hxx"
#include "SnapshotDialog.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

2
src/gui/StringListWidget.cxx
View File

@ -16,6 +16,8 @@
//============================================================================
#include "bspf.hxx"
#include "Dialog.hxx"
#include "FBSurface.hxx"
#include "Settings.hxx"
#include "ScrollBarWidget.hxx"
#include "StringListWidget.hxx"

5
src/gui/TabWidget.cxx
View File

@ -16,13 +16,12 @@
//============================================================================
#include "bspf.hxx"
#include "Dialog.hxx"
#include "FrameBuffer.hxx"
#include "FBSurface.hxx"
#include "Font.hxx"
#include "GuiObject.hxx"
#include "OSystem.hxx"
#include "Widget.hxx"
#include "TabWidget.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

10
src/gui/UIDialog.cxx
View File

@ -15,19 +15,21 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#include <sstream>
#include "bspf.hxx"
#include "Dialog.hxx"
#include "OSystem.hxx"
#include "FrameBuffer.hxx"
#include "FBSurface.hxx"
#include "ListWidget.hxx"
#include "PopUpWidget.hxx"
#include "ScrollBarWidget.hxx"
#include "Settings.hxx"
#include "TabWidget.hxx"
#include "Widget.hxx"
#include "Font.hxx"
#ifdef DEBUGGER_SUPPORT
#include "DebuggerDialog.hxx"
#endif
#include "UIDialog.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

6
src/gui/VideoDialog.cxx
View File

@ -15,10 +15,7 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#include <sstream>
#include "bspf.hxx"
#include "Control.hxx"
#include "Dialog.hxx"
#include "Menu.hxx"
@ -30,9 +27,10 @@
#include "TIA.hxx"
#include "Settings.hxx"
#include "Widget.hxx"
#include "Font.hxx"
#include "TabWidget.hxx"
#include "NTSCFilter.hxx"
#include "TIASurface.hxx"
#include "VideoDialog.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

1
src/gui/VideoDialog.hxx
View File

@ -29,6 +29,7 @@ class TabWidget;
class OSystem;
#include "Dialog.hxx"
#include "NTSCFilter.hxx"
#include "bspf.hxx"
class VideoDialog : public Dialog

5
src/gui/Widget.cxx
View File

@ -19,13 +19,10 @@
//============================================================================
#include "bspf.hxx"
#include "Command.hxx"
#include "DialogContainer.hxx"
#include "Dialog.hxx"
#include "EditableWidget.hxx"
#include "Font.hxx"
#include "FrameBuffer.hxx"
#include "FBSurface.hxx"
#include "GuiObject.hxx"
#include "OSystem.hxx"

14
src/gui/Widget.hxx
View File

@ -18,22 +18,20 @@
// Copyright (C) 2002-2004 The ScummVM project
//============================================================================
#include "Dialog.hxx"
#ifndef WIDGET_HXX
#define WIDGET_HXX
class Dialog;
namespace GUI {
class Font;
}
#include <cassert>
#include "bspf.hxx"
#include "Event.hxx"
#include "Font.hxx"
#include "FrameBuffer.hxx"
#include "GuiObject.hxx"
#include "OSystem.hxx"
#include "Rect.hxx"
#include "StellaKeys.hxx"
enum {
WIDGET_ENABLED = 1 << 0,