Changeset 7661 in orxonox.OLD for trunk/src/lib/shell

Timestamp:

May 18, 2006, 12:55:34 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the QT_GUI back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/qt_gui . -r7607:HEAD

absolutely no conflicts

Location:

trunk/src/lib/shell

Files:

• shell_buffer.h (modified) (1 diff)
• shell_completion_plugin.cc (modified) (4 diffs)

trunk/src/lib/shell/shell_buffer.h

@@ -10 +10 @@
 #include <stdarg.h>
 #include <list>
-#include "threading.h"
+#include "lib/util/threading.h"
 
 #define      SHELL_BUFFER_SIZE       16384         //!< The Size of the input-buffers (should be large enough to carry any kind of input)

trunk/src/lib/shell/shell_completion_plugin.cc

@@ -25 +25 @@
 #include "loading/resource_manager.h"
 
-#include "osdir.h"
+#include "directory.h"
 #include "debug.h"
 
@@ -94 +94 @@
   void CompletorFileSystem::addToCompleteList(std::vector<std::string>& completionList, const std::string& completionBegin) const
   {
-    OS::Directory dir;
+    Directory dir;
 
     if (completionBegin.empty()) // if we do not yet have the beginning of the line, start with the chosen startDir.
     {
-      dir.open(ResourceManager::getInstance()->getDataDir() + this->_subDir);
+      dir.setFileName(ResourceManager::getInstance()->getDataDir() + this->_subDir);
+      dir.open();
       while(dir)
       {
@@ -112 +113 @@
         directoryName = completionBegin.substr(0, pos);
 
-      dir.open(ResourceManager::getInstance()->getDataDir() + directoryName);
+      dir.setFileName(ResourceManager::getInstance()->getDataDir() + directoryName);
+      dir.open();
 
       std::string fileName;
@@ -136 +138 @@
         printf("%s\n", (ResourceManager::getInstance()->getDataDir() + fileName).c_str());
         if (!nocaseCmp(completionBegin, fileName, completionBegin.size()) &&
-             ResourceManager::isDir(ResourceManager::getInstance()->getDataDir() + fileName))
+             ResourceManager::isInDataDir(fileName))
         {
           printf("Dir %s\n", fileName.c_str());