summaryrefslogtreecommitdiffstats
path: root/kig
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
commitd8762de95349dc6edaa34db9bf699b367c1af6b1 (patch)
tree8c76a6ab8e4e92d13196cb11ddab2d0fb64ec680 /kig
parent03458c4e2ca2e92deafe078d0e09e1acd4c4765f (diff)
downloadtdeedu-d8762de95349dc6edaa34db9bf699b367c1af6b1.tar.gz
tdeedu-d8762de95349dc6edaa34db9bf699b367c1af6b1.zip
rename the following methods:
tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kig')
-rw-r--r--kig/DESIGN2
-rw-r--r--kig/FEATURES4
-rw-r--r--kig/README.boost-python1.30-gcc3.22
-rw-r--r--kig/examples/session_alotofthings.fgeo6
-rw-r--r--kig/filters/exporter.cc2
-rw-r--r--kig/filters/filter.cc2
-rw-r--r--kig/filters/filter.h2
-rw-r--r--kig/filters/kseg-filter.cc4
-rw-r--r--kig/filters/latexexporter.cc2
-rw-r--r--kig/filters/native-filter.cc8
-rw-r--r--kig/kfile/kfile_drgeo.cpp2
-rw-r--r--kig/kig/kig_document.cc2
-rw-r--r--kig/kig/kig_part.cpp4
-rw-r--r--kig/kig/kig_view.cpp2
-rw-r--r--kig/misc/builtin_stuff.cc2
-rw-r--r--kig/misc/calcpaths.cc2
-rw-r--r--kig/misc/common.cpp12
-rw-r--r--kig/misc/coordinate_system.cpp12
-rw-r--r--kig/misc/guiaction.cc2
-rw-r--r--kig/misc/kigpainter.cpp6
-rw-r--r--kig/misc/object_constructor.cc4
-rw-r--r--kig/misc/object_hierarchy.cc10
-rw-r--r--kig/misc/rect.cc4
-rw-r--r--kig/misc/rect.h4
-rw-r--r--kig/misc/special_constructors.cc2
-rw-r--r--kig/modes/construct_mode.cc2
-rw-r--r--kig/modes/moving.cc2
-rw-r--r--kig/objects/bogus_imp.cc2
-rw-r--r--kig/objects/bogus_imp.h2
-rw-r--r--kig/objects/circle_imp.cc10
-rw-r--r--kig/objects/circle_imp.h2
-rw-r--r--kig/objects/conic_imp.cc2
-rw-r--r--kig/objects/conic_imp.h2
-rw-r--r--kig/objects/cubic_imp.cc6
-rw-r--r--kig/objects/cubic_imp.h2
-rw-r--r--kig/objects/line_imp.cc6
-rw-r--r--kig/objects/line_imp.h6
-rw-r--r--kig/objects/locus_imp.cc2
-rw-r--r--kig/objects/locus_imp.h2
-rw-r--r--kig/objects/object_calcer.cc2
-rw-r--r--kig/objects/object_drawer.cc4
-rw-r--r--kig/objects/object_drawer.h2
-rw-r--r--kig/objects/object_factory.cc2
-rw-r--r--kig/objects/object_holder.cc4
-rw-r--r--kig/objects/object_holder.h2
-rw-r--r--kig/objects/object_imp.h2
-rw-r--r--kig/objects/object_type_factory.cc4
-rw-r--r--kig/objects/object_type_factory.h2
-rw-r--r--kig/objects/other_imp.cc8
-rw-r--r--kig/objects/other_imp.h6
-rw-r--r--kig/objects/point_imp.cc4
-rw-r--r--kig/objects/point_imp.h2
-rw-r--r--kig/objects/polygon_imp.cc4
-rw-r--r--kig/objects/polygon_imp.h2
-rw-r--r--kig/objects/text_imp.cc4
-rw-r--r--kig/objects/text_imp.h4
-rwxr-xr-xkig/pykig/pykig.py2
57 files changed, 106 insertions, 106 deletions
diff --git a/kig/DESIGN b/kig/DESIGN
index 3c922c67..06a9660e 100644
--- a/kig/DESIGN
+++ b/kig/DESIGN
@@ -158,7 +158,7 @@ Most of this is handled by the TextType class.
2.1.2 TextType
-The TextType class is an implementation of an ObjectType. It tqcontains
+The TextType class is an implementation of an ObjectType. It contains
code specifying how to calculate a TextImp from its parents, and for
how it behaves on user input. A text object has at least three
parents, and can handle any number of optional arguments. The three
diff --git a/kig/FEATURES b/kig/FEATURES
index 054ce9bc..012f49f1 100644
--- a/kig/FEATURES
+++ b/kig/FEATURES
@@ -16,7 +16,7 @@ here are some nice Kig features i'd like to show off :)
- is a KPart: try opening macrotest.kig from konqueror, if it doesn't
work yet, open your kcontrol, then go to "File Browsing"->"File
Associations", click add, group:"application", name:"x-kig", open
- the "embedding" tab page for the new type, click "add", tqfind
+ the "embedding" tab page for the new type, click "add", find
"KigPart" (if you installed Kig correctly (did you get the
"--prefix" on your configure right?) , it should be there), and add
it. then try opening macrotest.kig again
@@ -30,7 +30,7 @@ here are some nice Kig features i'd like to show off :)
Moreover, the other supported formats are: XFig files, and SVG and
LaTeX documents. These are useful since not all other programs
support Kig files yet... ;)
-- Kig is very compatible with the program it was intended to tqreplace,
+- Kig is very compatible with the program it was intended to replace,
KGeo. It supports all of its Object types and most of its file
format...
- There is a very flexible mechanism for supporting TextLabels with
diff --git a/kig/README.boost-python1.30-gcc3.2 b/kig/README.boost-python1.30-gcc3.2
index 959d5264..cafda75e 100644
--- a/kig/README.boost-python1.30-gcc3.2
+++ b/kig/README.boost-python1.30-gcc3.2
@@ -12,7 +12,7 @@ be applied in the following way.
Open a console window, and go to the directory containing the
Boost.Python headers. This will most likely be called something like
"/usr/include/boost/python/". Then execute the following commands (
-before giving these commands, tqreplace "/dir/to/kig/distribution/" by
+before giving these commands, replace "/dir/to/kig/distribution/" by
the directory where you put the downloaded kig distribution ):
cd object
diff --git a/kig/examples/session_alotofthings.fgeo b/kig/examples/session_alotofthings.fgeo
index b47c31d9..a2d3dbeb 100644
--- a/kig/examples/session_alotofthings.fgeo
+++ b/kig/examples/session_alotofthings.fgeo
@@ -63,7 +63,7 @@
<tqparent ref="82BF640"/>
</point>
</drgeo>
- <text name="Testo 1">Figure 1 tqcontains:
+ <text name="Testo 1">Figure 1 contains:
- some points;
- an arc;
- a line;
@@ -72,14 +72,14 @@
- an intersection point;
- a reflection point;
-Figure 2 tqcontains:
+Figure 2 contains:
- some points;
- 2 lines;
- a midpoint;
- a parallel;
- 2 intersection points;
-Figure 3 tqcontains:
+Figure 3 contains:
- some points;
- a circle;
- a vector;
diff --git a/kig/filters/exporter.cc b/kig/filters/exporter.cc
index f2847c0a..875dab17 100644
--- a/kig/filters/exporter.cc
+++ b/kig/filters/exporter.cc
@@ -297,7 +297,7 @@ void XFigExportImpVisitor::mapColor( const ObjectDrawer* obj )
void XFigExportImpVisitor::visit( ObjectHolder* obj )
{
if ( ! obj->drawer()->shown() ) return;
- assert( mcolormap.tqfind( obj->drawer()->color() ) != mcolormap.end() );
+ assert( mcolormap.find( obj->drawer()->color() ) != mcolormap.end() );
mcurcolorid = mcolormap[ obj->drawer()->color() ];
mcurobj = obj;
obj->imp()->visit( this );
diff --git a/kig/filters/filter.cc b/kig/filters/filter.cc
index 0cfe1479..ff380bec 100644
--- a/kig/filters/filter.cc
+++ b/kig/filters/filter.cc
@@ -31,7 +31,7 @@
KigFilters* KigFilters::sThis;
-KigFilter* KigFilters::tqfind(const TQString& mime)
+KigFilter* KigFilters::find(const TQString& mime)
{
for (vect::iterator i = mFilters.begin(); i != mFilters.end(); ++i)
{
diff --git a/kig/filters/filter.h b/kig/filters/filter.h
index af087818..8904b52d 100644
--- a/kig/filters/filter.h
+++ b/kig/filters/filter.h
@@ -34,7 +34,7 @@ class KigFilters
{
public:
static KigFilters* instance();
- KigFilter* tqfind (const TQString& mime);
+ KigFilter* find (const TQString& mime);
// bool save ( const KigDocument& data, TQTextStream& stream );
/**
diff --git a/kig/filters/kseg-filter.cc b/kig/filters/kseg-filter.cc
index 27edc762..86c6cba8 100644
--- a/kig/filters/kseg-filter.cc
+++ b/kig/filters/kseg-filter.cc
@@ -362,7 +362,7 @@ KigDocument* KigFilterKSeg::load( const TQString& file )
if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
if ( !parents[0]->imp()->inherits( SegmentImp::stype() ) )
KIG_FILTER_PARSE_ERROR;
- int index = parents[0]->imp()->propertiesInternalNames().tqfindIndex( "mid-point" );
+ int index = parents[0]->imp()->propertiesInternalNames().findIndex( "mid-point" );
assert( index != -1 );
o = new ObjectPropertyCalcer( parents[0], index );
break;
@@ -494,7 +494,7 @@ KigDocument* KigFilterKSeg::load( const TQString& file )
point = parents[1];
segment = parents[0];
};
- int index = segment->imp()->propertiesInternalNames().tqfindIndex( "length" );
+ int index = segment->imp()->propertiesInternalNames().findIndex( "length" );
if ( index == -1 ) KIG_FILTER_PARSE_ERROR;
ObjectPropertyCalcer* length = new ObjectPropertyCalcer( segment, index );
length->calc( *retdoc );
diff --git a/kig/filters/latexexporter.cc b/kig/filters/latexexporter.cc
index 811cfd9b..a1be1f5f 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/native-filter.cc b/kig/filters/native-filter.cc
index 9e92130d..3afaf0e1 100644
--- a/kig/filters/native-filter.cc
+++ b/kig/filters/native-filter.cc
@@ -318,7 +318,7 @@ 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();
- int propid = propnames.tqfindIndex( propname );
+ int propid = propnames.findIndex( propname );
if ( propid == -1 )
KIG_FILTER_PARSE_ERROR;
@@ -331,7 +331,7 @@ KigDocument* KigFilterNative::load04( const TQString& file, const TQDomElement&
KIG_FILTER_PARSE_ERROR;
const ObjectType* type =
- ObjectTypeFactory::instance()->tqfind( tmp.latin1() );
+ ObjectTypeFactory::instance()->find( tmp.latin1() );
if ( !type )
{
notSupported( file, i18n( "This Kig file uses an object of type \"%1\", "
@@ -469,7 +469,7 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement&
TQCString propname = e.attribute( "which" ).latin1();
ObjectCalcer* tqparent = parents[0];
- int propid = tqparent->imp()->propertiesInternalNames().tqfindIndex( propname );
+ int propid = tqparent->imp()->propertiesInternalNames().findIndex( propname );
if ( propid == -1 ) KIG_FILTER_PARSE_ERROR;
o = new ObjectPropertyCalcer( tqparent, propid );
@@ -478,7 +478,7 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement&
{
TQString tmp = e.attribute( "type" );
const ObjectType* type =
- ObjectTypeFactory::instance()->tqfind( tmp.latin1() );
+ ObjectTypeFactory::instance()->find( tmp.latin1() );
if ( ! type )
{
notSupported( file, i18n( "This Kig file uses an object of type \"%1\", "
diff --git a/kig/kfile/kfile_drgeo.cpp b/kig/kfile/kfile_drgeo.cpp
index bbdc6869..4cec1da4 100644
--- a/kig/kfile/kfile_drgeo.cpp
+++ b/kig/kfile/kfile_drgeo.cpp
@@ -41,7 +41,7 @@ DrgeoPlugin::DrgeoPlugin( TQObject *tqparent, const char *name, const TQStringLi
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_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 f59559d1..15d66df1 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -378,7 +378,7 @@ bool KigPart::openFile()
// findByURL...
KMimeType::Ptr mimeType = KMimeType::findByPath ( m_file );
kdDebug() << k_funcinfo << "mimetype: " << mimeType->name() << endl;
- KigFilter* filter = KigFilters::instance()->tqfind( mimeType->name() );
+ KigFilter* filter = KigFilters::instance()->find( mimeType->name() );
if ( !filter )
{
// we don't support this mime type...
@@ -922,7 +922,7 @@ extern "C" int convertToNative( const KURL& url, const TQCString& outfile )
KMimeType::Ptr mimeType = KMimeType::findByPath ( file );
kdDebug() << k_funcinfo << "mimetype: " << mimeType->name() << endl;
- KigFilter* filter = KigFilters::instance()->tqfind( mimeType->name() );
+ KigFilter* filter = KigFilters::instance()->find( mimeType->name() );
if ( !filter )
{
kdError() << "The file \"" << file << "\" is of a filetype not currently supported by Kig." << endl;
diff --git a/kig/kig/kig_view.cpp b/kig/kig/kig_view.cpp
index 9eda893b..a0884498 100644
--- a/kig/kig/kig_view.cpp
+++ b/kig/kig/kig_view.cpp
@@ -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;
diff --git a/kig/misc/builtin_stuff.cc b/kig/misc/builtin_stuff.cc
index 432721cf..85d0d110 100644
--- a/kig/misc/builtin_stuff.cc
+++ b/kig/misc/builtin_stuff.cc
@@ -509,7 +509,7 @@ void setupBuiltinStuff()
ContainsTestType::instance(),
I18N_NOOP( "Contains Test" ),
I18N_NOOP( "Test whether a given curve contains a given point" ),
- "testtqcontains" );
+ "testcontains" );
ctors->add( c );
actions->add( new ConstructibleAction( c, "objects_new_containstest" ) );
diff --git a/kig/misc/calcpaths.cc b/kig/misc/calcpaths.cc
index 15dd9d98..3e947789 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
diff --git a/kig/misc/common.cpp b/kig/misc/common.cpp
index 83fdd077..275170ef 100644
--- a/kig/misc/common.cpp
+++ b/kig/misc/common.cpp
@@ -422,7 +422,7 @@ bool lineInRect( const Rect& r, const Coordinate& a, const Coordinate& b,
// 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;
@@ -455,10 +455,10 @@ bool lineInRect( const Rect& r, const Coordinate& a, const Coordinate& b,
// intersection is not between the begin and end point.. ) and if
// 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/coordinate_system.cpp b/kig/misc/coordinate_system.cpp
index deefe954..10bd96ce 100644
--- a/kig/misc/coordinate_system.cpp
+++ b/kig/misc/coordinate_system.cpp
@@ -80,7 +80,7 @@ TQValidator::State CoordinateValidator::validate( TQString & input, int & pos )
if( tinput[tinput.length() - 1 ] == ' ' ) tinput.truncate( tinput.length() - 1 );
if ( tinput[0] == '(' ) tinput = tinput.mid( 1 );
if( tinput[0] == ' ' ) tinput = tinput.mid( 1 );
- int scp = tinput.tqfind( ';' );
+ int scp = tinput.find( ';' );
if ( scp == -1 ) return mdv.validate( tinput, pos ) == Invalid ? Invalid : Valid;
else
{
@@ -101,16 +101,16 @@ 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 ';'
- int i = input.tqfind( ';' );
- i = input.tqfind( ';', i );
+ int i = input.find( ';' );
+ i = input.find( ';', i );
input = input.left( i );
};
// now the string has at most one semicolon left..
- int sc = input.tqfind( ';' );
+ int sc = input.find( ';' );
if ( sc == -1 )
{
sc = input.length();
@@ -616,7 +616,7 @@ Coordinate EuclideanCoords::snapToGrid( const Coordinate& c,
Coordinate PolarCoords::snapToGrid( const Coordinate& c,
const KigWidget& w ) const
{
- // we reuse the drawGrid code to tqfind
+ // we reuse the drawGrid code to find
// we multiply by sqrt( 2 ) cause we don't want to miss circles in
// the corners, that intersect with the axes outside of the
diff --git a/kig/misc/guiaction.cc b/kig/misc/guiaction.cc
index d17501c2..4876e175 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 );
}
diff --git a/kig/misc/kigpainter.cpp b/kig/misc/kigpainter.cpp
index 95be1837..81ae6574 100644
--- a/kig/misc/kigpainter.cpp
+++ b/kig/misc/kigpainter.cpp
@@ -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_constructor.cc b/kig/misc/object_constructor.cc
index 5522a598..f2b9f330 100644
--- a/kig/misc/object_constructor.cc
+++ b/kig/misc/object_constructor.cc
@@ -554,7 +554,7 @@ void PropertyObjectConstructor::drawprelim(
const ObjectDrawer& drawer, KigPainter& p, const std::vector<ObjectCalcer*>& parents,
const KigDocument& d ) const
{
- int index = parents[0]->imp()->propertiesInternalNames().tqfindIndex( mpropinternalname );
+ int index = parents[0]->imp()->propertiesInternalNames().findIndex( mpropinternalname );
assert ( index != -1 );
ObjectImp* imp = parents[0]->imp()->property( index, d );
drawer.draw( *imp, p, true );
@@ -565,7 +565,7 @@ std::vector<ObjectHolder*> PropertyObjectConstructor::build(
const std::vector<ObjectCalcer*>& parents, KigDocument&,
KigWidget& ) const
{
- int index = parents[0]->imp()->propertiesInternalNames().tqfindIndex( mpropinternalname );
+ int index = parents[0]->imp()->propertiesInternalNames().findIndex( mpropinternalname );
assert( index != -1 );
std::vector<ObjectHolder*> ret;
ret.push_back(
diff --git a/kig/misc/object_hierarchy.cc b/kig/misc/object_hierarchy.cc
index 264f7e8c..9b5a09a8 100644
--- a/kig/misc/object_hierarchy.cc
+++ b/kig/misc/object_hierarchy.cc
@@ -51,7 +51,7 @@ public:
// 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.
@@ -237,7 +237,7 @@ void FetchPropertyNode::apply( std::vector<const ObjectImp*>& stack,
int loc, const KigDocument& d ) const
{
assert( stack[mtqparent] );
- if ( mpropid == -1 ) mpropid = stack[mtqparent]->propertiesInternalNames().tqfindIndex( mname );
+ if ( mpropid == -1 ) mpropid = stack[mtqparent]->propertiesInternalNames().findIndex( mname );
if ( mpropid != -1 )
stack[loc] = stack[mtqparent]->property( mpropid, d );
else
@@ -247,7 +247,7 @@ 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().tqfindIndex( mname );
+ mpropid = stack[mtqparent]->imp()->propertiesInternalNames().findIndex( mname );
assert( mpropid != -1 );
stack[loc] = new ObjectPropertyCalcer( stack[mtqparent], mpropid );
}
@@ -537,7 +537,7 @@ ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement&
{
// ApplyTypeNode
TQCString typen = e.attribute( "type" ).latin1();
- const ObjectType* type = ObjectTypeFactory::instance()->tqfind( typen );
+ const ObjectType* type = ObjectTypeFactory::instance()->find( typen );
if ( ! type )
{
error = i18n( "This Kig file uses an object of type \"%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 652fae2d..6a7ded12 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 52958dd8..4c8d1f64 100644
--- a/kig/misc/rect.h
+++ b/kig/misc/rect.h
@@ -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 );
diff --git a/kig/misc/special_constructors.cc b/kig/misc/special_constructors.cc
index 0806f09b..edc54b42 100644
--- a/kig/misc/special_constructors.cc
+++ b/kig/misc/special_constructors.cc
@@ -1403,7 +1403,7 @@ std::vector<ObjectHolder*> MidPointOfTwoPointsConstructor::build(
{
ObjectTypeCalcer* seg = new ObjectTypeCalcer( SegmentABType::instance(), os );
seg->calc( d );
- int index = seg->imp()->propertiesInternalNames().tqfindIndex( "mid-point" );
+ int index = seg->imp()->propertiesInternalNames().findIndex( "mid-point" );
assert( index != -1 );
ObjectPropertyCalcer* prop = new ObjectPropertyCalcer( seg, index );
prop->calc( d );
diff --git a/kig/modes/construct_mode.cc b/kig/modes/construct_mode.cc
index d4702314..e9e2e5ad 100644
--- a/kig/modes/construct_mode.cc
+++ b/kig/modes/construct_mode.cc
@@ -489,7 +489,7 @@ void TestConstructMode::leftClickedObject( ObjectHolder* o, const TQPoint& p,
assert( mresult->imp()->inherits( TestResultImp::stype() ) );
parents.push_back(
new ObjectPropertyCalcer(
- mresult.get(), mresult->imp()->propertiesInternalNames().tqfindIndex( "test-result" ) ) );
+ mresult.get(), mresult->imp()->propertiesInternalNames().findIndex( "test-result" ) ) );
parents.back()->calc( mdoc.document() );
ObjectCalcer* ret = new ObjectTypeCalcer( TextType::instance(), parents );
diff --git a/kig/modes/moving.cc b/kig/modes/moving.cc
index d6f2c74b..7c3148da 100644
--- a/kig/modes/moving.cc
+++ b/kig/modes/moving.cc
@@ -164,7 +164,7 @@ void MovingMode::moveTo( const Coordinate& o, bool snaptogrid )
{
for( std::vector<ObjectCalcer*>::iterator i = d->emo.begin(); i != d->emo.end(); ++i )
{
- assert( d->refmap.tqfind( *i ) != d->refmap.end() );
+ assert( d->refmap.find( *i ) != d->refmap.end() );
Coordinate nc = d->refmap[*i] + ( o - d->pwwsm );
if ( snaptogrid ) nc = mdoc.document().coordinateSystem().snapToGrid( nc, mview );
(*i)->move( nc, mdoc.document() );
diff --git a/kig/objects/bogus_imp.cc b/kig/objects/bogus_imp.cc
index 6e688b1b..5c68c30c 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/circle_imp.cc b/kig/objects/circle_imp.cc
index 059ff592..4b6c1123 100644
--- a/kig/objects/circle_imp.cc
+++ b/kig/objects/circle_imp.cc
@@ -63,7 +63,7 @@ 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 );
}
@@ -72,10 +72,10 @@ bool CircleImp::inRect( const Rect& r, int width, const KigWidget& w ) const
{
// 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 11e01c28..5828fc98 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 ) );
}
diff --git a/kig/objects/conic_imp.h b/kig/objects/conic_imp.h
index d1cfa3f9..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;
diff --git a/kig/objects/cubic_imp.cc b/kig/objects/cubic_imp.cc
index f727f49a..b4a85b8e 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 ) );
}
@@ -431,7 +431,7 @@ TQString CubicImp::cartesianEquationString( const KigDocument& ) const
ret = ret.tqarg( 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 65dc25ad..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;
diff --git a/kig/objects/line_imp.cc b/kig/objects/line_imp.cc
index 0cb8a985..7583dc71 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 ) );
}
diff --git a/kig/objects/line_imp.h b/kig/objects/line_imp.h
index c52d8afd..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;
@@ -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;
@@ -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;
diff --git a/kig/objects/locus_imp.cc b/kig/objects/locus_imp.cc
index 3bf85a9e..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() );
}
diff --git a/kig/objects/locus_imp.h b/kig/objects/locus_imp.h
index 54ec7f13..d6d93217 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;
diff --git a/kig/objects/object_calcer.cc b/kig/objects/object_calcer.cc
index 38c0b194..f6952768 100644
--- a/kig/objects/object_calcer.cc
+++ b/kig/objects/object_calcer.cc
@@ -202,7 +202,7 @@ const ObjectImpType* ObjectTypeCalcer::impRequirement(
os.begin(), os.end(),
std::back_inserter( args ),
std::mem_fun( &ObjectCalcer::imp ) );
- assert( std::tqfind( args.begin(), args.end(), o->imp() ) != args.end() );
+ assert( std::find( args.begin(), args.end(), o->imp() ) != args.end() );
return mtype->impRequirement( o->imp(), args );
}
diff --git a/kig/objects/object_drawer.cc b/kig/objects/object_drawer.cc
index 1fc0f2e0..d6e41144 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 7fca8d4e..cbd1374a 100644
--- a/kig/objects/object_drawer.h
+++ b/kig/objects/object_drawer.h
@@ -68,7 +68,7 @@ public:
* 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_factory.cc b/kig/objects/object_factory.cc
index c2d7b3b5..aabc82be 100644
--- a/kig/objects/object_factory.cc
+++ b/kig/objects/object_factory.cc
@@ -277,7 +277,7 @@ ObjectHolder* ObjectFactory::attachedLabel(
ObjectPropertyCalcer* ObjectFactory::propertyObjectCalcer(
ObjectCalcer* o, const char* p ) const
{
- int wp = o->imp()->propertiesInternalNames().tqfindIndex( p );
+ int wp = o->imp()->propertiesInternalNames().findIndex( p );
if ( wp == -1 ) return 0;
return new ObjectPropertyCalcer( o, wp );
}
diff --git a/kig/objects/object_holder.cc b/kig/objects/object_holder.cc
index 49e6da9d..b6c5f09e 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 0666fef1..1e80269b 100644
--- a/kig/objects/object_holder.h
+++ b/kig/objects/object_holder.h
@@ -103,7 +103,7 @@ public:
/**
* 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 20484ecf..46166858 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;
diff --git a/kig/objects/object_type_factory.cc b/kig/objects/object_type_factory.cc
index aa69f958..a6d527ce 100644
--- a/kig/objects/object_type_factory.cc
+++ b/kig/objects/object_type_factory.cc
@@ -56,11 +56,11 @@ ObjectTypeFactory* ObjectTypeFactory::instance()
void ObjectTypeFactory::add( const ObjectType* type )
{
- assert( mmap.tqfind( std::string( type->fullName() ) ) == mmap.end() );
+ assert( mmap.find( std::string( type->fullName() ) ) == mmap.end() );
mmap[std::string( type->fullName() )] = type;
}
-const ObjectType* ObjectTypeFactory::tqfind( const char* name ) const
+const ObjectType* ObjectTypeFactory::find( const char* name ) const
{
maptype::const_iterator i = mmap.find( std::string( name ) );
if ( i == mmap.end() ) return 0;
diff --git a/kig/objects/object_type_factory.h b/kig/objects/object_type_factory.h
index 97f4f0c3..c1371d67 100644
--- a/kig/objects/object_type_factory.h
+++ b/kig/objects/object_type_factory.h
@@ -34,7 +34,7 @@ class ObjectTypeFactory
public:
static ObjectTypeFactory* instance();
void add( const ObjectType* type );
- const ObjectType* tqfind( const char* name ) const;
+ const ObjectType* find( const char* name ) const;
};
#endif
diff --git a/kig/objects/other_imp.cc b/kig/objects/other_imp.cc
index 66da40a9..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 ) );
}
diff --git a/kig/objects/other_imp.h b/kig/objects/other_imp.h
index 56e8c387..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;
@@ -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;
diff --git a/kig/objects/point_imp.cc b/kig/objects/point_imp.cc
index b2f9b1c1..1e5b8766 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/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/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/pykig/pykig.py b/kig/pykig/pykig.py
index 3e2a5cdf..b8c97c7a 100755
--- a/kig/pykig/pykig.py
+++ b/kig/pykig/pykig.py
@@ -491,7 +491,7 @@ data=(\
def convstr(s):
for o, n in DICT:
- s=s.tqreplace(o, n)
+ s=s.replace(o, n)
return s
def databuild(nomeclasse, nomekig, v="val"):