summaryrefslogtreecommitdiffstats
path: root/kig/misc
diff options
context:
space:
mode:
Diffstat (limited to 'kig/misc')
-rw-r--r--kig/misc/coordinate_system.cpp16
-rw-r--r--kig/misc/guiaction.cc8
-rw-r--r--kig/misc/kiginputdialog.cc2
-rw-r--r--kig/misc/kigpainter.cpp8
-rw-r--r--kig/misc/object_hierarchy.cc6
5 files changed, 20 insertions, 20 deletions
diff --git a/kig/misc/coordinate_system.cpp b/kig/misc/coordinate_system.cpp
index 10bd96ce..b518078e 100644
--- a/kig/misc/coordinate_system.cpp
+++ b/kig/misc/coordinate_system.cpp
@@ -116,19 +116,19 @@ void CoordinateValidator::fixup( TQString & input ) const
sc = input.length();
KLocale* l = KGlobal::locale();
if ( mpolar )
- input.append( TQString::tqfromLatin1( ";" ) + l->positiveSign() +
- TQString::tqfromLatin1( "0°" ) );
+ input.append( TQString::fromLatin1( ";" ) + l->positiveSign() +
+ TQString::fromLatin1( "0°" ) );
else
- input.append( TQString::tqfromLatin1( ";" ) + l->positiveSign() +
- TQString::tqfromLatin1( "0" ) + l->decimalSymbol() +
- TQString::tqfromLatin1( "0" ) );
+ input.append( TQString::fromLatin1( ";" ) + l->positiveSign() +
+ TQString::fromLatin1( "0" ) + l->decimalSymbol() +
+ TQString::fromLatin1( "0" ) );
};
mre.exactMatch( input );
TQString ds1 = mre.cap( 1 );
mdv.fixup( ds1 );
TQString ds2 = mre.cap( 2 );
mdv.fixup( ds2 );
- input = ds1 + TQString::tqfromLatin1( "; " ) + ds2;
+ input = ds1 + TQString::fromLatin1( "; " ) + ds2;
}
EuclideanCoords::EuclideanCoords()
@@ -146,7 +146,7 @@ TQString EuclideanCoords::fromScreen( const Coordinate& p, const KigDocument& d
int l = kigMax( 0, (int) ( 3 - log10( m ) ) );
TQString xs = KGlobal::locale()->formatNumber( p.x, l );
TQString ys = KGlobal::locale()->formatNumber( p.y, l );
- return TQString::tqfromLatin1( "( %1; %2 )" ).tqarg( xs ).tqarg( ys );
+ return TQString::fromLatin1( "( %1; %2 )" ).tqarg( xs ).tqarg( ys );
}
Coordinate EuclideanCoords::toScreen(const TQString& s, bool& ok) const
@@ -354,7 +354,7 @@ TQString PolarCoords::fromScreen( const Coordinate& pt, const KigDocument& d ) c
TQString rs = KGlobal::locale()->formatNumber( r, l );
TQString ts = KGlobal::locale()->formatNumber( theta, 0 );
- return TQString::tqfromLatin1("( %1; %2° )").tqarg( rs ).tqarg( ts );
+ return TQString::fromLatin1("( %1; %2° )").tqarg( rs ).tqarg( ts );
}
TQString PolarCoords::coordinateFormatNotice() const
diff --git a/kig/misc/guiaction.cc b/kig/misc/guiaction.cc
index f19f2d82..d42b7ca4 100644
--- a/kig/misc/guiaction.cc
+++ b/kig/misc/guiaction.cc
@@ -223,7 +223,7 @@ void AddFixedPointAction::act( KigPart& doc )
KigInputDialog::getCoordinate(
i18n( "Fixed Point" ),
i18n( "Enter the coordinates for the new point." ) +
- TQString::tqfromLatin1( "<br>" ) +
+ TQString::fromLatin1( "<br>" ) +
doc.document().coordinateSystem().coordinateFormatNoticeMarkup(),
doc.widget(), &ok, doc.document(), &c );
if ( ! ok ) return;
@@ -272,7 +272,7 @@ TestAction::~TestAction()
TQString TestAction::description() const
{
- return TQString::tqfromLatin1( "Test stuff !!!" );
+ return TQString::fromLatin1( "Test stuff !!!" );
}
TQCString TestAction::iconFileName() const
@@ -282,7 +282,7 @@ TQCString TestAction::iconFileName() const
TQString TestAction::descriptiveName() const
{
- return TQString::tqfromLatin1( "Test stuff !!!" );
+ return TQString::fromLatin1( "Test stuff !!!" );
}
const char* TestAction::actionName() const
@@ -297,7 +297,7 @@ void TestAction::act( KigPart& doc )
Object* constantpoint = ObjectFactory::instance()->fixedPoint( Coordinate( -1, -1 ) );
constantpoint->calc( doc );
- Object* codeobject = new DataObject( new StringImp( TQString::tqfromLatin1( script ) ) );
+ Object* codeobject = new DataObject( new StringImp( TQString::fromLatin1( script ) ) );
Object* compiledcode = new RealObject( PythonCompileType::instance(), Objects( codeobject ) );
compiledcode->calc( doc );
diff --git a/kig/misc/kiginputdialog.cc b/kig/misc/kiginputdialog.cc
index 99e635b2..f45d6949 100644
--- a/kig/misc/kiginputdialog.cc
+++ b/kig/misc/kiginputdialog.cc
@@ -85,7 +85,7 @@ KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label,
d->m_textEdit->setText( label );
d->m_textEdit->setReadOnly( true );
d->m_textEdit->setFocusPolicy( TQ_NoFocus );
-// d->m_textEdit->tqsetAlignment( d->m_textEdit->tqalignment() | TQt::WordBreak );
+// d->m_textEdit->setAlignment( d->m_textEdit->tqalignment() | TQt::WordBreak );
d->m_textEdit->setFrameStyle( TQFrame::NoFrame );
mainlay->addWidget( d->m_textEdit );
diff --git a/kig/misc/kigpainter.cpp b/kig/misc/kigpainter.cpp
index 81ae6574..4b3ede2e 100644
--- a/kig/misc/kigpainter.cpp
+++ b/kig/misc/kigpainter.cpp
@@ -300,7 +300,7 @@ void KigPainter::drawPolygon( const std::vector<TQPoint>& pts,
{
t.putPoints( c++, 1, i->x(), i->y() );
};
- mP.tqdrawPolygon( t, winding, index, npoints );
+ mP.drawPolygon( t, winding, index, npoints );
setPen( oldpen );
setBrush( oldbrush );
if( mNeedOverlay ) mOverlay.push_back( t.boundingRect() );
@@ -645,7 +645,7 @@ void KigPainter::drawAngle( const Coordinate& cpoint, const double dstartangle,
setBrushStyle( Qt::SolidPattern );
// drawPolygon( arrow );
- mP.tqdrawPolygon( arrow, false, 0, -1 );
+ mP.drawPolygon( arrow, false, 0, -1 );
// if ( mNeedOverlay ) mOverlay.push_back( toScreen( r ) );
setWholeWinOverlay(); //mp: ugly! why not compute a correct overlay?
@@ -859,7 +859,7 @@ void KigPainter::drawCurve( const CurveImp* curve )
if ( curpolylinenextfree > 0 && curpolyline[curpolylinenextfree - 1] != tp1 )
{
// flush the current part of the curve
- mP.tqdrawPolyline( curpolyline, 0, curpolylinenextfree );
+ mP.drawPolyline( curpolyline, 0, curpolylinenextfree );
curpolylinenextfree = 0;
}
if ( curpolylinenextfree == 0 )
@@ -883,7 +883,7 @@ void KigPainter::drawCurve( const CurveImp* curve )
}
}
// flush the rest of the curve
- mP.tqdrawPolyline( curpolyline, 0, curpolylinenextfree );
+ mP.drawPolyline( curpolyline, 0, curpolylinenextfree );
curpolylinenextfree = 0;
if ( ! workstack.empty () )
diff --git a/kig/misc/object_hierarchy.cc b/kig/misc/object_hierarchy.cc
index e72a3c19..55914081 100644
--- a/kig/misc/object_hierarchy.cc
+++ b/kig/misc/object_hierarchy.cc
@@ -419,10 +419,10 @@ void ObjectHierarchy::serialize( TQDomElement& parent, TQDomDocument& doc ) cons
// we don't save these atm, since the user can't define them.
// we only load them from builtin macro's.
// TQDomElement ut = doc.createElement( "UseText" );
-// ut.appendChild( doc.createTextNode( TQString::tqfromLatin1(musetexts[i].c_str() ) ) );
+// ut.appendChild( doc.createTextNode( TQString::fromLatin1(musetexts[i].c_str() ) ) );
// e.appendChild( ut );
// TQDomElement ss = doc.createElement( "SelectStatement" );
-// ss.appendChild( doc.createTextNode( TQString::tqfromLatin1(mselectstatements[i].c_str() ) ) );
+// ss.appendChild( doc.createTextNode( TQString::fromLatin1(mselectstatements[i].c_str() ) ) );
// e.appendChild( ss );
parent.appendChild( e );
}
@@ -437,7 +437,7 @@ void ObjectHierarchy::serialize( TQDomElement& parent, TQDomDocument& doc ) cons
{
const ApplyTypeNode* node = static_cast<const ApplyTypeNode*>( mnodes[i] );
e.setAttribute( "action", "calc" );
- e.setAttribute( "type", TQString::tqfromLatin1( node->type()->fullName() ) );
+ e.setAttribute( "type", TQString::fromLatin1( node->type()->fullName() ) );
for ( uint i = 0; i < node->parents().size(); ++i )
{
int parent = node->parents()[i] + 1;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-19 20:53:19 +0000