Fix 'free-nonheap-object' warning

Author: noobie-iv

src/ProjectPages.cpp

@@ -39,13 +39,15 @@
 #include <assert.h>
 
 ProjectPages::ProjectPages(Qt::LayoutDirection const layout_direction)
+    : m_refCounter(0)
 {
     initSubPagesInOrder(layout_direction);
 }
 
 ProjectPages::ProjectPages(
-    std::vector<ImageInfo> const& info,
+    std::vector<ImageInfo> const &info,
     Qt::LayoutDirection const layout_direction)
+    : m_refCounter(0)
 {
     initSubPagesInOrder(layout_direction);
 
@@ -74,8 +76,9 @@ ProjectPages::ProjectPages(
 }
 
 ProjectPages::ProjectPages(
-    std::vector<ImageFileInfo> const& files,
+    std::vector<ImageFileInfo> const &files,
     Pages const pages, Qt::LayoutDirection const layout_direction)
+    : m_refCounter(0)
 {
     initSubPagesInOrder(layout_direction);
 

src/ProjectPages.h

@@ -20,14 +20,14 @@
 #define PROJECT_PAGES_H_
 
 #include "NonCopyable.h"
-#include "RefCountable.h"
 #include "ImageMetadata.h"
 #include "ImageId.h"
 #include "PageId.h"
 #include "PageInfo.h"
 #include "PageView.h"
 #include "BeforeOrAfter.h"
 #include "VirtualFunction.h"
+#include <QAtomicInt>
 #include <QObject>
 #include <QMutex>
 #include <QString>
@@ -45,7 +45,7 @@ class AbstractRelinker;
 class QDomElement;
 class QSize;
 
-class ProjectPages : public QObject, public RefCountable
+class ProjectPages : public QObject
 {
     Q_OBJECT
     DECLARE_NON_COPYABLE(ProjectPages)
@@ -63,6 +63,19 @@ class ProjectPages : public QObject, public RefCountable
 
     virtual ~ProjectPages();
 
+    void ref() const
+    {
+        m_refCounter.fetchAndAddRelaxed(1);
+    }
+
+    void unref() const
+    {
+        if (m_refCounter.fetchAndAddRelease(-1) == 1)
+        {
+            delete this;
+        }
+    }
+
     Qt::LayoutDirection layoutDirection() const;
 
     PageSequence toPageSequence(PageView view) const;
@@ -167,6 +180,7 @@ class ProjectPages : public QObject, public RefCountable
 
     PageInfo unremovePageImpl(PageId const& page_id, bool& modified);
 
+    mutable QAtomicInt m_refCounter;
     mutable QMutex m_mutex;
     std::vector<ImageDesc> m_images;
     PageId::SubPage m_subPagesInOrder[2];