Rename old tq methods that no longer need a unique name

21 files changed, 56 insertions, 56 deletions

diff --git a/karbon/core/vtext.h b/karbon/core/vtext.h
index ef40ac28..4f47f527 100644
--- a/karbon/core/vtext.h
+++ b/karbon/core/vtext.h
@@ -70,7 +70,7 @@ public:
 	virtual VSubpath& basePath() { return m_basePath; }
 	virtual void setPosition( Position position ) { m_position = position; }
 	virtual Position position() { return m_position; }
-	virtual void tqsetAlignment( Alignment tqalignment ) { m_tqalignment = tqalignment; }
+	virtual void setAlignment( Alignment tqalignment ) { m_tqalignment = tqalignment; }
 	virtual Alignment tqalignment() { return m_tqalignment; }
 	virtual void setUseShadow( bool state ) { m_shadow = state; }
 	virtual bool useShadow() { return m_shadow; }
diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc
index 98b0b883..a029d242 100644
--- a/karbon/dockers/vdocumentdocker.cc
+++ b/karbon/dockers/vdocumentdocker.cc
@@ -206,12 +206,12 @@ VDocumentPreview::paintEvent( TQPaintEvent* )
 	}
 
 	TQPainter pw( &pixmap );
-	pw.setPen( tqcolorGroup().light() );
+	pw.setPen( colorGroup().light() );
 	pw.drawLine( 1, 1, 1, height() - 2 );
 	pw.drawLine( 1, 1, width() - 2, 1 );
 	pw.drawLine( width() - 1, height() - 1, 0, height() - 1 );
 	pw.drawLine( width() - 1, height() - 1, width() - 1, 0 );
-	pw.setPen( tqcolorGroup().dark() );
+	pw.setPen( colorGroup().dark() );
 	pw.drawLine( 0, 0, width() - 1, 0 );
 	pw.drawLine( 0, 0, 0, height() - 1 );
 	pw.drawLine( width() - 2, height() - 2, width() - 2, 1 );
@@ -247,10 +247,10 @@ VDocumentTab::VDocumentTab( KarbonView* view, TQWidget* parent )
 	tqlayout->setColStretch( 2, 2 );
 	//tqlayout->addWidget(
 
-	m_width->tqsetAlignment( AlignRight );
-	m_height->tqsetAlignment( AlignRight );
-	m_layers->tqsetAlignment( AlignRight );
-	m_format->tqsetAlignment( AlignRight );
+	m_width->setAlignment( AlignRight );
+	m_height->setAlignment( AlignRight );
+	m_layers->setAlignment( AlignRight );
+	m_format->setAlignment( AlignRight );
 
 	connect( view->part()->commandHistory(), TQT_SIGNAL( commandAdded( VCommand* ) ), this, TQT_SLOT( slotCommandAdded( VCommand* ) ) );
 	connect( view->part()->commandHistory(), TQT_SIGNAL( commandExecuted() ), this, TQT_SLOT( slotCommandExecuted() ) );
diff --git a/karbon/dockers/vstyledocker.cc b/karbon/dockers/vstyledocker.cc
index 5b7633b1..fd8cfb30 100644
--- a/karbon/dockers/vstyledocker.cc
+++ b/karbon/dockers/vstyledocker.cc
@@ -263,7 +263,7 @@ ClipartWidget::importClipart()
 	else
 	{
 		KoFilterManager man( m_part );
-		KoFilter::ConversiontqStatus status;
+		KoFilter::ConversionStatus status;
 		TQString importedFile = man.import( fname, status );
 		if( status == KoFilter::OK )
 			m_part->mergeNativeFormat( importedFile );
diff --git a/karbon/karbon_drag.cpp b/karbon/karbon_drag.cpp
index 3c60e94d..3ef0772d 100644
--- a/karbon/karbon_drag.cpp
+++ b/karbon/karbon_drag.cpp
@@ -46,7 +46,7 @@ KarbonDrag::format( int i ) const
 }
 
 TQByteArray
-KarbonDrag::tqencodedData( const char* mimetype ) const
+KarbonDrag::encodedData( const char* mimetype ) const
 {
 	TQCString result;
 
@@ -85,7 +85,7 @@ KarbonDrag::decode( TQMimeSource* e, VObjectList& sl, VDocument& vdoc )
 	if( e->provides( m_decodeFormats[0] ) )
 	{
 		TQDomDocument doc( "clip" );
-		TQByteArray data = e->tqencodedData( m_decodeFormats[0] );
+		TQByteArray data = e->encodedData( m_decodeFormats[0] );
 		doc.setContent( TQCString( data, data.size()+1 ) );
 		TQDomElement clip = doc.documentElement();
 		// Try to parse the clipboard data
diff --git a/karbon/karbon_drag.h b/karbon/karbon_drag.h
index 0fb80119..f514b55d 100644
--- a/karbon/karbon_drag.h
+++ b/karbon/karbon_drag.h
@@ -36,7 +36,7 @@ class KarbonDrag : public TQDragObject
 public:
 	KarbonDrag( TQWidget* dragSource = 0, const char* name = 0 );
 	const char* format( int i ) const;
-	TQByteArray tqencodedData( const char* mimetype ) const;
+	TQByteArray encodedData( const char* mimetype ) const;
 	static bool canDecode( TQMimeSource * );
 	static bool decode( TQMimeSource* e, VObjectList& sl, VDocument& vdoc );
 	void setObjectList( VObjectList l );
diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cc
index 1d267e1b..90c8c29a 100644
--- a/karbon/karbon_factory.cc
+++ b/karbon/karbon_factory.cc
@@ -49,8 +49,8 @@ KarbonFactory::KarbonFactory( TQObject* parent, const char* name )
 	KarbonToolRegistry::instance();
 
 	// Load plugins
-	KTrader::OfferList offers = KTrader::self() -> query(TQString::tqfromLatin1("Karbon/CoreModule"),
-                                    TQString::tqfromLatin1("Type == 'Service'"));
+	KTrader::OfferList offers = KTrader::self() -> query(TQString::fromLatin1("Karbon/CoreModule"),
+                                    TQString::fromLatin1("Type == 'Service'"));
 
 	KTrader::OfferList::ConstIterator iter;
 
diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc
index 64dafd6a..5e7ecb8b 100644
--- a/karbon/karbon_part.cc
+++ b/karbon/karbon_part.cc
@@ -566,14 +566,14 @@ KarbonPart::paintContent( TQPainter& painter, const TQRect& rect,
 	//VPainter *p = new VKoPainter( painter.device() );
 	p->begin();
 	p->setZoomFactor( zoomFactor );
-	kdDebug(38000) << "painter.tqworldMatrix().dx() : " << painter.tqworldMatrix().dx() << endl;
-	kdDebug(38000) << "painter.tqworldMatrix().dy() : " << painter.tqworldMatrix().dy() << endl;
+	kdDebug(38000) << "painter.worldMatrix().dx() : " << painter.worldMatrix().dx() << endl;
+	kdDebug(38000) << "painter.worldMatrix().dy() : " << painter.worldMatrix().dy() << endl;
 	kdDebug(38000) << "rect.x() : "<< rect.x() << endl;
 	kdDebug(38000) << "rect.y() : "<< rect.y() << endl;
 	kdDebug(38000) << "rect.width() : "<< rect.width() << endl;
 	kdDebug(38000) << "rect.height() : "<< rect.height() << endl;
 	r = document().boundingBox();
-	TQWMatrix mat = painter.tqworldMatrix();
+	TQWMatrix mat = painter.worldMatrix();
 	mat.scale( 1, -1 );
 	mat.translate( 0, -r.height() * zoomFactor );
 	p->setWorldMatrix( mat );
diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc
index 33340690..79192129 100644
--- a/karbon/karbon_view.cc
+++ b/karbon/karbon_view.cc
@@ -119,20 +119,20 @@ KarbonView::KarbonView( KarbonPart* p, TQWidget* parent, const char* name )
 	setClientBuilder( this );
 
 	if( !p->isReadWrite() )
-		setXMLFile( TQString::tqfromLatin1( "karbon_readonly.rc" ) );
+		setXMLFile( TQString::fromLatin1( "karbon_readonly.rc" ) );
 	else
-		setXMLFile( TQString::tqfromLatin1( "karbon.rc" ) );
+		setXMLFile( TQString::fromLatin1( "karbon.rc" ) );
 
 	m_dcop = 0L;
 	dcopObject(); // build it
 
 	// set up status bar message
 	m_status = new KStatusBarLabel( TQString(), 0, statusBar() );
-	m_status->tqsetAlignment( AlignLeft | AlignVCenter );
+	m_status->setAlignment( AlignLeft | AlignVCenter );
 	m_status->setMinimumWidth( 300 );
 	addStatusBarItem( m_status, 1 );
 	m_cursorCoords = new KStatusBarLabel( TQString(), 0, statusBar() );
-	m_cursorCoords->tqsetAlignment( AlignLeft | AlignVCenter );
+	m_cursorCoords->setAlignment( AlignLeft | AlignVCenter );
 	m_cursorCoords->setMinimumWidth( 50 );
 	addStatusBarItem( m_cursorCoords, 0 );
 	m_smallPreview = new VSmallPreview( this, name );
@@ -462,7 +462,7 @@ KarbonView::fileImportGraphic()
 	else
 	{
 		KoFilterManager man( part() );
-		KoFilter::ConversiontqStatus status;
+		KoFilter::ConversionStatus status;
 		TQString importedFile = man.import( fname, status );
 		part()->mergeNativeFormat( importedFile );
 		if( !importedFile.isEmpty() )
diff --git a/karbon/karbon_view.h b/karbon/karbon_view.h
index 13afd9f1..ac3dc8dd 100644
--- a/karbon/karbon_view.h
+++ b/karbon/karbon_view.h
@@ -274,7 +274,7 @@ private:
 	// dcop
 	DCOPObject		*m_dcop;
 
-	//tqStatus Bar
+	//Status Bar
 	TQLabel				*m_status;       // Ordinary status
 	TQLabel				*m_cursorCoords; // Cursor coordinates
 	VSmallPreview		*m_smallPreview; // Stroke and Fill
diff --git a/karbon/plugins/shadoweffect/vshadowdecorator.cc b/karbon/plugins/shadoweffect/vshadowdecorator.cc
index b3c00bdd..99ee8c8c 100644
--- a/karbon/plugins/shadoweffect/vshadowdecorator.cc
+++ b/karbon/plugins/shadoweffect/vshadowdecorator.cc
@@ -69,7 +69,7 @@ VShadowDecorator::draw( VPainter* painter, const KoRect* rect ) const
 	if( m_object->fill()->type() != VFill::none )
 		m_object->fill()->setColor( black );
 	m_object->stroke()->setColor( black );
-	TQWMatrix mat = painter->tqworldMatrix();
+	TQWMatrix mat = painter->worldMatrix();
 	painter->setWorldMatrix( mat.translate( shadowDx * painter->zoomFactor(), -shadowDy * painter->zoomFactor()) );
 	m_object->draw( painter, rect );
 	m_object->setFill( *fill );
diff --git a/karbon/render/vkopainter.h b/karbon/render/vkopainter.h
index 75ac0bd1..eac4c204 100644
--- a/karbon/render/vkopainter.h
+++ b/karbon/render/vkopainter.h
@@ -52,7 +52,7 @@ public:
 
 	// matrix manipulation
 	virtual void setWorldMatrix( const TQWMatrix & );
-	virtual const TQWMatrix tqworldMatrix() { return m_matrix; }
+	virtual const TQWMatrix worldMatrix() { return m_matrix; }
 	virtual void setZoomFactor( double );
 	virtual double zoomFactor() { return m_zoomFactor; }
 
diff --git a/karbon/render/vpainter.h b/karbon/render/vpainter.h
index 84ad9d13..b61d854a 100644
--- a/karbon/render/vpainter.h
+++ b/karbon/render/vpainter.h
@@ -57,7 +57,7 @@ public:
 
 	// matrix manipulation
 	virtual void setWorldMatrix( const TQWMatrix & ) = 0;
-	virtual const TQWMatrix tqworldMatrix() = 0;
+	virtual const TQWMatrix worldMatrix() = 0;
 	virtual void setZoomFactor( double ) = 0;
 	virtual double zoomFactor() { return 1.0; }
 
diff --git a/karbon/render/vqpainter.cc b/karbon/render/vqpainter.cc
index 7f380287..51819ae3 100644
--- a/karbon/render/vqpainter.cc
+++ b/karbon/render/vqpainter.cc
@@ -81,9 +81,9 @@ VTQPainter::end()
 }
 
 const TQWMatrix
-VTQPainter::tqworldMatrix()
+VTQPainter::worldMatrix()
 {
-	return m_painter->tqworldMatrix();
+	return m_painter->worldMatrix();
 }
 
 void
@@ -153,13 +153,13 @@ VTQPainter::fillPath()
 {
 	// we probably dont need filling for qpainter
 	//m_index = 0;
-	m_painter->tqdrawPolygon( m_pa, FALSE, 0, m_index );
+	m_painter->drawPolygon( m_pa, FALSE, 0, m_index );
 }
 
 void
 VTQPainter::strokePath()
 {
-	m_painter->tqdrawPolyline( m_pa, 0, m_index );
+	m_painter->drawPolyline( m_pa, 0, m_index );
 	m_index = 0;
 }
 
@@ -265,7 +265,7 @@ VTQPainter::drawRect( const KoRect &rect )
 void
 VTQPainter::drawImage( const TQImage &image, const TQWMatrix &affine )
 {
-	TQWMatrix matrix = m_painter->tqworldMatrix();
+	TQWMatrix matrix = m_painter->worldMatrix();
 	
 	double m11 = affine.m11() * matrix.m11() * m_zoomFactor + affine.m12() * matrix.m21();
 	double m12 = (affine.m11() * matrix.m12() + affine.m12() * matrix.m22() ) * m_zoomFactor;
diff --git a/karbon/render/vqpainter.h b/karbon/render/vqpainter.h
index d1a556db..5cf3ecd1 100644
--- a/karbon/render/vqpainter.h
+++ b/karbon/render/vqpainter.h
@@ -44,7 +44,7 @@ public:
 
 	// matrix manipulation
 	virtual void setWorldMatrix( const TQWMatrix & );
-	virtual const TQWMatrix tqworldMatrix();
+	virtual const TQWMatrix worldMatrix();
 	virtual void setZoomFactor( double );
 	virtual double zoomFactor() { return m_zoomFactor; }
 
diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc
index a3500160..9a7790ba 100644
--- a/karbon/tools/vtexttool.cc
+++ b/karbon/tools/vtexttool.cc
@@ -173,7 +173,7 @@ ShadowPreview::paintEvent( TQPaintEvent* )
 		p.lineTo( KoPoint( w, h ) );
 		p.lineTo( KoPoint( w, 0 ) );
 		p.lineTo( KoPoint( 0, 0 ) );
-		VColor c( tqcolorGroup().background() );
+		VColor c( colorGroup().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( tqcolorGroup().light() );
+	painter.setPen( colorGroup().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( tqcolorGroup().dark() );
+	painter.setPen( colorGroup().dark() );
 	painter.moveTo( 0, height() - 1 );
 	painter.lineTo( 0, 0 );
 	painter.lineTo( width() - 1, 0 );
@@ -205,7 +205,7 @@ ShadowWidget::ShadowWidget( TQWidget* parent, const char* name, int angle, int d
 		: TQGroupBox( parent, name )
 {
 	setTitle( i18n( "Shadow" ) );
-	tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+	setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
 
 	TQGridLayout* tqlayout = new TQGridLayout( this );
 	tqlayout->addRowSpacing( 0, 12 );
@@ -317,7 +317,7 @@ ShadowWidget::updatePreview()
 VTextOptionsWidget::VTextOptionsWidget( VTextTool* tool, TQWidget *parent )
 	: KDialogBase( parent, "", true, i18n( "Text" ), Ok | Cancel ), m_tool( tool )
 {
-	//tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+	//setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
 	//setFrameStyle( Box | Sunken );
 	TQWidget *base = new TQWidget( this );
 	TQVBoxLayout* mainLayout = new TQVBoxLayout( base );
@@ -518,7 +518,7 @@ VText::Position VTextOptionsWidget::position()
 }
 
 void
-VTextOptionsWidget::tqsetAlignment( VText::Alignment tqalignment )
+VTextOptionsWidget::setAlignment( VText::Alignment tqalignment )
 {
 	m_textAlignment->setCurrentItem( tqalignment );
 }
@@ -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->tqsetAlignment( m_optionsWidget->tqalignment() );
+	m_editedText->setAlignment( m_optionsWidget->tqalignment() );
 	m_editedText->setOffset( 0.01 * m_optionsWidget->offset()  );
 #ifdef HAVE_KARBONTEXT
 	m_editedText->traceText();
@@ -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->tqsetAlignment( text.tqalignment() );
+	m_optionsWidget->setAlignment( text.tqalignment() );
 	m_optionsWidget->setOffset( text.offset() * 100.0 );
 	m_optionsWidget->setUseShadow( text.useShadow() );
 	m_optionsWidget->setShadow( text.shadowAngle(), text.shadowDistance(), text.translucentShadow() );
@@ -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->tqsetAlignment( m_textModifications->newAlignment );
+		m_text->setAlignment( 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->tqsetAlignment( m_textModifications->oldAlignment );
+		m_text->setAlignment( 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 cd3c4e87..112894d6 100644
--- a/karbon/tools/vtexttool.h
+++ b/karbon/tools/vtexttool.h
@@ -113,7 +113,7 @@ public:
 	TQString text();
 	void setPosition( VText::Position position );
 	VText::Position position();
-	void tqsetAlignment( VText::Alignment tqalignment );
+	void setAlignment( VText::Alignment tqalignment );
 	VText::Alignment tqalignment();
 	void setOffset( double offset );
 	double offset();
diff --git a/karbon/widgets/vcanvas.cc b/karbon/widgets/vcanvas.cc
index d96018b9..d0a1b6b7 100644
--- a/karbon/widgets/vcanvas.cc
+++ b/karbon/widgets/vcanvas.cc
@@ -228,7 +228,7 @@ VCanvas::viewportPaintEvent( TQPaintEvent *e )
 	setYMirroring( p );
 	
 	// TRICK : slightly adjust the matrix so libart AA looks better
-	TQWMatrix mat = p->tqworldMatrix();
+	TQWMatrix mat = p->worldMatrix();
 	p->setWorldMatrix( mat.translate( -.5, -.5 ) );
 
 	// set up clippath
@@ -305,7 +305,7 @@ VCanvas::drawDocument( TQPainter* /*painter*/, const KoRect&, bool drawVObjects
 		p->setZoomFactor( m_view->zoom() );
 		setYMirroring( p );
 		// TRICK : slightly adjust the matrix so libart AA looks better
-		TQWMatrix mat = p->tqworldMatrix();
+		TQWMatrix mat = p->worldMatrix();
 		p->setWorldMatrix( mat.translate( -.5, -.5 ) );
 
 		m_part->document().drawPage( p, m_part->pageLayout(), m_view->showPageMargins() );
diff --git a/karbon/widgets/vgradienttabwidget.cc b/karbon/widgets/vgradienttabwidget.cc
index f65cfd74..c90c655d 100644
--- a/karbon/widgets/vgradienttabwidget.cc
+++ b/karbon/widgets/vgradienttabwidget.cc
@@ -93,9 +93,9 @@ void VGradientListItem::paint( TQPainter* painter )
 	painter->drawPixmap( 0, 0, m_pixmap );
 	painter->restore();
 	if ( isSelected() )
-		painter->setPen( listBox()->tqcolorGroup().highlightedText() );
+		painter->setPen( listBox()->colorGroup().highlightedText() );
 	else
-		painter->setPen( listBox()->tqcolorGroup().base() );
+		painter->setPen( listBox()->colorGroup().base() );
 	painter->drawRect( r );
 	painter->flush();
 } // VGradientListItem::paint
@@ -151,13 +151,13 @@ void VGradientPreview::paintEvent( TQPaintEvent* )
 
 	TQPainter p( &pixmap );
 
-	p.setPen( tqcolorGroup().light() );
+	p.setPen( colorGroup().light() );
 	p.moveTo( 1, height() - 1 );
 	p.lineTo( 1, 1 );
 	p.lineTo( width() - 1, 1 );
 	p.lineTo( width() - 1, height() - 1 );
 	p.lineTo( 1, height() - 1 );
-	p.setPen( tqcolorGroup().dark() );
+	p.setPen( colorGroup().dark() );
 	p.moveTo( 0, height() - 1 );
 	p.lineTo( 0, 0 );
 	p.lineTo( width() - 1, 0 );
diff --git a/karbon/widgets/vgradientwidget.cc b/karbon/widgets/vgradientwidget.cc
index f1c55ea1..7e9ecd75 100644
--- a/karbon/widgets/vgradientwidget.cc
+++ b/karbon/widgets/vgradientwidget.cc
@@ -117,7 +117,7 @@ void VGradientWidget::paintEvent( TQPaintEvent* )
 
 	TQPainter p( &pixmap );
 
-	p.setPen( tqcolorGroup().light() );
+	p.setPen( colorGroup().light() );
 	// light frame around widget
 	p.moveTo( 1, height() - 1 );
 	p.lineTo( 1, 1 );
@@ -129,7 +129,7 @@ void VGradientWidget::paintEvent( TQPaintEvent* )
 	p.moveTo( 1, 3 + gh );
 	p.lineTo( width() - 1, 3 + gh );
 
-	p.setPen( tqcolorGroup().dark() );
+	p.setPen( colorGroup().dark() );
 	// left-top frame around widget
 	p.moveTo( 0, height() - 1 );
 	p.lineTo( 0, 0 );
@@ -151,7 +151,7 @@ void VGradientWidget::paintEvent( TQPaintEvent* )
 	
 	m_pntArea.setRect( 2, height() - ph - 2, w, ph );
 	// clear point area
-	p.fillRect( m_pntArea.x(), m_pntArea.y(), m_pntArea.width(), m_pntArea.height(), tqcolorGroup().background() );
+	p.fillRect( m_pntArea.x(), m_pntArea.y(), m_pntArea.width(), m_pntArea.height(), colorGroup().background() );
 
 	p.setClipRect( m_pntArea.x(), m_pntArea.y(), m_pntArea.width(), m_pntArea.height() );
 	p.translate( m_pntArea.x(), m_pntArea.y() );
@@ -244,7 +244,7 @@ void VGradientWidget::mouseDoubleClickEvent( TQMouseEvent* e )
 	if( currentPoint % 2 == 1 )
 	{
 		// ramp point hit -> change color
-		VColorDlg* d = new VColorDlg( m_gradient->m_colorStops.at( currentPoint / 2 )->color, this->tqtopLevelWidget() );
+		VColorDlg* d = new VColorDlg( m_gradient->m_colorStops.at( currentPoint / 2 )->color, this->topLevelWidget() );
 		if( d->exec() == TQDialog::Accepted )
 		{
 			m_gradient->m_colorStops.at( currentPoint / 2 )->color = d->Color();
@@ -256,7 +256,7 @@ void VGradientWidget::mouseDoubleClickEvent( TQMouseEvent* e )
 	else if( currentPoint == 0 )
 	{
 		// now point hit -> create new color stop
-		VColorDlg* d = new VColorDlg( m_gradient->m_colorStops.at( 0 )->color, this->tqtopLevelWidget() );
+		VColorDlg* d = new VColorDlg( m_gradient->m_colorStops.at( 0 )->color, this->topLevelWidget() );
 		if( d->exec() == TQDialog::Accepted )
 		{
 			m_gradient->addStop( d->Color(), (float)( e->x() - 2 ) / ( m_pntArea.width() ), 0.5 );
diff --git a/karbon/widgets/vruler.cc b/karbon/widgets/vruler.cc
index de03eb23..0fd21cc1 100644
--- a/karbon/widgets/vruler.cc
+++ b/karbon/widgets/vruler.cc
@@ -188,7 +188,7 @@ void VRuler::drawRuler()
 
     p.begin(m_pixmapBuffer);
     p.setPen(TQColor(0x70, 0x70, 0x70));
-    p.setBackgroundColor(tqcolorGroup().background());
+    p.setBackgroundColor(colorGroup().background());
     p.eraseRect(0, 0, m_pixmapBuffer -> width(), m_pixmapBuffer -> height());
 
     switch (m_unit) {
diff --git a/karbon/widgets/vstrokefillpreview.h b/karbon/widgets/vstrokefillpreview.h
index 1790c9c9..53234b09 100644
--- a/karbon/widgets/vstrokefillpreview.h
+++ b/karbon/widgets/vstrokefillpreview.h
@@ -37,9 +37,9 @@ public:
 	VStrokeFillPreview( KarbonPart *part, TQWidget* parent = 0L, const char* name = 0L );
 	~VStrokeFillPreview();
 
-	virtual TQSize tqsizeHint() const
+	virtual TQSize sizeHint() const
 		{ return TQSize( 50, 50 ); }
-	virtual TQSize tqminimumSizeHint() const
+	virtual TQSize minimumSizeHint() const
 		{ return TQSize( 20, 20 ); }
 	virtual TQSizePolicy sizePolicy() const
 		{ return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); }