Code clean up

main.cpp

+#include <QDesktopServices>
+#include <QDir>
 #include <QGuiApplication>
-#include <QQuickView>
-#include <QQmlEngine>
 #include <QQmlContext>
-#include <QDir>
+#include <QQmlEngine>
+#include <QQuickItem>
+#include <QQuickView>
 
 #include <QCommandLineParser>
 
 #include "qmlprinter.h"
 
-int main(int ac, char* av[]) {
-    QGuiApplication app(ac,av);
+int main(int ac, char *av[]) {
+  QGuiApplication app(ac, av);
 
-    QCommandLineParser parser;
-    parser.setApplicationDescription("QML PDF generator");
-    parser.addHelpOption();
-    parser.addVersionOption();
+  QCommandLineParser parser;
+  parser.setApplicationDescription("QML PDF generator");
+  parser.addHelpOption();
+  parser.addVersionOption();
 
-    parser.addOptions({
-                          {
-                              { "input", "i" }, "Input QML file", "input"
-                          },
-                          {
-                              { "output", "o" }, "Output PDF file", "output", "output.pdf"
-                          }
-                      });
+  parser.addOptions(
+      {{{"input", "i"}, "Input QML file", "input"},
+       {{"output", "o"}, "Output PDF file", "output", "output.pdf"}});
 
-    QCommandLineOption showOption({ "show", "s"},"Show PDF file", "show");
-    parser.addOption(showOption);
+  QCommandLineOption showOption({"show", "s"}, "Show PDF file", "show");
+  parser.addOption(showOption);
 
-    QCommandLineOption showPresentation({ "presentation", "p"},"Show Presentation", "presentation");
-    parser.addOption(showPresentation);
+  QCommandLineOption showPresentation({"presentation", "p"},
+                                      "Show Presentation", "presentation");
+  parser.addOption(showPresentation);
 
-    parser.process(app);
+  parser.process(app);
 
-    auto* view = new QQuickView;
+  auto *view = new QQuickView;
 
-    auto inputQml = parser.value("input");
-    auto outputPdf = parser.value("output");
-    auto showPdf = parser.isSet(showOption);
-    auto showPres = parser.isSet(showPresentation);
+  auto inputQml = parser.value("input");
+  auto outputPdf = parser.value("output");
+  auto showPdf = parser.isSet(showOption);
+  auto showPres = parser.isSet(showPresentation);
 
-    QDir outputPdfDir;
+  QDir outputPdfDir;
 
-    if (QDir::isRelativePath(outputPdf)) {
-        outputPdfDir = QDir(qApp->applicationDirPath() + QDir::separator() + outputPdf);
-    } else {
-        outputPdfDir = QDir(outputPdf);
-    }
+  if (QDir::isRelativePath(outputPdf)) {
+    outputPdfDir =
+        QDir(qApp->applicationDirPath() + QDir::separator() + outputPdf);
+  } else {
+    outputPdfDir = QDir(outputPdf);
+  }
 
-    view->setSource(QUrl::fromLocalFile(inputQml));
+  view->setSource(QUrl::fromLocalFile(inputQml));
 
-    QmlPrinter printer;
-    printer.printPdf( outputPdfDir.absolutePath(), view->rootObject());
+  QmlPrinter printer;
+  printer.printPdf(outputPdfDir.absolutePath(), view->rootObject());
 
-    qInfo() << app.tr("Writing PDF to %1").arg(outputPdfDir.absolutePath());
+  qInfo() << app.tr("Writing PDF to %1").arg(outputPdfDir.absolutePath());
 
-    if (showPres) {
-        view->rootObject()->setProperty("currentSlide",0);
-        view->show();
-    }
+  if (showPres) {
+    view->rootObject()->setProperty("currentSlide", 0);
+    view->show();
+  }
 
-    if (showPdf)
-        QDesktopServices::openUrl(QUrl::fromLocalFile(outputPdfDir.absolutePath()));
+  if (showPdf)
+    QDesktopServices::openUrl(QUrl::fromLocalFile(outputPdfDir.absolutePath()));
 
-    return showPres ? app.exec() : EXIT_SUCCESS;
+  return showPres ? app.exec() : EXIT_SUCCESS;
 }
-
-

qmlprinter.h

@@ -9,44 +9,39 @@
 #define QMLPRINTER_H
 
 #include <QObject>
-#include <QQuickItem>
-#include <QQuickWindow>
-#include <QPainter>
-#include <QPrinter>
-#include <QPrintDialog>
-#include <QDesktopServices>
-#include <QAbstractTextDocumentLayout>
-#include <QTextDocument>
-#include <QPrinterInfo>
-
-class QmlPrinter : public QObject
-{
-    Q_OBJECT
-private:
-
-    QList<QString> printableItems;
 
-    void paintItem(QQuickItem *item, QQuickWindow *window, QPainter *painter);
-    void paintQQuickRectangle(QQuickItem *item, QPainter *painter);
-    void paintQQuickText(QQuickItem *item, QPainter *painter);
-    void paintQQuickImage(QQuickItem *item, QPainter *painter);
-    void paintQQuickCanvasItem(QQuickItem *item, QQuickWindow *window, QPainter *painter);
+QT_BEGIN_NAMESPACE
+class QQuickItem;
+class QQuickWindow;
+class QPainter;
+class QPrinter;
+class QPrinterInfo;
+QT_END_NAMESPACE
 
-    bool inherits(const QMetaObject *metaObject, const QString &name);
-    bool isCustomPrintItem(const QString &item);
+class QmlPrinter {
+public:
+  explicit QmlPrinter();
+  virtual ~QmlPrinter();
 
-    void changePrinterOrientation(QPrinter& printer, const int& width, const int& height);
+  bool printPdf(const QString &location, QQuickItem *presentation);
+  void addPrintableItem(const QString &item);
+private:
+  QList<QString> printableItems;
 
-public:
-    explicit QmlPrinter(QObject *parent = 0);
-    virtual ~QmlPrinter();
+  static QMatrix transformMatrix(QQuickItem *);
 
-    bool printPdf(const QString &location, QQuickItem* presentation);
-    void addPrintableItem(const QString &item);
-signals:
+  void paintItem(QQuickItem *item, QQuickWindow *window, QPainter *painter);
+  void paintQQuickRectangle(QQuickItem *item, QPainter *painter);
+  void paintQQuickText(QQuickItem *item, QPainter *painter);
+  void paintQQuickImage(QQuickItem *item, QPainter *painter);
+  void paintQQuickCanvasItem(QQuickItem *item, QQuickWindow *window,
+                             QPainter *painter);
 
-public slots:
+  bool inherits(const QMetaObject *metaObject, const QString &name);
+  bool isCustomPrintItem(const QString &item);
 
+  void changePrinterOrientation(QPrinter &printer, const int &width,
+                                const int &height);
 };
 
 #endif // HURPRINTER_H