Changeset 1349 for code/trunk/src/core/CommandExecutor.h

Timestamp:

May 21, 2008, 9:07:08 PM (16 years ago)

Author:

rgrieder

Message:

• merged input branch back to trunk

File:

• code/trunk/src/core/CommandExecutor.h (modified) (3 diffs)

code/trunk/src/core/CommandExecutor.h

@@ -70 +70 @@
     std::string read(const std::string& filename);
 
-    enum KeybindMode {}; // temporary
-
     ///////////////////////
     // CommandEvaluation //
@@ -82 +80 @@
             CommandEvaluation();
 
-            KeybindMode getKeybindMode();
+            KeybindMode::Enum getKeybindMode();
             bool isValid() const;
 
@@ -89 +87 @@
             inline std::string getAdditionalParameter() const
                 { return (this->additionalParameter_ != "") ? (" " + this->additionalParameter_) : ""; }
-            inline std::string getCommandString() const { return this->processedCommand_; }
+            inline ExecutorStatic* getEvaluatedExecutor() { return evaluatedExecutor_; }
+            inline std::string getCommandString() { return this->processedCommand_; }
 
             void setEvaluatedParameter(unsigned int index, MultiTypeMath param);