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

List:       kde-commits
Subject:    Re: koffice/karbon/widgets
From:       Adam Gorzkiewicz <adgor () isn ! pl>
Date:       2004-05-10 10:12:23
Message-ID: 200405101212.30469.adgor () isn ! pl
[Download RAW message or body]

[Attachment #2 (multipart/mixed)]


Dnia niedziela 09 maj 2004 22:39, David Faure napisał:
> CVS commit by faure:
>
> Fix compilation with gcc-3.4 (alledgedly)
>
>
>   M +1 -1      vcanvas.cc   1.20
>
>
> --- koffice/karbon/widgets/vcanvas.cc  #1.19:1.20
> @@ -348,5 +348,5 @@ VCanvas::repaintAll( const KoRect & )
>  //              m_view->layersDocker()->updatePreviews();
>          VPainter *p = m_view->painterFactory()->painter();
> -        KoRect rect( rect().x(), rect().y(), rect().width(),
> rect().height() ); +        KoRect rect = KoRect::fromQRect( this->rect()
> );
>          p->blit( rect );

Could You apply sth like this below (solves another 'different types' 
problem)?
Tx

-- 
Adam Gorzkiewicz
http://www.pld-linux.org

["koffice-gcc34.patch" (text/x-diff)]

--- koffice-040509/krita/core/kis_image.cc.orig	2004-05-10 00:03:51.000000000 +0200
+++ koffice-040509/krita/core/kis_image.cc	2004-05-10 11:33:30.218796504 +0200
@@ -506,12 +506,12 @@
 
 const KisLayerSP KisImage::activeLayer() const
 {
-	return m_selection ? m_selection : m_activeLayer;
+	return m_selection ? static_cast<KisLayerSP>(m_selection) : m_activeLayer;
 }
 
 KisLayerSP KisImage::activeLayer()
 {
-	return m_selection ? m_selection : m_activeLayer;
+	return m_selection ? static_cast<KisLayerSP>(m_selection) : m_activeLayer;
 }
 
 KisLayerSP KisImage::activate(KisLayerSP layer)

[Attachment #6 (application/pgp-signature)]

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