Merge

3 files changed, 9 insertions, 35 deletions

diff --git a/src/directoryrefresher.cpp b/src/directoryrefresher.cpp
index a2a3ef77..21d1f811 100644
--- a/src/directoryrefresher.cpp
+++ b/src/directoryrefresher.cpp
@@ -63,8 +63,8 @@ void DirectoryRefresher::cleanStructure(DirectoryEntry *structure)
   }
 
   static wchar_t *dirs[] = { L"fomod" };
-  for (int i = 0; i < sizeof(files) / sizeof(wchar_t*); ++i) {
-    structure->removeDir(dirs[i]);
+  for (int i = 0; i < sizeof(dirs) / sizeof(wchar_t*); ++i) {
+    structure->removeDir(std::wstring(dirs[i]));
   }
 }
 
diff --git a/src/modlist.h b/src/modlist.h
index 314839fe..e0bc9df9 100644
--- a/src/modlist.h
+++ b/src/modlist.h
@@ -257,7 +257,7 @@ private:
 
   struct TModInfoChange {
     QString name;
-    QFlags<IModList::ModStates> state;
+    QFlags<IModList::ModState> state;
   };
 
 private:
diff --git a/src/organizer.pro b/src/organizer.pro
index 95f5d753..c16196d7 100644
--- a/src/organizer.pro
+++ b/src/organizer.pro
@@ -265,6 +265,8 @@ TRANSLATIONS = organizer_de.ts \
 

 LIBS += -lmo_shared -luibase -lshell32 -lole32 -luser32 -ladvapi32 -lgdi32 -lPsapi -lVersion -lbsatk -lshlwapi

 

+LIBS += -L"$(ZLIBPATH)/build" -lzlibstatic

+

 DEFINES += UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS NOMINMAX

 

 DEFINES += BOOST_DISABLE_ASSERTS NDEBUG

@@ -273,6 +275,10 @@ DEFINES += BOOST_DISABLE_ASSERTS NDEBUG
 HGID = $$system(hg id -i)

 DEFINES += HGID=\\\"$${HGID}\\\"

 

+load(moc)

+include(../common.pri)

+QMAKE_MOC += $$MOCDEFINES

+

 SRCDIR = $$PWD

 SRCDIR ~= s,/,$$QMAKE_DIR_SEP,g

 OUTDIR ~= s,/,$$QMAKE_DIR_SEP,g

@@ -321,38 +327,6 @@ OTHER_FILES += \
     tutorials/tutorials_installdialog.qml

 

 

-load(moc)

-

-# for each Boost header you include...

-QMAKE_MOC += \

-	-DBOOST_MPL_IF_HPP_INCLUDED \

-	-DBOOST_TT_TYPE_WITH_ALIGNMENT_INCLUDED \

-	-DBOOST_MPL_VOID_HPP_INCLUDED \

-	-DBOOST_MPL_NOT_HPP_INCLUDED \

-	-DBOOST_MPL_IDENTITY_HPP_INCLUDED \

-	-DBOOST_VARIANT_VARIANT_FWD_HPP \

-	-DBOOST_MPL_NEXT_PRIOR_HPP_INCLUDED \

-	-DBOOST_MPL_O1_SIZE_HPP_INCLUDED \

-	-DBOOST_MPL_DEREF_HPP_INCLUDED \

-	-DBOOST_MPL_PAIR_HPP_INCLUDED \

-	-DBOOST_MPL_ITER_FOLD_HPP_INCLUDED \

-	-DBOOST_MPL_PROTECT_HPP_INCLUDED \

-	-DBOOST_MPL_EVAL_IF_HPP_INCLUDED \

-	-DBOOST_MPL_SEQUENCE_TAG_HPP_INCLUDED \

-	-DBOOST_MPL_EMPTY_HPP_INCLUDED \

-	-DBOOST_MPL_ALWAYS_HPP_INCLUDED \

-	-DBOOST_MPL_TRANSFORM_HPP_INCLUDED \

-	-DBOOST_MPL_CLEAR_HPP_INCLUDED \

-	-DBOOST_MPL_BEGIN_END_HPP_INCLUDED \

-	-DBOOST_MPL_FOLD_HPP_INCLUDED \

-	-DBOOST_MPL_FRONT_HPP_INCLUDED \

-	-DBOOST_MPL_IS_SEQUENCE_HPP_INCLUDED \

-	-DBOOST_MPL_ITERATOR_RANGE_HPP_INCLUDED \

-	-DBOOST_MPL_MAX_ELEMENT_HPP_INCLUDED \

-	-DBOOST_MPL_PUSH_FRONT_HPP_INCLUDED \

-	-DBOOST_RESULT_OF_HPP \

-	-DBOOST_MPL_ITER_FOLD_IF_HPP_INCLUDED

-

 # leak detection with vld

 #INCLUDEPATH += "E:/Visual Leak Detector/include"

 #LIBS += -L"E:/Visual Leak Detector/lib/Win32"