Changeset 8145 in orxonox.OLD for trunk/src/lib/shell/shell_buffer.h

Timestamp:

Jun 5, 2006, 11:49:26 AM (19 years ago)

Author:

bensch

Message:

trunk: merged the gui back
merged with command:
svn merge -r8114:HEAD ​https://svn.orxonox.net/orxonox/branches/gui .
→ no conflicts

File:

• trunk/src/lib/shell/shell_buffer.h (modified) (3 diffs)

trunk/src/lib/shell/shell_buffer.h

@@ -32 +32 @@
     inline static bool isInstanciated() { return (ShellBuffer::singletonRef == NULL)?false:true; };
 
-    static bool addBufferLineStatic(const char* line, ...);
-    void addBufferLine(const char* line, va_list arg);
+    static void addBufferLineStatic(const char* line, ...);
+    void addBufferLine(const char* line);
 
     /// BUFFER
@@ -56 +56 @@
     unsigned int                  maxBufferSize;                         //!< The Size of the buffer
 
-    char                          bufferArray[SHELL_BUFFER_SIZE];     //!< a BUFFER for fast writing
     std::string                   keepBuffer;                         //!< a BUFFER to have multi-non-newLine commands be copied into the shell.
 
@@ -62 +61 @@
 
     // The Beginning of buffer (buffer.front()) is the last added line.
+    static char                   bufferArray[SHELL_BUFFER_SIZE];     //!< a BUFFER for fast writing
     static std::list<std::string> buffer;                             //!< A list of stored char-arrays(strings) to store the history
   };