Compile, link

svn path=/trunk/koffice/; revision=649643

libs/flake/KoCreateShapeStrategy.cpp

@@ -115,7 +115,7 @@ void KoCreateShapeStrategy::paint( QPainter &painter, KoViewConverter &converter
         if(painter.hasClipping())
             paintRect = paintRect.intersect(painter.clipRegion().boundingRect());
 
-        painter.setWorldMatrix( matrix, true );
+        painter.setMatrix( matrix, true );
         painter.drawPath( m_outline );
         painter.restore();
     }

libs/flake/KoInteractionStrategy.cpp

@@ -86,7 +86,7 @@ KoInteractionStrategy* KoInteractionStrategy::createStrategy(KoPointerEvent *eve
             return new KoShapeMoveStrategy(parent, canvas, event->point);
     }
 
-    KoShape * object( shapeManager->shapeAt( event->point, (event->modifiers() & Qt::ShiftButton) ? KoFlake::NextUnselected : KoFlake::ShapeOnTop ) );
+    KoShape * object( shapeManager->shapeAt( event->point, (event->modifiers() & Qt::ShiftModifier) ? KoFlake::NextUnselected : KoFlake::ShapeOnTop ) );
     if( !object && handle == KoFlake::NoHandle) {
         if ( ( event->modifiers() & Qt::ControlModifier ) == 0 )
         {

libs/flake/KoInteractionTool.cpp

@@ -101,14 +101,14 @@ KoInteractionTool::KoInteractionTool( KoCanvasBase *canvas )
     d->shearCursors[5] = QCursor(shearPixmap.transformed(QMatrix().rotate(225)));
     d->shearCursors[6] = QCursor(shearPixmap.transformed(QMatrix().rotate(270)));
     d->shearCursors[7] = QCursor(shearPixmap.transformed(QMatrix().rotate(315)));
-    d->sizeCursors[0] = KCursor::sizeVerCursor();
-    d->sizeCursors[1] = KCursor::sizeBDiagCursor();
-    d->sizeCursors[2] = KCursor::sizeHorCursor();
-    d->sizeCursors[3] = KCursor::sizeFDiagCursor();
-    d->sizeCursors[4] = KCursor::sizeVerCursor();
-    d->sizeCursors[5] = KCursor::sizeBDiagCursor();
-    d->sizeCursors[6] = KCursor::sizeHorCursor();
-    d->sizeCursors[7] = KCursor::sizeFDiagCursor();
+    d->sizeCursors[0] = Qt::SizeVerCursor;
+    d->sizeCursors[1] = Qt::SizeBDiagCursor;
+    d->sizeCursors[2] = Qt::SizeHorCursor;
+    d->sizeCursors[3] = Qt::SizeFDiagCursor;
+    d->sizeCursors[4] = Qt::SizeVerCursor;
+    d->sizeCursors[5] = Qt::SizeBDiagCursor;
+    d->sizeCursors[6] = Qt::SizeHorCursor;
+    d->sizeCursors[7] = Qt::SizeFDiagCursor;
 }
 
 KoInteractionTool::~KoInteractionTool()

libs/flake/KoParameterShape.cpp

@@ -82,7 +82,7 @@ void KoParameterShape::paintHandles( QPainter & painter, const KoViewConverter &
     QMatrix worldMatrix = painter.worldMatrix();
     painter.setMatrix( QMatrix() );
 
-    QWMatrix matrix;
+    QMatrix matrix;
     matrix.rotate( 45.0 );
     QPolygonF poly( handleRect( QPointF( 0, 0 ), handleRadius ) );
     poly = matrix.map( poly );
@@ -104,7 +104,7 @@ void KoParameterShape::paintHandle( QPainter & painter, const KoViewConverter &
     QMatrix worldMatrix = painter.worldMatrix();
     painter.setMatrix( QMatrix() );
 
-    QWMatrix matrix;
+    QMatrix matrix;
     matrix.rotate( 45.0 );
     QPolygonF poly( handleRect( QPointF( 0, 0 ), handleRadius ) );
     poly = matrix.map( poly );

libs/flake/KoPathShape.cpp

@@ -236,7 +236,7 @@ void KoPathPoint::paint( QPainter &painter, const QSizeF &size, KoPointTypes typ
             painter.drawRect( handle.translated( point() ) );
         else if( properties() & IsSymmetric )
         {
-            QWMatrix matrix;
+            QMatrix matrix;
             matrix.rotate( 45.0 );
             QPolygonF poly( handle );
             poly = matrix.map( poly );

libs/kofficecore/KoContainerHandler.cpp

@@ -345,7 +345,7 @@ bool KoContainerHandler::eventFilter( QObject*, QEvent* ev )
         else if ( gadget == KoChild::MidLeft || gadget == KoChild::MidRight )
             targetWidget->setCursor( Qt::SizeHorCursor );
         else if ( gadget == KoChild::Move )
-            targetWidget->setCursor( KCursor::handCursor() );
+            targetWidget->setCursor( Qt::PointingHandCursor );
         else
         {
 //            targetWidget->setCursor( arrowCursor );

libs/kofficecore/KoFrame.cpp

@@ -342,10 +342,10 @@ void KoFrame::mouseMoveEvent( QMouseEvent* ev )
     else if ( r7.contains( ev->pos() ) || r8.contains( ev->pos() ) )
       setCursor( Qt::SizeHorCursor );
     else
-      setCursor( KCursor::handCursor() );
+      setCursor( Qt::PointingHandCursor );
   }
   else
-    setCursor( KCursor::handCursor() );
+    setCursor( Qt::PointingHandCursor );
 }
 
 void KoFrame::mouseReleaseEvent( QMouseEvent* )

libs/kofficecore/KoMainWindow.cpp

@@ -1339,7 +1339,7 @@ void KoMainWindow::slotConfigureToolbars()
 {
     if (rootDocument())
         saveMainWindowSettings( KGlobal::config()->group( rootDocument()->componentData().componentName() ) );
-    KEditToolBar edit(factory(), QString(), this);
+    KEditToolBar edit(factory(), this);
     connect(&edit,SIGNAL(newToolbarConfig()),this,SLOT(slotNewToolbarConfig()));
     (void) edit.exec();
 }

libs/kofficeui/KoContextHelp.cpp

@@ -254,7 +254,7 @@ void KoHelpView::mouseReleaseEvent( QMouseEvent* e )
 void KoHelpView::mouseMoveEvent( QMouseEvent* e )
 {
 	if ( !currentText->anchorAt( e->pos() ).isEmpty() )
-		setCursor( KCursor::handCursor() );
+		setCursor( Qt::PointingHandCursor );
 	else
 		setCursor( KCursor::arrowCursor() );
 } // KoHelpView::mouseMove

libs/kwmf/CMakeLists.txt

@@ -11,7 +11,7 @@ kde4_automoc(${kwmf_LIB_SRCS})
 
 kde4_add_library(kwmf SHARED ${kwmf_LIB_SRCS})
 
-target_link_libraries(kwmf  ${KDE4_KDECORE_LIBS} )
+target_link_libraries(kwmf  ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY})
 
 set_target_properties(kwmf PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} )
 install(TARGETS kwmf  DESTINATION ${LIB_INSTALL_DIR})
@@ -30,7 +30,7 @@ kde4_automoc(${kowmf_LIB_SRCS})
 
 kde4_add_library(kowmf SHARED ${kowmf_LIB_SRCS})
 
-target_link_libraries(kowmf  ${KDE4_KDECORE_LIBS} ${QT_QT3SUPPORT_LIBRARY})
+target_link_libraries(kowmf  ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY})
 
 set_target_properties(kowmf PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} )
 install(TARGETS kowmf  DESTINATION ${LIB_INSTALL_DIR})