From cee429821aa6f1acc97fb482d325fb4eb37376ca Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:44:46 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kstars/kstars/ccdpreviewwg.cpp | 2 +- kstars/kstars/detaildialog.cpp | 24 ++++++++++++------------ kstars/kstars/dms.cpp | 2 +- kstars/kstars/fitsimage.cpp | 2 +- kstars/kstars/fovdialog.cpp | 12 ++++++------ kstars/kstars/indidriver.cpp | 10 +++++----- kstars/kstars/indidriver.h | 6 +++--- kstars/kstars/indifitsconf.cpp | 2 +- kstars/kstars/infoboxes.cpp | 6 +++--- kstars/kstars/ksnewstuff.cpp | 4 ++-- kstars/kstars/kstarsactions.cpp | 4 ++-- kstars/kstars/kstarsdata.cpp | 2 +- kstars/kstars/locationdialog.cpp | 10 +++++----- kstars/kstars/simclock.cpp | 4 ++-- kstars/kstars/streamwg.cpp | 2 +- kstars/kstars/tools/kstarsplotwidget.cpp | 8 ++++---- kstars/kstars/tools/modcalcazel.cpp | 4 ++-- kstars/kstars/tools/modcalcgeodcoord.cpp | 20 ++++++++++---------- kstars/kstars/tools/modcalcjd.cpp | 8 ++++---- kstars/kstars/tools/modcalcplanets.cpp | 4 ++-- kstars/kstars/tools/modcalcvlsr.cpp | 12 ++++++------ kstars/kstars/tools/observinglist.cpp | 6 +++--- kstars/kstars/tools/planetviewer.cpp | 6 +++--- kstars/kstars/tools/scriptbuilder.cpp | 6 +++--- 24 files changed, 83 insertions(+), 83 deletions(-) (limited to 'kstars/kstars') diff --git a/kstars/kstars/ccdpreviewwg.cpp b/kstars/kstars/ccdpreviewwg.cpp index abe0ae21..edbc9006 100644 --- a/kstars/kstars/ccdpreviewwg.cpp +++ b/kstars/kstars/ccdpreviewwg.cpp @@ -65,7 +65,7 @@ FILE *CCDwfp; brightnessChanged(brightnessBar->value()); contrastChanged(contrastBar->value()); - KIconLoader *icons = KGlobal::iconLoader(); + KIconLoader *icons = TDEGlobal::iconLoader(); playPix = icons->loadIcon( "player_play", KIcon::Toolbar ); pausePix = icons->loadIcon( "player_pause", KIcon::Toolbar ); diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp index 7e178278..b4fd1b75 100644 --- a/kstars/kstars/detaildialog.cpp +++ b/kstars/kstars/detaildialog.cpp @@ -136,7 +136,7 @@ void DetailDialog::createGeneralTab() Data->Names->setText( s->longname() ); Data->Type->setText( s->sptype() + " " + i18n("star") ); Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).arg( - KGlobal::locale()->formatNumber( s->mag(), 1 ) ) ); //show to tenths place + TDEGlobal::locale()->formatNumber( s->mag(), 1 ) ) ); //show to tenths place //distance if ( s->distance() > 2000. || s->distance() < 0. ) // parallax < 0.5 mas @@ -146,10 +146,10 @@ void DetailDialog::createGeneralTab() TQString::number( int( s->distance() + 0.5 ) ) ) ); else if ( s->distance() > 10.0 ) //show to tenths place Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).arg( - KGlobal::locale()->formatNumber( s->distance(), 1 ) ) ); + TDEGlobal::locale()->formatNumber( s->distance(), 1 ) ) ); else //show to hundredths place Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).arg( - KGlobal::locale()->formatNumber( s->distance(), 2 ) ) ); + TDEGlobal::locale()->formatNumber( s->distance(), 2 ) ) ); //Note multiplicity/variablility in angular size label Data->AngSizeLabel->setText( "" ); @@ -186,26 +186,26 @@ void DetailDialog::createGeneralTab() Data->Mag->setText( TQString("%1 %").arg( int( ((KSMoon *)selectedObject)->illum()*100. ) ) ); } else { Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).arg( - KGlobal::locale()->formatNumber( ps->mag(), 1 ) ) ); //show to tenths place + TDEGlobal::locale()->formatNumber( ps->mag(), 1 ) ) ); //show to tenths place } //Distance from Earth. The moon requires a unit conversion if ( ps->name() == "Moon" ) { Data->Distance->setText( i18n("distance in kilometers", "%1 km").arg( - KGlobal::locale()->formatNumber( ps->rearth()*AU_KM ) ) ); + TDEGlobal::locale()->formatNumber( ps->rearth()*AU_KM ) ) ); } else { Data->Distance->setText( i18n("distance in Astronomical Units", "%1 AU").arg( - KGlobal::locale()->formatNumber( ps->rearth() ) ) ); + TDEGlobal::locale()->formatNumber( ps->rearth() ) ) ); } //Angular size; moon and sun in arcmin, others in arcsec if ( ps->angSize() ) { if ( ps->name() == "Sun" || ps->name() == "Moon" ) Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").arg( - KGlobal::locale()->formatNumber( ps->angSize() ) ) ); + TDEGlobal::locale()->formatNumber( ps->angSize() ) ) ); else Data->AngSize->setText( i18n("angular size in arcseconds", "%1 arcsec").arg( - KGlobal::locale()->formatNumber( ps->angSize()*60.0 ) ) ); + TDEGlobal::locale()->formatNumber( ps->angSize()*60.0 ) ) ); } else { Data->AngSize->setText( "--" ); } @@ -246,7 +246,7 @@ void DetailDialog::createGeneralTab() Data->Mag->setText( "--" ); else Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).arg( - KGlobal::locale()->formatNumber( dso->mag(), 1 ) ) ); //show to tenths place + TDEGlobal::locale()->formatNumber( dso->mag(), 1 ) ) ); //show to tenths place //No distances at this point... Data->Distance->setText( "--" ); @@ -257,7 +257,7 @@ void DetailDialog::createGeneralTab() int( dso->a() ) ) ); else if ( dso->a() ) Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").arg( - KGlobal::locale()->formatNumber( dso->a(), 1 ) ) ); + TDEGlobal::locale()->formatNumber( dso->a(), 1 ) ) ); else Data->AngSize->setText( "--" ); @@ -313,7 +313,7 @@ void DetailDialog::createPositionTab( const KStarsDateTime &ut, GeoLocation *geo //because we don't want a thousands-place separator! TQString sEpoch = TQString::number( ut.epoch(), 'f', 1 ); //Replace the decimal point with localized decimal symbol - sEpoch.replace( ".", KGlobal::locale()->decimalSymbol() ); + sEpoch.replace( ".", TDEGlobal::locale()->decimalSymbol() ); Pos->RALabel->setText( i18n( "RA (%1):" ).arg( sEpoch ) ); Pos->DecLabel->setText( i18n( "Dec (%1):" ).arg( sEpoch ) ); @@ -336,7 +336,7 @@ void DetailDialog::createPositionTab( const KStarsDateTime &ut, GeoLocation *geo //Airmass is approximated as the secant of the zenith distance, //equivalent to 1./sin(Alt). Beware of Inf at Alt=0! if ( selectedObject->alt()->Degrees() > 0.0 ) - Pos->Airmass->setText( KGlobal::locale()->formatNumber( + Pos->Airmass->setText( TDEGlobal::locale()->formatNumber( 1./sin( selectedObject->alt()->radians() ), 2 ) ); else Pos->Airmass->setText( "--" ); diff --git a/kstars/kstars/dms.cpp b/kstars/kstars/dms.cpp index d5a69d8f..e8a29fc6 100644 --- a/kstars/kstars/dms.cpp +++ b/kstars/kstars/dms.cpp @@ -71,7 +71,7 @@ bool dms::setFromString( const TQString &str, bool isDeg ) { //Account for localized decimal-point settings //TQString::toDouble() requires that the decimal symbol is "." - entry.replace( KGlobal::locale()->decimalSymbol(), "." ); + entry.replace( TDEGlobal::locale()->decimalSymbol(), "." ); //empty entry returns false if ( entry.isEmpty() ) { diff --git a/kstars/kstars/fitsimage.cpp b/kstars/kstars/fitsimage.cpp index 1a42a1a7..76fccfa5 100644 --- a/kstars/kstars/fitsimage.cpp +++ b/kstars/kstars/fitsimage.cpp @@ -162,7 +162,7 @@ void FITSImage::contentsMouseMoveEvent ( TQMouseEvent * e ) if (validPoint) { viewer->statusBar()->changeItem(TQString("%1 , %2").arg( (int) x).arg( (int) y), 0); - viewer->statusBar()->changeItem( KGlobal::locale()->formatNumber( viewer->imgBuffer[(int) (y * width + x)], 3 ), 1 ); + viewer->statusBar()->changeItem( TDEGlobal::locale()->formatNumber( viewer->imgBuffer[(int) (y * width + x)], 3 ), 1 ); setCursor(TQt::CrossCursor); } else diff --git a/kstars/kstars/fovdialog.cpp b/kstars/kstars/fovdialog.cpp index dedf6dd9..6021c495 100644 --- a/kstars/kstars/fovdialog.cpp +++ b/kstars/kstars/fovdialog.cpp @@ -134,7 +134,7 @@ void FOVDialog::paintEvent( TQPaintEvent * ) { TQFont smallFont = p.font(); smallFont.setPointSize( p.font().pointSize() - 2 ); p.setFont( smallFont ); - p.drawText( 0, fov->ViewBox->contentsRect().height(), i18n("angular size in arcminutes", "%1 arcmin").arg( KGlobal::locale()->formatNumber( f->size() ), 3 ) ); + p.drawText( 0, fov->ViewBox->contentsRect().height(), i18n("angular size in arcminutes", "%1 arcmin").arg( TDEGlobal::locale()->formatNumber( f->size() ), 3 ) ); } } @@ -162,7 +162,7 @@ void FOVDialog::slotEditFOV() { return; newfdlg.ui->FOVName->setText( f->name() ); - newfdlg.ui->FOVEdit->setText( KGlobal::locale()->formatNumber( f->size(), 3 ) ); + newfdlg.ui->FOVEdit->setText( TDEGlobal::locale()->formatNumber( f->size(), 3 ) ); newfdlg.ui->ColorButton->setColor( TQColor( f->color() ) ); newfdlg.ui->ShapeBox->setCurrentItem( f->shape() ); newfdlg.slotUpdateFOV(); @@ -231,7 +231,7 @@ void NewFOV::paintEvent( TQPaintEvent * ) { p.begin( ui->ViewBox ); p.fillRect( ui->ViewBox->contentsRect(), TQColor( "black" ) ); f.draw( p, (float)( 0.3*ui->ViewBox->contentsRect().width() ) ); - p.drawText( 0, 0, i18n("angular size in arcminutes", "%1 arcmin").arg( KGlobal::locale()->formatNumber( f.size() ), 3 ) ); + p.drawText( 0, 0, i18n("angular size in arcminutes", "%1 arcmin").arg( TDEGlobal::locale()->formatNumber( f.size() ), 3 ) ); p.end(); } @@ -242,11 +242,11 @@ void NewFOV::slotComputeFOV() { if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "ComputeEyeFOV" ) && ui->TLength1->value() > 0.0 ) kdDebug() << "B" << endl; if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "ComputeEyeFOV" ) && ui->TLength1->value() > 0.0 ) - ui->FOVEdit->setText( KGlobal::locale()->formatNumber( ui->EyeFOV->value() * ui->EyeLength->value() / ui->TLength1->value() ) ); + ui->FOVEdit->setText( TDEGlobal::locale()->formatNumber( ui->EyeFOV->value() * ui->EyeLength->value() / ui->TLength1->value() ) ); else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "ComputeCameraFOV" ) && ui->TLength2->value() > 0.0 ) - ui->FOVEdit->setText( KGlobal::locale()->formatNumber( ui->ChipSize->value() * 3438.0 / ui->TLength2->value() ) ); + ui->FOVEdit->setText( TDEGlobal::locale()->formatNumber( ui->ChipSize->value() * 3438.0 / ui->TLength2->value() ) ); else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "ComputeHPBW" ) && ui->RTDiameter->value() > 0.0 && ui->WaveLength->value() > 0.0 ) { - ui->FOVEdit->setText( KGlobal::locale()->formatNumber( 34.34 * 1.2 * ui->WaveLength->value() / ui->RTDiameter->value() ) ); + ui->FOVEdit->setText( TDEGlobal::locale()->formatNumber( 34.34 * 1.2 * ui->WaveLength->value() / ui->RTDiameter->value() ) ); // Beam width for an antenna is usually a circle on the sky. ui->ShapeBox->setCurrentItem(4); slotUpdateFOV(); diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp index 64624f8a..e34b83f6 100644 --- a/kstars/kstars/indidriver.cpp +++ b/kstars/kstars/indidriver.cpp @@ -63,7 +63,7 @@ INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent ) localListView->setSorting(-1); clientListView->setSorting(-1); - KIconLoader *icons = KGlobal::iconLoader(); + KIconLoader *icons = TDEGlobal::iconLoader(); runningPix = icons->loadIcon( "exec", KIcon::Small); stopPix = icons->loadIcon( "button_cancel", KIcon::Small); localMode = icons->loadIcon( "network_local", KIcon::Small); @@ -402,7 +402,7 @@ bool INDIDriver::runDevice(IDevice *dev) return false; } - dev->proc = new KProcess; + dev->proc = new TDEProcess; *dev->proc << "indiserver"; *dev->proc << "-v" << "-r" << "0" << "-p" << TQString("%1").arg(dev->indiPort) << dev->driver; @@ -415,9 +415,9 @@ bool INDIDriver::runDevice(IDevice *dev) else localListView->selectedItem()->setPixmap(2, serverMode); - connect(dev->proc, TQT_SIGNAL(receivedStderr (KProcess *, char *, int)), dev, TQT_SLOT(processstd(KProcess *, char*, int))); + connect(dev->proc, TQT_SIGNAL(receivedStderr (TDEProcess *, char *, int)), dev, TQT_SLOT(processstd(TDEProcess *, char*, int))); - dev->proc->start(KProcess::NotifyOnExit, KProcess::Stderr); + dev->proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr); //dev->proc->start(); return (dev->proc->isRunning()); @@ -935,7 +935,7 @@ IDevice::IDevice(TQString inLabel, TQString inDriver, TQString inVersion) } -void IDevice::processstd(KProcess* /*proc*/, char* buffer, int /*buflen*/) +void IDevice::processstd(TDEProcess* /*proc*/, char* buffer, int /*buflen*/) { serverBuffer.append(buffer); emit newServerInput(); diff --git a/kstars/kstars/indidriver.h b/kstars/kstars/indidriver.h index f62f06a0..8ecf6e2e 100644 --- a/kstars/kstars/indidriver.h +++ b/kstars/kstars/indidriver.h @@ -29,7 +29,7 @@ class KStars; class KListView; class KPopupMenu; -class KProcess; +class TDEProcess; struct INDIHostsInfo { @@ -60,7 +60,7 @@ class IDevice : public TQObject bool managed; int mgrID; int deviceType; - KProcess *proc; + TDEProcess *proc; /* Telescope specific attributes */ double focal_length; @@ -69,7 +69,7 @@ class IDevice : public TQObject void restart(); public slots: - void processstd(KProcess *proc, char* buffer, int buflen); + void processstd(TDEProcess *proc, char* buffer, int buflen); signals: void newServerInput(); diff --git a/kstars/kstars/indifitsconf.cpp b/kstars/kstars/indifitsconf.cpp index 5c4cddae..d6d9ce02 100644 --- a/kstars/kstars/indifitsconf.cpp +++ b/kstars/kstars/indifitsconf.cpp @@ -27,7 +27,7 @@ INDIFITSConf::INDIFITSConf(TQWidget* parent, const char* name, bool modal, WFlag : INDIConf(parent,name, modal,fl) { - KIconLoader *icons = KGlobal::iconLoader(); + KIconLoader *icons = TDEGlobal::iconLoader(); selectDirB->setPixmap( icons->loadIcon( "fileopen", KIcon::Toolbar ) ); connect(selectDirB, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveFITSDirectory())); connect(filterCombo, TQT_SIGNAL(activated (int)), this, TQT_SLOT(comboUpdate(int))); diff --git a/kstars/kstars/infoboxes.cpp b/kstars/kstars/infoboxes.cpp index dff865e4..922380da 100644 --- a/kstars/kstars/infoboxes.cpp +++ b/kstars/kstars/infoboxes.cpp @@ -351,7 +351,7 @@ bool InfoBoxes::timeChanged( const KStarsDateTime &ut, const KStarsDateTime <, //Don't use KLocale::formatNumber() for Julian Day because we don't want //thousands-place separators TQString JDString = TQString::number( ut.djd(), 'f', 2 ); - JDString.replace( ".", KGlobal::locale()->decimalSymbol() ); + JDString.replace( ".", TDEGlobal::locale()->decimalSymbol() ); TimeBox->setText3( i18n( "Sidereal Time", "ST: " ) + STString + i18n( "Julian Day", "JD: " ) + JDString ); @@ -375,9 +375,9 @@ bool InfoBoxes::geoChanged(const GeoLocation *geo) { GeoBox->setText1( name ); GeoBox->setText2( i18n( "Longitude", "Long:" ) + " " + - KGlobal::locale()->formatNumber( geo->lng()->Degrees(),3) + " " + + TDEGlobal::locale()->formatNumber( geo->lng()->Degrees(),3) + " " + i18n( "Latitude", "Lat:" ) + " " + - KGlobal::locale()->formatNumber( geo->lat()->Degrees(),3) ); + TDEGlobal::locale()->formatNumber( geo->lat()->Degrees(),3) ); if ( ot1 == GeoBox->text1() && ot2 == GeoBox->text2() ) return false; diff --git a/kstars/kstars/ksnewstuff.cpp b/kstars/kstars/ksnewstuff.cpp index 3c14c73f..3332b58c 100644 --- a/kstars/kstars/ksnewstuff.cpp +++ b/kstars/kstars/ksnewstuff.cpp @@ -42,7 +42,7 @@ KSNewStuff::KSNewStuff( TQWidget *parent ) : { ks = (KStars*)parent; kdw = new KDirWatch( this ); - kdw->addDir( KGlobal::dirs()->saveLocation("data", kapp->instanceName(), true) ); + kdw->addDir( TDEGlobal::dirs()->saveLocation("data", kapp->instanceName(), true) ); } bool KSNewStuff::install( const TQString &fileName ) @@ -54,7 +54,7 @@ bool KSNewStuff::install( const TQString &fileName ) return false; const KArchiveDirectory *archiveDir = archive.directory(); - const TQString destDir = KGlobal::dirs()->saveLocation("data", kapp->instanceName(), true); + const TQString destDir = TDEGlobal::dirs()->saveLocation("data", kapp->instanceName(), true); KStandardDirs::makeDir( destDir ); //monitor destDir for changes; inform updateData when files are created. diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp index 8a7959f2..4e28a5ab 100644 --- a/kstars/kstars/kstarsactions.cpp +++ b/kstars/kstars/kstarsactions.cpp @@ -565,9 +565,9 @@ void KStars::slotRunScript() { //Add statusbar message that script is running //ks->statusBar()->changeItem( i18n( "Running script: %1" ).arg( fileURL.fileName() ), 0 ); - KProcess p; + TDEProcess p; p << f.name(); - p.start( KProcess::DontCare ); + p.start( TDEProcess::DontCare ); while ( p.isRunning() ) kapp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes. } diff --git a/kstars/kstars/kstarsdata.cpp b/kstars/kstars/kstarsdata.cpp index d8084480..5bd888e7 100644 --- a/kstars/kstars/kstarsdata.cpp +++ b/kstars/kstars/kstarsdata.cpp @@ -947,7 +947,7 @@ bool KStarsData::openURLFile(TQString urlfile, TQFile & file) { //Find global file(s) in findAllResources() list. TQFileInfo fi_local( file.name() ); - TQStringList flist = KGlobal::instance()->dirs()->findAllResources( "appdata", urlfile ); + TQStringList flist = TDEGlobal::instance()->dirs()->findAllResources( "appdata", urlfile ); for ( unsigned int i=0; i< flist.count(); i++ ) { if ( flist[i] != file.name() ) { TQFileInfo fi_global( flist[i] ); diff --git a/kstars/kstars/locationdialog.cpp b/kstars/kstars/locationdialog.cpp index 2ba14da1..546694c7 100644 --- a/kstars/kstars/locationdialog.cpp +++ b/kstars/kstars/locationdialog.cpp @@ -109,7 +109,7 @@ LocationDialog::LocationDialog( TQWidget* parent ) TZBox->setDuplicatesEnabled( false ); for ( int i=0; i<25; ++i ) - TZBox->insertItem( KGlobal::locale()->formatNumber( (double)(i-12) ) ); + TZBox->insertItem( TDEGlobal::locale()->formatNumber( (double)(i-12) ) ); TQMap::Iterator it = p->data()->Rulebook.begin(); TQMap::Iterator itEnd = p->data()->Rulebook.end(); @@ -224,10 +224,10 @@ void LocationDialog::initCityList( void ) { filteredCityList.append( loc ); //If TZ is not even integer value, add it to listbox - if ( loc->TZ0() - int( loc->TZ0() ) && ! TZBox->listBox()->findItem( KGlobal::locale()->formatNumber( loc->TZ0() ) ) ) { + if ( loc->TZ0() - int( loc->TZ0() ) && ! TZBox->listBox()->findItem( TDEGlobal::locale()->formatNumber( loc->TZ0() ) ) ) { for ( unsigned int i=0; i<((unsigned int) TZBox->count()); ++i ) { if ( TZBox->text( i ).toDouble() > loc->TZ0() ) { - TZBox->insertItem( KGlobal::locale()->formatNumber( loc->TZ0() ), i-1 ); + TZBox->insertItem( TDEGlobal::locale()->formatNumber( loc->TZ0() ), i-1 ); break; } } @@ -308,7 +308,7 @@ void LocationDialog::changeCity( void ) { NewCountryName->setText( SelectedCity->translatedCountry() ); NewLong->showInDegrees( SelectedCity->lng() ); NewLat->showInDegrees( SelectedCity->lat() ); - TZBox->setCurrentText( KGlobal::locale()->formatNumber( SelectedCity->TZ0() ) ); + TZBox->setCurrentText( TDEGlobal::locale()->formatNumber( SelectedCity->TZ0() ) ); //Pick the City's rule from the rulebook for ( int i=0; icount(); ++i ) { @@ -464,7 +464,7 @@ void LocationDialog::clearFields( void ) { NewCountryName->clear(); NewLong->clearFields(); NewLat->clearFields(); - TZBox->lineEdit()->setText( KGlobal::locale()->formatNumber( 0.0 ) ); + TZBox->lineEdit()->setText( TDEGlobal::locale()->formatNumber( 0.0 ) ); TZRuleBox->setCurrentItem( 0 ); nameModified = true; dataModified = false; diff --git a/kstars/kstars/simclock.cpp b/kstars/kstars/simclock.cpp index 0e7c467a..54c97b45 100644 --- a/kstars/kstars/simclock.cpp +++ b/kstars/kstars/simclock.cpp @@ -73,7 +73,7 @@ void SimClock::tick() { long double scaledsec = (long double)mselapsed * (long double)Scale / 1000.0; UTC.setDJD( julianmark + scaledsec / (24. * 3600.) ); -// kdDebug() << "tick() : JD = " << KGlobal::locale()->formatNumber( UTC.djd(), 7 ) << +// kdDebug() << "tick() : JD = " << TDEGlobal::locale()->formatNumber( UTC.djd(), 7 ) << // " mselapsed = " << mselapsed << " scale = " << Scale << // " scaledsec = " << double(scaledsec) << endl; @@ -163,7 +163,7 @@ void SimClock::setUTC(const KStarsDateTime &newtime) { } kdDebug() << i18n( "Setting clock: UTC: %1 JD: %2" ) - .arg( UTC.toString() ).arg( KGlobal::locale()->formatNumber( UTC.djd() ) ) << endl; + .arg( UTC.toString() ).arg( TDEGlobal::locale()->formatNumber( UTC.djd() ) ) << endl; emit timeChanged(); } else { kdDebug() << i18n( "Cannot set SimClock: Invalid Date/Time." ) << endl; diff --git a/kstars/kstars/streamwg.cpp b/kstars/kstars/streamwg.cpp index 53d19fc7..e6796bcb 100644 --- a/kstars/kstars/streamwg.cpp +++ b/kstars/kstars/streamwg.cpp @@ -52,7 +52,7 @@ FILE *wfp; //videoFrameLayout = new TQVBoxLayout(videoFrame, 0, 0); streamFrame = new VideoWG(videoFrame); - KIconLoader *icons = KGlobal::iconLoader(); + KIconLoader *icons = TDEGlobal::iconLoader(); playPix = icons->loadIcon( "player_play", KIcon::Toolbar ); pausePix = icons->loadIcon( "player_pause", KIcon::Toolbar ); diff --git a/kstars/kstars/tools/kstarsplotwidget.cpp b/kstars/kstars/tools/kstarsplotwidget.cpp index 750eb85a..3e2e2ee6 100644 --- a/kstars/kstars/tools/kstarsplotwidget.cpp +++ b/kstars/kstars/tools/kstarsplotwidget.cpp @@ -361,7 +361,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); int idot = str.find( '.' ); if ( idot >= 0 ) - str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.replace( idot, 1, TDEGlobal::locale()->decimalSymbol() ); if ( px > 0 && px < pW ) { TQRect r( px - BIGTICKSIZE, pH+BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); @@ -429,7 +429,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); int idot = str.find( '.' ); if ( idot >= 0 ) - str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.replace( idot, 1, TDEGlobal::locale()->decimalSymbol() ); if ( py > 0 && py < pH ) { TQRect r( -2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); @@ -495,7 +495,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); int idot = str.find( '.' ); if ( idot >= 0 ) - str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.replace( idot, 1, TDEGlobal::locale()->decimalSymbol() ); if ( px > 0 && px < pW ) { TQRect r( px - BIGTICKSIZE, -2*BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); @@ -559,7 +559,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); int idot = str.find( '.' ); if ( idot >= 0 ) - str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.replace( idot, 1, TDEGlobal::locale()->decimalSymbol() ); if ( py > 0 && py < pH ) { TQRect r( pW + 2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); diff --git a/kstars/kstars/tools/modcalcazel.cpp b/kstars/kstars/tools/modcalcazel.cpp index 9ddafb37..e2eb527e 100644 --- a/kstars/kstars/tools/modcalcazel.cpp +++ b/kstars/kstars/tools/modcalcazel.cpp @@ -165,8 +165,8 @@ void modCalcAzel::showEpoch( const KStarsDateTime &dt ) { double epochN = dt.epoch(); // Localization -// epochName->setText(KGlobal::locale()->formatNumber(epochN,3)); - epochName->setText( KGlobal::locale()->formatNumber( epochN ) ); +// epochName->setText(TDEGlobal::locale()->formatNumber(epochN,3)); + epochName->setText( TDEGlobal::locale()->formatNumber( epochN ) ); } diff --git a/kstars/kstars/tools/modcalcgeodcoord.cpp b/kstars/kstars/tools/modcalcgeodcoord.cpp index 1c4f9110..892b08e9 100644 --- a/kstars/kstars/tools/modcalcgeodcoord.cpp +++ b/kstars/kstars/tools/modcalcgeodcoord.cpp @@ -73,9 +73,9 @@ void modCalcGeodCoord::setEllipsoid(int index) { void modCalcGeodCoord::getCartGeoCoords (void) { - geoPlace->setXPos( KGlobal::locale()->readNumber(xGeoName->text())*1000. ); - geoPlace->setYPos( KGlobal::locale()->readNumber(yGeoName->text())*1000. ); - geoPlace->setZPos( KGlobal::locale()->readNumber(zGeoName->text())*1000. ); + geoPlace->setXPos( TDEGlobal::locale()->readNumber(xGeoName->text())*1000. ); + geoPlace->setYPos( TDEGlobal::locale()->readNumber(yGeoName->text())*1000. ); + geoPlace->setZPos( TDEGlobal::locale()->readNumber(zGeoName->text())*1000. ); //geoPlace->setXPos( xGeoName->text().toDouble()*1000. ); //geoPlace->setYPos( yGeoName->text().toDouble()*1000. ); //geoPlace->setZPos( zGeoName->text().toDouble()*1000. ); @@ -118,15 +118,15 @@ void modCalcGeodCoord::showSpheGeoCoords(void) { lonGeoBox->show( geoPlace->lng() ); latGeoBox->show( geoPlace->lat() ); - altGeoBox->setText( KGlobal::locale()->formatNumber( geoPlace->height(), 3) ); + altGeoBox->setText( TDEGlobal::locale()->formatNumber( geoPlace->height(), 3) ); } void modCalcGeodCoord::showCartGeoCoords(void) { - xGeoName->setText( KGlobal::locale()->formatNumber( geoPlace->xPos()/1000. ,6)); - yGeoName->setText( KGlobal::locale()->formatNumber( geoPlace->yPos()/1000. ,6)); - zGeoName->setText( KGlobal::locale()->formatNumber( geoPlace->zPos()/1000. ,6)); + xGeoName->setText( TDEGlobal::locale()->formatNumber( geoPlace->xPos()/1000. ,6)); + yGeoName->setText( TDEGlobal::locale()->formatNumber( geoPlace->yPos()/1000. ,6)); + zGeoName->setText( TDEGlobal::locale()->formatNumber( geoPlace->zPos()/1000. ,6)); } void modCalcGeodCoord::geoCheck(void) { @@ -297,7 +297,7 @@ void modCalcGeodCoord::processLines( TQTextStream &istream ) { xB = fields[i].toDouble(); i++; } else - xB = KGlobal::locale()->readNumber(xBoxBatch->text()) ; + xB = TDEGlobal::locale()->readNumber(xBoxBatch->text()) ; if ( allRadioBatch->isChecked() ) ostream << xB << space; @@ -311,7 +311,7 @@ void modCalcGeodCoord::processLines( TQTextStream &istream ) { yB = fields[i].toDouble(); i++; } else - yB = KGlobal::locale()->readNumber( yBoxBatch->text()) ; + yB = TDEGlobal::locale()->readNumber( yBoxBatch->text()) ; if ( allRadioBatch->isChecked() ) ostream << yB << space; @@ -324,7 +324,7 @@ void modCalcGeodCoord::processLines( TQTextStream &istream ) { zB = fields[i].toDouble(); i++; } else - zB = KGlobal::locale()->readNumber( zBoxBatch->text()); + zB = TDEGlobal::locale()->readNumber( zBoxBatch->text()); if ( allRadioBatch->isChecked() ) ostream << zB << space; diff --git a/kstars/kstars/tools/modcalcjd.cpp b/kstars/kstars/tools/modcalcjd.cpp index 8b87b998..9b982664 100644 --- a/kstars/kstars/tools/modcalcjd.cpp +++ b/kstars/kstars/tools/modcalcjd.cpp @@ -71,7 +71,7 @@ void modCalcJD::computeFromMjd (void) { long double julianDay, modjulianDay; - modjulianDay = KGlobal::locale()->readNumber( MjdName->text() ); + modjulianDay = TDEGlobal::locale()->readNumber( MjdName->text() ); julianDay = MJD0 + modjulianDay; showJd( julianDay ); computeFromJd(); @@ -80,7 +80,7 @@ void modCalcJD::computeFromMjd (void) void modCalcJD::computeFromJd (void) { long double julianDay, modjulianDay; - julianDay = KGlobal::locale()->readNumber( JdName->text() ); + julianDay = TDEGlobal::locale()->readNumber( JdName->text() ); KStarsDateTime dt( julianDay ); datBox->setDate( dt.date() ); @@ -116,10 +116,10 @@ KStarsDateTime modCalcJD::getDateTime (void) void modCalcJD::showJd(long double julianDay) { - JdName->setText(KGlobal::locale()->formatNumber( (double)julianDay, 5 ) ); + JdName->setText(TDEGlobal::locale()->formatNumber( (double)julianDay, 5 ) ); } void modCalcJD::showMjd(long double modjulianDay) { - MjdName->setText(KGlobal::locale()->formatNumber( (double)modjulianDay, 5 ) ); + MjdName->setText(TDEGlobal::locale()->formatNumber( (double)modjulianDay, 5 ) ); } diff --git a/kstars/kstars/tools/modcalcplanets.cpp b/kstars/kstars/tools/modcalcplanets.cpp index d149d5a3..977b47bf 100644 --- a/kstars/kstars/tools/modcalcplanets.cpp +++ b/kstars/kstars/tools/modcalcplanets.cpp @@ -220,14 +220,14 @@ void modCalcPlanets::showHeliocentricEclipticCoords(const dms *hLong, const dms { helLongBox->show( hLong ); helLatBox->show( hLat ); - sunDistBox->setText( KGlobal::locale()->formatNumber( dist,6)); + sunDistBox->setText( TDEGlobal::locale()->formatNumber( dist,6)); } void modCalcPlanets::showGeocentricEclipticCoords(const dms *eLong, const dms *eLat, double dist) { geoLongBox->show( eLong ); geoLatBox->show( eLat ); - earthDistBox->setText( KGlobal::locale()->formatNumber( dist,6)); + earthDistBox->setText( TDEGlobal::locale()->formatNumber( dist,6)); } void modCalcPlanets::showEquatorialCoords(const dms *ra, const dms *dec) diff --git a/kstars/kstars/tools/modcalcvlsr.cpp b/kstars/kstars/tools/modcalcvlsr.cpp index f55525b7..4f553554 100644 --- a/kstars/kstars/tools/modcalcvlsr.cpp +++ b/kstars/kstars/tools/modcalcvlsr.cpp @@ -172,30 +172,30 @@ void modCalcVlsr::showLongLat(void) void modCalcVlsr::showVlsr (const double vlsr ) { - vlsrBox->setText( KGlobal::locale()->formatNumber( vlsr ) ); + vlsrBox->setText( TDEGlobal::locale()->formatNumber( vlsr ) ); } void modCalcVlsr::showHelVel (const double vhel ) { - vHelioBox->setText( KGlobal::locale()->formatNumber( vhel ) ); + vHelioBox->setText( TDEGlobal::locale()->formatNumber( vhel ) ); } void modCalcVlsr::showGeoVel (const double vgeo ) { - vGeoBox->setText( KGlobal::locale()->formatNumber( vgeo ) ); + vGeoBox->setText( TDEGlobal::locale()->formatNumber( vgeo ) ); } void modCalcVlsr::showTopoVel (const double vtop ) { - vTopoBox->setText( KGlobal::locale()->formatNumber( vtop ) ); + vTopoBox->setText( TDEGlobal::locale()->formatNumber( vtop ) ); } void modCalcVlsr::showEpoch( const KStarsDateTime &dt ) { double epochN = dt.epoch(); // Localization -// epochName->setText(KGlobal::locale()->formatNumber(epochN,3)); - epochName->setText( KGlobal::locale()->formatNumber( epochN ) ); +// epochName->setText(TDEGlobal::locale()->formatNumber(epochN,3)); + epochName->setText( TDEGlobal::locale()->formatNumber( epochN ) ); } diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp index 2e6be24d..17fa8cce 100644 --- a/kstars/kstars/tools/observinglist.cpp +++ b/kstars/kstars/tools/observinglist.cpp @@ -105,7 +105,7 @@ ObservingList::ObservingList( KStars *_ks, TQWidget* parent ) obsList.setAutoDelete( false ); //do NOT delete removed pointers! //Add icons to Push Buttons - KIconLoader *icons = KGlobal::iconLoader(); + KIconLoader *icons = TDEGlobal::iconLoader(); ui->OpenButton->setPixmap( icons->loadIcon( "fileopen", KIcon::Toolbar ) ); ui->SaveButton->setPixmap( icons->loadIcon( "filesave", KIcon::Toolbar ) ); ui->SaveAsButton->setPixmap( icons->loadIcon( "filesaveas", KIcon::Toolbar ) ); @@ -676,7 +676,7 @@ void ObservingList::slotWizard() { void ObservingList::slotToggleSize() { if ( isLarge() ) { - ui->MiniButton->setPixmap( KGlobal::iconLoader()->loadIcon( "window_fullscreen", KIcon::Toolbar ) ); + ui->MiniButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "window_fullscreen", KIcon::Toolbar ) ); //switch widget stack to show TinyTable ui->TableStack->raiseWidget( ui->TinyTable ); @@ -697,7 +697,7 @@ void ObservingList::slotToggleSize() { bIsLarge = false; } else { - ui->MiniButton->setPixmap( KGlobal::iconLoader()->loadIcon( "window_nofullscreen", KIcon::Toolbar ) ); + ui->MiniButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "window_nofullscreen", KIcon::Toolbar ) ); //switch widget stack to show FullTable ui->TableStack->raiseWidget( ui->FullTable ); diff --git a/kstars/kstars/tools/planetviewer.cpp b/kstars/kstars/tools/planetviewer.cpp index bde44c2c..49cc6d28 100644 --- a/kstars/kstars/tools/planetviewer.cpp +++ b/kstars/kstars/tools/planetviewer.cpp @@ -48,7 +48,7 @@ PlanetViewer::PlanetViewer(TQWidget *parent, const char *name) pw->timeStep->setDaysOnly( true ); pw->timeStep->tsbox()->setValue( 1 ); //start with 1-day timestep - pw->RunButton->setPixmap( KGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Toolbar ) ); + pw->RunButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Toolbar ) ); pw->dateBox->setDate( ((KStars*)parent)->data()->lt().date() ); vlay->addWidget( pw ); @@ -115,11 +115,11 @@ void PlanetViewer::slotRunClock() { isClockRunning = !isClockRunning; if ( isClockRunning ) { - pw->RunButton->setPixmap( KGlobal::iconLoader()->loadIcon( "player_pause", KIcon::Toolbar ) ); + pw->RunButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "player_pause", KIcon::Toolbar ) ); tmr.start( 100 ); // pw->dateBox->setEnabled( false ); } else { - pw->RunButton->setPixmap( KGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Toolbar ) ); + pw->RunButton->setPixmap( TDEGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Toolbar ) ); tmr.stop(); // pw->dateBox->setEnabled( true ); } diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp index 88279857..9e02efe0 100644 --- a/kstars/kstars/tools/scriptbuilder.cpp +++ b/kstars/kstars/tools/scriptbuilder.cpp @@ -265,7 +265,7 @@ ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name ) new TQListViewItem(INDI_filter, setINDIFilterNumFunc->prototype()); //Add icons to Push Buttons - KIconLoader *icons = KGlobal::iconLoader(); + KIconLoader *icons = TDEGlobal::iconLoader(); sb->NewButton->setIconSet( icons->loadIcon( "filenew", KIcon::Toolbar ) ); sb->OpenButton->setIconSet( icons->loadIcon( "fileopen", KIcon::Toolbar ) ); sb->SaveButton->setIconSet( icons->loadIconSet( "filesave", KIcon::Toolbar ) ); @@ -898,9 +898,9 @@ void ScriptBuilder::slotRunScript() { //set rwx for owner, rx for group, rx for other chmod( f.name().ascii(), S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH ); - KProcess p; + TDEProcess p; p << f.name(); - if ( ! p.start( KProcess::DontCare ) ) + if ( ! p.start( TDEProcess::DontCare ) ) kdDebug() << "Process did not start." << endl; while ( p.isRunning() ) kapp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes. -- cgit v1.2.3