From b4311d79a9bf3228e3bb43b53aeb687a45d55422 Mon Sep 17 00:00:00 2001
From: Robert Knight <robertknight@gmail.com>
Date: Wed, 24 Aug 2011 11:53:02 +0100
Subject: [PATCH] Rename Dir to DirIterator

---
 src/CMakeLists.txt               |  4 ++--
 src/{Dir.cpp => DirIterator.cpp} | 14 +++++++-------
 src/{Dir.h => DirIterator.h}     |  6 +++---
 src/FileOps.cpp                  |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename src/{Dir.cpp => DirIterator.cpp} (84%)
 rename src/{Dir.h => DirIterator.h} (88%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e9d10c8..c20f7b2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,7 +21,7 @@ endif()
 add_definitions(-DTIXML_USE_STL)
 
 set (SOURCES
-  Dir.cpp
+  DirIterator.cpp
   FileOps.cpp
   Log.cpp
   ProcessUtils.cpp
@@ -41,7 +41,7 @@ if (WIN32)
 endif()
 
 set (HEADERS
-  Dir.h
+  DirIterator.h
   FileOps.h
   Log.h
   ProcessUtils.h
diff --git a/src/Dir.cpp b/src/DirIterator.cpp
similarity index 84%
rename from src/Dir.cpp
rename to src/DirIterator.cpp
index 3e4d492..476b570 100644
--- a/src/Dir.cpp
+++ b/src/DirIterator.cpp
@@ -1,4 +1,4 @@
-#include "Dir.h"
+#include "DirIterator.h"
 
 #include "Log.h"
 #include "StringUtils.h"
@@ -15,7 +15,7 @@ bool endsWith(const std::string& str, const char* text)
 	return str.find(text,str.size() - length) != 0;
 }
 
-Dir::Dir(const char* path)
+DirIterator::DirIterator(const char* path)
 {
 	m_path = path;
 
@@ -37,7 +37,7 @@ Dir::Dir(const char* path)
 #endif
 }
 
-Dir::~Dir()
+DirIterator::~DirIterator()
 {
 #ifdef PLATFORM_UNIX
 	closedir(m_dir);
@@ -46,7 +46,7 @@ Dir::~Dir()
 #endif
 }
 
-bool Dir::next()
+bool DirIterator::next()
 {
 #ifdef PLATFORM_UNIX
 	m_entry = readdir(m_dir);
@@ -66,7 +66,7 @@ bool Dir::next()
 #endif
 }
 
-std::string Dir::fileName() const
+std::string DirIterator::fileName() const
 {
 #ifdef PLATFORM_UNIX
 	return m_entry->d_name;
@@ -75,12 +75,12 @@ std::string Dir::fileName() const
 #endif
 }
 
-std::string Dir::filePath() const
+std::string DirIterator::filePath() const
 {
 	return m_path + '/' + fileName();
 }
 
-bool Dir::isDir() const
+bool DirIterator::isDir() const
 {
 #ifdef PLATFORM_UNIX
 	return m_entry->d_type == DT_DIR;
diff --git a/src/Dir.h b/src/DirIterator.h
similarity index 88%
rename from src/Dir.h
rename to src/DirIterator.h
index fc0e2af..d1d4faa 100644
--- a/src/Dir.h
+++ b/src/DirIterator.h
@@ -8,11 +8,11 @@
 #include <dirent.h>
 #endif
 
-class Dir
+class DirIterator
 {
 	public:
-		Dir(const char* path);
-		~Dir();
+		DirIterator(const char* path);
+		~DirIterator();
 
 		// iterate to the next entry in the directory
 		bool next();
diff --git a/src/FileOps.cpp b/src/FileOps.cpp
index 5ac9fe0..b84cf0c 100644
--- a/src/FileOps.cpp
+++ b/src/FileOps.cpp
@@ -1,6 +1,6 @@
 #include "FileOps.h"
 
-#include "Dir.h"
+#include "DirIterator.h"
 #include "Log.h"
 #include "Platform.h"
 #include "StringUtils.h"
@@ -266,7 +266,7 @@ void FileOps::touch(const char* path) throw (IOException)
 void FileOps::rmdirRecursive(const char* path) throw (IOException)
 {
 	// remove dir contents
-	Dir dir(path);
+	DirIterator dir(path);
 	while (dir.next())
 	{
 		std::string name = dir.fileName();