summaryrefslogtreecommitdiffstats
path: root/karbon/core
diff options
context:
space:
mode:
Diffstat (limited to 'karbon/core')
-rw-r--r--karbon/core/vcomposite.cc30
-rw-r--r--karbon/core/vfill.cc4
-rw-r--r--karbon/core/vfill.h4
-rw-r--r--karbon/core/vgradient.cc4
-rw-r--r--karbon/core/vgroup.cc2
-rw-r--r--karbon/core/vobject.h2
-rw-r--r--karbon/core/vpath.cc4
-rw-r--r--karbon/core/vstroke.cc2
-rw-r--r--karbon/core/vtext.cc14
-rw-r--r--karbon/core/vtext.h10
10 files changed, 38 insertions, 38 deletions
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/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..e9888355 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();
@@ -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 4f47f527..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 setAlignment( 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
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-14 05:24:37 +0000