Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

20 files changed, 80 insertions, 80 deletions

diff --git a/karbon/tools/vellipsetool.cc b/karbon/tools/vellipsetool.cc
index b0f981af..41936226 100644
--- a/karbon/tools/vellipsetool.cc
+++ b/karbon/tools/vellipsetool.cc
@@ -152,7 +152,7 @@ VEllipseTool::refreshUnit()
 }
 
 VPath*
-VEllipseTool::shape( bool interactive ) const
+VEllipseTool::tqshape( bool interactive ) const
 {
 	if( interactive )
 	{
@@ -270,7 +270,7 @@ VEllipseTool::setup( KActionCollection *collection )
 	{
 		m_action = new KRadioAction( i18n( "Ellipse Tool" ), "14_ellipse", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() );
 		m_action->setToolTip( i18n( "Ellipse" ) );
-		m_action->setExclusiveGroup( "shapes" );
+		m_action->setExclusiveGroup( "tqshapes" );
 		//m_ownAction = true;
 	}
 }
diff --git a/karbon/tools/vellipsetool.h b/karbon/tools/vellipsetool.h
index 5a605c53..859cac96 100644
--- a/karbon/tools/vellipsetool.h
+++ b/karbon/tools/vellipsetool.h
@@ -70,7 +70,7 @@ public:
 	virtual void setup(KActionCollection *collection);
 	virtual bool showDialog() const;
 	virtual TQString uiname() { return i18n( "Ellipse Tool" ); }
-	virtual VPath *shape( bool interactive = false ) const;
+	virtual VPath *tqshape( bool interactive = false ) const;
 	void refreshUnit();
 
 protected:
diff --git a/karbon/tools/vpatterntool.cc b/karbon/tools/vpatterntool.cc
index 92a981ba..893c8481 100644
--- a/karbon/tools/vpatterntool.cc
+++ b/karbon/tools/vpatterntool.cc
@@ -22,7 +22,7 @@
 #include <tqtoolbutton.h>
 #include <tqframe.h>
 #include <tqhbuttongroup.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqfileinfo.h>
 #include <tqlabel.h>
 #include <tqcursor.h>
@@ -49,9 +49,9 @@ VPatternWidget::VPatternWidget( TQPtrList<KoIconItem>* patterns, VTool*, TQWidge
 	: KDialogBase( parent, "", true, i18n( "Choose Pattern" ), Ok | Cancel ), m_pattern( 0 )
 {
 	TQWidget *base = new TQWidget( this );
-	TQVBoxLayout* layout = new TQVBoxLayout( base );
-	layout->addWidget( m_patternChooser = new KoIconChooser( TQSize( 32, 32 ), base ) );
-	layout->addWidget( m_buttonGroup = new TQHButtonGroup( base ) );
+	TQVBoxLayout* tqlayout = new TQVBoxLayout( base );
+	tqlayout->addWidget( m_patternChooser = new KoIconChooser( TQSize( 32, 32 ), base ) );
+	tqlayout->addWidget( m_buttonGroup = new TQHButtonGroup( base ) );
 	m_buttonGroup->insert( m_importPatternButton = new TQToolButton( m_buttonGroup ) );
 	m_buttonGroup->insert( m_deletePatternButton = new TQToolButton( m_buttonGroup ) );
 	m_patternChooser->setFixedSize( 180, 120 );
@@ -65,7 +65,7 @@ VPatternWidget::VPatternWidget( TQPtrList<KoIconItem>* patterns, VTool*, TQWidge
 	m_deletePatternButton->setEnabled( false );
 
 	//setFrameStyle( Box | Sunken );
-	layout->setMargin( 3 );
+	tqlayout->setMargin( 3 );
 
 	connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) );
 	connect( m_patternChooser, TQT_SIGNAL( selected( KoIconItem* ) ), this, TQT_SLOT( patternSelected( KoIconItem* ) ) );
diff --git a/karbon/tools/vpolygontool.cc b/karbon/tools/vpolygontool.cc
index fdd02299..db1ffb88 100644
--- a/karbon/tools/vpolygontool.cc
+++ b/karbon/tools/vpolygontool.cc
@@ -119,7 +119,7 @@ VPolygonTool::arrowKeyReleased( TQt::Key key )
 }
 
 VPath*
-VPolygonTool::shape( bool interactive ) const
+VPolygonTool::tqshape( bool interactive ) const
 {
 	if( interactive )
 	{
@@ -158,7 +158,7 @@ VPolygonTool::setup( KActionCollection *collection )
 		shortcut.append(KShortcut( TQt::Key_F9 ) );
 		m_action = new KRadioAction( i18n( "Polygon Tool" ), "14_polygon", shortcut, this, TQT_SLOT( activate() ), collection, name() );
 		m_action->setToolTip( i18n( "Polygon" ) );
-		m_action->setExclusiveGroup( "shapes" );
+		m_action->setExclusiveGroup( "tqshapes" );
 		//m_ownAction = true;
 	}
 }
diff --git a/karbon/tools/vpolygontool.h b/karbon/tools/vpolygontool.h
index cb1dabab..052d7e50 100644
--- a/karbon/tools/vpolygontool.h
+++ b/karbon/tools/vpolygontool.h
@@ -38,7 +38,7 @@ public:
 	virtual bool showDialog() const;
 	virtual TQString uiname() { return i18n( "Polygon Tool" ); }
 
-	virtual VPath *shape( bool interactive = false ) const;
+	virtual VPath *tqshape( bool interactive = false ) const;
 
 	void refreshUnit();
 
diff --git a/karbon/tools/vrectangletool.cc b/karbon/tools/vrectangletool.cc
index 1b9d9c0f..7d949ac7 100644
--- a/karbon/tools/vrectangletool.cc
+++ b/karbon/tools/vrectangletool.cc
@@ -101,7 +101,7 @@ VRectangleTool::refreshUnit()
 }
 
 VPath *
-VRectangleTool::shape( bool interactive ) const
+VRectangleTool::tqshape( bool interactive ) const
 {
 	if( interactive )
 	{
@@ -136,7 +136,7 @@ VRectangleTool::setup( KActionCollection *collection )
 	{
 		m_action = new KRadioAction( i18n( "Rectangle Tool" ), "14_rectangle", TQt::Key_Plus+TQt::Key_F9, this, TQT_SLOT( activate() ), collection, name() );
 		m_action->setToolTip( i18n( "Rectangle" ) );
-		m_action->setExclusiveGroup( "shapes" );
+		m_action->setExclusiveGroup( "tqshapes" );
 		//m_ownAction = true;
 	}
 }
diff --git a/karbon/tools/vrectangletool.h b/karbon/tools/vrectangletool.h
index ce39a119..b902b1ab 100644
--- a/karbon/tools/vrectangletool.h
+++ b/karbon/tools/vrectangletool.h
@@ -39,7 +39,7 @@ public:
 	virtual void setup(KActionCollection *collection);
 	virtual bool showDialog() const;
 	virtual TQString uiname() { return i18n( "Rectangle Tool" ); }
-	virtual VPath* shape( bool interactive = false ) const;
+	virtual VPath* tqshape( bool interactive = false ) const;
 
 	void refreshUnit();
 
diff --git a/karbon/tools/vroundrecttool.cc b/karbon/tools/vroundrecttool.cc
index c88bacd8..b7f354cf 100644
--- a/karbon/tools/vroundrecttool.cc
+++ b/karbon/tools/vroundrecttool.cc
@@ -40,7 +40,7 @@ VRoundRectTool::VRoundRectOptionsWidget::VRoundRectOptionsWidget( KarbonPart *pa
 	KoUnit::Unit unit = KoUnit::U_CM;
 	m_width = new KoUnitDoubleSpinBox( group, 0.0, KoUnit::fromUserValue( 1000.0, unit ), KoUnit::fromUserValue( 0.5, unit ), KoUnit::fromUserValue( 10.0, unit ), unit );
 
-	new TQLabel( i18n( "Height (%1):" ).arg(KoUnit::unitName( m_part->unit() )), group );
+	new TQLabel( i18n( "Height (%1):" ).tqarg(KoUnit::unitName( m_part->unit() )), group );
 	m_height = new KoUnitDoubleSpinBox( group, 0.0, KoUnit::fromUserValue( 1000.0, unit ), KoUnit::fromUserValue( 0.5, unit ), KoUnit::fromUserValue( 10.0, unit ), unit );
 
 	new TQLabel( i18n( "Edge radius X:" ), group );
@@ -132,7 +132,7 @@ void VRoundRectTool::refreshUnit()
 }
 
 VPath*
-VRoundRectTool::shape( bool interactive ) const
+VRoundRectTool::tqshape( bool interactive ) const
 {
 	if( interactive )
 	{
@@ -172,7 +172,7 @@ VRoundRectTool::setup( KActionCollection *collection )
 	{
 		m_action = new KRadioAction( i18n( "Round Rectangle Tool" ), "14_roundrect", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() );
 		m_action->setToolTip( i18n( "Round Rectangle" ) );
-		m_action->setExclusiveGroup( "shapes" );
+		m_action->setExclusiveGroup( "tqshapes" );
 		//m_ownAction = true;
 	}
 }
diff --git a/karbon/tools/vroundrecttool.h b/karbon/tools/vroundrecttool.h
index 5149ff2f..59a2fab0 100644
--- a/karbon/tools/vroundrecttool.h
+++ b/karbon/tools/vroundrecttool.h
@@ -43,7 +43,7 @@ public:
 	virtual void setup(KActionCollection *collection);
 	virtual TQString uiname() { return i18n( "Round Rectangle Tool" ); }
 
-	virtual VPath* shape( bool interactive = false ) const;
+	virtual VPath* tqshape( bool interactive = false ) const;
 
 	void refreshUnit();
 
diff --git a/karbon/tools/vselecttool.cc b/karbon/tools/vselecttool.cc
index e6b87f62..e29e1afb 100644
--- a/karbon/tools/vselecttool.cc
+++ b/karbon/tools/vselecttool.cc
@@ -424,11 +424,11 @@ VSelectTool::updateStatusBar() const
 		double b = KoUnit::toUserValue( rect.bottom(), view()->part()->unit() );
 
 		// print bottom-left (%1,%2), top-right (%3,%4) corner of selection bounding box and document unit (%5)
-		TQString selectMessage = i18n( "[(left,bottom), (right,top)] (actual unit)", "Selection [(%1, %2), (%3, %4)] (%5)").arg( x, 0, 'f', 1 ).arg( y, 0, 'f', 1 ).arg( r, 0, 'f', 1 ).arg( b, 0, 'f', 1 ).arg( view()->part()->unitName() );
+		TQString selectMessage = i18n( "[(left,bottom), (right,top)] (actual unit)", "Selection [(%1, %2), (%3, %4)] (%5)").tqarg( x, 0, 'f', 1 ).tqarg( y, 0, 'f', 1 ).tqarg( r, 0, 'f', 1 ).tqarg( b, 0, 'f', 1 ).tqarg( view()->part()->unitName() );
 
 		VSelectionDescription selectionDesc;
 		selectionDesc.visit( *view()->part()->document().selection() );
-		selectMessage += TQString( "(%1)" ).arg( selectionDesc.description() );
+		selectMessage += TQString( "(%1)" ).tqarg( selectionDesc.description() );
 
 		view()->statusMessage()->setText( selectMessage );
 	}
diff --git a/karbon/tools/vshapetool.cc b/karbon/tools/vshapetool.cc
index 9b59104d..49197773 100644
--- a/karbon/tools/vshapetool.cc
+++ b/karbon/tools/vshapetool.cc
@@ -52,8 +52,8 @@ TQString
 VShapeTool::contextHelp()
 {
 	TQString 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>" );
+	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;
 } 
 
@@ -77,7 +77,7 @@ VShapeTool::draw()
 	VPainter* painter = view()->painterFactory()->editpainter();
 	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 );
 
diff --git a/karbon/tools/vshapetool.h b/karbon/tools/vshapetool.h
index f66b5719..2a774e94 100644
--- a/karbon/tools/vshapetool.h
+++ b/karbon/tools/vshapetool.h
@@ -58,7 +58,7 @@ protected:
 	// Make it "abstract":
 	virtual ~VShapeTool();
 
-	virtual VPath* shape( bool interactive = false ) const = 0;
+	virtual VPath* tqshape( bool interactive = false ) const = 0;
 
 	/**
 	 * Output coordinates.
diff --git a/karbon/tools/vsinustool.cc b/karbon/tools/vsinustool.cc
index 65a8a62f..f95bc2c5 100644
--- a/karbon/tools/vsinustool.cc
+++ b/karbon/tools/vsinustool.cc
@@ -20,7 +20,7 @@
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
 #include <knuminput.h>
@@ -120,7 +120,7 @@ VSinusTool::refreshUnit()
 }
 
 VPath*
-VSinusTool::shape( bool interactive ) const
+VSinusTool::tqshape( bool interactive ) const
 {
 	if( interactive )
 		return
@@ -155,7 +155,7 @@ VSinusTool::setup( KActionCollection *collection )
 	{
 		m_action = new KRadioAction( i18n( "Sinus Tool" ), "14_sinus", TQt::SHIFT+TQt::Key_S, this, TQT_SLOT( activate() ), collection, name() );
 		m_action->setToolTip( i18n( "Sinus" ) );
-		m_action->setExclusiveGroup( "shapes" );
+		m_action->setExclusiveGroup( "tqshapes" );
 		//m_ownAction = true;
 	}
 }
diff --git a/karbon/tools/vsinustool.h b/karbon/tools/vsinustool.h
index 4aa1c464..71669ebd 100644
--- a/karbon/tools/vsinustool.h
+++ b/karbon/tools/vsinustool.h
@@ -38,7 +38,7 @@ public:
 	virtual bool showDialog() const;
 	virtual TQString uiname() { return i18n( "Sinus Tool" ); }
 
-	virtual VPath *shape( bool interactive = false ) const;
+	virtual VPath *tqshape( bool interactive = false ) const;
 
 	void refreshUnit();
 
diff --git a/karbon/tools/vspiraltool.cc b/karbon/tools/vspiraltool.cc
index e0c78e1d..304c8637 100644
--- a/karbon/tools/vspiraltool.cc
+++ b/karbon/tools/vspiraltool.cc
@@ -165,7 +165,7 @@ VSpiralTool::refreshUnit()
 }
 
 VPath*
-VSpiralTool::shape( bool interactive ) const
+VSpiralTool::tqshape( bool interactive ) const
 {
 	if( interactive )
 	{
@@ -206,7 +206,7 @@ VSpiralTool::setup( KActionCollection *collection )
 	{
 		m_action = new KRadioAction( i18n( "Spiral Tool" ), "14_spiral", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT( activate() ), collection, name() );
 		m_action->setToolTip( i18n( "Spiral" ) );
-		m_action->setExclusiveGroup( "shapes" );
+		m_action->setExclusiveGroup( "tqshapes" );
 		//m_ownAction = true;
 	}
 }
diff --git a/karbon/tools/vspiraltool.h b/karbon/tools/vspiraltool.h
index 072e3bea..5787063d 100644
--- a/karbon/tools/vspiraltool.h
+++ b/karbon/tools/vspiraltool.h
@@ -41,7 +41,7 @@ public:
 	virtual bool showDialog() const;
 	virtual TQString uiname() { return i18n( "Spiral Tool" ); }
 
-	virtual VPath* shape( bool interactive = false ) const;
+	virtual VPath* tqshape( bool interactive = false ) const;
 
 	void refreshUnit();
 
diff --git a/karbon/tools/vstartool.cc b/karbon/tools/vstartool.cc
index 114bab75..42c74f4e 100644
--- a/karbon/tools/vstartool.cc
+++ b/karbon/tools/vstartool.cc
@@ -198,7 +198,7 @@ VStarTool::arrowKeyReleased( TQt::Key key )
 }
 
 VPath*
-VStarTool::shape( bool interactive ) const
+VStarTool::tqshape( bool interactive ) const
 {
 	if( interactive )
 	{
@@ -241,7 +241,7 @@ VStarTool::setup( KActionCollection *collection )
 		shortcut.append(KShortcut( TQt::Key_F9 ) );
 		m_action = new KRadioAction( i18n( "Star Tool" ), "14_star", shortcut, this, TQT_SLOT( activate() ), collection, name() );
 		m_action->setToolTip( i18n( "Draw a star" ) );
-		m_action->setExclusiveGroup( "shapes" );
+		m_action->setExclusiveGroup( "tqshapes" );
 		//m_ownAction = true;
 	}
 }
diff --git a/karbon/tools/vstartool.h b/karbon/tools/vstartool.h
index ce073d0c..07d744c0 100644
--- a/karbon/tools/vstartool.h
+++ b/karbon/tools/vstartool.h
@@ -74,7 +74,7 @@ public:
 	virtual bool showDialog() const;
 	virtual void setup(KActionCollection *collection);
 	virtual TQString uiname() { return i18n( "Star Tool" ); }
-	virtual VPath* shape( bool interactive = false ) const;
+	virtual VPath* tqshape( bool interactive = false ) const;
 
 	void refreshUnit();
 
diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc
index 29293e8b..a3500160 100644
--- a/karbon/tools/vtexttool.cc
+++ b/karbon/tools/vtexttool.cc
@@ -23,7 +23,7 @@
 #include <tqcombobox.h>
 #include <tqcursor.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
@@ -173,7 +173,7 @@ ShadowPreview::paintEvent( TQPaintEvent* )
 		p.lineTo( KoPoint( w, h ) );
 		p.lineTo( KoPoint( w, 0 ) );
 		p.lineTo( KoPoint( 0, 0 ) );
-		VColor c( colorGroup().background() );
+		VColor c( tqcolorGroup().background() );
 		c.setOpacity( .8 );
 		p.setBrush( VFill( c ) );
 		p.fillPath();
@@ -183,13 +183,13 @@ ShadowPreview::paintEvent( TQPaintEvent* )
 
 	TQPainter painter( this );
 	painter.drawPixmap( 2, 2, pm );
-	painter.setPen( colorGroup().light() );
+	painter.setPen( tqcolorGroup().light() );
 	painter.moveTo( 1, height() - 1 );
 	painter.lineTo( 1, 1 );
 	painter.lineTo( width() - 1, 1 );
 	painter.lineTo( width() - 1, height() - 1 );
 	painter.lineTo( 1, height() - 1 );
-	painter.setPen( colorGroup().dark() );
+	painter.setPen( tqcolorGroup().dark() );
 	painter.moveTo( 0, height() - 1 );
 	painter.lineTo( 0, 0 );
 	painter.lineTo( width() - 1, 0 );
@@ -205,22 +205,22 @@ ShadowWidget::ShadowWidget( TQWidget* parent, const char* name, int angle, int d
 		: TQGroupBox( parent, name )
 {
 	setTitle( i18n( "Shadow" ) );
-	setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
-
-	TQGridLayout* layout = new TQGridLayout( this );
-	layout->addRowSpacing( 0, 12 );
-	layout->setMargin( 3 );
-	layout->setSpacing( 2 );
-	layout->setColStretch( 0, 1 );
-	layout->setColStretch( 1, 0 );
-	layout->setColStretch( 2, 2 );
-	layout->addMultiCellWidget( m_preview = new ShadowPreview( this ), 1, 3, 0, 0 );
-	layout->addWidget( new TQLabel( i18n( "Angle:" ), this ), 1, 1 );
-	layout->addWidget( m_angle = new KIntNumInput( this ), 1, 2 );
-	layout->addWidget( new TQLabel( i18n( "Distance:" ), this ), 2, 1 );
-	layout->addWidget( m_distance = new KIntNumInput( this ), 2, 2 );
-	layout->addWidget( m_useShadow = new TQCheckBox( i18n( "Shadow" ), this ), 3, 1 );
-	layout->addWidget( m_translucent = new TQCheckBox( i18n( "Draw translucent shadow" ), this ), 3, 2 );
+	tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+
+	TQGridLayout* tqlayout = new TQGridLayout( this );
+	tqlayout->addRowSpacing( 0, 12 );
+	tqlayout->setMargin( 3 );
+	tqlayout->setSpacing( 2 );
+	tqlayout->setColStretch( 0, 1 );
+	tqlayout->setColStretch( 1, 0 );
+	tqlayout->setColStretch( 2, 2 );
+	tqlayout->addMultiCellWidget( m_preview = new ShadowPreview( this ), 1, 3, 0, 0 );
+	tqlayout->addWidget( new TQLabel( i18n( "Angle:" ), this ), 1, 1 );
+	tqlayout->addWidget( m_angle = new KIntNumInput( this ), 1, 2 );
+	tqlayout->addWidget( new TQLabel( i18n( "Distance:" ), this ), 2, 1 );
+	tqlayout->addWidget( m_distance = new KIntNumInput( this ), 2, 2 );
+	tqlayout->addWidget( m_useShadow = new TQCheckBox( i18n( "Shadow" ), this ), 3, 1 );
+	tqlayout->addWidget( m_translucent = new TQCheckBox( i18n( "Draw translucent shadow" ), this ), 3, 2 );
 	m_distance->setRange( 1, 37, 1, true );
 	m_angle->setRange( 0, 360, 10, true );
 	m_angle->setValue( angle );
@@ -255,7 +255,7 @@ void
 ShadowWidget::setShadowAngle( int angle )
 {
 	m_angle->setValue( angle );
-	m_preview->repaint();
+	m_preview->tqrepaint();
 }
 
 int
@@ -268,7 +268,7 @@ void
 ShadowWidget::setShadowDistance( int distance )
 {
 	m_distance->setValue( distance );
-	m_preview->repaint();
+	m_preview->tqrepaint();
 }
 
 int
@@ -281,7 +281,7 @@ void
 ShadowWidget::setTranslucent( bool translucent )
 {
 	m_translucent->setChecked( translucent );
-	m_preview->repaint();
+	m_preview->tqrepaint();
 }
 
 bool ShadowWidget::isTranslucent()
@@ -301,13 +301,13 @@ ShadowWidget::setShadowValues( int angle, int distance, bool translucent )
 void
 ShadowWidget::updatePreview( int )
 {
-	m_preview->repaint();
+	m_preview->tqrepaint();
 }
 
 void
 ShadowWidget::updatePreview()
 {
-	m_preview->repaint();
+	m_preview->tqrepaint();
 	bool ok = m_useShadow->isChecked();
 	m_angle->setEnabled( ok );
 	m_distance->setEnabled( ok );
@@ -317,7 +317,7 @@ ShadowWidget::updatePreview()
 VTextOptionsWidget::VTextOptionsWidget( VTextTool* tool, TQWidget *parent )
 	: KDialogBase( parent, "", true, i18n( "Text" ), Ok | Cancel ), m_tool( tool )
 {
-	//setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+	//tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
 	//setFrameStyle( Box | Sunken );
 	TQWidget *base = new TQWidget( this );
 	TQVBoxLayout* mainLayout = new TQVBoxLayout( base );
@@ -387,13 +387,13 @@ VTextOptionsWidget::VTextOptionsWidget( VTextTool* tool, TQWidget *parent )
 
 	m_convertToShapes->setEnabled( true );
 
-	m_textAlignment->insertItem( i18n( "Horizontal alignment", "Left") );
-	m_textAlignment->insertItem( i18n( "Horizontal alignment", "Center") );
-	m_textAlignment->insertItem( i18n( "Horizontal alignment", "Right") );
+	m_textAlignment->insertItem( i18n( "Horizontal tqalignment", "Left") );
+	m_textAlignment->insertItem( i18n( "Horizontal tqalignment", "Center") );
+	m_textAlignment->insertItem( i18n( "Horizontal tqalignment", "Right") );
 
-	m_textPosition->insertItem( i18n( "Vertical alignment", "Above") );
-	m_textPosition->insertItem( i18n( "Vertical alignment", "On") );
-	m_textPosition->insertItem( i18n( "Vertical alignment", "Under") );
+	m_textPosition->insertItem( i18n( "Vertical tqalignment", "Above") );
+	m_textPosition->insertItem( i18n( "Vertical tqalignment", "On") );
+	m_textPosition->insertItem( i18n( "Vertical tqalignment", "Under") );
 
 	m_textOffset->setRange( 0.0, 100.0, 1.0, true );
 
@@ -518,12 +518,12 @@ VText::Position VTextOptionsWidget::position()
 }
 
 void
-VTextOptionsWidget::setAlignment( VText::Alignment alignment )
+VTextOptionsWidget::tqsetAlignment( VText::Alignment tqalignment )
 {
-	m_textAlignment->setCurrentItem( alignment );
+	m_textAlignment->setCurrentItem( tqalignment );
 }
 
-VText::Alignment VTextOptionsWidget::alignment()
+VText::Alignment VTextOptionsWidget::tqalignment()
 {
 	return ( VText::Alignment ) m_textAlignment->currentItem();
 }
@@ -768,7 +768,7 @@ VTextTool::createText( VSubpath &path )
 	m_text = 0L;
 	delete m_editedText;
 
-	m_editedText = new VText( m_optionsWidget->font(), path, m_optionsWidget->position(), m_optionsWidget->alignment(), m_optionsWidget->text() );
+	m_editedText = new VText( m_optionsWidget->font(), path, m_optionsWidget->position(), m_optionsWidget->tqalignment(), m_optionsWidget->text() );
 	
 	if( ! m_editedText ) 
 		return false;
@@ -803,7 +803,7 @@ VTextTool::textChanged()
 	m_editedText->setText( m_optionsWidget->text() );
 	m_editedText->setFont( m_optionsWidget->font() );
 	m_editedText->setPosition( m_optionsWidget->position() );
-	m_editedText->setAlignment( m_optionsWidget->alignment() );
+	m_editedText->tqsetAlignment( m_optionsWidget->tqalignment() );
 	m_editedText->setOffset( 0.01 * m_optionsWidget->offset()  );
 #ifdef HAVE_KARBONTEXT
 	m_editedText->traceText();
@@ -829,7 +829,7 @@ VTextTool::accept()
 				  m_editedText->font(),
 				  m_editedText->basePath(),
 				  m_editedText->position(),
-				  m_editedText->alignment(),
+				  m_editedText->tqalignment(),
 				  m_editedText->offset(),
 				  m_editedText->text(),
 				  m_optionsWidget->useShadow(),
@@ -932,7 +932,7 @@ VTextTool::visitVText( VText& text )
 	m_optionsWidget->setFont( text.font() );
 	m_optionsWidget->setText( text.text() );
 	m_optionsWidget->setPosition( text.position() );
-	m_optionsWidget->setAlignment( text.alignment() );
+	m_optionsWidget->tqsetAlignment( text.tqalignment() );
 	m_optionsWidget->setOffset( text.offset() * 100.0 );
 	m_optionsWidget->setUseShadow( text.useShadow() );
 	m_optionsWidget->setShadow( text.shadowAngle(), text.shadowDistance(), text.translucentShadow() );
@@ -962,7 +962,7 @@ VTextTool::VTextCmd::VTextCmd( VDocument* doc, const TQString& name, VText* text
 	m_textModifications->newPosition = newPosition;
 	m_textModifications->oldPosition = text->position();
 	m_textModifications->newAlignment = newAlignment;
-	m_textModifications->oldAlignment = text->alignment();
+	m_textModifications->oldAlignment = text->tqalignment();
 	m_textModifications->newOffset = newOffset;
 	m_textModifications->oldOffset = text->offset();
 	m_textModifications->newText = newText;
@@ -1007,7 +1007,7 @@ VTextTool::VTextCmd::execute()
 		m_text->setFont( m_textModifications->newFont );
 		m_text->setBasePath( m_textModifications->newBasePath );
 		m_text->setPosition( m_textModifications->newPosition );
-		m_text->setAlignment( m_textModifications->newAlignment );
+		m_text->tqsetAlignment( m_textModifications->newAlignment );
 		m_text->setOffset( m_textModifications->newOffset );
 		m_text->setText( m_textModifications->newText );
 		m_text->setUseShadow( m_textModifications->newUseShadow );
@@ -1041,7 +1041,7 @@ VTextTool::VTextCmd::unexecute()
 		m_text->setFont( m_textModifications->oldFont );
 		m_text->setBasePath( m_textModifications->oldBasePath );
 		m_text->setPosition( m_textModifications->oldPosition );
-		m_text->setAlignment( m_textModifications->oldAlignment );
+		m_text->tqsetAlignment( m_textModifications->oldAlignment );
 		m_text->setOffset( m_textModifications->oldOffset );
 		m_text->setText( m_textModifications->oldText );
 		m_text->setUseShadow( m_textModifications->oldUseShadow );
diff --git a/karbon/tools/vtexttool.h b/karbon/tools/vtexttool.h
index 48357dbf..cd3c4e87 100644
--- a/karbon/tools/vtexttool.h
+++ b/karbon/tools/vtexttool.h
@@ -113,8 +113,8 @@ public:
 	TQString text();
 	void setPosition( VText::Position position );
 	VText::Position position();
-	void setAlignment( VText::Alignment alignment );
-	VText::Alignment alignment();
+	void tqsetAlignment( VText::Alignment tqalignment );
+	VText::Alignment tqalignment();
 	void setOffset( double offset );
 	double offset();
 	void setUseShadow( bool state );