&csegmentList, TQPtrListname2().lower() ) {
TQString r = i18n( "Constellation name (optional)", o->name().local8Bit().data() );
r = r.left(1) + r.mid(1).lower(); //lowercase letters (except first letter)
- int i = r.tqfind(" ");
+ int i = r.find(" ");
i++;
if ( i>0 ) r = r.left(i) + r.mid(i,1).upper() + r.mid(i+1); //capitalize 2nd word
return r;
diff --git a/kstars/kstars/telescopewizardprocess.cpp b/kstars/kstars/telescopewizardprocess.cpp
index 4538ba14..b2be4995 100644
--- a/kstars/kstars/telescopewizardprocess.cpp
+++ b/kstars/kstars/telescopewizardprocess.cpp
@@ -230,7 +230,7 @@ int telescopeWizardProcess::establishLink()
return (0);
TQListViewItem *driverItem = NULL;
- driverItem = indidriver->localListView->tqfindItem(telescopeCombo->currentText(), 0);
+ driverItem = indidriver->localListView->findItem(telescopeCombo->currentText(), 0);
if (driverItem == NULL) return -1;
// If device is already running, we need to shut it down first
diff --git a/kstars/kstars/thumbnaileditor.cpp b/kstars/kstars/thumbnaileditor.cpp
index a8822439..53235044 100644
--- a/kstars/kstars/thumbnaileditor.cpp
+++ b/kstars/kstars/thumbnaileditor.cpp
@@ -130,7 +130,7 @@ void ThumbImage::paintEvent( TQPaintEvent* ) {
}
void ThumbImage::mousePressEvent( TQMouseEvent *e ) {
- if ( e->button() == Qt::LeftButton && CropRect->tqcontains( e->pos() ) ) {
+ if ( e->button() == Qt::LeftButton && CropRect->contains( e->pos() ) ) {
bMouseButtonDown = true;
//The Anchor tells how far from the CropRect corner we clicked
diff --git a/kstars/kstars/thumbnailpicker.cpp b/kstars/kstars/thumbnailpicker.cpp
index e8544b6b..0d7d0265 100644
--- a/kstars/kstars/thumbnailpicker.cpp
+++ b/kstars/kstars/thumbnailpicker.cpp
@@ -141,14 +141,14 @@ void ThumbnailPicker::parseGooglePage( TQStringList &ImList, TQString URL ) {
return;
}
- int index = PageHTML.tqfind( "?imgurl=", 0 );
+ int index = PageHTML.find( "?imgurl=", 0 );
while ( index >= 0 ) {
index += 8; //move to end of "?imgurl=" marker
//Image URL is everything from index to next occurence of "&"
- ImList.append( PageHTML.mid( index, PageHTML.tqfind( "&", index ) - index ) );
+ ImList.append( PageHTML.mid( index, PageHTML.find( "&", index ) - index ) );
- index = PageHTML.tqfind( "?imgurl=", index );
+ index = PageHTML.find( "?imgurl=", index );
}
}
diff --git a/kstars/kstars/timebox.cpp b/kstars/kstars/timebox.cpp
index 5f6040f0..c97b4a89 100644
--- a/kstars/kstars/timebox.cpp
+++ b/kstars/kstars/timebox.cpp
@@ -91,7 +91,7 @@ TQTime timeBox::createTime ( bool *ok )
TQStringList fields;
//check for colon-delimiters or space-delimiters
- if ( entry.tqcontains(':') )
+ if ( entry.contains(':') )
fields = TQStringList::split( ':', entry );
else fields = TQStringList::split( " ", entry );
@@ -113,9 +113,9 @@ TQTime timeBox::createTime ( bool *ok )
// ignore all after 3rd field
if ( fields.count() >= 3 ) {
- fields[0].tqreplace( TQRegExp("h"), "" );
- fields[1].tqreplace( TQRegExp("m"), "" );
- fields[2].tqreplace( TQRegExp("s"), "" );
+ fields[0].replace( TQRegExp("h"), "" );
+ fields[1].replace( TQRegExp("m"), "" );
+ fields[2].replace( TQRegExp("s"), "" );
}
//See if first two fields parse as integers.
//
diff --git a/kstars/kstars/timezonerule.cpp b/kstars/kstars/timezonerule.cpp
index 1d66d32c..0a711f57 100644
--- a/kstars/kstars/timezonerule.cpp
+++ b/kstars/kstars/timezonerule.cpp
@@ -168,7 +168,7 @@ int TimeZoneRule::findStartDay( const KStarsDateTime &d ) {
return test.day();
}
-int TimeZoneRule::tqfindRevertDay( const KStarsDateTime &d ) {
+int TimeZoneRule::findRevertDay( const KStarsDateTime &d ) {
// Determine the calendar date of RevertDay for the month and year of the given date.
ExtDate test;
@@ -215,7 +215,7 @@ bool TimeZoneRule::isDSTActive( const KStarsDateTime &date ) {
if ( day < sday ) return false;
if ( day==sday && date.time() < StartTime ) return false;
} else if ( month == RevertMonth ) {
- int rday = tqfindRevertDay( date );
+ int rday = findRevertDay( date );
if ( day > rday ) return false;
if ( day==rday && date.time() > RevertTime ) return false;
}
@@ -239,7 +239,7 @@ void TimeZoneRule::nextDSTChange_LTime( const KStarsDateTime &date ) {
if ( RevertMonth < date.date().month() ) ++y;
result = KStarsDateTime( ExtDate( y, RevertMonth, 1 ), RevertTime );
- result = KStarsDateTime( ExtDate( y, RevertMonth, tqfindRevertDay( result ) ), RevertTime );
+ result = KStarsDateTime( ExtDate( y, RevertMonth, findRevertDay( result ) ), RevertTime );
} else {
// Next change is starting DST.
@@ -284,7 +284,7 @@ void TimeZoneRule::previousDSTChange_LTime( const KStarsDateTime &date ) {
if ( RevertMonth > date.date().month() ) --y;
result = KStarsDateTime( ExtDate( y, RevertMonth, 1 ), RevertTime );
- result = KStarsDateTime( ExtDate( y, RevertMonth, tqfindRevertDay( result ) ), RevertTime );
+ result = KStarsDateTime( ExtDate( y, RevertMonth, findRevertDay( result ) ), RevertTime );
}
kdDebug() << i18n( "Previous Daylight Savings Time change (Local Time): " ) << result.toString() << endl;
diff --git a/kstars/kstars/timezonerule.h b/kstars/kstars/timezonerule.h
index 53ade37e..3cadb4e5 100644
--- a/kstars/kstars/timezonerule.h
+++ b/kstars/kstars/timezonerule.h
@@ -158,7 +158,7 @@ private:
*of the given KStarsDateTime.
*@p d the date containing the year to be tested
*@return the calendar date, an integer between 1 and 31. */
- int tqfindRevertDay( const KStarsDateTime &d );
+ int findRevertDay( const KStarsDateTime &d );
int StartDay, RevertDay;
int StartWeek, RevertWeek;
diff --git a/kstars/kstars/tools/altvstime.cpp b/kstars/kstars/tools/altvstime.cpp
index 4c51a6a4..27f94fc4 100644
--- a/kstars/kstars/tools/altvstime.cpp
+++ b/kstars/kstars/tools/altvstime.cpp
@@ -400,7 +400,7 @@ void AltVsTime::slotUpdateDateLoc(void) {
o->updateCoords( num );
//update pList entry
- pList.tqreplace( i, (SkyPoint*)o );
+ pList.replace( i, (SkyPoint*)o );
KPlotObject *po = new KPlotObject( "", "white", KPlotObject::CURVE, 1, KPlotObject::SOLID );
for ( double h=-12.0; h<=12.0; h+=0.5 ) {
@@ -512,7 +512,7 @@ void AVTPlotWidget::mouseMoveEvent( TQMouseEvent *e ) {
int Xcursor = e->x();
int Ycursor = e->y();
- if ( ! checkRect.tqcontains( e->x(), e->y() ) ) {
+ if ( ! checkRect.contains( e->x(), e->y() ) ) {
if ( e->x() < checkRect.left() ) Xcursor = checkRect.left();
if ( e->x() > checkRect.right() ) Xcursor = checkRect.right();
if ( e->y() < checkRect.top() ) Ycursor = checkRect.top();
diff --git a/kstars/kstars/tools/kstarsplotwidget.cpp b/kstars/kstars/tools/kstarsplotwidget.cpp
index d07c3e36..03cc4c38 100644
--- a/kstars/kstars/tools/kstarsplotwidget.cpp
+++ b/kstars/kstars/tools/kstarsplotwidget.cpp
@@ -359,9 +359,9 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) {
case DOUBLE :
{
TQString str = TQString( "%1" ).tqarg( lab, 0, 'g', 2 );
- int idot = str.tqfind( '.' );
+ int idot = str.find( '.' );
if ( idot >= 0 )
- str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() );
+ str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() );
if ( px > 0 && px < pW ) {
TQRect r( px - BIGTICKSIZE, pH+BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE );
@@ -427,9 +427,9 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) {
case DOUBLE :
{
TQString str = TQString( "%1" ).tqarg( lab, 0, 'g', 2 );
- int idot = str.tqfind( '.' );
+ int idot = str.find( '.' );
if ( idot >= 0 )
- str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() );
+ str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() );
if ( py > 0 && py < pH ) {
TQRect r( -2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE );
@@ -493,9 +493,9 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) {
case DOUBLE :
{
TQString str = TQString( "%1" ).tqarg( lab, 0, 'g', 2 );
- int idot = str.tqfind( '.' );
+ int idot = str.find( '.' );
if ( idot >= 0 )
- str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() );
+ str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() );
if ( px > 0 && px < pW ) {
TQRect r( px - BIGTICKSIZE, -2*BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE );
@@ -557,9 +557,9 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) {
case DOUBLE :
{
TQString str = TQString( "%1" ).tqarg( lab, 0, 'g', 2 );
- int idot = str.tqfind( '.' );
+ int idot = str.find( '.' );
if ( idot >= 0 )
- str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() );
+ str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() );
if ( py > 0 && py < pH ) {
TQRect r( pW + 2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE );
diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp
index a50165ac..323d5f62 100644
--- a/kstars/kstars/tools/observinglist.cpp
+++ b/kstars/kstars/tools/observinglist.cpp
@@ -121,7 +121,7 @@ ObservingList::ObservingList( KStars *_ks, TQWidget* tqparent )
ui->NotesEdit->setEnabled( false );
}
-bool ObservingList::tqcontains( const SkyObject *q ) {
+bool ObservingList::contains( const SkyObject *q ) {
for ( SkyObject* o = obsList.first(); o; o = obsList.next() ) {
if ( o == q ) return true;
}
@@ -346,7 +346,7 @@ void ObservingList::slotSlewToObject()
SkyPoint sp;
// Find the first device with EQUATORIAL_EOD_COORD or EQUATORIAL_COORD and with SLEW element
- // i.e. the first telescope we tqfind!
+ // i.e. the first telescope we find!
INDIMenu *imenu = ks->getINDIMenu();
diff --git a/kstars/kstars/tools/observinglist.h b/kstars/kstars/tools/observinglist.h
index a1602f1f..70671d48 100644
--- a/kstars/kstars/tools/observinglist.h
+++ b/kstars/kstars/tools/observinglist.h
@@ -71,7 +71,7 @@ public:
/**@return true if the object is in the observing list
*@p o pointer to the object to test.
*/
- bool tqcontains( const SkyObject *o );
+ bool contains( const SkyObject *o );
SkyObject* first() { return obsList.first(); }
SkyObject* next() { return obsList.next(); }
diff --git a/kstars/kstars/tools/obslistwizard.cpp b/kstars/kstars/tools/obslistwizard.cpp
index 9a3c57d8..1e65c24d 100644
--- a/kstars/kstars/tools/obslistwizard.cpp
+++ b/kstars/kstars/tools/obslistwizard.cpp
@@ -195,32 +195,32 @@ void ObsListWizard::slotShowStackWidget( TQListViewItem *i )
if ( i ) {
TQString t = i->text(0);
- if ( t.tqcontains( i18n( "Object type(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ObjTypePage );
- if ( t.tqcontains( i18n( "Region" ) ) ) olw->FilterStack->raiseWidget( olw->RegionPage );
- if ( t.tqcontains( i18n( "In constellation(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ConstellationPage );
- if ( t.tqcontains( i18n( "Circular" ) ) ) olw->FilterStack->raiseWidget( olw->CircRegionPage );
- if ( t.tqcontains( i18n( "Rectangular" ) ) ) olw->FilterStack->raiseWidget( olw->RectRegionPage );
-// if ( t.tqcontains( i18n( "Observable on date" ) ) ) olw->FilterStack->raiseWidget( olw->ObsDatePage );
- if ( t.tqcontains( i18n( "Magnitude limit" ) ) ) olw->FilterStack->raiseWidget( olw->MagLimitPage );
+ if ( t.contains( i18n( "Object type(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ObjTypePage );
+ if ( t.contains( i18n( "Region" ) ) ) olw->FilterStack->raiseWidget( olw->RegionPage );
+ if ( t.contains( i18n( "In constellation(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ConstellationPage );
+ if ( t.contains( i18n( "Circular" ) ) ) olw->FilterStack->raiseWidget( olw->CircRegionPage );
+ if ( t.contains( i18n( "Rectangular" ) ) ) olw->FilterStack->raiseWidget( olw->RectRegionPage );
+// if ( t.contains( i18n( "Observable on date" ) ) ) olw->FilterStack->raiseWidget( olw->ObsDatePage );
+ if ( t.contains( i18n( "Magnitude limit" ) ) ) olw->FilterStack->raiseWidget( olw->MagLimitPage );
}
}
void ObsListWizard::slotDeepSkyButton()
{
olw->TypeList->selectAll( false );
- olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Open Clusters" ) ), true );
- olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Globular Clusters" ) ), true );
- olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Gaseous Nebulae" ) ), true );
- olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Planetary Nebulae" ) ), true );
- olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Galaxies" ) ), true );
+ olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Open Clusters" ) ), true );
+ olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Globular Clusters" ) ), true );
+ olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Gaseous Nebulae" ) ), true );
+ olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Planetary Nebulae" ) ), true );
+ olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Galaxies" ) ), true );
}
void ObsListWizard::slotSolarSystemButton()
{
olw->TypeList->selectAll( false );
- olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Sun, Moon, Planets" ) ), true );
- olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Comets" ) ), true );
- olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Asteroids" ) ), true );
+ olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Sun, Moon, Planets" ) ), true );
+ olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Comets" ) ), true );
+ olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Asteroids" ) ), true );
}
void ObsListWizard::slotChangeLocation()
@@ -235,23 +235,23 @@ void ObsListWizard::slotChangeLocation()
void ObsListWizard::slotUpdateObjectCount()
{
ObjectCount = 0;
- if ( olw->TypeList->tqfindItem( i18n( "Stars" ) )->isSelected() )
+ if ( olw->TypeList->findItem( i18n( "Stars" ) )->isSelected() )
ObjectCount += StarCount;
- if ( olw->TypeList->tqfindItem( i18n( "Sun, Moon, Planets" ) )->isSelected() )
+ if ( olw->TypeList->findItem( i18n( "Sun, Moon, Planets" ) )->isSelected() )
ObjectCount += PlanetCount;
- if ( olw->TypeList->tqfindItem( i18n( "Comets" ) )->isSelected() )
+ if ( olw->TypeList->findItem( i18n( "Comets" ) )->isSelected() )
ObjectCount += CometCount;
- if ( olw->TypeList->tqfindItem( i18n( "Asteroids" ) )->isSelected() )
+ if ( olw->TypeList->findItem( i18n( "Asteroids" ) )->isSelected() )
ObjectCount += AsteroidCount;
- if ( olw->TypeList->tqfindItem( i18n( "Galaxies" ) )->isSelected() )
+ if ( olw->TypeList->findItem( i18n( "Galaxies" ) )->isSelected() )
ObjectCount += GalaxyCount;
- if ( olw->TypeList->tqfindItem( i18n( "Open Clusters" ) )->isSelected() )
+ if ( olw->TypeList->findItem( i18n( "Open Clusters" ) )->isSelected() )
ObjectCount += OpenClusterCount;
- if ( olw->TypeList->tqfindItem( i18n( "Globular Clusters" ) )->isSelected() )
+ if ( olw->TypeList->findItem( i18n( "Globular Clusters" ) )->isSelected() )
ObjectCount += GlobClusterCount;
- if ( olw->TypeList->tqfindItem( i18n( "Gaseous Nebulae" ) )->isSelected() )
+ if ( olw->TypeList->findItem( i18n( "Gaseous Nebulae" ) )->isSelected() )
ObjectCount += GasNebCount;
- if ( olw->TypeList->tqfindItem( i18n( "Planetary Nebulae" ) )->isSelected() )
+ if ( olw->TypeList->findItem( i18n( "Planetary Nebulae" ) )->isSelected() )
ObjectCount += PlanNebCount;
applyFilters( false ); //false = only adjust counts, do not build list
@@ -307,7 +307,7 @@ void ObsListWizard::applyFilters( bool doBuildList )
//Stars
int starIndex(ksw->data()->starList.count());
- if ( olw->TypeList->tqfindItem( i18n( "Stars" ) )->isSelected() ) {
+ if ( olw->TypeList->findItem( i18n( "Stars" ) )->isSelected() ) {
if ( maglimit < 100. ) {
//Stars are sorted by mag, so use binary search algo to find index of faintest mag
int low(0), high(ksw->data()->starList.count()-1), middle;
@@ -338,7 +338,7 @@ void ObsListWizard::applyFilters( bool doBuildList )
}
//Sun, Moon, Planets
- if ( olw->TypeList->tqfindItem( i18n( "Sun, Moon, Planets" ) )->isSelected() ) {
+ if ( olw->TypeList->findItem( i18n( "Sun, Moon, Planets" ) )->isSelected() ) {
applyRegionFilter( (SkyObject*)ksw->data()->PCat->planetSun(), doBuildList );
applyRegionFilter( (SkyObject*)ksw->data()->Moon, doBuildList );
applyRegionFilter( (SkyObject*)ksw->data()->PCat->findByName("Mercury"), doBuildList );
@@ -354,12 +354,12 @@ void ObsListWizard::applyFilters( bool doBuildList )
//Deep sky objects
for ( SkyObject *o = (SkyObject*)(ksw->data()->deepSkyList.first()); o; o = (SkyObject*)(ksw->data()->deepSkyList.next()) ) {
//Skip unselected object types
- if ( (o->type() == SkyObject::STAR || o->type() == SkyObject::CATALOG_STAR) && ! olw->TypeList->tqfindItem( i18n( "Stars" ) )->isSelected() ) continue;
- if ( o->type() == SkyObject::OPEN_CLUSTER && ! olw->TypeList->tqfindItem( i18n( "Open Clusters" ) )->isSelected() ) continue;
- if ( o->type() == SkyObject::GLOBULAR_CLUSTER && ! olw->TypeList->tqfindItem( i18n( "Globular Clusters" ) )->isSelected() ) continue;
- if ( (o->type() == SkyObject::GASEOUS_NEBULA || o->type() == SkyObject::SUPERNOVA_REMNANT) && ! olw->TypeList->tqfindItem( i18n( "Gaseous Nebulae" ) )->isSelected() ) continue;
- if ( o->type() == SkyObject::PLANETARY_NEBULA && ! olw->TypeList->tqfindItem( i18n( "Planetary Nebulae" ) )->isSelected() ) continue;
- if ( o->type() == SkyObject::GALAXY && ! olw->TypeList->tqfindItem( i18n( "Galaxies" ) )->isSelected() ) continue;
+ if ( (o->type() == SkyObject::STAR || o->type() == SkyObject::CATALOG_STAR) && ! olw->TypeList->findItem( i18n( "Stars" ) )->isSelected() ) continue;
+ if ( o->type() == SkyObject::OPEN_CLUSTER && ! olw->TypeList->findItem( i18n( "Open Clusters" ) )->isSelected() ) continue;
+ if ( o->type() == SkyObject::GLOBULAR_CLUSTER && ! olw->TypeList->findItem( i18n( "Globular Clusters" ) )->isSelected() ) continue;
+ if ( (o->type() == SkyObject::GASEOUS_NEBULA || o->type() == SkyObject::SUPERNOVA_REMNANT) && ! olw->TypeList->findItem( i18n( "Gaseous Nebulae" ) )->isSelected() ) continue;
+ if ( o->type() == SkyObject::PLANETARY_NEBULA && ! olw->TypeList->findItem( i18n( "Planetary Nebulae" ) )->isSelected() ) continue;
+ if ( o->type() == SkyObject::GALAXY && ! olw->TypeList->findItem( i18n( "Galaxies" ) )->isSelected() ) continue;
if ( o->type() == SkyObject::TYPE_UNKNOWN ) continue;
if ( olw->SelectByMag->isChecked() ) {
@@ -380,7 +380,7 @@ void ObsListWizard::applyFilters( bool doBuildList )
}
//Comets
- if ( olw->TypeList->tqfindItem( i18n( "Comets" ) )->isSelected() ) {
+ if ( olw->TypeList->findItem( i18n( "Comets" ) )->isSelected() ) {
for ( SkyObject *o = (SkyObject*)(ksw->data()->cometList.first()); o; o = (SkyObject*)(ksw->data()->cometList.next()) ) {
//comets don't have magnitudes at this point, so skip mag check
applyRegionFilter( o, doBuildList );
@@ -388,7 +388,7 @@ void ObsListWizard::applyFilters( bool doBuildList )
}
//Asteroids
- if ( olw->TypeList->tqfindItem( i18n( "Asteroids" ) )->isSelected() ) {
+ if ( olw->TypeList->findItem( i18n( "Asteroids" ) )->isSelected() ) {
for ( SkyObject *o = (SkyObject*)(ksw->data()->asteroidList.first()); o; o = (SkyObject*)(ksw->data()->asteroidList.next()) ) {
if ( olw->SelectByMag->isChecked() ) {
@@ -418,7 +418,7 @@ void ObsListWizard::applyRegionFilter( SkyObject *o, bool doBuildList, bool doAd
//select by constellation
if ( olw->SelectByConstellation->isChecked() ) {
TQString c( o->constellation( ksw->data()->csegmentList, ksw->data()->cnameList ) );
- TQListBoxItem *it = olw->ConstellationList->tqfindItem( c );
+ TQListBoxItem *it = olw->ConstellationList->findItem( c );
if ( it && it->isSelected() ) {
if ( doBuildList ) obsList().append ( o );
diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp
index 471e50c9..18736f98 100644
--- a/kstars/kstars/tools/scriptbuilder.cpp
+++ b/kstars/kstars/tools/scriptbuilder.cpp
@@ -709,7 +709,7 @@ void ScriptBuilder::initViewOptions() {
while ( !stream.eof() ) {
line = stream.readLine();
- argLoadColorScheme->SchemeList->insertItem( line.left( line.tqfind( ':' ) ) );
+ argLoadColorScheme->SchemeList->insertItem( line.left( line.find( ':' ) ) );
}
file.close();
}
@@ -922,7 +922,7 @@ void ScriptBuilder::writeScript( TQTextStream &ostream ) {
ostream << "#by " << currentAuthor << endl;
ostream << "#last modified: " << KStarsDateTime::tqcurrentDateTime().toString() << endl;
ostream << "#" << endl;
- ostream << "KSTARS=`dcoptqfind -a 'kstars*'`" << endl;
+ ostream << "KSTARS=`dcopfind -a 'kstars*'`" << endl;
ostream << "MAIN=KStarsInterface" << endl;
ostream << "CLOCK=clock#1" << endl;
@@ -946,7 +946,7 @@ void ScriptBuilder::writeScript( TQTextStream &ostream ) {
sf->setINDIProperty("PARK");
}
- if ( sf->argVal(0).tqcontains(" "))
+ if ( sf->argVal(0).contains(" "))
ostream << mainpre << "waitForINDIAction " << "\"" << sf->argVal(0) << "\" " << sf->INDIProperty() << endl;
else
ostream << mainpre << "waitForINDIAction " << sf->argVal(0) << " " << sf->INDIProperty() << endl;
@@ -965,11 +965,11 @@ void ScriptBuilder::readScript( TQTextStream &istream ) {
line = istream.readLine();
//look for name of script
- if ( line.tqcontains( "#KStars DCOP script: " ) )
+ if ( line.contains( "#KStars DCOP script: " ) )
currentScriptName = line.mid( 21 ).stripWhiteSpace();
//look for author of scriptbuilder
- if ( line.tqcontains( "#by " ) )
+ if ( line.contains( "#by " ) )
currentAuthor = line.mid( 4 ).stripWhiteSpace();
//Actual script functions
@@ -977,7 +977,7 @@ void ScriptBuilder::readScript( TQTextStream &istream ) {
//is ClockFunction?
bool clockfcn( false );
- if ( line.tqcontains( "$CLOCK" ) ) clockfcn = true;
+ if ( line.contains( "$CLOCK" ) ) clockfcn = true;
//remove leading dcop prefix
line = line.mid( 20 );
@@ -1369,7 +1369,7 @@ void ScriptBuilder::slotArgWidget() {
} else if ( sf->name() == "loadColorScheme" ) {
sb->ArgStack->raiseWidget( argLoadColorScheme );
- argLoadColorScheme->SchemeList->setCurrentItem( argLoadColorScheme->SchemeList->tqfindItem( sf->argVal(0).remove('\"'), 0 ) );
+ argLoadColorScheme->SchemeList->setCurrentItem( argLoadColorScheme->SchemeList->findItem( sf->argVal(0).remove('\"'), 0 ) );
} else if ( sf->name() == "stop" ) {
sb->ArgStack->raiseWidget( argBlank );
diff --git a/kstars/kstars/tools/scriptfunction.cpp b/kstars/kstars/tools/scriptfunction.cpp
index 4a3b70f2..8b74ab61 100644
--- a/kstars/kstars/tools/scriptfunction.cpp
+++ b/kstars/kstars/tools/scriptfunction.cpp
@@ -90,7 +90,7 @@ ScriptFunction::ScriptFunction( TQString name, TQString desc, bool clockfcn,
//before adding description, replace any '%n' instances with the corresponding
//argument name in color. For now, assume that the %n's occur in order, with no skips.
//Also assume that '%' is *only* used to indicate argument instances
- int narg = desc.tqcontains( '%' );
+ int narg = desc.contains( '%' );
switch (narg ) {
case 1:
Description += desc.tqarg( paramStyle.tqarg( an1 ) );
@@ -206,7 +206,7 @@ TQString ScriptFunction::scriptLine() const {
unsigned int i=0;
while ( ! ArgName[i].isEmpty() && i < 6 ) {
// Wrap arg in quotes if it contains a space
- if ( ArgVal[i].tqcontains(" ") ) {
+ if ( ArgVal[i].contains(" ") ) {
out += " \"" + ArgVal[i] + "\"";
} else {
out += " " + ArgVal[i];
diff --git a/ktouch/extras/training-gen/python/ktouchgen.py b/ktouch/extras/training-gen/python/ktouchgen.py
index 47cd54d5..97083c01 100644
--- a/ktouch/extras/training-gen/python/ktouchgen.py
+++ b/ktouch/extras/training-gen/python/ktouchgen.py
@@ -35,7 +35,7 @@
from whrandom import randint, random
import string
-from string import join, maketrans, translate, count, strip, lower, tqfind, upper
+from string import join, maketrans, translate, count, strip, lower, find, upper
import time
import sys
import ConfigParser
@@ -173,7 +173,7 @@ def main(argv):
# Parse the configfile
# Creates a List Levelops with [(Options), ]
- # Optiontuple tqcontains (lchars, title, rows)
+ # Optiontuple contains (lchars, title, rows)
conf = ConfigParser.ConfigParser()
try:
file = open(argv[2],'r')
diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp
index 1f2a7501..cf6bd2e3 100644
--- a/ktouch/src/ktouch.cpp
+++ b/ktouch/src/ktouch.cpp
@@ -489,7 +489,7 @@ void KTouch::changeLecture(int num) {
KTouchLecture l;
TQString fileName = m_lectureFiles[num];
if (!l.loadXML(this, KURL::fromPathOrURL(fileName))) {
- KMessageBox::sorry(0, i18n("Could not tqfind/open the lecture file '%1'.").tqarg(fileName) );
+ KMessageBox::sorry(0, i18n("Could not find/open the lecture file '%1'.").tqarg(fileName) );
m_defaultLectureAction->setCurrentItem(-1);
}
else {
@@ -622,19 +622,19 @@ void KTouch::init() {
// if keyboard tqlayout (loaded by Prefs is not available (e.g. the
// tqlayout file has been deleted) switch to default keyboard
- if (m_keyboardFiles.tqcontains(Prefs::currentKeyboardFile() )==0) {
+ if (m_keyboardFiles.contains(Prefs::currentKeyboardFile() )==0) {
TQString default_keyboard;
// determine locale
TQString lang = KGlobal::locale()->language();
TQString fname = lang + ".keyboard";
// try to find keyboard with current locale
TQStringList::const_iterator it = m_keyboardFiles.constBegin();
- while (it != m_keyboardFiles.constEnd() && (*it).tqfind(fname) == -1) ++it;
+ while (it != m_keyboardFiles.constEnd() && (*it).find(fname) == -1) ++it;
if (it == m_keyboardFiles.constEnd()) {
fname = lang.left(2) + ".keyboard";
// try to find more general version
it = m_keyboardFiles.constBegin();
- while (it != m_keyboardFiles.constEnd() && (*it).tqfind(fname) == -1) ++it;
+ while (it != m_keyboardFiles.constEnd() && (*it).find(fname) == -1) ++it;
}
if (it != m_keyboardFiles.constEnd())
@@ -755,7 +755,7 @@ void KTouch::updateFileLists() {
// remove the number tqlayout, since this is the necessary default tqlayout and will be
// added anyway
- TQStringList::iterator it = m_keyboardFiles.tqfind("number.keyboard");
+ TQStringList::iterator it = m_keyboardFiles.find("number.keyboard");
if (it!=m_keyboardFiles.end()) m_keyboardFiles.remove(it);
m_keyboardTitles.clear();
@@ -826,7 +826,7 @@ void KTouch::updateLectureActionCheck() {
int num = 0;
TQStringList::iterator it = m_lectureFiles.begin();
TQString fname = Prefs::currentLectureFile();
- while (it != m_lectureFiles.end() && (*it).tqfind(fname) == -1) {
+ while (it != m_lectureFiles.end() && (*it).find(fname) == -1) {
++it;
++num;
}
@@ -839,7 +839,7 @@ void KTouch::updateKeyboardActionCheck() {
int num = 0;
TQStringList::iterator it = m_keyboardFiles.begin();
TQString fname = Prefs::currentKeyboardFile();
- while (it != m_keyboardFiles.end() && (*it).tqfind(fname) == -1) {
+ while (it != m_keyboardFiles.end() && (*it).find(fname) == -1) {
++it;
++num;
}
diff --git a/ktouch/src/ktouchlecture.cpp b/ktouch/src/ktouchlecture.cpp
index 1f3b687b..610c583a 100644
--- a/ktouch/src/ktouchlecture.cpp
+++ b/ktouch/src/ktouchlecture.cpp
@@ -129,9 +129,9 @@ bool KTouchLecture::readLecture(TQTextStream& in) {
// only consider non-empty lines
if (!line.isEmpty()) {
// lecture title?
- if (line.tqfind("# Title:") == 0)
+ if (line.find("# Title:") == 0)
m_title = line.right(line.length() - 8).stripWhiteSpace();
- else if (line[0]!='#' || line.tqfind("# Comment:")!=-1) {
+ else if (line[0]!='#' || line.find("# Comment:")!=-1) {
// ok, after all those comment lines, we finally found the beginn of a level
in_level = true;
current_level += line + '\n';
diff --git a/ktouch/src/ktouchlecture.h b/ktouch/src/ktouchlecture.h
index 7c2af0d8..9cc4cc6e 100644
--- a/ktouch/src/ktouchlecture.h
+++ b/ktouch/src/ktouchlecture.h
@@ -27,7 +27,7 @@ class KURL;
/// This class handles the lecture data and provides the lines to type.
///
/// It contains the level data (see KTouchLevelData). A lecture object
-/// tqcontains ALWAYS at least one lecture.
+/// contains ALWAYS at least one lecture.
/// The lecture data can be read and written using the member functions
/// readLecture() and writeLecture().
/// During a training session the program will occasionally need a new
diff --git a/ktouch/src/ktouchleveldata.cpp b/ktouch/src/ktouchleveldata.cpp
index 58ac983f..de9b1257 100644
--- a/ktouch/src/ktouchleveldata.cpp
+++ b/ktouch/src/ktouchleveldata.cpp
@@ -45,7 +45,7 @@ bool KTouchLevelData::readLevel(TQTextStream& in) {
while (!line.isNull()) {
if (!line.isEmpty()) {
// Do we have a comment here? And if yes, is a keyword in the line?
- if (line.tqfind("# Comment:")==0)
+ if (line.find("# Comment:")==0)
m_comment = line.right(line.length() - 10).stripWhiteSpace();
else if (line[0]!='#') {
// the first line is the new characters line
diff --git a/ktouch/src/ktouchstatisticsdata.cpp b/ktouch/src/ktouchstatisticsdata.cpp
index b58802fd..f1b60dd0 100644
--- a/ktouch/src/ktouchstatisticsdata.cpp
+++ b/ktouch/src/ktouchstatisticsdata.cpp
@@ -157,7 +157,7 @@ void KTouchLevelStats::addCorrectChar(TQChar key) {
else
++(const_cast(*it).m_correctCount);
// this const_cast is necessary because the current gcc 3.2 has a bug in the
- // implementation of set::tqfind(). The non-const overload is missing and tqfind() always
+ // implementation of set::find(). The non-const overload is missing and find() always
// returns a const object. Maybe in the next release this will be fixed. Until then
// the const_cast helps.
}
@@ -179,7 +179,7 @@ void KTouchLevelStats::addWrongChar(TQChar key) {
else
++(const_cast(*it).m_wrongCount);
// this const_cast is necessary because the current gcc 3.2 has a bug in the
- // implementation of set::tqfind(). The non-const overload is missing and tqfind() always
+ // implementation of set::find(). The non-const overload is missing and find() always
// returns a const object. Maybe in the next release this will be fixed. Until then
// the const_cast helps.
}
@@ -324,7 +324,7 @@ void KTouchSessionStats::addCorrectChar(TQChar key) {
else
++(const_cast(*it).m_correctCount);
// this const_cast is necessary because the current gcc 3.2 has a bug in the
- // implementation of set::tqfind(). The non-const overload is missing and tqfind() always
+ // implementation of set::find(). The non-const overload is missing and find() always
// returns a const object. Maybe in the next release this will be fixed. Until then
// the const_cast helps.
}
@@ -346,7 +346,7 @@ void KTouchSessionStats::addWrongChar(TQChar key) {
else
++(const_cast(*it).m_wrongCount);
// this const_cast is necessary because the current gcc 3.2 has a bug in the
- // implementation of set::tqfind(). The non-const overload is missing and tqfind() always
+ // implementation of set::find(). The non-const overload is missing and find() always
// returns a const object. Maybe in the next release this will be fixed. Until then
// the const_cast helps.
}
diff --git a/kturtle/src/canvas.cpp b/kturtle/src/canvas.cpp
index e21ad4ea..e0a4ed05 100644
--- a/kturtle/src/canvas.cpp
+++ b/kturtle/src/canvas.cpp
@@ -18,7 +18,7 @@
// Note on this file:
-// It tqcontains 200 lines of code just to make sure very long line are drawn correctly
+// It contains 200 lines of code just to make sure very long line are drawn correctly
// till a certain extent... Beyond that extent the code just cuts the crap, since use user
// it then probably not doing anything usefull anymore; so he she will not notice the code
// is cheating a bit in order to prevent CPU hogging.
@@ -297,11 +297,11 @@ void Canvas::slotPrint(TQString text)
void Canvas::slotFontType(TQString family, TQString extra)
{
font.setFamily(family);
- font.setBold( extra.tqcontains("bold") > 0 );
- font.setItalic( extra.tqcontains("italic") > 0 );
- font.setUnderline( extra.tqcontains("underline") > 0 );
- font.setOverline( extra.tqcontains("overline") > 0 );
- font.setStrikeOut( extra.tqcontains("strikeout") > 0 );
+ font.setBold( extra.contains("bold") > 0 );
+ font.setItalic( extra.contains("italic") > 0 );
+ font.setUnderline( extra.contains("underline") > 0 );
+ font.setOverline( extra.contains("overline") > 0 );
+ font.setStrikeOut( extra.contains("strikeout") > 0 );
}
void Canvas::slotFontSize(int px)
diff --git a/kturtle/src/executer.cpp b/kturtle/src/executer.cpp
index e71204b4..9f88cc40 100644
--- a/kturtle/src/executer.cpp
+++ b/kturtle/src/executer.cpp
@@ -329,7 +329,7 @@ void Executer::execForEach(TreeNode* node)
bBreak = false;
- int i = expStr2.tqcontains(expStr1, false);
+ int i = expStr2.contains(expStr1, false);
for ( ; i > 0; i-- )
{
if (bAbort) return;
diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp
index 49f47d11..ffa528f3 100644
--- a/kturtle/src/kturtle.cpp
+++ b/kturtle/src/kturtle.cpp
@@ -650,7 +650,7 @@ void MainWindow::slotMessageDialog(TQString text)
-// BEGIN editor connections (undo, redo, cut, copy, paste, cursor, selections, tqfind, tqreplace, linenumbers etc.)
+// BEGIN editor connections (undo, redo, cut, copy, paste, cursor, selections, find, replace, linenumbers etc.)
void MainWindow::slotEditor()
{
@@ -716,7 +716,7 @@ void MainWindow::slotClearSelection()
void MainWindow::slotFind()
{
- KAction *a = editor->actionCollection()->action("edit_tqfind");
+ KAction *a = editor->actionCollection()->action("edit_find");
a->activate();
}
@@ -734,7 +734,7 @@ void MainWindow::slotFindPrevious()
void MainWindow::slotReplace()
{
- KAction* a = editor->actionCollection()->action("edit_tqreplace");
+ KAction* a = editor->actionCollection()->action("edit_replace");
a->activate();
}
@@ -1071,7 +1071,7 @@ void MainWindow::slotContextHelpUpdate()
int start, length, pos;
pos = 0;
- if ( line.tqcontains('"') )
+ if ( line.contains('"') )
{
TQRegExp delimitedStrings("(\"[^\"\\\\\\r\\n]*(\\\\.[^\"\\\\\\r\\n]*)*\")");
while ( delimitedStrings.search(line, pos) != -1 )
@@ -1112,13 +1112,13 @@ void MainWindow::slotContextHelpUpdate()
else if ( !translate->name2key( cursorWord.lower() ).isEmpty() ) helpKeyword = cursorWord;
else if ( !translate->alias2key( cursorWord.lower() ).isEmpty() ) helpKeyword = cursorWord;
- else if ( cursorWord.tqfind( TQRegExp("[\\d.]+") ) == 0 ) helpKeyword = i18n("");
+ else if ( cursorWord.find( TQRegExp("[\\d.]+") ) == 0 ) helpKeyword = i18n("");
- else if ( cursorWord.tqfind( TQRegExp("[+\\-*/\\(\\)]") ) == 0 ) helpKeyword = i18n("