[openMSX-commits] SF.net SVN: openmsx: [5733] openmsx/trunk/src

[<m97...@us...>]

Revision: 5733
          http://svn.sourceforge.net/openmsx/?rev=5733&view=rev
Author:   m9710797
Date:     2006-10-02 06:16:39 -0700 (Mon, 02 Oct 2006)

Log Message:
-----------
made a lot of classes noncopyable / small cleanups

Modified Paths:
--------------
    openmsx/trunk/src/Autofire.hh
    openmsx/trunk/src/CartridgeSlotManager.hh
    openmsx/trunk/src/CommandLineParser.hh
    openmsx/trunk/src/Connector.hh
    openmsx/trunk/src/EmptyPatch.hh
    openmsx/trunk/src/FirmwareSwitch.hh
    openmsx/trunk/src/GlobalSettings.hh
    openmsx/trunk/src/I8255.hh
    openmsx/trunk/src/IPSPatch.hh
    openmsx/trunk/src/MSXMotherBoard.hh
    openmsx/trunk/src/Pluggable.hh
    openmsx/trunk/src/PluggingController.hh
    openmsx/trunk/src/RP5C01.hh
    openmsx/trunk/src/Reactor.hh
    openmsx/trunk/src/RenShaTurbo.hh
    openmsx/trunk/src/ThrottleManager.hh
    openmsx/trunk/src/cassette/CasImage.hh
    openmsx/trunk/src/commands/CommandController.hh
    openmsx/trunk/src/commands/Completer.hh
    openmsx/trunk/src/commands/Interpreter.hh
    openmsx/trunk/src/config/HardwareConfig.hh
    openmsx/trunk/src/console/CommandConsole.hh
    openmsx/trunk/src/console/GLFont.hh
    openmsx/trunk/src/console/OSDConsoleRenderer.hh
    openmsx/trunk/src/console/SDLConsole.hh
    openmsx/trunk/src/cpu/BreakPointBase.hh
    openmsx/trunk/src/cpu/CPU.hh
    openmsx/trunk/src/cpu/IRQHelper.hh
    openmsx/trunk/src/debugger/Debugger.hh
    openmsx/trunk/src/events/CliComm.hh
    openmsx/trunk/src/events/HotKey.hh
    openmsx/trunk/src/events/InputEventGenerator.hh
    openmsx/trunk/src/events/Keys.hh
    openmsx/trunk/src/fdc/BootBlocks.hh
    openmsx/trunk/src/fdc/DiskChanger.hh
    openmsx/trunk/src/fdc/DriveMultiplexer.hh
    openmsx/trunk/src/fdc/TC8566AF.hh
    openmsx/trunk/src/file/CompressedFileAdapter.hh
    openmsx/trunk/src/file/File.hh
    openmsx/trunk/src/file/FileBase.hh
    openmsx/trunk/src/file/FileException.hh
    openmsx/trunk/src/file/FilePool.hh
    openmsx/trunk/src/file/ReadDir.hh
    openmsx/trunk/src/ide/AbstractIDEDevice.hh
    openmsx/trunk/src/ide/IDECDROM.hh
    openmsx/trunk/src/ide/IDEHD.hh
    openmsx/trunk/src/input/EventTranslator.hh
    openmsx/trunk/src/input/MSXEventDistributor.hh
    openmsx/trunk/src/input/MSXEventRecorder.hh
    openmsx/trunk/src/input/MSXEventRecorderReplayerCLI.hh
    openmsx/trunk/src/memory/CheckedRam.hh
    openmsx/trunk/src/memory/PanasonicMemory.hh
    openmsx/trunk/src/memory/Ram.hh
    openmsx/trunk/src/memory/Rom.hh
    openmsx/trunk/src/memory/RomDatabase.hh
    openmsx/trunk/src/memory/SRAM.hh
    openmsx/trunk/src/serial/I8254.hh
    openmsx/trunk/src/serial/MidiOutLogger.hh
    openmsx/trunk/src/settings/Setting.hh
    openmsx/trunk/src/sound/KeyClick.hh
    openmsx/trunk/src/sound/WavAudioInput.hh
    openmsx/trunk/src/thread/Thread.hh
    openmsx/trunk/src/video/BitmapConverter.hh
    openmsx/trunk/src/video/Display.hh
    openmsx/trunk/src/video/FBPostProcessor.hh
    openmsx/trunk/src/video/FrameSource.hh
    openmsx/trunk/src/video/GLHQLiteScaler.hh
    openmsx/trunk/src/video/GLHQScaler.hh
    openmsx/trunk/src/video/GLImage.hh
    openmsx/trunk/src/video/GLPostProcessor.hh
    openmsx/trunk/src/video/GLRasterizer.hh
    openmsx/trunk/src/video/GLScaleNxScaler.hh
    openmsx/trunk/src/video/GLSimpleScaler.hh
    openmsx/trunk/src/video/GLSnow.hh
    openmsx/trunk/src/video/GLTVScaler.hh
    openmsx/trunk/src/video/IconLayer.hh
    openmsx/trunk/src/video/PixelRenderer.hh
    openmsx/trunk/src/video/PostProcessor.hh
    openmsx/trunk/src/video/Rasterizer.hh
    openmsx/trunk/src/video/RawFrame.hh
    openmsx/trunk/src/video/RenderSettings.hh
    openmsx/trunk/src/video/RendererFactory.hh
    openmsx/trunk/src/video/SDLRasterizer.hh
    openmsx/trunk/src/video/ScalerFactory.hh
    openmsx/trunk/src/video/Simple3xScaler.hh
    openmsx/trunk/src/video/VisibleSurface.hh
    openmsx/trunk/src/video/v9990/V9990SDLRasterizer.hh
    openmsx/trunk/src/video/v9990/V9990VRAM.hh

Modified: openmsx/trunk/src/Autofire.hh
===================================================================
--- openmsx/trunk/src/Autofire.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/Autofire.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -6,6 +6,7 @@
 #include "Observer.hh"
 #include "DynamicClock.hh"
 #include "openmsx.hh"
+#include "noncopyable.hh"
 #include <string>
 #include <memory>
 
@@ -23,7 +24,7 @@
  * There can be multiple autofire circuits. For example, one used
  * by the Ren-Sha Turbo and another one built into a joystick.
  */
-class Autofire : private Observer<Setting>
+class Autofire : private Observer<Setting>, private noncopyable
 {
 public:
 	Autofire(CommandController& commandController,

Modified: openmsx/trunk/src/CartridgeSlotManager.hh
===================================================================
--- openmsx/trunk/src/CartridgeSlotManager.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/CartridgeSlotManager.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -3,6 +3,7 @@
 #ifndef CARTRIDGESLOTMANAGER_HH
 #define CARTRIDGESLOTMANAGER_HH
 
+#include "noncopyable.hh"
 #include <string>
 #include <memory>
 
@@ -13,7 +14,7 @@
 class CartCmd;
 class HardwareConfig;
 
-class CartridgeSlotManager
+class CartridgeSlotManager : private noncopyable
 {
 public:
 	explicit CartridgeSlotManager(MSXMotherBoard& motherBoard);

Modified: openmsx/trunk/src/CommandLineParser.hh
===================================================================
--- openmsx/trunk/src/CommandLineParser.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/CommandLineParser.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -5,6 +5,7 @@
 
 #include "StringOp.hh"
 #include "openmsx.hh"
+#include "noncopyable.hh"
 #include <string>
 #include <vector>
 #include <list>
@@ -48,7 +49,7 @@
 	virtual const std::string& fileTypeHelp() const = 0;
 };
 
-class CommandLineParser
+class CommandLineParser : private noncopyable
 {
 public:
 	enum ParseStatus { UNPARSED, RUN, CONTROL, TEST, EXIT };

Modified: openmsx/trunk/src/Connector.hh
===================================================================
--- openmsx/trunk/src/Connector.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/Connector.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -3,6 +3,7 @@
 #ifndef CONNECTOR
 #define CONNECTOR
 
+#include "noncopyable.hh"
 #include <string>
 #include <memory>
 
@@ -17,7 +18,7 @@
  * When there is not an actual Pluggable plugged in, a dummy Pluggable
  * is used.
  */
-class Connector
+class Connector : private noncopyable
 {
 public:
 	/**

Modified: openmsx/trunk/src/EmptyPatch.hh
===================================================================
--- openmsx/trunk/src/EmptyPatch.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/EmptyPatch.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,10 +4,11 @@
 #define EMPTYPATCH_HH
 
 #include "PatchInterface.hh"
+#include "noncopyable.hh"
 
 namespace openmsx {
 
-class EmptyPatch : public PatchInterface
+class EmptyPatch : public PatchInterface, private noncopyable
 {
 public:
 	EmptyPatch(const byte* block, unsigned size);

Modified: openmsx/trunk/src/FirmwareSwitch.hh
===================================================================
--- openmsx/trunk/src/FirmwareSwitch.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/FirmwareSwitch.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -3,6 +3,7 @@
 #ifndef FRONTSWITCH_HH
 #define FRONTSWITCH_HH
 
+#include "noncopyable.hh"
 #include <memory>
 
 namespace openmsx {
@@ -12,7 +13,7 @@
 class XMLElement;
 class CliComm;
 
-class FirmwareSwitch
+class FirmwareSwitch : private noncopyable
 {
 public:
 	FirmwareSwitch(CommandController& commandController, 

Modified: openmsx/trunk/src/GlobalSettings.hh
===================================================================
--- openmsx/trunk/src/GlobalSettings.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/GlobalSettings.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define GLOBALSETTINGS_HH
 
 #include "Observer.hh"
+#include "noncopyable.hh"
 #include <memory>
 
 namespace openmsx {
@@ -21,7 +22,7 @@
  * (including some singletons). This class was introduced to solve
  * lifetime management issues.
  */
-class GlobalSettings : private Observer<Setting>
+class GlobalSettings : private Observer<Setting>, private noncopyable
 {
 public:
 	explicit GlobalSettings(CommandController& commandController);

Modified: openmsx/trunk/src/I8255.hh
===================================================================
--- openmsx/trunk/src/I8255.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/I8255.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -10,6 +10,7 @@
 #define I8255_HH
 
 #include "openmsx.hh"
+#include "noncopyable.hh"
 
 namespace openmsx {
 
@@ -33,7 +34,7 @@
 	virtual void writeC1(nibble value, const EmuTime& time) = 0;
 };
 
-class I8255
+class I8255 : private noncopyable
 {
 public:
 	I8255(I8255Interface& interf, const EmuTime& time);

Modified: openmsx/trunk/src/IPSPatch.hh
===================================================================
--- openmsx/trunk/src/IPSPatch.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/IPSPatch.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define IPSPATCH_HH
 
 #include "PatchInterface.hh"
+#include "noncopyable.hh"
 #include <string>
 #include <vector>
 #include <map>
@@ -11,7 +12,7 @@
 
 namespace openmsx {
 
-class IPSPatch : public PatchInterface
+class IPSPatch : public PatchInterface, private noncopyable
 {
 public:
 	typedef std::map<unsigned, std::vector<byte> > PatchMap;

Modified: openmsx/trunk/src/MSXMotherBoard.hh
===================================================================
--- openmsx/trunk/src/MSXMotherBoard.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/MSXMotherBoard.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define MSXMOTHERBOARD_HH
 
 #include "Observer.hh"
+#include "noncopyable.hh"
 #include <memory>
 #include <vector>
 #include <string>
@@ -46,7 +47,7 @@
 class AfterCommand;
 class ConfigInfo;
 
-class MSXMotherBoard : private Observer<Setting>
+class MSXMotherBoard : private Observer<Setting>, private noncopyable
 {
 public:
 	MSXMotherBoard(Reactor& reactor);

Modified: openmsx/trunk/src/Pluggable.hh
===================================================================
--- openmsx/trunk/src/Pluggable.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/Pluggable.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -3,8 +3,9 @@
 #ifndef PLUGGABLE_HH
 #define PLUGGABLE_HH
 
+#include "MSXException.hh"
+#include "noncopyable.hh"
 #include <string>
-#include "MSXException.hh"
 
 namespace openmsx {
 
@@ -20,7 +21,7 @@
 		: MSXException(message) {}
 };
 
-class Pluggable
+class Pluggable : private noncopyable
 {
 public:
 	Pluggable();

Modified: openmsx/trunk/src/PluggingController.hh
===================================================================
--- openmsx/trunk/src/PluggingController.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/PluggingController.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -3,6 +3,7 @@
 #ifndef PLUGGINGCONTROLLER_HH
 #define PLUGGINGCONTROLLER_HH
 
+#include "noncopyable.hh"
 #include <vector>
 #include <memory>
 
@@ -24,7 +25,7 @@
 /**
  * Central administration of Connectors and Pluggables.
  */
-class PluggingController
+class PluggingController : private noncopyable
 {
 public:
 	explicit PluggingController(MSXMotherBoard& motherBoard);

Modified: openmsx/trunk/src/RP5C01.hh
===================================================================
--- openmsx/trunk/src/RP5C01.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/RP5C01.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -9,8 +9,9 @@
 #ifndef RP5C01_HH
 #define RP5C01_HH
 
+#include "Clock.hh"
 #include "openmsx.hh"
-#include "Clock.hh"
+#include "noncopyable.hh"
 #include <memory>
 
 namespace openmsx {
@@ -19,7 +20,7 @@
 class SRAM;
 template <typename T> class EnumSetting;
 
-class RP5C01
+class RP5C01 : private noncopyable
 {
 public:
 	RP5C01(CommandController& commandController, SRAM& regs,

Modified: openmsx/trunk/src/Reactor.hh
===================================================================
--- openmsx/trunk/src/Reactor.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/Reactor.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -6,6 +6,7 @@
 #include "Observer.hh"
 #include "EventListener.hh"
 #include "Semaphore.hh"
+#include "noncopyable.hh"
 #include <string>
 #include <memory>
 
@@ -35,7 +36,8 @@
  * This class serializes all incoming requests so they can be handled by the
  * main thread.
  */
-class Reactor : private Observer<Setting>, private EventListener
+class Reactor : private Observer<Setting>, private EventListener,
+                private noncopyable
 {
 public:
 	Reactor();

Modified: openmsx/trunk/src/RenShaTurbo.hh
===================================================================
--- openmsx/trunk/src/RenShaTurbo.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/RenShaTurbo.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define RENSHATURBO_HH
 
 #include "openmsx.hh"
+#include "noncopyable.hh"
 #include <memory>
 
 namespace openmsx {
@@ -20,7 +21,7 @@
  *
  * It uses one autofire circuit.
  */
-class RenShaTurbo
+class RenShaTurbo : private noncopyable
 {
 public:
 	RenShaTurbo(CommandController& commandController,

Modified: openmsx/trunk/src/ThrottleManager.hh
===================================================================
--- openmsx/trunk/src/ThrottleManager.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/ThrottleManager.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define THROTTLEMANAGER_HH
 
 #include "Subject.hh"
+#include "noncopyable.hh"
 #include <memory>
 
 namespace openmsx {
@@ -19,7 +20,8 @@
  * status of openMSX, attach to me! (And not just to throttleSetting!)
  */
 class ThrottleManager : public Subject<ThrottleManager>,
-                        private Observer<Setting>
+                        private Observer<Setting>,
+                        private noncopyable
 {
 public:
 	explicit ThrottleManager(CommandController& commandController);

Modified: openmsx/trunk/src/cassette/CasImage.hh
===================================================================
--- openmsx/trunk/src/cassette/CasImage.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/cassette/CasImage.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -34,7 +34,7 @@
 
 	unsigned size;
 	unsigned pos;
-	byte* buf;
+	byte* buf; // TODO only valid in constructor, should not be a member
 	std::vector<char> output;
 
 	CliComm& cliComm;

Modified: openmsx/trunk/src/commands/CommandController.hh
===================================================================
--- openmsx/trunk/src/commands/CommandController.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/commands/CommandController.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -3,6 +3,7 @@
 #ifndef COMMANDCONTROLLER_HH
 #define COMMANDCONTROLLER_HH
 
+#include "noncopyable.hh"
 #include <string>
 #include <map>
 #include <set>
@@ -28,7 +29,7 @@
 class VersionInfo;
 class RomInfoTopic;
 
-class CommandController
+class CommandController : private noncopyable
 {
 public:
 	explicit CommandController(EventDistributor& eventDistributor);

Modified: openmsx/trunk/src/commands/Completer.hh
===================================================================
--- openmsx/trunk/src/commands/Completer.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/commands/Completer.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -3,6 +3,7 @@
 #ifndef COMPLETER_HH
 #define COMPLETER_HH
 
+#include "noncopyable.hh"
 #include <string>
 #include <vector>
 #include <set>
@@ -12,7 +13,7 @@
 class FileContext;
 class CommandController;
 
-class Completer
+class Completer : private noncopyable
 {
 public:
 	/** Print help for this command.

Modified: openmsx/trunk/src/commands/Interpreter.hh
===================================================================
--- openmsx/trunk/src/commands/Interpreter.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/commands/Interpreter.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define INTERPRETER_HH
 
 #include "EventListener.hh"
+#include "noncopyable.hh"
 #include <map>
 #include <set>
 #include <string>
@@ -18,7 +19,7 @@
 class InterpreterOutput;
 class TclObject;
 
-class Interpreter : private EventListener
+class Interpreter : private EventListener, private noncopyable
 {
 public:
 	explicit Interpreter(EventDistributor& eventDistributor);

Modified: openmsx/trunk/src/config/HardwareConfig.hh
===================================================================
--- openmsx/trunk/src/config/HardwareConfig.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/config/HardwareConfig.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define HARDWARECONFIG_HH
 
 #include "XMLElement.hh"
+#include "noncopyable.hh"
 #include <string>
 #include <vector>
 #include <memory>
@@ -13,10 +14,10 @@
 class MSXMotherBoard;
 class MSXDevice;
 
-class HardwareConfig
+class HardwareConfig : private noncopyable
 {
 public:
-	HardwareConfig(MSXMotherBoard& motherBoard);
+	explicit HardwareConfig(MSXMotherBoard& motherBoard);
 	virtual ~HardwareConfig();
 
 	const XMLElement& getConfig() const;

Modified: openmsx/trunk/src/console/CommandConsole.hh
===================================================================
--- openmsx/trunk/src/console/CommandConsole.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/console/CommandConsole.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -8,6 +8,7 @@
 #include "InterpreterOutput.hh"
 #include "CircularBuffer.hh"
 #include "openmsx.hh"
+#include "noncopyable.hh"
 #include <list>
 #include <string>
 
@@ -20,7 +21,7 @@
 class Display;
 
 class CommandConsole : public Console, private EventListener,
-                       private InterpreterOutput
+                       private InterpreterOutput, private noncopyable
 {
 public:
 	CommandConsole(CommandController& commandController,

Modified: openmsx/trunk/src/console/GLFont.hh
===================================================================
--- openmsx/trunk/src/console/GLFont.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/console/GLFont.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -5,10 +5,11 @@
 
 #include "Font.hh"
 #include "GLUtil.hh"
+#include "noncopyable.hh"
 
 namespace openmsx {
 
-class GLFont : public Font
+class GLFont : public Font, private noncopyable
 {
 public:
 	GLFont(GLuint texture, int width, int height, GLfloat* texCoord);

Modified: openmsx/trunk/src/console/OSDConsoleRenderer.hh
===================================================================
--- openmsx/trunk/src/console/OSDConsoleRenderer.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/console/OSDConsoleRenderer.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -7,6 +7,7 @@
 #include "FilenameSetting.hh"
 #include "Observer.hh"
 #include "openmsx.hh"
+#include "noncopyable.hh"
 #include <memory>
 #include <string>
 
@@ -21,7 +22,8 @@
 template <typename T> class EnumSetting;
 
 class OSDConsoleRenderer : public Layer, private Observer<Setting>,
-                           private SettingChecker<FilenameSetting::Policy>
+                           private SettingChecker<FilenameSetting::Policy>,
+                           private noncopyable
 {
 public:
 	virtual ~OSDConsoleRenderer();

Modified: openmsx/trunk/src/console/SDLConsole.hh
===================================================================
--- openmsx/trunk/src/console/SDLConsole.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/console/SDLConsole.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,7 +4,6 @@
 #define SDLCONSOLE_HH
 
 #include "OSDConsoleRenderer.hh"
-#include "noncopyable.hh"
 #include <memory>
 
 class SDL_Surface;
@@ -13,7 +12,7 @@
 
 class SDLImage;
 
-class SDLConsole : public OSDConsoleRenderer, private noncopyable
+class SDLConsole : public OSDConsoleRenderer
 {
 public:
 	SDLConsole(Reactor& reactor, SDL_Surface* screen);

Modified: openmsx/trunk/src/cpu/BreakPointBase.hh
===================================================================
--- openmsx/trunk/src/cpu/BreakPointBase.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/cpu/BreakPointBase.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -3,6 +3,7 @@
 #ifndef BREAKPOINTBASE_HH
 #define BREAKPOINTBASE_HH
 
+#include "noncopyable.hh"
 #include <string>
 #include <memory>
 
@@ -13,7 +14,7 @@
 
 /** Base class for CPU break and watch points.
  */
-class BreakPointBase
+class BreakPointBase : private noncopyable
 {
 public:
 	std::string getCondition() const;

Modified: openmsx/trunk/src/cpu/CPU.hh
===================================================================
--- openmsx/trunk/src/cpu/CPU.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/cpu/CPU.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -5,6 +5,7 @@
 
 #include "BreakPoint.hh"
 #include "openmsx.hh"
+#include "noncopyable.hh"
 #include <vector>
 #include <map>
 #include <memory>
@@ -14,7 +15,7 @@
 class EmuTime;
 class TclObject;
 
-class CPU
+class CPU : private noncopyable
 {
 public:
 	// cache constants

Modified: openmsx/trunk/src/cpu/IRQHelper.hh
===================================================================
--- openmsx/trunk/src/cpu/IRQHelper.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/cpu/IRQHelper.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define IRQHELPER_HH
 
 #include "MSXCPU.hh"
+#include "noncopyable.hh"
 
 namespace openmsx {
 
@@ -53,7 +54,7 @@
 };
 
 // generic implementation
-template <typename SOURCE> class IntHelper : public SOURCE
+template <typename SOURCE> class IntHelper : public SOURCE, private noncopyable
 {
 public:
 	/** Create a new IntHelper.

Modified: openmsx/trunk/src/debugger/Debugger.hh
===================================================================
--- openmsx/trunk/src/debugger/Debugger.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/debugger/Debugger.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -3,6 +3,7 @@
 #ifndef DEBUGGER_HH
 #define DEBUGGER_HH
 
+#include "noncopyable.hh"
 #include <map>
 #include <set>
 #include <string>
@@ -15,7 +16,7 @@
 class MSXCPU;
 class DebugCmd;
 
-class Debugger
+class Debugger : private noncopyable
 {
 public:
 	explicit Debugger(MSXMotherBoard& motherBoard);

Modified: openmsx/trunk/src/events/CliComm.hh
===================================================================
--- openmsx/trunk/src/events/CliComm.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/events/CliComm.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -6,6 +6,7 @@
 #include "CommandLineParser.hh"
 #include "EventListener.hh"
 #include "Semaphore.hh"
+#include "noncopyable.hh"
 #include <map>
 #include <string>
 #include <memory>
@@ -17,7 +18,7 @@
 class CliConnection;
 class UpdateCmd;
 
-class CliComm : private EventListener
+class CliComm : private EventListener, private noncopyable
 {
 public:
 	enum LogLevel {

Modified: openmsx/trunk/src/events/HotKey.hh
===================================================================
--- openmsx/trunk/src/events/HotKey.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/events/HotKey.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define HOTKEY_HH
 
 #include "EventListener.hh"
+#include "noncopyable.hh"
 #include "shared_ptr.hh"
 #include <map>
 #include <set>
@@ -26,7 +27,7 @@
 	bool operator()(T t1, T t2) const { return *t1 < *t2; }
 };
 
-class HotKey : private EventListener
+class HotKey : private EventListener, private noncopyable
 {
 public:
 	typedef shared_ptr<const Event> EventPtr;

Modified: openmsx/trunk/src/events/InputEventGenerator.hh
===================================================================
--- openmsx/trunk/src/events/InputEventGenerator.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/events/InputEventGenerator.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -5,6 +5,7 @@
 
 #include "Observer.hh"
 #include "EventListener.hh"
+#include "noncopyable.hh"
 #include <SDL.h>
 #include <memory>
 
@@ -16,7 +17,8 @@
 class Setting;
 class EscapeGrabCmd;
 
-class InputEventGenerator : private Observer<Setting>, private EventListener
+class InputEventGenerator : private Observer<Setting>, private EventListener,
+                            private noncopyable
 {
 public:
 	InputEventGenerator(CommandController& commandController,

Modified: openmsx/trunk/src/events/Keys.hh
===================================================================
--- openmsx/trunk/src/events/Keys.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/events/Keys.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -3,14 +3,15 @@
 #ifndef KEYS_HH
 #define KEYS_HH
 
+#include "StringOp.hh"
 #include <SDL_keysym.h> // TODO
 #include <map>
 #include <string>
-#include "StringOp.hh"
 
 namespace openmsx {
 
-class Keys {
+class Keys
+{
 public:
 	// There are two special key codes:
 	//  - K_NONE    : returned when we do string -> key code

Modified: openmsx/trunk/src/fdc/BootBlocks.hh
===================================================================
--- openmsx/trunk/src/fdc/BootBlocks.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/fdc/BootBlocks.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -7,16 +7,15 @@
 
 namespace openmsx {
 
-class BootBlocks {
-
+class BootBlocks
+{
 public:
 	// bootblock created with regular nms8250 and '_format'
 	static const byte dos1BootBlock[512];
 
 	// bootblock created with nms8250 and MSX-DOS 2.20
 	static const byte dos2BootBlock[512];
-	
-}; // class BootBlocks
+};
 
 } // namespace openmsx
 

Modified: openmsx/trunk/src/fdc/DiskChanger.hh
===================================================================
--- openmsx/trunk/src/fdc/DiskChanger.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/fdc/DiskChanger.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -5,6 +5,7 @@
 
 #include "DiskContainer.hh"
 #include "MSXEventListener.hh"
+#include "noncopyable.hh"
 #include <vector>
 #include <string>
 #include <memory>
@@ -21,7 +22,8 @@
 class GlobalSettings;
 class TclObject;
 
-class DiskChanger : public DiskContainer, private MSXEventListener
+class DiskChanger : public DiskContainer, private MSXEventListener,
+                    private noncopyable
 {
 public:
 	DiskChanger(const std::string& driveName,

Modified: openmsx/trunk/src/fdc/DriveMultiplexer.hh
===================================================================
--- openmsx/trunk/src/fdc/DriveMultiplexer.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/fdc/DriveMultiplexer.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define DRIVEMULTIPLEXER_HH
 
 #include "DiskDrive.hh"
+#include "noncopyable.hh"
 
 namespace openmsx {
 
@@ -11,7 +12,7 @@
  * This class connects to a FDC as a normal DiskDrive and deligates all
  * requests to one of four other DiskDrives.
  */
-class DriveMultiplexer : public DiskDrive
+class DriveMultiplexer : public DiskDrive, private noncopyable
 {
 public:
 	enum DriveNum {

Modified: openmsx/trunk/src/fdc/TC8566AF.hh
===================================================================
--- openmsx/trunk/src/fdc/TC8566AF.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/fdc/TC8566AF.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -9,12 +9,13 @@
 
 #include "Clock.hh"
 #include "openmsx.hh"
+#include "noncopyable.hh"
 
 namespace openmsx {
 
 class DiskDrive;
 
-class TC8566AF
+class TC8566AF : private noncopyable
 {
 public:
 	TC8566AF(DiskDrive* drive[4], const EmuTime& time);

Modified: openmsx/trunk/src/file/CompressedFileAdapter.hh
===================================================================
--- openmsx/trunk/src/file/CompressedFileAdapter.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/file/CompressedFileAdapter.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -3,8 +3,8 @@
 #ifndef COMPRESSEDFILEADAPTER_HH
 #define COMPRESSEDFILEADAPTER_HH
 
+#include "FileBase.hh"
 #include <memory>
-#include "FileBase.hh"
 
 namespace openmsx {
 

Modified: openmsx/trunk/src/file/File.hh
===================================================================
--- openmsx/trunk/src/file/File.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/file/File.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define FILE_HH
 
 #include "openmsx.hh"
+#include "noncopyable.hh"
 #include <memory>
 #include <string>
 #include <time.h>
@@ -12,7 +13,7 @@
 
 class FileBase;
 
-class File
+class File : private noncopyable
 {
 public:
 	enum OpenMode {

Modified: openmsx/trunk/src/file/FileBase.hh
===================================================================
--- openmsx/trunk/src/file/FileBase.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/file/FileBase.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -5,10 +5,11 @@
 
 #include <string>
 #include "openmsx.hh"
+#include "noncopyable.hh"
 
 namespace openmsx {
 
-class FileBase
+class FileBase : private noncopyable
 {
 public:
 	FileBase();

Modified: openmsx/trunk/src/file/FileException.hh
===================================================================
--- openmsx/trunk/src/file/FileException.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/file/FileException.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -7,7 +7,8 @@
 
 namespace openmsx {
 
-class FileException : public MSXException {
+class FileException : public MSXException
+{
 public:
 	explicit FileException(const std::string& mes) : MSXException(mes) {}
 };

Modified: openmsx/trunk/src/file/FilePool.hh
===================================================================
--- openmsx/trunk/src/file/FilePool.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/file/FilePool.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -3,6 +3,7 @@
 #ifndef FILEPOOL_HH
 #define FILEPOOL_HH
 
+#include "noncopyable.hh"
 #include <string>
 #include <map>
 #include <vector>
@@ -12,7 +13,7 @@
 
 class SettingsConfig;
 
-class FilePool
+class FilePool : private noncopyable
 {
 public:
 	explicit FilePool(SettingsConfig& settingsConfig);

Modified: openmsx/trunk/src/file/ReadDir.hh
===================================================================
--- openmsx/trunk/src/file/ReadDir.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/file/ReadDir.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -3,6 +3,7 @@
 #ifndef READDIR_HH
 #define READDIR_HH
 
+#include "noncopyable.hh"
 #include <string>
 #include <sys/types.h>
 #include <dirent.h>
@@ -14,7 +15,7 @@
  * Mainly usefull to automatically call closedir() when object goes out
  * of scope.
  */
-class ReadDir
+class ReadDir : private noncopyable
 {
 public:
 	explicit ReadDir(const std::string& directory);

Modified: openmsx/trunk/src/ide/AbstractIDEDevice.hh
===================================================================
--- openmsx/trunk/src/ide/AbstractIDEDevice.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/ide/AbstractIDEDevice.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -35,8 +35,7 @@
 	static const byte ABORT = 0x04;
 
 	AbstractIDEDevice(
-		EventDistributor& eventDistributor, const EmuTime& time
-		);
+		EventDistributor& eventDistributor, const EmuTime& time);
 	virtual ~AbstractIDEDevice();
 
 	/** Is this device a packet (ATAPI) device?

Modified: openmsx/trunk/src/ide/IDECDROM.hh
===================================================================
--- openmsx/trunk/src/ide/IDECDROM.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/ide/IDECDROM.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define IDECDROM_HH
 
 #include "AbstractIDEDevice.hh"
+#include "noncopyable.hh"
 #include <memory>
 
 namespace openmsx {
@@ -13,7 +14,7 @@
 class File;
 class CDXCommand;
 
-class IDECDROM : public AbstractIDEDevice
+class IDECDROM : public AbstractIDEDevice, private noncopyable
 {
 public:
 	IDECDROM(MSXMotherBoard& motherBoard, const XMLElement& config,

Modified: openmsx/trunk/src/ide/IDEHD.hh
===================================================================
--- openmsx/trunk/src/ide/IDEHD.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/ide/IDEHD.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -6,6 +6,7 @@
 #include "AbstractIDEDevice.hh"
 #include "SectorAccessibleDisk.hh"
 #include "DiskContainer.hh"
+#include "noncopyable.hh"
 #include <string>
 #include <memory>
 
@@ -18,7 +19,7 @@
 class HDCommand;
 
 class IDEHD : public AbstractIDEDevice, public SectorAccessibleDisk,
-	public DiskContainer
+              public DiskContainer, private noncopyable
 {
 public:
 	IDEHD(MSXMotherBoard& motherBoard, const XMLElement& config,

Modified: openmsx/trunk/src/input/EventTranslator.hh
===================================================================
--- openmsx/trunk/src/input/EventTranslator.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/input/EventTranslator.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,13 +4,14 @@
 #define EVENTTRANSLATOR_HH
 
 #include "EventListener.hh"
+#include "noncopyable.hh"
 
 namespace openmsx {
 
 class EventDistributor;
 class EventDelay;
 
-class EventTranslator : private EventListener
+class EventTranslator : private EventListener, private noncopyable
 {
 public:
 	EventTranslator(EventDistributor& eventDistributor,

Modified: openmsx/trunk/src/input/MSXEventDistributor.hh
===================================================================
--- openmsx/trunk/src/input/MSXEventDistributor.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/input/MSXEventDistributor.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -3,6 +3,7 @@
 #ifndef MSXEVENTDISTRIBUTOR_HH
 #define MSXEVENTDISTRIBUTOR_HH
 
+#include "noncopyable.hh"
 #include "shared_ptr.hh"
 #include <vector>
 
@@ -12,7 +13,7 @@
 class Event;
 class EmuTime;
 
-class MSXEventDistributor
+class MSXEventDistributor : private noncopyable
 {
 public:
 	typedef shared_ptr<const Event> EventPtr;

Modified: openmsx/trunk/src/input/MSXEventRecorder.hh
===================================================================
--- openmsx/trunk/src/input/MSXEventRecorder.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/input/MSXEventRecorder.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define MSXEVENTRECORDER_HH
 
 #include "MSXEventListener.hh"
+#include "noncopyable.hh"
 #include <fstream>
 #include <string>
 
@@ -11,7 +12,7 @@
 
 class MSXEventDistributor;
 
-class MSXEventRecorder : private MSXEventListener
+class MSXEventRecorder : private MSXEventListener, private noncopyable
 {
 public:
 	MSXEventRecorder(MSXEventDistributor& eventDistributor, 

Modified: openmsx/trunk/src/input/MSXEventRecorderReplayerCLI.hh
===================================================================
--- openmsx/trunk/src/input/MSXEventRecorderReplayerCLI.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/input/MSXEventRecorderReplayerCLI.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -3,6 +3,7 @@
 #ifndef MSXEVENTRECORDERREPLAYERCLI_HH
 #define MSXEVENTRECORDERREPLAYERCLI_HH
 
+#include "noncopyable.hh"
 #include <memory>
 
 namespace openmsx {
@@ -11,7 +12,7 @@
 class RecordOption;
 class ReplayOption;
 
-class MSXEventRecorderReplayerCLI
+class MSXEventRecorderReplayerCLI : private noncopyable
 {
 public:
 	explicit MSXEventRecorderReplayerCLI(CommandLineParser& cmdLineParser);

Modified: openmsx/trunk/src/memory/CheckedRam.hh
===================================================================
--- openmsx/trunk/src/memory/CheckedRam.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/memory/CheckedRam.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -5,6 +5,7 @@
 
 #include "CPU.hh"
 #include "openmsx.hh"
+#include "noncopyable.hh"
 #include <vector>
 #include <bitset>
 #include <memory>
@@ -25,7 +26,7 @@
  * accessed in DRAM mode or via the ROM mapper are unchecked! Note that there
  * is basically no overhead for using CheckedRam over Ram, thanks to Wouter.
  */
-class CheckedRam
+class CheckedRam : private noncopyable
 {
 public:
 	CheckedRam(MSXMotherBoard& motherBoard, const std::string& name,

Modified: openmsx/trunk/src/memory/PanasonicMemory.hh
===================================================================
--- openmsx/trunk/src/memory/PanasonicMemory.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/memory/PanasonicMemory.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define PANASONICMEMORY_HH
 
 #include "openmsx.hh"
+#include "noncopyable.hh"
 #include <memory>
 
 namespace openmsx {
@@ -13,7 +14,7 @@
 class Ram;
 class Rom;
 
-class PanasonicMemory
+class PanasonicMemory : private noncopyable
 {
 public:
 	explicit PanasonicMemory(MSXMotherBoard& motherBoard);

Modified: openmsx/trunk/src/memory/Ram.hh
===================================================================
--- openmsx/trunk/src/memory/Ram.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/memory/Ram.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define RAM_HH
 
 #include "openmsx.hh"
+#include "noncopyable.hh"
 #include <cassert>
 #include <memory>
 
@@ -12,7 +13,7 @@
 class MSXMotherBoard;
 class RamDebuggable;
 
-class Ram
+class Ram : private noncopyable
 {
 public:
 	Ram(MSXMotherBoard& motherBoard, const std::string& name,

Modified: openmsx/trunk/src/memory/Rom.hh
===================================================================
--- openmsx/trunk/src/memory/Rom.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/memory/Rom.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define ROM_HH
 
 #include "openmsx.hh"
+#include "noncopyable.hh"
 #include <memory>
 #include <cassert>
 
@@ -17,7 +18,7 @@
 class CliComm;
 class RomDebuggable;
 
-class Rom
+class Rom : private noncopyable
 {
 public:
 	Rom(MSXMotherBoard& motherBoard, const std::string& name,

Modified: openmsx/trunk/src/memory/RomDatabase.hh
===================================================================
--- openmsx/trunk/src/memory/RomDatabase.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/memory/RomDatabase.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -3,6 +3,7 @@
 #ifndef ROMDATABASE_HH
 #define ROMDATABASE_HH
 
+#include "noncopyable.hh"
 #include <memory>
 
 namespace openmsx {
@@ -11,7 +12,7 @@
 class CliComm;
 class RomInfo;
 
-class RomDatabase
+class RomDatabase : private noncopyable
 {
 public:
 	static RomDatabase& instance();

Modified: openmsx/trunk/src/memory/SRAM.hh
===================================================================
--- openmsx/trunk/src/memory/SRAM.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/memory/SRAM.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define SRAM_HH
 
 #include "Ram.hh"
+#include "noncopyable.hh"
 #include <memory>
 
 namespace openmsx {
@@ -13,7 +14,7 @@
 class CliComm;
 class SRAMSync;
 
-class SRAM
+class SRAM : private noncopyable
 {
 public:
 	SRAM(MSXMotherBoard& motherBoard, const std::string& name, int size,

Modified: openmsx/trunk/src/serial/I8254.hh
===================================================================
--- openmsx/trunk/src/serial/I8254.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/serial/I8254.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -9,6 +9,7 @@
 #define I8254_HH
 
 #include "openmsx.hh"
+#include "noncopyable.hh"
 #include "EmuTime.hh"
 #include "ClockPin.hh"
 
@@ -16,7 +17,7 @@
 
 class Scheduler;
 
-class I8254
+class I8254 : private noncopyable
 {
 	class Counter {
 	public:

Modified: openmsx/trunk/src/serial/MidiOutLogger.hh
===================================================================
--- openmsx/trunk/src/serial/MidiOutLogger.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/serial/MidiOutLogger.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,7 +4,6 @@
 #define MIDIOUTLOGGER_HH
 
 #include "MidiOutDevice.hh"
-#include "noncopyable.hh"
 #include <fstream>
 #include <memory>
 
@@ -13,7 +12,7 @@
 class CommandController;
 class FilenameSetting;
 
-class MidiOutLogger : public MidiOutDevice, private noncopyable
+class MidiOutLogger : public MidiOutDevice
 {
 public:
 	explicit MidiOutLogger(CommandController& commandController);

Modified: openmsx/trunk/src/settings/Setting.hh
===================================================================
--- openmsx/trunk/src/settings/Setting.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/settings/Setting.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define SETTINGNODE_HH
 
 #include "Subject.hh"
+#include "noncopyable.hh"
 #include <string>
 #include <vector>
 
@@ -13,7 +14,7 @@
 class XMLElement;
 class TclObject;
 
-class Setting : public Subject<Setting>
+class Setting : public Subject<Setting>, private noncopyable
 {
 public:
 	enum SaveSetting {

Modified: openmsx/trunk/src/sound/KeyClick.hh
===================================================================
--- openmsx/trunk/src/sound/KeyClick.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/sound/KeyClick.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -3,6 +3,7 @@
 #ifndef KEYCLICK_HH
 #define KEYCLICK_HH
 
+#include "noncopyable.hh"
 #include <memory>
 
 namespace openmsx {
@@ -12,7 +13,7 @@
 class EmuTime;
 class DACSound8U;
 
-class KeyClick
+class KeyClick : private noncopyable
 {
 public:
 	KeyClick(Mixer& mixer, const XMLElement& config, const EmuTime& time);

Modified: openmsx/trunk/src/sound/WavAudioInput.hh
===================================================================
--- openmsx/trunk/src/sound/WavAudioInput.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/sound/WavAudioInput.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -6,7 +6,6 @@
 #include "AudioInputDevice.hh"
 #include "Observer.hh"
 #include "EmuTime.hh"
-#include "noncopyable.hh"
 #include <memory>
 
 namespace openmsx {
@@ -15,8 +14,7 @@
 class FilenameSetting;
 class Setting;
 
-class WavAudioInput : public AudioInputDevice, private Observer<Setting>,
-                      private noncopyable
+class WavAudioInput : public AudioInputDevice, private Observer<Setting>
 {
 public:
 	explicit WavAudioInput(CommandController& commandController);

Modified: openmsx/trunk/src/thread/Thread.hh
===================================================================
--- openmsx/trunk/src/thread/Thread.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/thread/Thread.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -9,7 +9,7 @@
 
 namespace openmsx {
 
-class Runnable
+class Runnable : private noncopyable
 {
 public:
 	virtual void run() = 0;

Modified: openmsx/trunk/src/video/BitmapConverter.hh
===================================================================
--- openmsx/trunk/src/video/BitmapConverter.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/BitmapConverter.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -94,7 +94,6 @@
 	}
 
 private:
-
 	typedef void (BitmapConverter::*RenderMethod)
 		(Pixel* pixelPtr, const byte* vramPtr0, const byte* vramPtr1);
 

Modified: openmsx/trunk/src/video/Display.hh
===================================================================
--- openmsx/trunk/src/video/Display.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/Display.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -8,6 +8,7 @@
 #include "EventListener.hh"
 #include "Observer.hh"
 #include "CircularBuffer.hh"
+#include "noncopyable.hh"
 #include <memory>
 #include <vector>
 
@@ -26,7 +27,7 @@
   * A display contains several layers.
   */
 class Display : private EventListener, private Observer<Setting>,
-                private LayerListener
+                private LayerListener, private noncopyable
 {
 public:
 	explicit Display(Reactor& reactor);

Modified: openmsx/trunk/src/video/FBPostProcessor.hh
===================================================================
--- openmsx/trunk/src/video/FBPostProcessor.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/FBPostProcessor.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -24,16 +24,14 @@
 	FBPostProcessor(
 		CommandController& commandController, Display& display,
 		VisibleSurface& screen, VideoSource videoSource,
-		unsigned maxWidth, unsigned height
-		);
+		unsigned maxWidth, unsigned height);
 	virtual ~FBPostProcessor();
 
 	// Layer interface:
 	virtual void paint();
 
 	virtual RawFrame* rotateFrames(
-		RawFrame* finishedFrame, FrameSource::FieldType field
-		);
+		RawFrame* finishedFrame, FrameSource::FieldType field);
 
 private:
 	void preCalcNoise(double factor);

Modified: openmsx/trunk/src/video/FrameSource.hh
===================================================================
--- openmsx/trunk/src/video/FrameSource.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/FrameSource.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -3,6 +3,7 @@
 #ifndef FRAMESOURCE_HH
 #define FRAMESOURCE_HH
 
+#include "noncopyable.hh"
 #include <algorithm>
 #include <vector>
 
@@ -12,7 +13,7 @@
 
 /** Interface for getting lines from a video frame.
   */
-class FrameSource
+class FrameSource : private noncopyable
 {
 public:
 	/** What role does this frame play in interlacing?

Modified: openmsx/trunk/src/video/GLHQLiteScaler.hh
===================================================================
--- openmsx/trunk/src/video/GLHQLiteScaler.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/GLHQLiteScaler.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define GLHQLITESCALER_HH
 
 #include "GLScaler.hh"
+#include "noncopyable.hh"
 #include <memory>
 
 namespace openmsx {
@@ -11,7 +12,7 @@
 class ShaderProgram;
 class Texture;
 
-class GLHQLiteScaler : public GLScaler
+class GLHQLiteScaler : public GLScaler, private noncopyable
 {
 public:
 	GLHQLiteScaler();

Modified: openmsx/trunk/src/video/GLHQScaler.hh
===================================================================
--- openmsx/trunk/src/video/GLHQScaler.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/GLHQScaler.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define GLHQSCALER_HH
 
 #include "GLScaler.hh"
+#include "noncopyable.hh"
 #include <memory>
 
 namespace openmsx {
@@ -11,7 +12,7 @@
 class ShaderProgram;
 class Texture;
 
-class GLHQScaler : public GLScaler
+class GLHQScaler : public GLScaler, private noncopyable
 {
 public:
 	GLHQScaler();

Modified: openmsx/trunk/src/video/GLImage.hh
===================================================================
--- openmsx/trunk/src/video/GLImage.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/GLImage.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -3,14 +3,15 @@
 #ifndef GLTEXTURE_HH
 #define GLTEXTURE_HH
 
+#include "GLUtil.hh"
+#include "noncopyable.hh"
 #include <string>
-#include "GLUtil.hh"
 
 class SDL_Surface;
 
 namespace openmsx {
 
-class GLImage
+class GLImage : private noncopyable
 {
 public:
 	GLImage(SDL_Surface* output, const std::string& filename);

Modified: openmsx/trunk/src/video/GLPostProcessor.hh
===================================================================
--- openmsx/trunk/src/video/GLPostProcessor.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/GLPostProcessor.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -25,16 +25,14 @@
 	GLPostProcessor(
 		CommandController& commandController, Display& display,
 		VisibleSurface& screen, VideoSource videoSource,
-		unsigned maxWidth, unsigned height
-		);
+		unsigned maxWidth, unsigned height);
 	virtual ~GLPostProcessor();
 
 	// Layer interface:
 	virtual void paint();
 
 	virtual RawFrame* rotateFrames(
-		RawFrame* finishedFrame, FrameSource::FieldType field
-		);
+		RawFrame* finishedFrame, FrameSource::FieldType field);
 
 protected:
 	// Observer<Setting> interface:
@@ -94,7 +92,6 @@
 	GLuint color_tex[2];
 	GLuint monitor3DList;
 	bool storedFrame;
-
 };
 
 } // namespace openmsx

Modified: openmsx/trunk/src/video/GLRasterizer.hh
===================================================================
--- openmsx/trunk/src/video/GLRasterizer.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/GLRasterizer.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -34,8 +34,7 @@
 
 	GLRasterizer(
 		CommandController& commandController,
-		VDP& vdp, Display& display, OutputSurface& screen
-		);
+		VDP& vdp, Display& display, OutputSurface& screen);
 	virtual ~GLRasterizer();
 
 	// Layer interface:

Modified: openmsx/trunk/src/video/GLScaleNxScaler.hh
===================================================================
--- openmsx/trunk/src/video/GLScaleNxScaler.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/GLScaleNxScaler.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -5,13 +5,14 @@
 
 #include "GLScaler.hh"
 #include "GLUtil.hh"
+#include "noncopyable.hh"
 #include <memory>
 
 namespace openmsx {
 
 class ShaderProgram;
 
-class GLScaleNxScaler: public GLScaler
+class GLScaleNxScaler: public GLScaler, private noncopyable
 {
 public:
 	GLScaleNxScaler();

Modified: openmsx/trunk/src/video/GLSimpleScaler.hh
===================================================================
--- openmsx/trunk/src/video/GLSimpleScaler.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/GLSimpleScaler.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define GLSIMPLESCALER_HH
 
 #include "GLScaler.hh"
+#include "noncopyable.hh"
 #include <memory>
 
 namespace openmsx {
@@ -11,7 +12,7 @@
 class RenderSettings;
 class ShaderProgram;
 
-class GLSimpleScaler: public GLScaler
+class GLSimpleScaler: public GLScaler, private noncopyable
 {
 public:
 	GLSimpleScaler(RenderSettings& renderSettings);

Modified: openmsx/trunk/src/video/GLSnow.hh
===================================================================
--- openmsx/trunk/src/video/GLSnow.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/GLSnow.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -5,12 +5,13 @@
 
 #include "Layer.hh"
 #include "GLUtil.hh"
+#include "noncopyable.hh"
 
 namespace openmsx {
 
 /** Snow effect for background layer.
   */
-class GLSnow: public Layer
+class GLSnow: public Layer, private noncopyable
 {
 public:
 	GLSnow(unsigned width, unsigned height);

Modified: openmsx/trunk/src/video/GLTVScaler.hh
===================================================================
--- openmsx/trunk/src/video/GLTVScaler.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/GLTVScaler.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -5,13 +5,14 @@
 
 #include "GLScaler.hh"
 #include "GLUtil.hh"
+#include "noncopyable.hh"
 #include <memory>
 
 namespace openmsx {
 
 class ShaderProgram;
 
-class GLTVScaler: public GLScaler
+class GLTVScaler: public GLScaler, private noncopyable
 {
 public:
 	GLTVScaler();

Modified: openmsx/trunk/src/video/IconLayer.hh
===================================================================
--- openmsx/trunk/src/video/IconLayer.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/IconLayer.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -6,6 +6,7 @@
 #include "Layer.hh"
 #include "LedEvent.hh"
 #include "FilenameSetting.hh"
+#include "noncopyable.hh"
 #include <memory>
 
 class SDL_Surface;
@@ -18,7 +19,8 @@
 class IntegerSetting;
 
 template <class IMAGE>
-class IconLayer : public Layer, private SettingChecker<FilenameSetting::Policy>
+class IconLayer : public Layer, private SettingChecker<FilenameSetting::Policy>,
+                  private noncopyable
 {
 public:
 	IconLayer(CommandController& commandController,

Modified: openmsx/trunk/src/video/PixelRenderer.hh
===================================================================
--- openmsx/trunk/src/video/PixelRenderer.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/PixelRenderer.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -8,6 +8,7 @@
 #include "RenderSettings.hh"
 #include "DisplayMode.hh"
 #include "openmsx.hh"
+#include "noncopyable.hh"
 #include <memory>
 
 namespace openmsx {
@@ -24,7 +25,8 @@
 /** Generic implementation of a pixel-based Renderer.
   * Uses a Rasterizer to plot actual pixels for a specific video system.
   */
-class PixelRenderer : public Renderer, private Observer<Setting>
+class PixelRenderer : public Renderer, private Observer<Setting>,
+                      private noncopyable 
 {
 public:
 	explicit PixelRenderer(VDP& vdp, Display& display);

Modified: openmsx/trunk/src/video/PostProcessor.hh
===================================================================
--- openmsx/trunk/src/video/PostProcessor.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/PostProcessor.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -41,8 +41,7 @@
 	  * @return RawFrame object that can be used for building the next frame.
 	  */
 	virtual RawFrame* rotateFrames(
-		RawFrame* finishedFrame, FrameSource::FieldType field
-		);
+		RawFrame* finishedFrame, FrameSource::FieldType field);
 
 protected:
 	/** Returns the maximum width for lines [y..y+step).
@@ -52,8 +51,7 @@
 	PostProcessor(
 		CommandController& commandController, Display& display,
 		VisibleSurface& screen, VideoSource videoSource,
-		unsigned maxWidth, unsigned height
-		);
+		unsigned maxWidth, unsigned height);
 
 	/** Render settings
 	  */

Modified: openmsx/trunk/src/video/Rasterizer.hh
===================================================================
--- openmsx/trunk/src/video/Rasterizer.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/Rasterizer.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -11,8 +11,6 @@
 class Rasterizer
 {
 public:
-	/** Destructor.
-	  */
 	virtual ~Rasterizer() {}
 
 	/** Will the output of this Rasterizer be displayed?
@@ -81,8 +79,7 @@
 	virtual void drawDisplay(
 		int fromX, int fromY,
 		int displayX, int displayY,
-		int displayWidth, int displayHeight
-		) = 0;
+		int displayWidth, int displayHeight) = 0;
 
 	/** Render a rectangle of sprite pixels on the host screen.
 	  * Although the parameters are very similar to drawDisplay,
@@ -98,9 +95,7 @@
 	virtual void drawSprites(
 		int fromX, int fromY,
 		int displayX, int displayY,
-		int displayWidth, int displayHeight
-		) = 0;
-
+		int displayWidth, int displayHeight) = 0;
 };
 
 } // namespace openmsx

Modified: openmsx/trunk/src/video/RawFrame.hh
===================================================================
--- openmsx/trunk/src/video/RawFrame.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/RawFrame.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -15,7 +15,7 @@
 {
 public:
 	RawFrame(const SDL_PixelFormat* format, unsigned maxWidth, unsigned height);
-	~RawFrame();
+	virtual ~RawFrame();
 
 	virtual unsigned getLineBufferSize() const;
 	virtual unsigned getLineWidth(unsigned line);
@@ -46,4 +46,4 @@
 
 } // namespace openmsx
 
-#endif // RAWFRAME_HH
+#endif

Modified: openmsx/trunk/src/video/RenderSettings.hh
===================================================================
--- openmsx/trunk/src/video/RenderSettings.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/RenderSettings.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -4,6 +4,7 @@
 #define RENDERSETTINGS_HH
 
 #include "RendererFactory.hh"
+#include "noncopyable.hh"
 #include <string>
 #include <memory>
 
@@ -21,7 +22,7 @@
   * Keeping the settings here makes sure they are preserved when the user
   * switches to another renderer.
   */
-class RenderSettings
+class RenderSettings : private noncopyable
 {
 public:
 	/** Render accuracy: granularity of the rendered area.

Modified: openmsx/trunk/src/video/RendererFactory.hh
===================================================================
--- openmsx/trunk/src/video/RendererFactory.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/RendererFactory.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -31,8 +31,6 @@
 	enum RendererID { UNINITIALIZED, DUMMY, SDL,
 	                  SDLGL, SDLGL_PP, SDLGL_FB16, SDLGL_FB32 };
 
-	virtual ~RendererFactory() {}
-
 	typedef EnumSetting<RendererID> RendererSetting;
 
 	/** Create the video system required by the current renderer setting.

Modified: openmsx/trunk/src/video/SDLRasterizer.hh
===================================================================
--- openmsx/trunk/src/video/SDLRasterizer.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/SDLRasterizer.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -34,8 +34,7 @@
 public:
 	SDLRasterizer(
 		VDP& vdp, Display& display, VisibleSurface& screen,
-		std::auto_ptr<PostProcessor> postProcessor_
-		);
+		std::auto_ptr<PostProcessor> postProcessor);
 	virtual ~SDLRasterizer();
 
 	// Rasterizer interface:

Modified: openmsx/trunk/src/video/ScalerFactory.hh
===================================================================
--- openmsx/trunk/src/video/ScalerFactory.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/ScalerFactory.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -22,8 +22,8 @@
 	  * @return A Scaler object, owned by the caller.
 	  */
 	static std::auto_ptr<Scaler> createScaler(
-		const PixelOperations<Pixel>& pixelOps, RenderSettings& renderSettings
-		);
+		const PixelOperations<Pixel>& pixelOps,
+		RenderSettings& renderSettings);
 };
 
 } // namespace openmsx

Modified: openmsx/trunk/src/video/Simple3xScaler.hh
===================================================================
--- openmsx/trunk/src/video/Simple3xScaler.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/Simple3xScaler.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -6,6 +6,7 @@
 #include "Scaler3.hh"
 #include "PixelOperations.hh"
 #include "Scanline.hh"
+#include "noncopyable.hh"
 #include <memory>
 
 namespace openmsx {
@@ -14,7 +15,7 @@
 template <class Pixel> class Blur_1on3;
 
 template <class Pixel>
-class Simple3xScaler : public Scaler3<Pixel>
+class Simple3xScaler : public Scaler3<Pixel>, private noncopyable
 {
 public:
 	Simple3xScaler(const PixelOperations<Pixel>& pixelOps,

Modified: openmsx/trunk/src/video/VisibleSurface.hh
===================================================================
--- openmsx/trunk/src/video/VisibleSurface.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/VisibleSurface.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -22,7 +22,7 @@
   * This class provides a frame buffer based renderer a common interface,
   * no matter whether the back-end is plain SDL or SDL+OpenGL.
   */
-class VisibleSurface: public OutputSurface
+class VisibleSurface : public OutputSurface
 {
 public:
 	virtual ~VisibleSurface();

Modified: openmsx/trunk/src/video/v9990/V9990SDLRasterizer.hh
===================================================================
--- openmsx/trunk/src/video/v9990/V9990SDLRasterizer.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/v9990/V9990SDLRasterizer.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -32,8 +32,7 @@
 public:
 	V9990SDLRasterizer(
 		V9990& vdp, Display& display, VisibleSurface& screen,
-		std::auto_ptr<PostProcessor> postProcessor_
-		);
+		std::auto_ptr<PostProcessor> postProcessor);
 	virtual ~V9990SDLRasterizer();
 
 	// Rasterizer interface:

Modified: openmsx/trunk/src/video/v9990/V9990VRAM.hh
===================================================================
--- openmsx/trunk/src/video/v9990/V9990VRAM.hh	2006-10-02 07:00:04 UTC (rev 5732)
+++ openmsx/trunk/src/video/v9990/V9990VRAM.hh	2006-10-02 13:16:39 UTC (rev 5733)
@@ -5,6 +5,7 @@
 
 #include "V9990CmdEngine.hh"
 #include "Ram.hh"
+#include "noncopyable.hh"
 #include "openmsx.hh"
 
 namespace openmsx {
@@ -14,7 +15,7 @@
 
 /** Video RAM for the V9990.
   */
-class V9990VRAM
+class V9990VRAM : private noncopyable
 {
 public:
 	/** VRAM Size


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.