summaryrefslogtreecommitdiffstats
path: root/kig
diff options
context:
space:
mode:
Diffstat (limited to 'kig')
-rw-r--r--kig/filters/drgeo-filter-chooserbase.ui2
-rw-r--r--kig/filters/drgeo-filter.cc2
-rw-r--r--kig/filters/filters-common.cc2
-rw-r--r--kig/filters/kgeo-filter.cc2
-rw-r--r--kig/filters/kgeo-filter.h2
-rw-r--r--kig/filters/kseg-filter.cc2
-rw-r--r--kig/filters/native-filter.cc10
-rw-r--r--kig/kfile/kfile_kig.cpp4
-rw-r--r--kig/kig/kig_view.cpp10
-rw-r--r--kig/kig/kig_view.h2
-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
-rw-r--r--kig/modes/construct_mode.cc2
-rw-r--r--kig/modes/edittype.cc4
-rw-r--r--kig/modes/edittypebase.ui4
-rw-r--r--kig/modes/macrowizard.cc4
-rw-r--r--kig/modes/popup.cc8
-rw-r--r--kig/modes/textlabelwizard.cc4
-rw-r--r--kig/modes/typesdialog.cpp4
-rw-r--r--kig/modes/typesdialogbase.ui4
-rw-r--r--kig/objects/object_imp_factory.cc36
-rw-r--r--kig/objects/point_type.cc2
-rw-r--r--kig/scripting/newscriptwizard.cc4
-rw-r--r--kig/scripting/script-common.cc2
27 files changed, 78 insertions, 78 deletions
diff --git a/kig/filters/drgeo-filter-chooserbase.ui b/kig/filters/drgeo-filter-chooserbase.ui
index 1a9589b2..16c10b15 100644
--- a/kig/filters/drgeo-filter-chooserbase.ui
+++ b/kig/filters/drgeo-filter-chooserbase.ui
@@ -96,7 +96,7 @@ Please select which to import:</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kig/filters/drgeo-filter.cc b/kig/filters/drgeo-filter.cc
index 6596bf44..7acc2adf 100644
--- a/kig/filters/drgeo-filter.cc
+++ b/kig/filters/drgeo-filter.cc
@@ -770,7 +770,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
{
std::vector<ObjectCalcer*> args2;
args2.push_back( o->nameCalcer() );
- oc2 = fact->attachedLabelCalcer( TQString::tqfromLatin1( "%1" ), oc,
+ oc2 = fact->attachedLabelCalcer( TQString::fromLatin1( "%1" ), oc,
static_cast<const PointImp*>( oc->imp() )->coordinate(),
false, args2, *ret );
co = TQt::black;
diff --git a/kig/filters/filters-common.cc b/kig/filters/filters-common.cc
index 6ae6cef9..4ba24e9f 100644
--- a/kig/filters/filters-common.cc
+++ b/kig/filters/filters-common.cc
@@ -34,6 +34,6 @@ ObjectTypeCalcer* filtersConstructTextObject(
propo->calc( doc );
std::vector<ObjectCalcer*> args;
args.push_back( propo );
- return fact->labelCalcer( TQString::tqfromLatin1( "%1" ), c, needframe,
+ return fact->labelCalcer( TQString::fromLatin1( "%1" ), c, needframe,
args, doc );
}
diff --git a/kig/filters/kgeo-filter.cc b/kig/filters/kgeo-filter.cc
index 8d37a871..8849256b 100644
--- a/kig/filters/kgeo-filter.cc
+++ b/kig/filters/kgeo-filter.cc
@@ -130,7 +130,7 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c
elems.push_back( elem );
for ( const char* parent = parents.first(); parent; parent = parents.next() )
{
- int parentIndex = TQString::tqfromLatin1( parent ).toInt( &ok );
+ int parentIndex = TQString::fromLatin1( parent ).toInt( &ok );
if ( ! ok ) KIG_FILTER_PARSE_ERROR;
if ( parentIndex != 0 )
elems[i].parents.push_back( parentIndex - 1 );
diff --git a/kig/filters/kgeo-filter.h b/kig/filters/kgeo-filter.h
index e2317d1b..52107203 100644
--- a/kig/filters/kgeo-filter.h
+++ b/kig/filters/kgeo-filter.h
@@ -29,7 +29,7 @@ class KSimpleConfig;
* supposed to be its successor, and this import filter is part of my
* attempt to achieve that :)
*
- * tqStatus: a significant part of KGeo's format is supported, not all
+ * Status: a significant part of KGeo's format is supported, not all
* yet, though..
*/
class KigFilterKGeo
diff --git a/kig/filters/kseg-filter.cc b/kig/filters/kseg-filter.cc
index 7ddfcde4..286f23cd 100644
--- a/kig/filters/kseg-filter.cc
+++ b/kig/filters/kseg-filter.cc
@@ -636,7 +636,7 @@ KigDocument* KigFilterKSeg::load( const TQString& file )
std::vector<ObjectCalcer*> args2;
args2.push_back( object->nameCalcer() );
ObjectCalcer* oc2 = fact->attachedLabelCalcer(
- TQString::tqfromLatin1( "%1" ), object->calcer(),
+ TQString::fromLatin1( "%1" ), object->calcer(),
static_cast<const PointImp*>( object->imp() )->coordinate(),
false, args2, *retdoc );
oc2->calc( *retdoc );
diff --git a/kig/filters/native-filter.cc b/kig/filters/native-filter.cc
index d3323778..4c83c517 100644
--- a/kig/filters/native-filter.cc
+++ b/kig/filters/native-filter.cc
@@ -114,7 +114,7 @@ KigDocument* KigFilterNative::load( const TQString& file )
TQFile kigdoc( file );
#ifndef KIG_NO_COMPRESSED_FILES
bool iscompressed = false;
- if ( !file.tqendsWith( ".kig", false ) )
+ if ( !file.endsWith( ".kig", false ) )
{
// the file is compressed, so we have to decompress it and fetch the
// kig file inside it...
@@ -125,7 +125,7 @@ KigDocument* KigFilterNative::load( const TQString& file )
KIG_FILTER_PARSE_ERROR;
TQString tempname = file.section( '/', -1 );
- if ( file.tqendsWith( ".kigz", false ) )
+ if ( file.endsWith( ".kigz", false ) )
{
tempname.remove( TQRegExp( "\\.[Kk][Ii][Gg][Zz]$" ) );
}
@@ -642,7 +642,7 @@ bool KigFilterNative::save07( const KigDocument& kdoc, TQTextStream& stream )
TQDomElement drawelem = doc.createElement( "Draw" );
drawelem.setAttribute( "object", id );
drawelem.setAttribute( "color", d->color().name() );
- drawelem.setAttribute( "shown", TQString::tqfromLatin1( d->shown() ? "true" : "false" ) );
+ drawelem.setAttribute( "shown", TQString::fromLatin1( d->shown() ? "true" : "false" ) );
drawelem.setAttribute( "width", TQString::number( d->width() ) );
drawelem.setAttribute( "style", d->styleToString() );
drawelem.setAttribute( "point-style", d->pointStyleToString() );
@@ -683,7 +683,7 @@ bool KigFilterNative::save07( const KigDocument& data, const TQString& outfile )
return save07( data, stdoutstream );
}
#ifndef KIG_NO_COMPRESSED_FILES
- if ( !outfile.tqendsWith( ".kig", false ) )
+ if ( !outfile.endsWith( ".kig", false ) )
{
// the user wants to save a compressed file, so we have to save our kig
// file to a temp file and then compress it...
@@ -693,7 +693,7 @@ bool KigFilterNative::save07( const KigDocument& data, const TQString& outfile )
return false;
TQString tempname = outfile.section( '/', -1 );
- if ( outfile.tqendsWith( ".kigz", false ) )
+ if ( outfile.endsWith( ".kigz", false ) )
tempname.remove( TQRegExp( "\\.[Kk][Ii][Gg][Zz]$" ) );
else
return false;
diff --git a/kig/kfile/kfile_kig.cpp b/kig/kfile/kfile_kig.cpp
index 496a851f..7618d3b4 100644
--- a/kig/kfile/kfile_kig.cpp
+++ b/kig/kfile/kfile_kig.cpp
@@ -58,7 +58,7 @@ bool KigPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ )
TQString sfile = metainfo.path();
bool iscompressed = false;
TQFile f( sfile );
- if ( !sfile.tqendsWith( ".kig", false ) )
+ if ( !sfile.endsWith( ".kig", false ) )
{
iscompressed = true;
@@ -67,7 +67,7 @@ bool KigPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ )
return false;
TQString tempname = sfile.section( '/', -1 );
- if ( sfile.tqendsWith( ".kigz", false ) )
+ if ( sfile.endsWith( ".kigz", false ) )
{
tempname.remove( TQRegExp( "\\.[Kk][Ii][Gg][Zz]$" ) );
}
diff --git a/kig/kig/kig_view.cpp b/kig/kig/kig_view.cpp
index fe2da6e1..24f507d9 100644
--- a/kig/kig/kig_view.cpp
+++ b/kig/kig/kig_view.cpp
@@ -314,7 +314,7 @@ KigView::KigView( KigPart* part,
mtqlayout->addWidget( mrealwidget, 0, 0 );
mtqlayout->addWidget( mrightscroll, 0, 1 );
- resize( tqsizeHint() );
+ resize( sizeHint() );
mrealwidget->recenterScreen();
part->redrawScreen( mrealwidget );
updateScrollBars();
@@ -443,7 +443,7 @@ const KigDocument& KigWidget::document() const
return mpart->document();
}
-TQSize KigWidget::tqsizeHint() const
+TQSize KigWidget::sizeHint() const
{
return TQSize( 630, 450 );
}
@@ -508,9 +508,9 @@ void KigView::toggleFullScreen()
{
mrealwidget->setFullScreen( ! mrealwidget->isFullScreen() );
if ( mrealwidget->isFullScreen() )
- tqtopLevelWidget()->showFullScreen();
+ topLevelWidget()->showFullScreen();
else
- tqtopLevelWidget()->showNormal();
+ topLevelWidget()->showNormal();
}
void KigWidget::setFullScreen( bool f )
@@ -568,7 +568,7 @@ void KigWidget::zoomArea()
KigInputDialog::getTwoCoordinates( i18n( "Select Zoom Area" ),
i18n( "Select the zoom area by entering the coordinates of "
"the upper left corner and the lower right corner." ) +
- TQString::tqfromLatin1("<br>") +
+ TQString::fromLatin1("<br>") +
mpart->document().coordinateSystem().coordinateFormatNoticeMarkup(),
this, &ok, mpart->document(), &tl, &br );
if ( ok )
diff --git a/kig/kig/kig_view.h b/kig/kig/kig_view.h
index 6cda690b..e574d6f0 100644
--- a/kig/kig/kig_view.h
+++ b/kig/kig/kig_view.h
@@ -62,7 +62,7 @@ class KigWidget : public TQWidget
void paintEvent( TQPaintEvent* e );
void wheelEvent( TQWheelEvent* e );
void resizeEvent( TQResizeEvent* );
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
/**
* this is called to match a rect's dimensions to the dimensions of
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;
diff --git a/kig/modes/construct_mode.cc b/kig/modes/construct_mode.cc
index e9e2e5ad..f2d5f2ed 100644
--- a/kig/modes/construct_mode.cc
+++ b/kig/modes/construct_mode.cc
@@ -485,7 +485,7 @@ void TestConstructMode::leftClickedObject( ObjectHolder* o, const TQPoint& p,
std::vector<ObjectCalcer*> parents;
parents.push_back( new ObjectConstCalcer( new IntImp( test_has_frame_dflt ) ) );
parents.push_back( new ObjectConstCalcer( new PointImp( loc ) ) );
- parents.push_back( new ObjectConstCalcer( new StringImp( TQString::tqfromLatin1( "%1" ) ) ) );
+ parents.push_back( new ObjectConstCalcer( new StringImp( TQString::fromLatin1( "%1" ) ) ) );
assert( mresult->imp()->inherits( TestResultImp::stype() ) );
parents.push_back(
new ObjectPropertyCalcer(
diff --git a/kig/modes/edittype.cc b/kig/modes/edittype.cc
index d2f25a47..f4ed323e 100644
--- a/kig/modes/edittype.cc
+++ b/kig/modes/edittype.cc
@@ -50,8 +50,8 @@ EditType::~EditType()
void EditType::helpSlot()
{
- kapp->invokeHelp( TQString::tqfromLatin1( "working-with-types" ),
- TQString::tqfromLatin1( "kig" ) );
+ kapp->invokeHelp( TQString::fromLatin1( "working-with-types" ),
+ TQString::fromLatin1( "kig" ) );
}
void EditType::okSlot()
diff --git a/kig/modes/edittypebase.ui b/kig/modes/edittypebase.ui
index e69d9f13..91ff6df4 100644
--- a/kig/modes/edittypebase.ui
+++ b/kig/modes/edittypebase.ui
@@ -152,7 +152,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -212,7 +212,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kig/modes/macrowizard.cc b/kig/modes/macrowizard.cc
index 1b25c803..662e3a0d 100644
--- a/kig/modes/macrowizard.cc
+++ b/kig/modes/macrowizard.cc
@@ -85,6 +85,6 @@ void MacroWizard::accept()
void MacroWizard::slotHelpClicked()
{
- kapp->invokeHelp( TQString::tqfromLatin1( "defining-macros"),
- TQString::tqfromLatin1( "kig" ) );
+ kapp->invokeHelp( TQString::fromLatin1( "defining-macros"),
+ TQString::fromLatin1( "kig" ) );
}
diff --git a/kig/modes/popup.cc b/kig/modes/popup.cc
index 32280d62..321675c0 100644
--- a/kig/modes/popup.cc
+++ b/kig/modes/popup.cc
@@ -198,7 +198,7 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part,
else if ( single )
{
if ( !objs[0]->name().isNull() )
- title = TQString::tqfromLatin1( "%1 %2" ).tqarg( objs[0]->imp()->type()->translatedName() ).tqarg( objs[0]->name() );
+ title = TQString::fromLatin1( "%1 %2" ).tqarg( objs[0]->imp()->type()->translatedName() ).tqarg( objs[0]->name() );
else
title = objs[0]->imp()->type()->translatedName();
}
@@ -518,7 +518,7 @@ static void addNameLabel( ObjectCalcer* object, ObjectCalcer* namecalcer, const
object->imp()->inherits( CurveImp::stype() ) )
attachto = object;
ObjectHolder* label = ObjectFactory::instance()->attachedLabel(
- TQString::tqfromLatin1( "%1" ), attachto, loc, namelabelneedsframe, args, doc.document() );
+ TQString::fromLatin1( "%1" ), attachto, loc, namelabelneedsframe, args, doc.document() );
doc.addObject( label );
}
@@ -924,7 +924,7 @@ bool PropertiesActionsProvider::executeAction(
// /////// Coordinate c = Coordinate::invalidCoord();
Coordinate c = w.fromScreen( popup.plc() );
ObjectHolder* label = ObjectFactory::instance()->attachedLabel(
- TQString::tqfromLatin1( "%1" ), parent->calcer(), c,
+ TQString::fromLatin1( "%1" ), parent->calcer(), c,
false, args, doc.document() );
doc.addObject( label );
}
@@ -1182,7 +1182,7 @@ ObjectChooserPopup::ObjectChooserPopup( const TQPoint& p, KigWidget& view,
for ( uint i = 0; i < mobjs.size(); i++ )
{
insertItem( !mobjs[i]->name().isEmpty()
- ? TQString::tqfromLatin1( "%1 %2" ).tqarg( mobjs[i]->imp()->type()->translatedName() ).tqarg( mobjs[i]->name() )
+ ? TQString::fromLatin1( "%1 %2" ).tqarg( mobjs[i]->imp()->type()->translatedName() ).tqarg( mobjs[i]->name() )
: mobjs[i]->imp()->type()->translatedName(),
i );
}
diff --git a/kig/modes/textlabelwizard.cc b/kig/modes/textlabelwizard.cc
index e35e707a..8991a93c 100644
--- a/kig/modes/textlabelwizard.cc
+++ b/kig/modes/textlabelwizard.cc
@@ -89,7 +89,7 @@ void TextLabelWizard::relayoutArgsPage()
void TextLabelWizard::slotHelpClicked()
{
- kapp->invokeHelp( TQString::tqfromLatin1( "text-labels" ),
- TQString::tqfromLatin1( "kig" ) );
+ kapp->invokeHelp( TQString::fromLatin1( "text-labels" ),
+ TQString::fromLatin1( "kig" ) );
}
diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp
index df061888..b4336bf2 100644
--- a/kig/modes/typesdialog.cpp
+++ b/kig/modes/typesdialog.cpp
@@ -108,8 +108,8 @@ TypesDialog::~TypesDialog()
void TypesDialog::helpSlot()
{
- kapp->invokeHelp( TQString::tqfromLatin1( "working-with-types" ),
- TQString::tqfromLatin1( "kig" ) );
+ kapp->invokeHelp( TQString::fromLatin1( "working-with-types" ),
+ TQString::fromLatin1( "kig" ) );
}
void TypesDialog::okSlot()
diff --git a/kig/modes/typesdialogbase.ui b/kig/modes/typesdialogbase.ui
index 89f00986..347eb831 100644
--- a/kig/modes/typesdialogbase.ui
+++ b/kig/modes/typesdialogbase.ui
@@ -138,7 +138,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -228,7 +228,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kig/objects/object_imp_factory.cc b/kig/objects/object_imp_factory.cc
index a29cf5e8..1d466835 100644
--- a/kig/objects/object_imp_factory.cc
+++ b/kig/objects/object_imp_factory.cc
@@ -84,33 +84,33 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
parent.appendChild(
doc.createTextNode(
TQString::number( static_cast<const IntImp&>( d ).data() ) ) );
- return TQString::tqfromLatin1( "int" );
+ return TQString::fromLatin1( "int" );
}
else if ( d.inherits( DoubleImp::stype() ) )
{
parent.appendChild(
doc.createTextNode(
TQString::number( static_cast<const DoubleImp&>( d ).data() ) ) );
- return TQString::tqfromLatin1( "double" );
+ return TQString::fromLatin1( "double" );
}
else if( d.inherits( StringImp::stype() ) )
{
parent.appendChild(
doc.createTextNode(
static_cast<const StringImp&>( d ).data() ) );
- return TQString::tqfromLatin1( "string" );
+ return TQString::fromLatin1( "string" );
}
else if ( d.inherits( TestResultImp::stype() ) )
{
parent.appendChild(
doc.createTextNode(
static_cast<const TestResultImp&>( d ).data() ) );
- return TQString::tqfromLatin1( "testresult" );
+ return TQString::fromLatin1( "testresult" );
}
else if( d.inherits( HierarchyImp::stype() ) )
{
static_cast<const HierarchyImp&>( d ).data().serialize( parent, doc );
- return TQString::tqfromLatin1( "hierarchy" );
+ return TQString::fromLatin1( "hierarchy" );
}
else if ( d.inherits( TransformationImp::stype() ) )
{
@@ -135,7 +135,7 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
homothetye.appendChild( doc.createTextNode( ishomothety ) );
parent.appendChild( homothetye );
- return TQString::tqfromLatin1( "transformation" );
+ return TQString::fromLatin1( "transformation" );
}
else if( d.inherits( AbstractLineImp::stype() ) )
{
@@ -143,28 +143,28 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
addCoordinateElement( "a", l.a, parent, doc );
addCoordinateElement( "b", l.b, parent, doc );
if( d.inherits( SegmentImp::stype() ) )
- return TQString::tqfromLatin1( "segment" );
+ return TQString::fromLatin1( "segment" );
else if( d.inherits( RayImp::stype() ) )
- return TQString::tqfromLatin1( "ray" );
- else return TQString::tqfromLatin1( "line" );
+ return TQString::fromLatin1( "ray" );
+ else return TQString::fromLatin1( "line" );
}
else if( d.inherits( PointImp::stype() ) )
{
addXYElements( static_cast<const PointImp&>( d ).coordinate(),
parent, doc );
- return TQString::tqfromLatin1( "point" );
+ return TQString::fromLatin1( "point" );
}
else if( d.inherits( TextImp::stype() ) )
{
TQString text = static_cast<const TextImp&>( d ).text();
parent.appendChild(
doc.createTextNode( text ) );
- return TQString::tqfromLatin1( "text" );
+ return TQString::fromLatin1( "text" );
}
else if( d.inherits( AngleImp::stype() ) )
{
addDoubleElement( "size", static_cast<const AngleImp&>( d ).size(), parent, doc );
- return TQString::tqfromLatin1( "angle" );
+ return TQString::fromLatin1( "angle" );
}
else if ( d.inherits( ArcImp::stype() ) )
{
@@ -173,13 +173,13 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
addDoubleElement( "radius", a.radius(), parent, doc );
addDoubleElement( "startangle", a.startAngle(), parent, doc );
addDoubleElement( "angle", a.angle(), parent, doc );
- return TQString::tqfromLatin1( "arc" );
+ return TQString::fromLatin1( "arc" );
}
else if( d.inherits( VectorImp::stype() ) )
{
Coordinate dir = static_cast<const VectorImp&>( d ).dir();
addXYElements( dir, parent, doc );
- return TQString::tqfromLatin1( "vector" );
+ return TQString::fromLatin1( "vector" );
}
else if( d.inherits( LocusImp::stype() ) )
{
@@ -197,14 +197,14 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
locus.hierarchy().serialize( hier, doc );
parent.appendChild( hier );
- return TQString::tqfromLatin1( "locus" );
+ return TQString::fromLatin1( "locus" );
}
else if( d.inherits( CircleImp::stype() ) )
{
const CircleImp& c = static_cast<const CircleImp&>( d );
addCoordinateElement( "center", c.center(), parent, doc );
addDoubleElement( "radius", c.radius(), parent, doc );
- return TQString::tqfromLatin1( "circle" );
+ return TQString::fromLatin1( "circle" );
}
else if( d.inherits( ConicImp::stype() ) )
{
@@ -213,7 +213,7 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
addDoubleElement( "pdimen", data.pdimen, parent, doc );
addDoubleElement( "ecostheta0", data.ecostheta0, parent, doc );
addDoubleElement( "esintheta0", data.esintheta0, parent, doc );
- return TQString::tqfromLatin1( "conic" );
+ return TQString::fromLatin1( "conic" );
}
else if( d.inherits( CubicImp::stype() ) )
{
@@ -230,7 +230,7 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
addDoubleElement( "a122", data.coeffs[8], coeffs, doc );
addDoubleElement( "a222", data.coeffs[9], coeffs, doc );
parent.appendChild( coeffs );
- return TQString::tqfromLatin1( "cubic" );
+ return TQString::fromLatin1( "cubic" );
}
assert( false );
return TQString();
diff --git a/kig/objects/point_type.cc b/kig/objects/point_type.cc
index f1c59ac4..2acd8479 100644
--- a/kig/objects/point_type.cc
+++ b/kig/objects/point_type.cc
@@ -395,7 +395,7 @@ void FixedPointType::executeAction(
Coordinate oldc = static_cast<const PointImp*>( o.imp() )->coordinate();
KigInputDialog::getCoordinate(
i18n( "Set Coordinate" ),
- i18n( "Enter the new coordinate." ) + TQString::tqfromLatin1( "<br>" ) +
+ i18n( "Enter the new coordinate." ) + TQString::fromLatin1( "<br>" ) +
d.document().coordinateSystem().coordinateFormatNoticeMarkup(),
&w, &ok, d.document(), &oldc );
if ( ! ok ) break;
diff --git a/kig/scripting/newscriptwizard.cc b/kig/scripting/newscriptwizard.cc
index 255a6073..e2a8fe25 100644
--- a/kig/scripting/newscriptwizard.cc
+++ b/kig/scripting/newscriptwizard.cc
@@ -159,8 +159,8 @@ void NewScriptWizard::accept()
void NewScriptWizard::slotHelpClicked()
{
- kapp->invokeHelp( TQString::tqfromLatin1( "scripting" ),
- TQString::tqfromLatin1( "kig" ) );
+ kapp->invokeHelp( TQString::fromLatin1( "scripting" ),
+ TQString::fromLatin1( "kig" ) );
}
void NewScriptWizard::setText( const TQString& text )
diff --git a/kig/scripting/script-common.cc b/kig/scripting/script-common.cc
index 1f5d8c4a..fbdf0a54 100644
--- a/kig/scripting/script-common.cc
+++ b/kig/scripting/script-common.cc
@@ -44,7 +44,7 @@ TQString ScriptType::templateCode( ScriptType::Type type, std::list<ObjectHolder
{
if ( type == Python )
{
- TQString tempcode = TQString::tqfromLatin1( "def calc( " );
+ TQString tempcode = TQString::fromLatin1( "def calc( " );
bool firstarg = true;
TQString temparg = i18n( "Note to translators: this should be a default "
"name for an argument in a Python function. The "