From 999f961ff5278b84c8ffd8a91addb9343e589cf0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:30:46 -0600 Subject: Rename old tq methods that no longer need a unique name --- kig/filters/drgeo-filter-chooserbase.ui | 2 +- kig/filters/drgeo-filter.cc | 2 +- kig/filters/filters-common.cc | 2 +- kig/filters/kgeo-filter.cc | 2 +- kig/filters/kgeo-filter.h | 2 +- kig/filters/kseg-filter.cc | 2 +- kig/filters/native-filter.cc | 10 +++++----- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'kig/filters') 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: Expanding - + 20 20 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 args2; args2.push_back( o->nameCalcer() ); - oc2 = fact->attachedLabelCalcer( TQString::tqfromLatin1( "%1" ), oc, + oc2 = fact->attachedLabelCalcer( TQString::fromLatin1( "%1" ), oc, static_cast( 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 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 args2; args2.push_back( object->nameCalcer() ); ObjectCalcer* oc2 = fact->attachedLabelCalcer( - TQString::tqfromLatin1( "%1" ), object->calcer(), + TQString::fromLatin1( "%1" ), object->calcer(), static_cast( 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; -- cgit v1.2.1