Changeset 7610 in orxonox.OLD

Timestamp:

May 12, 2006, 11:49:48 AM (18 years ago)

Author:

bensch

Message:

orxonox/qt_gui: directory splitted into declaration and definition

Location:

branches/qt_gui/src/lib

Files:

• Makefile.am (modified) (1 diff)
• shell/shell_completion_plugin.cc (modified) (1 diff)
• util/directory.cc (added)
• util/directory.h (modified) (3 diffs)

branches/qt_gui/src/lib/Makefile.am

@@ -25 +25 @@
                 util/preferences.cc \
                 util/threading.cc \
+                util/directory.cc \
                 \
                 data/data_tank.cc

branches/qt_gui/src/lib/shell/shell_completion_plugin.cc

@@ -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.

branches/qt_gui/src/lib/util/directory.h

@@ -17 +17 @@
  */
 
-#ifndef OSLINK_OSDIR_HEADER_H_
-#define OSLINK_OSDIR_HEADER_H_
+#ifndef __DIRECTORY_H_
+#define __DIRECTORY_H_
 
 #if defined(unix) || defined(__unix) || defined(__unix__)
@@ -31 +31 @@
 
 #if defined(OSLINK_OSDIR_NOTSUPPORTED)
-
-namespace OS
-{
-  class Directory
-  {
-    public:
-      Directory(const std::string&) { }
-      bool open(const std::string&) {};
-      void close() {};
-
-      operator void*() const { return (void*)0; }
-      std::string next() { return ""; }
-  };
-}
+#warning DIRECTORY NOT SUPPORTET
 
 #elif defined(OSLINK_OSDIR_POSIX)
-
 #include <sys/types.h>
 #include <dirent.h>
 
-namespace OS
-{
-  class Directory
-  {
-    public:
-      Directory(const std::string& directoryName = "")
-          : willfail(false)
-      {
-        this->handle = NULL;
-        this->willfail = true;
-        this->open(directoryName);
-      }
-
-      ~Directory()
-      {
-        this->close();
-      }
-
-      bool open(const std::string& directoryName)
-      {
-        if (this->handle != NULL)
-          this->close();
-        this->handle = opendir(directoryName.c_str());
-        if (!handle)
-          willfail = true;
-        else
-        {
-          willfail = false;
-          dirent* entry = readdir(handle);
-          if (entry)
-            current = entry->d_name;
-          else
-            willfail = true;
-        }
-      }
-
-      void close()
-      {
-        if (this->handle != NULL)
-          closedir(handle);
-        this->handle = NULL;
-        this->willfail = true;
-        this->current = "";
-      }
-
-      operator void*() const
-      {
-        return willfail ? (void*)0:(void*)(-1);
-      }
-
-      std::string next()
-      {
-        std::string prev(current);
-        dirent* entry = readdir(handle);
-        if (entry)
-          current = entry->d_name;
-        else
-          willfail = true;
-        return prev;
-      }
-
-    private:
-      DIR* handle;
-      bool willfail;
-      std::string current;
-  };
-}
-
 #elif defined(OSLINK_OSDIR_WINDOWS)
 
+/// HACK
 #ifdef DATADIR
 #undef DATADIR
@@ -128 +47 @@
 #include <winbase.h>
 
-namespace OS
+#endif
+
+class Directory
 {
-  class Directory
-  {
-    public:
-      Directory(const std::string& directoryName = "")
-          : handle(INVALID_HANDLE_VALUE), willfail(true)
-      {
-        this->open(directoryName);
-      }
+public:
+  Directory(const std::string& directoryName = "");
+  ~Directory();
 
-      ~Directory()
-      {
-        this->close();
-      }
+  bool open(const std::string& directoryName);
+  void close();
+  operator void*() const { return willfail ? (void*)0:(void*)(-1); }
 
-      bool open(const std::string& directoryName)
-      {
-        if (handle != INVALID_HANDLE_VALUE)
-          this->close();
+  std::string next();
 
-        // First check the attributes trying to access a non-Directory with
-        // FindFirstFile takes ages
-        DWORD attrs = GetFileAttributes(directoryName.c_str());
-        if ( (attrs == 0xFFFFFFFF) || ((attrs && FILE_ATTRIBUTE_DIRECTORY) == 0) )
-        {
-          willfail = true;
-          return false;
-        }
-        std::string Full(directoryName);
-        // Circumvent a problem in FindFirstFile with c:\\* as parameter
-        if ( (Full.length() > 0) && (Full[Full.length()-1] != '\\') )
-          Full += "\\";
-        WIN32_FIND_DATA entry;
-        handle = FindFirstFile( (Full+"*").c_str(), &entry);
-        if (handle == INVALID_HANDLE_VALUE)
-          {
-            willfail = true;
-            return false;
-          }
-        else
-          {
-            willfail = false;
-            current = entry.cFileName;
-            return true;
-          }
-      }
-
-      void close()
-      {
-        if (handle != INVALID_HANDLE_VALUE)
-          FindClose(handle);
-        this->willfail = true;
-      }
-
-      operator void*() const
-      {
-        return willfail ? (void*)0:(void*)(-1);
-      }
-
-      std::string next()
-      {
-        std::string prev = current;
-        WIN32_FIND_DATA entry;
-        int ok = FindNextFile(handle, &entry);
-        if (!ok)
-          willfail = true;
-        else
-          current = entry.cFileName;
-        return current;
-      }
+private:
+#if defined(OSLINK_OSDIR_POSIX)
+  DIR* handle;
+#elif defined(OSLINK_OSDIR_WINDOWS)
+    HANDLE    handle;
+#endif
+  bool willfail;
+  std::string current;
+};
 
 
-    private:
-      HANDLE    handle;
-      bool      willfail;
-      std::string current;
-  };
-}
 
-
-#endif
-
-#endif
+#endif /* __DIRECTORY_H_ */
 
 /**