CFF partial support. All sankre compatible features

src/adaptors/UBCFFSubsetAdaptor.h

@@ -38,7 +38,6 @@ class UBCFFSubsetAdaptor
 {
 public:
     UBCFFSubsetAdaptor();
-
     static bool ConvertCFFFileToUbz(QString &cffSourceFile, UBDocumentProxy* pDocument);
 
 private:
@@ -46,6 +45,7 @@ private:
     {
     public:
         UBCFFSubsetReader(UBDocumentProxy *proxy, QFile *content);
+        ~UBCFFSubsetReader();
 
         UBDocumentProxy *mProxy;
         QString pwdContent;
@@ -101,7 +101,7 @@ private:
         inline void hashSceneItem(const QDomElement &element, UBGraphicsItem *item);
 
         // to kill
-        void parseTextAttributes(const QDomElement &element, qreal &fontSize, QColor &fontColor,
+        inline void parseTextAttributes(const QDomElement &element, qreal &fontSize, QColor &fontColor,
                                  QString &fontFamily, QString &fontStretch, bool &italic,
                                  int &fontWeight, int &textAlign, QTransform &fontTransform);
 
@@ -110,14 +110,12 @@ private:
 
         bool createNewScene();
         bool persistCurrentScene();
+        bool persistScenes();
 
 //        helper methods
         void repositionSvgItem(QGraphicsItem *item, qreal width, qreal height,
                                qreal x, qreal y,
                                bool useTransform, QTransform &transform);
-        void experimentalReposition(QGraphicsItem *item, qreal width, qreal height,
-                                    qreal x, qreal y,
-                                    bool useTransform, QTransform &transform);
         QColor colorFromString(const QString& clrString);
         QTransform transformFromString(const QString trString);
         bool getViewBoxDimenstions(const QString& viewBox);

src/adaptors/UBThumbnailAdaptor.cpp

@@ -111,7 +111,6 @@ QList<QPixmap> UBThumbnailAdaptor::load(UBDocumentProxy* proxy)
             moreToProcess = false;
         }
     }
-
     return thumbnails;
 }
 

src/core/UBPersistenceManager.h

@@ -86,6 +86,7 @@ class UBPersistenceManager : public QObject
         virtual void moveSceneToIndex(UBDocumentProxy* pDocumentProxy, int source, int target);
 
         virtual UBGraphicsScene* loadDocumentScene(UBDocumentProxy* pDocumentProxy, int sceneIndex);
+        UBGraphicsScene *getDocumentScene(UBDocumentProxy* pDocumentProxy, int sceneIndex) {return mSceneCache.value(pDocumentProxy, sceneIndex);}
 
         QList<QPointer<UBDocumentProxy> > documentProxies;
 

src/domain/UBGraphicsPixmapItem.h

@@ -26,7 +26,7 @@ class UBGraphicsItemDelegate;
 
 class UBGraphicsPixmapItem : public QObject, public QGraphicsPixmapItem, public UBItem, public UBGraphicsItem
 {
-    Q_OBJECT;
+    Q_OBJECT
 
     public:
         UBGraphicsPixmapItem(QGraphicsItem* parent = 0);
@@ -38,7 +38,6 @@ class UBGraphicsPixmapItem : public QObject, public QGraphicsPixmapItem, public
         {
             return Type;
         }
-
         virtual UBItem* deepCopy() const;
 
         virtual UBGraphicsScene* scene();

src/domain/UBGraphicsScene.h

@@ -52,7 +52,7 @@ const double PI = 4.0 * atan(1.0);
 
 class UBGraphicsScene: public UBCoreGraphicsScene, public UBItem
 {
-    Q_OBJECT;
+    Q_OBJECT
 
     public:
 

src/domain/UBGraphicsTextItem.h

@@ -26,7 +26,7 @@ class UBGraphicsScene;
 
 class UBGraphicsTextItem : public QGraphicsTextItem, public UBItem, public UBResizableGraphicsItem, public UBGraphicsItem
 {
-    Q_OBJECT;
+    Q_OBJECT
 
     public:
         UBGraphicsTextItem(QGraphicsItem * parent = 0);
@@ -97,7 +97,6 @@ class UBGraphicsTextItem : public QGraphicsTextItem, public UBItem, public UBRes
         virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
 
     private:
-//        UBGraphicsItemDelegate *mDelegate;
         qreal mTextHeight;
 
         int mMultiClickState;
@@ -106,8 +105,6 @@ class UBGraphicsTextItem : public QGraphicsTextItem, public UBItem, public UBRes
 
         QColor mColorOnDarkBackground;
         QColor mColorOnLightBackground;
-
-
 };
 
 #endif /* UBGRAPHICSTEXTITEM_H_ */

src/pdf/PDFRenderer.cpp

@@ -19,7 +19,6 @@
 
 #include "XPDFRenderer.h"
 
-
 #include "core/memcheck.h"
 
 QMap< QUuid, QPointer<PDFRenderer> > PDFRenderer::sRenderers;