diff options
Diffstat (limited to 'kig')
87 files changed, 312 insertions, 312 deletions
diff --git a/kig/filters/cabri-filter.cc b/kig/filters/cabri-filter.cc index 1413d56a..3cadf522 100644 --- a/kig/filters/cabri-filter.cc +++ b/kig/filters/cabri-filter.cc @@ -548,7 +548,7 @@ KigDocument* KigFilterCabri::load( const TQString& file ) } else { - notSupported( file, i18n( "This Cabri file tqcontains a \"%1\" object, " + notSupported( file, i18n( "This Cabri file contains a \"%1\" object, " "which Kig does not currently support." ).arg( obj.type ) ); return 0; } diff --git a/kig/filters/drgeo-filter-chooserbase.ui b/kig/filters/drgeo-filter-chooserbase.ui index c842721f..829d84cc 100644 --- a/kig/filters/drgeo-filter-chooserbase.ui +++ b/kig/filters/drgeo-filter-chooserbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KigFilterDrgeoChooserBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -30,10 +30,10 @@ <cstring>ExplanationTextLabel</cstring> </property> <property name="text"> - <string>The current Dr. Geo file tqcontains more than one figure. + <string>The current Dr. Geo file contains more than one figure. Please select which to import:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -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> @@ -131,7 +131,7 @@ Please select which to import:</string> </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistbox.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kig/filters/drgeo-filter.cc b/kig/filters/drgeo-filter.cc index d43c4729..82438a57 100644 --- a/kig/filters/drgeo-filter.cc +++ b/kig/filters/drgeo-filter.cc @@ -105,7 +105,7 @@ KigDocument* KigFilterDrgeo::load( const TQString& file ) } if ( figures.isEmpty() ) { if( nmacros > 0 ) - warning( i18n( "The Dr. Geo file \"%1\" is a macro file so it tqcontains no " + warning( i18n( "The Dr. Geo file \"%1\" is a macro file so it contains no " "figures." ).arg( file ) ); else warning( i18n( "There are no figures in Dr. Geo file \"%1\"." ).arg( file ) ); @@ -332,7 +332,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co else { // oc = fact->constrainedPointCalcer( parents[0], value ); - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -369,7 +369,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co type = ArcLineIntersectionType::instance(); else { - notSupported( file, i18n( "This Dr. Geo file tqcontains an intersection type, " + notSupported( file, i18n( "This Dr. Geo file contains an intersection type, " "which Kig does not currently support." ) ); return false; } @@ -386,7 +386,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co oc = new ObjectTypeCalcer( RotationType::instance(), parents ); else { - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -418,7 +418,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co type = CircleBCPType::instance(); else { - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -431,7 +431,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co type = ArcBTPType::instance(); else { - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -452,7 +452,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co } else { - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -468,7 +468,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co } else { - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -489,7 +489,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co oc = new ObjectTypeCalcer( RotationType::instance(), parents ); else { - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -617,7 +617,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co } else { - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -635,7 +635,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co } else { - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -676,7 +676,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co oc = fact->labelCalcer( text, Coordinate( x, y ), false, std::vector<ObjectCalcer*>(), *ret ); else { - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -688,7 +688,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co oc = fact->locusCalcer( parents[0], parents[1] ); else { - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -708,7 +708,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co #ifdef DRGEO_DEBUG kdDebug() << ">>>>>>>>> UNKNOWN OBJECT" << endl; #endif - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -747,8 +747,8 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co TQString ps = domelem.attribute( "style" ); int pointstyle = ObjectDrawer::pointStyleFromString( ps ); // show this object? - bool show = ( ( domelem.attribute( "tqmasked" ) != "True" ) && - ( domelem.attribute( "tqmasked" ) != "Alway" ) ); + bool show = ( ( domelem.attribute( "masked" ) != "True" ) && + ( domelem.attribute( "masked" ) != "Alway" ) ); // costructing the ObjectDrawer* ObjectDrawer* d = new ObjectDrawer( co, w, show, s, pointstyle ); // reading object name @@ -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 = Qt::black; diff --git a/kig/filters/drgeo-filter.h b/kig/filters/drgeo-filter.h index ddd2359e..9b0ef369 100644 --- a/kig/filters/drgeo-filter.h +++ b/kig/filters/drgeo-filter.h @@ -26,7 +26,7 @@ class KigDocument; class TQString; /** - * This is an import filter for the GNOME tqgeometry program DrGeo. + * This is an import filter for the GNOME geometry program DrGeo. */ class KigFilterDrgeo : public KigFilter 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/imageexporteroptionsbase.ui b/kig/filters/imageexporteroptionsbase.ui index ec126c96..03145dec 100644 --- a/kig/filters/imageexporteroptionsbase.ui +++ b/kig/filters/imageexporteroptionsbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ImageExporterOptionsBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -144,7 +144,7 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kig/filters/kgeo-filter.cc b/kig/filters/kgeo-filter.cc index 1ce9a27e..02c1efde 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 ); @@ -310,7 +310,7 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c } case ID_slope: { - // if parents tqcontains a segment, line, vector or whatever, we + // if parents contains a segment, line, vector or whatever, we // take its parents cause we want points.. if ( parents.size() == 1 ) parents = parents[0]->parents(); if ( parents.size() != 2 ) KIG_FILTER_PARSE_ERROR; diff --git a/kig/filters/kgeo-filter.h b/kig/filters/kgeo-filter.h index 0eb8d462..f8accd91 100644 --- a/kig/filters/kgeo-filter.h +++ b/kig/filters/kgeo-filter.h @@ -25,11 +25,11 @@ class KSimpleConfig; /** * This is an import filter for files generated by the program KGeo, - * which was an interactive tqgeometry program in kdeedu. Kig is + * which was an interactive geometry program in kdeedu. Kig is * 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/kgeo-resource.h b/kig/filters/kgeo-resource.h index ce149605..f7af0f64 100644 --- a/kig/filters/kgeo-resource.h +++ b/kig/filters/kgeo-resource.h @@ -51,7 +51,7 @@ #include <klocale.h> /////////////////////////////////////////////////////////////////// -// resource.h -- tqcontains macros used for commands +// resource.h -- contains macros used for commands /////////////////////////////////////////////////////////////////// diff --git a/kig/filters/kseg-filter.cc b/kig/filters/kseg-filter.cc index 5ad746b7..fb96c25c 100644 --- a/kig/filters/kseg-filter.cc +++ b/kig/filters/kseg-filter.cc @@ -67,7 +67,7 @@ bool KigFilterKSeg::supportMime( const TQString& mime ) struct drawstyle { - TQ_INT8 pointstyle; + Q_INT8 pointstyle; TQFont font; TQPen pen; TQBrush brush; @@ -556,19 +556,19 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) }; case G_CIRCLEINTERIOR: { - notSupported( file, i18n( "This KSeg file tqcontains a filled circle, " + notSupported( file, i18n( "This KSeg file contains a filled circle, " "which Kig does not currently support." ) ); return false; }; case G_ARCSECTOR: { - notSupported( file, i18n( "This KSeg file tqcontains an arc sector, " + notSupported( file, i18n( "This KSeg file contains an arc sector, " "which Kig does not currently support." ) ); return false; }; case G_ARCSEGMENT: { - notSupported( file, i18n( "This KSeg file tqcontains an arc segment, " + notSupported( file, i18n( "This KSeg file contains an arc segment, " "which Kig does not currently support." ) ); return false; }; @@ -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/latexexporter.cc b/kig/filters/latexexporter.cc index ce713771..98d3fc2e 100644 --- a/kig/filters/latexexporter.cc +++ b/kig/filters/latexexporter.cc @@ -194,7 +194,7 @@ void LatexExportImpVisitor::mapColor( TQColor color ) ColorMap newcolor; newcolor.color = color; TQString tmpname = color.name(); - tmpname.tqreplace( "#", "" ); + tmpname.replace( "#", "" ); newcolor.name = tmpname; mcolors.push_back( newcolor ); mstream << "\\newrgbcolor{" << tmpname << "}{" diff --git a/kig/filters/latexexporteroptions.ui b/kig/filters/latexexporteroptions.ui index e60614cd..d2e60c5b 100644 --- a/kig/filters/latexexporteroptions.ui +++ b/kig/filters/latexexporteroptions.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>LatexExporterOptions</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -63,7 +63,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> </includehints> </UI> diff --git a/kig/filters/native-filter.cc b/kig/filters/native-filter.cc index 2466d536..a5378263 100644 --- a/kig/filters/native-filter.cc +++ b/kig/filters/native-filter.cc @@ -140,7 +140,7 @@ KigDocument* KigFilterNative::load( const TQString& file ) TQStringList kigfiles = entries.grep( TQRegExp( "\\.kig$" ) ); if ( kigfiles.count() != 1 ) // I throw a generic parse error here, but I should warn the user that - // this kig archive file doesn't contain one kig file (it tqcontains no + // this kig archive file doesn't contain one kig file (it contains no // kig files or more than one). KIG_FILTER_PARSE_ERROR; const KArchiveEntry* kigz = dir->entry( kigfiles[0] ); @@ -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() ); diff --git a/kig/filters/svgexporteroptions.ui b/kig/filters/svgexporteroptions.ui index 7b346459..2de679cb 100644 --- a/kig/filters/svgexporteroptions.ui +++ b/kig/filters/svgexporteroptions.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SVGExporterOptions</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -55,7 +55,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> </includehints> </UI> diff --git a/kig/kfile/Makefile.am b/kig/kfile/Makefile.am index 2ca05840..b8de2d3d 100644 --- a/kig/kfile/Makefile.am +++ b/kig/kfile/Makefile.am @@ -10,11 +10,11 @@ kde_module_LTLIBRARIES = \ kfile_drgeo_la_SOURCES = kfile_drgeo.cpp kfile_drgeo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kfile_drgeo_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) +kfile_drgeo_la_LIBADD = $(LIB_KIO) kfile_kig_la_SOURCES = kfile_kig.cpp kfile_kig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kfile_kig_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) +kfile_kig_la_LIBADD = $(LIB_KIO) METASOURCES = AUTO diff --git a/kig/kfile/kfile_drgeo.cpp b/kig/kfile/kfile_drgeo.cpp index 3bd809db..b921131b 100644 --- a/kig/kfile/kfile_drgeo.cpp +++ b/kig/kfile/kfile_drgeo.cpp @@ -41,7 +41,7 @@ DrgeoPlugin::DrgeoPlugin( TQObject *parent, const char *name, const TQStringList item = addItemInfo( group, "NumOfMacros", i18n( "Macros" ), TQVariant::Int ); group_contents = addGroupInfo( info, "DrgeoContents", i18n( "Translators: what this drgeo " - "file tqcontains", "Contents" ) ); + "file contains", "Contents" ) ); } bool DrgeoPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ ) diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp index d54fe44e..ed954d26 100644 --- a/kig/kig/kig.cpp +++ b/kig/kig/kig.cpp @@ -111,7 +111,7 @@ void Kig::setupActions() #ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showtqStatusbar(this, TQT_SLOT(optionsShowtqStatusbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); #else createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); @@ -272,7 +272,7 @@ void Kig::fileOpen() if (!file_name.isEmpty()) openURL(file_name); } -// ifdef's disabled, cause Qt tqmoc doesn't handle ifdef's.. +// ifdef's disabled, cause Qt moc doesn't handle ifdef's.. // #ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES void Kig::optionsShowToolbar() { @@ -286,7 +286,7 @@ void Kig::optionsShowToolbar() #endif } -void Kig::optionsShowtqStatusbar() +void Kig::optionsShowStatusbar() { #ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES if (m_statusbarAction->isChecked()) diff --git a/kig/kig/kig.h b/kig/kig/kig.h index 3db8da16..51c236f2 100644 --- a/kig/kig/kig.h +++ b/kig/kig/kig.h @@ -114,10 +114,10 @@ class Kig : public KParts::MainWindow private slots: void fileNew(); void fileOpen(); - // Qt tqmoc doesn't handle ifdef's, so i'm disabling it.. + // Qt moc doesn't handle ifdef's, so i'm disabling it.. // #ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES void optionsShowToolbar(); - void optionsShowtqStatusbar(); + void optionsShowStatusbar(); // #endif // #if KDE_IS_VERSION( 3, 2, 90 ) void optionsConfigureKeys(); diff --git a/kig/kig/kig_document.cc b/kig/kig/kig_document.cc index 04f1e7fa..884b41c5 100644 --- a/kig/kig/kig_document.cc +++ b/kig/kig/kig_document.cc @@ -69,7 +69,7 @@ std::vector<ObjectHolder*> KigDocument::whatAmIOn( const Coordinate& p, const Ki for ( std::set<ObjectHolder*>::const_iterator i = mobjects.begin(); i != mobjects.end(); ++i ) { - if(!(*i)->tqcontains(p, w, mnightvision)) continue; + if(!(*i)->contains(p, w, mnightvision)) continue; if ( (*i)->imp()->inherits( PointImp::stype() ) ) ret.push_back( *i ); else if ( !(*i)->imp()->inherits( PolygonImp::stype() ) ) curves.push_back( *i ); diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp index 86aed687..1f891bb9 100644 --- a/kig/kig/kig_part.cpp +++ b/kig/kig/kig_part.cpp @@ -167,7 +167,7 @@ bool KigPrintDialogPage::isValid( TQString& ) return true; } -KigPart::KigPart( TQWidget *tqparentWidget, const char *, +KigPart::KigPart( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const TQStringList& ) : KParts::ReadWritePart( parent, name ), @@ -179,7 +179,7 @@ KigPart::KigPart( TQWidget *tqparentWidget, const char *, mMode = new NormalMode( *this ); // we need a widget, to actually show the document - m_widget = new KigView(this, false, tqparentWidget, "kig_view"); + m_widget = new KigView(this, false, parentWidget, "kig_view"); // notify the part that this is our internal widget setWidget( m_widget ); @@ -378,7 +378,7 @@ bool KigPart::openFile() // m_file is always local, so we can use findByPath instead of // findByURL... - KMimeType::Ptr mimeType = KMimeType::tqfindByPath ( m_file ); + KMimeType::Ptr mimeType = KMimeType::findByPath ( m_file ); kdDebug() << k_funcinfo << "mimetype: " << mimeType->name() << endl; KigFilter* filter = KigFilters::instance()->find( mimeType->name() ); if ( !filter ) @@ -429,7 +429,7 @@ bool KigPart::saveFile() { if ( m_file.isEmpty() || m_bTemp ) return internalSaveAs(); // mimetype: - KMimeType::Ptr mimeType = KMimeType::tqfindByPath ( m_file ); + KMimeType::Ptr mimeType = KMimeType::findByPath ( m_file ); if ( mimeType->name() != "application/x-kig" ) { // we don't support this mime type... @@ -930,7 +930,7 @@ extern "C" int convertToNative( const KURL& url, const TQCString& outfile ) return -1; }; - KMimeType::Ptr mimeType = KMimeType::tqfindByPath ( file ); + KMimeType::Ptr mimeType = KMimeType::findByPath ( file ); kdDebug() << k_funcinfo << "mimetype: " << mimeType->name() << endl; KigFilter* filter = KigFilters::instance()->find( mimeType->name() ); if ( !filter ) diff --git a/kig/kig/kig_part.h b/kig/kig/kig_part.h index 99ffdb97..3245f38b 100644 --- a/kig/kig/kig_part.h +++ b/kig/kig/kig_part.h @@ -65,7 +65,7 @@ public: /** * Default constructor */ - KigPart( TQWidget* tqparentWidget, const char* widgetName, + KigPart( TQWidget* parentWidget, const char* widgetName, TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); diff --git a/kig/kig/kig_view.cpp b/kig/kig/kig_view.cpp index a6c6495c..fbf16517 100644 --- a/kig/kig/kig_view.cpp +++ b/kig/kig/kig_view.cpp @@ -290,13 +290,13 @@ KigView::KigView( KigPart* part, TQWidget* parent, const char* name ) : TQWidget( parent, name ), - mtqlayout( 0 ), mrightscroll( 0 ), mbottomscroll( 0 ), + mlayout( 0 ), mrightscroll( 0 ), mbottomscroll( 0 ), mupdatingscrollbars( false ), mrealwidget( 0 ), mpart( part ) { connect( part, TQT_SIGNAL( recenterScreen() ), this, TQT_SLOT( slotInternalRecenterScreen() ) ); - mtqlayout = new TQGridLayout( this, 2, 2 ); + mlayout = new TQGridLayout( this, 2, 2 ); mrightscroll = new TQScrollBar( Vertical, this, "Right Scrollbar" ); // TODO: make this configurable... mrightscroll->setTracking( true ); @@ -310,11 +310,11 @@ KigView::KigView( KigPart* part, connect( mbottomscroll, TQT_SIGNAL( sliderReleased() ), this, TQT_SLOT( updateScrollBars() ) ); mrealwidget = new KigWidget( part, this, this, "Kig Widget", fullscreen ); - mtqlayout->addWidget( mbottomscroll, 1, 0 ); - mtqlayout->addWidget( mrealwidget, 0, 0 ); - mtqlayout->addWidget( mrightscroll, 0, 1 ); + mlayout->addWidget( mbottomscroll, 1, 0 ); + mlayout->addWidget( mrealwidget, 0, 0 ); + mlayout->addWidget( mrightscroll, 0, 1 ); - resize( tqsizeHint() ); + resize( sizeHint() ); mrealwidget->recenterScreen(); part->redrawScreen( mrealwidget ); updateScrollBars(); @@ -324,7 +324,7 @@ void KigView::updateScrollBars() { // we update the scrollbars to reflect the new "total size" of the // document... The total size is calced in entireDocumentRect(). - // ( it is calced as a rect that tqcontains all the points in the + // ( it is calced as a rect that contains all the points in the // document, and then enlarged a bit, and scaled to match the screen // width/height ratio... // What we do here is tell the scroll bars what they should show as @@ -336,7 +336,7 @@ void KigView::updateScrollBars() Rect er = mrealwidget->entireDocumentRect(); Rect sr = mrealwidget->screenInfo().shownRect(); - // we define the total rect to be the smallest rect that tqcontains + // we define the total rect to be the smallest rect that contains // both er and sr... er |= sr; @@ -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 fcd914a5..a60e3ee5 100644 --- a/kig/kig/kig_view.h +++ b/kig/kig/kig_view.h @@ -61,7 +61,7 @@ class KigWidget : public QWidget 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 @@ -228,7 +228,7 @@ class KigView { Q_OBJECT - TQGridLayout* mtqlayout; + TQGridLayout* mlayout; TQScrollBar* mrightscroll; TQScrollBar* mbottomscroll; diff --git a/kig/misc/argsparser.h b/kig/misc/argsparser.h index 2712cf40..001d9359 100644 --- a/kig/misc/argsparser.h +++ b/kig/misc/argsparser.h @@ -29,7 +29,7 @@ class ObjectImpType; * parents to ObjectCalcer's, and to put them in the correct order. * An ObjectType should construct an ArgsParser with a specification * of the arguments it wants. This specification is given as an array - * of ArgsParser::spec structs. This struct tqcontains a pointer to an + * of ArgsParser::spec structs. This struct contains a pointer to an * ObjectImpType ( which is the type you want the argument to have ), * a string ( which is an I18N_NOOP'd string describing what you will * be using the argument for ) and a boolean ( which says whether the diff --git a/kig/misc/builtin_stuff.cc b/kig/misc/builtin_stuff.cc index f02d89d7..e162e7ac 100644 --- a/kig/misc/builtin_stuff.cc +++ b/kig/misc/builtin_stuff.cc @@ -508,15 +508,15 @@ void setupBuiltinStuff() c = new TestConstructor( ContainsTestType::instance(), I18N_NOOP( "Contains Test" ), - I18N_NOOP( "Test whether a given curve tqcontains a given point" ), - "testqcontains" ); + I18N_NOOP( "Test whether a given curve contains a given point" ), + "testcontains" ); ctors->add( c ); - actions->add( new ConstructibleAction( c, "objects_new_tqcontainstest" ) ); + actions->add( new ConstructibleAction( c, "objects_new_containstest" ) ); c = new TestConstructor( InPolygonTestType::instance(), I18N_NOOP( "In Polygon Test" ), - I18N_NOOP( "Test whether a given polygon tqcontains a given point" ), + I18N_NOOP( "Test whether a given polygon contains a given point" ), "test" ); ctors->add( c ); actions->add( new ConstructibleAction( c, "objects_new_inpolygontest" ) ); diff --git a/kig/misc/calcpaths.cc b/kig/misc/calcpaths.cc index b2190303..1532715b 100644 --- a/kig/misc/calcpaths.cc +++ b/kig/misc/calcpaths.cc @@ -33,7 +33,7 @@ // I previously misunderstood the semantics of this function // and thought that the os vector had to be completed with all // the subtree generated by it. On the contrary, the os vector -// tqcontains *all* the objects that we want, we only have to +// contains *all* the objects that we want, we only have to // reorder them. Now it *should* work, however we postpone // activating this to a more proper moment @@ -105,7 +105,7 @@ std::vector<ObjectCalcer*> calcPath( const std::vector<ObjectCalcer*>& os ) std::vector<ObjectCalcer*> all = os; // tmp is the var containing the objects we're iterating over. The // first time around this is the os variable, the next time, this - // tqcontains the variables we added in the first round... + // contains the variables we added in the first round... std::vector<ObjectCalcer*> tmp = os; // tmp2 is a temporary var. During a round, it receives all the // variables we add ( to "all" ) in that round, and at the end of @@ -283,7 +283,7 @@ std::set<ObjectCalcer*> getAllChildren( const std::vector<ObjectCalcer*> objs ) std::set<ObjectCalcer*> cur( objs.begin(), objs.end() ); while( !cur.empty() ) { - // tqcontains the objects to iterate over the next time around... + // contains the objects to iterate over the next time around... std::set<ObjectCalcer*> next; for( std::set<ObjectCalcer*>::iterator i = cur.begin(); i != cur.end(); ++i ) diff --git a/kig/misc/common.cpp b/kig/misc/common.cpp index bc6f53d9..b41b9284 100644 --- a/kig/misc/common.cpp +++ b/kig/misc/common.cpp @@ -416,13 +416,13 @@ bool lineInRect( const Rect& r, const Coordinate& a, const Coordinate& b, //mp: the following test didn't work for vertical segments; // fortunately the ieee floating point standard allows us to avoid // the test altogether, since it would produce an infinity value that -// makes the final r.tqcontains to fail +// makes the final r.contains to fail // in any case the corresponding test for a.y - b.y was missing. // if ( fabs( a.x - b.x ) <= 1e-7 ) // { // // too small to be useful.. -// return r.tqcontains( Coordinate( a.x, r.center().y ), miss ); +// return r.contains( Coordinate( a.x, r.center().y ), miss ); // } // in case we have a segment we need also to check for the case when @@ -433,7 +433,7 @@ bool lineInRect( const Rect& r, const Coordinate& a, const Coordinate& b, // - if the midpoint is in the rect than returning true is safe (also // in the cases where we have a ray or a line) - if ( r.tqcontains( 0.5*( a + b ), miss ) ) return true; + if ( r.contains( 0.5*( a + b ), miss ) ) return true; Coordinate dir = b - a; double m = dir.y / dir.x; @@ -453,12 +453,12 @@ bool lineInRect( const Rect& r, const Coordinate& a, const Coordinate& b, // For each intersection, we now check if we contain the // intersection ( this might not be the case for a segment, when the // intersection is not between the begin and end point.. ) and if - // the rect tqcontains the intersection.. If it does, we have a winner.. + // the rect contains the intersection.. If it does, we have a winner.. return - ( imp->tqcontains( leftint, width, w ) && r.tqcontains( leftint, miss ) ) || - ( imp->tqcontains( rightint, width, w ) && r.tqcontains( rightint, miss ) ) || - ( imp->tqcontains( bottomint, width, w ) && r.tqcontains( bottomint, miss ) ) || - ( imp->tqcontains( topint, width, w ) && r.tqcontains( topint, miss ) ); + ( imp->contains( leftint, width, w ) && r.contains( leftint, miss ) ) || + ( imp->contains( rightint, width, w ) && r.contains( rightint, miss ) ) || + ( imp->contains( bottomint, width, w ) && r.contains( bottomint, miss ) ) || + ( imp->contains( topint, width, w ) && r.contains( topint, miss ) ); } bool operator==( const LineData& l, const LineData& r ) diff --git a/kig/misc/common.h b/kig/misc/common.h index a2b259c4..d1969df3 100644 --- a/kig/misc/common.h +++ b/kig/misc/common.h @@ -188,7 +188,7 @@ void calcBorderPoints( Coordinate& p1, Coordinate& p2, const Rect& r ); */ void calcBorderPoints( double& xa, double& xb, double& ya, double& yb, const Rect& r); /** - * cleaner overload, intended to tqreplace the above two... + * cleaner overload, intended to replace the above two... */ const LineData calcBorderPoints( const LineData& l, const Rect& r ); @@ -257,7 +257,7 @@ Coordinate calcCircleRadicalStartPoint( const Coordinate& ca, /** * Is the line, segment, ray or vector inside r ? We need the imp to * distinguish between rays, lines, segments or whatever.. ( we use - * their tqcontains functions actually.. ) + * their contains functions actually.. ) */ bool lineInRect( const Rect& r, const Coordinate& a, const Coordinate& b, const int width, const ObjectImp* imp, const KigWidget& w ); diff --git a/kig/misc/coordinate.cpp b/kig/misc/coordinate.cpp index e34f69db..f2c272f2 100644 --- a/kig/misc/coordinate.cpp +++ b/kig/misc/coordinate.cpp @@ -159,7 +159,7 @@ const Coordinate Coordinate::normalize( double l ) const const Coordinate Coordinate::round() const { - return Coordinate( tqRound( x ), tqRound( y ) ); + return Coordinate( qRound( x ), qRound( y ) ); } TQPoint Coordinate::toQPoint() const diff --git a/kig/misc/coordinate_system.cpp b/kig/misc/coordinate_system.cpp index 9b5ebd3a..859ed81d 100644 --- a/kig/misc/coordinate_system.cpp +++ b/kig/misc/coordinate_system.cpp @@ -101,7 +101,7 @@ TQValidator::State CoordinateValidator::validate( TQString & input, int & pos ) void CoordinateValidator::fixup( TQString & input ) const { - int nsc = input.tqcontains( ';' ); + int nsc = input.contains( ';' ); if ( nsc > 1 ) { // where is the second ';' @@ -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 )" ).arg( xs ).arg( ys ); + return TQString::fromLatin1( "( %1; %2 )" ).arg( xs ).arg( 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° )").arg( rs ).arg( ts ); + return TQString::fromLatin1("( %1; %2° )").arg( rs ).arg( ts ); } TQString PolarCoords::coordinateFormatNotice() const @@ -608,8 +608,8 @@ Coordinate EuclideanCoords::snapToGrid( const Coordinate& c, const double hgraphmin = ceil( hmin / hd) * hd; const double vgraphmin = ceil( vmin / vd ) * vd; - const double nx = tqRound( ( c.x - hgraphmin ) / hd ) * hd + hgraphmin; - const double ny = tqRound( ( c.y - vgraphmin ) / vd ) * vd + vgraphmin; + const double nx = qRound( ( c.x - hgraphmin ) / hd ) * hd + hgraphmin; + const double ny = qRound( ( c.y - vgraphmin ) / vd ) * vd + vgraphmin; return Coordinate( nx, ny ); } @@ -643,7 +643,7 @@ Coordinate PolarCoords::snapToGrid( const Coordinate& c, double d = kigMin( hd, vd ); double dist = c.length(); - double ndist = tqRound( dist / d ) * d; + double ndist = qRound( dist / d ) * d; return c.normalize( ndist ); } diff --git a/kig/misc/guiaction.cc b/kig/misc/guiaction.cc index 55d908bd..c9435d2b 100644 --- a/kig/misc/guiaction.cc +++ b/kig/misc/guiaction.cc @@ -93,7 +93,7 @@ KigGUIAction::KigGUIAction( GUIAction* act, { setWhatsThis( act->description() ); TQString tooltip = act->descriptiveName(); - tooltip.tqreplace( TQRegExp( "&&" ), "&" ); + tooltip.replace( TQRegExp( "&&" ), "&" ); setToolTip( tooltip ); } @@ -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 9f070813..ea0aeb66 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( NoFocus ); -// d->m_textEdit->tqsetAlignment( d->m_textEdit->tqalignment() | Qt::WordBreak ); +// d->m_textEdit->setAlignment( d->m_textEdit->alignment() | Qt::WordBreak ); d->m_textEdit->setFrameStyle( TQFrame::NoFrame ); mainlay->addWidget( d->m_textEdit ); diff --git a/kig/misc/kignumerics.cpp b/kig/misc/kignumerics.cpp index 6ff414c6..4711d058 100644 --- a/kig/misc/kignumerics.cpp +++ b/kig/misc/kignumerics.cpp @@ -331,7 +331,7 @@ bool GaussianElimination( double *matrix[], int numrows, /* * solve an undetermined homogeneous triangular system. the matrix is nonzero * on its diagonal. The last unknown(s) are chosen to be 1. The - * vector "exchange" tqcontains exchanges to be performed on the + * vector "exchange" contains exchanges to be performed on the * final solution components. */ diff --git a/kig/misc/kigpainter.cpp b/kig/misc/kigpainter.cpp index 57a1df06..98594ecb 100644 --- a/kig/misc/kigpainter.cpp +++ b/kig/misc/kigpainter.cpp @@ -374,7 +374,7 @@ void KigPainter::circleOverlayRecurse( const Coordinate& centre, // too near to the centre if (distmaxsq < radiussq) return; - // the rect tqcontains some of the circle + // the rect contains some of the circle // -> if it's small enough, we keep it if( currentRect.width() < overlayRectSize() ) { mOverlay.push_back( toScreenEnlarge( currentRect) ); @@ -735,10 +735,10 @@ void KigPainter::drawCurve( const CurveImp* curve ) TQPen pen = mP.pen(); - // this stack tqcontains pairs of Coordinates ( parameter intervals ) + // this stack contains pairs of Coordinates ( parameter intervals ) // that we still need to process: std::stack<workitem> workstack; - // mp: this stack tqcontains all the generated overlays: + // mp: this stack contains all the generated overlays: // the strategy for generating the overlay structure is the same // recursive-like used to draw the segments: a new rectangle is // generated whenever the length of a segment becomes lower than @@ -758,7 +758,7 @@ void KigPainter::drawCurve( const CurveImp* curve ) std::stack<Rect> overlaystack; // mp: the original version in which an initial set of 20 intervals - // were pushed onto the stack is tqreplaced by a single interval and + // were pushed onto the stack is replaced by a single interval and // by forcing subdivision till h < hmax (with more or less the same // final result). // First push the [0,1] interval into the stack: @@ -835,7 +835,7 @@ void KigPainter::drawCurve( const CurveImp* curve ) bool dooverlay = ! overlaypt && h < hmaxoverlay && valid0 && valid1 && fabs( p0.x - p1.x ) <= overlayRectSize() && fabs( p0.y - p1.y ) <= overlayRectSize(); - bool addn = sr.tqcontains( p2 ) || h >= hmax; + bool addn = sr.contains( p2 ) || h >= hmax; // estimated error between the curve and the segments double errsq = 1e21; if ( allvalid ) errsq = (0.5*p0 + 0.5*p1 - p2).squareLength(); @@ -870,10 +870,10 @@ void KigPainter::drawCurve( const CurveImp* curve ) else if ( h >= hmin ) // we do not continue to subdivide indefinitely! { // push into stack in order to process both subintervals - if ( addn || ( valid0 && sr.tqcontains( p0 ) ) ) + if ( addn || ( valid0 && sr.contains( p0 ) ) ) workstack.push( workitem( curitem.first, coordparampair( t2, p2 ), overlaypt ) ); - if ( addn || ( valid1 && sr.tqcontains( p1 ) ) ) + if ( addn || ( valid1 && sr.contains( p1 ) ) ) { curitem = workitem( coordparampair( t2, p2 ), curitem.second , overlaypt ); diff --git a/kig/misc/object_hierarchy.cc b/kig/misc/object_hierarchy.cc index b7e89456..c2365aaa 100644 --- a/kig/misc/object_hierarchy.cc +++ b/kig/misc/object_hierarchy.cc @@ -44,14 +44,14 @@ public: virtual void apply( std::vector<ObjectCalcer*>& stack, int loc ) const = 0; // this function is used to check whether the final objects depend - // on the given objects. The dependsstack tqcontains a set of + // on the given objects. The dependsstack contains a set of // booleans telling which parts of the hierarchy certainly depend on // the given objects. In this function, the node should check // whether any of its parents have true set, and if so, set its own // value to true. virtual void checkDependsOnGiven( std::vector<bool>& dependsstack, int loc ) const = 0; // this function is used to check whether the given objects are all - // used by one or more of the final objects. The usedstack tqcontains + // used by one or more of the final objects. The usedstack contains // a set of booleans telling which parts of the hierarchy are // certainly ancestors of the final objects. In this function, the // node should set all of its parents' booleans to true. @@ -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; @@ -696,7 +696,7 @@ const ObjectImpType* lowermost( const ObjectImpType* a, const ObjectImpType* b ) // this function is part of the visit procedure really. It is // factored out, because it recurses for cache ObjectImp's. What this // does is, it makes sure that object o is calcable, by putting -// appropriate Node's in mnodes.. po is o->parents() and pl tqcontains +// appropriate Node's in mnodes.. po is o->parents() and pl contains // the location of objects that are already in mnodes and -1 // otherwise.. -1 means we have to store their ObjectImp, unless // they're cache ObjectImp's etc. diff --git a/kig/misc/rect.cc b/kig/misc/rect.cc index c3f56d1e..183f50f8 100644 --- a/kig/misc/rect.cc +++ b/kig/misc/rect.cc @@ -211,7 +211,7 @@ double Rect::height() const return mheight; } -bool Rect::tqcontains( const Coordinate& p, double allowed_miss ) const +bool Rect::contains( const Coordinate& p, double allowed_miss ) const { return p.x - left() >= - allowed_miss && p.y - bottom() >= - allowed_miss && @@ -219,7 +219,7 @@ bool Rect::tqcontains( const Coordinate& p, double allowed_miss ) const p.y - bottom() - height() <= allowed_miss; } -bool Rect::tqcontains( const Coordinate& p ) const +bool Rect::contains( const Coordinate& p ) const { return p.x >= left() && p.y >= bottom() && diff --git a/kig/misc/rect.h b/kig/misc/rect.h index 24edebdd..1fe0b071 100644 --- a/kig/misc/rect.h +++ b/kig/misc/rect.h @@ -28,8 +28,8 @@ #include <kdebug.h> /** - * like Coordinate is a TQPoint tqreplacement with doubles, this is a - * TQRect tqreplacement with doubles... + * like Coordinate is a TQPoint replacement with doubles, this is a + * TQRect replacement with doubles... */ class Rect { @@ -85,7 +85,7 @@ public: Rect& operator/=( const double r ) { scale(1/r); return *this; } /** - * This expands the rect so that it tqcontains r. It has friends + * This expands the rect so that it contains r. It has friends * '|=' and '|' below... */ void eat( const Rect& r ); @@ -115,8 +115,8 @@ public: double top() const; double width() const; double height() const; - bool tqcontains( const Coordinate& p ) const; - bool tqcontains( const Coordinate& p, double allowed_miss ) const; + bool contains( const Coordinate& p ) const; + bool contains( const Coordinate& p, double allowed_miss ) const; bool intersects( const Rect& p ) const; Rect normalized() const; friend kdbgstream& operator<<( kdbgstream& s, const Rect& t ); @@ -131,7 +131,7 @@ protected: bool operator==( const Rect& r, const Rect& s ); kdbgstream& operator<<( kdbgstream& s, const Rect& t ); /** - * this operator returns a Rect that tqcontains both the given + * this operator returns a Rect that contains both the given * rects.. */ Rect operator|( const Rect& lhs, const Rect& rhs ); diff --git a/kig/modes/base_mode.cc b/kig/modes/base_mode.cc index 86de684d..d968566b 100644 --- a/kig/modes/base_mode.cc +++ b/kig/modes/base_mode.cc @@ -46,9 +46,9 @@ void BaseMode::leftClicked( TQMouseEvent* e, KigWidget* v ) v->updateWidget(); mplc = e->pos(); - tqmoco = mdoc.document().whatAmIOn( v->fromScreen( mplc ), *v ); + moco = mdoc.document().whatAmIOn( v->fromScreen( mplc ), *v ); - if( tqmoco.empty() ) + if( moco.empty() ) { // clicked on an empty spot --> we show the rectangle for // selecting stuff... @@ -66,8 +66,8 @@ void BaseMode::leftClicked( TQMouseEvent* e, KigWidget* v ) void BaseMode::leftMouseMoved( TQMouseEvent* e, KigWidget* w ) { - if( !tqmoco.empty() && ( mplc - e->pos() ).manhattanLength() > 3 ) - dragObject( tqmoco, mplc, *w, + if( !moco.empty() && ( mplc - e->pos() ).manhattanLength() > 3 ) + dragObject( moco, mplc, *w, ( e->state() & (ShiftButton | ControlButton ) ) != 0 ); } @@ -79,16 +79,16 @@ void BaseMode::leftReleased( TQMouseEvent* e, KigWidget* v ) ObjectHolder* o = 0; bool keyCtrl = ( e->state() & ControlButton ) != 0; bool keyShift = ( e->state() & ShiftButton ) != 0; - if ( ! tqmoco.empty() ) + if ( ! moco.empty() ) { if ( keyShift ) { - int id = ObjectChooserPopup::getObjectFromList( e->pos(), v, tqmoco ); + int id = ObjectChooserPopup::getObjectFromList( e->pos(), v, moco ); if ( id >= 0 ) - o = tqmoco[id]; + o = moco[id]; } else - o = tqmoco.front(); + o = moco.front(); } leftClickedObject( o, e->pos(), *v, keyCtrl ); } @@ -100,7 +100,7 @@ void BaseMode::midClicked( TQMouseEvent* e, KigWidget* v ) v->updateWidget(); mplc = e->pos(); - tqmoco = mdoc.document().whatAmIOn( v->fromScreen( e->pos() ), *v ); + moco = mdoc.document().whatAmIOn( v->fromScreen( e->pos() ), *v ); } void BaseMode::midReleased( TQMouseEvent* e, KigWidget* v ) @@ -119,9 +119,9 @@ void BaseMode::rightClicked( TQMouseEvent* e, KigWidget* w ) w->setCursor( KCursor::arrowCursor() ); mplc = e->pos(); - tqmoco = mdoc.document().whatAmIOn( w->fromScreen( mplc ), *w ); + moco = mdoc.document().whatAmIOn( w->fromScreen( mplc ), *w ); - rightClicked( tqmoco, mplc, *w ); + rightClicked( moco, mplc, *w ); } void BaseMode::mouseMoved( TQMouseEvent* e, KigWidget* w ) @@ -151,7 +151,7 @@ void BaseMode::enableActions() std::vector<ObjectHolder*> BaseMode::oco() { - return tqmoco; + return moco; } TQPoint BaseMode::pointLocation() diff --git a/kig/modes/base_mode.h b/kig/modes/base_mode.h index 044b8b65..cb029abf 100644 --- a/kig/modes/base_mode.h +++ b/kig/modes/base_mode.h @@ -31,7 +31,7 @@ class BaseMode : public KigMode { TQPoint mplc; - std::vector<ObjectHolder*> tqmoco; + std::vector<ObjectHolder*> moco; void leftClicked( TQMouseEvent* e, KigWidget* v ); void leftMouseMoved( TQMouseEvent*, KigWidget* ); diff --git a/kig/modes/construct_mode.cc b/kig/modes/construct_mode.cc index 71488c12..b535ee5c 100644 --- a/kig/modes/construct_mode.cc +++ b/kig/modes/construct_mode.cc @@ -69,15 +69,15 @@ void BaseConstructMode::leftReleased( TQMouseEvent* e, KigWidget* v ) ObjectHolder* o = 0; bool keyCtrlOrShift = ( e->state() & ( ControlButton | ShiftButton) ) != 0; - std::vector<ObjectHolder*> tqmoco = oco(); - if ( ! tqmoco.empty() ) + std::vector<ObjectHolder*> moco = oco(); + if ( ! moco.empty() ) { std::vector<ObjectHolder*> goodargs; - if ( !tqmoco.empty() ) + if ( !moco.empty() ) { std::vector<ObjectHolder*>::const_iterator it; std::vector<ObjectCalcer*> testargs = getCalcers( mparents ); - for ( std::vector<ObjectHolder*>::const_iterator i = tqmoco.begin(); i != tqmoco.end(); ++i ) + for ( std::vector<ObjectHolder*>::const_iterator i = moco.begin(); i != moco.end(); ++i ) { it = std::find( mparents.begin(), mparents.end(), *i ); bool newdup = @@ -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 5e85bfca..0dc8129d 100644 --- a/kig/modes/edittypebase.ui +++ b/kig/modes/edittypebase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>EditTypeBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -43,7 +43,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -51,7 +51,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -125,7 +125,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <vbox> <property name="name"> @@ -152,7 +152,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -179,7 +179,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <hbox> <property name="name"> @@ -212,7 +212,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -275,7 +275,7 @@ <slot>okSlot()</slot> <slot>cancelSlot()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kig/modes/label.cc b/kig/modes/label.cc index 1bbc4ca9..578e15dd 100644 --- a/kig/modes/label.cc +++ b/kig/modes/label.cc @@ -391,7 +391,7 @@ void TextLabelModeBase::updateLinksLabel() d->wiz->myCustomWidget1->addText( s.mid( prevpos ), buf ); d->wiz->myCustomWidget1->applyEdit( buf ); - d->wiz->retqlayoutArgsPage(); + d->wiz->relayoutArgsPage(); d->wiz->resize( d->wiz->size() ); } diff --git a/kig/modes/linkslabel.cpp b/kig/modes/linkslabel.cpp index eba5409c..96a73a8f 100644 --- a/kig/modes/linkslabel.cpp +++ b/kig/modes/linkslabel.cpp @@ -33,7 +33,7 @@ using namespace std; class LinksLabel::Private { public: - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; std::vector<TQLabel*> labels; std::vector<KURLLabel*> urllabels; }; @@ -42,22 +42,22 @@ LinksLabel::LinksLabel( TQWidget* parent, const char* name ) : TQWidget( parent, name ) { p = new Private; - p->tqlayout = new TQHBoxLayout( this ); + p->layout = new TQHBoxLayout( this ); TQLabel* l = new TQLabel( TQString::fromUtf8( "Dit is een " ), this ); p->labels.push_back( l ); - p->tqlayout->addWidget( l ); + p->layout->addWidget( l ); KURLLabel* u = new KURLLabel( TQString::fromUtf8( "http://www.kde.org/" ), TQString::fromUtf8( "url"), this ); p->urllabels.push_back( u ); - p->tqlayout->addWidget( u ); + p->layout->addWidget( u ); l = new TQLabel( TQString::fromUtf8( " !" ), this ); p->labels.push_back( l ); - p->tqlayout->addWidget(l ); + p->layout->addWidget(l ); - p->tqlayout->activate(); + p->layout->activate(); } LinksLabel::~LinksLabel() @@ -99,8 +99,8 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf ) p->urllabels.clear(); p->labels.clear(); - delete p->tqlayout; - p->tqlayout = new TQHBoxLayout( this ); + delete p->layout; + p->layout = new TQHBoxLayout( this ); for ( LinksLabelEditBuf::vec::iterator i = buf.data.begin(); i != buf.data.end(); ++i ) { @@ -111,7 +111,7 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf ) KURLLabel* l = new KURLLabel( TQString::fromUtf8( "http://edu.kde.org/kig" ), i->second, this ); p->urllabels.push_back( l ); - p->tqlayout->addWidget( l ); + p->layout->addWidget( l ); connect( l, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( urlClicked() ) ); } else @@ -119,15 +119,15 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf ) // we need a normal label... TQLabel* l = new TQLabel( i->second, this ); p->labels.push_back( l ); - p->tqlayout->addWidget( l ); + p->layout->addWidget( l ); }; }; TQSpacerItem* spacer = new TQSpacerItem( 40, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - p->tqlayout->addItem( spacer ); + p->layout->addItem( spacer ); - p->tqlayout->activate(); + p->layout->activate(); std::for_each( p->urllabels.begin(), p->urllabels.end(), mem_fun( &TQWidget::show ) ); std::for_each( p->labels.begin(), p->labels.end(), mem_fun( &TQWidget::show ) ); 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/macrowizardbase.ui b/kig/modes/macrowizardbase.ui index 40d1dacb..d3929ad8 100644 --- a/kig/modes/macrowizardbase.ui +++ b/kig/modes/macrowizardbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>MacroWizardBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>4</x> <y>0</y> @@ -55,7 +55,7 @@ <property name="text"> <string>Select the "given" objects for your new macro and press "Next".</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -180,7 +180,7 @@ </vbox> </widget> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kig/modes/popup.cc b/kig/modes/popup.cc index 92d933ba..489b4985 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" ).arg( objs[0]->imp()->type()->translatedName() ).arg( objs[0]->name() ); + title = TQString::fromLatin1( "%1 %2" ).arg( objs[0]->imp()->type()->translatedName() ).arg( 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" ).arg( mobjs[i]->imp()->type()->translatedName() ).arg( mobjs[i]->name() ) + ? TQString::fromLatin1( "%1 %2" ).arg( mobjs[i]->imp()->type()->translatedName() ).arg( mobjs[i]->name() ) : mobjs[i]->imp()->type()->translatedName(), i ); } diff --git a/kig/modes/textlabelwizard.cc b/kig/modes/textlabelwizard.cc index 2f7a10ab..d562bbf3 100644 --- a/kig/modes/textlabelwizard.cc +++ b/kig/modes/textlabelwizard.cc @@ -81,15 +81,15 @@ void TextLabelWizard::linkClicked( int which ) mmode->linkClicked( which ); } -void TextLabelWizard::retqlayoutArgsPage() +void TextLabelWizard::relayoutArgsPage() { select_arguments_pageLayout->activate(); - tqrepaint(); + repaint(); } 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/textlabelwizard.h b/kig/modes/textlabelwizard.h index 357e83e0..bd51c1e0 100644 --- a/kig/modes/textlabelwizard.h +++ b/kig/modes/textlabelwizard.h @@ -34,7 +34,7 @@ public: void reject(); void accept(); - void retqlayoutArgsPage(); + void relayoutArgsPage(); private slots: void textChanged(); void linkClicked( int which ); diff --git a/kig/modes/textlabelwizardbase.ui b/kig/modes/textlabelwizardbase.ui index 4676ecac..4e195b0d 100644 --- a/kig/modes/textlabelwizardbase.ui +++ b/kig/modes/textlabelwizardbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>TextLabelWizardBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -34,7 +34,7 @@ <string>Enter the text for your label here and press "Next". If you want to show variable parts, then put %1, %2, ... at the appropriate places (e.g. "This segment is %1 units long.").</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -71,7 +71,7 @@ If you want to show variable parts, then put %1, %2, ... at the appropriate plac <property name="text"> <string>Now select the argument(s) you need. For every argument, click on it, select an object and a property in the Kig window, and click finish when you are done...</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -106,7 +106,7 @@ If you want to show variable parts, then put %1, %2, ... at the appropriate plac <data format="XPM.GZ" length="4462">789c9d97c76e24490e86effd1442f3d65870d2451a0ce6206f5adeb4cc620f8c34f2553225b5a4c1befb46927fe6a1d4c0ccac4287fa8a0c26834193f5dbb785b3fd9d856fbf7d799ec9ecba5ea8afe469e15bf3727ffffeeffffcf1e797af49b2d0ffc7d142f2f55f5fbe1ecc16ea85dde9a4ed81290045faa77ca49cf4ab67ba1e3953969173651ab9d4fdf1c8a27c3872ad7c3c72d3b32c2a67c3f3444636fbef23eb7e590267e68fcc4656395d8dacf6d938ef97eaef289781cddebdb2846fccff44b989ba58e3411f3dc75158e6df1d3889539517ca49bf54fe43398d1dec4f46567f685fd9c539f43fc025f80c1c3ce8d93f28e77185f8bf0c6cfae4c0b5f9c3c6e5c0542a4b5876fe13708df39d2bd7716372aa8c93c4e4723bb2f977aadc26ceec4bdb7310e6b0bfab9c2445ecd49f1370694cebca65d260ffa6711a41aef14d24e94cee6be3348e0ae5e9c8765f07ca3e8db17f0f9c825794eb3489351fe9bb7217e4969f29388bd51ee9fda5715a19730696b852fea95c6471647ca95cf64bcf43e0cef4657b647bfe6acf213d6bb32f9a9f5992b5a64f9a8f990b6cf9ecc15d6cf9acf6b2da55a8a75cb973dee4b2d1b38b5c05de02434e87e01aacfb351df5bebddea74b5c67f9c795711ea15e357e2ecde358fb87efc0a867df8cac728a074e62e527706afb59f3cf6583be5c28bb3c35f693812d1fbdc6dbe57966fec932d899ffa4f7e38adca17e34beaeca4b9c271a18f1d5fc739257b0d70d9c68be7bed7fcee7827ab91cd8e4740cf6b19d4ffb87ab07b9bf516e72d4a3ac821b9cef6e60d84f47367ded2fae1d9f7704f6163f79000ffde27660f387ed3c5dbf54dfeebb0bf6acbe6b706bfa5ef32f8f8b18f5bf0f463f20edb77956a4e68fbc80b3c4facd163847be6bfde72ec86dbeac82715fbc0286be683cf3bc081d44f7df80d344fb0b6b7de64581fb916765297263d6fccd9b7ee97e566e8b06cfdb1f59cf2bda2f8bbc2c11df0c5c41aefdb328ca22b1feb0012eedbce24736f91b18fb796d64eb87cb60817dcdafb07d906bfd14d22f659d8785ef97b2f6d7b2df6ef1d6fb2babaac6f92e8c25b27ecc1f239b7f3a5fca5a8678ea7c2d9bc0e6ef1238b3fca2c7814d5f4cbf9334b5f833384bed3c7a5f5514f4adbe2ec07962e7590457f06f6f649b977afe2a16f42f5e070bfc591e18f7a5f1a812a9e0df39d827da4fbd8c6ccfd7785569bf945f953371a9d5a3de67950bfa2d75c63eb2fb15bdcfaaf011e6c7263846bf8f4636f91618f3c7d3c0f047fb69550efab2074e12bd6fd27957553ec33c5b043bcc7f9d0795f818fdb501a3df8ae673e507ff69021eea37063bc45ffb73550736ff36c0a84f3e0317a86f8b5f139e6ffe1f821de6d9127898ff3be00a7c3ab2cd03e3d697560ff40016e47b3bb2e96bbd559d8f32bbff4b7065f193042c98873acf240af6adbf3c83c5f2954bb0c7bcd77c107d81d2fdebc63e33ff640aaecc9e1c8151df5c803dfaadc64b52dfa03ed64636ffb4ff4b2867f453ede7227586fcd3f9264ded91fffafe236d5da37fe83c91ceb7b9e5b7f6731ff92ed7f747d6fbf7e185cf58347e3e6932e47b3430fa893edf87d795c2fc3f003b67f5f902cec17abfde0dfa3c053b3c5ffb832fc2eb8fddcf233887fc195c801f46b6f3cdc02558fba72f7d2d1a7f7e321ee58fe0cad86bbff24dd3e2fe74fef836b0c6eb60d62fa6bf5e07b3419f853dd7dc70fb8bd5f1255fd90ed30f9f3c5ff30ddff21ddff384a7fcc08ffcc4cf61cdf8855ff9e79c7e1db4dff89d3f7891977899577895d7789d377893b7f83b6fcfe937bc13b477798ff7f9800ff928ac633ee11f7cca6761d7f99c7e1b3cb908da11c7413be1943376e153cc39175c72f549ff9e17c31744429e6a6aa8a58e2ee98aaee9866e7f617fc24b7417a4f734a1293dd0233dd133cd8285177aa5f9f3b63ca5377aa78f607b919668995682e62aadd17ab0b1419b9ff41f682b48bed336edd02eed05ed7d5ea3033a0cdf1ed1f127fd273ae123fa41a774a6b685cee982228a837e42e927fd47caf8985c38651eb40b2ac38e4a5842658a97fab33fd248cb87d2c9a55cc9b5dcc82d1fc99ddccb44a6f230af2f8ff224cf417f262ff22a3fe54ddee543166549966545567f617f4dd66523dc6b2c9bb225df655b7682f692ecca9eeccfe97772c09b722847722c27c1f3eb70f66bf9116c9fca999ccbc59cfe25bf4a143a5ef8992561324a78bd92522acf9ebc78efe7cf7b153276db37bef59dbff457fedadff85b7f27abfede4ffcd4cf9ff76faeff4fffefeff8c7f5fedfdfbffc0fa355c495</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>linkslabel.h</includehint> </includehints> diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp index 92755113..e14ceee8 100644 --- a/kig/modes/typesdialog.cpp +++ b/kig/modes/typesdialog.cpp @@ -106,8 +106,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 cab548a4..7cc7effb 100644 --- a/kig/modes/typesdialogbase.ui +++ b/kig/modes/typesdialogbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>TypesDialogBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -30,7 +30,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -90,7 +90,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -98,7 +98,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -147,7 +147,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -228,7 +228,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -323,7 +323,7 @@ <slot access="protected">contextMenuRequested( QListViewItem* i, const QPoint& p, int c )</slot> <slot>cancelSlot()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kig/objects/bogus_imp.cc b/kig/objects/bogus_imp.cc index 8cedc89f..b7b8f41e 100644 --- a/kig/objects/bogus_imp.cc +++ b/kig/objects/bogus_imp.cc @@ -32,7 +32,7 @@ void BogusImp::draw( KigPainter& ) const { } -bool BogusImp::tqcontains( const Coordinate&, int, const KigWidget& ) const +bool BogusImp::contains( const Coordinate&, int, const KigWidget& ) const { return false; } diff --git a/kig/objects/bogus_imp.h b/kig/objects/bogus_imp.h index 3ab32809..c8f3ee2b 100644 --- a/kig/objects/bogus_imp.h +++ b/kig/objects/bogus_imp.h @@ -46,7 +46,7 @@ public: Coordinate attachPoint( ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& w ) const; + bool contains( const Coordinate& p, int width, const KigWidget& w ) const; bool inRect( const Rect& r, int width, const KigWidget& w ) const; Rect surroundingRect() const; diff --git a/kig/objects/centerofcurvature_type.cc b/kig/objects/centerofcurvature_type.cc index 628ed571..8111410f 100644 --- a/kig/objects/centerofcurvature_type.cc +++ b/kig/objects/centerofcurvature_type.cc @@ -66,7 +66,7 @@ ObjectImp* CocConicType::calc( const Args& args, const KigDocument& doc ) const const ConicImp* conic = static_cast<const ConicImp*>( args[0] ); const Coordinate& p = static_cast<const PointImp*>( args[1] )->coordinate(); - if ( !conic->tqcontainsPoint( p, doc ) ) + if ( !conic->containsPoint( p, doc ) ) return new InvalidImp; double x = p.x; @@ -152,7 +152,7 @@ ObjectImp* CocCubicType::calc( const Args& args, const KigDocument& doc ) const const CubicImp* cubic = static_cast<const CubicImp*>( args[0] ); const Coordinate& p = static_cast<const PointImp*>( args[1] )->coordinate(); - if ( !cubic->tqcontainsPoint( p, doc ) ) + if ( !cubic->containsPoint( p, doc ) ) return new InvalidImp; double x = p.x; @@ -234,7 +234,7 @@ ObjectImp* CocCurveType::calc( const Args& args, const KigDocument& doc ) const const CurveImp* curve = static_cast<const CurveImp*>( args[0] ); const Coordinate& p = static_cast<const PointImp*>( args[1] )->coordinate(); - if ( !curve->tqcontainsPoint( p, doc ) ) + if ( !curve->containsPoint( p, doc ) ) return new InvalidImp; diff --git a/kig/objects/circle_imp.cc b/kig/objects/circle_imp.cc index 86e6f978..38522c22 100644 --- a/kig/objects/circle_imp.cc +++ b/kig/objects/circle_imp.cc @@ -63,19 +63,19 @@ void CircleImp::draw( KigPainter& p ) const p.drawCircle( mcenter, mradius ); } -bool CircleImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool CircleImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { return fabs((mcenter - p).length() - mradius) <= w.screenInfo().normalMiss( width ); } bool CircleImp::inRect( const Rect& r, int width, const KigWidget& w ) const { - // first we check if the rect tqcontains at least one of the + // first we check if the rect contains at least one of the // north/south/east/west points of the circle - if ( r.tqcontains( mcenter + Coordinate( 0, -mradius ) ) ) return true; - if ( r.tqcontains( mcenter + Coordinate( mradius, 0 ) ) ) return true; - if ( r.tqcontains( mcenter + Coordinate( 0, mradius ) ) ) return true; - if ( r.tqcontains( mcenter + Coordinate( -mradius, 0 ) ) ) return true; + if ( r.contains( mcenter + Coordinate( 0, -mradius ) ) ) return true; + if ( r.contains( mcenter + Coordinate( mradius, 0 ) ) ) return true; + if ( r.contains( mcenter + Coordinate( 0, mradius ) ) ) return true; + if ( r.contains( mcenter + Coordinate( -mradius, 0 ) ) ) return true; // we allow a miss of some pixels .. double miss = w.screenInfo().normalMiss( width ); diff --git a/kig/objects/circle_imp.h b/kig/objects/circle_imp.h index 98fa391d..1ccede6a 100644 --- a/kig/objects/circle_imp.h +++ b/kig/objects/circle_imp.h @@ -46,7 +46,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; bool valid() const; Rect surroundingRect() const; diff --git a/kig/objects/conic_imp.cc b/kig/objects/conic_imp.cc index c06f05f8..81331522 100644 --- a/kig/objects/conic_imp.cc +++ b/kig/objects/conic_imp.cc @@ -47,7 +47,7 @@ bool ConicImp::valid() const return true; } -bool ConicImp::tqcontains( const Coordinate& o, int width, const KigWidget& w ) const +bool ConicImp::contains( const Coordinate& o, int width, const KigWidget& w ) const { return internalContainsPoint( o, w.screenInfo().normalMiss( width ) ); } @@ -332,7 +332,7 @@ const ObjectImpType* ConicImp::type() const return ConicImp::stype(); } -bool ConicImp::tqcontainsPoint( const Coordinate& p, const KigDocument& ) const +bool ConicImp::containsPoint( const Coordinate& p, const KigDocument& ) const { const ConicPolarData d = polarData(); diff --git a/kig/objects/conic_imp.h b/kig/objects/conic_imp.h index 3562422f..29068a7b 100644 --- a/kig/objects/conic_imp.h +++ b/kig/objects/conic_imp.h @@ -51,7 +51,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; bool valid() const; Rect surroundingRect() const; @@ -116,7 +116,7 @@ public: bool equals( const ObjectImp& rhs ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const; + bool containsPoint( const Coordinate& p, const KigDocument& doc ) const; bool internalContainsPoint( const Coordinate& p, double threshold ) const; }; diff --git a/kig/objects/cubic_imp.cc b/kig/objects/cubic_imp.cc index f5a86ef8..3879c5d9 100644 --- a/kig/objects/cubic_imp.cc +++ b/kig/objects/cubic_imp.cc @@ -50,7 +50,7 @@ void CubicImp::draw( KigPainter& p ) const p.drawCurve( this ); } -bool CubicImp::tqcontains( const Coordinate& o, int width, const KigWidget& w ) const +bool CubicImp::contains( const Coordinate& o, int width, const KigWidget& w ) const { return internalContainsPoint( o, w.screenInfo().normalMiss( width ) ); } @@ -363,7 +363,7 @@ const ObjectImpType* CubicImp::stype() return &t; } -bool CubicImp::tqcontainsPoint( const Coordinate& p, const KigDocument& ) const +bool CubicImp::containsPoint( const Coordinate& p, const KigDocument& ) const { return internalContainsPoint( p, test_threshold ); } @@ -431,7 +431,7 @@ TQString CubicImp::cartesianEquationString( const KigDocument& ) const ret = ret.arg( mdata.coeffs[0], 0, 'g', 3 ); // we should find a common place to do this... - ret.tqreplace( "+ -", "- " ); - ret.tqreplace( "+-", "-" ); + ret.replace( "+ -", "- " ); + ret.replace( "+-", "-" ); return ret; } diff --git a/kig/objects/cubic_imp.h b/kig/objects/cubic_imp.h index ab7434a2..5e9e6a2c 100644 --- a/kig/objects/cubic_imp.h +++ b/kig/objects/cubic_imp.h @@ -40,7 +40,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; Rect surroundingRect() const; TQString cartesianEquationString( const KigDocument& ) const; @@ -74,7 +74,7 @@ public: bool equals( const ObjectImp& rhs ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const; + bool containsPoint( const Coordinate& p, const KigDocument& doc ) const; bool internalContainsPoint( const Coordinate& p, double threshold ) const; }; diff --git a/kig/objects/curve_imp.h b/kig/objects/curve_imp.h index a0b130cc..3a33a722 100644 --- a/kig/objects/curve_imp.h +++ b/kig/objects/curve_imp.h @@ -51,12 +51,12 @@ public: virtual CurveImp* copy() const = 0; /** - * Return whether this Curve tqcontains the given point. This is + * Return whether this Curve contains the given point. This is * implemented as a numerical approximation. Implementations * can/should use the value test_threshold in common.h as a * threshold value. */ - virtual bool tqcontainsPoint( const Coordinate& p, const KigDocument& ) const = 0; + virtual bool containsPoint( const Coordinate& p, const KigDocument& ) const = 0; }; #endif diff --git a/kig/objects/intersection_types.cc b/kig/objects/intersection_types.cc index 7305ba3d..804d498d 100644 --- a/kig/objects/intersection_types.cc +++ b/kig/objects/intersection_types.cc @@ -172,8 +172,8 @@ ObjectImp* LineLineIntersectionType::calc( const Args& parents, const KigDocumen calcIntersectionPoint( static_cast<const AbstractLineImp*>( parents[0] )->data(), static_cast<const AbstractLineImp*>( parents[1] )->data() ); - if ( static_cast<const AbstractLineImp*>( parents[0] )->tqcontainsPoint( p, d ) && - static_cast<const AbstractLineImp*>( parents[1] )->tqcontainsPoint( p, d ) ) + if ( static_cast<const AbstractLineImp*>( parents[0] )->containsPoint( p, d ) && + static_cast<const AbstractLineImp*>( parents[1] )->containsPoint( p, d ) ) return new PointImp( p ); else return new InvalidImp(); } diff --git a/kig/objects/line_imp.cc b/kig/objects/line_imp.cc index 6f5b176f..a49078a1 100644 --- a/kig/objects/line_imp.cc +++ b/kig/objects/line_imp.cc @@ -197,7 +197,7 @@ void SegmentImp::draw( KigPainter& p ) const p.drawSegment( mdata ); } -bool SegmentImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool SegmentImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { return internalContainsPoint( p, w.screenInfo().normalMiss( width ) ); } @@ -207,7 +207,7 @@ void RayImp::draw( KigPainter& p ) const p.drawRay( mdata ); } -bool RayImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool RayImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { return internalContainsPoint( p, w.screenInfo().normalMiss( width ) ); } @@ -217,7 +217,7 @@ void LineImp::draw( KigPainter& p ) const p.drawLine( mdata ); } -bool LineImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool LineImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { return internalContainsPoint( p, w.screenInfo().normalMiss( width ) ); } @@ -507,7 +507,7 @@ const ObjectImpType* LineImp::type() const return LineImp::stype(); } -bool SegmentImp::tqcontainsPoint( const Coordinate& p, const KigDocument& ) const +bool SegmentImp::containsPoint( const Coordinate& p, const KigDocument& ) const { return internalContainsPoint( p, test_threshold ); } @@ -517,7 +517,7 @@ bool SegmentImp::internalContainsPoint( const Coordinate& p, double threshold ) return isOnSegment( p, mdata.a, mdata.b, threshold ); } -bool RayImp::tqcontainsPoint( const Coordinate& p, const KigDocument& ) const +bool RayImp::containsPoint( const Coordinate& p, const KigDocument& ) const { return internalContainsPoint( p, test_threshold ); } @@ -527,7 +527,7 @@ bool RayImp::internalContainsPoint( const Coordinate& p, double threshold ) cons return isOnRay( p, mdata.a, mdata.b, threshold ); } -bool LineImp::tqcontainsPoint( const Coordinate& p, const KigDocument& ) const +bool LineImp::containsPoint( const Coordinate& p, const KigDocument& ) const { return internalContainsPoint( p, test_threshold ); } diff --git a/kig/objects/line_imp.h b/kig/objects/line_imp.h index 4d2319e5..b12c045d 100644 --- a/kig/objects/line_imp.h +++ b/kig/objects/line_imp.h @@ -99,7 +99,7 @@ public: SegmentImp( const LineData& d ); void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& si ) const; + bool contains( const Coordinate& p, int width, const KigWidget& si ) const; Rect surroundingRect() const; ObjectImp* transform( const Transformation& ) const; @@ -124,7 +124,7 @@ public: const ObjectImpType* type() const; void visit( ObjectImpVisitor* vtor ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const; + bool containsPoint( const Coordinate& p, const KigDocument& doc ) const; bool internalContainsPoint( const Coordinate& p, double threshold ) const; }; @@ -154,7 +154,7 @@ public: RayImp( const LineData& d ); void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& si ) const; + bool contains( const Coordinate& p, int width, const KigWidget& si ) const; Rect surroundingRect() const; ObjectImp* transform( const Transformation& ) const; @@ -167,7 +167,7 @@ public: const ObjectImpType* type() const; void visit( ObjectImpVisitor* vtor ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const; + bool containsPoint( const Coordinate& p, const KigDocument& doc ) const; bool internalContainsPoint( const Coordinate& p, double threshold ) const; }; @@ -195,7 +195,7 @@ public: */ LineImp( const LineData& d ); void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& si ) const; + bool contains( const Coordinate& p, int width, const KigWidget& si ) const; Rect surroundingRect() const; ObjectImp* transform( const Transformation& ) const; @@ -208,7 +208,7 @@ public: const ObjectImpType* type() const; void visit( ObjectImpVisitor* vtor ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const; + bool containsPoint( const Coordinate& p, const KigDocument& doc ) const; bool internalContainsPoint( const Coordinate& p, double threshold ) const; }; diff --git a/kig/objects/locus_imp.cc b/kig/objects/locus_imp.cc index a45159a7..edbdc88b 100644 --- a/kig/objects/locus_imp.cc +++ b/kig/objects/locus_imp.cc @@ -49,7 +49,7 @@ void LocusImp::draw( KigPainter& p ) const p.drawCurve( this ); } -bool LocusImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool LocusImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { return internalContainsPoint( p, w.screenInfo().normalMiss( width ), w.document() ); } @@ -372,7 +372,7 @@ const ObjectImpType* LocusImp::type() const return LocusImp::stype(); } -bool LocusImp::tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const +bool LocusImp::containsPoint( const Coordinate& p, const KigDocument& doc ) const { return internalContainsPoint( p, test_threshold, doc ); } diff --git a/kig/objects/locus_imp.h b/kig/objects/locus_imp.h index 19bd690f..568e0e7c 100644 --- a/kig/objects/locus_imp.h +++ b/kig/objects/locus_imp.h @@ -66,7 +66,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; Rect surroundingRect() const; bool inRect( const Rect& r, int width, const KigWidget& ) const; double getParam( const Coordinate& point, const KigDocument& ) const; @@ -89,7 +89,7 @@ public: bool equals( const ObjectImp& rhs ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& d ) const; + bool containsPoint( const Coordinate& p, const KigDocument& d ) const; bool internalContainsPoint( const Coordinate& p, double threshold, const KigDocument& doc ) const; }; diff --git a/kig/objects/object_drawer.cc b/kig/objects/object_drawer.cc index 89c2c976..f92fabe7 100644 --- a/kig/objects/object_drawer.cc +++ b/kig/objects/object_drawer.cc @@ -41,10 +41,10 @@ void ObjectDrawer::draw( const ObjectImp& imp, KigPainter& p, bool sel ) const } } -bool ObjectDrawer::tqcontains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv ) const +bool ObjectDrawer::contains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv ) const { bool shownornv = mshown || nv; - return shownornv && imp.tqcontains( pt, mwidth, w ); + return shownornv && imp.contains( pt, mwidth, w ); } bool ObjectDrawer::shown( ) const diff --git a/kig/objects/object_drawer.h b/kig/objects/object_drawer.h index c9c962dd..6206522e 100644 --- a/kig/objects/object_drawer.h +++ b/kig/objects/object_drawer.h @@ -64,11 +64,11 @@ public: */ void draw( const ObjectImp& imp, KigPainter& p, bool selected ) const; /** - * returns whether the object \p imp tqcontains coordinate \p p . This is + * returns whether the object \p imp contains coordinate \p p . This is * dependent on whether it is shown ( when it will never contain * anything ), and on its width.. */ - bool tqcontains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv = false ) const; + bool contains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv = false ) const; /** * returns whether the object \p imp is in the rectangle \p r . This is * dependent on whether it is shown and on its width.. diff --git a/kig/objects/object_holder.cc b/kig/objects/object_holder.cc index f3516eea..70e1100b 100644 --- a/kig/objects/object_holder.cc +++ b/kig/objects/object_holder.cc @@ -80,9 +80,9 @@ void ObjectHolder::draw( KigPainter& p, bool selected ) const mdrawer->draw( *imp(), p, selected ); } -bool ObjectHolder::tqcontains( const Coordinate& pt, const KigWidget& w, bool nv ) const +bool ObjectHolder::contains( const Coordinate& pt, const KigWidget& w, bool nv ) const { - return mdrawer->tqcontains( *imp(), pt, w, nv ); + return mdrawer->contains( *imp(), pt, w, nv ); } bool ObjectHolder::inRect( const Rect& r, const KigWidget& w ) const diff --git a/kig/objects/object_holder.h b/kig/objects/object_holder.h index 1d96e007..0afd3892 100644 --- a/kig/objects/object_holder.h +++ b/kig/objects/object_holder.h @@ -101,9 +101,9 @@ public: */ void draw( KigPainter& p, bool selected ) const; /** - * Returns whether this object tqcontains the point \p p . + * Returns whether this object contains the point \p p . */ - bool tqcontains( const Coordinate& p, const KigWidget& w, bool nv = false ) const; + bool contains( const Coordinate& p, const KigWidget& w, bool nv = false ) const; /** * Returns whether this object is in the rectangle \p r . */ diff --git a/kig/objects/object_imp.h b/kig/objects/object_imp.h index 8e12de26..eaf29328 100644 --- a/kig/objects/object_imp.h +++ b/kig/objects/object_imp.h @@ -268,7 +268,7 @@ public: virtual ObjectImp* transform( const Transformation& t ) const = 0; virtual void draw( KigPainter& p ) const = 0; - virtual bool tqcontains( const Coordinate& p, int width, + virtual bool contains( const Coordinate& p, int width, const KigWidget& si ) const = 0; virtual bool inRect( const Rect& r, int width, const KigWidget& si ) const = 0; @@ -327,7 +327,7 @@ public: virtual ObjectImp* copy() const = 0; // s is a string with at least one escape ( "%N" where N is a - // number ) somewhere. This function tqreplaces the first escape it + // number ) somewhere. This function replaces the first escape it // sees with the "value" of this imp ( using the TQString::arg // functions ). This is e.g. used by TextType to turn its variable // args into strings.. @@ -341,7 +341,7 @@ public: /** * Returns true if this ObjectImp is equal to rhs. * This function checks whether rhs is of the same ObjectImp type, - * and whether it tqcontains the same data as this ObjectImp. + * and whether it contains the same data as this ObjectImp. * \internal It is used e.g. by the KigCommand stuff to see what the * user has changed during a move.. */ diff --git a/kig/objects/object_imp_factory.cc b/kig/objects/object_imp_factory.cc index b422ccf1..65cd9c94 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::null; diff --git a/kig/objects/other_imp.cc b/kig/objects/other_imp.cc index f094b487..137a3e93 100644 --- a/kig/objects/other_imp.cc +++ b/kig/objects/other_imp.cc @@ -56,7 +56,7 @@ AngleImp::AngleImp( const Coordinate& pt, double start_angle_in_radials, { } -bool AngleImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool AngleImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { double radius = 50*w.screenInfo().pixelWidth(); @@ -73,7 +73,7 @@ bool AngleImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) bool AngleImp::inRect( const Rect& r, int width, const KigWidget& w ) const { // TODO ? - return r.tqcontains( mpoint, w.screenInfo().normalMiss( width ) ); + return r.contains( mpoint, w.screenInfo().normalMiss( width ) ); } Coordinate AngleImp::attachPoint() const @@ -179,7 +179,7 @@ void VectorImp::draw( KigPainter& p ) const p.drawVector( mdata.a, mdata.b ); } -bool VectorImp::tqcontains( const Coordinate& o, int width, const KigWidget& w ) const +bool VectorImp::contains( const Coordinate& o, int width, const KigWidget& w ) const { return internalContainsPoint( o, w.screenInfo().normalMiss( width ) ); } @@ -340,7 +340,7 @@ void ArcImp::draw( KigPainter& p ) const p.drawArc( mcenter, mradius, msa, ma ); } -bool ArcImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool ArcImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { return internalContainsPoint( p, w.screenInfo().normalMiss( width ) ); } @@ -614,7 +614,7 @@ const ObjectImpType* ArcImp::type() const return ArcImp::stype(); } -bool ArcImp::tqcontainsPoint( const Coordinate& p, const KigDocument& ) const +bool ArcImp::containsPoint( const Coordinate& p, const KigDocument& ) const { return internalContainsPoint( p, test_threshold ); } @@ -694,7 +694,7 @@ double VectorImp::getParam( const Coordinate& p, const KigDocument& ) const return ( ( pt - mdata.a ).length() ) / ( dir().length() ); } -bool VectorImp::tqcontainsPoint( const Coordinate& p, const KigDocument& ) const +bool VectorImp::containsPoint( const Coordinate& p, const KigDocument& ) const { return internalContainsPoint( p, test_threshold ); } diff --git a/kig/objects/other_imp.h b/kig/objects/other_imp.h index 204d63a1..8e716fa6 100644 --- a/kig/objects/other_imp.h +++ b/kig/objects/other_imp.h @@ -49,7 +49,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; Rect surroundingRect() const; @@ -113,7 +113,7 @@ public: double getParam( const Coordinate&, const KigDocument& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; Rect surroundingRect() const; @@ -153,7 +153,7 @@ public: bool equals( const ObjectImp& rhs ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const; + bool containsPoint( const Coordinate& p, const KigDocument& doc ) const; bool internalContainsPoint( const Coordinate& p, double threshold ) const; }; @@ -186,7 +186,7 @@ public: ObjectImp* transform( const Transformation& t ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& w ) const; + bool contains( const Coordinate& p, int width, const KigWidget& w ) const; bool inRect( const Rect& r, int width, const KigWidget& si ) const; Rect surroundingRect() const; bool valid() const; @@ -236,7 +236,7 @@ public: bool equals( const ObjectImp& rhs ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const; + bool containsPoint( const Coordinate& p, const KigDocument& doc ) const; bool internalContainsPoint( const Coordinate& p, double threshold ) const; }; diff --git a/kig/objects/point_imp.cc b/kig/objects/point_imp.cc index 57f8fe4a..539f98b3 100644 --- a/kig/objects/point_imp.cc +++ b/kig/objects/point_imp.cc @@ -42,7 +42,7 @@ void PointImp::draw( KigPainter& p ) const p.drawFatPoint( mc ); } -bool PointImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool PointImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { int twidth = width == -1 ? 5 : width; return (p - mc).length() - twidth*w.screenInfo().pixelWidth() < 0; @@ -51,7 +51,7 @@ bool PointImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) bool PointImp::inRect( const Rect& r, int width, const KigWidget& w ) const { double am = w.screenInfo().normalMiss( width ); - return r.tqcontains( mc, am ); + return r.contains( mc, am ); } const uint PointImp::numberOfProperties() const diff --git a/kig/objects/point_imp.h b/kig/objects/point_imp.h index 6a2db06f..dac0576c 100644 --- a/kig/objects/point_imp.h +++ b/kig/objects/point_imp.h @@ -54,7 +54,7 @@ public: void setCoordinate( const Coordinate& c ); void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; const uint numberOfProperties() const; diff --git a/kig/objects/point_type.cc b/kig/objects/point_type.cc index c443f099..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; @@ -514,7 +514,7 @@ ObjectImp* MeasureTransportType::calc( const Args& parents, const KigDocument& d { const LineImp* c = static_cast<const LineImp*>( parents[1] ); - if ( !c->tqcontainsPoint( p, doc ) ) + if ( !c->containsPoint( p, doc ) ) return new InvalidImp; const LineData line = c->data(); @@ -526,7 +526,7 @@ ObjectImp* MeasureTransportType::calc( const Args& parents, const KigDocument& d } else if ( parents[1]->inherits (CircleImp::stype()) ) { const CircleImp* c = static_cast<const CircleImp*>( parents[1] ); - if ( !c->tqcontainsPoint( p, doc ) ) + if ( !c->containsPoint( p, doc ) ) return new InvalidImp; double param = c->getParam( p, doc ); @@ -614,7 +614,7 @@ ObjectImp* MeasureTransportTypeOld::calc( const Args& parents, const KigDocument const CircleImp* c = static_cast<const CircleImp*>( parents[0] ); const Coordinate& p = static_cast<const PointImp*>( parents[1] )->coordinate(); - if ( !c->tqcontainsPoint( p, doc ) ) + if ( !c->containsPoint( p, doc ) ) return new InvalidImp; const SegmentImp* s = static_cast<const SegmentImp*>( parents[2] ); diff --git a/kig/objects/polygon_imp.cc b/kig/objects/polygon_imp.cc index c9c8fb11..08215bfb 100644 --- a/kig/objects/polygon_imp.cc +++ b/kig/objects/polygon_imp.cc @@ -159,12 +159,12 @@ bool PolygonImp::isInPolygon( const Coordinate& p ) const } #define selectpolygonwithinside 1 #ifdef selectpolygonwithinside -bool PolygonImp::tqcontains( const Coordinate& p, int, const KigWidget& ) const +bool PolygonImp::contains( const Coordinate& p, int, const KigWidget& ) const { return isInPolygon( p ); } #else -bool PolygonImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool PolygonImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { bool ret = false; uint reduceddim = mpoints.size() - 1; diff --git a/kig/objects/polygon_imp.h b/kig/objects/polygon_imp.h index 506ca245..9a25d516 100644 --- a/kig/objects/polygon_imp.h +++ b/kig/objects/polygon_imp.h @@ -53,7 +53,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; bool valid() const; Rect surroundingRect() const; diff --git a/kig/objects/tangent_type.cc b/kig/objects/tangent_type.cc index 15b78458..12ebda23 100644 --- a/kig/objects/tangent_type.cc +++ b/kig/objects/tangent_type.cc @@ -68,7 +68,7 @@ ObjectImp* TangentConicType::calc( const Args& args, const KigDocument& doc ) co const ConicImp* c = static_cast<const ConicImp*>( args[0] ); const Coordinate& p = static_cast<const PointImp*>( args[1] )->coordinate(); - if ( !c->tqcontainsPoint( p, doc ) ) + if ( !c->containsPoint( p, doc ) ) return new InvalidImp; bool ok; @@ -118,7 +118,7 @@ ObjectImp* TangentArcType::calc( const Args& args, const KigDocument& doc ) cons const ArcImp* arc = static_cast<const ArcImp*>( args[0] ); const Coordinate& p = static_cast<const PointImp*>( args[1] )->coordinate(); - if ( !arc->tqcontainsPoint( p, doc ) ) + if ( !arc->containsPoint( p, doc ) ) return new InvalidImp; Coordinate c = arc->center(); @@ -173,7 +173,7 @@ ObjectImp* TangentCubicType::calc( const Args& args, const KigDocument& doc ) co const CubicImp* cubic = static_cast<const CubicImp*>( args[0] ); const Coordinate& p = static_cast<const PointImp*>( args[1] )->coordinate(); - if ( !cubic->tqcontainsPoint( p, doc ) ) + if ( !cubic->containsPoint( p, doc ) ) return new InvalidImp; double x = p.x; @@ -243,7 +243,7 @@ ObjectImp* TangentCurveType::calc( const Args& args, const KigDocument& doc ) co const CurveImp* curve = static_cast<const CurveImp*>( args[0] ); const Coordinate& p = static_cast<const PointImp*>( args[1] )->coordinate(); - if ( !curve->tqcontainsPoint( p, doc ) ) + if ( !curve->containsPoint( p, doc ) ) return new InvalidImp; const double t = curve->getParam( p, doc ); diff --git a/kig/objects/tests_type.cc b/kig/objects/tests_type.cc index a2c65808..e85c111e 100644 --- a/kig/objects/tests_type.cc +++ b/kig/objects/tests_type.cc @@ -159,7 +159,7 @@ const ObjectImpType* AreCollinearType::resultId() const return TestResultImp::stype(); } -static const ArgsParser::spec tqcontainsTestArgsSpec[] = +static const ArgsParser::spec containsTestArgsSpec[] = { { PointImp::stype(), I18N_NOOP( "Check whether this point is on a curve" ), I18N_NOOP( "Select the point you want to test..." ), false }, @@ -170,7 +170,7 @@ static const ArgsParser::spec tqcontainsTestArgsSpec[] = KIG_INSTANTIATE_OBJECT_TYPE_INSTANCE( ContainsTestType ) ContainsTestType::ContainsTestType() - : ArgsParserObjectType( "ContainsTest", tqcontainsTestArgsSpec, 2 ) + : ArgsParserObjectType( "ContainsTest", containsTestArgsSpec, 2 ) { } @@ -190,8 +190,8 @@ ObjectImp* ContainsTestType::calc( const Args& parents, const KigDocument& doc ) const Coordinate& p = static_cast<const PointImp*>( parents[0] )->coordinate(); const CurveImp* c = static_cast<const CurveImp*>( parents[1] ); - if ( c->tqcontainsPoint( p, doc ) ) - return new TestResultImp( i18n( "This curve tqcontains the point." ) ); + if ( c->containsPoint( p, doc ) ) + return new TestResultImp( i18n( "This curve contains the point." ) ); else return new TestResultImp( i18n( "This curve does not contain the point." ) ); } @@ -237,7 +237,7 @@ ObjectImp* InPolygonTestType::calc( const Args& parents, const KigDocument& ) co const PolygonImp* pol = static_cast<const PolygonImp*>( parents[1] ); if ( pol->isInPolygon( p ) ) - return new TestResultImp( i18n( "This polygon tqcontains the point." ) ); + return new TestResultImp( i18n( "This polygon contains the point." ) ); else return new TestResultImp( i18n( "This polygon does not contain the point." ) ); } diff --git a/kig/objects/text_imp.cc b/kig/objects/text_imp.cc index e8feb7f0..32591c16 100644 --- a/kig/objects/text_imp.cc +++ b/kig/objects/text_imp.cc @@ -51,9 +51,9 @@ void TextImp::draw( KigPainter& p ) const p.drawTextFrame( mboundrect, mtext, mframe ); } -bool TextImp::tqcontains( const Coordinate& p, int, const KigWidget& ) const +bool TextImp::contains( const Coordinate& p, int, const KigWidget& ) const { - return mboundrect.tqcontains( p ); + return mboundrect.contains( p ); } bool TextImp::inRect( const Rect& r, int, const KigWidget& ) const diff --git a/kig/objects/text_imp.h b/kig/objects/text_imp.h index 54eb7647..54e33f79 100644 --- a/kig/objects/text_imp.h +++ b/kig/objects/text_imp.h @@ -30,7 +30,7 @@ class TextImp Coordinate mloc; bool mframe; // with this var, we keep track of the place we drew in, for use in - // the tqcontains() function.. + // the contains() function.. mutable Rect mboundrect; public: typedef ObjectImp Parent; @@ -44,7 +44,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; bool valid() const; Rect surroundingRect() const; diff --git a/kig/scripting/newscriptwizard.cc b/kig/scripting/newscriptwizard.cc index 28b6b337..de959ce2 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/newscriptwizardbase.ui b/kig/scripting/newscriptwizardbase.ui index 90713813..30117961 100644 --- a/kig/scripting/newscriptwizardbase.ui +++ b/kig/scripting/newscriptwizardbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>NewScriptWizardBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -34,7 +34,7 @@ <string>Select the argument objects ( if any ) in the Kig window and press "Next".</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -74,7 +74,7 @@ in the Kig window and press "Next".</string> </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextedit.h</includehint> </includehints> diff --git a/kig/scripting/script-common.cc b/kig/scripting/script-common.cc index 02364463..2eb2da81 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 " |