sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed Directory::SetDirectory to Directory::SetPath 

Added Directory::GetPath


Former-commit-id: 0d2918557962b05ea7c9a16c82e6afc961db32a8
This commit is contained in:
Lynix 2014-05-26 02:00:46 +02:00
parent ee55847220
commit 8f4b304df1
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/Nazara/Core/Directory.hpp
View File

@ -38,6 +38,7 @@ class NAZARA_API NzDirectory
bool Exists() const; bool Exists() const;
NzString GetPath() const;
NzString GetPattern() const; NzString GetPattern() const;
NzString GetResultName() const; NzString GetResultName() const;
NzString GetResultPath() const; NzString GetResultPath() const;
@ -50,7 +51,7 @@ class NAZARA_API NzDirectory
bool Open(); bool Open();
void SetDirectory(const NzString& dirPath); void SetPath(const NzString& dirPath);
void SetPattern(const NzString& pattern); void SetPattern(const NzString& pattern);
static bool Copy(const NzString& sourcePath, const NzString& destPath); static bool Copy(const NzString& sourcePath, const NzString& destPath);
@ -66,7 +67,7 @@ class NAZARA_API NzDirectory
NzString m_dirPath; NzString m_dirPath;
NzString m_pattern; NzString m_pattern;
NzDirectoryImpl* m_impl = nullptr; NzDirectoryImpl* m_impl;
}; };
#endif // NAZARA_DIRECTORY_HPP #endif // NAZARA_DIRECTORY_HPP

15
src/Nazara/Core/Directory.cpp
View File

@ -30,13 +30,15 @@ namespace
} }
NzDirectory::NzDirectory() : NzDirectory::NzDirectory() :
m_pattern('*') m_pattern('*'),
m_impl(nullptr)
{ {
} }
NzDirectory::NzDirectory(const NzString& dirPath) : NzDirectory::NzDirectory(const NzString& dirPath) :
m_dirPath(dirPath), m_dirPath(dirPath),
m_pattern('*') m_pattern('*'),
m_impl(nullptr)
{ {
} }
@ -67,6 +69,13 @@ bool NzDirectory::Exists() const
return Exists(m_dirPath); return Exists(m_dirPath);
} }
NzString NzDirectory::GetPath() const
{
NazaraLock(m_mutex);
return m_dirPath;
}
NzString NzDirectory::GetPattern() const NzString NzDirectory::GetPattern() const
{ {
NazaraLock(m_mutex); NazaraLock(m_mutex);
@ -193,7 +202,7 @@ bool NzDirectory::Open()
return true; return true;
} }
void NzDirectory::SetDirectory(const NzString& dirPath) void NzDirectory::SetPath(const NzString& dirPath)
{ {
NazaraLock(m_mutex); NazaraLock(m_mutex);