[patch] patch for the src/svg/qsvgwidget.cpp

qt-svg-4.6.0.src-svg-qsvgwidget.cpp.patch (text/plain), 2.22 KB, created by antonmx on 2010-01-19 02:56:51 UTC

--- src/svg/qsvgwidget.cpp.original	2009-11-27 12:27:53.000000000 +1100
+++ src/svg/qsvgwidget.cpp	2010-01-19 03:34:53.000000000 +1100
@@ -79,21 +79,14 @@
     \sa QSvgRenderer, {QtSvg Module}, QPicture
 */
 
-class QSvgWidgetPrivate : public QWidgetPrivate
-{
-    Q_DECLARE_PUBLIC(QSvgWidget)
-public:
-    QSvgRenderer *renderer;
-};
-
 /*!
     Constructs a new SVG display widget with the given \a parent.
 */
 QSvgWidget::QSvgWidget(QWidget *parent)
-    : QWidget(*new QSvgWidgetPrivate, parent, 0)
+    : QWidget( parent )
 {
-    d_func()->renderer = new QSvgRenderer(this);
-    QObject::connect(d_func()->renderer, SIGNAL(repaintNeeded()),
+    m_renderer = new QSvgRenderer(this);
+    QObject::connect(m_renderer, SIGNAL(repaintNeeded()),
                      this, SLOT(update()));
 }
 
@@ -102,10 +95,10 @@
     of the specified \a file.
 */
 QSvgWidget::QSvgWidget(const QString &file, QWidget *parent)
-    : QWidget(*new QSvgWidgetPrivate, parent, 0)
+    : QWidget( parent )
 {
-    d_func()->renderer = new QSvgRenderer(file, this);
-    QObject::connect(d_func()->renderer, SIGNAL(repaintNeeded()),
+    m_renderer = new QSvgRenderer(file, this);
+    QObject::connect(m_renderer, SIGNAL(repaintNeeded()),
                      this, SLOT(update()));
 }
 
@@ -122,8 +115,7 @@
 */
 QSvgRenderer * QSvgWidget::renderer() const
 {
-    Q_D(const QSvgWidget);
-    return d->renderer;
+    return m_renderer;
 }
 
 
@@ -132,9 +124,8 @@
 */
 QSize QSvgWidget::sizeHint() const
 {
-    Q_D(const QSvgWidget);
-    if (d->renderer->isValid())
-        return d->renderer->defaultSize();
+    if (m_renderer->isValid())
+        return m_renderer->defaultSize();
     else
         return QSize(128, 64);
 }
@@ -145,9 +136,8 @@
 */
 void QSvgWidget::paintEvent(QPaintEvent *)
 {
-    Q_D(QSvgWidget);
     QPainter p(this);
-    d->renderer->render(&p);
+    m_renderer->render(&p);
 }
 
 /*!
@@ -155,8 +145,7 @@
 */
 void QSvgWidget::load(const QString &file)
 {
-    Q_D(const QSvgWidget);
-    d->renderer->load(file);
+    m_renderer->load(file);
 }
 
 /*!
@@ -164,8 +153,7 @@
 */
 void QSvgWidget::load(const QByteArray &contents)
 {
-    Q_D(const QSvgWidget);
-    d->renderer->load(contents);
+    m_renderer->load(contents);
 }
 
 QT_END_NAMESPACE