TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 4 insertions, 4 deletions

diff --git a/kivio/kiviopart/kiviosdk/kivio_shape_painter.cpp b/kivio/kiviopart/kiviosdk/kivio_shape_painter.cpp
index f0d446cc..fbdad979 100644
--- a/kivio/kiviopart/kiviosdk/kivio_shape_painter.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_shape_painter.cpp
@@ -8,13 +8,13 @@
 #include "kivio_shape_data.h"
 #include "kivio_shape_painter.h"
 
-#include <qcolor.h>
+#include <tqcolor.h>
 
 
 KivioShapePainter::KivioShapePainter( KivioPainter *p )
 {
     m_pPainter = p;
-    m_fgColor = QColor(255,255,255);
+    m_fgColor = TQColor(255,255,255);
     m_lineWidth = 1.0f;
     m_pShape = NULL;
 
@@ -37,9 +37,9 @@ void KivioShapePainter::drawShape( KivioShape *pShape, float x, float y, float w
 
     m_pShape = pShape;
 
-    pShapeData = pShape->shapeData();
+    pShapeData = pShape->tqshapeData();
 
-    switch( pShapeData->shapeType() )
+    switch( pShapeData->tqshapeType() )
     {
     case KivioShapeData::kstArc:
         drawArc();