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

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.cc (modified) (3 diffs)

code/trunk/src/core/CommandExecutor.cc

@@ -31 +31 @@
 #include "util/String.h"
 #include "util/Convert.h"
+#include "util/SubString.h"
 #include "Identifier.h"
 #include "Language.h"
@@ -173 +174 @@
     }
 
-    KeybindMode CommandEvaluation::getKeybindMode()
+    KeybindMode::Enum CommandEvaluation::getKeybindMode()
     {
         if (this->state_ == CS_Shortcut_Params || this->state_ == CS_Shortcut_Finished)
@@ -198 +199 @@
         }
         // FIXME: Had to insert a return statement
-        return (KeybindMode)0;
+        return (KeybindMode::Enum)0;
     }