[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/krita-sketch-rempt] /: Merge branch 'master' into krita-sketch-rempt
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2013-03-28 12:20:44
Message-ID: 20130328122044.93DA5A604F () git ! kde ! org
[Download RAW message or body]

Git commit 82f1429123151300ca0c31ed4970deee8f895f82 by Boudewijn Rempt.
Committed on 28/03/2013 at 13:15.
Pushed by rempt into branch 'krita-sketch-rempt'.

Merge branch 'master' into krita-sketch-rempt

M  +11   -11   krita/ui/canvas/kis_canvas2.cpp
M  +16   -16   krita/ui/kis_view2.cpp
M  +1    -0    libs/main/KoDocument.h
M  +30   -12   libs/main/KoPart.cpp

http://commits.kde.org/calligra/82f1429123151300ca0c31ed4970deee8f895f82

diff --cc krita/ui/canvas/kis_canvas2.cpp
index 98c00fc,1b92b22..2408e35
--- a/krita/ui/canvas/kis_canvas2.cpp
+++ b/krita/ui/canvas/kis_canvas2.cpp
@@@ -349,10 -360,14 +349,10 @@@ void KisCanvas2::connectCurrentImage(
      KisImageWSP image = m_d->view->image();
  
      m_d->coordinatesConverter->setImage(image);
 -
 -    if (!m_d->currentCanvasIsOpenGL) {
 -        Q_ASSERT(m_d->prescaledProjection);
 -        m_d->prescaledProjection->setImage(image);
 -    }
 +    m_d->canvasWidget->setImage(image);
  
-     connect(image, SIGNAL(sigImageUpdated(const QRect &)),
-             SLOT(startUpdateCanvasProjection(const QRect &)),
+     connect(image, SIGNAL(sigImageUpdated(QRect)),
+             SLOT(startUpdateCanvasProjection(QRect)),
              Qt::DirectConnection);
      connect(this, SIGNAL(sigCanvasCacheUpdated(KisUpdateInfoSP)),
              this, SLOT(updateCanvasProjection(KisUpdateInfoSP)));
diff --cc libs/main/KoDocument.h
index 08d1d2b,4841d58..79a5718
--- a/libs/main/KoDocument.h
+++ b/libs/main/KoDocument.h
@@@ -444,9 -443,8 +444,10 @@@ public
       * progress to.
       */
      void setProgressProxy(KoProgressProxy *progressProxy);
+     KoProgressProxy* progressProxy() const;
  
 +    KoProgressProxy *progressProxy() const;
 +
      /**
       * Return true if url() is a real filename, false if url() is
       * an internal url in the store, like "tar:/..."

[prev in list] [next in list] [prev in thread] [next in thread]