diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | eb570158698cf61dad4f77d950ef908160f6c3cc (patch) | |
| tree | 649bf182bcf0a20bed5035d25ffd77de5aee138a /kig | |
| parent | d8762de95349dc6edaa34db9bf699b367c1af6b1 (diff) | |
| download | tdeedu-eb570158698cf61dad4f77d950ef908160f6c3cc.tar.gz tdeedu-eb570158698cf61dad4f77d950ef908160f6c3cc.zip | |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kig')
58 files changed, 323 insertions, 323 deletions
diff --git a/kig/ChangeLog b/kig/ChangeLog index 3cbd6c2f..af35b577 100644 --- a/kig/ChangeLog +++ b/kig/ChangeLog @@ -10,7 +10,7 @@ 2005-09-16 Pino Toscano <[email protected]> * Move a text label by (2,2), so the attached ones should be less - sticky to the "tqparent" object. + sticky to the "parent" object. 2005-09-08 Pino Toscano <[email protected]> @@ -1399,7 +1399,7 @@ * show an appropriate error when trying to open an non-existing file.. - * clean up the object tqparent-child relation mechanism. Rather + * clean up the object parent-child relation mechanism. Rather large code cleanup, that simplifies a lot of code.. Needed a backwards-compatible file format extension. This commit now also adds proper treatment of internal objects, because it no longer @@ -221,7 +221,7 @@ Next, an ObjectHierarchy object is constructed, which stores the way to calculate the second point from the first point and the objects from the previous paragraph. -An object is then constructed that has as tqparent the curve tqparent that +An object is then constructed that has as parent the curve parent that the first point is constrained to, the HierarchyImp containing the ObjectHierarchy from the previous paragraph, and all the objects from the "side of the tree". This new object is an ObjectTypeCalcer with diff --git a/kig/examples/figure_angle.fgeo b/kig/examples/figure_angle.fgeo index 6265e7e4..22db1113 100644 --- a/kig/examples/figure_angle.fgeo +++ b/kig/examples/figure_angle.fgeo @@ -14,17 +14,17 @@ <y>-0.216667</y> </point> <line id="822BC80" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> - <tqparent ref="827A5C0"/> - <tqparent ref="8248660"/> + <parent ref="827A5C0"/> + <parent ref="8248660"/> </line> <line id="8249A48" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> - <tqparent ref="822A6B0"/> - <tqparent ref="8248660"/> + <parent ref="822A6B0"/> + <parent ref="8248660"/> </line> <angle id="82B86D8" type="3pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> - <tqparent ref="822A6B0"/> - <tqparent ref="8248660"/> - <tqparent ref="827A5C0"/> + <parent ref="822A6B0"/> + <parent ref="8248660"/> + <parent ref="827A5C0"/> </angle> </drgeo> </drgenius> diff --git a/kig/examples/figure_manyobjects.fgeo b/kig/examples/figure_manyobjects.fgeo index 1e50da51..c03634e3 100644 --- a/kig/examples/figure_manyobjects.fgeo +++ b/kig/examples/figure_manyobjects.fgeo @@ -18,12 +18,12 @@ <y>1.883333</y> </point> <point id="8226648" type="Middle_2pts" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> - <tqparent ref="82257B8"/> - <tqparent ref="8255158"/> + <parent ref="82257B8"/> + <parent ref="8255158"/> </point> <halfLine id="8225B10" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> - <tqparent ref="8250D30"/> - <tqparent ref="8250458"/> + <parent ref="8250D30"/> + <parent ref="8250458"/> </halfLine> <point id="82043A0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-2.833333</x> @@ -38,12 +38,12 @@ <y>3.983333</y> </point> <segment id="82B0888" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> - <tqparent ref="82257B8"/> - <tqparent ref="82AED28"/> + <parent ref="82257B8"/> + <parent ref="82AED28"/> </segment> <line id="82B1B80" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> - <tqparent ref="82043A0"/> - <tqparent ref="8115668"/> + <parent ref="82043A0"/> + <parent ref="8115668"/> </line> <point id="82B26F0" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-5.533333</x> @@ -52,21 +52,21 @@ <vector id="82A3948" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> <Ox>-2.800000</Ox> <Oy>1.883333</Oy> - <tqparent ref="8255158"/> - <tqparent ref="82B26F0"/> + <parent ref="8255158"/> + <parent ref="82B26F0"/> </vector> <point id="82B4358" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>3.166667</x> <y>-0.683333</y> </point> <circle id="82B5918" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> - <tqparent ref="82B4358"/> - <tqparent ref="8115668"/> + <parent ref="82B4358"/> + <parent ref="8115668"/> </circle> <arcCircle id="82B5D30" type="3pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> - <tqparent ref="82257B8"/> - <tqparent ref="82B26F0"/> - <tqparent ref="8250D30"/> + <parent ref="82257B8"/> + <parent ref="82B26F0"/> + <parent ref="8250D30"/> </arcCircle> </drgeo> </drgenius> diff --git a/kig/examples/session_alotofthings.fgeo b/kig/examples/session_alotofthings.fgeo index a2d3dbeb..967dada9 100644 --- a/kig/examples/session_alotofthings.fgeo +++ b/kig/examples/session_alotofthings.fgeo @@ -30,37 +30,37 @@ <y>1.783334</y> </point> <line id="82C3C40" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> - <tqparent ref="8281F08"/> - <tqparent ref="82076B0"/> + <parent ref="8281F08"/> + <parent ref="82076B0"/> </line> <arcCircle id="82C2F40" type="3pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> - <tqparent ref="8208228"/> - <tqparent ref="822F448"/> - <tqparent ref="82535F0"/> + <parent ref="8208228"/> + <parent ref="822F448"/> + <parent ref="82535F0"/> </arcCircle> <halfLine id="82A86B8" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> - <tqparent ref="822FB88"/> - <tqparent ref="82B08A0"/> + <parent ref="822FB88"/> + <parent ref="82B08A0"/> </halfLine> <point id="82C8738" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-1.066667</x> <y>-0.416667</y> </point> <point id="82C4DC8" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="" extra="0"> - <tqparent ref="82A86B8"/> - <tqparent ref="82C2F40"/> + <parent ref="82A86B8"/> + <parent ref="82C2F40"/> </point> <point id="82C5230" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="" extra="1"> - <tqparent ref="82A86B8"/> - <tqparent ref="82C2F40"/> + <parent ref="82A86B8"/> + <parent ref="82C2F40"/> </point> <line id="82BF640" type="perpendicular" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> - <tqparent ref="82C8738"/> - <tqparent ref="82C3C40"/> + <parent ref="82C8738"/> + <parent ref="82C3C40"/> </line> <point id="83030E0" type="Reflexion" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> - <tqparent ref="82C4DC8"/> - <tqparent ref="82BF640"/> + <parent ref="82C4DC8"/> + <parent ref="82BF640"/> </point> </drgeo> <text name="Testo 1">Figure 1 contains: @@ -99,32 +99,32 @@ Figure 3 contains: <y>1.650000</y> </point> <line id="8337158" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> - <tqparent ref="82EB588"/> - <tqparent ref="831A340"/> + <parent ref="82EB588"/> + <parent ref="831A340"/> </line> <point id="8339778" type="Middle_2pts" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> - <tqparent ref="831A340"/> - <tqparent ref="82D1958"/> + <parent ref="831A340"/> + <parent ref="82D1958"/> </point> <line id="8322C38" type="parallel" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> - <tqparent ref="8339778"/> - <tqparent ref="8337158"/> + <parent ref="8339778"/> + <parent ref="8337158"/> </line> <point id="8322E28" type="Free" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name=""> <x>-6.200000</x> <y>-1.483334</y> </point> <line id="831E530" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> - <tqparent ref="8322E28"/> - <tqparent ref="82D1958"/> + <parent ref="8322E28"/> + <parent ref="82D1958"/> </line> <point id="8356028" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="" extra="0"> - <tqparent ref="831E530"/> - <tqparent ref="8337158"/> + <parent ref="831E530"/> + <parent ref="8337158"/> </point> <point id="8320CC8" type="Intersection" color="Red" thickness="Dashed" style="Round" filled="False" masked="False" name="" extra="0"> - <tqparent ref="8322C38"/> - <tqparent ref="831E530"/> + <parent ref="8322C38"/> + <parent ref="831E530"/> </point> </drgeo> <drgeo name="Figure 3" scale="30.000000" origin_x="0.000000" origin_y="0.000000" grid="False"> @@ -147,16 +147,16 @@ Figure 3 contains: <vector id="8108B10" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> <Ox>-6.433334</Ox> <Oy>2.050000</Oy> - <tqparent ref="837C5E0"/> - <tqparent ref="83380E8"/> + <parent ref="837C5E0"/> + <parent ref="83380E8"/> </vector> <circle id="83A2B10" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> - <tqparent ref="82FBCC8"/> - <tqparent ref="83565C8"/> + <parent ref="82FBCC8"/> + <parent ref="83565C8"/> </circle> <circle id="83D6820" type="Translation" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""> - <tqparent ref="83A2B10"/> - <tqparent ref="8108B10"/> + <parent ref="83A2B10"/> + <parent ref="8108B10"/> </circle> </drgeo> </drgenius> diff --git a/kig/filters/cabri-filter.cc b/kig/filters/cabri-filter.cc index 2348af86..7d7369a1 100644 --- a/kig/filters/cabri-filter.cc +++ b/kig/filters/cabri-filter.cc @@ -441,10 +441,10 @@ KigDocument* KigFilterCabri::load( const TQString& file ) obj.thick *= 2; if ( args.size() != 1 || obj.data.size() != 2 ) KIG_FILTER_PARSE_ERROR; - ObjectCalcer* tqparent = args[0]; - if ( !tqparent->imp()->inherits( CurveImp::stype() ) ) + ObjectCalcer* parent = args[0]; + if ( !parent->imp()->inherits( CurveImp::stype() ) ) KIG_FILTER_PARSE_ERROR; - const CurveImp* curve = static_cast<const CurveImp*>( tqparent->imp() ); + const CurveImp* curve = static_cast<const CurveImp*>( parent->imp() ); Coordinate pt = Coordinate( obj.data[0], obj.data[1] ); double param = curve->getParam( pt, *ret ); args.push_back( new ObjectConstCalcer( new DoubleImp( param ) ) ); @@ -486,11 +486,11 @@ KigDocument* KigFilterCabri::load( const TQString& file ) // points, or a vector... if ( args.size() != 1 || !obj.data.empty() ) KIG_FILTER_PARSE_ERROR; - ObjectCalcer* tqparent = args[0]; - if ( tqparent->imp()->inherits( SegmentImp::stype() ) ) - oc = fact->propertyObjectCalcer( tqparent, "mid-point" ) ; - else if ( tqparent->imp()->inherits( VectorImp::stype() ) ) - oc = fact->propertyObjectCalcer( tqparent, "vect-mid-point" ); + ObjectCalcer* parent = args[0]; + if ( parent->imp()->inherits( SegmentImp::stype() ) ) + oc = fact->propertyObjectCalcer( parent, "mid-point" ) ; + else if ( parent->imp()->inherits( VectorImp::stype() ) ) + oc = fact->propertyObjectCalcer( parent, "vect-mid-point" ); else KIG_FILTER_PARSE_ERROR; } else if ( obj.type == "PBiss" ) @@ -505,12 +505,12 @@ KigDocument* KigFilterCabri::load( const TQString& file ) } if ( args.size() != 1 || !obj.data.empty() ) KIG_FILTER_PARSE_ERROR; - ObjectCalcer* tqparent = args[0]; + ObjectCalcer* parent = args[0]; ObjectCalcer* midpoint = 0; - if ( tqparent->imp()->inherits( SegmentImp::stype() ) ) - midpoint = fact->propertyObjectCalcer( tqparent, "mid-point" ) ; -// else if ( tqparent->imp()->inherits( VectorImp::stype() ) ) -// midpoint = fact->propertyObjectCalcer( tqparent, "vect-mid-point" ); + if ( parent->imp()->inherits( SegmentImp::stype() ) ) + midpoint = fact->propertyObjectCalcer( parent, "mid-point" ) ; +// else if ( parent->imp()->inherits( VectorImp::stype() ) ) +// midpoint = fact->propertyObjectCalcer( parent, "vect-mid-point" ); else KIG_FILTER_PARSE_ERROR; midpoint->calc( *ret ); args.push_back( midpoint ); diff --git a/kig/filters/drgeo-filter.cc b/kig/filters/drgeo-filter.cc index 856d995c..6596bf44 100644 --- a/kig/filters/drgeo-filter.cc +++ b/kig/filters/drgeo-filter.cc @@ -201,7 +201,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co { TQDomElement ce = c.toElement(); if ( ce.isNull() ) continue; - else if ( ce.tagName() == "tqparent" ) + else if ( ce.tagName() == "parent" ) elem.parents.push_back( ce.attribute( "ref" ) ); } TQString curid = domelem.attribute( "id" ); @@ -255,7 +255,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co if ( parents.size() > 0 ) for ( uint j = 0; j < parents.size(); ++j ) { - kdDebug() << "+++++++++ tqparent[" << j << "]: " << parents[j] << " - " + kdDebug() << "+++++++++ parent[" << j << "]: " << parents[j] << " - " << parents[j]->imp()->type()->internalName() << endl; } else diff --git a/kig/filters/exporter.cc b/kig/filters/exporter.cc index 875dab17..8dfeffda 100644 --- a/kig/filters/exporter.cc +++ b/kig/filters/exporter.cc @@ -65,13 +65,13 @@ class ExporterAction KigWidget* mw; public: ExporterAction( const KigPart* doc, KigWidget* w, - KActionCollection* tqparent, KigExporter* exp ); + KActionCollection* parent, KigExporter* exp ); void slotActivated(); }; ExporterAction::ExporterAction( const KigPart* doc, KigWidget* w, - KActionCollection* tqparent, KigExporter* exp ) - : KAction( exp->menuEntryName(), KShortcut(), 0, 0, tqparent ), + KActionCollection* parent, KigExporter* exp ) + : KAction( exp->menuEntryName(), KShortcut(), 0, 0, parent ), mexp( exp ), mdoc( doc ), mw( w ) { TQString iconstr = exp->menuIcon(); diff --git a/kig/filters/imageexporteroptions.cc b/kig/filters/imageexporteroptions.cc index d88792fc..cd68a0af 100644 --- a/kig/filters/imageexporteroptions.cc +++ b/kig/filters/imageexporteroptions.cc @@ -23,8 +23,8 @@ #include <knuminput.h> -ImageExporterOptions::ImageExporterOptions( TQWidget* tqparent, const TQSize& s ) - : ImageExporterOptionsBase( tqparent, "imageexporteroptions" ), msize( s ), +ImageExporterOptions::ImageExporterOptions( TQWidget* parent, const TQSize& s ) + : ImageExporterOptionsBase( parent, "imageexporteroptions" ), msize( s ), minternallysettingstuff( false ) { keepAspectRatio->setChecked( true ); diff --git a/kig/filters/imageexporteroptions.h b/kig/filters/imageexporteroptions.h index 82db4950..30c128b7 100644 --- a/kig/filters/imageexporteroptions.h +++ b/kig/filters/imageexporteroptions.h @@ -35,7 +35,7 @@ class ImageExporterOptions // value like to user changes... bool minternallysettingstuff; public: - ImageExporterOptions( TQWidget* tqparent, const TQSize& s ); + ImageExporterOptions( TQWidget* parent, const TQSize& s ); ~ImageExporterOptions(); protected slots: diff --git a/kig/filters/kgeo-filter.cc b/kig/filters/kgeo-filter.cc index 2405e46b..8d37a871 100644 --- a/kig/filters/kgeo-filter.cc +++ b/kig/filters/kgeo-filter.cc @@ -111,10 +111,10 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c c->setGroup("Main"); int number = c->readNumEntry ("Number"); - // first we determine the tqparent relationships, and sort the + // first we determine the parent relationships, and sort the // elements in an order that we can be sure all of an object's // parents will have been handled before it is handled itself.. - // ( aka topological sort of the tqparent relations graph.. + // ( aka topological sort of the parent relations graph.. std::vector<KGeoHierarchyElement> elems; elems.reserve( number ); @@ -128,9 +128,9 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c TQStrList parents; c->readListEntry( "Parents", parents ); elems.push_back( elem ); - for ( const char* tqparent = parents.first(); tqparent; tqparent = parents.next() ) + for ( const char* parent = parents.first(); parent; parent = parents.next() ) { - int parentIndex = TQString::tqfromLatin1( tqparent ).toInt( &ok ); + int parentIndex = TQString::tqfromLatin1( parent ).toInt( &ok ); if ( ! ok ) KIG_FILTER_PARSE_ERROR; if ( parentIndex != 0 ) elems[i].parents.push_back( parentIndex - 1 ); diff --git a/kig/filters/kseg-filter.cc b/kig/filters/kseg-filter.cc index 86c6cba8..7ddfcde4 100644 --- a/kig/filters/kseg-filter.cc +++ b/kig/filters/kseg-filter.cc @@ -255,9 +255,9 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) std::vector<ObjectCalcer*> parents( nparents, 0 ); for ( short j = 0; j < nparents; ++j ) { - int tqparent; - stream >> tqparent; - parents[j] = ret[tqparent]->calcer(); + int parent; + stream >> parent; + parents[j] = ret[parent]->calcer(); }; // read the object.. @@ -335,9 +335,9 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) double p; stream >> p; if ( nparents != 1 ) KIG_FILTER_PARSE_ERROR; - ObjectCalcer* tqparent = parents[0]; - assert( tqparent ); - o = fact->constrainedPointCalcer( tqparent, p ); + ObjectCalcer* parent = parents[0]; + assert( parent ); + o = fact->constrainedPointCalcer( parent, p ); break; } case G_INTERSECTION_POINT: diff --git a/kig/filters/native-filter.cc b/kig/filters/native-filter.cc index 3afaf0e1..d3323778 100644 --- a/kig/filters/native-filter.cc +++ b/kig/filters/native-filter.cc @@ -316,13 +316,13 @@ KigDocument* KigFilterNative::load04( const TQString& file, const TQDomElement& }; if ( i->parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - ObjectCalcer* tqparent = retcalcers[i->parents[0] -1]; - QCStringList propnames = tqparent->imp()->propertiesInternalNames(); + ObjectCalcer* parent = retcalcers[i->parents[0] -1]; + QCStringList propnames = parent->imp()->propertiesInternalNames(); int propid = propnames.findIndex( propname ); if ( propid == -1 ) KIG_FILTER_PARSE_ERROR; - o = new ObjectPropertyCalcer( tqparent, propid ); + o = new ObjectPropertyCalcer( parent, propid ); } else if ( e.tagName() == "Object" ) { @@ -443,9 +443,9 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement& uint parentid = tmp.toInt( &ok ); if ( ! ok ) KIG_FILTER_PARSE_ERROR; if ( parentid == 0 || parentid > calcers.size() ) KIG_FILTER_PARSE_ERROR; - ObjectCalcer* tqparent = calcers[parentid - 1].get(); - if ( ! tqparent ) KIG_FILTER_PARSE_ERROR; - parents.push_back( tqparent ); + ObjectCalcer* parent = calcers[parentid - 1].get(); + if ( ! parent ) KIG_FILTER_PARSE_ERROR; + parents.push_back( parent ); } ObjectCalcer* o = 0; @@ -468,11 +468,11 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement& if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; TQCString propname = e.attribute( "which" ).latin1(); - ObjectCalcer* tqparent = parents[0]; - int propid = tqparent->imp()->propertiesInternalNames().findIndex( propname ); + ObjectCalcer* parent = parents[0]; + int propid = parent->imp()->propertiesInternalNames().findIndex( propname ); if ( propid == -1 ) KIG_FILTER_PARSE_ERROR; - o = new ObjectPropertyCalcer( tqparent, propid ); + o = new ObjectPropertyCalcer( parent, propid ); } else if ( e.tagName() == "Object" ) { @@ -604,7 +604,7 @@ bool KigFilterNative::save07( const KigDocument& kdoc, TQTextStream& stream ) const ObjectPropertyCalcer* o = static_cast<const ObjectPropertyCalcer*>( *i ); objectelem = doc.createElement( "Property" ); - TQCString propname = o->tqparent()->imp()->propertiesInternalNames()[o->propId()]; + TQCString propname = o->parent()->imp()->propertiesInternalNames()[o->propId()]; objectelem.setAttribute( TQString("which"), TQString(propname) ); } else if ( dynamic_cast<const ObjectTypeCalcer*>( *i ) ) diff --git a/kig/filters/tests/locus.fgeo b/kig/filters/tests/locus.fgeo index 55fa562f..a914068c 100644 --- a/kig/filters/tests/locus.fgeo +++ b/kig/filters/tests/locus.fgeo @@ -1,2 +1,2 @@ <?xml version="1.0"?> -<drgenius><drgeo name="Figuur 1" scale="30.000000" origin_x="0.000000" origin_y="0.000000" grid="False"><point id="8293DE0" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>-1.666666</x><y>3.216667</y></point><point id="8306C70" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>-2.766667</x><y>0.550000</y></point><circle id="8307268" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><tqparent ref="8293DE0"/><tqparent ref="8306C70"/></circle><point id="8309098" type="On_curve" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><value>0.080691</value><tqparent ref="8307268"/></point><point id="830A920" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>3.000000</x><y>3.016667</y></point><line id="8172970" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><tqparent ref="8309098"/><tqparent ref="830A920"/></line><point id="8339730" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>2.866667</x><y>-0.750000</y></point><line id="833AD18" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><tqparent ref="8309098"/><tqparent ref="8339730"/></line><point id="8338A50" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>2.600000</x><y>3.816667</y></point><line id="833BBB8" type="perpendicular" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><tqparent ref="8338A50"/><tqparent ref="833AD18"/></line><point id="8342478" type="Intersection" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name="" extra="0"><tqparent ref="8172970"/><tqparent ref="833BBB8"/></point><locus id="8345D60" type="None" color="Black" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><tqparent ref="8309098"/><tqparent ref="8342478"/></locus></drgeo></drgenius> +<drgenius><drgeo name="Figuur 1" scale="30.000000" origin_x="0.000000" origin_y="0.000000" grid="False"><point id="8293DE0" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>-1.666666</x><y>3.216667</y></point><point id="8306C70" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>-2.766667</x><y>0.550000</y></point><circle id="8307268" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><parent ref="8293DE0"/><parent ref="8306C70"/></circle><point id="8309098" type="On_curve" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><value>0.080691</value><parent ref="8307268"/></point><point id="830A920" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>3.000000</x><y>3.016667</y></point><line id="8172970" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><parent ref="8309098"/><parent ref="830A920"/></line><point id="8339730" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>2.866667</x><y>-0.750000</y></point><line id="833AD18" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><parent ref="8309098"/><parent ref="8339730"/></line><point id="8338A50" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>2.600000</x><y>3.816667</y></point><line id="833BBB8" type="perpendicular" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><parent ref="8338A50"/><parent ref="833AD18"/></line><point id="8342478" type="Intersection" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name="" extra="0"><parent ref="8172970"/><parent ref="833BBB8"/></point><locus id="8345D60" type="None" color="Black" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><parent ref="8309098"/><parent ref="8342478"/></locus></drgeo></drgenius> diff --git a/kig/kfile/kfile_drgeo.cpp b/kig/kfile/kfile_drgeo.cpp index 4cec1da4..b921131b 100644 --- a/kig/kfile/kfile_drgeo.cpp +++ b/kig/kfile/kfile_drgeo.cpp @@ -29,8 +29,8 @@ typedef KGenericFactory<DrgeoPlugin> drgeoFactory; K_EXPORT_COMPONENT_FACTORY( kfile_drgeo, drgeoFactory( "kfile_drgeo" ) ) -DrgeoPlugin::DrgeoPlugin( TQObject *tqparent, const char *name, const TQStringList &args ) - : KFilePlugin( tqparent, name, args ) +DrgeoPlugin::DrgeoPlugin( TQObject *parent, const char *name, const TQStringList &args ) + : KFilePlugin( parent, name, args ) { info = addMimeTypeInfo( "application/x-drgeo" ); diff --git a/kig/kfile/kfile_drgeo.h b/kig/kfile/kfile_drgeo.h index 19b28e5b..950c6093 100644 --- a/kig/kfile/kfile_drgeo.h +++ b/kig/kfile/kfile_drgeo.h @@ -31,7 +31,7 @@ class DrgeoPlugin: public KFilePlugin TQ_OBJECT public: - DrgeoPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); + DrgeoPlugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& metainfo, uint what); protected: diff --git a/kig/kfile/kfile_kig.cpp b/kig/kfile/kfile_kig.cpp index defae8c2..496a851f 100644 --- a/kig/kfile/kfile_kig.cpp +++ b/kig/kfile/kfile_kig.cpp @@ -35,8 +35,8 @@ typedef KGenericFactory<KigPlugin> kigFactory; K_EXPORT_COMPONENT_FACTORY( kfile_kig, kigFactory( "kfile_kig" ) ) -KigPlugin::KigPlugin( TQObject *tqparent, const char *name, const TQStringList &args ) - : KFilePlugin( tqparent, name, args ) +KigPlugin::KigPlugin( TQObject *parent, const char *name, const TQStringList &args ) + : KFilePlugin( parent, name, args ) { KFileMimeTypeInfo::ItemInfo* item; diff --git a/kig/kfile/kfile_kig.h b/kig/kfile/kfile_kig.h index 7c0512be..c0d248f6 100644 --- a/kig/kfile/kfile_kig.h +++ b/kig/kfile/kfile_kig.h @@ -31,7 +31,7 @@ class KigPlugin: public KFilePlugin TQ_OBJECT public: - KigPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); + KigPlugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& metainfo, uint what); protected: diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp index 15d66df1..30b8b3db 100644 --- a/kig/kig/kig_part.cpp +++ b/kig/kig/kig_part.cpp @@ -87,13 +87,13 @@ class SetCoordinateSystemAction { KigPart& md; public: - SetCoordinateSystemAction( KigPart& d, KActionCollection* tqparent ); + SetCoordinateSystemAction( KigPart& d, KActionCollection* parent ); void slotActivated( int index ); }; SetCoordinateSystemAction::SetCoordinateSystemAction( - KigPart& d, KActionCollection* tqparent ) - : KSelectAction( i18n( "&Set Coordinate System" ), 0, tqparent, "settings_set_coordinate_system" ), + KigPart& d, KActionCollection* parent ) + : KSelectAction( i18n( "&Set Coordinate System" ), 0, parent, "settings_set_coordinate_system" ), md( d ) { setItems( CoordinateSystemFactory::names() ); @@ -112,7 +112,7 @@ class KigPrintDialogPage : public KPrintDialogPage { public: - KigPrintDialogPage( TQWidget* tqparent = 0, const char* name = 0 ); + KigPrintDialogPage( TQWidget* parent = 0, const char* name = 0 ); ~KigPrintDialogPage(); void getOptions( TQMap<TQString,TQString>& opts, bool ); @@ -124,8 +124,8 @@ private: TQCheckBox *showaxes; }; -KigPrintDialogPage::KigPrintDialogPage( TQWidget* tqparent, const char* name ) - : KPrintDialogPage( tqparent, name ) +KigPrintDialogPage::KigPrintDialogPage( TQWidget* parent, const char* name ) + : KPrintDialogPage( parent, name ) { setTitle( i18n( "Kig Options" ) ); @@ -166,9 +166,9 @@ bool KigPrintDialogPage::isValid( TQString& ) } KigPart::KigPart( TQWidget *parentWidget, const char *, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const TQStringList& ) - : KParts::ReadWritePart( tqparent, name ), + : KParts::ReadWritePart( parent, name ), mMode( 0 ), mdocument( new KigDocument() ) { // we need an instance @@ -281,7 +281,7 @@ void KigPart::setupActions() #endif #endif #ifdef KIG_PART_CPP_STD_FULLSCREEN_ACTION - a = KStdAction::fullScreen( TQT_TQOBJECT(m_widget), TQT_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->tqparent()),"fullscreen" ); + a = KStdAction::fullScreen( TQT_TQOBJECT(m_widget), TQT_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->parent()),"fullscreen" ); #else tmp = l->loadIcon( "window_fullscreen", KIcon::Toolbar ); a = new KAction( diff --git a/kig/kig/kig_part.h b/kig/kig/kig_part.h index 677c9037..81435abf 100644 --- a/kig/kig/kig_part.h +++ b/kig/kig/kig_part.h @@ -67,7 +67,7 @@ public: * Default constructor */ KigPart( TQWidget* parentWidget, const char* widgetName, - TQObject* tqparent = 0, const char* name = 0, + 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 a0884498..fe2da6e1 100644 --- a/kig/kig/kig_view.cpp +++ b/kig/kig/kig_view.cpp @@ -55,10 +55,10 @@ kdbgstream& operator<< ( kdbgstream& s, const TQPoint& t ) KigWidget::KigWidget( KigPart* part, KigView* view, - TQWidget* tqparent, + TQWidget* parent, const char* name, bool fullscreen ) - : TQWidget( tqparent, name, + : TQWidget( parent, name, fullscreen ? WStyle_Customize | WStyle_NoBorder : 0 ), mpart( part ), mview( view ), @@ -287,9 +287,9 @@ void KigWidget::updateScrollBars() KigView::KigView( KigPart* part, bool fullscreen, - TQWidget* tqparent, + TQWidget* parent, const char* name ) - : TQWidget( tqparent, name ), + : TQWidget( parent, name ), mtqlayout( 0 ), mrightscroll( 0 ), mbottomscroll( 0 ), mupdatingscrollbars( false ), mrealwidget( 0 ), mpart( part ) diff --git a/kig/kig/kig_view.h b/kig/kig/kig_view.h index 9d3ebab2..6cda690b 100644 --- a/kig/kig/kig_view.h +++ b/kig/kig/kig_view.h @@ -105,7 +105,7 @@ public: */ KigWidget( KigPart* doc, KigView* view, - TQWidget* tqparent = 0, + TQWidget* parent = 0, const char* name = 0, bool fullscreen = false ); @@ -246,7 +246,7 @@ class KigView public: KigView( KigPart* part, bool fullscreen = false, - TQWidget* tqparent = 0, + TQWidget* parent = 0, const char* name = 0 ); ~KigView(); diff --git a/kig/misc/common.cpp b/kig/misc/common.cpp index 275170ef..b41b9284 100644 --- a/kig/misc/common.cpp +++ b/kig/misc/common.cpp @@ -347,7 +347,7 @@ Coordinate calcCircleRadicalStartPoint( const Coordinate& ca, const Coordinate& } double getDoubleFromUser( const TQString& caption, const TQString& label, double value, - TQWidget* tqparent, bool* ok, double min, double max, int decimals ) + TQWidget* parent, bool* ok, double min, double max, int decimals ) { #ifdef KIG_USE_KDOUBLEVALIDATOR KDoubleValidator vtor( min, max, decimals, 0, 0 ); @@ -357,12 +357,12 @@ double getDoubleFromUser( const TQString& caption, const TQString& label, double #if KDE_IS_VERSION( 3, 1, 90 ) TQString input = KInputDialog::getText( caption, label, KGlobal::locale()->formatNumber( value, decimals ), - ok, tqparent, "getDoubleFromUserDialog", &vtor ); + ok, parent, "getDoubleFromUserDialog", &vtor ); #else TQString input = KLineEditDlg::getText( caption, label, KGlobal::locale()->formatNumber( value, decimals ), - ok, tqparent, &vtor ); + ok, parent, &vtor ); #endif bool myok = true; diff --git a/kig/misc/common.h b/kig/misc/common.h index d4f388fb..d1969df3 100644 --- a/kig/misc/common.h +++ b/kig/misc/common.h @@ -52,7 +52,7 @@ extern const double double_inf; */ double getDoubleFromUser( const TQString& caption, const TQString& label, double value, - TQWidget* tqparent, bool* ok, double min, double max, int decimals ); + TQWidget* parent, bool* ok, double min, double max, int decimals ); /** * Simple class representing a line. Used by various functions in Kig. diff --git a/kig/misc/guiaction.cc b/kig/misc/guiaction.cc index 4876e175..f19f2d82 100644 --- a/kig/misc/guiaction.cc +++ b/kig/misc/guiaction.cc @@ -81,13 +81,13 @@ void ConstructibleAction::act( KigPart& d ) KigGUIAction::KigGUIAction( GUIAction* act, KigPart& doc, - TQObject* tqparent ) + TQObject* parent ) : KAction( act->descriptiveName(), doc.instance()->iconLoader()->loadIcon( act->iconFileName(), KIcon::Toolbar, 0, KIcon::DefaultState, 0L, true ), act->shortcut(), 0, 0, // no slot connection - tqparent, act->actionName() ), + parent, act->actionName() ), mact( act ), mdoc( doc ) { diff --git a/kig/misc/guiaction.h b/kig/misc/guiaction.h index e9595605..724ce6cf 100644 --- a/kig/misc/guiaction.h +++ b/kig/misc/guiaction.h @@ -41,7 +41,7 @@ class KigGUIAction public: KigGUIAction( GUIAction* act, KigPart& doc, - TQObject* tqparent ); + TQObject* parent ); void slotActivated(); GUIAction* guiAction(); diff --git a/kig/misc/kigfiledialog.cc b/kig/misc/kigfiledialog.cc index cdfe2196..2c211690 100644 --- a/kig/misc/kigfiledialog.cc +++ b/kig/misc/kigfiledialog.cc @@ -25,8 +25,8 @@ #include <kmessagebox.h> KigFileDialog::KigFileDialog( const TQString& startDir, const TQString& filter, - const TQString& caption, TQWidget* tqparent ) - : KFileDialog( startDir, filter, tqparent, "kigfiledialog", true ), + const TQString& caption, TQWidget* parent ) + : KFileDialog( startDir, filter, parent, "kigfiledialog", true ), mow( 0L ) { setCaption( caption ); diff --git a/kig/misc/kigfiledialog.h b/kig/misc/kigfiledialog.h index 5fb65949..8a299bf5 100644 --- a/kig/misc/kigfiledialog.h +++ b/kig/misc/kigfiledialog.h @@ -46,17 +46,17 @@ public: * documentation of KFileDialog for more help about this * \param filter the filter for the file dialog * \param caption the caption of this file dialog - * \param tqparent the tqparent for this file dialog + * \param parent the parent for this file dialog */ KigFileDialog( const TQString& startDir, const TQString& filter, - const TQString& caption, TQWidget *tqparent ); + const TQString& caption, TQWidget *parent ); /** * Use this to set the widget containing the options of eg an export filter. * The option widget will be popped up in a dialog right after the user * presses OK and before the dialog is closed. * - * You can construct the option widget with no tqparent, as it will be + * You can construct the option widget with no parent, as it will be * reparented. * * \param w the option widget diff --git a/kig/misc/kiginputdialog.cc b/kig/misc/kiginputdialog.cc index de8f691d..99e635b2 100644 --- a/kig/misc/kiginputdialog.cc +++ b/kig/misc/kiginputdialog.cc @@ -65,8 +65,8 @@ KigInputDialogPrivate::KigInputDialogPrivate() } KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label, - TQWidget* tqparent, const KigDocument& doc, Coordinate* c1, Coordinate* c2 ) - : KDialogBase( tqparent, "kigdialog", true, caption, Ok|Cancel, Cancel, true ), + TQWidget* parent, const KigDocument& doc, Coordinate* c1, Coordinate* c2 ) + : KDialogBase( parent, "kigdialog", true, caption, Ok|Cancel, Cancel, true ), d( new KigInputDialogPrivate() ) { d->m_coord1 = c1 ? Coordinate( *c1 ) : Coordinate::invalidCoord(); @@ -121,8 +121,8 @@ KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label, enableButtonOK( ok ); } -KigInputDialog::KigInputDialog( TQWidget* tqparent, const Goniometry& g ) - : KDialogBase( tqparent, "kigdialog", true, i18n( "Set Angle Size" ), Ok|Cancel, Cancel, true ), +KigInputDialog::KigInputDialog( TQWidget* parent, const Goniometry& g ) + : KDialogBase( parent, "kigdialog", true, i18n( "Set Angle Size" ), Ok|Cancel, Cancel, true ), d( new KigInputDialogPrivate() ) { d->m_gonio = g; @@ -247,16 +247,16 @@ Goniometry KigInputDialog::goniometry() const } void KigInputDialog::getCoordinate( const TQString& caption, const TQString& label, - TQWidget* tqparent, bool* ok, const KigDocument& doc, Coordinate* cvalue ) + TQWidget* parent, bool* ok, const KigDocument& doc, Coordinate* cvalue ) { - getTwoCoordinates( caption, label, tqparent, ok, doc, cvalue, 0 ); + getTwoCoordinates( caption, label, parent, ok, doc, cvalue, 0 ); } void KigInputDialog::getTwoCoordinates( const TQString& caption, const TQString& label, - TQWidget* tqparent, bool* ok, const KigDocument& doc, Coordinate* cvalue, + TQWidget* parent, bool* ok, const KigDocument& doc, Coordinate* cvalue, Coordinate* cvalue2 ) { - KigInputDialog dlg( caption, label, tqparent, doc, cvalue, cvalue2 ); + KigInputDialog dlg( caption, label, parent, doc, cvalue, cvalue2 ); *ok = ( dlg.exec() == Accepted ); @@ -273,9 +273,9 @@ void KigInputDialog::getTwoCoordinates( const TQString& caption, const TQString& } -Goniometry KigInputDialog::getAngle( TQWidget* tqparent, bool* ok, const Goniometry& g ) +Goniometry KigInputDialog::getAngle( TQWidget* parent, bool* ok, const Goniometry& g ) { - KigInputDialog dlg( tqparent, g ); + KigInputDialog dlg( parent, g ); *ok = ( dlg.exec() == Accepted ); diff --git a/kig/misc/kiginputdialog.h b/kig/misc/kiginputdialog.h index 60f2ba54..f11d2665 100644 --- a/kig/misc/kiginputdialog.h +++ b/kig/misc/kiginputdialog.h @@ -46,9 +46,9 @@ Q_OBJECT public: private: - KigInputDialog( const TQString& caption, const TQString& label, TQWidget* tqparent, + KigInputDialog( const TQString& caption, const TQString& label, TQWidget* parent, const KigDocument& doc, Coordinate* c1, Coordinate* c2 ); - KigInputDialog( TQWidget* tqparent, const Goniometry& g ); + KigInputDialog( TQWidget* parent, const Goniometry& g ); virtual void keyPressEvent( TQKeyEvent* e ); @@ -70,7 +70,7 @@ public: * * \param caption caption of the dialog * \param label text of the label of the dialog - * \param tqparent tqparent of the dialog widget + * \param parent parent of the dialog widget * \param ok it will be set to true if the user pressed Ok after inserting a * well-formatted Coordinate * \param doc the actual Kig document @@ -80,14 +80,14 @@ public: * displayed as initial value of the correspondenting text edit */ static void getCoordinate( const TQString& caption, const TQString& label, - TQWidget* tqparent, bool* ok, const KigDocument& doc, Coordinate* cvalue ); + TQWidget* parent, bool* ok, const KigDocument& doc, Coordinate* cvalue ); /** * Static convenience function to get two Coordinates at once from the user. * * \param caption caption of the dialog * \param label text of the label of the dialog - * \param tqparent tqparent of the dialog widget + * \param parent parent of the dialog widget * \param ok it will be set to true if the user pressed Ok after inserting * well-formatted Coordinates * \param doc the actual Kig document @@ -103,14 +103,14 @@ public: * the text edit representing the second Coordinate. */ static void getTwoCoordinates( const TQString& caption, const TQString& label, - TQWidget* tqparent, bool* ok, const KigDocument& doc, Coordinate* cvalue, + TQWidget* parent, bool* ok, const KigDocument& doc, Coordinate* cvalue, Coordinate* cvalue2 ); /** * Static convenience function to get an angle incapsulated in a Goniometry * class. * - * \param tqparent tqparent of the dialog widget + * \param parent parent of the dialog widget * \param ok it will be set to true if the user pressed Ok after inserting a * well-formatted angle * \param g the Goniometry class containing the original angle we are going @@ -118,7 +118,7 @@ public: * * \return a Goniometry class containing the new angle */ - static Goniometry getAngle( TQWidget* tqparent, bool* ok, const Goniometry& g ); + static Goniometry getAngle( TQWidget* parent, bool* ok, const Goniometry& g ); }; #endif diff --git a/kig/misc/object_hierarchy.cc b/kig/misc/object_hierarchy.cc index 9b5a09a8..e72a3c19 100644 --- a/kig/misc/object_hierarchy.cc +++ b/kig/misc/object_hierarchy.cc @@ -186,21 +186,21 @@ class FetchPropertyNode : public ObjectHierarchy::Node { mutable int mpropid; - int mtqparent; + int mparent; const TQCString mname; public: - // propid is a cache of the location of name in the tqparent's + // propid is a cache of the location of name in the parent's // propertiesInternalNames(), just as it is in PropertyObject. We // don't want to ever save this value, since we cannot guarantee it // remains consistent if we add properties some place.. - FetchPropertyNode( const int tqparent, const TQCString& name, const int propid = -1 ) - : mpropid( propid ), mtqparent( tqparent ), mname( name ) {} + FetchPropertyNode( const int parent, const TQCString& name, const int propid = -1 ) + : mpropid( propid ), mparent( parent ), mname( name ) {} ~FetchPropertyNode(); Node* copy() const; void checkDependsOnGiven( std::vector<bool>& dependsstack, int loc ) const; void checkArgumentsUsed( std::vector<bool>& usedstack ) const; - int tqparent() const { return mtqparent; } + int parent() const { return mparent; } const TQCString& propinternalname() const { return mname; } int id() const; @@ -215,17 +215,17 @@ FetchPropertyNode::~FetchPropertyNode() void FetchPropertyNode::checkArgumentsUsed( std::vector<bool>& usedstack ) const { - usedstack[mtqparent] = true; + usedstack[mparent] = true; } void FetchPropertyNode::checkDependsOnGiven( std::vector<bool>& dependsstack, int loc ) const { - dependsstack[loc] = dependsstack[mtqparent]; + dependsstack[loc] = dependsstack[mparent]; } ObjectHierarchy::Node* FetchPropertyNode::copy() const { - return new FetchPropertyNode( mtqparent, mname, mpropid ); + return new FetchPropertyNode( mparent, mname, mpropid ); } int FetchPropertyNode::id() const @@ -236,10 +236,10 @@ int FetchPropertyNode::id() const void FetchPropertyNode::apply( std::vector<const ObjectImp*>& stack, int loc, const KigDocument& d ) const { - assert( stack[mtqparent] ); - if ( mpropid == -1 ) mpropid = stack[mtqparent]->propertiesInternalNames().findIndex( mname ); + assert( stack[mparent] ); + if ( mpropid == -1 ) mpropid = stack[mparent]->propertiesInternalNames().findIndex( mname ); if ( mpropid != -1 ) - stack[loc] = stack[mtqparent]->property( mpropid, d ); + stack[loc] = stack[mparent]->property( mpropid, d ); else stack[loc] = new InvalidImp(); } @@ -247,9 +247,9 @@ void FetchPropertyNode::apply( std::vector<const ObjectImp*>& stack, void FetchPropertyNode::apply( std::vector<ObjectCalcer*>& stack, int loc ) const { if ( mpropid == -1 ) - mpropid = stack[mtqparent]->imp()->propertiesInternalNames().findIndex( mname ); + mpropid = stack[mparent]->imp()->propertiesInternalNames().findIndex( mname ); assert( mpropid != -1 ); - stack[loc] = new ObjectPropertyCalcer( stack[mtqparent], mpropid ); + stack[loc] = new ObjectPropertyCalcer( stack[mparent], mpropid ); } std::vector<ObjectImp*> ObjectHierarchy::calc( const Args& a, const KigDocument& doc ) const @@ -408,7 +408,7 @@ ObjectHierarchy::ObjectHierarchy( const std::vector<ObjectCalcer*>& from, const init( from, to ); } -void ObjectHierarchy::serialize( TQDomElement& tqparent, TQDomDocument& doc ) const +void ObjectHierarchy::serialize( TQDomElement& parent, TQDomDocument& doc ) const { int id = 1; for ( uint i = 0; i < mnumberofargs; ++i ) @@ -424,7 +424,7 @@ void ObjectHierarchy::serialize( TQDomElement& tqparent, TQDomDocument& doc ) co // TQDomElement ss = doc.createElement( "SelectStatement" ); // ss.appendChild( doc.createTextNode( TQString::tqfromLatin1(mselectstatements[i].c_str() ) ) ); // e.appendChild( ss ); - tqparent.appendChild( e ); + parent.appendChild( e ); } for ( uint i = 0; i < mnodes.size(); ++i ) @@ -440,9 +440,9 @@ void ObjectHierarchy::serialize( TQDomElement& tqparent, TQDomDocument& doc ) co e.setAttribute( "type", TQString::tqfromLatin1( node->type()->fullName() ) ); for ( uint i = 0; i < node->parents().size(); ++i ) { - int tqparent = node->parents()[i] + 1; + int parent = node->parents()[i] + 1; TQDomElement arge = doc.createElement( "arg" ); - arge.appendChild( doc.createTextNode( TQString::number( tqparent ) ) ); + arge.appendChild( doc.createTextNode( TQString::number( parent ) ) ); e.appendChild( arge ); }; } @@ -452,7 +452,7 @@ void ObjectHierarchy::serialize( TQDomElement& tqparent, TQDomDocument& doc ) co e.setAttribute( "action", "fetch-property" ); e.setAttribute( TQString("property"), TQString(node->propinternalname()) ); TQDomElement arge = doc.createElement( "arg" ); - arge.appendChild( doc.createTextNode( TQString::number( node->tqparent() + 1 ) ) ); + arge.appendChild( doc.createTextNode( TQString::number( node->parent() + 1 ) ) ); e.appendChild( arge ); } else @@ -464,7 +464,7 @@ void ObjectHierarchy::serialize( TQDomElement& tqparent, TQDomDocument& doc ) co e.setAttribute( "type", type ); }; - tqparent.appendChild( e ); + parent.appendChild( e ); }; } @@ -473,7 +473,7 @@ ObjectHierarchy::ObjectHierarchy() { } -ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement& tqparent, TQString& error ) +ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement& parent, TQString& error ) { #define KIG_GENERIC_PARSE_ERROR \ { \ @@ -486,7 +486,7 @@ ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement& bool ok = true; TQString tmp; - TQDomElement e = tqparent.firstChild().toElement(); + TQDomElement e = parent.firstChild().toElement(); for (; !e.isNull(); e = e.nextSibling().toElement() ) { if ( e.tagName() != "input" ) break; @@ -565,9 +565,9 @@ ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement& // FetchPropertyNode TQCString propname = e.attribute( "property" ).latin1(); TQDomElement arge = e.firstChild().toElement(); - int tqparent = arge.text().toInt( &ok ); + int parent = arge.text().toInt( &ok ); if ( !ok ) KIG_GENERIC_PARSE_ERROR; - newnode = new FetchPropertyNode( tqparent - 1, propname ); + newnode = new FetchPropertyNode( parent - 1, propname ); } else { @@ -723,12 +723,12 @@ int ObjectHierarchy::storeObject( const ObjectCalcer* o, const std::vector<Objec } else if ( (uint) pl[i] < mnumberofargs ) { - ObjectCalcer* tqparent = o->parents()[i]; + ObjectCalcer* parent = o->parents()[i]; std::vector<ObjectCalcer*> opl = o->parents(); margrequirements[pl[i]] = lowermost( margrequirements[pl[i]], - o->impRequirement( tqparent, opl ) ); + o->impRequirement( parent, opl ) ); musetexts[pl[i]] = margrequirements[pl[i]]->selectStatement(); }; }; @@ -737,12 +737,12 @@ int ObjectHierarchy::storeObject( const ObjectCalcer* o, const std::vector<Objec else if ( dynamic_cast<const ObjectPropertyCalcer*>( o ) ) { assert( pl.size() == 1 ); - int tqparent = pl.front(); + int parent = pl.front(); ObjectCalcer* op = po.front(); assert( op ); uint propid = static_cast<const ObjectPropertyCalcer*>( o )->propId(); assert( propid < op->imp()->propertiesInternalNames().size() ); - mnodes.push_back( new FetchPropertyNode( tqparent, op->imp()->propertiesInternalNames()[propid], propid ) ); + mnodes.push_back( new FetchPropertyNode( parent, op->imp()->propertiesInternalNames()[propid], propid ) ); } else assert( false ); diff --git a/kig/misc/object_hierarchy.h b/kig/misc/object_hierarchy.h index 35e7cbef..5997015c 100644 --- a/kig/misc/object_hierarchy.h +++ b/kig/misc/object_hierarchy.h @@ -73,16 +73,16 @@ public: std::vector<ObjectImp*> calc( const Args& a, const KigDocument& doc ) const; /** - * saves the ObjectHierarchy data in tqchildren xml tags of \p tqparent .. + * saves the ObjectHierarchy data in tqchildren xml tags of \p parent .. */ - void serialize( TQDomElement& tqparent, TQDomDocument& doc ) const; + void serialize( TQDomElement& parent, TQDomDocument& doc ) const; /** - * Deserialize the ObjectHierarchy data from the xml element \p tqparent .. + * Deserialize the ObjectHierarchy data from the xml element \p parent .. * Since this operation can fail for some reasons, we provide it as a * static to return 0 in case of error. */ - static ObjectHierarchy* buildSafeObjectHierarchy( const TQDomElement& tqparent, TQString& error ); -// ObjectHierarchy( const TQDomElement& tqparent ); + static ObjectHierarchy* buildSafeObjectHierarchy( const TQDomElement& parent, TQString& error ); +// ObjectHierarchy( const TQDomElement& parent ); /** * build a set of objects that interdepend according to this diff --git a/kig/modes/edittype.cc b/kig/modes/edittype.cc index e9776204..d2f25a47 100644 --- a/kig/modes/edittype.cc +++ b/kig/modes/edittype.cc @@ -31,8 +31,8 @@ #include <kpushbutton.h> #include <kstdguiitem.h> -EditType::EditType( TQWidget* tqparent, TQString name, TQString desc, TQString icon ) - : EditTypeBase( tqparent, "edittype", true ), mname( name ), mdesc( desc ), micon( icon ) +EditType::EditType( TQWidget* parent, TQString name, TQString desc, TQString icon ) + : EditTypeBase( parent, "edittype", true ), mname( name ), mdesc( desc ), micon( icon ) { // improving GUI look'n'feel... buttonHelp->setGuiItem( KStdGuiItem::help() ); diff --git a/kig/modes/edittype.h b/kig/modes/edittype.h index ac578808..aeb874ad 100644 --- a/kig/modes/edittype.h +++ b/kig/modes/edittype.h @@ -34,7 +34,7 @@ class EditType : public EditTypeBase TQString mdesc; TQString micon; public: - EditType( TQWidget* tqparent, TQString name = TQString(), TQString desc = TQString(), TQString icon = TQString() ); + EditType( TQWidget* parent, TQString name = TQString(), TQString desc = TQString(), TQString icon = TQString() ); ~EditType(); const TQString name() const; const TQString description() const; diff --git a/kig/modes/label.cc b/kig/modes/label.cc index 298e75d0..48f729bf 100644 --- a/kig/modes/label.cc +++ b/kig/modes/label.cc @@ -55,8 +55,8 @@ public: TQPoint plc; // the currently selected coordinate Coordinate mcoord; - // the possible tqparent object that defines the location of the label.. - ObjectCalcer* locationtqparent; + // the possible parent object that defines the location of the label.. + ObjectCalcer* locationparent; // the text is only kept in the text input widget, not here // TQString mtext; @@ -65,7 +65,7 @@ public: // to them in the args object, and keep a pointer to them ( or 0 ) // in the correct order in args ( separately, because we can't use // the order of the parents of a ReferenceObject, and certainly - // can't give 0 as a tqparent.. + // can't give 0 as a parent.. argvect args; // if we're ReallySelectingArgs, then this var points to the arg @@ -90,7 +90,7 @@ TextLabelModeBase::~TextLabelModeBase() TextLabelModeBase::TextLabelModeBase( KigPart& doc ) : KigMode( doc ), d( new Private ) { - d->locationtqparent = 0; + d->locationparent = 0; d->lpc = 0; d->mwawd = SelectingLocation; d->wiz = new TextLabelWizard( doc.widget(), this ); @@ -212,7 +212,7 @@ void TextLabelModeBase::mouseMoved( TQMouseEvent* e, KigWidget* w ) { std::vector<ObjectHolder*> os = mdoc.document().whatAmIOn( w->fromScreen( e->pos() ), *w ); bool attachable = false; - d->locationtqparent = 0; + d->locationparent = 0; for ( std::vector<ObjectHolder*>::iterator i = os.begin(); i != os.end(); ++i ) { if( (*i)->imp()->attachPoint().valid() || @@ -220,7 +220,7 @@ void TextLabelModeBase::mouseMoved( TQMouseEvent* e, KigWidget* w ) (*i)->imp()->inherits( CurveImp::stype() ) ) { attachable = true; - d->locationtqparent = (*i)->calcer(); + d->locationparent = (*i)->calcer(); break; }; }; @@ -228,7 +228,7 @@ void TextLabelModeBase::mouseMoved( TQMouseEvent* e, KigWidget* w ) if ( attachable ) { w->setCursor( KCursor::handCursor() ); - TQString s = d->locationtqparent->imp()->type()->attachToThisStatement(); + TQString s = d->locationparent->imp()->type()->attachToThisStatement(); mdoc.emitStatusBarText( s ); KigPainter p( w->screenInfo(), TQT_TQPAINTDEVICE(&w->curPix), mdoc.document() ); @@ -296,7 +296,7 @@ void TextLabelModeBase::finishPressed() "value for. Please remove them or select enough arguments." ) ); else { - finish( d->mcoord, s, d->args, needframe, d->locationtqparent ); + finish( d->mcoord, s, d->args, needframe, d->locationparent ); killMode(); }; } @@ -452,7 +452,7 @@ TextLabelConstructionMode::~TextLabelConstructionMode() void TextLabelConstructionMode::finish( const Coordinate& coord, const TQString& s, const argvect& props, bool needframe, - ObjectCalcer* locationtqparent ) + ObjectCalcer* locationparent ) { std::vector<ObjectCalcer*> args; for ( argvect::const_iterator i = props.begin(); @@ -460,8 +460,8 @@ void TextLabelConstructionMode::finish( args.push_back( i->get() ); ObjectHolder* label = 0; - if ( locationtqparent ) - label = ObjectFactory::instance()->attachedLabel( s, locationtqparent, coord, needframe, args, mdoc.document() ); + if ( locationparent ) + label = ObjectFactory::instance()->attachedLabel( s, locationparent, coord, needframe, args, mdoc.document() ); else label = ObjectFactory::instance()->label( s, coord, needframe, args, mdoc.document() ); mdoc.addObject( label ); @@ -507,7 +507,7 @@ TextLabelRedefineMode::~TextLabelRedefineMode() void TextLabelRedefineMode::finish( const Coordinate& coord, const TQString& s, const argvect& props, bool needframe, - ObjectCalcer* locationtqparent ) + ObjectCalcer* locationparent ) { std::vector<ObjectCalcer*> parents = mlabel->parents(); assert( parents.size() >= 3 ); @@ -552,19 +552,19 @@ void TextLabelRedefineMode::finish( * take advantage of the method "getAttachPoint" that should * do all the work; it is also used when creating a new label */ - np[1] = ObjectFactory::instance()->getAttachPoint( locationtqparent, coord, mdoc.document() ); + np[1] = ObjectFactory::instance()->getAttachPoint( locationparent, coord, mdoc.document() ); /* this is the old code, just in case... */ -// if ( locationtqparent && locationtqparent->imp()->inherits( CurveImp::stype() ) ) +// if ( locationparent && locationparent->imp()->inherits( CurveImp::stype() ) ) // { -// double param = static_cast<const CurveImp*>( locationtqparent->imp() )->getParam( coord, mdoc.document() ); -// np[1] = ObjectFactory::instance()->constrainedPointCalcer( locationtqparent, param ); +// double param = static_cast<const CurveImp*>( locationparent->imp() )->getParam( coord, mdoc.document() ); +// np[1] = ObjectFactory::instance()->constrainedPointCalcer( locationparent, param ); // np[1]->calc( mdoc.document() ); // } -// else if ( locationtqparent ) +// else if ( locationparent ) // { -// assert( locationtqparent->imp()->inherits( PointImp::stype() ) ); -// np[1] = locationtqparent; +// assert( locationparent->imp()->inherits( PointImp::stype() ) ); +// np[1] = locationparent; // } // else // np[1] = new ObjectConstCalcer( new PointImp( coord ) ); @@ -585,5 +585,5 @@ void TextLabelModeBase::setFrame( bool f ) void TextLabelModeBase::setLocationParent( ObjectCalcer* o ) { - d->locationtqparent = o; + d->locationparent = o; } diff --git a/kig/modes/label.h b/kig/modes/label.h index 7d8f842a..b016d691 100644 --- a/kig/modes/label.h +++ b/kig/modes/label.h @@ -72,7 +72,7 @@ protected: virtual void finish( const Coordinate& c, const TQString& s, const argvect& props, bool needframe, - ObjectCalcer* locationtqparent ) = 0; + ObjectCalcer* locationparent ) = 0; private: // the KigMode interface.. @@ -111,7 +111,7 @@ public: void finish( const Coordinate& coord, const TQString& s, const argvect& props, bool needframe, - ObjectCalcer* locationtqparent ); + ObjectCalcer* locationparent ); }; class TextLabelRedefineMode @@ -120,7 +120,7 @@ class TextLabelRedefineMode ObjectTypeCalcer* mlabel; void finish( const Coordinate& coord, const TQString& s, const argvect& props, bool needframe, - ObjectCalcer* locationtqparent ); + ObjectCalcer* locationparent ); public: TextLabelRedefineMode( KigPart& d, ObjectTypeCalcer* label ); ~TextLabelRedefineMode(); diff --git a/kig/modes/linkslabel.cpp b/kig/modes/linkslabel.cpp index 8d711d65..693c165a 100644 --- a/kig/modes/linkslabel.cpp +++ b/kig/modes/linkslabel.cpp @@ -38,8 +38,8 @@ public: std::vector<KURLLabel*> urllabels; }; -LinksLabel::LinksLabel( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +LinksLabel::LinksLabel( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { p = new Private; p->tqlayout = new TQHBoxLayout( this ); diff --git a/kig/modes/linkslabel.h b/kig/modes/linkslabel.h index 8ed8b04a..e2349361 100644 --- a/kig/modes/linkslabel.h +++ b/kig/modes/linkslabel.h @@ -33,7 +33,7 @@ class LinksLabel : public TQWidget TQ_OBJECT public: - LinksLabel( TQWidget* tqparent = 0, const char* name = 0 ); + LinksLabel( TQWidget* parent = 0, const char* name = 0 ); ~LinksLabel(); class LinksLabelEditBuf diff --git a/kig/modes/macrowizard.cc b/kig/modes/macrowizard.cc index 4a240b74..1b25c803 100644 --- a/kig/modes/macrowizard.cc +++ b/kig/modes/macrowizard.cc @@ -24,8 +24,8 @@ #include <klineedit.h> #include <kapplication.h> -MacroWizard::MacroWizard( TQWidget* tqparent, DefineMacroMode* m ) - : MacroWizardBase( tqparent, "Define Macro Wizard", false ), mmode( m ) +MacroWizard::MacroWizard( TQWidget* parent, DefineMacroMode* m ) + : MacroWizardBase( parent, "Define Macro Wizard", false ), mmode( m ) { connect( KLineEdit2, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( nameTextChanged( const TQString& ) ) ); diff --git a/kig/modes/macrowizard.h b/kig/modes/macrowizard.h index b3b59c66..2680f5ce 100644 --- a/kig/modes/macrowizard.h +++ b/kig/modes/macrowizard.h @@ -27,7 +27,7 @@ class MacroWizard : public MacroWizardBase Q_OBJECT TQ_OBJECT public: - MacroWizard( TQWidget* tqparent, DefineMacroMode* m ); + MacroWizard( TQWidget* parent, DefineMacroMode* m ); ~MacroWizard(); void back(); diff --git a/kig/modes/popup.cc b/kig/modes/popup.cc index 8a3d05e1..32280d62 100644 --- a/kig/modes/popup.cc +++ b/kig/modes/popup.cc @@ -871,7 +871,7 @@ void PropertiesActionsProvider::fillUpMenu( NormalModePopupObjects& popup, add &= ! prop->inherits( BogusImp::stype() ); // we don't want to construct PointImp's coordinate property, // since it would construct a point at the same place as its - // tqparent.. + // parent.. add &= ! ( o->imp()->inherits( PointImp::stype() ) && prop->inherits( PointImp::stype() ) ); } @@ -909,11 +909,11 @@ bool PropertiesActionsProvider::executeAction( } int propid = mprops[menu-1][id]; assert( os.size() == 1 ); - ObjectHolder* tqparent = os[0]; + ObjectHolder* parent = os[0]; if ( menu == NormalModePopupObjects::ShowMenu ) { std::vector<ObjectCalcer*> args; - args.push_back( new ObjectPropertyCalcer( tqparent->calcer(), propid ) ); + args.push_back( new ObjectPropertyCalcer( parent->calcer(), propid ) ); args.back()->calc( doc.document() ); // TODO: recover the cursor position somehow... the following does not work // in general... @@ -924,14 +924,14 @@ bool PropertiesActionsProvider::executeAction( // /////// Coordinate c = Coordinate::invalidCoord(); Coordinate c = w.fromScreen( popup.plc() ); ObjectHolder* label = ObjectFactory::instance()->attachedLabel( - TQString::tqfromLatin1( "%1" ), tqparent->calcer(), c, + TQString::tqfromLatin1( "%1" ), parent->calcer(), c, false, args, doc.document() ); doc.addObject( label ); } else { ObjectHolder* h = new ObjectHolder( - new ObjectPropertyCalcer( tqparent->calcer(), propid ) ); + new ObjectPropertyCalcer( parent->calcer(), propid ) ); h->calc( doc.document() ); doc.addObject( h ); }; diff --git a/kig/modes/textlabelwizard.cc b/kig/modes/textlabelwizard.cc index b79f4a5e..e35e707a 100644 --- a/kig/modes/textlabelwizard.cc +++ b/kig/modes/textlabelwizard.cc @@ -26,8 +26,8 @@ #include <tqlayout.h> -TextLabelWizard::TextLabelWizard( TQWidget* tqparent, TextLabelModeBase* mode ) - : TextLabelWizardBase( tqparent, "TextLabelWizard", false ), mmode( mode ) +TextLabelWizard::TextLabelWizard( TQWidget* parent, TextLabelModeBase* mode ) + : TextLabelWizardBase( parent, "TextLabelWizard", false ), mmode( mode ) { connect( labelTextInput, TQT_SIGNAL( textChanged() ), TQT_SLOT( textChanged() ) ); diff --git a/kig/modes/textlabelwizard.h b/kig/modes/textlabelwizard.h index c6f0a7ca..5aec81a4 100644 --- a/kig/modes/textlabelwizard.h +++ b/kig/modes/textlabelwizard.h @@ -27,7 +27,7 @@ class TextLabelWizard : public TextLabelWizardBase Q_OBJECT TQ_OBJECT public: - TextLabelWizard( TQWidget* tqparent, TextLabelModeBase* mode ); + TextLabelWizard( TQWidget* parent, TextLabelModeBase* mode ); ~TextLabelWizard(); void back(); diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp index 0371ca7f..97973857 100644 --- a/kig/modes/typesdialog.cpp +++ b/kig/modes/typesdialog.cpp @@ -58,8 +58,8 @@ MacroListElement::MacroListElement( KListView* lv, Macro* m ) { } -TypesDialog::TypesDialog( TQWidget* tqparent, KigPart& part ) - : TypesDialogBase( tqparent, "types_dialog", true ), mpart( part ) +TypesDialog::TypesDialog( TQWidget* parent, KigPart& part ) + : TypesDialogBase( parent, "types_dialog", true ), mpart( part ) { // improving GUI look'n'feel... buttonHelp->setGuiItem( KStdGuiItem::help() ); diff --git a/kig/modes/typesdialog.h b/kig/modes/typesdialog.h index 8275b653..03eed111 100644 --- a/kig/modes/typesdialog.h +++ b/kig/modes/typesdialog.h @@ -46,7 +46,7 @@ class TypesDialog : public TypesDialogBase const KIconLoader* il; TQPopupMenu* popup; public: - TypesDialog( TQWidget* tqparent, KigPart& ); + TypesDialog( TQWidget* parent, KigPart& ); ~TypesDialog(); public slots: diff --git a/kig/objects/locus_imp.h b/kig/objects/locus_imp.h index d6d93217..568e0e7c 100644 --- a/kig/objects/locus_imp.h +++ b/kig/objects/locus_imp.h @@ -24,7 +24,7 @@ /** * LocusImp is an imp that consists of a copy of the curveimp that the * moving point moves over, and an ObjectHierarchy that can calc ( - * given a point, and optionally some more tqparent objects the position + * given a point, and optionally some more parent objects the position * of the moving point. The hierarchy should take the moving point as * its *first* argument and all others after that. The others are * used to make it possible for Locus to be updated when some of the diff --git a/kig/objects/object_calcer.cc b/kig/objects/object_calcer.cc index f6952768..0bf4e774 100644 --- a/kig/objects/object_calcer.cc +++ b/kig/objects/object_calcer.cc @@ -131,21 +131,21 @@ const ObjectType* ObjectTypeCalcer::type() const return mtype; } -ObjectPropertyCalcer::ObjectPropertyCalcer( ObjectCalcer* tqparent, int propid ) - : mimp( 0 ), mtqparent( tqparent ), mpropid( propid ) +ObjectPropertyCalcer::ObjectPropertyCalcer( ObjectCalcer* parent, int propid ) + : mimp( 0 ), mparent( parent ), mpropid( propid ) { // Some weird C++ thing prevents me from calling protected members - // of ObjectCalcer on mtqparent.. This is an ugly workaround.. - ( mtqparent->*&ObjectCalcer::addChild )( this ); - //mtqparent->addChild( this ); + // of ObjectCalcer on mparent.. This is an ugly workaround.. + ( mparent->*&ObjectCalcer::addChild )( this ); + //mparent->addChild( this ); } ObjectPropertyCalcer::~ObjectPropertyCalcer() { // Some weird C++ thing prevents me from calling protected members - // of ObjectCalcer on mtqparent.. This is an ugly workaround.. - ( mtqparent->*&ObjectCalcer::delChild )( this ); - //mtqparent->delChild( this ); + // of ObjectCalcer on mparent.. This is an ugly workaround.. + ( mparent->*&ObjectCalcer::delChild )( this ); + //mparent->delChild( this ); delete mimp; } @@ -157,13 +157,13 @@ const ObjectImp* ObjectPropertyCalcer::imp() const std::vector<ObjectCalcer*> ObjectPropertyCalcer::parents() const { std::vector<ObjectCalcer*> ret; - ret.push_back( mtqparent ); + ret.push_back( mparent ); return ret; } void ObjectPropertyCalcer::calc( const KigDocument& doc ) { - ObjectImp* n = mtqparent->imp()->property( mpropid, doc ); + ObjectImp* n = mparent->imp()->property( mpropid, doc ); delete mimp; mimp = n; } @@ -183,7 +183,7 @@ std::vector<ObjectCalcer*> ObjectCalcer::tqchildren() const const ObjectImpType* ObjectPropertyCalcer::impRequirement( ObjectCalcer*, const std::vector<ObjectCalcer*>& ) const { - return mtqparent->imp()->impRequirementForProperty( mpropid ); + return mparent->imp()->impRequirementForProperty( mpropid ); } const ObjectImpType* ObjectConstCalcer::impRequirement( @@ -276,9 +276,9 @@ void ObjectTypeCalcer::move( const Coordinate& to, const KigDocument& doc ) mtype->move( *this, to, doc ); } -ObjectCalcer* ObjectPropertyCalcer::tqparent() const +ObjectCalcer* ObjectPropertyCalcer::parent() const { - return mtqparent; + return mparent; } ObjectCalcer::ObjectCalcer() @@ -303,8 +303,8 @@ bool ObjectConstCalcer::isDefinedOnOrThrough( const ObjectCalcer* ) const bool ObjectPropertyCalcer::isDefinedOnOrThrough( const ObjectCalcer* o ) const { - return o == mtqparent && - mtqparent->imp()->isPropertyDefinedOnOrThroughThisImp( propId() ); + return o == mparent && + mparent->imp()->isPropertyDefinedOnOrThroughThisImp( propId() ); } bool ObjectTypeCalcer::isDefinedOnOrThrough( const ObjectCalcer* o ) const diff --git a/kig/objects/object_calcer.h b/kig/objects/object_calcer.h index 92eebc8e..98262e5e 100644 --- a/kig/objects/object_calcer.h +++ b/kig/objects/object_calcer.h @@ -90,7 +90,7 @@ public: */ void addChild( ObjectCalcer* c ); /** - * a calcer should call this in its destructor, to inform its tqparent + * a calcer should call this in its destructor, to inform its parent * that it is no longer a child of this calcer. This will release * the reference taken in addChild.. */ @@ -106,7 +106,7 @@ public: virtual ~ObjectCalcer(); /** - * Returns the tqparent ObjectCalcer's of this ObjectCalcer. + * Returns the parent ObjectCalcer's of this ObjectCalcer. */ virtual std::vector<ObjectCalcer*> parents() const = 0; /** @@ -124,7 +124,7 @@ public: * certain type. This method returns the ObjectImpType that \p o * should have. \p os is a list of all the parents in order, and * \p o is part of it. This method will return the ObjectImpType - * that the tqparent should *at least* be. For example, a Translated + * that the parent should *at least* be. For example, a Translated * object can translate any sort of object, so it will return * ObjectImp::stype() here ( the topmost ObjectImpType, that all * other ObjectImpType's inherit ). @@ -267,7 +267,7 @@ public: }; /** - * This is an ObjectCalcer that has a single tqparent, and gets a + * This is an ObjectCalcer that has a single parent, and gets a * certain property from it in its calc() method. * * \see ObjectImp::property @@ -276,14 +276,14 @@ class ObjectPropertyCalcer : public ObjectCalcer { ObjectImp* mimp; - ObjectCalcer* mtqparent; + ObjectCalcer* mparent; int mpropid; public: /** * Construct a new ObjectPropertyCalcer, that will get the property - * from tqparent with number propid. + * from parent with number propid. */ - ObjectPropertyCalcer( ObjectCalcer* tqparent, int propid ); + ObjectPropertyCalcer( ObjectCalcer* parent, int propid ); ~ObjectPropertyCalcer(); const ObjectImp* imp() const; @@ -291,7 +291,7 @@ public: void calc( const KigDocument& doc ); int propId() const; - ObjectCalcer* tqparent() const; + ObjectCalcer* parent() const; const ObjectImpType* impRequirement( ObjectCalcer* o, const std::vector<ObjectCalcer*>& os ) const; diff --git a/kig/objects/object_factory.cc b/kig/objects/object_factory.cc index aabc82be..942139f4 100644 --- a/kig/objects/object_factory.cc +++ b/kig/objects/object_factory.cc @@ -266,12 +266,12 @@ ObjectCalcer* ObjectFactory::getAttachPoint( } ObjectHolder* ObjectFactory::attachedLabel( - const TQString& s, ObjectCalcer* locationtqparent, + const TQString& s, ObjectCalcer* locationparent, const Coordinate& loc, bool needframe, const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const { - return new ObjectHolder( attachedLabelCalcer( s, locationtqparent, loc, needframe, parents, doc ) ); + return new ObjectHolder( attachedLabelCalcer( s, locationparent, loc, needframe, parents, doc ) ); } ObjectPropertyCalcer* ObjectFactory::propertyObjectCalcer( @@ -299,7 +299,7 @@ void ObjectFactory::redefinePoint( std::mem_fun( calcmeth ) ); ObjectCalcer* v = 0; - // we don't want one of our tqchildren as a tqparent... + // we don't want one of our tqchildren as a parent... std::set<ObjectCalcer*> tqchildren = getAllChildren( point ); for ( std::vector<ObjectCalcer*>::iterator i = os.begin(); i != os.end(); ++i ) diff --git a/kig/objects/object_factory.h b/kig/objects/object_factory.h index d99cce8b..30f080d9 100644 --- a/kig/objects/object_factory.h +++ b/kig/objects/object_factory.h @@ -108,10 +108,10 @@ public: /** * this one does the same as the above, only that the new label is - * attached to locationtqparent if it is non-null.. + * attached to locationparent if it is non-null.. */ ObjectTypeCalcer* attachedLabelCalcer( - const TQString& s, ObjectCalcer* locationtqparent, + const TQString& s, ObjectCalcer* locationparent, const Coordinate& loc, bool needframe, const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const; @@ -121,11 +121,11 @@ public: * attach point from the method above */ ObjectCalcer* getAttachPoint( - ObjectCalcer* locationtqparent, + ObjectCalcer* locationparent, const Coordinate& loc, const KigDocument& doc ) const; ObjectHolder* attachedLabel( - const TQString& s, ObjectCalcer* locationtqparent, + const TQString& s, ObjectCalcer* locationparent, const Coordinate& loc, bool needframe, const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const; diff --git a/kig/objects/object_imp.cc b/kig/objects/object_imp.cc index 7b2498a3..9a3ee679 100644 --- a/kig/objects/object_imp.cc +++ b/kig/objects/object_imp.cc @@ -178,7 +178,7 @@ bool ObjectImp::canFillInNextEscape() const return false; } -ObjectImpType::ObjectImpType( const ObjectImpType* tqparent, +ObjectImpType::ObjectImpType( const ObjectImpType* parent, const char* internalname, const char* translatedname, const char* selectstatement, @@ -189,7 +189,7 @@ ObjectImpType::ObjectImpType( const ObjectImpType* tqparent, const char* attachtothisstatement, const char* showastatement, const char* hideastatement ) - : mtqparent( tqparent ), minternalname( internalname ), + : mparent( parent ), minternalname( internalname ), mtranslatedname( translatedname ), mselectstatement( selectstatement ), mselectnamestatement( selectnamestatement ), mremoveastatement( removeastatement ), maddastatement( addastatement ), @@ -207,7 +207,7 @@ ObjectImpType::~ObjectImpType() bool ObjectImpType::inherits( const ObjectImpType* t ) const { - return t == this || (mtqparent && mtqparent->inherits( t ) ); + return t == this || (mparent && mparent->inherits( t ) ); } const char* ObjectImpType::internalName() const diff --git a/kig/objects/object_imp.h b/kig/objects/object_imp.h index 46166858..ddf0eb46 100644 --- a/kig/objects/object_imp.h +++ b/kig/objects/object_imp.h @@ -87,7 +87,7 @@ typedef unsigned int uint; */ class ObjectImpType { - const ObjectImpType* mtqparent; + const ObjectImpType* mparent; const char* minternalname; const char* mtranslatedname; const char* mselectstatement; @@ -126,12 +126,12 @@ public: * hideastatement is a translatable string like "Hide a Segment" * * All translatable strings should have - * I18N_NOOP around them ! @param tqparent is the ObjectImpType of - * your tqparent ObjectImp type. Never give 0 as tqparent, except for + * I18N_NOOP around them ! @param parent is the ObjectImpType of + * your parent ObjectImp type. Never give 0 as parent, except for * the top ObjectImp ObjectImpType.. */ ObjectImpType( - const ObjectImpType* tqparent, const char* internalname, + const ObjectImpType* parent, const char* internalname, const char* translatedname, const char* selectstatement, const char* selectnamestatement, diff --git a/kig/objects/object_imp_factory.cc b/kig/objects/object_imp_factory.cc index 116f0d0d..a29cf5e8 100644 --- a/kig/objects/object_imp_factory.cc +++ b/kig/objects/object_imp_factory.cc @@ -48,25 +48,25 @@ ObjectImpFactory::~ObjectImpFactory() { } -static void addXYElements( const Coordinate& c, TQDomElement& tqparent, TQDomDocument& doc ) +static void addXYElements( const Coordinate& c, TQDomElement& parent, TQDomDocument& doc ) { TQDomElement xe = doc.createElement( "x" ); xe.appendChild( doc.createTextNode( TQString::number( c.x ) ) ); - tqparent.appendChild( xe ); + parent.appendChild( xe ); TQDomElement ye = doc.createElement( "y" ); ye.appendChild( doc.createTextNode( TQString::number( c.y ) ) ); - tqparent.appendChild( ye ); + parent.appendChild( ye ); } -static void addDoubleElement( const char* name, double d, TQDomElement& tqparent, TQDomDocument& doc ) +static void addDoubleElement( const char* name, double d, TQDomElement& parent, TQDomDocument& doc ) { TQDomElement e = doc.createElement( name ); e.appendChild( doc.createTextNode( TQString::number( d ) ) ); - tqparent.appendChild( e ); + parent.appendChild( e ); } static void addCoordinateElement( const char* name, const Coordinate& d, TQDomElement& p, TQDomDocument& doc ) @@ -76,40 +76,40 @@ static void addCoordinateElement( const char* name, const Coordinate& d, TQDomEl p.appendChild( e ); } -TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& tqparent, +TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent, TQDomDocument& doc ) const { if( d.inherits( IntImp::stype() ) ) { - tqparent.appendChild( + parent.appendChild( doc.createTextNode( TQString::number( static_cast<const IntImp&>( d ).data() ) ) ); return TQString::tqfromLatin1( "int" ); } else if ( d.inherits( DoubleImp::stype() ) ) { - tqparent.appendChild( + parent.appendChild( doc.createTextNode( TQString::number( static_cast<const DoubleImp&>( d ).data() ) ) ); return TQString::tqfromLatin1( "double" ); } else if( d.inherits( StringImp::stype() ) ) { - tqparent.appendChild( + parent.appendChild( doc.createTextNode( static_cast<const StringImp&>( d ).data() ) ); return TQString::tqfromLatin1( "string" ); } else if ( d.inherits( TestResultImp::stype() ) ) { - tqparent.appendChild( + parent.appendChild( doc.createTextNode( static_cast<const TestResultImp&>( d ).data() ) ); return TQString::tqfromLatin1( "testresult" ); } else if( d.inherits( HierarchyImp::stype() ) ) { - static_cast<const HierarchyImp&>( d ).data().serialize( tqparent, doc ); + static_cast<const HierarchyImp&>( d ).data().serialize( parent, doc ); return TQString::tqfromLatin1( "hierarchy" ); } else if ( d.inherits( TransformationImp::stype() ) ) @@ -128,20 +128,20 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& tqparent matrixe.appendChild( elel ); }; } - tqparent.appendChild( matrixe ); + parent.appendChild( matrixe ); TQDomElement homothetye = doc.createElement( "homothetic" ); const char* ishomothety = trans.isHomothetic() ? "true" : "false"; homothetye.appendChild( doc.createTextNode( ishomothety ) ); - tqparent.appendChild( homothetye ); + parent.appendChild( homothetye ); return TQString::tqfromLatin1( "transformation" ); } else if( d.inherits( AbstractLineImp::stype() ) ) { LineData l = static_cast<const AbstractLineImp&>( d ).data(); - addCoordinateElement( "a", l.a, tqparent, doc ); - addCoordinateElement( "b", l.b, tqparent, doc ); + addCoordinateElement( "a", l.a, parent, doc ); + addCoordinateElement( "b", l.b, parent, doc ); if( d.inherits( SegmentImp::stype() ) ) return TQString::tqfromLatin1( "segment" ); else if( d.inherits( RayImp::stype() ) ) @@ -151,34 +151,34 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& tqparent else if( d.inherits( PointImp::stype() ) ) { addXYElements( static_cast<const PointImp&>( d ).coordinate(), - tqparent, doc ); + parent, doc ); return TQString::tqfromLatin1( "point" ); } else if( d.inherits( TextImp::stype() ) ) { TQString text = static_cast<const TextImp&>( d ).text(); - tqparent.appendChild( + parent.appendChild( doc.createTextNode( text ) ); return TQString::tqfromLatin1( "text" ); } else if( d.inherits( AngleImp::stype() ) ) { - addDoubleElement( "size", static_cast<const AngleImp&>( d ).size(), tqparent, doc ); + addDoubleElement( "size", static_cast<const AngleImp&>( d ).size(), parent, doc ); return TQString::tqfromLatin1( "angle" ); } else if ( d.inherits( ArcImp::stype() ) ) { const ArcImp& a = static_cast<const ArcImp&>( d ); - addCoordinateElement( "center", a.center(), tqparent, doc ); - addDoubleElement( "radius", a.radius(), tqparent, doc ); - addDoubleElement( "startangle", a.startAngle(), tqparent, doc ); - addDoubleElement( "angle", a.angle(), tqparent, doc ); + addCoordinateElement( "center", a.center(), parent, doc ); + addDoubleElement( "radius", a.radius(), parent, doc ); + addDoubleElement( "startangle", a.startAngle(), parent, doc ); + addDoubleElement( "angle", a.angle(), parent, doc ); return TQString::tqfromLatin1( "arc" ); } else if( d.inherits( VectorImp::stype() ) ) { Coordinate dir = static_cast<const VectorImp&>( d ).dir(); - addXYElements( dir, tqparent, doc ); + addXYElements( dir, parent, doc ); return TQString::tqfromLatin1( "vector" ); } else if( d.inherits( LocusImp::stype() ) ) @@ -190,29 +190,29 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& tqparent const CurveImp& curveimp = *locus.curve(); TQString type = serialize( curveimp, curve, doc ); curve.setAttribute( "type", type ); - tqparent.appendChild( curve ); + parent.appendChild( curve ); // serialize the hierarchy.. TQDomElement hier = doc.createElement( "calculation" ); locus.hierarchy().serialize( hier, doc ); - tqparent.appendChild( hier ); + parent.appendChild( hier ); return TQString::tqfromLatin1( "locus" ); } else if( d.inherits( CircleImp::stype() ) ) { const CircleImp& c = static_cast<const CircleImp&>( d ); - addCoordinateElement( "center", c.center(), tqparent, doc ); - addDoubleElement( "radius", c.radius(), tqparent, doc ); + addCoordinateElement( "center", c.center(), parent, doc ); + addDoubleElement( "radius", c.radius(), parent, doc ); return TQString::tqfromLatin1( "circle" ); } else if( d.inherits( ConicImp::stype() ) ) { const ConicPolarData data = static_cast<const ConicImp&>( d ).polarData(); - addCoordinateElement( "focus1", data.focus1, tqparent, doc ); - addDoubleElement( "pdimen", data.pdimen, tqparent, doc ); - addDoubleElement( "ecostheta0", data.ecostheta0, tqparent, doc ); - addDoubleElement( "esintheta0", data.esintheta0, tqparent, doc ); + addCoordinateElement( "focus1", data.focus1, parent, doc ); + addDoubleElement( "pdimen", data.pdimen, parent, doc ); + addDoubleElement( "ecostheta0", data.ecostheta0, parent, doc ); + addDoubleElement( "esintheta0", data.esintheta0, parent, doc ); return TQString::tqfromLatin1( "conic" ); } else if( d.inherits( CubicImp::stype() ) ) @@ -229,7 +229,7 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& tqparent addDoubleElement( "a112", data.coeffs[7], coeffs, doc ); addDoubleElement( "a122", data.coeffs[8], coeffs, doc ); addDoubleElement( "a222", data.coeffs[9], coeffs, doc ); - tqparent.appendChild( coeffs ); + parent.appendChild( coeffs ); return TQString::tqfromLatin1( "cubic" ); } assert( false ); @@ -285,7 +285,7 @@ static double readDoubleElement( TQDomNode n, bool& ok, } ObjectImp* ObjectImpFactory::deserialize( const TQString& type, - const TQDomElement& tqparent, + const TQDomElement& parent, TQString& error ) const { #define KIG_GENERIC_PARSE_ERROR \ @@ -298,27 +298,27 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type, bool ok = true; if ( type == "int" ) { - int ret = tqparent.text().toInt( &ok ); + int ret = parent.text().toInt( &ok ); if ( ! ok ) KIG_GENERIC_PARSE_ERROR; return new IntImp( ret ); } else if ( type == "double" ) { - double ret = tqparent.text().toDouble( &ok ); + double ret = parent.text().toDouble( &ok ); if ( ! ok ) KIG_GENERIC_PARSE_ERROR; return new DoubleImp( ret ); } else if ( type == "string" ) { - return new StringImp( tqparent.text() ); + return new StringImp( parent.text() ); } else if ( type == "testresult" ) { - return new TestResultImp( tqparent.text() ); + return new TestResultImp( parent.text() ); } else if ( type == "hierarchy" ) { - ObjectHierarchy* hier = ObjectHierarchy::buildSafeObjectHierarchy( tqparent, error ); + ObjectHierarchy* hier = ObjectHierarchy::buildSafeObjectHierarchy( parent, error ); if ( ! hier ) return 0; HierarchyImp* imp = new HierarchyImp( *hier ); delete hier; @@ -328,7 +328,7 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type, { double data[3][3]; bool homothetic = false; - for ( TQDomElement childe = tqparent.firstChild().toElement(); + for ( TQDomElement childe = parent.firstChild().toElement(); ! childe.isNull(); childe = childe.nextSibling().toElement() ) { if ( childe.tagName() == "matrix" ) @@ -357,13 +357,13 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type, } else if ( type == "point" ) { - Coordinate ret = readXYElements( tqparent, ok ); + Coordinate ret = readXYElements( parent, ok ); if ( ! ok ) KIG_GENERIC_PARSE_ERROR; return new PointImp( ret ); } else if ( type == "line" || type == "segment" || type == "ray" ) { - TQDomNode n = tqparent.firstChild(); + TQDomNode n = parent.firstChild(); Coordinate a = readCoordinateElement( n, ok, "a" ); if ( !ok ) KIG_GENERIC_PARSE_ERROR; n = n.nextSibling(); @@ -375,13 +375,13 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type, } else if( type == "angle" ) { - double size = readDoubleElement( tqparent.firstChild(), ok, "size" ); + double size = readDoubleElement( parent.firstChild(), ok, "size" ); if ( ! ok ) KIG_GENERIC_PARSE_ERROR; return new AngleImp( Coordinate(), 0, size ); } else if ( type == "arc" ) { - TQDomNode n = tqparent.firstChild(); + TQDomNode n = parent.firstChild(); Coordinate center = readCoordinateElement( n, ok, "center" ); if ( ! ok ) KIG_GENERIC_PARSE_ERROR; n = n.nextSibling(); @@ -397,13 +397,13 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type, } else if( type == "vector" ) { - Coordinate dir = readXYElements( tqparent, ok ); + Coordinate dir = readXYElements( parent, ok ); if ( ! ok ) KIG_GENERIC_PARSE_ERROR; return new VectorImp( Coordinate(), dir ); } else if( type == "locus" ) { - TQDomElement curvee = tqparent.firstChild().toElement(); + TQDomElement curvee = parent.firstChild().toElement(); if ( curvee.isNull() || curvee.tagName() != "curve" ) KIG_GENERIC_PARSE_ERROR; TQString type = curvee.attribute( "type" ); ObjectImp* oi = deserialize( type, curvee, error ); @@ -417,7 +417,7 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type, } else if( type == "circle" ) { - TQDomNode n = tqparent.firstChild(); + TQDomNode n = parent.firstChild(); Coordinate center = readCoordinateElement( n, ok, "center" ); if ( ! ok ) KIG_GENERIC_PARSE_ERROR; @@ -429,7 +429,7 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type, } else if( type == "conic" ) { - TQDomNode n = tqparent.firstChild(); + TQDomNode n = parent.firstChild(); Coordinate focus1 = readCoordinateElement( n, ok, "focus1" ); if ( ! ok ) KIG_GENERIC_PARSE_ERROR; @@ -450,7 +450,7 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type, } else if( type == "cubic" ) { - TQDomElement coeffse = tqparent.firstChild().toElement(); + TQDomElement coeffse = parent.firstChild().toElement(); if ( coeffse.isNull() || coeffse.tagName() != "coefficients" ) KIG_GENERIC_PARSE_ERROR; diff --git a/kig/objects/object_imp_factory.h b/kig/objects/object_imp_factory.h index 6056f45d..1ac08dde 100644 --- a/kig/objects/object_imp_factory.h +++ b/kig/objects/object_imp_factory.h @@ -27,14 +27,14 @@ class ObjectImpFactory public: static const ObjectImpFactory* instance(); /** - * loads data from \p tqparent , and returns a new ObjectImp from the type + * loads data from \p parent , and returns a new ObjectImp from the type * string \p type . */ - ObjectImp* deserialize( const TQString& type, const TQDomElement& tqparent, TQString& error ) const; + ObjectImp* deserialize( const TQString& type, const TQDomElement& parent, TQString& error ) const; /** - * adds data to \p tqparent , and returns a type string.. + * adds data to \p parent , and returns a type string.. */ - TQString serialize( const ObjectImp& d, TQDomElement& tqparent, TQDomDocument& doc ) const; + TQString serialize( const ObjectImp& d, TQDomElement& parent, TQDomDocument& doc ) const; }; #endif diff --git a/kig/objects/other_type.cc b/kig/objects/other_type.cc index 80986e82..27787986 100644 --- a/kig/objects/other_type.cc +++ b/kig/objects/other_type.cc @@ -182,7 +182,7 @@ Args CopyObjectType::sortArgs( const Args& args ) const bool CopyObjectType::isDefinedOnOrThrough( const ObjectImp*, const Args& ) const { - // TODO: vragen aan tqparent ? + // TODO: vragen aan parent ? // TODO: translate the above TODO ? return false; } diff --git a/kig/pykig/pykig.py b/kig/pykig/pykig.py index b8c97c7a..106c8a0c 100755 --- a/kig/pykig/pykig.py +++ b/kig/pykig/pykig.py @@ -457,9 +457,9 @@ class Property(PropObj): genealogia: Property <- PropObj <- KigDOP <- object """ - def __init__(self, type, tqparent, shown, name, internal, + def __init__(self, type, parent, shown, name, internal, width, pointstyle, linestyle, color): - PropObj.__init__(self, True, type, (tqparent,), shown, name, internal, + PropObj.__init__(self, True, type, (parent,), shown, name, internal, width, pointstyle, linestyle, color) # print shown diff --git a/kig/scripting/newscriptwizard.cc b/kig/scripting/newscriptwizard.cc index cc3e1771..255a6073 100644 --- a/kig/scripting/newscriptwizard.cc +++ b/kig/scripting/newscriptwizard.cc @@ -56,8 +56,8 @@ NewScriptWizard::~NewScriptWizard() } } -NewScriptWizard::NewScriptWizard( TQWidget* tqparent, ScriptModeBase* mode ) - : NewScriptWizardBase( tqparent, "New Script Wizard" ), +NewScriptWizard::NewScriptWizard( TQWidget* parent, ScriptModeBase* mode ) + : NewScriptWizardBase( parent, "New Script Wizard" ), mmode( mode ) { document = KTextEditor::EditorChooser::createDocument( 0, "KTextEditor::Document" ); diff --git a/kig/scripting/newscriptwizard.h b/kig/scripting/newscriptwizard.h index 403236ee..0a76f58f 100644 --- a/kig/scripting/newscriptwizard.h +++ b/kig/scripting/newscriptwizard.h @@ -38,7 +38,7 @@ class NewScriptWizard TQ_OBJECT ScriptModeBase* mmode; public: - NewScriptWizard( TQWidget* tqparent, ScriptModeBase* mode ); + NewScriptWizard( TQWidget* parent, ScriptModeBase* mode ); ~NewScriptWizard(); void back(); |