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, 17 insertions, 17 deletions

diff --git a/karbon/tools/vshapetool.cc b/karbon/tools/vshapetool.cc
index 5ec04084..4f46c317 100644
--- a/karbon/tools/vshapetool.cc
+++ b/karbon/tools/vshapetool.cc
@@ -17,9 +17,9 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <qcursor.h>
-#include <qevent.h>
-#include <qlabel.h>
+#include <tqcursor.h>
+#include <tqevent.h>
+#include <tqlabel.h>
 
 #include "karbon_part.h"
 #include "karbon_view.h"
@@ -28,15 +28,15 @@
 #include "vglobal.h"
 #include "vpainter.h"
 #include "vpainterfactory.h"
-#include "vshapecmd.h"
-#include "vshapetool.h"
+#include "vtqshapecmd.h"
+#include "vtqshapetool.h"
 #include "vselection.h"
 #include "vcursor.h"
 
 VShapeTool::VShapeTool( KarbonView *view, const char *name, bool polar )
 	: VTool( view, name )
 {
-	m_cursor = new QCursor( VCursor::createCursor( VCursor::CrossHair ) );
+	m_cursor = new TQCursor( VCursor::createCursor( VCursor::CrossHair ) );
 
 	m_isPolar = polar;
 	m_isSquare   = false;
@@ -48,12 +48,12 @@ VShapeTool::~VShapeTool()
 	delete m_cursor;
 }
 
-QString
+TQString
 VShapeTool::contextHelp()
 {
-	QString s = i18n( "<qt><b>Shape tool</b><br>" );
-	s += i18n( "<i>Click and drag</i> to place your own shape.<br>" );
-	s += i18n( "<i>Click</i> to place a shape using the tool properties values.</qt>" );
+	TQString s = i18n( "<qt><b>Shape tool</b><br>" );
+	s += i18n( "<i>Click and drag</i> to place your own tqshape.<br>" );
+	s += i18n( "<i>Click</i> to place a tqshape using the tool properties values.</qt>" );
 	return s;
 } 
 
@@ -65,7 +65,7 @@ VShapeTool::activate()
 	view()->part()->document().selection()->showHandle( true );
 }
 
-QString
+TQString
 VShapeTool::statusText()
 {
 	return uiname();
@@ -75,9 +75,9 @@ void
 VShapeTool::draw()
 {
 	VPainter* painter = view()->painterFactory()->editpainter();
-	painter->setRasterOp( Qt::NotROP );
+	painter->setRasterOp( TQt::NotROP );
 
-	VPath* composite = shape();
+	VPath* composite = tqshape();
 	composite->setState( VPath::edit );
 	composite->draw( painter, &composite->boundingBox() );
 	delete( composite );
@@ -101,7 +101,7 @@ VShapeTool::mouseButtonRelease()
 
 	if( showDialog() )
 	{
-		VPath* composite = shape( true );
+		VPath* composite = tqshape( true );
 
 		if( composite )
 		{
@@ -136,7 +136,7 @@ VShapeTool::mouseDragRelease()
 
 	VShapeCmd* cmd = new VShapeCmd(
 		&view()->part()->document(),
-		uiname(), shape(), icon() );
+		uiname(), tqshape(), icon() );
 
 	view()->part()->addCommand( cmd, true );
 
@@ -266,8 +266,8 @@ VShapeTool::recalc()
 
 		if ( m_isCentered )
 		{
-			m_p.setX( m_p.x() - m_sign1 * qRound( m_d1 * 0.5 ) );
-			m_p.setY( m_p.y() + m_sign2 * qRound( m_d2 * 0.5 ) );
+			m_p.setX( m_p.x() - m_sign1 * tqRound( m_d1 * 0.5 ) );
+			m_p.setY( m_p.y() + m_sign2 * tqRound( m_d2 * 0.5 ) );
 		}
 	}
 }