From 8f4b304df195e0ac50a270815b5b9a1c423a1f6b Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 26 May 2014 02:00:46 +0200 Subject: [PATCH] Renamed Directory::SetDirectory to Directory::SetPath Added Directory::GetPath Former-commit-id: 0d2918557962b05ea7c9a16c82e6afc961db32a8 --- include/Nazara/Core/Directory.hpp | 5 +++-- src/Nazara/Core/Directory.cpp | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/include/Nazara/Core/Directory.hpp b/include/Nazara/Core/Directory.hpp index 21dd54dbe..1a7ae5905 100644 --- a/include/Nazara/Core/Directory.hpp +++ b/include/Nazara/Core/Directory.hpp @@ -38,6 +38,7 @@ class NAZARA_API NzDirectory bool Exists() const; + NzString GetPath() const; NzString GetPattern() const; NzString GetResultName() const; NzString GetResultPath() const; @@ -50,7 +51,7 @@ class NAZARA_API NzDirectory bool Open(); - void SetDirectory(const NzString& dirPath); + void SetPath(const NzString& dirPath); void SetPattern(const NzString& pattern); static bool Copy(const NzString& sourcePath, const NzString& destPath); @@ -66,7 +67,7 @@ class NAZARA_API NzDirectory NzString m_dirPath; NzString m_pattern; - NzDirectoryImpl* m_impl = nullptr; + NzDirectoryImpl* m_impl; }; #endif // NAZARA_DIRECTORY_HPP diff --git a/src/Nazara/Core/Directory.cpp b/src/Nazara/Core/Directory.cpp index 2969e578c..32ce320ef 100644 --- a/src/Nazara/Core/Directory.cpp +++ b/src/Nazara/Core/Directory.cpp @@ -30,13 +30,15 @@ namespace } NzDirectory::NzDirectory() : -m_pattern('*') +m_pattern('*'), +m_impl(nullptr) { } NzDirectory::NzDirectory(const NzString& dirPath) : m_dirPath(dirPath), -m_pattern('*') +m_pattern('*'), +m_impl(nullptr) { } @@ -67,6 +69,13 @@ bool NzDirectory::Exists() const return Exists(m_dirPath); } +NzString NzDirectory::GetPath() const +{ + NazaraLock(m_mutex); + + return m_dirPath; +} + NzString NzDirectory::GetPattern() const { NazaraLock(m_mutex); @@ -193,7 +202,7 @@ bool NzDirectory::Open() return true; } -void NzDirectory::SetDirectory(const NzString& dirPath) +void NzDirectory::SetPath(const NzString& dirPath) { NazaraLock(m_mutex);