Changeset 9869 in orxonox.OLD for trunk/src/lib/shell/shell_completion_plugin.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/shell/shell_completion_plugin.cc (modified) (4 diffs)

trunk/src/lib/shell/shell_completion_plugin.cc

@@ -21 +21 @@
 #include "shell_command.h"
 
-#include "substring.h"
-#include "class_list.h"
+#include "helper_functions.h"
 #include "loading/resource_manager.h"
 
@@ -98 +97 @@
     if (completionBegin.empty()) // if we do not yet have the beginning of the line, start with the chosen startDir.
     {
-      dir.setFileName(ResourceManager::getInstance()->getDataDir() + this->_subDir);
+      dir.setFileName(Resources::ResourceManager::getInstance()->mainGlobalPath().name() + this->_subDir);
       dir.open();
       for(unsigned int i = 0; i < dir.fileCount(); i++ )
@@ -113 +112 @@
         directoryName = completionBegin.substr(0, pos);
 
-      dir.setFileName(ResourceManager::getInstance()->getDataDir() + directoryName);
+      dir.setFileName(Resources::ResourceManager::getInstance()->mainGlobalPath().name() + directoryName);
       dir.open();
 
@@ -136 +135 @@
           continue;
         }
-        printf("%s\n", (ResourceManager::getInstance()->getDataDir() + fileName).c_str());
+        printf("%s\n", (Resources::ResourceManager::getInstance()->mainGlobalPath().name() + fileName).c_str());
         if (!nocaseCmp(completionBegin, fileName, completionBegin.size()) &&
-             ResourceManager::isInDataDir(fileName))
+             Resources::ResourceManager::getInstance()->checkFileInMainPath(fileName))
         {
           printf("Dir %s\n", fileName.c_str());