Merge

1 files changed, 3 insertions, 1 deletions

diff --git a/src/shared/directoryentry.h b/src/shared/directoryentry.h
index 7836d719..d588ab02 100644
--- a/src/shared/directoryentry.h
+++ b/src/shared/directoryentry.h
@@ -29,8 +29,10 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #define WIN32_MEAN_AND_LEAN

 #include <Windows.h>

 #include <bsatk.h>

+#ifndef Q_MOC_RUN

 #include <boost/shared_ptr.hpp>

 #include <boost/weak_ptr.hpp>

+#endif

 #include "util.h"

 

 

@@ -217,7 +219,7 @@ public:
   void clear();

   bool isPopulated() const { return m_Populated; }

 

-  bool isEmpty() const { return (m_Files.size() == 0) && (m_SubDirectories.size() == 0); }

+  bool isEmpty() const { return m_Files.empty() && m_SubDirectories.empty(); }

 

   const DirectoryEntry *getParent() const { return m_Parent; }