Merge

1 files changed, 7 insertions, 1 deletions

diff --git a/src/modlist.h b/src/modlist.h
index 6116a913..cf52b2ec 100644
--- a/src/modlist.h
+++ b/src/modlist.h
@@ -32,7 +32,9 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QListWidget>

 #include <QNetworkReply>

 #include <QNetworkAccessManager>

+#ifndef Q_MOC_RUN

 #include <boost/signals2.hpp>

+#endif

 #include <set>

 #include <vector>

 #include <QVector>

@@ -73,6 +75,8 @@ public:
    **/

   ModList(QObject *parent = NULL);

 

+  ~ModList();

+

   /**

    * @brief set the profile used for status information

    *

@@ -103,6 +107,8 @@ public:
   void modInfoAboutToChange(ModInfo::Ptr info);

   void modInfoChanged(ModInfo::Ptr info);

 

+  void disconnectSlots();

+

 public:

 

   /// \copydoc MOBase::IModList::displayName

@@ -261,7 +267,7 @@ private:
 

   struct TModInfo {

     TModInfo(unsigned int index, ModInfo::Ptr modInfo)

-        : modInfo(modInfo), nameOrder(index) {}

+        : modInfo(modInfo), nameOrder(index), priorityOrder(0), modIDOrder(0), categoryOrder(0) {}

     ModInfo::Ptr modInfo;

     unsigned int nameOrder;

     unsigned int priorityOrder;