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

List:       kde-commits
Subject:    koffice/kpresenter
From:       Laurent Montel <montel () kde ! org>
Date:       2006-12-12 10:16:28
Message-ID: 1165918588.384554.942.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 612693 by mlaurent:

Make it compile


 M  +19 -10    KPrCanvas.cpp  
 M  +3 -0      KPrView.cpp  


--- trunk/koffice/kpresenter/KPrCanvas.cpp #612692:612693
@@ -856,7 +856,8 @@
                     recalcAutoGuides();
                     if ( m_view->kPresenterDoc()->showGuideLines() && \
!m_disableSnapping )  {
-                        m_gl.repaintSnapping( objectRect( false ) );
+#warning "port to qrectf/qpointf"			    
+                        //m_gl.repaintSnapping( objectRect( false ) );
                     }
                 }
                 else
@@ -4619,13 +4620,15 @@
             m_moveSnapDiff = KoPoint( 0, 0 );
 
             KoGuides::SnapStatus snapStatus = KoGuides::SNAP_NONE;
-            m_gl.snapToGuideLines( movedRect, KEY_SNAP_DISTANCE, snapStatus, \
m_moveSnapDiff ); +#warning "kde4: port to qrectf"	    
+            //m_gl.snapToGuideLines( movedRect, KEY_SNAP_DISTANCE, snapStatus, \
m_moveSnapDiff );  
             move += m_moveSnapDiff;
         }
         else
         {
-            m_gl.diffNextGuide( rect, move );
+#warning "kde4: port to qrectf"		
+            //m_gl.diffNextGuide( rect, move );
         }
     }
 
@@ -4653,8 +4656,9 @@
     {
         // redraw guidelines (intentionally always)
         KoRect movedRect( rect );
-        movedRect.moveBy( move.x(), move.y() );
-        m_gl.repaintSnapping( movedRect );
+        movedRect.translate( move.x(), move.y() );	
+#warning "kde4: port to qrectf"	
+        //m_gl.repaintSnapping( movedRect );
     }
 
     if ( move != KoPoint( 0, 0 ) )
@@ -4701,7 +4705,8 @@
 
     if ( snapToGuideLines )
     {
-        m_gl.snapToGuideLines( movedRect, MOUSE_SNAP_DISTANCE, snapStatus, \
m_moveSnapDiff ); +#warning "kde4 port to qrectf"	    
+        //m_gl.snapToGuideLines( movedRect, MOUSE_SNAP_DISTANCE, snapStatus, \
m_moveSnapDiff );  }
 
     move += m_moveSnapDiff;
@@ -4743,7 +4748,8 @@
     if ( snapToGuideLines )
     {
         // redraw guidelines (intentionally always)
-        m_gl.repaintSnapping( movedRect );
+#warning "kde4: port to qrectf" 
+        //m_gl.repaintSnapping( movedRect );
     }
 
     if ( move != KoPoint( 0, 0 ) )
@@ -4947,7 +4953,8 @@
             {
                 sp.setY( rect.bottom() );
             }
-            m_gl.repaintSnapping( sp, snapStatus );
+#warning "kde4 port to qrectf"	    
+            //m_gl.repaintSnapping( sp, snapStatus );
         }
 
         _repaint( oldBoundingRect );
@@ -5565,7 +5572,8 @@
 
     if ( snapToGuideLines )
     {
-        m_gl.snapToGuideLines( sp, MOUSE_SNAP_DISTANCE, snapStatus, snapDiff );
+#warning "port to QPointF/QRectF"	    
+        //m_gl.snapToGuideLines( sp, MOUSE_SNAP_DISTANCE, snapStatus, snapDiff );
     }
 
     sp += snapDiff;
@@ -5585,7 +5593,8 @@
     // redraw guidelines (intentionally always)
     if ( repaintSnapping && snapToGuideLines )
     {
-        m_gl.repaintSnapping( sp, KoGuides::SNAP_BOTH );
+#warning "kde4: port to QRectF/QPointF"	    
+        //m_gl.repaintSnapping( sp, KoGuides::SNAP_BOTH );
     }
 
     return sp;
--- trunk/koffice/kpresenter/KPrView.cpp #612692:612693
@@ -5653,6 +5653,8 @@
 
 void KPrView::addGuideLine()
 {
+#warning "port to new koguide"	
+#if 0	
     KoRect rect( m_canvas->activePage()->getPageRect() );
 
     KoPoint pos( zoomHandler()->unzoomPointOld( m_mousePos + QPoint( \
m_canvas->diffx(), m_canvas->diffy() ) ) ); @@ -5661,6 +5663,7 @@
     {
         m_pKPresenterDoc->addGuideLine( dia.orientation(), dia.pos() );
     }
+#endif    
 }
 
 void KPrView::removeComment()


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