Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop

Conflicts:
	CMakeLists.txt
	gui/MainWindow.cpp

1 files changed, 43 insertions, 0 deletions

diff --git a/mmc_updater/src/DirIterator.h b/mmc_updater/src/DirIterator.h
new file mode 100644
index 00000000..f3fbb955
--- /dev/null
+++ b/mmc_updater/src/DirIterator.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include "Platform.h"
+
+#include <string>
+
+#ifdef PLATFORM_UNIX
+#include <dirent.h>
+#endif
+
+/** Simple class for iterating over the files in a directory
+  * and reporting their names and types.
+  */
+class DirIterator
+{
+	public:
+		DirIterator(const char* path);
+		~DirIterator();
+
+		// iterate to the next entry in the directory
+		bool next();
+
+		// methods to return information about
+		// the current entry
+		std::string fileName() const;
+		std::string filePath() const;
+		bool isDir() const;
+	
+	private:
+		std::string m_path;
+
+#ifdef PLATFORM_UNIX
+		DIR* m_dir;
+		dirent* m_entry;
+#endif
+
+#ifdef PLATFORM_WINDOWS
+		HANDLE m_findHandle;
+		WIN32_FIND_DATA m_findData;
+		bool m_firstEntry;
+#endif
+};
+