Merge

1 files changed, 4 insertions, 4 deletions

diff --git a/src/directoryrefresher.cpp b/src/directoryrefresher.cpp
index 1a5c025d..d21af1e3 100644
--- a/src/directoryrefresher.cpp
+++ b/src/directoryrefresher.cpp
@@ -31,7 +31,7 @@ using namespace MOShared;
 

 

 DirectoryRefresher::DirectoryRefresher()

-  : m_DirectoryStructure(NULL)

+  : m_DirectoryStructure(nullptr)

 {

 }

 

@@ -44,7 +44,7 @@ DirectoryEntry *DirectoryRefresher::getDirectoryStructure()
 {

   QMutexLocker locker(&m_RefreshLock);

   DirectoryEntry *result = m_DirectoryStructure;

-  m_DirectoryStructure = NULL;

+  m_DirectoryStructure = nullptr;

   return result;

 }

 

@@ -104,7 +104,7 @@ void DirectoryRefresher::addModFilesToStructure(DirectoryEntry *directoryStructu
     foreach (const QString &filename, stealFiles) {

       QFileInfo fileInfo(filename);

       FileEntry::Ptr file = directoryStructure->findFile(ToWString(fileInfo.fileName()));

-      if (file.get() != NULL) {

+      if (file.get() != nullptr) {

         if (file->getOrigin() == 0) {

           // replace data as the origin on this bsa

           file->removeOrigin(0);

@@ -134,7 +134,7 @@ void DirectoryRefresher::refresh()
 

   delete m_DirectoryStructure;

 

-  m_DirectoryStructure = new DirectoryEntry(L"data", NULL, 0);

+  m_DirectoryStructure = new DirectoryEntry(L"data", nullptr, 0);

 

   std::wstring dataDirectory = GameInfo::instance().getGameDirectory() + L"\\data";

   m_DirectoryStructure->addFromOrigin(L"data", dataDirectory, 0);