diff options
Diffstat (limited to 'karbon')
81 files changed, 350 insertions, 350 deletions
diff --git a/karbon/commands/vbooleancmd.h b/karbon/commands/vbooleancmd.h index 3a3478d3..c782c838 100644 --- a/karbon/commands/vbooleancmd.h +++ b/karbon/commands/vbooleancmd.h @@ -37,8 +37,8 @@ public: enum VBooleanType { intersect, - tqshape_union, - tqshape_xor, + shape_union, + shape_xor, substract }; diff --git a/karbon/commands/vreplacingcmd.cc b/karbon/commands/vreplacingcmd.cc index 2275dba8..427ecdca 100644 --- a/karbon/commands/vreplacingcmd.cc +++ b/karbon/commands/vreplacingcmd.cc @@ -44,7 +44,7 @@ VReplacingCmd::execute() bool successful = false; - // Create new tqshapes if they don't exist yet. + // Create new shapes if they don't exist yet. if( !m_newObjects ) { m_newObjects = new VSelection(); @@ -65,11 +65,11 @@ VReplacingCmd::execute() { successful = true; - // Insert new tqshape right before old tqshape. + // Insert new shape right before old shape. itr.current()->parent()->insertInfrontOf( newObject, itr.current() ); - // Add new tqshape to list of new objects. + // Add new shape to list of new objects. m_newObjects->append( newObject ); } // No success. diff --git a/karbon/commands/vshapecmd.cc b/karbon/commands/vshapecmd.cc index ae0ad2dc..9a59fcd9 100644 --- a/karbon/commands/vshapecmd.cc +++ b/karbon/commands/vshapecmd.cc @@ -25,33 +25,33 @@ #include "vshapecmd.h" -VShapeCmd::VShapeCmd( VDocument* doc, const TQString& name, VPath* tqshape, const TQString& icon ) - : VCommand( doc, name, icon ), m_tqshape( tqshape ) +VShapeCmd::VShapeCmd( VDocument* doc, const TQString& name, VPath* shape, const TQString& icon ) + : VCommand( doc, name, icon ), m_shape( shape ) { } void VShapeCmd::execute() { - if( !m_tqshape ) + if( !m_shape ) return; - if( m_tqshape->state() == VObject::deleted ) + if( m_shape->state() == VObject::deleted ) { document()->selection()->clear(); - m_tqshape->setState( VObject::normal ); - document()->selection()->append( m_tqshape ); + m_shape->setState( VObject::normal ); + document()->selection()->append( m_shape ); } else { - m_tqshape->setState( VObject::normal ); - m_tqshape->setFill( *( document()->selection()->fill() ) ); - m_tqshape->setStroke( *( document()->selection()->stroke() ) ); + m_shape->setState( VObject::normal ); + m_shape->setFill( *( document()->selection()->fill() ) ); + m_shape->setStroke( *( document()->selection()->stroke() ) ); // Add path: - document()->append( m_tqshape ); + document()->append( m_shape ); document()->selection()->clear(); - document()->selection()->append( m_tqshape ); + document()->selection()->append( m_shape ); } setSuccess( true ); @@ -60,11 +60,11 @@ VShapeCmd::execute() void VShapeCmd::unexecute() { - if( !m_tqshape ) + if( !m_shape ) return; - document()->selection()->take( *m_tqshape ); - m_tqshape->setState( VObject::deleted ); + document()->selection()->take( *m_shape ); + m_shape->setState( VObject::deleted ); setSuccess( false ); } diff --git a/karbon/commands/vshapecmd.h b/karbon/commands/vshapecmd.h index 30607fcd..d4742a67 100644 --- a/karbon/commands/vshapecmd.h +++ b/karbon/commands/vshapecmd.h @@ -28,13 +28,13 @@ class VPath; /* * Provides a common base class for creation commands since they all have * a similar execute / unexecute behaviour and all build a VPath. Upon - * execution() the tqshape will be added to the document and selected, upon undoing + * execution() the shape will be added to the document and selected, upon undoing * it will be set to the deleted state. */ class KARBONCOMMAND_EXPORT VShapeCmd : public VCommand { public: - VShapeCmd( VDocument* doc, const TQString& name, VPath* tqshape, const TQString& icon = "14_polygon" ); + VShapeCmd( VDocument* doc, const TQString& name, VPath* shape, const TQString& icon = "14_polygon" ); virtual ~VShapeCmd() {} virtual void execute(); @@ -43,8 +43,8 @@ public: virtual bool changesSelection() const { return true; } protected: - /// Pointer to the created tqshape. - VPath *m_tqshape; + /// Pointer to the created shape. + VPath *m_shape; }; #endif diff --git a/karbon/commands/vtextcmd.h b/karbon/commands/vtextcmd.h index 708250c8..2fb0a75a 100644 --- a/karbon/commands/vtextcmd.h +++ b/karbon/commands/vtextcmd.h @@ -23,7 +23,7 @@ #include <tqfont.h> -#include "vtqshapecmd.h" +#include "vshapecmd.h" // create a text-object. diff --git a/karbon/commands/vtransformcmd.cc b/karbon/commands/vtransformcmd.cc index f0173920..dc1038ab 100644 --- a/karbon/commands/vtransformcmd.cc +++ b/karbon/commands/vtransformcmd.cc @@ -484,7 +484,7 @@ VTranslatePointCmd::translatePoints() segment->setPoint( pnts[i], segment->point( pnts[i] ).transform( m_mat ) ); } - // tqinvalidate all changed subpaths + // invalidate all changed subpaths VObjectListIterator itr( m_subpaths ); for( ; itr.current(); ++itr ) itr.current()->invalidateBoundingBox(); diff --git a/karbon/core/vcomposite.cc b/karbon/core/vcomposite.cc index 570b06dc..25636211 100644 --- a/karbon/core/vcomposite.cc +++ b/karbon/core/vcomposite.cc @@ -377,7 +377,7 @@ VPath::saveOasis( KoStore *store, KoXmlWriter *docWriter, KoGenStyles &mainStyle double w = boundingBox().width(); double h = boundingBox().height(); - docWriter->addAttribute( "svg:viewBox", TQString( "%1 %2 %3 %4" ).tqarg( x ).tqarg( y ).tqarg( w ).tqarg( h ) ); + docWriter->addAttribute( "svg:viewBox", TQString( "%1 %2 %3 %4" ).arg( x ).arg( y ).arg( w ).arg( h ) ); docWriter->addAttributePt( "svg:x", x ); docWriter->addAttributePt( "svg:y", y ); docWriter->addAttributePt( "svg:width", w ); @@ -456,7 +456,7 @@ VPath::loadOasis( const TQDomElement &element, KoOasisLoadingContext &context ) viewbox = element.attributeNS( KoXmlNS::svg, "viewBox", TQString() ); } - else if( element.localName() == "custom-tqshape" ) + else if( element.localName() == "custom-shape" ) { TQDomNodeList list = element.childNodes(); for( uint i = 0; i < list.count(); ++i ) @@ -467,7 +467,7 @@ VPath::loadOasis( const TQDomElement &element, KoOasisLoadingContext &context ) if( e.namespaceURI() != KoXmlNS::draw ) continue; - if( e.localName() == "enhanced-tqgeometry" ) + if( e.localName() == "enhanced-geometry" ) { TQString data = e.attributeNS( KoXmlNS::draw, "enhanced-path", TQString() ); if( ! data.isEmpty() ) @@ -742,12 +742,12 @@ VPath::buildSvgTransform( const TQWMatrix &mat ) const TQString transform; if( !mat.isIdentity() ) { - transform = TQString( "matrix(%1, %2, %3, %4, %5, %6)" ).tqarg( mat.m11() ) - .tqarg( mat.m12() ) - .tqarg( mat.m21() ) - .tqarg( mat.m22() ) - .tqarg( mat.dx() ) - .tqarg( mat.dy() ); + transform = TQString( "matrix(%1, %2, %3, %4, %5, %6)" ).arg( mat.m11() ) + .arg( mat.m12() ) + .arg( mat.m21() ) + .arg( mat.m22() ) + .arg( mat.dx() ) + .arg( mat.dy() ); } return transform; } @@ -764,12 +764,12 @@ VPath::buildOasisTransform( const TQWMatrix &mat ) const TQString transform; if( !mat.isIdentity() ) { - transform = TQString( "matrix(%1, %2, %3, %4, %5pt, %6pt)" ).tqarg( mat.m11() ) - .tqarg( mat.m12() ) - .tqarg( mat.m21() ) - .tqarg( mat.m22() ) - .tqarg( mat.dx() ) - .tqarg( mat.dy() ); + transform = TQString( "matrix(%1, %2, %3, %4, %5pt, %6pt)" ).arg( mat.m11() ) + .arg( mat.m12() ) + .arg( mat.m21() ) + .arg( mat.m22() ) + .arg( mat.dx() ) + .arg( mat.dy() ); } return transform; } diff --git a/karbon/core/vdocument.h b/karbon/core/vdocument.h index 45270d2e..aa35b834 100644 --- a/karbon/core/vdocument.h +++ b/karbon/core/vdocument.h @@ -83,7 +83,7 @@ public: * Draw the document frame to a painting device. * * @param painter abstraction that is used to render to a painting device. - * @param pl tqlayout describing the page to draw on (restricting the painter) + * @param pl layout describing the page to draw on (restricting the painter) * @param drawPageMargins if @c true, also draw the crop marks for the page margins, * otherwise, don't draw them. */ diff --git a/karbon/core/vfill.cc b/karbon/core/vfill.cc index d1cd9d13..dfa4d5df 100644 --- a/karbon/core/vfill.cc +++ b/karbon/core/vfill.cc @@ -83,7 +83,7 @@ VFill::saveOasis( KoGenStyles &mainStyles, KoGenStyle &style ) const style.addProperty( "draw:fill", "solid" ); style.addProperty( "draw:fill-color", TQColor( m_color ).name() ); if( m_color.opacity() < 1 ) - style.addProperty( "draw:opacity", TQString( "%1%" ).tqarg( m_color.opacity() * 100. ) ); + style.addProperty( "draw:opacity", TQString( "%1%" ).arg( m_color.opacity() * 100. ) ); } else if( m_type == grad ) { @@ -91,7 +91,7 @@ VFill::saveOasis( KoGenStyles &mainStyles, KoGenStyle &style ) const TQString grad = m_gradient.saveOasis( mainStyles ); style.addProperty( "draw:fill-gradient-name", grad ); if( m_color.opacity() < 1 ) - style.addProperty( "draw:opacity", TQString( "%1%" ).tqarg( m_color.opacity() * 100. ) ); + style.addProperty( "draw:opacity", TQString( "%1%" ).arg( m_color.opacity() * 100. ) ); } else if( m_type == patt ) style.addProperty( "draw:fill", "hatch" ); diff --git a/karbon/core/vfill.h b/karbon/core/vfill.h index 0e562949..89662198 100644 --- a/karbon/core/vfill.h +++ b/karbon/core/vfill.h @@ -33,10 +33,10 @@ class KoOasisLoadingContext; /** - * Manages the fill of tqshapes. + * Manages the fill of shapes. * * The fill can be solid or gradient. - * Also two fill rules are supported that effect how the tqshape is + * Also two fill rules are supported that effect how the shape is * filled. For explanation see the TQPainter documentation. * * Default is no fill and even-odd filling rule. diff --git a/karbon/core/vgradient.cc b/karbon/core/vgradient.cc index 60d89241..577d1373 100644 --- a/karbon/core/vgradient.cc +++ b/karbon/core/vgradient.cc @@ -208,10 +208,10 @@ VGradient::saveOasis( KoGenStyles &mainStyles ) const for( colorstop = colorStops.first(); colorstop; colorstop = colorStops.next() ) { elementWriter.startElement( "svg:stop" ); - elementWriter.addAttribute( "svg:offset", TQString( "%1" ).tqarg( colorstop->rampPoint ) ); + elementWriter.addAttribute( "svg:offset", TQString( "%1" ).arg( colorstop->rampPoint ) ); elementWriter.addAttribute( "svg:color", TQColor( colorstop->color ).name() ); if( colorstop->color.opacity() < 1 ) - elementWriter.addAttribute( "svg:stop-opacity", TQString( "%1" ).tqarg( colorstop->color.opacity() ) ); + elementWriter.addAttribute( "svg:stop-opacity", TQString( "%1" ).arg( colorstop->color.opacity() ) ); elementWriter.endElement(); } diff --git a/karbon/core/vgroup.cc b/karbon/core/vgroup.cc index 51d991e1..1d18f54f 100644 --- a/karbon/core/vgroup.cc +++ b/karbon/core/vgroup.cc @@ -215,7 +215,7 @@ VGroup::loadOasis( const TQDomElement &element, KoOasisLoadingContext &context ) context.styleStack().save(); - if( e.localName() == "path" || e.localName() == "custom-tqshape" ) + if( e.localName() == "path" || e.localName() == "custom-shape" ) { VPath* composite = new VPath( this ); composite->loadOasis( e, context ); diff --git a/karbon/core/vobject.h b/karbon/core/vobject.h index 899422ee..eccc6180 100644 --- a/karbon/core/vobject.h +++ b/karbon/core/vobject.h @@ -57,7 +57,7 @@ public: hidden_locked = 3, /**< hidden and locked (r/o) */ deleted = 4, /**< deleted, nearly dead */ - // tqshape specific states: + // shape specific states: selected = 5, /**< visible, active and can be manipulated by tools */ edit = 6 /**< visible, active and is currently manipulated by a tool */ }; diff --git a/karbon/core/vpath.cc b/karbon/core/vpath.cc index e5366966..ea05fc76 100644 --- a/karbon/core/vpath.cc +++ b/karbon/core/vpath.cc @@ -716,13 +716,13 @@ VSubpath::saveSvgPath( TQString &d ) const if( segment->prev() ) { d += TQString( "L%1 %2" ). - tqarg( segment->knot().x() ).tqarg( segment->knot().y() ); + arg( segment->knot().x() ).arg( segment->knot().y() ); } // Moveto. else { d += TQString( "M%1 %2" ). - tqarg( segment->knot().x() ).tqarg( segment->knot().y() ); + arg( segment->knot().x() ).arg( segment->knot().y() ); } } // Bezier ( degree >= 3 ). diff --git a/karbon/core/vstroke.cc b/karbon/core/vstroke.cc index 0ec27fb2..d0cea9c7 100644 --- a/karbon/core/vstroke.cc +++ b/karbon/core/vstroke.cc @@ -117,7 +117,7 @@ VStroke::saveOasis( KoGenStyle &style ) const style.addProperty( "svg:stroke-color", TQColor( m_color ).name() ); style.addPropertyPt( "svg:stroke-width", m_lineWidth ); if( m_color.opacity() < 1 ) - style.addProperty( "svg:stroke-opacity", TQString( "%1%" ).tqarg( m_color.opacity() * 100. ) ); + style.addProperty( "svg:stroke-opacity", TQString( "%1%" ).arg( m_color.opacity() * 100. ) ); } else if( m_type == none ) style.addProperty( "draw:stroke", "none" ); diff --git a/karbon/core/vtext.cc b/karbon/core/vtext.cc index c45d91cb..4c7d3989 100644 --- a/karbon/core/vtext.cc +++ b/karbon/core/vtext.cc @@ -128,7 +128,7 @@ VText::VText( VObject* parent, VState state ) m_stroke = new VStroke( this ); m_fill = new VFill(); m_position = (VText::Position)0; - m_tqalignment = (VText::Alignment)0; + m_alignment = (VText::Alignment)0; m_shadow = false; m_translucentShadow = false; m_shadowAngle = 0; @@ -137,8 +137,8 @@ VText::VText( VObject* parent, VState state ) } -VText::VText( const TQFont &font, const VSubpath& basePath, Position position, Alignment tqalignment, const TQString& text ) - : VObject( 0L ), m_font( font ), m_basePath( basePath ), m_position( position ), m_tqalignment( tqalignment ), m_text( text ) +VText::VText( const TQFont &font, const VSubpath& basePath, Position position, Alignment alignment, const TQString& text ) + : VObject( 0L ), m_font( font ), m_basePath( basePath ), m_position( position ), m_alignment( alignment ), m_text( text ) { m_glyphs.setAutoDelete( true ); m_boundingBoxIsInvalid = true; @@ -148,7 +148,7 @@ VText::VText( const TQFont &font, const VSubpath& basePath, Position position, A } VText::VText( const VText& text ) - : VObject( text ), m_font( text.m_font ), m_basePath( text.m_basePath ), m_position( text.m_position ), m_tqalignment( text.m_tqalignment ), m_text( text.m_text ), m_shadow( text.m_shadow ), m_translucentShadow( text.m_translucentShadow ), m_shadowDistance( text.m_shadowDistance ), m_shadowAngle( text.m_shadowAngle ), m_offset( text.m_offset ) + : VObject( text ), m_font( text.m_font ), m_basePath( text.m_basePath ), m_position( text.m_position ), m_alignment( text.m_alignment ), m_text( text.m_text ), m_shadow( text.m_shadow ), m_translucentShadow( text.m_translucentShadow ), m_shadowDistance( text.m_shadowDistance ), m_shadowAngle( text.m_shadowAngle ), m_offset( text.m_offset ) { m_stroke = new VStroke( *text.m_stroke ); m_stroke->setParent( this ); @@ -323,7 +323,7 @@ VText::save( TQDomElement& element ) const me.setAttribute( "italic", m_font.italic() ); me.setAttribute( "bold", m_font.bold() ); me.setAttribute( "position", m_position ); - me.setAttribute( "tqalignment", m_tqalignment ); + me.setAttribute( "alignment", m_alignment ); me.setAttribute( "shadow", m_shadow ); me.setAttribute( "translucentshadow", m_translucentShadow ); me.setAttribute( "shadowangle", m_shadowAngle ); @@ -349,7 +349,7 @@ VText::load( const TQDomElement& element ) m_font.setWeight( TQFont::Normal ); m_font.setBold( element.attribute( "bold" ).toInt() == 1 ); m_position = (Position)element.attribute( "position", "0" ).toInt(); - m_tqalignment = (Alignment)element.attribute( "tqalignment", "0" ).toInt(); + m_alignment = (Alignment)element.attribute( "alignment", "0" ).toInt(); m_shadow = ( element.attribute( "shadow" ).toInt() == 1 ); m_translucentShadow = ( element.attribute( "translucentshadow" ).toInt() == 1 ); m_shadowAngle = element.attribute( "shadowangle" ).toInt(); @@ -473,7 +473,7 @@ VText::traceText() bool foundCharmap = false; - // Try to choose tqunicode charmap + // Try to choose unicode charmap for( int charmap = 0; charmap < fontFace->num_charmaps; charmap++ ) { if( fontFace->charmaps[charmap]->encoding == ft_encoding_unicode ) @@ -481,14 +481,14 @@ VText::traceText() FT_Error error = FT_Set_Charmap( fontFace, fontFace->charmaps[charmap] ); if( error ) { - kdDebug(38000) << "traceText(), unable to select tqunicode charmap." << endl; + kdDebug(38000) << "traceText(), unable to select unicode charmap." << endl; continue; } foundCharmap = true; } } - // Choose first charmap if no tqunicode charmap was found + // Choose first charmap if no unicode charmap was found if( ! foundCharmap ) { error = FT_Set_Charmap( fontFace, fontFace->charmaps[0] ); @@ -518,7 +518,7 @@ VText::traceText() { // get the glyph index for the current character TQChar character = m_text.at( i ); - glyphIndex = FT_Get_Char_Index( fontFace, character.tqunicode() ); + glyphIndex = FT_Get_Char_Index( fontFace, character.unicode() ); if( ! glyphIndex ) { kdDebug(38000) << "traceText(), unable get index of char : " << character << endl; @@ -575,7 +575,7 @@ VText::traceText() kdDebug(38000) << "traceText(), using offset : " << m_offset << endl; float x = m_offset * pathLength; - switch( m_tqalignment ) + switch( m_alignment ) { case Left: x += 0; break; case Center: x -= 0.5 * l; break; diff --git a/karbon/core/vtext.h b/karbon/core/vtext.h index ef40ac28..234332df 100644 --- a/karbon/core/vtext.h +++ b/karbon/core/vtext.h @@ -57,7 +57,7 @@ public: }; VText( VObject* parent, VState state = normal ); - VText( const TQFont &font, const VSubpath& basePath, Position position, Alignment tqalignment, const TQString& text ); + VText( const TQFont &font, const VSubpath& basePath, Position position, Alignment alignment, const TQString& text ); VText( const VText& text ); virtual ~VText(); virtual DCOPObject* dcopObject(); @@ -70,8 +70,8 @@ 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 Alignment tqalignment() { return m_tqalignment; } + virtual void setAlignment( Alignment alignment ) { m_alignment = alignment; } + virtual Alignment alignment() { return m_alignment; } virtual void setUseShadow( bool state ) { m_shadow = state; } virtual bool useShadow() { return m_shadow; } virtual void setShadow( int angle, int distance, bool translucent ) @@ -118,8 +118,8 @@ private: VSubpath m_basePath; // The text position Position m_position; - // The text tqalignment - Alignment m_tqalignment; + // The text alignment + Alignment m_alignment; // The text to draw TQString m_text; // Shadow parameters diff --git a/karbon/dialogs/vcolortab.cc b/karbon/dialogs/vcolortab.cc index 56fecc0b..e6e30667 100644 --- a/karbon/dialogs/vcolortab.cc +++ b/karbon/dialogs/vcolortab.cc @@ -20,7 +20,7 @@ #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <kcolordialog.h> #include <klocale.h> diff --git a/karbon/dialogs/vconfiguredlg.cc b/karbon/dialogs/vconfiguredlg.cc index 141006dc..19e3ef90 100644 --- a/karbon/dialogs/vconfiguredlg.cc +++ b/karbon/dialogs/vconfiguredlg.cc @@ -22,7 +22,7 @@ #include <tqcheckbox.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqvgroupbox.h> #include <tqcombobox.h> @@ -218,10 +218,10 @@ VConfigMiscPage::VConfigMiscPage( KarbonView* view, TQVBox* box, char* name ) KoUnit::Unit unit = view->part()->unit(); TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Misc" ), box, "GroupBox" ); - tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint()); - tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint()); + tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint()); + tmpTQGroupBox->layout()->setMargin(KDialog::marginHint()); - TQGridLayout* grid = new TQGridLayout(tmpTQGroupBox->tqlayout(), 4, 2 ); + TQGridLayout* grid = new TQGridLayout(tmpTQGroupBox->layout(), 4, 2 ); m_oldUndoRedo = 30; diff --git a/karbon/dialogs/vstrokedlg.cc b/karbon/dialogs/vstrokedlg.cc index 2428de11..56df7227 100644 --- a/karbon/dialogs/vstrokedlg.cc +++ b/karbon/dialogs/vstrokedlg.cc @@ -20,7 +20,7 @@ #include <tqcombobox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtabwidget.h> #include <tqradiobutton.h> #include <tqvbuttongroup.h> diff --git a/karbon/dockers/vcolordocker.cc b/karbon/dockers/vcolordocker.cc index c6453575..9579303e 100644 --- a/karbon/dockers/vcolordocker.cc +++ b/karbon/dockers/vcolordocker.cc @@ -19,7 +19,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtabwidget.h> #include <tqwidget.h> #include <tqcolor.h> diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc index 98b0b883..bdb7ad44 100644 --- a/karbon/dockers/vdocumentdocker.cc +++ b/karbon/dockers/vdocumentdocker.cc @@ -19,7 +19,7 @@ #include <tqhbuttongroup.h> #include <tqinputdialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqlistview.h> #include <tqptrvector.h> @@ -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 ); @@ -224,33 +224,33 @@ VDocumentTab::VDocumentTab( KarbonView* view, TQWidget* parent ) : TQWidget( parent, "DocumentTab" ), m_view( view ) { TQFrame* frame; - TQGridLayout* tqlayout = new TQGridLayout( this ); - tqlayout->setMargin( 3 ); - tqlayout->setSpacing( 2 ); - tqlayout->addMultiCellWidget( m_documentPreview = new VDocumentPreview( m_view, this ), 0, 7, 2, 2 ); - tqlayout->addWidget( new TQLabel( i18n( "document width", "Width:" ), this ), 0, 0 ); - tqlayout->addWidget( new TQLabel( i18n( "Height:" ), this ), 1, 0 ); - tqlayout->addMultiCellWidget( frame = new TQFrame( this ), 2, 2, 0, 1 ); + TQGridLayout* layout = new TQGridLayout( this ); + layout->setMargin( 3 ); + layout->setSpacing( 2 ); + layout->addMultiCellWidget( m_documentPreview = new VDocumentPreview( m_view, this ), 0, 7, 2, 2 ); + layout->addWidget( new TQLabel( i18n( "document width", "Width:" ), this ), 0, 0 ); + layout->addWidget( new TQLabel( i18n( "Height:" ), this ), 1, 0 ); + layout->addMultiCellWidget( frame = new TQFrame( this ), 2, 2, 0, 1 ); frame->setFrameShape( TQFrame::HLine ); - tqlayout->addWidget( new TQLabel( i18n( "Layers:" ), this ), 3, 0 ); - tqlayout->addWidget( new TQLabel( i18n( "Format:" ), this ), 4, 0 ); - tqlayout->addMultiCellWidget( frame = new TQFrame( this ), 5, 5, 0, 1 ); + layout->addWidget( new TQLabel( i18n( "Layers:" ), this ), 3, 0 ); + layout->addWidget( new TQLabel( i18n( "Format:" ), this ), 4, 0 ); + layout->addMultiCellWidget( frame = new TQFrame( this ), 5, 5, 0, 1 ); frame->setFrameShape( TQFrame::HLine ); - //tqlayout->addMultiCellWidget( new TQLabel( i18n( "Zoom factor:" ), this ), 6, 6, 0, 1 ); - tqlayout->addWidget( m_width = new TQLabel( this ), 0, 1 ); - tqlayout->addWidget( m_height = new TQLabel( this ), 1, 1 ); - tqlayout->addWidget( m_layers = new TQLabel( this ), 3, 1 ); - tqlayout->addWidget( m_format = new TQLabel( this ), 4, 1 ); - tqlayout->setRowStretch( 7, 1 ); - tqlayout->setColStretch( 0, 0 ); - tqlayout->setColStretch( 1, 0 ); - tqlayout->setColStretch( 2, 2 ); - //tqlayout->addWidget( - - m_width->tqsetAlignment( AlignRight ); - m_height->tqsetAlignment( AlignRight ); - m_layers->tqsetAlignment( AlignRight ); - m_format->tqsetAlignment( AlignRight ); + //layout->addMultiCellWidget( new TQLabel( i18n( "Zoom factor:" ), this ), 6, 6, 0, 1 ); + layout->addWidget( m_width = new TQLabel( this ), 0, 1 ); + layout->addWidget( m_height = new TQLabel( this ), 1, 1 ); + layout->addWidget( m_layers = new TQLabel( this ), 3, 1 ); + layout->addWidget( m_format = new TQLabel( this ), 4, 1 ); + layout->setRowStretch( 7, 1 ); + layout->setColStretch( 0, 0 ); + layout->setColStretch( 1, 0 ); + layout->setColStretch( 2, 2 ); + //layout->addWidget( + + 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() ) ); @@ -320,7 +320,7 @@ VObjectListViewItem::~VObjectListViewItem() TQString VObjectListViewItem::key( int, bool ) const { - return TQString( "%1" ).tqarg( m_key ); + return TQString( "%1" ).arg( m_key ); } void @@ -329,7 +329,7 @@ VObjectListViewItem::update() // text description VSelectionDescription selectionDesc; selectionDesc.visit( *m_object ); - setText( 0, TQString( "%1" ).tqarg( selectionDesc.shortDescription() ) ); + setText( 0, TQString( "%1" ).arg( selectionDesc.shortDescription() ) ); // draw thumb preview (16x16) TQPixmap preview; @@ -438,7 +438,7 @@ VLayerListViewItem::pos() TQString VLayerListViewItem::key( int, bool ) const { - return TQString( "%1" ).tqarg( m_key ); + return TQString( "%1" ).arg( m_key ); } int @@ -454,8 +454,8 @@ VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent ) { TQToolButton* button; - TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 1 ); - tqlayout->addWidget( m_layersListView = new TQListView( this ), 1 ); + TQVBoxLayout* layout = new TQVBoxLayout( this, 1 ); + layout->addWidget( m_layersListView = new TQListView( this ), 1 ); m_buttonGroup = new TQHButtonGroup( this ); m_buttonGroup->setInsideMargin( 3 ); button = new TQToolButton( m_buttonGroup ); @@ -474,9 +474,9 @@ VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent ) button->setIconSet( SmallIcon( "14_layer_deletelayer" ) ); button->setTextLabel( i18n( "Delete" ) ); m_buttonGroup->insert( button ); - tqlayout->addWidget( m_buttonGroup, 0); - tqlayout->setSpacing( 0 ); - tqlayout->setMargin( 3 ); + layout->addWidget( m_buttonGroup, 0); + layout->setSpacing( 0 ); + layout->setMargin( 3 ); m_layersListView->setAllColumnsShowFocus( true ); m_layersListView->addColumn( i18n( "Item" ), 120 ); @@ -497,7 +497,7 @@ VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent ) connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) ); connect( view->part()->commandHistory(), TQT_SIGNAL( commandExecuted( VCommand*) ), this, TQT_SLOT( slotCommandExecuted( VCommand* ) ) ); - tqlayout->activate(); + layout->activate(); updateLayers(); } // VLayersTab::VLayersTab @@ -531,7 +531,7 @@ VLayersTab::resetSelection() for(; it.current(); ++it ) { it.current()->setSelected( false ); - it.current()->tqrepaint(); + it.current()->repaint(); } } @@ -556,14 +556,14 @@ VLayersTab::selectActiveLayer() for(; it.current(); ++it ) { it.current()->setSelected( false ); - it.current()->tqrepaint(); + it.current()->repaint(); } VLayerListViewItem *layerItem = m_layers[ m_document->activeLayer() ]; if( layerItem ) { layerItem->setSelected( true ); - layerItem->tqrepaint(); + layerItem->repaint(); kdDebug(38000) << "selecting active layer: " << layerItem->text() << endl; } } @@ -620,7 +620,7 @@ VLayersTab::updateChildItems( TQListViewItem *item ) updateChildItems( objectItem ); objectItem->update(); - objectItem->tqrepaint(); + objectItem->repaint(); } } @@ -676,7 +676,7 @@ VLayersTab::itemClicked( TQListViewItem* item, const TQPoint &, int col ) toggleState( layerItem->layer(), col ); layerItem->update(); - layerItem->tqrepaint(); + layerItem->repaint(); updateChildItems( layerItem ); @@ -703,7 +703,7 @@ VLayersTab::itemClicked( TQListViewItem* item, const TQPoint &, int col ) objectItem->setSelected( false ); objectItem->update(); - objectItem->tqrepaint(); + objectItem->repaint(); if( dynamic_cast<VGroup*>( objectItem->object() ) ) updateChildItems( objectItem ); @@ -740,7 +740,7 @@ VLayersTab::selectionChangedFromList() && (state != VObject::hidden_locked) ) { m_document->selection()->append( objectItem->object() ); - objectItem->tqrepaint(); + objectItem->repaint(); } } @@ -1203,16 +1203,16 @@ VHistoryItem::paintFocus( TQPainter*, const TQColorGroup&, const TQRect& ) VHistoryTab::VHistoryTab( KarbonPart* part, TQWidget* parent ) : TQWidget( parent ), m_part( part ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->setMargin( 3 ); - tqlayout->setSpacing( 2 ); - tqlayout->add( m_history = new TQListView( this ) ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->setMargin( 3 ); + layout->setSpacing( 2 ); + layout->add( m_history = new TQListView( this ) ); m_history->setVScrollBarMode( TQListView::AlwaysOn ); m_history->setSelectionMode( TQListView::NoSelection ); m_history->addColumn( i18n( "Commands" ) ); m_history->setResizeMode( TQListView::AllColumns ); m_history->setRootIsDecorated( true ); - tqlayout->add( m_groupCommands = new TQCheckBox( i18n( "Group commands" ), this ) ); + layout->add( m_groupCommands = new TQCheckBox( i18n( "Group commands" ), this ) ); m_history->setSorting( 0, true ); VHistoryGroupItem* group = 0; diff --git a/karbon/dockers/vstrokedocker.cc b/karbon/dockers/vstrokedocker.cc index f30b3042..4fa0b94b 100644 --- a/karbon/dockers/vstrokedocker.cc +++ b/karbon/dockers/vstrokedocker.cc @@ -20,7 +20,7 @@ #include <tqhbuttongroup.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqwidget.h> #include <tqtooltip.h> diff --git a/karbon/dockers/vstyledocker.cc b/karbon/dockers/vstyledocker.cc index 5b7633b1..79021604 100644 --- a/karbon/dockers/vstyledocker.cc +++ b/karbon/dockers/vstyledocker.cc @@ -19,7 +19,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtabwidget.h> #include <tqsize.h> #include <tqhbuttongroup.h> @@ -128,9 +128,9 @@ ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonP { KIconLoader il; - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_clipartChooser = new ClipartChooser( TQSize( 32, 32 ), this ) ); - tqlayout->addWidget( m_buttonGroup = new TQHButtonGroup( this ) ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->addWidget( m_clipartChooser = new ClipartChooser( TQSize( 32, 32 ), this ) ); + layout->addWidget( m_buttonGroup = new TQHButtonGroup( this ) ); TQToolButton* m_addClipartButton; m_buttonGroup->insert( m_addClipartButton = new TQToolButton( m_buttonGroup ) ); m_buttonGroup->insert( m_importClipartButton = new TQToolButton( m_buttonGroup ) ); @@ -145,7 +145,7 @@ ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonP m_buttonGroup->setInsideMargin( 3 ); //setFrameStyle( Box | Sunken ); - tqlayout->setMargin( 3 ); + layout->setMargin( 3 ); connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) ); //connect( m_deleteClipartButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteClipart() ) ); @@ -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/dockers/vtransformdocker.cc b/karbon/dockers/vtransformdocker.cc index 7e93577b..5f079afd 100644 --- a/karbon/dockers/vtransformdocker.cc +++ b/karbon/dockers/vtransformdocker.cc @@ -19,7 +19,7 @@ */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidget.h> #include <tqwmatrix.h> #include <tqtooltip.h> diff --git a/karbon/karbon_drag.cpp b/karbon/karbon_drag.cpp index 3c60e94d..88ce476e 100644 --- a/karbon/karbon_drag.cpp +++ b/karbon/karbon_drag.cpp @@ -21,7 +21,7 @@ #include <tqcstring.h> #include <tqdom.h> -#include <tqtextstream.h> +#include <textstream.h> #include "vdocument.h" @@ -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..955b21f5 100644 --- a/karbon/karbon_part.cc +++ b/karbon/karbon_part.cc @@ -109,9 +109,9 @@ DCOPObject* KarbonPart::dcopObject() } void -KarbonPart::setPageLayout( KoPageLayout& tqlayout, KoUnit::Unit _unit ) +KarbonPart::setPageLayout( KoPageLayout& layout, KoUnit::Unit _unit ) { - m_pageLayout = tqlayout; + m_pageLayout = layout; m_doc.setUnit( _unit ); m_doc.setWidth( m_pageLayout.ptWidth ); m_doc.setHeight( m_pageLayout.ptHeight ); @@ -308,7 +308,7 @@ KarbonPart::loadOasis( const TQDomDocument &doc, KoOasisStyles &styles, const TQ return false; } - TQString masterPageName = "Standard"; // use default tqlayout as fallback + TQString masterPageName = "Standard"; // use default layout as fallback TQDomElement *master = styles.masterPages()[ masterPageName ]; if ( !master ) //last test... master = styles.masterPages()[ "Default" ]; @@ -319,7 +319,7 @@ KarbonPart::loadOasis( const TQDomDocument &doc, KoOasisStyles &styles, const TQ master = it.current(); } Q_ASSERT( master ); - const TQDomElement *style = master ? styles.findStyle( master->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) ) : 0; + const TQDomElement *style = master ? styles.findStyle( master->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ) ) : 0; if( style ) { m_pageLayout.loadOasis( *style ); @@ -371,7 +371,7 @@ KarbonPart::saveOasis( KoStore *store, KoXmlWriter *manifestWriter ) KoGenStyle pageLayout = m_pageLayout.saveOasis(); TQString layoutName = mainStyles.lookup( pageLayout, "PL" ); KoGenStyle masterPage( KoGenStyle::STYLE_MASTER ); - masterPage.addAttribute( "style:page-tqlayout-name", layoutName ); + masterPage.addAttribute( "style:page-layout-name", layoutName ); mainStyles.lookup( masterPage, "Default", KoGenStyles::DontForceNumbering ); KTempFile contentTmpFile; @@ -435,7 +435,7 @@ KarbonPart::saveOasis( KoStore *store, KoXmlWriter *manifestWriter ) it = styleList.begin(); for( ; it != styleList.end(); ++it ) - (*it).style->writeStyle( styleWriter, mainStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties" ); + (*it).style->writeStyle( styleWriter, mainStyles, "style:page-layout", (*it).name, "style:page-layout-properties" ); styleWriter->endElement(); // office:automatic-styles @@ -495,19 +495,19 @@ KarbonPart::saveOasisSettings( KoXmlWriter &/*settingsWriter*/ ) void KarbonPart::insertObject( VObject* object ) { - // don't tqrepaint here explicitly. some commands might want to insert many + // don't repaint here explicitly. some commands might want to insert many // objects. m_doc.append( object ); setModified( true ); } void -KarbonPart::addCommand( VCommand* cmd, bool tqrepaint ) +KarbonPart::addCommand( VCommand* cmd, bool repaint ) { m_commandHistory->addCommand( cmd ); setModified( true ); - if( tqrepaint ) + if( repaint ) repaintAllViews(); } @@ -530,12 +530,12 @@ KarbonPart::clearHistory() } void -KarbonPart::repaintAllViews( bool tqrepaint ) +KarbonPart::repaintAllViews( bool repaint ) { TQPtrListIterator<KoView> itr( views() ); for( ; itr.current() ; ++itr ) - static_cast<KarbonView*>( itr.current() )->canvasWidget()->repaintAll( tqrepaint ); + static_cast<KarbonView*>( itr.current() )->canvasWidget()->repaintAll( repaint ); } void @@ -561,19 +561,19 @@ KarbonPart::paintContent( TQPainter& painter, const TQRect& rect, painter.eraseRect( rect ); VPainterFactory *painterFactory = new VPainterFactory; //TQPaintDeviceMetrics metrics( painter.device() ); - painterFactory->setPainter( painter.tqdevice(), rect.width(), rect.height() ); + painterFactory->setPainter( painter.device(), rect.width(), rect.height() ); VPainter *p = painterFactory->painter(); //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_part.h b/karbon/karbon_part.h index 34e0e04b..9c9ae91a 100644 --- a/karbon/karbon_part.h +++ b/karbon/karbon_part.h @@ -73,7 +73,7 @@ public: void insertObject( VObject* object ); /// insert a command into the undo/redo-history: - void addCommand( VCommand* cmd, bool tqrepaint = false ); + void addCommand( VCommand* cmd, bool repaint = false ); // access static document: VDocument& document() { return m_doc; } @@ -102,13 +102,13 @@ public: void initConfig(); unsigned int maxRecentFiles() const { return m_maxRecentFiles; } - void setPageLayout( KoPageLayout& tqlayout, KoUnit::Unit _unit ); + void setPageLayout( KoPageLayout& layout, KoUnit::Unit _unit ); bool mergeNativeFormat( const TQString & file ); public slots: - /// tqrepaint all views attached to this koDocument - void repaintAllViews( bool tqrepaint = true ); + /// repaint all views attached to this koDocument + void repaintAllViews( bool repaint = true ); void repaintAllViews( const KoRect& ); void slotDocumentRestored(); void slotCommandExecuted( VCommand * ); diff --git a/karbon/karbon_part_iface.cc b/karbon/karbon_part_iface.cc index d90c506e..3c7f30ac 100644 --- a/karbon/karbon_part_iface.cc +++ b/karbon/karbon_part_iface.cc @@ -81,14 +81,14 @@ TQString KarbonPartIface::widthInUnits() { TQString val = KoUnit::toUserStringValue( m_part->document().width(), m_part->unit() ); - return TQString( "%1%2" ).tqarg( val ).tqarg( m_part->unitName() ); + return TQString( "%1%2" ).arg( val ).arg( m_part->unitName() ); } TQString KarbonPartIface::heightInUnits() { TQString val = KoUnit::toUserStringValue( m_part->document().height(), m_part->unit() ); - return TQString( "%1%2" ).tqarg( val ).tqarg( m_part->unitName() ); + return TQString( "%1%2" ).arg( val ).arg( m_part->unitName() ); } double diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc index 33340690..f76dd156 100644 --- a/karbon/karbon_view.cc +++ b/karbon/karbon_view.cc @@ -22,7 +22,7 @@ #include <tqdragobject.h> #include <tqiconset.h> #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqpopupmenu.h> #include <tqpaintdevicemetrics.h> #include <tqpainter.h> @@ -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() ) @@ -494,7 +494,7 @@ KarbonView::addSelectionToClipboard() const KarbonDrag* kd = new KarbonDrag(); kd->setObjectList( part()->document().selection()->objects() ); - TQApplication::tqclipboard()->setData( kd ); + TQApplication::clipboard()->setData( kd ); } void @@ -503,7 +503,7 @@ KarbonView::editPaste() KarbonDrag kd; VObjectList objects; - if( !kd.decode( TQApplication::tqclipboard()->data(), objects, part()->document() ) ) + if( !kd.decode( TQApplication::clipboard()->data(), objects, part()->document() ) ) return; // Paste with a small offset. @@ -769,7 +769,7 @@ KarbonView::viewModeChanged() void KarbonView::setZoomAt( double zoom, const KoPoint &p ) { - TQString zoomText = TQString( "%1%" ).tqarg( zoom * 100.0, 0, 'f', 2 ); + TQString zoomText = TQString( "%1%" ).arg( zoom * 100.0, 0, 'f', 2 ); TQStringList stl = m_zoomAction->items(); if( stl.first() == "25%" ) { @@ -1171,7 +1171,7 @@ KarbonView::mouseEvent( TQMouseEvent* event, const KoPoint &p ) xy.setX(KoUnit::toUserValue(xy.x(), part()->unit())); xy.setY(KoUnit::toUserValue(xy.y(), part()->unit())); - m_cursorCoords->setText( TQString( "%1, %2" ).tqarg(KGlobal::_locale->formatNumber(xy.x(), 2)).tqarg(KGlobal::_locale->formatNumber(xy.y(), 2)) ); + m_cursorCoords->setText( TQString( "%1, %2" ).arg(KGlobal::_locale->formatNumber(xy.x(), 2)).arg(KGlobal::_locale->formatNumber(xy.y(), 2)) ); if( toolController() ) return toolController()->mouseEvent( event, p ); @@ -1310,11 +1310,11 @@ void KarbonView::pageLayout() { KoHeadFoot hf; - KoPageLayout tqlayout = part()->pageLayout(); + KoPageLayout layout = part()->pageLayout(); KoUnit::Unit unit = part()->unit(); - if( KoPageLayoutDia::pageLayout( tqlayout, hf, FORMAT_AND_BORDERS | DISABLE_UNIT, unit ) ) + if( KoPageLayoutDia::pageLayout( layout, hf, FORMAT_AND_BORDERS | DISABLE_UNIT, unit ) ) { - part()->setPageLayout( tqlayout, unit ); + part()->setPageLayout( layout, unit ); m_horizRuler->setUnit( unit ); m_vertRuler->setUnit( unit ); m_canvas->resizeContents( int( ( part()->pageLayout().ptWidth + 300 ) * zoom() ), @@ -1444,9 +1444,9 @@ KarbonView::repaintAll( const KoRect &r ) } void -KarbonView::repaintAll( bool tqrepaint ) +KarbonView::repaintAll( bool repaint ) { - m_canvas->repaintAll( tqrepaint ); + m_canvas->repaintAll( repaint ); } void KarbonView::setPos( const KoPoint& p ) 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/karbon_view_iface.cc b/karbon/karbon_view_iface.cc index 5d919f8f..3fdf1778 100644 --- a/karbon/karbon_view_iface.cc +++ b/karbon/karbon_view_iface.cc @@ -143,7 +143,7 @@ void KarbonViewIface::pathWhirlPinch() //m_view->pathWhirlPinch(); } -void KarbonViewIface::tqrepaint() +void KarbonViewIface::repaint() { m_view->canvasWidget()->repaintAll(); } diff --git a/karbon/karbon_view_iface.h b/karbon/karbon_view_iface.h index fcd4cf55..59756746 100644 --- a/karbon/karbon_view_iface.h +++ b/karbon/karbon_view_iface.h @@ -61,7 +61,7 @@ k_dcop: void pathRoundCorners(); void pathWhirlPinch(); - void tqrepaint(); + void repaint(); private: KarbonView* m_view; diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.cc b/karbon/plugins/shadoweffect/shadoweffectplugin.cc index dea09571..fc6da1da 100644 --- a/karbon/plugins/shadoweffect/shadoweffectplugin.cc +++ b/karbon/plugins/shadoweffect/shadoweffectplugin.cc @@ -142,7 +142,7 @@ VCreateShadowCmd::execute() bool successful = false; - // Create new tqshapes if they don't exist yet. + // Create new shapes if they don't exist yet. if( !m_newObjects ) { m_newObjects = new VSelection(); @@ -169,11 +169,11 @@ VCreateShadowCmd::execute() if(newObject) { - // Insert new tqshape right before old tqshape. + // Insert new shape right before old shape. itr.current()->parent()->insertInfrontOf( newObject, itr.current() ); - // Add new tqshape to list of new objects. + // Add new shape to list of new objects. m_newObjects->append( newObject ); } } 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/art_rgb.c b/karbon/render/art_rgb.c index 6dd84bde..4d30fad4 100644 --- a/karbon/render/art_rgb.c +++ b/karbon/render/art_rgb.c @@ -30,10 +30,10 @@ /* This is really slow. Is there any way we might speed it up? Two ideas: - First, maybe we should be working at 32-bit tqalignment. Then, + First, maybe we should be working at 32-bit alignment. Then, this can be a simple loop over word stores. - Second, we can keep working at 24-bit tqalignment, but have some + Second, we can keep working at 24-bit alignment, but have some intelligence about storing. For example, we can iterate over 4-pixel chunks (aligned at 4 pixels), with an inner loop something like: @@ -100,7 +100,7 @@ art_rgb_fill_run_ (art_u8 *buf, art_u32 rgb, int n) *buf++ = b; } } else { - /* handle prefix up to byte tqalignment */ + /* handle prefix up to byte alignment */ /* I'm worried about this cast on sizeof(long) != sizeof(uchar *) architectures, but it _should_ work. */ for (i = 0; ((unsigned long)buf) & 3; i++) diff --git a/karbon/render/art_rgb_svp.c b/karbon/render/art_rgb_svp.c index 2052d2ff..617f1abe 100644 --- a/karbon/render/art_rgb_svp.c +++ b/karbon/render/art_rgb_svp.c @@ -120,7 +120,7 @@ art_rgb_svp_callback_ (void *callback_data, int y, * @rowstride: Rowstride of @buf buffer. * @alphagamma: #ArtAlphaGamma for gamma-correcting the rendering. * - * Renders the tqshape specified with @svp into the @buf RGB buffer. + * Renders the shape specified with @svp into the @buf RGB buffer. * @x1 - @x0 specifies the width, and @y1 - @y0 specifies the height, * of the rectangle rendered. The new pixels are stored starting at * the first byte of @buf. Thus, the @x0 and @y0 parameters specify @@ -400,7 +400,7 @@ art_rgb_svp_alpha_opaque_callback_ (void *callback_data, int y, * @rowstride: Rowstride of @buf buffer. * @alphagamma: #ArtAlphaGamma for gamma-correcting the compositing. * - * Renders the tqshape specified with @svp over the @buf RGB buffer. + * Renders the shape specified with @svp over the @buf RGB buffer. * @x1 - @x0 specifies the width, and @y1 - @y0 specifies the height, * of the rectangle rendered. The new pixels are stored starting at * the first byte of @buf. Thus, the @x0 and @y0 parameters specify 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/render/xrgbrender/gdk-pixbuf-xlib-drawable.c b/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c index b9cf9376..7e955610 100644 --- a/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c +++ b/karbon/render/xrgbrender/gdk-pixbuf-xlib-drawable.c @@ -1103,19 +1103,19 @@ xlib_window_is_viewable (Window w) XWindowAttributes wa; while (w != 0) { - Window parent, root, *tqchildren; - int ntqchildren; + Window parent, root, *children; + int nchildren; XGetWindowAttributes (gdk_pixbuf_dpy, w, &wa); if (wa.map_state != IsViewable) return 0; if (!XQueryTree (gdk_pixbuf_dpy, w, &root, - &parent, &tqchildren, &ntqchildren)) + &parent, &children, &nchildren)) return 0; - if (ntqchildren > 0) - XFree (tqchildren); + if (nchildren > 0) + XFree (children); if (parent == root) return 1; diff --git a/karbon/shapes/vellipse.cc b/karbon/shapes/vellipse.cc index 0b5fd80c..ef5bb070 100644 --- a/karbon/shapes/vellipse.cc +++ b/karbon/shapes/vellipse.cc @@ -254,7 +254,7 @@ VEllipse::loadOasis( const TQDomElement &element, KoOasisLoadingContext &context double startAngle = element.attributeNS( KoXmlNS::draw, "start-angle", TQString() ).toDouble(); double endAngle = element.attributeNS( KoXmlNS::draw, "end-angle", TQString() ).toDouble(); - // the tqshape gets mirrored in y-direction, so make the angles temporary clockwise + // the shape gets mirrored in y-direction, so make the angles temporary clockwise // just for creating the path m_startAngle = 360.0 - endAngle; m_endAngle = 360.0 - startAngle; diff --git a/karbon/shapes/vpolygon.cc b/karbon/shapes/vpolygon.cc index 650b4698..1735471f 100644 --- a/karbon/shapes/vpolygon.cc +++ b/karbon/shapes/vpolygon.cc @@ -108,8 +108,8 @@ VPolygon::save( TQDomElement& element ) const me.setAttribute( "x", m_topLeft.x() ); me.setAttribute( "y", m_topLeft.y() ); - me.setAttribute( "width", TQString("%1pt").tqarg( m_width ) ); - me.setAttribute( "height", TQString("%1pt").tqarg( m_height ) ); + me.setAttribute( "width", TQString("%1pt").arg( m_width ) ); + me.setAttribute( "height", TQString("%1pt").arg( m_height ) ); me.setAttribute( "points", m_points ); diff --git a/karbon/shapes/vpolyline.cc b/karbon/shapes/vpolyline.cc index d716c325..cef5bda2 100644 --- a/karbon/shapes/vpolyline.cc +++ b/karbon/shapes/vpolyline.cc @@ -157,7 +157,7 @@ VPolyline::loadOasis( const TQDomElement &element, KoOasisLoadingContext &contex p2.setX( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "x2", TQString() ) ) ); p2.setY( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "y2", TQString() ) ) ); - m_points = TQString( "%1,%2 %3,%4" ).tqarg( p1.x() ).tqarg( p1.y() ).tqarg( p2.x() ).tqarg( p2.y() ); + m_points = TQString( "%1,%2 %3,%4" ).arg( p1.x() ).arg( p1.y() ).arg( p2.x() ).arg( p2.y() ); moveTo( p1 ); lineTo( p2 ); diff --git a/karbon/shapes/vrectangle.cc b/karbon/shapes/vrectangle.cc index bb3512fd..bbeef50f 100644 --- a/karbon/shapes/vrectangle.cc +++ b/karbon/shapes/vrectangle.cc @@ -125,8 +125,8 @@ VRectangle::save( TQDomElement& element ) const me.setAttribute( "x", m_topLeft.x() ); me.setAttribute( "y", m_topLeft.y() ); - me.setAttribute( "width", TQString("%1pt").tqarg( m_width ) ); - me.setAttribute( "height", TQString("%1pt").tqarg( m_height ) ); + me.setAttribute( "width", TQString("%1pt").arg( m_width ) ); + me.setAttribute( "height", TQString("%1pt").arg( m_height ) ); me.setAttribute( "rx", m_rx ); me.setAttribute( "ry", m_ry ); diff --git a/karbon/shapes/vstar.h b/karbon/shapes/vstar.h index d82cdf9e..e6134662 100644 --- a/karbon/shapes/vstar.h +++ b/karbon/shapes/vstar.h @@ -23,11 +23,11 @@ #include "vcomposite.h" #include <koffice_export.h> /** - * This tqshape offers star-like tqshapes with a lot of parameters : + * This shape offers star-like shapes with a lot of parameters : * * Types : * - * Star - fully connected star tqshape. + * Star - fully connected star shape. * Star outline - like star but without the cross connections. * Framed star - like star outline but with an enclosing path. * Spoke - basically a star outline with inner radius of zero. @@ -42,7 +42,7 @@ * Inner radius - inner radius where star has to connect to. This value * doesn't apply to polygon, spoke and wheel. * Inner angle - extra radius amount for inner radius. - * Roundness - uses curves instead of lines for the star tqshape. + * Roundness - uses curves instead of lines for the star shape. */ class KARBONBASE_EXPORT VStar : public VPath { diff --git a/karbon/tools/vellipsetool.cc b/karbon/tools/vellipsetool.cc index 41936226..b0f981af 100644 --- a/karbon/tools/vellipsetool.cc +++ b/karbon/tools/vellipsetool.cc @@ -152,7 +152,7 @@ VEllipseTool::refreshUnit() } VPath* -VEllipseTool::tqshape( bool interactive ) const +VEllipseTool::shape( 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( "tqshapes" ); + m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; } } diff --git a/karbon/tools/vellipsetool.h b/karbon/tools/vellipsetool.h index 859cac96..5a605c53 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 *tqshape( bool interactive = false ) const; + virtual VPath *shape( bool interactive = false ) const; void refreshUnit(); protected: diff --git a/karbon/tools/vpatterntool.cc b/karbon/tools/vpatterntool.cc index 893c8481..92a981ba 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 <tqlayout.h> +#include <layout.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* tqlayout = new TQVBoxLayout( base ); - tqlayout->addWidget( m_patternChooser = new KoIconChooser( TQSize( 32, 32 ), base ) ); - tqlayout->addWidget( m_buttonGroup = new TQHButtonGroup( base ) ); + TQVBoxLayout* layout = new TQVBoxLayout( base ); + layout->addWidget( m_patternChooser = new KoIconChooser( TQSize( 32, 32 ), base ) ); + layout->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 ); - tqlayout->setMargin( 3 ); + layout->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 db1ffb88..fdd02299 100644 --- a/karbon/tools/vpolygontool.cc +++ b/karbon/tools/vpolygontool.cc @@ -119,7 +119,7 @@ VPolygonTool::arrowKeyReleased( TQt::Key key ) } VPath* -VPolygonTool::tqshape( bool interactive ) const +VPolygonTool::shape( 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( "tqshapes" ); + m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; } } diff --git a/karbon/tools/vpolygontool.h b/karbon/tools/vpolygontool.h index 052d7e50..cb1dabab 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 *tqshape( bool interactive = false ) const; + virtual VPath *shape( bool interactive = false ) const; void refreshUnit(); diff --git a/karbon/tools/vrectangletool.cc b/karbon/tools/vrectangletool.cc index 7d949ac7..1b9d9c0f 100644 --- a/karbon/tools/vrectangletool.cc +++ b/karbon/tools/vrectangletool.cc @@ -101,7 +101,7 @@ VRectangleTool::refreshUnit() } VPath * -VRectangleTool::tqshape( bool interactive ) const +VRectangleTool::shape( 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( "tqshapes" ); + m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; } } diff --git a/karbon/tools/vrectangletool.h b/karbon/tools/vrectangletool.h index b902b1ab..ce39a119 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* tqshape( bool interactive = false ) const; + virtual VPath* shape( bool interactive = false ) const; void refreshUnit(); diff --git a/karbon/tools/vroundrecttool.cc b/karbon/tools/vroundrecttool.cc index b7f354cf..c88bacd8 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):" ).tqarg(KoUnit::unitName( m_part->unit() )), group ); + new TQLabel( i18n( "Height (%1):" ).arg(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::tqshape( bool interactive ) const +VRoundRectTool::shape( 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( "tqshapes" ); + m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; } } diff --git a/karbon/tools/vroundrecttool.h b/karbon/tools/vroundrecttool.h index 59a2fab0..5149ff2f 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* tqshape( bool interactive = false ) const; + virtual VPath* shape( bool interactive = false ) const; void refreshUnit(); diff --git a/karbon/tools/vselecttool.cc b/karbon/tools/vselecttool.cc index e29e1afb..e6b87f62 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)").tqarg( x, 0, 'f', 1 ).tqarg( y, 0, 'f', 1 ).tqarg( r, 0, 'f', 1 ).tqarg( b, 0, 'f', 1 ).tqarg( view()->part()->unitName() ); + 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() ); VSelectionDescription selectionDesc; selectionDesc.visit( *view()->part()->document().selection() ); - selectMessage += TQString( "(%1)" ).tqarg( selectionDesc.description() ); + selectMessage += TQString( "(%1)" ).arg( selectionDesc.description() ); view()->statusMessage()->setText( selectMessage ); } diff --git a/karbon/tools/vshapetool.cc b/karbon/tools/vshapetool.cc index 49197773..9b59104d 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 tqshape.<br>" ); - s += i18n( "<i>Click</i> to place a tqshape using the tool properties values.</qt>" ); + 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>" ); return s; } @@ -77,7 +77,7 @@ VShapeTool::draw() VPainter* painter = view()->painterFactory()->editpainter(); painter->setRasterOp( TQt::NotROP ); - VPath* composite = tqshape(); + VPath* composite = shape(); composite->setState( VPath::edit ); composite->draw( painter, &composite->boundingBox() ); delete( composite ); @@ -101,7 +101,7 @@ VShapeTool::mouseButtonRelease() if( showDialog() ) { - VPath* composite = tqshape( true ); + VPath* composite = shape( true ); if( composite ) { @@ -136,7 +136,7 @@ VShapeTool::mouseDragRelease() VShapeCmd* cmd = new VShapeCmd( &view()->part()->document(), - uiname(), tqshape(), icon() ); + uiname(), shape(), icon() ); view()->part()->addCommand( cmd, true ); diff --git a/karbon/tools/vshapetool.h b/karbon/tools/vshapetool.h index 2a774e94..f66b5719 100644 --- a/karbon/tools/vshapetool.h +++ b/karbon/tools/vshapetool.h @@ -58,7 +58,7 @@ protected: // Make it "abstract": virtual ~VShapeTool(); - virtual VPath* tqshape( bool interactive = false ) const = 0; + virtual VPath* shape( bool interactive = false ) const = 0; /** * Output coordinates. diff --git a/karbon/tools/vsinustool.cc b/karbon/tools/vsinustool.cc index f95bc2c5..65a8a62f 100644 --- a/karbon/tools/vsinustool.cc +++ b/karbon/tools/vsinustool.cc @@ -20,7 +20,7 @@ #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <knuminput.h> @@ -120,7 +120,7 @@ VSinusTool::refreshUnit() } VPath* -VSinusTool::tqshape( bool interactive ) const +VSinusTool::shape( 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( "tqshapes" ); + m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; } } diff --git a/karbon/tools/vsinustool.h b/karbon/tools/vsinustool.h index 71669ebd..4aa1c464 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 *tqshape( bool interactive = false ) const; + virtual VPath *shape( bool interactive = false ) const; void refreshUnit(); diff --git a/karbon/tools/vspiraltool.cc b/karbon/tools/vspiraltool.cc index 304c8637..e0c78e1d 100644 --- a/karbon/tools/vspiraltool.cc +++ b/karbon/tools/vspiraltool.cc @@ -165,7 +165,7 @@ VSpiralTool::refreshUnit() } VPath* -VSpiralTool::tqshape( bool interactive ) const +VSpiralTool::shape( 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( "tqshapes" ); + m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; } } diff --git a/karbon/tools/vspiraltool.h b/karbon/tools/vspiraltool.h index 5787063d..072e3bea 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* tqshape( bool interactive = false ) const; + virtual VPath* shape( bool interactive = false ) const; void refreshUnit(); diff --git a/karbon/tools/vstartool.cc b/karbon/tools/vstartool.cc index 42c74f4e..114bab75 100644 --- a/karbon/tools/vstartool.cc +++ b/karbon/tools/vstartool.cc @@ -198,7 +198,7 @@ VStarTool::arrowKeyReleased( TQt::Key key ) } VPath* -VStarTool::tqshape( bool interactive ) const +VStarTool::shape( 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( "tqshapes" ); + m_action->setExclusiveGroup( "shapes" ); //m_ownAction = true; } } diff --git a/karbon/tools/vstartool.h b/karbon/tools/vstartool.h index 07d744c0..ce073d0c 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* tqshape( bool interactive = false ) const; + virtual VPath* shape( bool interactive = false ) const; void refreshUnit(); diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc index a3500160..29293e8b 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 <tqlayout.h> +#include <layout.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( 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,22 +205,22 @@ ShadowWidget::ShadowWidget( TQWidget* parent, const char* name, int angle, int d : TQGroupBox( parent, name ) { setTitle( i18n( "Shadow" ) ); - 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 ); + 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 ); 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->tqrepaint(); + m_preview->repaint(); } int @@ -268,7 +268,7 @@ void ShadowWidget::setShadowDistance( int distance ) { m_distance->setValue( distance ); - m_preview->tqrepaint(); + m_preview->repaint(); } int @@ -281,7 +281,7 @@ void ShadowWidget::setTranslucent( bool translucent ) { m_translucent->setChecked( translucent ); - m_preview->tqrepaint(); + m_preview->repaint(); } bool ShadowWidget::isTranslucent() @@ -301,13 +301,13 @@ ShadowWidget::setShadowValues( int angle, int distance, bool translucent ) void ShadowWidget::updatePreview( int ) { - m_preview->tqrepaint(); + m_preview->repaint(); } void ShadowWidget::updatePreview() { - m_preview->tqrepaint(); + m_preview->repaint(); 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 ) { - //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 ); @@ -387,13 +387,13 @@ VTextOptionsWidget::VTextOptionsWidget( VTextTool* tool, TQWidget *parent ) m_convertToShapes->setEnabled( true ); - m_textAlignment->insertItem( i18n( "Horizontal tqalignment", "Left") ); - m_textAlignment->insertItem( i18n( "Horizontal tqalignment", "Center") ); - m_textAlignment->insertItem( i18n( "Horizontal tqalignment", "Right") ); + m_textAlignment->insertItem( i18n( "Horizontal alignment", "Left") ); + m_textAlignment->insertItem( i18n( "Horizontal alignment", "Center") ); + m_textAlignment->insertItem( i18n( "Horizontal alignment", "Right") ); - m_textPosition->insertItem( i18n( "Vertical tqalignment", "Above") ); - m_textPosition->insertItem( i18n( "Vertical tqalignment", "On") ); - m_textPosition->insertItem( i18n( "Vertical tqalignment", "Under") ); + m_textPosition->insertItem( i18n( "Vertical alignment", "Above") ); + m_textPosition->insertItem( i18n( "Vertical alignment", "On") ); + m_textPosition->insertItem( i18n( "Vertical alignment", "Under") ); m_textOffset->setRange( 0.0, 100.0, 1.0, true ); @@ -518,12 +518,12 @@ VText::Position VTextOptionsWidget::position() } void -VTextOptionsWidget::tqsetAlignment( VText::Alignment tqalignment ) +VTextOptionsWidget::setAlignment( VText::Alignment alignment ) { - m_textAlignment->setCurrentItem( tqalignment ); + m_textAlignment->setCurrentItem( alignment ); } -VText::Alignment VTextOptionsWidget::tqalignment() +VText::Alignment VTextOptionsWidget::alignment() { 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->tqalignment(), m_optionsWidget->text() ); + m_editedText = new VText( m_optionsWidget->font(), path, m_optionsWidget->position(), m_optionsWidget->alignment(), 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->tqsetAlignment( m_optionsWidget->tqalignment() ); + m_editedText->setAlignment( m_optionsWidget->alignment() ); 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->tqalignment(), + m_editedText->alignment(), 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->tqsetAlignment( text.tqalignment() ); + m_optionsWidget->setAlignment( text.alignment() ); 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->tqalignment(); + m_textModifications->oldAlignment = text->alignment(); 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->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..48357dbf 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 tqsetAlignment( VText::Alignment tqalignment ); - VText::Alignment tqalignment(); + void setAlignment( VText::Alignment alignment ); + VText::Alignment alignment(); void setOffset( double offset ); double offset(); void setUseShadow( bool state ); diff --git a/karbon/usablity-review.txt b/karbon/usablity-review.txt index 237dc828..5d2eb8b4 100644 --- a/karbon/usablity-review.txt +++ b/karbon/usablity-review.txt @@ -79,7 +79,7 @@ unselects is not one of the outside objects. It is impossible to select an object that is completely inside another. A perfect solution would: -* make the 'hit area' based more on the outside of the tqshape. +* make the 'hit area' based more on the outside of the shape. A line should not be selected when clicked more then pixels next to it. Text should be selected when clicked in the white area of a 'D' diff --git a/karbon/vtool.h b/karbon/vtool.h index 877dc41b..2b8bc72e 100644 --- a/karbon/vtool.h +++ b/karbon/vtool.h @@ -37,7 +37,7 @@ enum enumToolType { TOOL_SELECT = 0, // TOOL_FREEHAND = 1, // - TOOL_SHAPE = 2, // Geometric tqshapes like ellipses and lines + TOOL_SHAPE = 2, // Geometric shapes like ellipses and lines TOOL_MANIPULATION = 3, // TOOL_MISC = 4 // }; diff --git a/karbon/widgets/vcanvas.cc b/karbon/widgets/vcanvas.cc index d96018b9..9fa5dcd6 100644 --- a/karbon/widgets/vcanvas.cc +++ b/karbon/widgets/vcanvas.cc @@ -152,7 +152,7 @@ VCanvas::eventFilter( TQObject* object, TQEvent* event ) } -// This causes a tqrepaint normally, so just overwriting it omits the repainting +// This causes a repaint normally, so just overwriting it omits the repainting void VCanvas::focusInEvent( TQFocusEvent * ) { @@ -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/vcolorslider.cc b/karbon/widgets/vcolorslider.cc index 3e2af4f0..6c32465e 100644 --- a/karbon/widgets/vcolorslider.cc +++ b/karbon/widgets/vcolorslider.cc @@ -20,7 +20,7 @@ /* vcolorslider.cc */ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <knuminput.h> #include <kselect.h> @@ -53,15 +53,15 @@ VColorSlider::~VColorSlider() void VColorSlider::init() { m_isDragging = false; - TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 3 ); + TQHBoxLayout *layout = new TQHBoxLayout( this, 3 ); m_label = new TQLabel( this ); m_gradientSelect = new KGradientSelector( Qt::Horizontal, this ); m_spinBox = new KIntSpinBox( this ); - tqlayout->addWidget( m_label ); - tqlayout->addWidget( m_gradientSelect, 2 ); - tqlayout->addWidget( m_spinBox ); + layout->addWidget( m_label ); + layout->addWidget( m_gradientSelect, 2 ); + layout->addWidget( m_spinBox ); setValue( 0 ); setMinValue( 0 ); @@ -72,7 +72,7 @@ void VColorSlider::init() m_gradientSelect->installEventFilter( this ); - tqlayout->activate(); + layout->activate(); } void VColorSlider::setLabel( const TQString& label ) diff --git a/karbon/widgets/vgradienttabwidget.cc b/karbon/widgets/vgradienttabwidget.cc index f65cfd74..0dd365f1 100644 --- a/karbon/widgets/vgradienttabwidget.cc +++ b/karbon/widgets/vgradienttabwidget.cc @@ -19,7 +19,7 @@ #include <tqlabel.h> #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <tqpushbutton.h> #include <tqfileinfo.h> @@ -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/vreference.cc b/karbon/widgets/vreference.cc index f400fc13..0040c3ef 100644 --- a/karbon/widgets/vreference.cc +++ b/karbon/widgets/vreference.cc @@ -21,14 +21,14 @@ /* vreference.cc */ #include <tqbuttongroup.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include "vreference.h" VReference::VReference( TQWidget *parent, const char *name ) : TQFrame ( parent, name ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); mButtonGroup = new TQButtonGroup (3,Qt::Vertical, this ); TQRadioButton* radio = new TQRadioButton ( mButtonGroup ); mButtonGroup->insert( radio, TopLeft ); @@ -54,8 +54,8 @@ VReference::VReference( TQWidget *parent, const char *name ) : TQFrame ( parent, this, TQT_SLOT( setReferencePoint( int ) ) ); mButtonGroup->setButton( Center ); - tqlayout->addWidget( mButtonGroup ); - tqlayout->activate(); + layout->addWidget( mButtonGroup ); + layout->activate(); setReferencePoint( Center ); } diff --git a/karbon/widgets/vruler.cc b/karbon/widgets/vruler.cc index de03eb23..28b7db9f 100644 --- a/karbon/widgets/vruler.cc +++ b/karbon/widgets/vruler.cc @@ -114,7 +114,7 @@ void VRuler::setUnit(KoUnit::Unit u) m_unit = u; drawRuler(); updatePointer(m_currentPosition, m_currentPosition); - tqrepaint(); + repaint(); } void VRuler::setZoom(double zoom) @@ -123,7 +123,7 @@ void VRuler::setZoom(double zoom) recalculateSize(); drawRuler(); updatePointer(m_currentPosition, m_currentPosition); - tqrepaint(); + repaint(); } void VRuler::updatePointer(TQ_INT32 x, TQ_INT32 y) @@ -131,7 +131,7 @@ void VRuler::updatePointer(TQ_INT32 x, TQ_INT32 y) if (m_pixmapBuffer) { if (m_orientation == Qt::Horizontal) { if (m_currentPosition != -1) - tqrepaint(m_currentPosition, 1, MARKER_WIDTH, MARKER_HEIGHT); + repaint(m_currentPosition, 1, MARKER_WIDTH, MARKER_HEIGHT); if (x != -1) { bitBlt(this, x, 1, &m_pixmapMarker, 0, 0, MARKER_WIDTH, MARKER_HEIGHT); @@ -139,7 +139,7 @@ void VRuler::updatePointer(TQ_INT32 x, TQ_INT32 y) } } else { if (m_currentPosition != -1) - tqrepaint(1, m_currentPosition, MARKER_HEIGHT, MARKER_WIDTH); + repaint(1, m_currentPosition, MARKER_HEIGHT, MARKER_WIDTH); if (y != -1) { bitBlt(this, 1, y, &m_pixmapMarker, 0, 0, MARKER_HEIGHT, MARKER_WIDTH); @@ -158,7 +158,7 @@ void VRuler::updateVisibleArea(TQ_INT32 xpos, TQ_INT32 ypos) //kdDebug() << "--###-- VRuler::updateVisibleArea(" << xpos << ", " << ypos << ")" << endl; drawRuler(); - tqrepaint(); + repaint(); updatePointer(m_currentPosition, m_currentPosition); //kdDebug() << "--###-- VRuler::updatePointer(" << m_currentPosition << ", " << m_currentPosition << ")" << endl; } @@ -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/vsmallpreview.cc b/karbon/widgets/vsmallpreview.cc index 6e35d921..1cd6af0e 100644 --- a/karbon/widgets/vsmallpreview.cc +++ b/karbon/widgets/vsmallpreview.cc @@ -22,7 +22,7 @@ #include <tqcolor.h> #include <tqframe.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpixmap.h> #include <klocale.h> @@ -42,21 +42,21 @@ VSmallPreview::VSmallPreview( TQWidget* parent, const char* name ) : TQWidget( parent, name ) { - /* Create widget tqlayout */ - TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 4 ); + /* Create widget layout */ + TQHBoxLayout *layout = new TQHBoxLayout( this, 4 ); m_strokeLabel = new TQLabel( i18n( "Stroke: None" ), this ); - tqlayout->addWidget( m_strokeLabel ); + layout->addWidget( m_strokeLabel ); m_strokeFrame = new TQFrame( this ); m_strokeFrame->setFixedWidth ( FRAMEWIDTH ); m_strokeFrame->setFrameStyle( TQFrame::GroupBoxPanel | TQFrame::Plain ); - tqlayout->addWidget( m_strokeFrame ); + layout->addWidget( m_strokeFrame ); m_fillLabel = new TQLabel( i18n( "Fill: None" ), this ); - tqlayout->addWidget( m_fillLabel ); + layout->addWidget( m_fillLabel ); m_fillFrame = new TQFrame( this ); m_fillFrame->setFixedWidth ( FRAMEWIDTH ); m_fillFrame->setFrameStyle( TQFrame::GroupBoxPanel | TQFrame::Plain ); - tqlayout->addWidget( m_fillFrame ); - tqlayout->activate(); + layout->addWidget( m_fillFrame ); + layout->activate(); m_fill = VFill(); m_stroke = VStroke(); diff --git a/karbon/widgets/vstrokefillpreview.cc b/karbon/widgets/vstrokefillpreview.cc index 473ce4db..f69d5d85 100644 --- a/karbon/widgets/vstrokefillpreview.cc +++ b/karbon/widgets/vstrokefillpreview.cc @@ -195,7 +195,7 @@ VStrokeFillPreview::update( const VStroke &s, const VFill &f ) m_painter->end(); - tqrepaint(); + repaint(); } void 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 ); } diff --git a/karbon/widgets/vtranslate.cc b/karbon/widgets/vtranslate.cc index e13da689..faa4d837 100644 --- a/karbon/widgets/vtranslate.cc +++ b/karbon/widgets/vtranslate.cc @@ -20,7 +20,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqstring.h> #include <klocale.h> #include <knuminput.h> @@ -34,38 +34,38 @@ VTranslate::VTranslate( TQWidget* parent, const char* name ) { setCaption( i18n( "Translate" ) ); - TQVBoxLayout *maintqlayout = new TQVBoxLayout(this, 7); - maintqlayout->addSpacing(5); + TQVBoxLayout *mainlayout = new TQVBoxLayout(this, 7); + mainlayout->addSpacing(5); - TQGridLayout *inputtqlayout = new TQGridLayout(this, 5, 3); - maintqlayout->addLayout(inputtqlayout); + TQGridLayout *inputlayout = new TQGridLayout(this, 5, 3); + mainlayout->addLayout(inputlayout); m_labelX = new TQLabel(i18n("X:"), this); - inputtqlayout->addWidget(m_labelX, 0, 0); + inputlayout->addWidget(m_labelX, 0, 0); labely = new TQLabel(i18n("Y:"), this); - inputtqlayout->addWidget(labely, 1, 0); - inputtqlayout->addColSpacing(1, 1); - inputtqlayout->addColSpacing(3, 5); + inputlayout->addWidget(labely, 1, 0); + inputlayout->addColSpacing(1, 1); + inputlayout->addColSpacing(3, 5); m_inputX = new KDoubleNumInput( this ); m_inputX->setRange(-10000.00, 10000.00, 1.00, false); //range is just for example - for now :-) - inputtqlayout->addWidget(m_inputX, 0, 2); + inputlayout->addWidget(m_inputX, 0, 2); m_inputY = new KDoubleNumInput( this ); m_inputY->setRange(-10000.00, 10000.00, 1.00, false); - inputtqlayout->addWidget(m_inputY, 1, 2); + inputlayout->addWidget(m_inputY, 1, 2); m_labelUnit1 = new TQLabel("", this); - inputtqlayout->addWidget(m_labelUnit1, 0, 4); + inputlayout->addWidget(m_labelUnit1, 0, 4); m_labelUnit2 = new TQLabel("", this); - inputtqlayout->addWidget(m_labelUnit2, 1, 4); - maintqlayout->addSpacing(5); + inputlayout->addWidget(m_labelUnit2, 1, 4); + mainlayout->addSpacing(5); m_checkBoxPosition = new TQCheckBox(i18n("Relative &position"), this); - maintqlayout->addWidget(m_checkBoxPosition); - maintqlayout->addSpacing(5); + mainlayout->addWidget(m_checkBoxPosition); + mainlayout->addSpacing(5); m_buttonDuplicate = new TQPushButton(i18n("&Duplicate"), this); - maintqlayout->addWidget(m_buttonDuplicate); - maintqlayout->addSpacing(1); + mainlayout->addWidget(m_buttonDuplicate); + mainlayout->addSpacing(1); m_buttonApply = new KPushButton(KStdGuiItem::apply(), this); - maintqlayout->addWidget(m_buttonApply); + mainlayout->addWidget(m_buttonApply); - maintqlayout->activate(); + mainlayout->activate(); setFixedSize(baseSize()); //Set the size tp fixed values } |