Changeset 9667 for code/trunk/src/libraries/core/command

Timestamp:

Aug 25, 2013, 9:08:42 PM (11 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/command/ArgumentCompletionFunctions.cc (modified) (1 diff)
• src/libraries/core/command/Functor.h (modified) (2 diffs)
• src/libraries/core/command/IOConsolePOSIX.cc (modified) (1 diff)
• src/libraries/core/command/IOConsoleWindows.cc (modified) (1 diff)
• src/libraries/core/command/Shell.cc (modified) (4 diffs)
• src/libraries/core/command/Shell.h (modified) (3 diffs)

code/trunk/src/libraries/core/command/ArgumentCompletionFunctions.cc

@@ -39 +39 @@
 #include "util/Convert.h"
 #include "util/StringUtils.h"
-#include "core/Identifier.h"
-#include "core/ConfigFileManager.h"
-#include "core/ConfigValueContainer.h"
+#include "core/class/Identifier.h"
+#include "core/config/SettingsConfigFile.h"
+#include "core/config/ConfigValueContainer.h"
 #include "CommandExecutor.h"
 #include "ConsoleCommand.h"

code/trunk/src/libraries/core/command/Functor.h

@@ -120 +120 @@
 #include "util/Output.h"
 #include "util/MultiType.h"
-#include "core/OrxonoxClass.h"
+#include "core/object/Destroyable.h"
 #include "FunctorPtr.h"
 
@@ -303 +303 @@
             /// Casts the object and registers as destruction listener.
             inline void registerObject(O* object)
-                { OrxonoxClass* base = dynamic_cast<OrxonoxClass*>(object); if (base) { this->registerAsDestructionListener(base); } }
+                { Destroyable* base = dynamic_cast<Destroyable*>(object); if (base) { this->registerAsDestructionListener(base); } }
             /// Casts the object and unregisters as destruction listener.
             inline void unregisterObject(O* object)
-                { OrxonoxClass* base = dynamic_cast<OrxonoxClass*>(object); if (base) { this->unregisterAsDestructionListener(base); } }
-
-            /// Will be called by OrxonoxClass::~OrxonoxClass() if the stored object is deleted and the Functor is in safe mode.
+                { Destroyable* base = dynamic_cast<Destroyable*>(object); if (base) { this->unregisterAsDestructionListener(base); } }
+
+            /// Will be called by Destroyable::~Destroyable() if the stored object is deleted and the Functor is in safe mode.
             inline void objectDeleted()
                 { this->object_ = 0; }

code/trunk/src/libraries/core/command/IOConsolePOSIX.cc

@@ -99 +99 @@
 
         resetTerminalMode();
-        this->shell_->destroy();
+        delete this->shell_;
 
         // Restore this->cout_ redirection

code/trunk/src/libraries/core/command/IOConsoleWindows.cc

@@ -113 +113 @@
 
         resetTerminalMode();
-        this->shell_->destroy();
+        delete this->shell_;
     }
 

code/trunk/src/libraries/core/command/Shell.cc

@@ -40 +40 @@
 #include "util/output/MemoryWriter.h"
 #include "core/CoreIncludes.h"
-#include "core/ConfigFileManager.h"
-#include "core/ConfigValueIncludes.h"
+#include "core/config/ConfigFileManager.h"
+#include "core/config/ConfigValueIncludes.h"
 #include "core/PathConfig.h"
 #include "core/input/InputBuffer.h"
@@ -55 +55 @@
         const OutputLevel User = level::user_info;
     }
+
+    RegisterClassNoArgs(Shell);
 
     /**
@@ -66 +68 @@
         , bScrollable_(bScrollable)
     {
-        RegisterRootObject(Shell);
+        RegisterObject(Shell);
 
         OutputManager::getInstance().registerListener(this);
@@ -96 +98 @@
     Shell::~Shell()
     {
-        this->inputBuffer_->destroy();
+        delete this->inputBuffer_;
 
         OutputManager::getInstance().unregisterListener(this);

code/trunk/src/libraries/core/command/Shell.h

@@ -50 +50 @@
 #include "util/output/BaseWriter.h"
 #include "core/Core.h"
-#include "core/OrxonoxClass.h"
 
 namespace orxonox
@@ -110 +109 @@
             };
 
-            Shell(const std::string& consoleName, bool bScrollable);
+            Shell(const std::string& consoleName = "", bool bScrollable = true);
             ~Shell();
 
@@ -200 +199 @@
             unsigned int              historyOffset_;       ///< The command history is a circular buffer, this variable defines the current write-offset
             std::vector<std::string>  commandHistory_;      ///< The history of commands that were entered by the user
-            static unsigned int       cacheSize_s;          ///< The maximum cache size of the CommandExecutor - this is stored here for better readability of the config file and because CommandExecutor is no OrxonoxClass
+            static unsigned int       cacheSize_s;          ///< The maximum cache size of the CommandExecutor - this is stored here for better readability of the config file and because CommandExecutor is not configurable
     };
 }