[Orxonox-commit 2496] r7203 - code/branches/consolecommands3/src/libraries/core/command
landauf at orxonox.net
landauf at orxonox.net
Mon Aug 23 00:58:52 CEST 2010
Author: landauf
Date: 2010-08-23 00:58:52 +0200 (Mon, 23 Aug 2010)
New Revision: 7203
Modified:
code/branches/consolecommands3/src/libraries/core/command/ArgumentCompleter.h
code/branches/consolecommands3/src/libraries/core/command/ArgumentCompletionFunctions.cc
code/branches/consolecommands3/src/libraries/core/command/ArgumentCompletionFunctions.h
code/branches/consolecommands3/src/libraries/core/command/ArgumentCompletionListElement.h
code/branches/consolecommands3/src/libraries/core/command/CommandEvaluation.cc
code/branches/consolecommands3/src/libraries/core/command/CommandEvaluation.h
code/branches/consolecommands3/src/libraries/core/command/CommandExecutor.cc
code/branches/consolecommands3/src/libraries/core/command/CommandExecutor.h
code/branches/consolecommands3/src/libraries/core/command/ConsoleCommand.cc
code/branches/consolecommands3/src/libraries/core/command/ConsoleCommand.h
code/branches/consolecommands3/src/libraries/core/command/ConsoleCommandCompilation.h
code/branches/consolecommands3/src/libraries/core/command/Executor.h
code/branches/consolecommands3/src/libraries/core/command/ExecutorPtr.h
code/branches/consolecommands3/src/libraries/core/command/Functor.h
code/branches/consolecommands3/src/libraries/core/command/FunctorPtr.h
code/branches/consolecommands3/src/libraries/core/command/IOConsole.cc
code/branches/consolecommands3/src/libraries/core/command/IOConsole.h
code/branches/consolecommands3/src/libraries/core/command/IRC.cc
code/branches/consolecommands3/src/libraries/core/command/IRC.h
code/branches/consolecommands3/src/libraries/core/command/Shell.cc
code/branches/consolecommands3/src/libraries/core/command/Shell.h
code/branches/consolecommands3/src/libraries/core/command/TclBind.cc
code/branches/consolecommands3/src/libraries/core/command/TclBind.h
code/branches/consolecommands3/src/libraries/core/command/TclThreadList.h
code/branches/consolecommands3/src/libraries/core/command/TclThreadManager.cc
code/branches/consolecommands3/src/libraries/core/command/TclThreadManager.h
Log:
adjusted includes in core/command/*
Modified: code/branches/consolecommands3/src/libraries/core/command/ArgumentCompleter.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/ArgumentCompleter.h 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/ArgumentCompleter.h 2010-08-22 22:58:52 UTC (rev 7203)
@@ -29,7 +29,7 @@
#ifndef _ArgumentCompleter_H__
#define _ArgumentCompleter_H__
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
#include "ArgumentCompletionListElement.h"
namespace orxonox
Modified: code/branches/consolecommands3/src/libraries/core/command/ArgumentCompletionFunctions.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/ArgumentCompletionFunctions.cc 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/ArgumentCompletionFunctions.cc 2010-08-22 22:58:52 UTC (rev 7203)
@@ -34,9 +34,9 @@
#include "util/Convert.h"
#include "util/StringUtils.h"
-#include "Identifier.h"
-#include "ConfigFileManager.h"
-#include "ConfigValueContainer.h"
+#include "core/Identifier.h"
+#include "core/ConfigFileManager.h"
+#include "core/ConfigValueContainer.h"
#include "TclThreadManager.h"
// Boost 1.36 has some issues with deprecated functions that have been omitted
Modified: code/branches/consolecommands3/src/libraries/core/command/ArgumentCompletionFunctions.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/ArgumentCompletionFunctions.h 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/ArgumentCompletionFunctions.h 2010-08-22 22:58:52 UTC (rev 7203)
@@ -29,7 +29,7 @@
#ifndef _ArgumentCompletionFunctions_H__
#define _ArgumentCompletionFunctions_H__
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
#include "ArgumentCompleter.h"
Modified: code/branches/consolecommands3/src/libraries/core/command/ArgumentCompletionListElement.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/ArgumentCompletionListElement.h 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/ArgumentCompletionListElement.h 2010-08-22 22:58:52 UTC (rev 7203)
@@ -29,7 +29,7 @@
#ifndef _ArgumentCompletionListElement_H__
#define _ArgumentCompletionListElement_H__
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
#include <list>
#include <string>
Modified: code/branches/consolecommands3/src/libraries/core/command/CommandEvaluation.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/CommandEvaluation.cc 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/CommandEvaluation.cc 2010-08-22 22:58:52 UTC (rev 7203)
@@ -30,8 +30,8 @@
#include "util/Debug.h"
#include "util/StringUtils.h"
+#include "core/Identifier.h"
#include "ConsoleCommand.h"
-#include "Identifier.h"
namespace orxonox
{
Modified: code/branches/consolecommands3/src/libraries/core/command/CommandEvaluation.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/CommandEvaluation.h 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/CommandEvaluation.h 2010-08-22 22:58:52 UTC (rev 7203)
@@ -29,7 +29,7 @@
#ifndef _CommandEvaluation_H__
#define _CommandEvaluation_H__
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
#include <string>
#include <list>
Modified: code/branches/consolecommands3/src/libraries/core/command/CommandExecutor.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/CommandExecutor.cc 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/CommandExecutor.cc 2010-08-22 22:58:52 UTC (rev 7203)
@@ -30,9 +30,9 @@
#include "util/Debug.h"
#include "util/StringUtils.h"
+#include "core/Identifier.h"
+#include "core/Language.h"
#include "ConsoleCommand.h"
-#include "Identifier.h"
-#include "Language.h"
#include "TclBind.h"
namespace orxonox
Modified: code/branches/consolecommands3/src/libraries/core/command/CommandExecutor.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/CommandExecutor.h 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/CommandExecutor.h 2010-08-22 22:58:52 UTC (rev 7203)
@@ -29,7 +29,7 @@
#ifndef _CommandExecutor_H__
#define _CommandExecutor_H__
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
#include <map>
#include <set>
Modified: code/branches/consolecommands3/src/libraries/core/command/ConsoleCommand.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/ConsoleCommand.cc 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/ConsoleCommand.cc 2010-08-22 22:58:52 UTC (rev 7203)
@@ -29,7 +29,7 @@
#include "ConsoleCommand.h"
#include <cassert>
-#include "Language.h"
+#include "core/Language.h"
namespace orxonox
{
@@ -116,7 +116,7 @@
}
}
-#include "BaseObject.h" // remove this
+#include "core/BaseObject.h" // remove this
namespace orxonox
{
Modified: code/branches/consolecommands3/src/libraries/core/command/ConsoleCommand.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/ConsoleCommand.h 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/ConsoleCommand.h 2010-08-22 22:58:52 UTC (rev 7203)
@@ -29,17 +29,17 @@
#ifndef _ConsoleCommand_H__
#define _ConsoleCommand_H__
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
#include <stack>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/facilities/expand.hpp>
#include "util/VA_NARGS.h"
+#include "core/Identifier.h"
#include "ArgumentCompletionFunctions.h"
#include "CommandExecutor.h"
#include "Executor.h"
-#include "Identifier.h"
#define SetConsoleCommand(classname, function, bCreateShortcut) \
Modified: code/branches/consolecommands3/src/libraries/core/command/ConsoleCommandCompilation.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/ConsoleCommandCompilation.h 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/ConsoleCommandCompilation.h 2010-08-22 22:58:52 UTC (rev 7203)
@@ -29,7 +29,7 @@
#ifndef _ConsoleCommandCompilation_H__
#define _ConsoleCommandCompilation_H__
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
namespace orxonox
{
Modified: code/branches/consolecommands3/src/libraries/core/command/Executor.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/Executor.h 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/Executor.h 2010-08-22 22:58:52 UTC (rev 7203)
@@ -30,7 +30,7 @@
#ifndef _Executor_H__
#define _Executor_H__
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
#include <string>
#include "util/MultiType.h"
Modified: code/branches/consolecommands3/src/libraries/core/command/ExecutorPtr.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/ExecutorPtr.h 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/ExecutorPtr.h 2010-08-22 22:58:52 UTC (rev 7203)
@@ -29,8 +29,8 @@
#ifndef _ExecutorPtr_H__
#define _ExecutorPtr_H__
-#include "CorePrereqs.h"
-#include "SharedPtr.h"
+#include "core/CorePrereqs.h"
+#include "core/SharedPtr.h"
namespace orxonox
{
Modified: code/branches/consolecommands3/src/libraries/core/command/Functor.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/Functor.h 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/Functor.h 2010-08-22 22:58:52 UTC (rev 7203)
@@ -32,7 +32,7 @@
#include <typeinfo>
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
#include "util/Convert.h"
#include "util/Debug.h"
Modified: code/branches/consolecommands3/src/libraries/core/command/FunctorPtr.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/FunctorPtr.h 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/FunctorPtr.h 2010-08-22 22:58:52 UTC (rev 7203)
@@ -29,8 +29,8 @@
#ifndef _FunctorPtr_H__
#define _FunctorPtr_H__
-#include "CorePrereqs.h"
-#include "SharedPtr.h"
+#include "core/CorePrereqs.h"
+#include "core/SharedPtr.h"
namespace orxonox
{
Modified: code/branches/consolecommands3/src/libraries/core/command/IOConsole.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/IOConsole.cc 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/IOConsole.cc 2010-08-22 22:58:52 UTC (rev 7203)
@@ -34,8 +34,8 @@
#include "util/Clock.h"
#include "util/Math.h"
-#include "Game.h"
-#include "input/InputBuffer.h"
+#include "core/Game.h"
+#include "core/input/InputBuffer.h"
// ##########################
// ### Mutual methods ###
Modified: code/branches/consolecommands3/src/libraries/core/command/IOConsole.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/IOConsole.h 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/IOConsole.h 2010-08-22 22:58:52 UTC (rev 7203)
@@ -30,7 +30,7 @@
#ifndef _IOConsole_H__
#define _IOConsole_H__
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
#include <sstream>
#include <string>
Modified: code/branches/consolecommands3/src/libraries/core/command/IRC.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/IRC.cc 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/IRC.cc 2010-08-22 22:58:52 UTC (rev 7203)
@@ -33,8 +33,8 @@
#include "util/Convert.h"
#include "util/Exception.h"
#include "util/StringUtils.h"
+#include "core/CoreIncludes.h"
#include "ConsoleCommand.h"
-#include "CoreIncludes.h"
#include "TclThreadManager.h"
namespace orxonox
Modified: code/branches/consolecommands3/src/libraries/core/command/IRC.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/IRC.h 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/IRC.h 2010-08-22 22:58:52 UTC (rev 7203)
@@ -29,10 +29,10 @@
#ifndef _IRC_H__
#define _IRC_H__
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
#include <string>
-#include "OrxonoxClass.h"
+#include "core/OrxonoxClass.h"
namespace orxonox
{
Modified: code/branches/consolecommands3/src/libraries/core/command/Shell.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/Shell.cc 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/Shell.cc 2010-08-22 22:58:52 UTC (rev 7203)
@@ -31,10 +31,10 @@
#include "util/OutputHandler.h"
#include "util/StringUtils.h"
#include "util/SubString.h"
+#include "core/CoreIncludes.h"
+#include "core/ConfigFileManager.h"
+#include "core/ConfigValueIncludes.h"
#include "CommandExecutor.h"
-#include "CoreIncludes.h"
-#include "ConfigFileManager.h"
-#include "ConfigValueIncludes.h"
#include "ConsoleCommand.h"
namespace orxonox
Modified: code/branches/consolecommands3/src/libraries/core/command/Shell.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/Shell.h 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/Shell.h 2010-08-22 22:58:52 UTC (rev 7203)
@@ -29,7 +29,7 @@
#ifndef _Shell_H__
#define _Shell_H__
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
#include <list>
#include <sstream>
@@ -37,8 +37,8 @@
#include <vector>
#include "util/OutputHandler.h"
-#include "OrxonoxClass.h"
-#include "input/InputBuffer.h"
+#include "core/OrxonoxClass.h"
+#include "core/input/InputBuffer.h"
namespace orxonox
{
Modified: code/branches/consolecommands3/src/libraries/core/command/TclBind.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/TclBind.cc 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/TclBind.cc 2010-08-22 22:58:52 UTC (rev 7203)
@@ -36,9 +36,9 @@
#include "util/Debug.h"
#include "util/Exception.h"
#include "util/StringUtils.h"
+#include "core/PathConfig.h"
#include "CommandExecutor.h"
#include "ConsoleCommand.h"
-#include "PathConfig.h"
#include "TclThreadManager.h"
namespace orxonox
Modified: code/branches/consolecommands3/src/libraries/core/command/TclBind.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/TclBind.h 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/TclBind.h 2010-08-22 22:58:52 UTC (rev 7203)
@@ -29,7 +29,7 @@
#ifndef _TclBind_H__
#define _TclBind_H__
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
#include <cassert>
#include <string>
Modified: code/branches/consolecommands3/src/libraries/core/command/TclThreadList.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/TclThreadList.h 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/TclThreadList.h 2010-08-22 22:58:52 UTC (rev 7203)
@@ -29,7 +29,7 @@
#ifndef _TclThreadList_H__
#define _TclThreadList_H__
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
#include <list>
Modified: code/branches/consolecommands3/src/libraries/core/command/TclThreadManager.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/TclThreadManager.cc 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/TclThreadManager.cc 2010-08-22 22:58:52 UTC (rev 7203)
@@ -39,9 +39,9 @@
#include "util/Convert.h"
#include "util/Exception.h"
#include "util/StringUtils.h"
+#include "core/CoreIncludes.h"
#include "CommandExecutor.h"
#include "ConsoleCommand.h"
-#include "CoreIncludes.h"
#include "TclBind.h"
#include "TclThreadList.h"
Modified: code/branches/consolecommands3/src/libraries/core/command/TclThreadManager.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/command/TclThreadManager.h 2010-08-22 22:54:08 UTC (rev 7202)
+++ code/branches/consolecommands3/src/libraries/core/command/TclThreadManager.h 2010-08-22 22:58:52 UTC (rev 7203)
@@ -29,7 +29,7 @@
#ifndef _TclThreadManager_H__
#define _TclThreadManager_H__
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
#include <cassert>
#include <list>
@@ -37,7 +37,7 @@
#include <string>
#include "util/Singleton.h"
-#include "OrxonoxClass.h"
+#include "core/OrxonoxClass.h"
struct Tcl_Interp;
More information about the Orxonox-commit
mailing list