Changeset 7624 in orxonox.OLD for branches/qt_gui/src/lib/util/directory.h

Timestamp:

May 16, 2006, 9:04:24 AM (19 years ago)

Author:

bensch

Message:

orxonox/qt_gui: directory is a File now

File:

• branches/qt_gui/src/lib/util/directory.h (modified) (3 diffs)

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

@@ +1 @@
+/*!
+ * @file directory.h
+ * @brief Definition of the Directory Handler class
+ */
+
+
 /**
  * Copyright (C) 2002 Bart Vanhauwaert
@@ -20 +26 @@
 #define __DIRECTORY_H_
 
-#if defined(unix) || defined(__unix) || defined(__unix__)
-#define OSLINK_OSDIR_POSIX
-#elif defined(_WIN32)
-#define OSLINK_OSDIR_WINDOWS
+#include "file.h"
+
+#if not defined (__WIN32__)
+ #include <sys/types.h>
+ #include <dirent.h>
 #else
-#define OSLINK_OSDIR_NOTSUPPORTED
+ #include <windows.h>
+ #include <winbase.h>
 #endif
 
-#include <string>
-
-#if defined(OSLINK_OSDIR_NOTSUPPORTED)
-#warning DIRECTORY NOT SUPPORTET
-
-#elif defined(OSLINK_OSDIR_POSIX)
-#include <sys/types.h>
-#include <dirent.h>
-
-#elif defined(OSLINK_OSDIR_WINDOWS)
-
-/// HACK
-#ifdef DATADIR
-#undef DATADIR
-#endif
-
-#include <windows.h>
-#include <winbase.h>
-
-#endif
-
-class Directory
+class Directory : public File
 {
 public:
@@ -55 +42 @@
   ~Directory();
 
-  bool open(const std::string& directoryName);
-  void close();
+  virtual bool open(const std::string& directoryName);
+  virtual bool close();
   operator void*() const { return willfail ? (void*)0:(void*)(-1); }
 
   std::string next();
 
+  bool create();
+
 private:
-#if defined(OSLINK_OSDIR_POSIX)
+#if not defined(__WIN32__)
   DIR* handle;
-#elif defined(OSLINK_OSDIR_WINDOWS)
-    HANDLE    handle;
+#else
+  HANDLE    handle;
 #endif
   bool willfail;