Have pure virtual function on UBGraphicsItems

preferencesAboutTextFull
Ivan Ilin 13 years ago
parent 9aa3027c51
commit fc593b1ece
  1. 3
      src/adaptors/UBCFFSubsetAdaptor.cpp
  2. 2
      src/domain/UBGraphicsProxyWidget.h
  3. 10
      src/domain/UBGraphicsWidgetItem.h
  4. 2
      src/domain/UBGraphicsWidgetItemDelegate.h
  5. 2
      src/domain/UBItem.h
  6. 3
      src/tools/UBGraphicsCurtainItem.h

@ -917,8 +917,6 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseDoc()
} else if (currentSvg.tagName() == tPageset){ } else if (currentSvg.tagName() == tPageset){
parseSvgPageset(currentSvg); parseSvgPageset(currentSvg);
} }
// while (!mReader.atEnd()) // while (!mReader.atEnd())
// { // {
// mReader.readNext(); // mReader.readNext();
@ -942,7 +940,6 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseDoc()
// } // }
// if (!mReader.error() == QXmlStreamReader::NoError) // if (!mReader.error() == QXmlStreamReader::NoError)
// UBApplication::showMessage(mReader.errorString()); // UBApplication::showMessage(mReader.errorString());
return true; return true;
} }

@ -41,7 +41,7 @@ class UBGraphicsProxyWidget: public QGraphicsProxyWidget, public UBItem, public
virtual void remove(); virtual void remove();
virtual UBGraphicsItemDelegate* delegate() const { return mDelegate;} virtual UBGraphicsItemDelegate* Delegate() const { return mDelegate;}
protected: protected:

@ -29,10 +29,12 @@ class UBGraphicsScene;
class UBAbstractWidget; class UBAbstractWidget;
class UBW3CWidgetAPI; class UBW3CWidgetAPI;
class UBW3CWidgetWebStorageAPI; class UBW3CWidgetWebStorageAPI;
class UBGraphiscItem;
class UBGraphiscItemDelegate;
class UBGraphicsWidgetItem : public UBGraphicsProxyWidget class UBGraphicsWidgetItem : public UBGraphicsProxyWidget
{ {
Q_OBJECT; Q_OBJECT
public: public:
UBGraphicsWidgetItem(QGraphicsItem *parent = 0, int widgetType = 0); UBGraphicsWidgetItem(QGraphicsItem *parent = 0, int widgetType = 0);
@ -60,11 +62,13 @@ class UBGraphicsWidgetItem : public UBGraphicsProxyWidget
QMap<QString, QString> datastoreEntries() const; QMap<QString, QString> datastoreEntries() const;
void removeDatastoreEntry(const QString& key); void removeDatastoreEntry(const QString& key);
void removeAllDatastoreEntries(); void removeAllDatastoreEntries();
virtual UBGraphicsItemDelegate* Delegate() const {return mDelegate;}
virtual void remove(); virtual void remove();
void removeScript(); void removeScript();
protected: protected:
virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
@ -89,7 +93,7 @@ class UBGraphicsWidgetItem : public UBGraphicsProxyWidget
class UBGraphicsAppleWidgetItem : public UBGraphicsWidgetItem class UBGraphicsAppleWidgetItem : public UBGraphicsWidgetItem
{ {
Q_OBJECT; Q_OBJECT
public: public:
UBGraphicsAppleWidgetItem(const QUrl& pWidgetUrl, QGraphicsItem *parent = 0); UBGraphicsAppleWidgetItem(const QUrl& pWidgetUrl, QGraphicsItem *parent = 0);
@ -109,7 +113,7 @@ class UBGraphicsAppleWidgetItem : public UBGraphicsWidgetItem
class UBGraphicsW3CWidgetItem : public UBGraphicsWidgetItem class UBGraphicsW3CWidgetItem : public UBGraphicsWidgetItem
{ {
Q_OBJECT; Q_OBJECT
public: public:
UBGraphicsW3CWidgetItem(const QUrl& pWidgetUrl, QGraphicsItem *parent = 0, int widgetType = UBGraphicsItemType::W3CWidgetItemType); UBGraphicsW3CWidgetItem(const QUrl& pWidgetUrl, QGraphicsItem *parent = 0, int widgetType = UBGraphicsItemType::W3CWidgetItemType);

@ -24,7 +24,7 @@
class UBGraphicsWidgetItemDelegate : public UBGraphicsItemDelegate class UBGraphicsWidgetItemDelegate : public UBGraphicsItemDelegate
{ {
Q_OBJECT; Q_OBJECT
public: public:
UBGraphicsWidgetItemDelegate(UBGraphicsWidgetItem* pDelegated, int widgetType = 0); UBGraphicsWidgetItemDelegate(UBGraphicsWidgetItem* pDelegated, int widgetType = 0);

@ -99,7 +99,7 @@ protected:
} }
public: public:
virtual UBGraphicsItemDelegate *Delegate() const {return 0;} virtual UBGraphicsItemDelegate *Delegate() const = 0;
virtual void remove() = 0; virtual void remove() = 0;
}; };

@ -28,7 +28,7 @@ class UBGraphicsItemDelegate;
class UBGraphicsCurtainItem : public QObject, public QGraphicsRectItem, public UBItem, public UBGraphicsItem class UBGraphicsCurtainItem : public QObject, public QGraphicsRectItem, public UBItem, public UBGraphicsItem
{ {
Q_OBJECT; Q_OBJECT
public: public:
UBGraphicsCurtainItem(QGraphicsItem* parent = 0); UBGraphicsCurtainItem(QGraphicsItem* parent = 0);
@ -47,6 +47,7 @@ class UBGraphicsCurtainItem : public QObject, public QGraphicsRectItem, public U
//TODO UB 4.x not nice ... //TODO UB 4.x not nice ...
void triggerRemovedSignal(); void triggerRemovedSignal();
virtual UBGraphicsItemDelegate* Delegate() const {return mDelegate;}
signals: signals:

Loading…
Cancel
Save