Changeset 7625 in orxonox.OLD for branches

Timestamp:

May 16, 2006, 9:17:10 AM (19 years ago)

Author:

bensch

Message:

qt_gui: Directory in File-style

Location:

branches/qt_gui/src/lib

Files:

• parser/ini_parser/ini_parser.h (modified) (1 diff)
• shell/shell_completion_plugin.cc (modified) (2 diffs)
• util/directory.cc (modified) (4 diffs)
• util/directory.h (modified) (1 diff)
• util/file.h (modified) (1 diff)

branches/qt_gui/src/lib/parser/ini_parser/ini_parser.h

@@ -18 +18 @@
  * This class can be used to load an initializer file and parse it's contents for variablename=value pairs.
  */
-class IniParser
+class IniParser : public File
 {
   private:

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

@@ -98 +98 @@
     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;

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

@@ -42 +42 @@
 #endif
 Directory::Directory(const std::string& directoryName)
-    : willfail(false)
+  : File(directoryName), willfail(false)
 {
   this->handle = 0;
@@ -52 +52 @@
 }
 
-bool Directory::open(const std::string& directoryName)
+bool Directory::open()
 {
 #if not defined(__WIN32__)
   if (this->handle != NULL)
     this->close();
-  this->handle = opendir(directoryName.c_str());
+  this->handle = opendir(this->name().c_str());
   if (!handle)
     willfail = true;
@@ -75 +75 @@
     // First check the attributes trying to access a non-Directory with
     // FindFirstFile takes ages
-    DWORD attrs = GetFileAttributes(directoryName.c_str());
+    DWORD attrs = GetFileAttributes(this->name().c_str());
     if ( (attrs == 0xFFFFFFFF) || ((attrs && FILE_ATTRIBUTE_DIRECTORY) == 0) )
     {
@@ -81 +81 @@
       return false;
     }
-    std::string Full(directoryName);
+    std::string Full(this->name());
     // Circumvent a problem in FindFirstFile with c:\\* as parameter
     if ( (Full.length() > 0) && (Full[Full.length()-1] != '\\') )

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

@@ -42 +42 @@
   ~Directory();
 
-  virtual bool open(const std::string& directoryName);
+  virtual bool open();
   virtual bool close();
   operator void*() const { return willfail ? (void*)0:(void*)(-1); }

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

@@ -11 +11 @@
 typedef struct stat;
 
+//! A Class to Handle Files.
 class File
 {
   public:
+  //! How the File should be opened.
   typedef enum
   {
-    ReadOnly,
-    WriteOnly,
-    ReadWrite,
-    Append,
+    ReadOnly,      //!< ReadOnly mode
+    WriteOnly,     //!< WriteOnly mode
+    ReadWrite,     //!< Read and Write mode together
+    Append,        //!< Append at the end.
   } OpenMode;