summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/declarative/fx/fx.pri6
-rw-r--r--src/declarative/fx/qfxpainteditem.cpp (renamed from src/declarative/fx/qfximageitem.cpp)68
-rw-r--r--src/declarative/fx/qfxpainteditem.h (renamed from src/declarative/fx/qfximageitem.h)19
-rw-r--r--src/declarative/fx/qfxpainteditem_p.h (renamed from src/declarative/fx/qfximageitem_p.h)6
-rw-r--r--src/declarative/fx/qfxtextedit.cpp20
-rw-r--r--src/declarative/fx/qfxtextedit.h4
-rw-r--r--src/declarative/fx/qfxtextedit_p.h4
-rw-r--r--src/declarative/fx/qfxwebview.cpp26
-rw-r--r--src/declarative/fx/qfxwebview.h4
9 files changed, 77 insertions, 80 deletions
diff --git a/src/declarative/fx/fx.pri b/src/declarative/fx/fx.pri
index 7e04459..90820fa 100644
--- a/src/declarative/fx/fx.pri
+++ b/src/declarative/fx/fx.pri
@@ -17,8 +17,8 @@ HEADERS += \
fx/qfxgridview.h \
fx/qfxhighlightfilter.h \
fx/qfximage.h \
- fx/qfximageitem.h \
- fx/qfximageitem_p.h \
+ fx/qfxpainteditem.h \
+ fx/qfxpainteditem_p.h \
fx/qfximage_p.h \
fx/qfxitem.h \
fx/qfxitem_p.h \
@@ -65,7 +65,7 @@ SOURCES += \
fx/qfxgridview.cpp \
fx/qfxhighlightfilter.cpp \
fx/qfximage.cpp \
- fx/qfximageitem.cpp \
+ fx/qfxpainteditem.cpp \
fx/qfxitem.cpp \
fx/qfxkeyactions.cpp \
fx/qfxkeyproxy.cpp \
diff --git a/src/declarative/fx/qfximageitem.cpp b/src/declarative/fx/qfxpainteditem.cpp
index d751845..950b468 100644
--- a/src/declarative/fx/qfximageitem.cpp
+++ b/src/declarative/fx/qfxpainteditem.cpp
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#include "qfximageitem.h"
-#include "qfximageitem_p.h"
+#include "qfxpainteditem.h"
+#include "qfxpainteditem_p.h"
#include <QDebug>
#include <QPen>
@@ -57,30 +57,30 @@
QT_BEGIN_NAMESPACE
/*!
- \class QFxImageItem
- \brief The QFxImageItem class is an abstract base class for QFxView items that want cached painting.
+ \class QFxPaintedItem
+ \brief The QFxPaintedItem class is an abstract base class for QFxView items that want cached painting.
\ingroup group_coreitems
- This is a convenience class allowing easy use of cached painting within a custom
- item. The contents of the item are are cached behind the scenes.
+ This is a convenience class for implementing items that paint their contents
+ using a QPainter. The contents of the item are are cached behind the scenes.
The dirtyCache() function should be called if the contents change to
ensure the cache is refreshed the next time painting occurs.
- To subclass QFxImageItem, you must reimplement drawContents() to draw
+ To subclass QFxPaintedItem, you must reimplement drawContents() to draw
the contents of the item.
*/
/*!
- \fn void QFxImageItem::drawContents(QPainter *painter, const QRect &rect)
+ \fn void QFxPaintedItem::drawContents(QPainter *painter, const QRect &rect)
This function is called when the cache needs to be refreshed. When
- sub-classing QFxImageItem this function should be implemented so as to
+ sub-classing QFxPaintedItem this function should be implemented so as to
paint the contents of the item using the given \a painter for the
area of the contents specified by \a rect.
*/
/*!
- \property QFxImageItem::contentsSize
+ \property QFxPaintedItem::contentsSize
\brief The size of the contents
The contents size is the size of the item in regards to how it is painted
@@ -89,7 +89,7 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \property QFxImageItem::smooth
+ \property QFxPaintedItem::smooth
\brief Setting for whether smooth scaling is enabled.
*/
@@ -99,9 +99,9 @@ QT_BEGIN_NAMESPACE
\sa clearCache()
*/
-void QFxImageItem::dirtyCache(const QRect& rect)
+void QFxPaintedItem::dirtyCache(const QRect& rect)
{
- Q_D(QFxImageItem);
+ Q_D(QFxPaintedItem);
for (int i=0; i < d->imagecache.count(); ) {
if (d->imagecache[i]->area.intersects(rect)) {
d->imagecache.removeAt(i);
@@ -116,9 +116,9 @@ void QFxImageItem::dirtyCache(const QRect& rect)
\sa dirtyCache()
*/
-void QFxImageItem::clearCache()
+void QFxPaintedItem::clearCache()
{
- Q_D(QFxImageItem);
+ Q_D(QFxPaintedItem);
qDeleteAll(d->imagecache);
d->imagecache.clear();
}
@@ -128,9 +128,9 @@ void QFxImageItem::clearCache()
\sa setSmooth()
*/
-bool QFxImageItem::isSmooth() const
+bool QFxPaintedItem::isSmooth() const
{
- Q_D(const QFxImageItem);
+ Q_D(const QFxPaintedItem);
return d->smooth;
}
@@ -139,9 +139,9 @@ bool QFxImageItem::isSmooth() const
\sa setContentsSize()
*/
-QSize QFxImageItem::contentsSize() const
+QSize QFxPaintedItem::contentsSize() const
{
- Q_D(const QFxImageItem);
+ Q_D(const QFxPaintedItem);
return d->contentsSize;
}
@@ -151,9 +151,9 @@ QSize QFxImageItem::contentsSize() const
\sa isSmooth()
*/
-void QFxImageItem::setSmooth(bool smooth)
+void QFxPaintedItem::setSmooth(bool smooth)
{
- Q_D(QFxImageItem);
+ Q_D(QFxPaintedItem);
if (d->smooth == smooth) return;
d->smooth = smooth;
clearCache();
@@ -165,9 +165,9 @@ void QFxImageItem::setSmooth(bool smooth)
\sa contentsSize()
*/
-void QFxImageItem::setContentsSize(const QSize &size)
+void QFxPaintedItem::setContentsSize(const QSize &size)
{
- Q_D(QFxImageItem);
+ Q_D(QFxPaintedItem);
if (d->contentsSize == size) return;
d->contentsSize = size;
clearCache();
@@ -175,20 +175,20 @@ void QFxImageItem::setContentsSize(const QSize &size)
}
/*!
- Constructs a new QFxImageItem with the given \a parent.
+ Constructs a new QFxPaintedItem with the given \a parent.
*/
-QFxImageItem::QFxImageItem(QFxItem *parent)
- : QFxItem(*(new QFxImageItemPrivate), parent)
+QFxPaintedItem::QFxPaintedItem(QFxItem *parent)
+ : QFxItem(*(new QFxPaintedItemPrivate), parent)
{
init();
}
/*!
\internal
- Constructs a new QFxImageItem with the given \a parent and
+ Constructs a new QFxPaintedItem with the given \a parent and
initialized private data member \a dd.
*/
-QFxImageItem::QFxImageItem(QFxImageItemPrivate &dd, QFxItem *parent)
+QFxPaintedItem::QFxPaintedItem(QFxPaintedItemPrivate &dd, QFxItem *parent)
: QFxItem(dd, parent)
{
init();
@@ -197,14 +197,14 @@ QFxImageItem::QFxImageItem(QFxImageItemPrivate &dd, QFxItem *parent)
/*!
Destroys the image item.
*/
-QFxImageItem::~QFxImageItem()
+QFxPaintedItem::~QFxPaintedItem()
{
}
/*!
\internal
*/
-void QFxImageItem::init()
+void QFxPaintedItem::init()
{
connect(this,SIGNAL(widthChanged()),this,SLOT(clearCache()));
connect(this,SIGNAL(heightChanged()),this,SLOT(clearCache()));
@@ -215,17 +215,17 @@ void QFxImageItem::init()
/*!
\reimp
*/
-void QFxImageItem::paintContents(QPainter &p)
+void QFxPaintedItem::paintContents(QPainter &p)
#elif defined(QFX_RENDER_OPENGL)
/*!
\reimp
*/
-void QFxImageItem::paintGLContents(GLPainter &p)
+void QFxPaintedItem::paintGLContents(GLPainter &p)
#else
#error "What render?"
#endif
{
- Q_D(QFxImageItem);
+ Q_D(QFxPaintedItem);
const QRect content(QPoint(0,0),d->contentsSize);
if (content.width() <= 0 || content.height() <= 0)
return;
@@ -316,7 +316,7 @@ void QFxImageItem::paintGLContents(GLPainter &p)
qp.translate(-r.x(),-r.y());
drawContents(&qp, r);
}
- QFxImageItemPrivate::ImageCacheItem *newitem = new QFxImageItemPrivate::ImageCacheItem;
+ QFxPaintedItemPrivate::ImageCacheItem *newitem = new QFxPaintedItemPrivate::ImageCacheItem;
newitem->area = r;
#if defined(QFX_RENDER_QPAINTER)
newitem->image = QSimpleCanvasConfig::Image(QSimpleCanvasConfig::toImage(img));
diff --git a/src/declarative/fx/qfximageitem.h b/src/declarative/fx/qfxpainteditem.h
index 9ffd44e..015a035 100644
--- a/src/declarative/fx/qfximageitem.h
+++ b/src/declarative/fx/qfxpainteditem.h
@@ -51,17 +51,14 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
-/*
-WARNING: SHORT TERM CLASS. INTENDED TO MERGE INTO QFxPainted
-*/
-class QFxImageItemPrivate;
-class Q_DECLARATIVE_EXPORT QFxImageItem : public QFxItem
+class QFxPaintedItemPrivate;
+class Q_DECLARATIVE_EXPORT QFxPaintedItem : public QFxItem
{
Q_OBJECT
public:
- QFxImageItem(QFxItem *parent=0);
- ~QFxImageItem();
+ QFxPaintedItem(QFxItem *parent=0);
+ ~QFxPaintedItem();
Q_PROPERTY(QSize contentsSize READ contentsSize WRITE setContentsSize);
Q_PROPERTY(bool smooth READ isSmooth WRITE setSmooth);
@@ -78,7 +75,7 @@ public:
void setSmooth(bool);
void setContentsSize(const QSize &);
protected:
- QFxImageItem(QFxImageItemPrivate &dd, QFxItem *parent);
+ QFxPaintedItem(QFxPaintedItemPrivate &dd, QFxItem *parent);
virtual void drawContents(QPainter *p, const QRect &) = 0;
@@ -88,10 +85,10 @@ protected Q_SLOTS:
private:
void init();
- Q_DISABLE_COPY(QFxImageItem)
- Q_DECLARE_PRIVATE(QFxImageItem)
+ Q_DISABLE_COPY(QFxPaintedItem)
+ Q_DECLARE_PRIVATE(QFxPaintedItem)
};
-QML_DECLARE_TYPE(QFxImageItem);
+QML_DECLARE_TYPE(QFxPaintedItem);
QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfximageitem_p.h b/src/declarative/fx/qfxpainteditem_p.h
index 80450ec..b0432ac 100644
--- a/src/declarative/fx/qfximageitem_p.h
+++ b/src/declarative/fx/qfxpainteditem_p.h
@@ -62,12 +62,12 @@
QT_BEGIN_NAMESPACE
-class QFxImageItemPrivate : public QFxItemPrivate
+class QFxPaintedItemPrivate : public QFxItemPrivate
{
- Q_DECLARE_PUBLIC(QFxImageItem)
+ Q_DECLARE_PUBLIC(QFxPaintedItem)
public:
- QFxImageItemPrivate()
+ QFxPaintedItemPrivate()
: max_imagecache_size(1000*1000), smooth(false)
{
}
diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp
index 84e209b..a1b5484 100644
--- a/src/declarative/fx/qfxtextedit.cpp
+++ b/src/declarative/fx/qfxtextedit.cpp
@@ -103,7 +103,7 @@ TextEdit {
Constructs a new QFxTextEdit.
*/
QFxTextEdit::QFxTextEdit(QFxItem *parent)
-: QFxImageItem(*(new QFxTextEditPrivate), parent)
+: QFxPaintedItem(*(new QFxTextEditPrivate), parent)
{
Q_D(QFxTextEdit);
d->init();
@@ -113,7 +113,7 @@ QFxTextEdit::QFxTextEdit(QFxItem *parent)
\internal
*/
QFxTextEdit::QFxTextEdit(QFxTextEditPrivate &dd, QFxItem *parent)
- : QFxImageItem(dd, parent)
+ : QFxPaintedItem(dd, parent)
{
Q_D(QFxTextEdit);
d->init();
@@ -383,7 +383,7 @@ void QFxTextEdit::geometryChanged(const QRectF &newGeometry,
{
if (newGeometry.width() != oldGeometry.width())
updateSize();
- QFxImageItem::geometryChanged(newGeometry, oldGeometry);
+ QFxPaintedItem::geometryChanged(newGeometry, oldGeometry);
}
/*!
@@ -393,7 +393,7 @@ void QFxTextEdit::dump(int depth)
{
QByteArray ba(depth * 4, ' ');
qWarning() << ba.constData() << propertyInfo();
- QFxImageItem::dump(depth);
+ QFxPaintedItem::dump(depth);
}
/*!
@@ -412,7 +412,7 @@ QString QFxTextEdit::propertyInfo() const
void QFxTextEdit::componentComplete()
{
Q_D(QFxTextEdit);
- QFxImageItem::componentComplete();
+ QFxPaintedItem::componentComplete();
if (d->dirty) {
updateSize();
d->dirty = false;
@@ -588,7 +588,7 @@ Handles the given focus \a event.
void QFxTextEdit::focusInEvent(QFocusEvent *event)
{
Q_D(QFxTextEdit);
- QFxImageItem::focusInEvent(event);
+ QFxPaintedItem::focusInEvent(event);
d->control->processEvent(event, QPointF(0, 0));
}
@@ -599,7 +599,7 @@ Handles the given focus \a event.
void QFxTextEdit::focusOutEvent(QFocusEvent *event)
{
Q_D(QFxTextEdit);
- QFxImageItem::focusOutEvent(event);
+ QFxPaintedItem::focusOutEvent(event);
d->control->processEvent(event, QPointF(0, 0));
}
@@ -638,7 +638,7 @@ void QFxTextEdit::mousePressEvent(QGraphicsSceneMouseEvent *event)
event->setAccepted(me->isAccepted());
delete me;
if (!event->isAccepted())
- QFxImageItem::mousePressEvent(event);
+ QFxPaintedItem::mousePressEvent(event);
}
/*!
@@ -653,7 +653,7 @@ void QFxTextEdit::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
event->setAccepted(me->isAccepted());
delete me;
if (!event->isAccepted())
- QFxImageItem::mousePressEvent(event);
+ QFxPaintedItem::mousePressEvent(event);
}
/*!
@@ -668,7 +668,7 @@ void QFxTextEdit::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
event->setAccepted(me->isAccepted());
delete me;
if (!event->isAccepted())
- QFxImageItem::mousePressEvent(event);
+ QFxPaintedItem::mousePressEvent(event);
}
/*!
diff --git a/src/declarative/fx/qfxtextedit.h b/src/declarative/fx/qfxtextedit.h
index be84a3c..b017635 100644
--- a/src/declarative/fx/qfxtextedit.h
+++ b/src/declarative/fx/qfxtextedit.h
@@ -43,7 +43,7 @@
#define QFXTEXTEDIT_H
#include <qfxtext.h>
-#include <qfximageitem.h>
+#include <qfxpainteditem.h>
#include <QtGui/qtextdocument.h>
#include <QtGui/qtextoption.h>
@@ -60,7 +60,7 @@ QT_MODULE(Declarative)
WARNING: SHORT TERM CLASS. INTENDED TO MERGE INTO QFxTextItem
*/
class QFxTextEditPrivate;
-class Q_DECLARATIVE_EXPORT QFxTextEdit : public QFxImageItem
+class Q_DECLARATIVE_EXPORT QFxTextEdit : public QFxPaintedItem
{
Q_OBJECT
Q_ENUMS(VAlignment)
diff --git a/src/declarative/fx/qfxtextedit_p.h b/src/declarative/fx/qfxtextedit_p.h
index aa07484..b583dbe 100644
--- a/src/declarative/fx/qfxtextedit_p.h
+++ b/src/declarative/fx/qfxtextedit_p.h
@@ -54,7 +54,7 @@
//
#include "qfxitem.h"
-#include "qfximageitem_p.h"
+#include "qfxpainteditem_p.h"
#include "qml.h"
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
class QTextLayout;
class QTextDocument;
class QTextControl;
-class QFxTextEditPrivate : public QFxImageItemPrivate
+class QFxTextEditPrivate : public QFxPaintedItemPrivate
{
Q_DECLARE_PUBLIC(QFxTextEdit)
diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp
index 9b18a9e..3f05846 100644
--- a/src/declarative/fx/qfxwebview.cpp
+++ b/src/declarative/fx/qfxwebview.cpp
@@ -68,7 +68,7 @@
#include "qfxwebview.h"
#include <qsimplecanvasfilter.h>
-#include <private/qfximageitem_p.h>
+#include <private/qfxpainteditem_p.h>
QT_BEGIN_NAMESPACE
QML_DEFINE_TYPE(QFxWebView,WebView);
@@ -142,13 +142,13 @@ public:
};
-class QFxWebViewPrivate : public QFxImageItemPrivate
+class QFxWebViewPrivate : public QFxPaintedItemPrivate
{
Q_DECLARE_PUBLIC(QFxWebView)
public:
QFxWebViewPrivate()
- : QFxImageItemPrivate(), page(0), idealwidth(0), idealheight(0), interactive(true), lastPress(0), lastRelease(0), mouseX(0), mouseY(0),
+ : QFxPaintedItemPrivate(), page(0), idealwidth(0), idealheight(0), interactive(true), lastPress(0), lastRelease(0), mouseX(0), mouseY(0),
max_imagecache_size(100000), progress(1.0), pending(PendingNone)
{
}
@@ -253,13 +253,13 @@ public:
*/
QFxWebView::QFxWebView(QFxItem *parent)
- : QFxImageItem(*(new QFxWebViewPrivate), parent)
+ : QFxPaintedItem(*(new QFxWebViewPrivate), parent)
{
init();
}
QFxWebView::QFxWebView(QFxWebViewPrivate &dd, QFxItem *parent)
- : QFxImageItem(dd, parent)
+ : QFxPaintedItem(dd, parent)
{
init();
}
@@ -283,7 +283,7 @@ void QFxWebView::init()
void QFxWebView::componentComplete()
{
- QFxImageItem::componentComplete();
+ QFxPaintedItem::componentComplete();
Q_D(QFxWebView);
switch (d->pending) {
case QFxWebViewPrivate::PendingUrl:
@@ -491,7 +491,7 @@ void QFxWebView::geometryChanged(const QRectF &newGeometry,
{
if (newGeometry.size() != oldGeometry.size())
expandToWebPage();
- QFxImageItem::geometryChanged(newGeometry, oldGeometry);
+ QFxPaintedItem::geometryChanged(newGeometry, oldGeometry);
}
void QFxWebView::paintPage(const QRect& r)
@@ -554,7 +554,7 @@ void QFxWebView::dump(int depth)
{
QByteArray ba(depth * 4, ' ');
qWarning() << ba.constData() << "url:" << url();
- QFxImageItem::dump(depth);
+ QFxPaintedItem::dump(depth);
}
void QFxWebView::drawContents(QPainter *p, const QRect &r)
@@ -656,7 +656,7 @@ void QFxWebView::mousePressEvent(QGraphicsSceneMouseEvent *event)
event->setAccepted(false);
}
if (!event->isAccepted())
- QFxImageItem::mousePressEvent(event);
+ QFxPaintedItem::mousePressEvent(event);
}
void QFxWebView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
@@ -670,7 +670,7 @@ void QFxWebView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
event->setAccepted(false);
}
if (!event->isAccepted())
- QFxImageItem::mouseReleaseEvent(event);
+ QFxPaintedItem::mouseReleaseEvent(event);
}
void QFxWebView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
@@ -691,7 +691,7 @@ void QFxWebView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
event->setAccepted(false);
}
if (!event->isAccepted())
- QFxImageItem::mouseMoveEvent(event);
+ QFxPaintedItem::mouseMoveEvent(event);
}
void QFxWebView::keyPressEvent(QKeyEvent* event)
@@ -700,7 +700,7 @@ void QFxWebView::keyPressEvent(QKeyEvent* event)
if (d->interactive)
page()->event(event);
if (!event->isAccepted())
- QFxImageItem::keyPressEvent(event);
+ QFxPaintedItem::keyPressEvent(event);
}
void QFxWebView::keyReleaseEvent(QKeyEvent* event)
@@ -709,7 +709,7 @@ void QFxWebView::keyReleaseEvent(QKeyEvent* event)
if (d->interactive)
page()->event(event);
if (!event->isAccepted())
- QFxImageItem::keyReleaseEvent(event);
+ QFxPaintedItem::keyReleaseEvent(event);
}
/*!
diff --git a/src/declarative/fx/qfxwebview.h b/src/declarative/fx/qfxwebview.h
index 17037ca..afd5b0f 100644
--- a/src/declarative/fx/qfxwebview.h
+++ b/src/declarative/fx/qfxwebview.h
@@ -45,7 +45,7 @@
#include <QAction>
#include <QUrl>
#include <qfxglobal.h>
-#include <qfximageitem.h>
+#include <qfxpainteditem.h>
#include <QtNetwork/qnetworkaccessmanager.h>
#include <QWebPage>
@@ -74,7 +74,7 @@ private:
};
-class Q_DECLARATIVE_EXPORT QFxWebView : public QFxImageItem
+class Q_DECLARATIVE_EXPORT QFxWebView : public QFxPaintedItem
{
Q_OBJECT
generated by cgit v0.12 at 2024-10-19 20:01:02 (GMT)