Make that QXlsx::Document is the only subclass of QObject

src/xlsx/xlsxdocument.cpp

@@ -12,7 +12,7 @@ namespace QXlsx {
 DocumentPrivate::DocumentPrivate(Document *p) :
     q_ptr(p), defaultPackageName(QStringLiteral("Book1.xlsx"))
 {
-    workbook = new Workbook(p);
+    workbook = QSharedPointer<Workbook>(new Workbook);
 }
 
 void DocumentPrivate::init()
@@ -147,7 +147,7 @@ QStringList Document::documentPropertyNames() const
 Workbook *Document::workbook() const
 {
     Q_D(const Document);
-    return d->workbook;
+    return d->workbook.data();
 }
 
 bool Document::addWorksheet(const QString &name)

src/xlsx/xlsxdocument_p.h

@@ -22,7 +22,7 @@ public:
     QString packageName; //name of the .xlsx file
 
     QMap<QString, QString> documentProperties; //core, app and custom properties
-    Workbook *workbook;
+    QSharedPointer<Workbook> workbook;
 };
 
 }

src/xlsx/xlsxdrawing.cpp

@@ -3,8 +3,7 @@
 
 namespace QXlsx {
 
-Drawing::Drawing(QObject *parent) :
+Drawing::Drawing()
-    QObject(parent)
 {
     embedded = false;
     orientation = 0;

src/xlsx/xlsxdrawing_p.h

@@ -1,8 +1,8 @@
 #ifndef QXLSX_DRAWING_H
 #define QXLSX_DRAWING_H
 
-#include <QObject>
 #include <QList>
+#include <QString>
 
 class QIODevice;
 
@@ -28,11 +28,10 @@ struct XlsxDrawingDimensionData
     int shape;
 };
 
-class Drawing : public QObject
+class Drawing
 {
-    Q_OBJECT
 public:
-    explicit Drawing(QObject *parent = 0);
+    Drawing();
     void saveToXmlFile(QIODevice *device);
 
     bool embedded;

src/xlsx/xlsxrelationships_p.h

@@ -26,8 +26,8 @@
 #define XLSXRELATIONSHIPS_H
 
 #include "xlsxglobal.h"
-#include <QObject>
 #include <QList>
+#include <QString>
 class QIODevice;
 
 namespace QXlsx {

src/xlsx/xlsxstyles_p.h

@@ -40,7 +40,7 @@ struct FillData;
 struct BorderData;
 class XmlStreamWriter;
 
-class XLSX_AUTOTEST_EXPORT Styles : public QObject
+class XLSX_AUTOTEST_EXPORT Styles
 {
 public:
     Styles();

src/xlsx/xlsxworkbook.cpp

@@ -55,14 +55,15 @@ WorkbookPrivate::WorkbookPrivate(Workbook *q) :
     table_count = 0;
 }
 
-Workbook::Workbook(QObject *parent) :
+Workbook::Workbook() :
-    QObject(parent), d_ptr(new WorkbookPrivate(this))
+    d_ptr(new WorkbookPrivate(this))
 {
 
 }
 
 Workbook::~Workbook()
 {
+    qDeleteAll(d_ptr->worksheets);
     delete d_ptr;
 }
 

src/xlsx/xlsxworkbook.h

@@ -26,7 +26,6 @@
 #define XLSXWORKBOOK_H
 
 #include "xlsxglobal.h"
-#include <QObject>
 #include <QList>
 #include <QImage>
 #include <QSharedPointer>
@@ -45,9 +44,8 @@ class Document;
 class DocumentPrivate;
 
 class WorkbookPrivate;
-class Q_XLSX_EXPORT Workbook : public QObject
+class Q_XLSX_EXPORT Workbook
 {
-    Q_OBJECT
     Q_DECLARE_PRIVATE(Workbook)
 public:
     ~Workbook();
@@ -72,7 +70,7 @@ private:
     friend class Document;
     friend class DocumentPrivate;
 
-    Workbook(QObject *parent=0);
+    Workbook();
 
     void saveToXmlFile(QIODevice *device);
     QByteArray saveToXmlData();

src/xlsx/xlsxworksheet.h

@@ -26,7 +26,6 @@
 #define XLSXWORKSHEET_H
 
 #include "xlsxglobal.h"
-#include <QObject>
 #include <QStringList>
 #include <QMap>
 #include <QVariant>

src/xlsx/xlsxzipwriter.cpp

@@ -28,15 +28,13 @@
 
 namespace QXlsx {
 
-ZipWriter::ZipWriter(const QString &filePath, QObject *parent) :
+ZipWriter::ZipWriter(const QString &filePath)
-    QObject(parent)
 {
     m_writer = new QZipWriter(filePath, QIODevice::WriteOnly);
     m_writer->setCompressionPolicy(QZipWriter::NeverCompress);
 }
 
-ZipWriter::ZipWriter(QIODevice *device, QObject *parent) :
+ZipWriter::ZipWriter(QIODevice *device)
-    QObject(parent)
 {
     m_writer = new QZipWriter(device);
     m_writer->setCompressionPolicy(QZipWriter::NeverCompress);

src/xlsx/xlsxzipwriter_p.h

@@ -25,18 +25,17 @@
 #ifndef QXLSX_ZIPWRITER_H
 #define QXLSX_ZIPWRITER_H
 
-#include <QObject>
+#include <QString>
 class QIODevice;
 class QZipWriter;
 
 namespace QXlsx {
 
-class ZipWriter : public QObject
+class ZipWriter
 {
-    Q_OBJECT
 public:
-    explicit ZipWriter(const QString &filePath, QObject *parent = 0);
+    explicit ZipWriter(const QString &filePath);
-    explicit ZipWriter(QIODevice *device, QObject *parent = 0);
+    explicit ZipWriter(QIODevice *device);
     ~ZipWriter();
 
     void addFile(const QString &filePath, QIODevice *device);