From fc593b1ecea98df3add99aa4f903ebb111e2f79b Mon Sep 17 00:00:00 2001
From: Ivan Ilin <ilin@scand.com>
Date: Tue, 1 Nov 2011 10:48:58 +0200
Subject: [PATCH] Have pure virtual function on UBGraphicsItems

---
 src/adaptors/UBCFFSubsetAdaptor.cpp       |  3 ---
 src/domain/UBGraphicsProxyWidget.h        |  2 +-
 src/domain/UBGraphicsWidgetItem.h         | 10 +++++++---
 src/domain/UBGraphicsWidgetItemDelegate.h |  2 +-
 src/domain/UBItem.h                       |  2 +-
 src/tools/UBGraphicsCurtainItem.h         |  3 ++-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/adaptors/UBCFFSubsetAdaptor.cpp b/src/adaptors/UBCFFSubsetAdaptor.cpp
index 82dda974..d0c531d0 100644
--- a/src/adaptors/UBCFFSubsetAdaptor.cpp
+++ b/src/adaptors/UBCFFSubsetAdaptor.cpp
@@ -917,8 +917,6 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseDoc()
         } else if (currentSvg.tagName() == tPageset){
             parseSvgPageset(currentSvg);
         }
-
-
 //    while (!mReader.atEnd())
 //    {
 //        mReader.readNext();
@@ -942,7 +940,6 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseDoc()
 //    }
 //    if (!mReader.error() == QXmlStreamReader::NoError)
 //        UBApplication::showMessage(mReader.errorString());
-
     return true;
 }
 
diff --git a/src/domain/UBGraphicsProxyWidget.h b/src/domain/UBGraphicsProxyWidget.h
index 14739946..3b7fea29 100644
--- a/src/domain/UBGraphicsProxyWidget.h
+++ b/src/domain/UBGraphicsProxyWidget.h
@@ -41,7 +41,7 @@ class UBGraphicsProxyWidget: public QGraphicsProxyWidget, public UBItem, public
 
         virtual void remove();
 
-        virtual UBGraphicsItemDelegate* delegate() const { return mDelegate;}
+        virtual UBGraphicsItemDelegate* Delegate() const { return mDelegate;}
 
     protected:
 
diff --git a/src/domain/UBGraphicsWidgetItem.h b/src/domain/UBGraphicsWidgetItem.h
index 465ae4c8..37386df6 100644
--- a/src/domain/UBGraphicsWidgetItem.h
+++ b/src/domain/UBGraphicsWidgetItem.h
@@ -29,10 +29,12 @@ class UBGraphicsScene;
 class UBAbstractWidget;
 class UBW3CWidgetAPI;
 class UBW3CWidgetWebStorageAPI;
+class UBGraphiscItem;
+class UBGraphiscItemDelegate;
 
 class UBGraphicsWidgetItem : public UBGraphicsProxyWidget
 {
-    Q_OBJECT;
+    Q_OBJECT
 
     public:
         UBGraphicsWidgetItem(QGraphicsItem *parent = 0, int widgetType = 0);
@@ -60,11 +62,13 @@ class UBGraphicsWidgetItem : public UBGraphicsProxyWidget
         QMap<QString, QString> datastoreEntries() const;
         void removeDatastoreEntry(const QString& key);
         void removeAllDatastoreEntries();
+        virtual UBGraphicsItemDelegate* Delegate() const {return mDelegate;}
 
         virtual void remove();
         void removeScript();
 
 
+
     protected:
 
         virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
@@ -89,7 +93,7 @@ class UBGraphicsWidgetItem : public UBGraphicsProxyWidget
 
 class UBGraphicsAppleWidgetItem : public UBGraphicsWidgetItem
 {
-    Q_OBJECT;
+    Q_OBJECT
 
     public:
         UBGraphicsAppleWidgetItem(const QUrl& pWidgetUrl, QGraphicsItem *parent = 0);
@@ -109,7 +113,7 @@ class UBGraphicsAppleWidgetItem : public UBGraphicsWidgetItem
 
 class UBGraphicsW3CWidgetItem : public UBGraphicsWidgetItem
 {
-    Q_OBJECT;
+    Q_OBJECT
 
     public:
         UBGraphicsW3CWidgetItem(const QUrl& pWidgetUrl, QGraphicsItem *parent = 0, int widgetType = UBGraphicsItemType::W3CWidgetItemType);
diff --git a/src/domain/UBGraphicsWidgetItemDelegate.h b/src/domain/UBGraphicsWidgetItemDelegate.h
index 75d7ccdb..0e379137 100644
--- a/src/domain/UBGraphicsWidgetItemDelegate.h
+++ b/src/domain/UBGraphicsWidgetItemDelegate.h
@@ -24,7 +24,7 @@
 
 class UBGraphicsWidgetItemDelegate : public UBGraphicsItemDelegate
 {
-    Q_OBJECT;
+    Q_OBJECT
 
     public:
         UBGraphicsWidgetItemDelegate(UBGraphicsWidgetItem* pDelegated, int widgetType = 0);
diff --git a/src/domain/UBItem.h b/src/domain/UBItem.h
index 8fcbb6c8..58f61867 100644
--- a/src/domain/UBItem.h
+++ b/src/domain/UBItem.h
@@ -99,7 +99,7 @@ protected:
     }
 
 public:
-    virtual UBGraphicsItemDelegate *Delegate() const {return 0;}
+    virtual UBGraphicsItemDelegate *Delegate() const  = 0;
     virtual void remove() = 0;
 
 };
diff --git a/src/tools/UBGraphicsCurtainItem.h b/src/tools/UBGraphicsCurtainItem.h
index 446c7fa8..3b8fd57b 100644
--- a/src/tools/UBGraphicsCurtainItem.h
+++ b/src/tools/UBGraphicsCurtainItem.h
@@ -28,7 +28,7 @@ class UBGraphicsItemDelegate;
 class UBGraphicsCurtainItem : public QObject, public QGraphicsRectItem, public UBItem, public UBGraphicsItem
 {
 
-    Q_OBJECT;
+    Q_OBJECT
 
     public:
         UBGraphicsCurtainItem(QGraphicsItem* parent = 0);
@@ -47,6 +47,7 @@ class UBGraphicsCurtainItem : public QObject, public QGraphicsRectItem, public U
 
         //TODO UB 4.x not nice ...
         void triggerRemovedSignal();
+        virtual UBGraphicsItemDelegate* Delegate() const {return mDelegate;}
 
      signals: