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

[<mth...@us...>]

Revision: 10714
          http://openmsx.svn.sourceforge.net/openmsx/?rev=10714&view=rev
Author:   mthuurne
Date:     2009-10-25 17:12:57 +0000 (Sun, 25 Oct 2009)

Log Message:
-----------
Make it explicit that GlobalCommandController is passed to CommandConsole.

Modified Paths:
--------------
    openmsx/trunk/src/console/CommandConsole.cc
    openmsx/trunk/src/console/CommandConsole.hh
    openmsx/trunk/src/video/Display.cc

Modified: openmsx/trunk/src/console/CommandConsole.cc
===================================================================
--- openmsx/trunk/src/console/CommandConsole.cc	2009-10-25 17:07:50 UTC (rev 10713)
+++ openmsx/trunk/src/console/CommandConsole.cc	2009-10-25 17:12:57 UTC (rev 10714)
@@ -2,7 +2,7 @@
 
 #include "CommandConsole.hh"
 #include "CommandException.hh"
-#include "CommandController.hh"
+#include "GlobalCommandController.hh"
 #include "Completer.hh"
 #include "Interpreter.hh"
 #include "Keys.hh"
@@ -38,7 +38,7 @@
 const char* const PROMPT2 = "| ";
 
 CommandConsole::CommandConsole(
-		CommandController& commandController_,
+		GlobalCommandController& commandController_,
 		EventDistributor& eventDistributor_,
 		Display& display_)
 	: commandController(commandController_)

Modified: openmsx/trunk/src/console/CommandConsole.hh
===================================================================
--- openmsx/trunk/src/console/CommandConsole.hh	2009-10-25 17:07:50 UTC (rev 10713)
+++ openmsx/trunk/src/console/CommandConsole.hh	2009-10-25 17:12:57 UTC (rev 10714)
@@ -14,7 +14,7 @@
 
 namespace openmsx {
 
-class CommandController;
+class GlobalCommandController;
 class EventDistributor;
 class KeyEvent;
 class BooleanSetting;
@@ -25,7 +25,7 @@
                        private InterpreterOutput, private noncopyable
 {
 public:
-	CommandConsole(CommandController& commandController,
+	CommandConsole(GlobalCommandController& commandController,
 	               EventDistributor& eventDistributor,
 	               Display& display);
 	virtual ~CommandConsole();
@@ -71,7 +71,7 @@
 	void loadHistory();
 	void saveHistory();
 
-	CommandController& commandController;
+	GlobalCommandController& commandController;
 	EventDistributor& eventDistributor;
 	Display& display;
 	std::auto_ptr<BooleanSetting> consoleSetting;

Modified: openmsx/trunk/src/video/Display.cc
===================================================================
--- openmsx/trunk/src/video/Display.cc	2009-10-25 17:07:50 UTC (rev 10713)
+++ openmsx/trunk/src/video/Display.cc	2009-10-25 17:12:57 UTC (rev 10714)
@@ -74,7 +74,8 @@
 	, reactor(reactor_)
 	, renderSettings(new RenderSettings(reactor.getCommandController()))
 	, commandConsole(new CommandConsole(
-		reactor.getCommandController(), reactor.getEventDistributor(), *this))
+		reactor.getGlobalCommandController(),
+		reactor.getEventDistributor(), *this))
 	, currentRenderer(RendererFactory::UNINITIALIZED)
 	, switchInProgress(false)
 {


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