From eb570158698cf61dad4f77d950ef908160f6c3cc Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kstars/TODO | 2 +- kstars/kstars/addcatdialog.cpp | 6 +++--- kstars/kstars/addcatdialog.h | 2 +- kstars/kstars/addlinkdialog.cpp | 4 ++-- kstars/kstars/addlinkdialog.h | 2 +- kstars/kstars/ccdpreviewwg.cpp | 4 ++-- kstars/kstars/ccdpreviewwg.h | 4 ++-- kstars/kstars/conbridlg.cpp | 6 +++--- kstars/kstars/conbridlg.h | 2 +- kstars/kstars/detaildialog.cpp | 26 +++++++++++------------ kstars/kstars/detaildialog.h | 10 ++++----- kstars/kstars/devicemanager.cpp | 20 +++++++++--------- kstars/kstars/devicemanager.h | 4 ++-- kstars/kstars/dms.h | 2 +- kstars/kstars/dmsbox.cpp | 4 ++-- kstars/kstars/dmsbox.h | 4 ++-- kstars/kstars/draglistbox.cpp | 4 ++-- kstars/kstars/draglistbox.h | 2 +- kstars/kstars/finddialog.cpp | 8 +++---- kstars/kstars/finddialog.h | 2 +- kstars/kstars/fitshistogram.cpp | 8 +++---- kstars/kstars/fitshistogram.h | 4 ++-- kstars/kstars/fitsimage.cpp | 6 +++--- kstars/kstars/fitsimage.h | 6 +++--- kstars/kstars/fitsprocess.cpp | 8 +++---- kstars/kstars/fitsprocess.h | 4 ++-- kstars/kstars/fitsviewer.cpp | 10 ++++----- kstars/kstars/fitsviewer.h | 4 ++-- kstars/kstars/focusdialog.cpp | 6 +++--- kstars/kstars/focusdialog.h | 2 +- kstars/kstars/fovdialog.cpp | 10 ++++----- kstars/kstars/fovdialog.h | 4 ++-- kstars/kstars/imagereductiondlg.cpp | 2 +- kstars/kstars/imagereductiondlg.h | 2 +- kstars/kstars/imagesequence.cpp | 6 +++--- kstars/kstars/imagesequence.h | 2 +- kstars/kstars/imageviewer.cpp | 8 +++---- kstars/kstars/imageviewer.h | 4 ++-- kstars/kstars/indi/apogee/CameraIO_Linux.h | 2 +- kstars/kstars/indi/celestrongps.cpp | 2 +- kstars/kstars/indi/indiapi.h | 10 ++++----- kstars/kstars/indi/indicom.h | 2 +- kstars/kstars/indi/indiserver.c | 2 +- kstars/kstars/indi/lilxml.c | 8 +++---- kstars/kstars/indi/lilxml.h | 12 +++++------ kstars/kstars/indi/lx200_16.cpp | 2 +- kstars/kstars/indi/lx200autostar.cpp | 2 +- kstars/kstars/indi/lx200classic.cpp | 2 +- kstars/kstars/indi/lx200generic.cpp | 2 +- kstars/kstars/indi/lx200gps.cpp | 4 ++-- kstars/kstars/indi/v4lphilips.cpp | 6 +++--- kstars/kstars/indi/webcam/pwc-ioctl.h | 2 +- kstars/kstars/indidevice.cpp | 4 ++-- kstars/kstars/indidevice.h | 2 +- kstars/kstars/indidriver.cpp | 4 ++-- kstars/kstars/indidriver.h | 2 +- kstars/kstars/indielement.h | 2 +- kstars/kstars/indifitsconf.cpp | 4 ++-- kstars/kstars/indifitsconf.h | 2 +- kstars/kstars/indigroup.cpp | 2 +- kstars/kstars/indimenu.cpp | 4 ++-- kstars/kstars/indimenu.h | 2 +- kstars/kstars/indiproperty.cpp | 2 +- kstars/kstars/indiproperty.h | 4 ++-- kstars/kstars/infobox.h | 4 ++-- kstars/kstars/ksnewstuff.cpp | 6 +++--- kstars/kstars/ksnewstuff.h | 4 ++-- kstars/kstars/ksplanetbase.cpp | 2 +- kstars/kstars/ksplanetbase.h | 2 +- kstars/kstars/kspopupmenu.cpp | 6 +++--- kstars/kstars/kspopupmenu.h | 2 +- kstars/kstars/kssun.cpp | 2 +- kstars/kstars/kstars.h | 2 +- kstars/kstars/kstarsactions.cpp | 2 +- kstars/kstars/kstarsdata.h | 2 +- kstars/kstars/kstarsdatetime.cpp | 2 +- kstars/kstars/kstarssplash.cpp | 4 ++-- kstars/kstars/kstarssplash.h | 2 +- kstars/kstars/kswizard.cpp | 6 +++--- kstars/kstars/kswizard.h | 4 ++-- kstars/kstars/locationdialog.cpp | 16 +++++++------- kstars/kstars/locationdialog.h | 2 +- kstars/kstars/magnitudespinbox.cpp | 8 +++---- kstars/kstars/magnitudespinbox.h | 4 ++-- kstars/kstars/mapcanvas.cpp | 6 +++--- kstars/kstars/mapcanvas.h | 4 ++-- kstars/kstars/opsadvanced.h | 2 +- kstars/kstars/opscatalog.h | 2 +- kstars/kstars/opscolors.h | 2 +- kstars/kstars/opsguides.cpp | 4 ++-- kstars/kstars/opsguides.h | 2 +- kstars/kstars/opssolarsystem.cpp | 6 +++--- kstars/kstars/opssolarsystem.h | 2 +- kstars/kstars/simclock.cpp | 6 +++--- kstars/kstars/simclock.h | 4 ++-- kstars/kstars/skymap.cpp | 34 +++++++++++++++--------------- kstars/kstars/skymap.h | 10 ++++----- kstars/kstars/skyobjectname.cpp | 4 ++-- kstars/kstars/skyobjectname.h | 2 +- kstars/kstars/skypoint.h | 2 +- kstars/kstars/stardatasink.cpp | 4 ++-- kstars/kstars/stardatasink.h | 2 +- kstars/kstars/starpixmap.cpp | 8 +++---- kstars/kstars/streamwg.cpp | 4 ++-- kstars/kstars/streamwg.h | 4 ++-- kstars/kstars/telescopeprop.cpp | 6 +++--- kstars/kstars/telescopeprop.h | 2 +- kstars/kstars/telescopewizardprocess.cpp | 6 +++--- kstars/kstars/telescopewizardprocess.h | 2 +- kstars/kstars/thumbnaileditor.cpp | 8 +++---- kstars/kstars/thumbnaileditor.h | 4 ++-- kstars/kstars/thumbnailpicker.cpp | 6 +++--- kstars/kstars/thumbnailpicker.h | 2 +- kstars/kstars/timebox.cpp | 2 +- kstars/kstars/timebox.h | 4 ++-- kstars/kstars/timedialog.cpp | 6 +++--- kstars/kstars/timedialog.h | 2 +- kstars/kstars/timespinbox.cpp | 4 ++-- kstars/kstars/timespinbox.h | 2 +- kstars/kstars/timestepbox.cpp | 4 ++-- kstars/kstars/timestepbox.h | 2 +- kstars/kstars/timeunitbox.cpp | 4 ++-- kstars/kstars/timeunitbox.h | 2 +- kstars/kstars/toggleaction.cpp | 8 +++---- kstars/kstars/toggleaction.h | 4 ++-- kstars/kstars/tools/altvstime.cpp | 10 ++++----- kstars/kstars/tools/altvstime.h | 4 ++-- kstars/kstars/tools/astrocalc.cpp | 16 +++++++------- kstars/kstars/tools/astrocalc.h | 6 +++--- kstars/kstars/tools/jmoontool.cpp | 6 +++--- kstars/kstars/tools/jmoontool.h | 2 +- kstars/kstars/tools/kstarsplotwidget.cpp | 6 +++--- kstars/kstars/tools/kstarsplotwidget.h | 2 +- kstars/kstars/tools/lcgenerator.cpp | 10 ++++----- kstars/kstars/tools/lcgenerator.h | 4 ++-- kstars/kstars/tools/modcalcapcoord.cpp | 2 +- kstars/kstars/tools/modcalcapcoorddlg.ui | 4 ++-- kstars/kstars/tools/modcalcazel.cpp | 6 +++--- kstars/kstars/tools/modcalcazeldlg.ui | 2 +- kstars/kstars/tools/modcalcdaylength.cpp | 4 ++-- kstars/kstars/tools/modcalcequinox.cpp | 4 ++-- kstars/kstars/tools/modcalcgeodcoord.cpp | 2 +- kstars/kstars/tools/modcalcjd.cpp | 2 +- kstars/kstars/tools/modcalcplanets.cpp | 8 +++---- kstars/kstars/tools/modcalcsidtime.cpp | 2 +- kstars/kstars/tools/modcalcvlsr.cpp | 6 +++--- kstars/kstars/tools/observinglist.cpp | 4 ++-- kstars/kstars/tools/observinglist.h | 2 +- kstars/kstars/tools/obslistwizard.cpp | 6 +++--- kstars/kstars/tools/obslistwizard.h | 2 +- kstars/kstars/tools/planetviewer.cpp | 14 ++++++------ kstars/kstars/tools/planetviewer.h | 6 +++--- kstars/kstars/tools/scriptbuilder.cpp | 10 ++++----- kstars/kstars/tools/scriptbuilder.h | 4 ++-- 154 files changed, 369 insertions(+), 369 deletions(-) (limited to 'kstars') diff --git a/kstars/TODO b/kstars/TODO index 4d949331..fa6e56ab 100644 --- a/kstars/TODO +++ b/kstars/TODO @@ -33,7 +33,7 @@ - OpsDialog: zoomed-out faint limit not restricted to be <= zoomed-in limit -- OpsDialog: child widgets should disable when tqparent deselected: +- OpsDialog: child widgets should disable when parent deselected: Stars, Asteroids, Comets, CNames, MW, Hide obj. - OpsDialog: Remove All Trails button does nothing diff --git a/kstars/kstars/addcatdialog.cpp b/kstars/kstars/addcatdialog.cpp index 5264faa8..86c2b6dd 100644 --- a/kstars/kstars/addcatdialog.cpp +++ b/kstars/kstars/addcatdialog.cpp @@ -30,8 +30,8 @@ #include "addcatdialog.h" -AddCatDialog::AddCatDialog( TQWidget *tqparent ) - : KDialogBase( KDialogBase::Plain, i18n( "Import Catalog" ), Help|Ok|Cancel, Ok, tqparent ) { +AddCatDialog::AddCatDialog( TQWidget *parent ) + : KDialogBase( KDialogBase::Plain, i18n( "Import Catalog" ), Help|Ok|Cancel, Ok, parent ) { TQFrame *page = plainPage(); setMainWidget(page); @@ -106,7 +106,7 @@ void AddCatDialog::slotHelp() { * Position angle: floating-point value (position angle, in degrees) */ bool AddCatDialog::validateDataFile() { - KStars *ksw = (KStars*) tqtopLevelWidget()->tqparent(); + KStars *ksw = (KStars*) tqtopLevelWidget()->parent(); //Create the catalog file contents: first the header CatalogContents = writeCatalogHeader(); diff --git a/kstars/kstars/addcatdialog.h b/kstars/kstars/addcatdialog.h index 93e18c84..d867e5bc 100644 --- a/kstars/kstars/addcatdialog.h +++ b/kstars/kstars/addcatdialog.h @@ -40,7 +40,7 @@ class AddCatDialog : public KDialogBase { public: /**Default constructor */ - AddCatDialog( TQWidget *tqparent=0 ); + AddCatDialog( TQWidget *parent=0 ); /**Destructor (empty) */ diff --git a/kstars/kstars/addlinkdialog.cpp b/kstars/kstars/addlinkdialog.cpp index 1c6aa548..c03cc0c4 100644 --- a/kstars/kstars/addlinkdialog.cpp +++ b/kstars/kstars/addlinkdialog.cpp @@ -25,8 +25,8 @@ #include "addlinkdialog.h" #include "skyobject.h" -AddLinkDialog::AddLinkDialog( TQWidget *tqparent, const TQString &oname ) - : KDialogBase( KDialogBase::Plain, i18n( "Add Custom URL to %1" ).tqarg( oname ), Ok|Cancel, Ok, tqparent ), ObjectName( oname ) { +AddLinkDialog::AddLinkDialog( TQWidget *parent, const TQString &oname ) + : KDialogBase( KDialogBase::Plain, i18n( "Add Custom URL to %1" ).tqarg( oname ), Ok|Cancel, Ok, parent ), ObjectName( oname ) { TQFrame *page = plainPage(); setMainWidget(page); diff --git a/kstars/kstars/addlinkdialog.h b/kstars/kstars/addlinkdialog.h index b99de203..9c4917e0 100644 --- a/kstars/kstars/addlinkdialog.h +++ b/kstars/kstars/addlinkdialog.h @@ -39,7 +39,7 @@ class AddLinkDialog : public KDialogBase { TQ_OBJECT public: /**Constructor. */ - AddLinkDialog( TQWidget* tqparent = 0, const TQString &oname=i18n("object") ); + AddLinkDialog( TQWidget* parent = 0, const TQString &oname=i18n("object") ); /**Destructor (empty) */ ~AddLinkDialog() {} diff --git a/kstars/kstars/ccdpreviewwg.cpp b/kstars/kstars/ccdpreviewwg.cpp index e9269e60..26370cad 100644 --- a/kstars/kstars/ccdpreviewwg.cpp +++ b/kstars/kstars/ccdpreviewwg.cpp @@ -49,7 +49,7 @@ FILE *CCDwfp; - CCDPreviewWG::CCDPreviewWG(INDIStdDevice *inStdDev, TQWidget * tqparent, const char * name) : CCDPreviewForm(tqparent, name) + CCDPreviewWG::CCDPreviewWG(INDIStdDevice *inStdDev, TQWidget * parent, const char * name) : CCDPreviewForm(parent, name) { stdDev = inStdDev; @@ -277,7 +277,7 @@ void CCDPreviewWG::captureImage() } -CCDVideoWG::CCDVideoWG(TQWidget * tqparent, const char * name) : TQFrame(tqparent, name, TQt::WNoAutoErase) +CCDVideoWG::CCDVideoWG(TQWidget * parent, const char * name) : TQFrame(parent, name, TQt::WNoAutoErase) { streamImage = NULL; streamBuffer = NULL; diff --git a/kstars/kstars/ccdpreviewwg.h b/kstars/kstars/ccdpreviewwg.h index d6eddbfc..79d82a37 100644 --- a/kstars/kstars/ccdpreviewwg.h +++ b/kstars/kstars/ccdpreviewwg.h @@ -34,7 +34,7 @@ enum Pixelorder {PIXELORDER_NORMAL=1, PIXELORDER_DUAL=2}; TQ_OBJECT public: - CCDPreviewWG(INDIStdDevice *inStdDev, TQWidget * tqparent =0, const char * name =0); + CCDPreviewWG(INDIStdDevice *inStdDev, TQWidget * parent =0, const char * name =0); ~CCDPreviewWG(); friend class CCDVideoWG; @@ -77,7 +77,7 @@ enum Pixelorder {PIXELORDER_NORMAL=1, PIXELORDER_DUAL=2}; TQ_OBJECT public: - CCDVideoWG(TQWidget * tqparent =0, const char * name =0); + CCDVideoWG(TQWidget * parent =0, const char * name =0); ~CCDVideoWG(); friend class CCDPreviewWG; diff --git a/kstars/kstars/conbridlg.cpp b/kstars/kstars/conbridlg.cpp index d2178857..4b57b431 100644 --- a/kstars/kstars/conbridlg.cpp +++ b/kstars/kstars/conbridlg.cpp @@ -36,13 +36,13 @@ //TODO find a better and faster way to implement this, this operation can be memory and CPU intensive. -ContrastBrightnessDlg::ContrastBrightnessDlg(TQWidget *tqparent) : - KDialogBase(KDialogBase::Plain, i18n( "Brightness/Contrast" ), Ok|Cancel, Ok, tqparent ) +ContrastBrightnessDlg::ContrastBrightnessDlg(TQWidget *parent) : + KDialogBase(KDialogBase::Plain, i18n( "Brightness/Contrast" ), Ok|Cancel, Ok, parent ) { float pixdiff, datadiff; contrast = brightness = 0; - viewer = (FITSViewer *) tqparent; + viewer = (FITSViewer *) parent; displayImage = viewer->image->displayImage; tempImage = new TQImage(displayImage->copy()); width = displayImage->width(); diff --git a/kstars/kstars/conbridlg.h b/kstars/kstars/conbridlg.h index eaabcf2e..1f9ce088 100644 --- a/kstars/kstars/conbridlg.h +++ b/kstars/kstars/conbridlg.h @@ -31,7 +31,7 @@ class ContrastBrightnessDlg : public KDialogBase { Q_OBJECT TQ_OBJECT public: - ContrastBrightnessDlg(TQWidget *tqparent=0); + ContrastBrightnessDlg(TQWidget *parent=0); ~ContrastBrightnessDlg(); TQSize tqsizeHint() const; diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp index 3f06da87..07bcd87c 100644 --- a/kstars/kstars/detaildialog.cpp +++ b/kstars/kstars/detaildialog.cpp @@ -57,7 +57,7 @@ #include "devicemanager.h" #include "indistd.h" -LogEdit::LogEdit( TQWidget *tqparent, const char *name ) : KTextEdit( tqparent, name ) +LogEdit::LogEdit( TQWidget *parent, const char *name ) : KTextEdit( parent, name ) { setFrameStyle( TQFrame::StyledPanel ); setFrameShadow( TQFrame::Plain ); @@ -69,13 +69,13 @@ void LogEdit::focusOutEvent( TQFocusEvent *e ) { TQWidget::focusOutEvent(e); } -ClickLabel::ClickLabel( TQWidget *tqparent, const char *name ) : TQLabel( tqparent, name ) +ClickLabel::ClickLabel( TQWidget *parent, const char *name ) : TQLabel( parent, name ) {} DetailDialog::DetailDialog(SkyObject *o, const KStarsDateTime &ut, GeoLocation *geo, - TQWidget *tqparent, const char *name ) : - KDialogBase( KDialogBase::Tabbed, i18n( "Object Details" ), Close, Close, tqparent, name ) , - selectedObject(o), ksw((KStars*)tqparent), Data(0), Pos(0), Links(0), Adv(0), Log(0) + TQWidget *parent, const char *name ) : + KDialogBase( KDialogBase::Tabbed, i18n( "Object Details" ), Close, Close, parent, name ) , + selectedObject(o), ksw((KStars*)parent), Data(0), Pos(0), Links(0), Adv(0), Log(0) { //Modify color palette setPaletteBackgroundColor( palette().color( TQPalette::Active, TQColorGroup::Base ) ); @@ -774,7 +774,7 @@ bool DetailDialog::readUserFile(int type)//, int sourceFileType) return true; } -void DetailDialog::populateADVTree(TQListViewItem *tqparent) +void DetailDialog::populateADVTree(TQListViewItem *parent) { // list done if (!treeIt->current()) @@ -782,20 +782,20 @@ void DetailDialog::populateADVTree(TQListViewItem *tqparent) // if relative top level [KSLABEL] if (treeIt->current()->Type == 0) - forkTree(tqparent); + forkTree(parent); while (treeIt->current()) { if (treeIt->current()->Type == 0) { - forkTree(tqparent); + forkTree(parent); continue; } else if (treeIt->current()->Type == 1) break; - if (tqparent) - new TQListViewItem( tqparent, treeIt->current()->Name); + if (parent) + new TQListViewItem( parent, treeIt->current()->Name); else new TQListViewItem( Adv->ADVTree, treeIt->current()->Name); @@ -803,11 +803,11 @@ void DetailDialog::populateADVTree(TQListViewItem *tqparent) } } -void DetailDialog::forkTree(TQListViewItem *tqparent) +void DetailDialog::forkTree(TQListViewItem *parent) { TQListViewItem *current = 0; - if (tqparent) - current = new TQListViewItem(tqparent, treeIt->current()->Name); + if (parent) + current = new TQListViewItem(parent, treeIt->current()->Name); else current = new TQListViewItem(Adv->ADVTree, treeIt->current()->Name); diff --git a/kstars/kstars/detaildialog.h b/kstars/kstars/detaildialog.h index dd6a5f8a..92ffdfbf 100644 --- a/kstars/kstars/detaildialog.h +++ b/kstars/kstars/detaildialog.h @@ -58,7 +58,7 @@ class LogEdit : public KTextEdit { Q_OBJECT TQ_OBJECT public: - LogEdit( TQWidget *tqparent=0, const char *name=0 ); + LogEdit( TQWidget *parent=0, const char *name=0 ); ~LogEdit() {} signals: @@ -76,7 +76,7 @@ class ClickLabel : public TQLabel { Q_OBJECT TQ_OBJECT public: - ClickLabel( TQWidget *tqparent=0, const char *name=0 ); + ClickLabel( TQWidget *parent=0, const char *name=0 ); ~ClickLabel() {} signals: @@ -110,7 +110,7 @@ class DetailDialog : public KDialogBase { public: /**Constructor */ - DetailDialog(SkyObject *o, const KStarsDateTime &ut, GeoLocation *geo, TQWidget *tqparent=0, const char *name=0); + DetailDialog(SkyObject *o, const KStarsDateTime &ut, GeoLocation *geo, TQWidget *parent=0, const char *name=0); /**Destructor (empty) */ @@ -214,11 +214,11 @@ private: /**Populate the TreeView of known astronomical databases in the Advanced Tab */ - void populateADVTree(TQListViewItem *tqparent); + void populateADVTree(TQListViewItem *parent); /**For the databases TreeView */ - void forkTree(TQListViewItem *tqparent); + void forkTree(TQListViewItem *parent); /**Data for the Advanced Tab TreeView is stored in the file advinterface.dat. *This function parses advinterface.dat. diff --git a/kstars/kstars/devicemanager.cpp b/kstars/kstars/devicemanager.cpp index 705ddfe0..a83cd5cc 100644 --- a/kstars/kstars/devicemanager.cpp +++ b/kstars/kstars/devicemanager.cpp @@ -42,14 +42,14 @@ ** This allow KStars to control multiple devices distributed acorss ** multiple servers seemingly in a way that is completely transparent ** to devices and drivers alike. -** The device Manager can be thought of as the 'networking' tqparent -** of devices, while indimenu is 'GUI' tqparent of devices +** The device Manager can be thought of as the 'networking' parent +** of devices, while indimenu is 'GUI' parent of devices *******************************************************************/ -DeviceManager::DeviceManager(INDIMenu *INDItqparent, int inID) +DeviceManager::DeviceManager(INDIMenu *INDIparent, int inID) { - tqparent = INDItqparent; + parent = INDIparent; mgrID = inID; indi_dev.setAutoDelete(true); @@ -154,7 +154,7 @@ void DeviceManager::dataReceived() tcflush(serverFD, TCIFLUSH); sNotifier->disconnect(); close(serverFD); - tqparent->removeDeviceMgr(mgrID); + parent->removeDeviceMgr(mgrID); KMessageBox::error(0, TQString::tqfromLatin1(errmsg)); return; @@ -309,17 +309,17 @@ INDI_D * DeviceManager::addDevice (XMLEle *dep, char errmsg[]) if (!ap) return NULL; - if (tqparent->currentLabel.isEmpty()) - tqparent->setCustomLabel(valuXMLAtt(ap)); + if (parent->currentLabel.isEmpty()) + parent->setCustomLabel(valuXMLAtt(ap)); - dp = new INDI_D(tqparent, this, TQString(valuXMLAtt(ap)), tqparent->currentLabel); + dp = new INDI_D(parent, this, TQString(valuXMLAtt(ap)), parent->currentLabel); indi_dev.append(dp); emit newDevice(); // Reset label - tqparent->currentLabel = ""; + parent->currentLabel = ""; /* ok */ return dp; @@ -405,7 +405,7 @@ void DeviceManager::doMsg (XMLEle *msg, INDI_D *dp) txt_w->insert( TQString(valuXMLAtt(message)) + TQString("\n")); if ( Options::indiMessages() ) - tqparent->ksw->statusBar()->changeItem( TQString(valuXMLAtt(message)), 0); + parent->ksw->statusBar()->changeItem( TQString(valuXMLAtt(message)), 0); } diff --git a/kstars/kstars/devicemanager.h b/kstars/kstars/devicemanager.h index 78b2b933..f70d7b40 100644 --- a/kstars/kstars/devicemanager.h +++ b/kstars/kstars/devicemanager.h @@ -28,10 +28,10 @@ class DeviceManager : public TQObject Q_OBJECT TQ_OBJECT public: - DeviceManager(INDIMenu *INDItqparent, int inID); + DeviceManager(INDIMenu *INDIparent, int inID); ~DeviceManager(); - INDIMenu *tqparent; + INDIMenu *parent; TQPtrList indi_dev; diff --git a/kstars/kstars/dms.h b/kstars/kstars/dms.h index 165b5ce1..7cbbaa22 100644 --- a/kstars/kstars/dms.h +++ b/kstars/kstars/dms.h @@ -313,7 +313,7 @@ public: void setRadians( const double &a ); /**return the equivalent angle between 0 and 360 degrees. - *@warning does not change the value of the tqparent angle itself. + *@warning does not change the value of the parent angle itself. */ const dms reduce( void ) const; diff --git a/kstars/kstars/dmsbox.cpp b/kstars/kstars/dmsbox.cpp index 9faa30d5..1857b1bf 100644 --- a/kstars/kstars/dmsbox.cpp +++ b/kstars/kstars/dmsbox.cpp @@ -26,8 +26,8 @@ #include #include -dmsBox::dmsBox(TQWidget *tqparent, const char *name, bool dg) - : KLineEdit(tqparent,name), EmptyFlag(true) { +dmsBox::dmsBox(TQWidget *parent, const char *name, bool dg) + : KLineEdit(parent,name), EmptyFlag(true) { setMaxLength(14); setMaximumWidth(160); setDegType( dg ); diff --git a/kstars/kstars/dmsbox.h b/kstars/kstars/dmsbox.h index 81590a4e..d12c0a12 100644 --- a/kstars/kstars/dmsbox.h +++ b/kstars/kstars/dmsbox.h @@ -47,12 +47,12 @@ TQ_PROPERTY (bool degType READ degType WRITE setDegType) public: /**Constructor for the dmsBox object. - *@param tqparent pointer to the tqparent TQWidget + *@param parent pointer to the parent TQWidget *@param ni the name of the object *@param deg if TRUE use deg/arcmin/arcsec; otherwise * use hours/min/sec. */ - dmsBox(TQWidget *tqparent, const char *ni=0, bool deg=TRUE); + dmsBox(TQWidget *parent, const char *ni=0, bool deg=TRUE); /**Destructor (empty)*/ ~dmsBox(); diff --git a/kstars/kstars/draglistbox.cpp b/kstars/kstars/draglistbox.cpp index a2b5a453..74cd169f 100644 --- a/kstars/kstars/draglistbox.cpp +++ b/kstars/kstars/draglistbox.cpp @@ -21,8 +21,8 @@ #include "draglistbox.h" -DragListBox::DragListBox( TQWidget *tqparent, const char *name, WFlags f ) - : KListBox( tqparent, name, f ) { +DragListBox::DragListBox( TQWidget *parent, const char *name, WFlags f ) + : KListBox( parent, name, f ) { setAcceptDrops( TRUE ); dragging = FALSE; diff --git a/kstars/kstars/draglistbox.h b/kstars/kstars/draglistbox.h index 4ec1c987..20fbcc37 100644 --- a/kstars/kstars/draglistbox.h +++ b/kstars/kstars/draglistbox.h @@ -36,7 +36,7 @@ class DragListBox : public KListBox { public: /**@short Default constructor */ - DragListBox( TQWidget *tqparent = 0, const char *name = 0, WFlags = 0 ); + DragListBox( TQWidget *parent = 0, const char *name = 0, WFlags = 0 ); /**@short Default destructor */ diff --git a/kstars/kstars/finddialog.cpp b/kstars/kstars/finddialog.cpp index c7719cc4..c1aa5321 100644 --- a/kstars/kstars/finddialog.cpp +++ b/kstars/kstars/finddialog.cpp @@ -33,8 +33,8 @@ #include "objectnamelist.h" -FindDialog::FindDialog( TQWidget* tqparent ) : - KDialogBase( KDialogBase::Plain, i18n( "Find Object" ), Ok|Cancel, Ok, tqparent ), +FindDialog::FindDialog( TQWidget* parent ) : + KDialogBase( KDialogBase::Plain, i18n( "Find Object" ), Ok|Cancel, Ok, parent ), vlay(0), hlay(0), SearchList(0), SearchBox(0), filterTypeLabel(0), filterType(0), currentitem(0) { @@ -114,7 +114,7 @@ void FindDialog::init() { } void FindDialog::filter() { //Filter the list of names with the string in the SearchBox - KStars *p = (KStars *)tqparent(); + KStars *p = (KStars *)parent(); SearchList->clear(); ObjectNameList &ObjNames = p->data()->ObjNames; @@ -136,7 +136,7 @@ void FindDialog::filter() { //Filter the list of names with the string in the S } void FindDialog::filterByType() { - KStars *p = (KStars *)tqparent(); + KStars *p = (KStars *)parent(); SearchList->clear(); // TQListBox TQString searchFor = SearchBox->text().lower(); // search string diff --git a/kstars/kstars/finddialog.h b/kstars/kstars/finddialog.h index 83746c49..fac1a771 100644 --- a/kstars/kstars/finddialog.h +++ b/kstars/kstars/finddialog.h @@ -52,7 +52,7 @@ public: /**Constructor. Creates all widgets and packs them in TQLayouts. Connects *Signals and Slots. Runs initObjectList(). */ - FindDialog( TQWidget* tqparent = 0 ); + FindDialog( TQWidget* parent = 0 ); /**Destructor */ diff --git a/kstars/kstars/fitshistogram.cpp b/kstars/kstars/fitshistogram.cpp index ddeb1897..29938ed1 100644 --- a/kstars/kstars/fitshistogram.cpp +++ b/kstars/kstars/fitshistogram.cpp @@ -37,9 +37,9 @@ - FITSHistogram::FITSHistogram(TQWidget *tqparent, const char * name) : histDialog(tqparent, name) + FITSHistogram::FITSHistogram(TQWidget *parent, const char * name) : histDialog(parent, name) { - viewer = (FITSViewer *) tqparent; + viewer = (FITSViewer *) parent; setModal(false); @@ -234,9 +234,9 @@ int FITSHistogram::findMax() return max; } -FITSHistogramCommand::FITSHistogramCommand(TQWidget * tqparent, FITSHistogram *inHisto, int newType, int lmin, int lmax) +FITSHistogramCommand::FITSHistogramCommand(TQWidget * parent, FITSHistogram *inHisto, int newType, int lmin, int lmax) { - viewer = (FITSViewer *) tqparent; + viewer = (FITSViewer *) parent; type = newType; histo = inHisto; oldImage = new TQImage(); diff --git a/kstars/kstars/fitshistogram.h b/kstars/kstars/fitshistogram.h index 2d8fdfd4..82de8aea 100644 --- a/kstars/kstars/fitshistogram.h +++ b/kstars/kstars/fitshistogram.h @@ -32,7 +32,7 @@ TQ_OBJECT public: - FITSHistogram(TQWidget *tqparent, const char * name = 0); + FITSHistogram(TQWidget *parent, const char * name = 0); ~FITSHistogram(); void constructHistogram(float *buffer); @@ -64,7 +64,7 @@ class FITSHistogramCommand : public KCommand { public: - FITSHistogramCommand(TQWidget * tqparent, FITSHistogram *inHisto, int newType, int lmin, int lmax); + FITSHistogramCommand(TQWidget * parent, FITSHistogram *inHisto, int newType, int lmin, int lmax); ~FITSHistogramCommand(); void execute(); diff --git a/kstars/kstars/fitsimage.cpp b/kstars/kstars/fitsimage.cpp index f12c890c..8e3b6e70 100644 --- a/kstars/kstars/fitsimage.cpp +++ b/kstars/kstars/fitsimage.cpp @@ -64,9 +64,9 @@ static FITSLoadVals plvals = 0 /* Dont compose images */ }; -FITSImage::FITSImage(TQWidget * tqparent, const char * name) : TQScrollView(tqparent, name), zoomFactor(1.2) +FITSImage::FITSImage(TQWidget * parent, const char * name) : TQScrollView(parent, name), zoomFactor(1.2) { - viewer = (FITSViewer *) tqparent; + viewer = (FITSViewer *) parent; reducedImgBuffer = NULL; displayImage = NULL; @@ -459,7 +459,7 @@ void FITSImage::fitsZoomDefault() } -FITSFrame::FITSFrame(FITSImage * img, TQWidget * tqparent, const char * name) : TQFrame(tqparent, name, TQt::WNoAutoErase) +FITSFrame::FITSFrame(FITSImage * img, TQWidget * parent, const char * name) : TQFrame(parent, name, TQt::WNoAutoErase) { image = img; setPaletteBackgroundColor(image->viewport()->paletteBackgroundColor()); diff --git a/kstars/kstars/fitsimage.h b/kstars/kstars/fitsimage.h index d0befa9b..ba6b18d3 100644 --- a/kstars/kstars/fitsimage.h +++ b/kstars/kstars/fitsimage.h @@ -57,7 +57,7 @@ class FITSImage : public TQScrollView { friend class FITSChangeCommand; friend class FITSProcessCommand; - FITSImage(TQWidget * tqparent, const char * name = 0); + FITSImage(TQWidget * parent, const char * name = 0); ~FITSImage(); enum scaleType { FITSAuto = 0 , FITSLinear, FITSLog, FITSSqrt, FITSCustom }; @@ -74,7 +74,7 @@ class FITSImage : public TQScrollView { void clearMem(); private: - FITSViewer *viewer; /* tqparent FITSViewer */ + FITSViewer *viewer; /* parent FITSViewer */ FITSFrame *imgFrame; /* Frame holding the image */ TQImage *displayImage; /* FITS image that is displayed in the GUI */ TQImage *templateImage; /* backup image for currentImage */ @@ -112,7 +112,7 @@ class FITSFrame : public TQFrame TQ_OBJECT public: - FITSFrame(FITSImage * img, TQWidget * tqparent = 0, const char * name = 0); + FITSFrame(FITSImage * img, TQWidget * parent = 0, const char * name = 0); ~FITSFrame(); private: diff --git a/kstars/kstars/fitsprocess.cpp b/kstars/kstars/fitsprocess.cpp index ebb9e11d..6a4d7fcd 100644 --- a/kstars/kstars/fitsprocess.cpp +++ b/kstars/kstars/fitsprocess.cpp @@ -31,13 +31,13 @@ #define ELEM_SWAP(a,b) { register float t=(a);(a)=(b);(b)=t; } - FITSProcess::FITSProcess(FITSViewer *tqparent, TQStringList darkFiles, TQStringList flatFiles, TQStringList darkflatFiles, int darkMode, int flatMode, int darkflatMode) + FITSProcess::FITSProcess(FITSViewer *parent, TQStringList darkFiles, TQStringList flatFiles, TQStringList darkflatFiles, int darkMode, int flatMode, int darkflatMode) { float * buffer = NULL; darkCombineMode = darkMode; flatCombineMode = flatMode; darkflatCombineMode = darkflatMode; - viewer = tqparent; + viewer = parent; finalDark = NULL; finalFlat = NULL; finalDarkFlat = NULL; @@ -311,10 +311,10 @@ void FITSProcess::reduce() } -FITSProcessCommand::FITSProcessCommand(FITSViewer *tqparent) +FITSProcessCommand::FITSProcessCommand(FITSViewer *parent) { - viewer = tqparent; + viewer = parent; oldImage = new TQImage(); // TODO apply maximum compression against this buffer buffer = (float *) malloc (viewer->image->width * viewer->image->height * sizeof(float)); diff --git a/kstars/kstars/fitsprocess.h b/kstars/kstars/fitsprocess.h index 0917148f..da0e597e 100644 --- a/kstars/kstars/fitsprocess.h +++ b/kstars/kstars/fitsprocess.h @@ -36,7 +36,7 @@ class TQImage; class FITSProcess { public: - FITSProcess(FITSViewer *tqparent, TQStringList darkFiles, TQStringList flatFiles, TQStringList darkflatFiles, int darkMode, int flatMode, int darkflatMode); + FITSProcess(FITSViewer *parent, TQStringList darkFiles, TQStringList flatFiles, TQStringList darkflatFiles, int darkMode, int flatMode, int darkflatMode); ~FITSProcess(); TQPtrList darkFrames; @@ -67,7 +67,7 @@ class FITSProcessCommand : public KCommand { public: - FITSProcessCommand(FITSViewer *tqparent); + FITSProcessCommand(FITSViewer *parent); ~FITSProcessCommand(); void execute(); diff --git a/kstars/kstars/fitsviewer.cpp b/kstars/kstars/fitsviewer.cpp index 32232235..dc8385f9 100644 --- a/kstars/kstars/fitsviewer.cpp +++ b/kstars/kstars/fitsviewer.cpp @@ -91,8 +91,8 @@ extern int fits_ieee64_motorola; uc[4] = p[3]; uc[5] = p[2]; uc[6] = p[1]; uc[7] = p[0]; \ val = *(FITS_BITPIXM64 *)uc; } else val = *(FITS_BITPIXM64 *)p; } -FITSViewer::FITSViewer (const KURL *url, TQWidget *tqparent, const char *name) - : KMainWindow (tqparent, name) +FITSViewer::FITSViewer (const KURL *url, TQWidget *parent, const char *name) + : KMainWindow (parent, name) { image = NULL; currentURL = *url; @@ -553,7 +553,7 @@ void FITSViewer::fileSave() if (TQFile::exists(currentURL.path())) { - int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(tqparent()), + int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), i18n( "A file named \"%1\" already exists. " "Overwrite it?" ).tqarg(currentURL.fileName()), i18n( "Overwrite File?" ), @@ -952,9 +952,9 @@ void FITSViewer::fitsHeader() } -FITSChangeCommand::FITSChangeCommand(TQWidget * tqparent, int inType, TQImage* newIMG, TQImage *oldIMG) +FITSChangeCommand::FITSChangeCommand(TQWidget * parent, int inType, TQImage* newIMG, TQImage *oldIMG) { - viewer = (FITSViewer *) tqparent; + viewer = (FITSViewer *) parent; newImage = new TQImage(); oldImage = new TQImage(); *newImage = newIMG->copy(); diff --git a/kstars/kstars/fitsviewer.h b/kstars/kstars/fitsviewer.h index 37f1167c..fa14ae2a 100644 --- a/kstars/kstars/fitsviewer.h +++ b/kstars/kstars/fitsviewer.h @@ -60,7 +60,7 @@ class FITSViewer : public KMainWindow { friend class FITSProcessCommand; /**Constructor. */ - FITSViewer (const KURL *imageName, TQWidget *tqparent, const char *name = 0); + FITSViewer (const KURL *imageName, TQWidget *parent, const char *name = 0); ~FITSViewer(); @@ -125,7 +125,7 @@ class FITSViewer : public KMainWindow { class FITSChangeCommand : public KCommand { public: - FITSChangeCommand(TQWidget * tqparent, int inType, TQImage *newIMG, TQImage *oldIMG); + FITSChangeCommand(TQWidget * parent, int inType, TQImage *newIMG, TQImage *oldIMG); ~FITSChangeCommand(); void execute(); diff --git a/kstars/kstars/focusdialog.cpp b/kstars/kstars/focusdialog.cpp index 7fbce4e5..7b182225 100644 --- a/kstars/kstars/focusdialog.cpp +++ b/kstars/kstars/focusdialog.cpp @@ -32,8 +32,8 @@ #include "dmsbox.h" #include "focusdialog.h" -FocusDialog::FocusDialog( TQWidget *tqparent ) - : KDialogBase( KDialogBase::Plain, i18n( "Set Focus Manually" ), Ok|Cancel, Ok, tqparent ) { +FocusDialog::FocusDialog( TQWidget *parent ) + : KDialogBase( KDialogBase::Plain, i18n( "Set Focus Manually" ), Ok|Cancel, Ok, parent ) { Point = 0; //initialize pointer to null UsedAltAz = false; //assume RA/Dec by default @@ -81,7 +81,7 @@ void FocusDialog::validatePoint() { dms dec( fdlg->decBox->createDms( true, &decOk ) ); TQString message; - KStars *ks = (KStars*) tqparent(); + KStars *ks = (KStars*) parent(); if ( raOk && decOk ) { //make sure values are in valid range diff --git a/kstars/kstars/focusdialog.h b/kstars/kstars/focusdialog.h index 9b4d4807..20bf2428 100644 --- a/kstars/kstars/focusdialog.h +++ b/kstars/kstars/focusdialog.h @@ -38,7 +38,7 @@ class FocusDialog : public KDialogBase { TQ_OBJECT public: /**Constructor. */ - FocusDialog( TQWidget *tqparent=0 ); + FocusDialog( TQWidget *parent=0 ); /**Destructor (empty). */ ~FocusDialog(); diff --git a/kstars/kstars/fovdialog.cpp b/kstars/kstars/fovdialog.cpp index 88cdd3f4..ff3c9bb5 100644 --- a/kstars/kstars/fovdialog.cpp +++ b/kstars/kstars/fovdialog.cpp @@ -39,10 +39,10 @@ //---------FOVDialog---------------// -FOVDialog::FOVDialog( TQWidget *tqparent ) - : KDialogBase( KDialogBase::Plain, i18n( "Set FOV Indicator" ), Ok|Cancel, Ok, tqparent ) { +FOVDialog::FOVDialog( TQWidget *parent ) + : KDialogBase( KDialogBase::Plain, i18n( "Set FOV Indicator" ), Ok|Cancel, Ok, parent ) { - ks = (KStars*)TQT_TQWIDGET(tqparent); + ks = (KStars*)TQT_TQWIDGET(parent); TQFrame *page = plainPage(); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 ); @@ -192,8 +192,8 @@ void FOVDialog::slotRemoveFOV() { } //-------------NewFOV------------------// -NewFOV::NewFOV( TQWidget *tqparent ) - : KDialogBase( KDialogBase::Plain, i18n( "New FOV Indicator" ), Ok|Cancel, Ok, tqparent ), f() { +NewFOV::NewFOV( TQWidget *parent ) + : KDialogBase( KDialogBase::Plain, i18n( "New FOV Indicator" ), Ok|Cancel, Ok, parent ), f() { TQFrame *page = plainPage(); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 ); ui = new NewFOVUI( page ); diff --git a/kstars/kstars/fovdialog.h b/kstars/kstars/fovdialog.h index 02429390..c9a93f3d 100644 --- a/kstars/kstars/fovdialog.h +++ b/kstars/kstars/fovdialog.h @@ -36,7 +36,7 @@ class FOVDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - FOVDialog( TQWidget *tqparent=0 ); + FOVDialog( TQWidget *parent=0 ); ~FOVDialog(); unsigned int currentItem() const; TQPtrList FOVList; @@ -66,7 +66,7 @@ class NewFOV : public KDialogBase Q_OBJECT TQ_OBJECT public: - NewFOV( TQWidget *tqparent=0 ); + NewFOV( TQWidget *parent=0 ); ~NewFOV() {} NewFOVUI *ui; diff --git a/kstars/kstars/imagereductiondlg.cpp b/kstars/kstars/imagereductiondlg.cpp index 842e9618..e687a142 100644 --- a/kstars/kstars/imagereductiondlg.cpp +++ b/kstars/kstars/imagereductiondlg.cpp @@ -24,7 +24,7 @@ #include "imagereductiondlg.h" - ImageReductionDlg::ImageReductionDlg(TQWidget * tqparent, const char * name) : imageReductionUI(tqparent, name) + ImageReductionDlg::ImageReductionDlg(TQWidget * parent, const char * name) : imageReductionUI(parent, name) { connect(darkAddB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addDarkFile())); connect(flatAddB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addFlatFile())); diff --git a/kstars/kstars/imagereductiondlg.h b/kstars/kstars/imagereductiondlg.h index 03feba93..a2dd99af 100644 --- a/kstars/kstars/imagereductiondlg.h +++ b/kstars/kstars/imagereductiondlg.h @@ -26,7 +26,7 @@ TQ_OBJECT public: - ImageReductionDlg(TQWidget * tqparent, const char * name = 0); + ImageReductionDlg(TQWidget * parent, const char * name = 0); ~ImageReductionDlg(); diff --git a/kstars/kstars/imagesequence.cpp b/kstars/kstars/imagesequence.cpp index adf1f3f9..73026e99 100644 --- a/kstars/kstars/imagesequence.cpp +++ b/kstars/kstars/imagesequence.cpp @@ -37,11 +37,11 @@ #define RETRY_MAX 12 #define RETRY_PERIOD 5000 -imagesequence::imagesequence(TQWidget* tqparent, const char* name, bool modal, WFlags fl) -: imgSequenceDlg(tqparent,name, modal,fl) +imagesequence::imagesequence(TQWidget* parent, const char* name, bool modal, WFlags fl) +: imgSequenceDlg(parent,name, modal,fl) { - ksw = (KStars *) tqparent; + ksw = (KStars *) parent; INDIMenu *devMenu = ksw->getINDIMenu(); if (devMenu) diff --git a/kstars/kstars/imagesequence.h b/kstars/kstars/imagesequence.h index ceeacfbb..304b9ad3 100644 --- a/kstars/kstars/imagesequence.h +++ b/kstars/kstars/imagesequence.h @@ -24,7 +24,7 @@ class imagesequence : public imgSequenceDlg TQ_OBJECT public: - imagesequence(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + imagesequence(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~imagesequence(); diff --git a/kstars/kstars/imageviewer.cpp b/kstars/kstars/imageviewer.cpp index b92ee486..747ae796 100644 --- a/kstars/kstars/imageviewer.cpp +++ b/kstars/kstars/imageviewer.cpp @@ -29,8 +29,8 @@ #include -ImageViewer::ImageViewer (const KURL *url, const TQString &capText, TQWidget *tqparent, const char *name) - : KMainWindow (tqparent, name), imageURL (*url), fileIsImage (false), +ImageViewer::ImageViewer (const KURL *url, const TQString &capText, TQWidget *parent, const char *name) + : KMainWindow (parent, name), imageURL (*url), fileIsImage (false), ctrl (false), key_s (false), key_q (false), downloadJob(0) { // toolbar can dock only on top-position and can't be minimized @@ -86,7 +86,7 @@ void ImageViewer::resizeEvent (TQResizeEvent */*ev*/) void ImageViewer::closeEvent (TQCloseEvent *ev) { if (ev) // not if closeEvent (0) is called, because segfault - ev->accept(); // tqparent-widgets should not get this event, so it will be filtered + ev->accept(); // parent-widgets should not get this event, so it will be filtered this->~ImageViewer(); // destroy the object, so the object can only allocated with operator new, not as a global/local variable } @@ -208,7 +208,7 @@ void ImageViewer::saveFileToDisc() TQFile f (newURL.directory() + "/" + newURL.fileName()); if (f.exists()) { - int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(tqparent()), + int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), i18n( "A file named \"%1\" already exists. " "Overwrite it?" ).tqarg(newURL.fileName()), i18n( "Overwrite File?" ), diff --git a/kstars/kstars/imageviewer.h b/kstars/kstars/imageviewer.h index ed475f6c..7b092f26 100644 --- a/kstars/kstars/imageviewer.h +++ b/kstars/kstars/imageviewer.h @@ -37,7 +37,7 @@ *save these files. For other formats, like PNG, this is not so important *because they can directly saved by TQImage. * - *The download-slave works asynchron so the tqparent-widget can be used at + *The download-slave works asynchron so the parent-widget can be used at *this time. The save-slave works synchronously, but this is not important *because the files are at this time local saved and this works not so long. */ @@ -51,7 +51,7 @@ class ImageViewer : public KMainWindow { public: /**Constructor. */ - ImageViewer (const KURL *imageName, const TQString &capText, TQWidget *tqparent, const char *name = 0); + ImageViewer (const KURL *imageName, const TQString &capText, TQWidget *parent, const char *name = 0); /**Destructor. If there is a partially downloaded image file, delete it.*/ ~ImageViewer(); diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.h b/kstars/kstars/indi/apogee/CameraIO_Linux.h index afe23774..e614aee1 100644 --- a/kstars/kstars/indi/apogee/CameraIO_Linux.h +++ b/kstars/kstars/indi/apogee/CameraIO_Linux.h @@ -271,7 +271,7 @@ public: // Mask user requested set of IRQS // void MaskIrqs(); - // Restore default IRQ tqmask + // Restore default IRQ mask // void UnmaskIrqs(); // Starts flushing the camera (which should be the normal idle state) diff --git a/kstars/kstars/indi/celestrongps.cpp b/kstars/kstars/indi/celestrongps.cpp index e8c67553..a187aaf8 100644 --- a/kstars/kstars/indi/celestrongps.cpp +++ b/kstars/kstars/indi/celestrongps.cpp @@ -125,7 +125,7 @@ CelestronGPS::CelestronGPS() JD = 0; - // Children call tqparent routines, this is the default + // Children call parent routines, this is the default IDLog("initilizaing from Celeston GPS device...\n"); } diff --git a/kstars/kstars/indi/indiapi.h b/kstars/kstars/indi/indiapi.h index d2ffd6fe..324b7824 100644 --- a/kstars/kstars/indi/indiapi.h +++ b/kstars/kstars/indi/indiapi.h @@ -136,7 +136,7 @@ typedef struct { char label[MAXINDILABEL]; /** malloced text string */ char *text; - /** pointer to tqparent */ + /** pointer to parent */ struct _ITextVectorProperty *tvp; /** handy place to hang helper info */ void *aux0; @@ -182,7 +182,7 @@ typedef struct { double min, max; /** range, ignore if min == max */ double step; /** step size, ignore if step == 0 */ double value; /** current value */ - struct _INumberVectorProperty *nvp; /** pointer to tqparent */ + struct _INumberVectorProperty *nvp; /** pointer to parent */ void *aux0, *aux1; /** handy place to hang helper info */ } INumber; @@ -235,7 +235,7 @@ typedef struct { char name[MAXINDINAME]; /** index name */ char label[MAXINDILABEL]; /** this switch's label */ ISState s; /** this switch's state */ - struct _ISwitchVectorProperty *svp; /** pointer to tqparent */ + struct _ISwitchVectorProperty *svp; /** pointer to parent */ void *aux; /** handy place to hang helper info */ } ISwitch; @@ -276,7 +276,7 @@ typedef struct { char name[MAXINDINAME]; /** index name */ char label[MAXINDILABEL]; /** this lights's label */ IPState s; /** this lights's state */ - struct _ILightVectorProperty *lvp; /** pointer to tqparent */ + struct _ILightVectorProperty *lvp; /** pointer to parent */ void *aux; /** handy place to hang helper info */ } ILight; @@ -320,7 +320,7 @@ typedef struct { /* one BLOB descriptor */ int bloblen; /** n uncompressed bytes */ int size; - /** pointer to tqparent */ + /** pointer to parent */ struct _IBLOBVectorProperty *bvp; /** handy place to hang helper info */ void *aux0, *aux1, *aux2; diff --git a/kstars/kstars/indi/indicom.h b/kstars/kstars/indi/indicom.h index 47526cad..726c7dcd 100644 --- a/kstars/kstars/indi/indicom.h +++ b/kstars/kstars/indi/indicom.h @@ -169,7 +169,7 @@ void aberrate(double *RA, double *Dec); */ void precessFromAnyEpoch(double jd0, double jdf, double *RA, double *Dec); -/** \brief Calculate the aptqparent coordiantes for RA and Dec from any epoch to any epoch. +/** \brief Calculate the apparent coordiantes for RA and Dec from any epoch to any epoch. \param jd0 starting epoch. \param jdf final epoch. \param RA a pointer to a double containing the Right ascension in hours. The function stores the processed Right ascension back in this variable. diff --git a/kstars/kstars/indi/indiserver.c b/kstars/kstars/indi/indiserver.c index 62a7c967..ad4d2ffd 100644 --- a/kstars/kstars/indi/indiserver.c +++ b/kstars/kstars/indi/indiserver.c @@ -316,7 +316,7 @@ startDvr (DvrInfo *dp) /* go -- should never return */ execlp (dp->name, dp->name, NULL); fprintf (stderr, "Driver %s: %s\n", dp->name, strerror(errno)); - _exit (1); /* tqparent will notice EOF shortly */ + _exit (1); /* parent will notice EOF shortly */ } /* don't need child's side of pipes */ diff --git a/kstars/kstars/indi/lilxml.c b/kstars/kstars/indi/lilxml.c index 1fec3989..2a687bd4 100644 --- a/kstars/kstars/indi/lilxml.c +++ b/kstars/kstars/indi/lilxml.c @@ -78,7 +78,7 @@ struct _LilXML { /* internal representation of a (possibly nested) XML element */ struct _xml_ele { char *tag; /* element tag */ - struct _xml_ele *pe; /* tqparent element, or NULL if root */ + struct _xml_ele *pe; /* parent element, or NULL if root */ XMLAtt **at; /* list of attributes */ int nat; /* number of attributes */ int ait; /* used to iterate over at[] */ @@ -294,14 +294,14 @@ nextXMLAtt (XMLEle *ep, int init) return (ep->at[ait]); } -/* return tqparent of given XMLEle */ +/* return parent of given XMLEle */ XMLEle * parentXMLEle (XMLEle *ep) { return (ep->pe); } -/* return tqparent element of given XMLAtt */ +/* return parent element of given XMLAtt */ XMLEle * parentXMLAtt (XMLAtt *ap) { @@ -632,7 +632,7 @@ pushXMLEle(LilXML *lp) resetEndTag(lp); } -/* point ce to tqparent of current ce. +/* point ce to parent of current ce. * endtag no longer valid. */ static void diff --git a/kstars/kstars/indi/lilxml.h b/kstars/kstars/indi/lilxml.h index b9d1da4e..98bfdd2b 100644 --- a/kstars/kstars/indi/lilxml.h +++ b/kstars/kstars/indi/lilxml.h @@ -130,13 +130,13 @@ extern XMLEle *nextXMLEle (XMLEle *ep, int first); extern XMLAtt *nextXMLAtt (XMLEle *ep, int first); /* tree functions */ -/** \brief Return the tqparent of an XML element. - \return a pointer to the XML element tqparent. +/** \brief Return the parent of an XML element. + \return a pointer to the XML element parent. */ extern XMLEle *parentXMLEle (XMLEle *ep); -/** \brief Return the tqparent of an XML attribute. - \return a pointer to the XML element tqparent. +/** \brief Return the parent of an XML attribute. + \return a pointer to the XML element parent. */ extern XMLEle *parentXMLAtt (XMLAtt *ap); @@ -171,13 +171,13 @@ extern char *valuXMLAtt (XMLAtt *ap); */ extern int pcdatalenXMLEle (XMLEle *ep); -/** \brief Return the number of nested XML elements in a tqparent XML element. +/** \brief Return the number of nested XML elements in a parent XML element. \param ep a pointer to an XML element. \return the number of nested XML elements. */ extern int nXMLEle (XMLEle *ep); -/** \brief Return the number of XML attributes in a tqparent XML element. +/** \brief Return the number of XML attributes in a parent XML element. \param ep a pointer to an XML element. \return the number of XML attributes within the XML element. */ diff --git a/kstars/kstars/indi/lx200_16.cpp b/kstars/kstars/indi/lx200_16.cpp index e9e95534..a376b0d9 100644 --- a/kstars/kstars/indi/lx200_16.cpp +++ b/kstars/kstars/indi/lx200_16.cpp @@ -101,7 +101,7 @@ void LX200_16::ISGetProperties (const char *dev) if (dev && strcmp (thisDevice, dev)) return; - // process tqparent first + // process parent first LX200Autostar::ISGetProperties(dev); IDDefNumber (&horNum, NULL); diff --git a/kstars/kstars/indi/lx200autostar.cpp b/kstars/kstars/indi/lx200autostar.cpp index 4a397eff..79c3d575 100644 --- a/kstars/kstars/indi/lx200autostar.cpp +++ b/kstars/kstars/indi/lx200autostar.cpp @@ -148,7 +148,7 @@ void LX200Autostar::ISNewNumber (const char *dev, const char *name, double value IDSetText(&VersionInfo, NULL); - // process tqparent + // process parent LX200Generic::getBasicData(); } diff --git a/kstars/kstars/indi/lx200classic.cpp b/kstars/kstars/indi/lx200classic.cpp index cd074209..5788bd16 100644 --- a/kstars/kstars/indi/lx200classic.cpp +++ b/kstars/kstars/indi/lx200classic.cpp @@ -327,7 +327,7 @@ void LX200Classic::ISNewNumber (const char *dev, const char *name, double values void LX200Classic::getBasicData() { - // process tqparent first + // process parent first LX200Generic::getBasicData(); } diff --git a/kstars/kstars/indi/lx200generic.cpp b/kstars/kstars/indi/lx200generic.cpp index 5c91f1c3..3e6e398a 100644 --- a/kstars/kstars/indi/lx200generic.cpp +++ b/kstars/kstars/indi/lx200generic.cpp @@ -328,7 +328,7 @@ LX200Generic::LX200Generic() IDLog("Julian Day is %g\n", JD); - // Children call tqparent routines, this is the default + // Children call parent routines, this is the default IDLog("initilizaing from generic LX200 device...\n"); IDLog("INDI Version: 2004-02-17\n"); diff --git a/kstars/kstars/indi/lx200gps.cpp b/kstars/kstars/indi/lx200gps.cpp index 158cd14a..c2752fb0 100644 --- a/kstars/kstars/indi/lx200gps.cpp +++ b/kstars/kstars/indi/lx200gps.cpp @@ -83,7 +83,7 @@ void LX200GPS::ISGetProperties (const char *dev) if (dev && strcmp (thisDevice, dev)) return; -// process tqparent first +// process parent first LX200_16::ISGetProperties(dev); IDDefSwitch (&GPSPowerSw, NULL); @@ -334,7 +334,7 @@ void LX200GPS::ISNewNumber (const char *dev, const char *name, double values[], //getOTATemp(&OTATemp.np[0].value); //IDSetNumber(&OTATemp, NULL); - // process tqparent + // process parent LX200_16::getBasicData(); } diff --git a/kstars/kstars/indi/v4lphilips.cpp b/kstars/kstars/indi/v4lphilips.cpp index f759e097..cc15d43d 100644 --- a/kstars/kstars/indi/v4lphilips.cpp +++ b/kstars/kstars/indi/v4lphilips.cpp @@ -46,7 +46,7 @@ void V4L_Philips::initCamBase() void V4L_Philips::initProperties(const char *dev) { - // Call tqparent + // Call parent V4L_Driver::initProperties(dev); fillSwitch(&BackLightS[0], "ON", "", ISS_OFF); @@ -375,7 +375,7 @@ void V4L_Philips::ISNewSwitch (const char *dev, const char *name, ISState *state } #endif - // Call tqparent + // Call parent V4L_Driver::ISNewSwitch(dev, name, states, names, n); @@ -481,7 +481,7 @@ void V4L_Philips::ISNewNumber (const char *dev, const char *name, double values[ #endif - // Call tqparent + // Call parent V4L_Driver::ISNewNumber(dev, name, values, names, n); } diff --git a/kstars/kstars/indi/webcam/pwc-ioctl.h b/kstars/kstars/indi/webcam/pwc-ioctl.h index e161acdb..6df68780 100644 --- a/kstars/kstars/indi/webcam/pwc-ioctl.h +++ b/kstars/kstars/indi/webcam/pwc-ioctl.h @@ -43,7 +43,7 @@ /* The frame rate is encoded in the video_window.flags parameter using the upper 16 bits, since some flags are defined nowadays. The following - defines provide a tqmask and shift to filter out this value. + defines provide a mask and shift to filter out this value. In 'Snapshot' mode the camera freezes its automatic exposure and colour balance controls. diff --git a/kstars/kstars/indidevice.cpp b/kstars/kstars/indidevice.cpp index 350d7d09..a276eff4 100644 --- a/kstars/kstars/indidevice.cpp +++ b/kstars/kstars/indidevice.cpp @@ -91,7 +91,7 @@ INDI_D::INDI_D(INDIMenu *menuParent, DeviceManager *parentManager, TQString inNa { name = inName; label = inLabel; - tqparent = menuParent; + parent = menuParent; parentMgr = parentManager; gl.setAutoDelete(true); @@ -105,7 +105,7 @@ INDI_D::INDI_D(INDIMenu *menuParent, DeviceManager *parentManager, TQString inNa dataBuffer = (unsigned char *) malloc (1); - stdDev = new INDIStdDevice(this, tqparent->ksw); + stdDev = new INDIStdDevice(this, parent->ksw); curGroup = NULL; diff --git a/kstars/kstars/indidevice.h b/kstars/kstars/indidevice.h index 80d589ce..04e594ee 100644 --- a/kstars/kstars/indidevice.h +++ b/kstars/kstars/indidevice.h @@ -96,7 +96,7 @@ class INDI_D : public KDialogBase INDI_G *curGroup; bool INDIStdSupport; - INDIMenu *tqparent; + INDIMenu *parent; DeviceManager *parentMgr; enum DTypes { DATA_FITS, DATA_STREAM, DATA_OTHER, DATA_CCDPREVIEW }; diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp index 18337a1b..14bbb89c 100644 --- a/kstars/kstars/indidriver.cpp +++ b/kstars/kstars/indidriver.cpp @@ -48,7 +48,7 @@ * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -INDIDriver::INDIDriver(TQWidget *tqparent) : devManager( tqparent ) +INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent ) { @@ -56,7 +56,7 @@ INDIDriver::INDIDriver(TQWidget *tqparent) : devManager( tqparent ) lastGroup = NULL; lastDevice = NULL; - ksw = (KStars *) tqparent; + ksw = (KStars *) parent; //FormLayout = makeVBoxMainWidget(); diff --git a/kstars/kstars/indidriver.h b/kstars/kstars/indidriver.h index cdb3ec17..9cddeb99 100644 --- a/kstars/kstars/indidriver.h +++ b/kstars/kstars/indidriver.h @@ -84,7 +84,7 @@ class INDIDriver : public devManager public: - INDIDriver(TQWidget * tqparent = 0); + INDIDriver(TQWidget * parent = 0); ~INDIDriver(); KListView* deviceContainer; diff --git a/kstars/kstars/indielement.h b/kstars/kstars/indielement.h index 5961c204..8ef4d542 100644 --- a/kstars/kstars/indielement.h +++ b/kstars/kstars/indielement.h @@ -96,7 +96,7 @@ class INDI_E : public TQObject TQString name; /* name */ TQString label; /* label is the name by default, unless specefied */ PState state; /* control on/off t/f etc */ - INDI_P *pp; /* tqparent property */ + INDI_P *pp; /* parent property */ TQHBoxLayout *EHBox; /*Qt::Horizontal tqlayout */ diff --git a/kstars/kstars/indifitsconf.cpp b/kstars/kstars/indifitsconf.cpp index 53b9dd3b..5c4cddae 100644 --- a/kstars/kstars/indifitsconf.cpp +++ b/kstars/kstars/indifitsconf.cpp @@ -23,8 +23,8 @@ #include "Options.h" -INDIFITSConf::INDIFITSConf(TQWidget* tqparent, const char* name, bool modal, WFlags fl) -: INDIConf(tqparent,name, modal,fl) +INDIFITSConf::INDIFITSConf(TQWidget* parent, const char* name, bool modal, WFlags fl) +: INDIConf(parent,name, modal,fl) { KIconLoader *icons = KGlobal::iconLoader(); diff --git a/kstars/kstars/indifitsconf.h b/kstars/kstars/indifitsconf.h index 598c5ec9..fb7182e8 100644 --- a/kstars/kstars/indifitsconf.h +++ b/kstars/kstars/indifitsconf.h @@ -18,7 +18,7 @@ class INDIFITSConf : public INDIConf TQ_OBJECT public: - INDIFITSConf(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + INDIFITSConf(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~INDIFITSConf(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/kstars/kstars/indigroup.cpp b/kstars/kstars/indigroup.cpp index e535c228..a4a0d47e 100644 --- a/kstars/kstars/indigroup.cpp +++ b/kstars/kstars/indigroup.cpp @@ -36,7 +36,7 @@ INDI_G::INDI_G(INDI_D *parentDevice, TQString inName) pl.setAutoDelete(true); - // FIXME what's the tqparent exactly? + // FIXME what's the parent exactly? // You can do this eaither way: // 1. Propertycontainer is a TQFrame, then you make TQVBoxLayout for it (check form1.cpp) // 2. Keep it as TQVBox and let it handle its tqchildren. diff --git a/kstars/kstars/indimenu.cpp b/kstars/kstars/indimenu.cpp index 354e8a9e..fb5b4c73 100644 --- a/kstars/kstars/indimenu.cpp +++ b/kstars/kstars/indimenu.cpp @@ -59,10 +59,10 @@ ** INDI Menu: Handles communication to server and fetching basic XML ** data. *******************************************************************/ -INDIMenu::INDIMenu(TQWidget *tqparent, const char *name ) : KDialogBase(KDialogBase::Tabbed, i18n("INDI Control Panel"), 0, KDialogBase::Default, tqparent, name, false) +INDIMenu::INDIMenu(TQWidget *parent, const char *name ) : KDialogBase(KDialogBase::Tabbed, i18n("INDI Control Panel"), 0, KDialogBase::Default, parent, name, false) { - ksw = (KStars *) tqparent; + ksw = (KStars *) parent; mgrCounter = 0; diff --git a/kstars/kstars/indimenu.h b/kstars/kstars/indimenu.h index 81a99a79..7ed8986d 100644 --- a/kstars/kstars/indimenu.h +++ b/kstars/kstars/indimenu.h @@ -50,7 +50,7 @@ class INDIMenu : public KDialogBase Q_OBJECT TQ_OBJECT public: - INDIMenu(TQWidget * tqparent = 0 , const char *name = 0); + INDIMenu(TQWidget * parent = 0 , const char *name = 0); ~INDIMenu(); /***************************************************************** diff --git a/kstars/kstars/indiproperty.cpp b/kstars/kstars/indiproperty.cpp index 0da730ee..9c2fd658 100644 --- a/kstars/kstars/indiproperty.cpp +++ b/kstars/kstars/indiproperty.cpp @@ -59,7 +59,7 @@ INDI_P::INDI_P(INDI_G *parentGroup, TQString inName) stdID = -1; - indistd = new INDIStdProperty(this, pg->dp->tqparent->ksw, pg->dp->stdDev); + indistd = new INDIStdProperty(this, pg->dp->parent->ksw, pg->dp->stdDev); PHBox = new TQHBoxLayout(0, 0, KDialogBase::spacingHint()); PVBox = new TQVBoxLayout(0, 0, KDialogBase::spacingHint()); diff --git a/kstars/kstars/indiproperty.h b/kstars/kstars/indiproperty.h index af4eb261..b86feb81 100644 --- a/kstars/kstars/indiproperty.h +++ b/kstars/kstars/indiproperty.h @@ -42,7 +42,7 @@ class INDI_P : public TQObject TQString name; /* property name */ TQString label; /* property label */ - INDI_G *pg; /* tqparent group */ + INDI_G *pg; /* parent group */ KPopupMenu *assosiatedPopup; /* assosiated popup menu, if any */ INDIStdProperty *indistd; /* Assosciated std routines class */ double timeout; /* timeout, seconds */ @@ -72,7 +72,7 @@ class INDI_P : public TQObject /* First step in adding a new GUI element */ void addGUI(XMLEle *root); - /* Set Property's tqparent group */ + /* Set Property's parent group */ void setGroup(INDI_G *parentGroup) { pg = parentGroup; } /* Find an element within the property */ diff --git a/kstars/kstars/infobox.h b/kstars/kstars/infobox.h index bd943a2b..c6c0e895 100644 --- a/kstars/kstars/infobox.h +++ b/kstars/kstars/infobox.h @@ -185,10 +185,10 @@ public: /**Set the box to be anchored to the bottom window edge*/ void setAnchorBottom( const bool ab ); - /**@return the box's anchor flag bittqmask.*/ + /**@return the box's anchor flag bitmask.*/ int anchorFlag() const { return AnchorFlag; } - /**Set the box's anchor flag bittqmask*/ + /**Set the box's anchor flag bitmask*/ void setAnchorFlag( const int af ) { AnchorFlag = af; } enum AnchorType { diff --git a/kstars/kstars/ksnewstuff.cpp b/kstars/kstars/ksnewstuff.cpp index 4b0ed9e8..329b1ae4 100644 --- a/kstars/kstars/ksnewstuff.cpp +++ b/kstars/kstars/ksnewstuff.cpp @@ -37,10 +37,10 @@ #include "objectnamelist.h" #include "skymap.h" -KSNewStuff::KSNewStuff( TQWidget *tqparent ) : - TQObject(), KNewStuff( "kstars", tqparent ), NGCUpdated( false ) +KSNewStuff::KSNewStuff( TQWidget *parent ) : + TQObject(), KNewStuff( "kstars", parent ), NGCUpdated( false ) { - ks = (KStars*)tqparent; + ks = (KStars*)parent; kdw = new KDirWatch( this ); kdw->addDir( KGlobal::dirs()->saveLocation("data", kapp->instanceName(), true) ); } diff --git a/kstars/kstars/ksnewstuff.h b/kstars/kstars/ksnewstuff.h index a6e4cd49..d8d36673 100644 --- a/kstars/kstars/ksnewstuff.h +++ b/kstars/kstars/ksnewstuff.h @@ -48,9 +48,9 @@ class KSNewStuff : public TQObject, public KNewStuff public: /** *Constructor - *@p tqparent pointer to the tqparent widget + *@p parent pointer to the parent widget */ - KSNewStuff( TQWidget *tqparent = 0 ); + KSNewStuff( TQWidget *parent = 0 ); /** *Install new application data diff --git a/kstars/kstars/ksplanetbase.cpp b/kstars/kstars/ksplanetbase.cpp index 9550342d..469c5307 100644 --- a/kstars/kstars/ksplanetbase.cpp +++ b/kstars/kstars/ksplanetbase.cpp @@ -95,7 +95,7 @@ bool KSPlanetBase::isMajorPlanet() const { } void KSPlanetBase::localizeCoords( const KSNumbers *num, const dms *lat, const dms *LST ) { - //convert geocentric coordinates to local aptqparent coordinates (topocentric coordinates) + //convert geocentric coordinates to local apparent coordinates (topocentric coordinates) dms HA, HA2; //Hour Angle, before and after correction double rsinp, rcosp, u, sinHA, cosHA, sinDec, cosDec, D; double cosHA2; diff --git a/kstars/kstars/ksplanetbase.h b/kstars/kstars/ksplanetbase.h index 97296c61..71787087 100644 --- a/kstars/kstars/ksplanetbase.h +++ b/kstars/kstars/ksplanetbase.h @@ -317,7 +317,7 @@ protected: private: /**@short correct the position for the fact that the location is not at the center of the Earth, *but a position on its surface. This causes a small parallactic shift in a solar system - *body's aptqparent position. The effect is most significant for the Moon. + *body's apparent position. The effect is most significant for the Moon. *This function is private, and should only be called from the public findPosition() function. *@param num pointer to a ksnumbers object for the target date/time *@param lat pointer to the geographic latitude of the location. diff --git a/kstars/kstars/kspopupmenu.cpp b/kstars/kstars/kspopupmenu.cpp index 907371ef..33282ab0 100644 --- a/kstars/kstars/kspopupmenu.cpp +++ b/kstars/kstars/kspopupmenu.cpp @@ -32,10 +32,10 @@ #include "indigroup.h" #include "indiproperty.h" -KSPopupMenu::KSPopupMenu( TQWidget *tqparent, const char *name ) - : KPopupMenu( tqparent, name ) +KSPopupMenu::KSPopupMenu( TQWidget *parent, const char *name ) + : KPopupMenu( parent, name ) { - ksw = ( KStars* )tqparent; + ksw = ( KStars* )parent; } KSPopupMenu::~KSPopupMenu() diff --git a/kstars/kstars/kspopupmenu.h b/kstars/kstars/kspopupmenu.h index a6ef1a20..48bc0383 100644 --- a/kstars/kstars/kspopupmenu.h +++ b/kstars/kstars/kspopupmenu.h @@ -42,7 +42,7 @@ Q_OBJECT TQ_OBJECT public: /**Default constructor*/ - KSPopupMenu( TQWidget *tqparent = 0, const char *name = 0 ); + KSPopupMenu( TQWidget *parent = 0, const char *name = 0 ); /**Destructor (empty)*/ ~KSPopupMenu(); diff --git a/kstars/kstars/kssun.cpp b/kstars/kstars/kssun.cpp index fc9b312d..5df14c59 100644 --- a/kstars/kstars/kssun.cpp +++ b/kstars/kstars/kssun.cpp @@ -125,7 +125,7 @@ bool KSSun::findGeocentricPosition( const KSNumbers *num, const KSPlanetBase *Ea nutate(num); aberrate(num); - // We obtain the aptqparent geocentric ecliptic coordinates. That is, after + // We obtain the apparent geocentric ecliptic coordinates. That is, after // nutation and aberration have been applied. EquatorialToEcliptic( num->obliquity() ); diff --git a/kstars/kstars/kstars.h b/kstars/kstars/kstars.h index c5f213a2..569c70f7 100644 --- a/kstars/kstars/kstars.h +++ b/kstars/kstars/kstars.h @@ -669,7 +669,7 @@ class KStars::privatedata { KStarsData *kstarsData; /**Constructor */ - privatedata(KStars *tqparent) : ks(tqparent), splash(0), kstarsData(0) {} + privatedata(KStars *parent) : ks(parent), splash(0), kstarsData(0) {} /**Destructor */ ~privatedata(); diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp index 802d8ab8..f470e756 100644 --- a/kstars/kstars/kstarsactions.cpp +++ b/kstars/kstars/kstarsactions.cpp @@ -450,7 +450,7 @@ void KStars::slotExportImage() { //Warn user if file exists! if (TQFile::exists(fileURL.path())) { - int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(tqparent()), + int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), i18n( "A file named \"%1\" already exists. " "Overwrite it?" ).tqarg(fileURL.fileName()), i18n( "Overwrite File?" ), diff --git a/kstars/kstars/kstarsdata.h b/kstars/kstars/kstarsdata.h index ec84d391..b33b76e3 100644 --- a/kstars/kstars/kstarsdata.h +++ b/kstars/kstars/kstarsdata.h @@ -327,7 +327,7 @@ public: //TODO JM: ADV tree should use XML instead /**Read Advanced interface structure to be used later to construct the list view in *the advanced tab in the Detail Dialog. - *@li KSLABEL designates a top-level tqparent label + *@li KSLABEL designates a top-level parent label *@li KSINTERFACE designates a common URL interface for several objects *@li END designates the end of a sub tree structure *@short read Advanted interface structure. diff --git a/kstars/kstars/kstarsdatetime.cpp b/kstars/kstars/kstarsdatetime.cpp index b99a6173..25c3be0b 100644 --- a/kstars/kstars/kstarsdatetime.cpp +++ b/kstars/kstars/kstarsdatetime.cpp @@ -116,7 +116,7 @@ dms KStarsDateTime::GSTat0hUT() const { double t1 = 6.697374558 + 2400.051336*t + 0.000025862*t*t + 0.000000002*t*t*t; - // To obtain the aptqparent sidereal time, we have to correct the + // To obtain the apparent sidereal time, we have to correct the // mean greenwich sidereal time with nutation in longitude multiplied // by the cosine of the obliquity of the ecliptic. This correction // is called nutation in right ascention, and may amount to 0.3 secs. diff --git a/kstars/kstars/kstarssplash.cpp b/kstars/kstars/kstarssplash.cpp index b0edbed0..29198caa 100644 --- a/kstars/kstars/kstarssplash.cpp +++ b/kstars/kstars/kstarssplash.cpp @@ -25,9 +25,9 @@ #include "kstarssplash.h" #include "ksutils.h" -KStarsSplash::KStarsSplash( TQWidget *tqparent, const char* name ) +KStarsSplash::KStarsSplash( TQWidget *parent, const char* name ) : KDialogBase( KDialogBase::Plain, i18n( "Loading KStars..." ), - 0 /*no buttons*/, Ok, tqparent, name, false /*not modal*/ ) { + 0 /*no buttons*/, Ok, parent, name, false /*not modal*/ ) { //Set up widgets for splashscreen. TQFrame *page = plainPage(); diff --git a/kstars/kstars/kstarssplash.h b/kstars/kstars/kstarssplash.h index 0becc4a8..8d9b2236 100644 --- a/kstars/kstars/kstarssplash.h +++ b/kstars/kstars/kstarssplash.h @@ -38,7 +38,7 @@ class KStarsSplash : public KDialogBase public: /**Constructor. Create widgets. Load KStars logo. Start load timer. */ - KStarsSplash( TQWidget *tqparent, const char* name ); + KStarsSplash( TQWidget *parent, const char* name ); /**Destructor */ diff --git a/kstars/kstars/kswizard.cpp b/kstars/kstars/kswizard.cpp index 88037007..85258362 100644 --- a/kstars/kstars/kswizard.cpp +++ b/kstars/kstars/kswizard.cpp @@ -31,10 +31,10 @@ #include "kswizardui.h" #include "kswizard.h" -KSWizard::KSWizard( TQWidget *tqparent, const char *name ) - : KSWizardUI( tqparent, name ) +KSWizard::KSWizard( TQWidget *parent, const char *name ) + : KSWizardUI( parent, name ) { - ksw = (KStars *)tqparent; + ksw = (KStars *)parent; GeoID.resize(10000); //Removing telescope page for now... diff --git a/kstars/kstars/kswizard.h b/kstars/kstars/kswizard.h index 27b3010b..f72e19ef 100644 --- a/kstars/kstars/kswizard.h +++ b/kstars/kstars/kswizard.h @@ -43,10 +43,10 @@ Q_OBJECT public: /** *Constructor - *@p tqparent pointer to the tqparent widget + *@p parent pointer to the parent widget *@p name name for the KSWizard object */ - KSWizard( TQWidget *tqparent=0, const char *name=0 ); + KSWizard( TQWidget *parent=0, const char *name=0 ); /**Destructor */ ~KSWizard(); diff --git a/kstars/kstars/locationdialog.cpp b/kstars/kstars/locationdialog.cpp index ec5e28a2..57287329 100644 --- a/kstars/kstars/locationdialog.cpp +++ b/kstars/kstars/locationdialog.cpp @@ -36,10 +36,10 @@ #include "mapcanvas.h" #include "dmsbox.h" -LocationDialog::LocationDialog( TQWidget* tqparent ) - : KDialogBase( KDialogBase::Plain, i18n( "Set Geographic Location" ), Ok|Cancel, Ok, tqparent ) { +LocationDialog::LocationDialog( TQWidget* parent ) + : KDialogBase( KDialogBase::Plain, i18n( "Set Geographic Location" ), Ok|Cancel, Ok, parent ) { - KStars *p = (KStars *)tqparent; + KStars *p = (KStars *)parent; TQFrame *page = plainPage(); CityBox = new TQGroupBox( page, "CityBox" ); @@ -217,7 +217,7 @@ LocationDialog::~LocationDialog(){ } void LocationDialog::initCityList( void ) { - KStars *p = (KStars *)tqparent(); + KStars *p = (KStars *)parent(); for (GeoLocation *loc = p->data()->geoList.first(); loc; loc = p->data()->geoList.next()) { GeoBox->insertItem( loc->fullName() ); @@ -252,7 +252,7 @@ void LocationDialog::initCityList( void ) { } void LocationDialog::filterCity( void ) { - KStars *p = (KStars *)tqparent(); + KStars *p = (KStars *)parent(); GeoBox->clear(); filteredCityList.clear(); @@ -302,7 +302,7 @@ void LocationDialog::changeCity( void ) { //Fill the fields at the bottom of the window with the selected city's data. if ( SelectedCity ) { - KStars *p = (KStars *)tqparent(); + KStars *p = (KStars *)parent(); NewCityName->setText( SelectedCity->translatedName() ); NewProvinceName->setText( SelectedCity->translatedProvince() ); NewCountryName->setText( SelectedCity->translatedCountry() ); @@ -328,7 +328,7 @@ void LocationDialog::changeCity( void ) { } void LocationDialog::addCity( void ) { - KStars *p = (KStars *)tqparent(); + KStars *p = (KStars *)parent(); bCityAdded = false; if ( !nameModified && !dataModified ) { @@ -417,7 +417,7 @@ void LocationDialog::addCity( void ) { } void LocationDialog::findCitiesNear( int lng, int lat ) { - KStars *ks = (KStars *)tqparent(); + KStars *ks = (KStars *)parent(); //find all cities within 3 degrees of (lng, lat); list them in GeoBox GeoBox->clear(); diff --git a/kstars/kstars/locationdialog.h b/kstars/kstars/locationdialog.h index 995f7f13..e40c43a4 100644 --- a/kstars/kstars/locationdialog.h +++ b/kstars/kstars/locationdialog.h @@ -65,7 +65,7 @@ public: *Constructor. Create all widgets, and pack them into TQLayouts. *Connect Signals to Slots. Run initCityList(). */ - LocationDialog( TQWidget* tqparent = 0 ); + LocationDialog( TQWidget* parent = 0 ); /** *Destructor (empty) */ diff --git a/kstars/kstars/magnitudespinbox.cpp b/kstars/kstars/magnitudespinbox.cpp index 09a85def..2f4b1930 100644 --- a/kstars/kstars/magnitudespinbox.cpp +++ b/kstars/kstars/magnitudespinbox.cpp @@ -17,13 +17,13 @@ #include "magnitudespinbox.h" -MagnitudeSpinBox::MagnitudeSpinBox( TQWidget * tqparent , const char * name ) - : KDoubleNumInput( 0.0, 10.0, 0.0, 0.1 /*step*/, 1 /*precision*/, tqparent, name) +MagnitudeSpinBox::MagnitudeSpinBox( TQWidget * parent , const char * name ) + : KDoubleNumInput( 0.0, 10.0, 0.0, 0.1 /*step*/, 1 /*precision*/, parent, name) { } MagnitudeSpinBox::MagnitudeSpinBox( double minValue, double maxValue, - TQWidget * tqparent , const char * name ) - : KDoubleNumInput( minValue, maxValue, minValue, 0.1 /* step */, 1, tqparent, name) + TQWidget * parent , const char * name ) + : KDoubleNumInput( minValue, maxValue, minValue, 0.1 /* step */, 1, parent, name) { } diff --git a/kstars/kstars/magnitudespinbox.h b/kstars/kstars/magnitudespinbox.h index 36017176..14a8d0e2 100644 --- a/kstars/kstars/magnitudespinbox.h +++ b/kstars/kstars/magnitudespinbox.h @@ -36,11 +36,11 @@ class MagnitudeSpinBox : public KDoubleNumInput /**Default Constructor. */ - MagnitudeSpinBox( TQWidget* tqparent = 0, const char* name = 0); + MagnitudeSpinBox( TQWidget* parent = 0, const char* name = 0); /**Constructor. Set minimum and maximum values for the spinbox. */ - MagnitudeSpinBox( double minValue, double maxValue, TQWidget* tqparent = 0, const char* name = 0); + MagnitudeSpinBox( double minValue, double maxValue, TQWidget* parent = 0, const char* name = 0); }; diff --git a/kstars/kstars/mapcanvas.cpp b/kstars/kstars/mapcanvas.cpp index bc76ab02..928623f8 100644 --- a/kstars/kstars/mapcanvas.cpp +++ b/kstars/kstars/mapcanvas.cpp @@ -25,14 +25,14 @@ #include "kstars.h" #include "kstarsdata.h" -MapCanvas::MapCanvas(TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name) { +MapCanvas::MapCanvas(TQWidget *parent, const char *name ) : TQWidget(parent,name) { BGColor = "#33A"; setBackgroundColor( TQColor( BGColor ) ); setBackgroundMode( TQWidget::NoBackground ); Canvas = new TQPixmap(); bgImage = new TQPixmap(); LocationDialog *ld = (LocationDialog *)tqtopLevelWidget(); - KStars *ks = (KStars *)ld->tqparent(); + KStars *ks = (KStars *)ld->parent(); TQString bgFile = ks->data()->stdDirs->findResource( "data", "kstars/geomap.png" ); bgImage->load( bgFile, "PNG" ); } @@ -69,7 +69,7 @@ void MapCanvas::mousePressEvent( TQMouseEvent *e ) { void MapCanvas::paintEvent( TQPaintEvent * ) { TQPainter pcanvas; LocationDialog *ld = (LocationDialog *)tqtopLevelWidget(); - KStars *ks = (KStars *)ld->tqparent(); + KStars *ks = (KStars *)ld->parent(); //prepare the canvas pcanvas.begin( Canvas ); diff --git a/kstars/kstars/mapcanvas.h b/kstars/kstars/mapcanvas.h index 66402408..fd5432c4 100644 --- a/kstars/kstars/mapcanvas.h +++ b/kstars/kstars/mapcanvas.h @@ -42,9 +42,9 @@ class MapCanvas : public TQWidget { public: /**Default constructor. Initialize the widget: create pixmaps, load the *world map bitmap, set pointers to the main window and the - *LocationDialog tqparent. + *LocationDialog parent. */ - MapCanvas(TQWidget *tqparent=0, const char *name=0); + MapCanvas(TQWidget *parent=0, const char *name=0); /**Destructor (empty) */ ~MapCanvas(); diff --git a/kstars/kstars/opsadvanced.h b/kstars/kstars/opsadvanced.h index 7475cc49..45cdbf17 100644 --- a/kstars/kstars/opsadvanced.h +++ b/kstars/kstars/opsadvanced.h @@ -39,7 +39,7 @@ class OpsAdvanced : public OpsAdvancedUI TQ_OBJECT public: - OpsAdvanced( TQWidget *tqparent=0, const char *name=0, WFlags fl = 0 ); + OpsAdvanced( TQWidget *parent=0, const char *name=0, WFlags fl = 0 ); ~OpsAdvanced(); private slots: diff --git a/kstars/kstars/opscatalog.h b/kstars/kstars/opscatalog.h index 0e6701e9..ca2d3553 100644 --- a/kstars/kstars/opscatalog.h +++ b/kstars/kstars/opscatalog.h @@ -42,7 +42,7 @@ class OpsCatalog : public OpsCatalogUI TQ_OBJECT public: - OpsCatalog( TQWidget *tqparent=0, const char *name=0, WFlags fl = 0 ); + OpsCatalog( TQWidget *parent=0, const char *name=0, WFlags fl = 0 ); ~OpsCatalog(); private slots: diff --git a/kstars/kstars/opscolors.h b/kstars/kstars/opscolors.h index 34f1b658..bca94c4f 100644 --- a/kstars/kstars/opscolors.h +++ b/kstars/kstars/opscolors.h @@ -44,7 +44,7 @@ class OpsColors : public OpsColorsUI TQ_OBJECT public: - OpsColors( TQWidget *tqparent=0, const char *name=0, WFlags fl = 0 ); + OpsColors( TQWidget *parent=0, const char *name=0, WFlags fl = 0 ); ~OpsColors(); private slots: diff --git a/kstars/kstars/opsguides.cpp b/kstars/kstars/opsguides.cpp index d9bfc7c9..aae84244 100644 --- a/kstars/kstars/opsguides.cpp +++ b/kstars/kstars/opsguides.cpp @@ -18,8 +18,8 @@ #include #include "opsguides.h" -OpsGuides::OpsGuides( TQWidget* tqparent, const char* name, WFlags fl ) - : OpsGuidesUI( tqparent, name, fl ) +OpsGuides::OpsGuides( TQWidget* parent, const char* name, WFlags fl ) + : OpsGuidesUI( parent, name, fl ) { connect( kcfg_ShowCNames, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotToggleConstellOptions() ) ); diff --git a/kstars/kstars/opsguides.h b/kstars/kstars/opsguides.h index 383f6082..cf208b8e 100644 --- a/kstars/kstars/opsguides.h +++ b/kstars/kstars/opsguides.h @@ -25,7 +25,7 @@ class OpsGuides : public OpsGuidesUI TQ_OBJECT public: - OpsGuides( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + OpsGuides( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~OpsGuides(); private slots: diff --git a/kstars/kstars/opssolarsystem.cpp b/kstars/kstars/opssolarsystem.cpp index 4ee0a4da..e10496fb 100644 --- a/kstars/kstars/opssolarsystem.cpp +++ b/kstars/kstars/opssolarsystem.cpp @@ -21,10 +21,10 @@ #include "kstars.h" #include "magnitudespinbox.h" -OpsSolarSystem::OpsSolarSystem( TQWidget *tqparent, const char *name, WFlags fl ) - : OpsSolarSystemUI( tqparent, name, fl ) +OpsSolarSystem::OpsSolarSystem( TQWidget *parent, const char *name, WFlags fl ) + : OpsSolarSystemUI( parent, name, fl ) { - ksw = (KStars *)tqparent; + ksw = (KStars *)parent; connect( kcfg_ShowAsteroids, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotAsteroidWidgets(bool) ) ); connect( kcfg_ShowComets, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotCometWidgets(bool) ) ); diff --git a/kstars/kstars/opssolarsystem.h b/kstars/kstars/opssolarsystem.h index cce6d052..98aca19f 100644 --- a/kstars/kstars/opssolarsystem.h +++ b/kstars/kstars/opssolarsystem.h @@ -35,7 +35,7 @@ class OpsSolarSystem : public OpsSolarSystemUI TQ_OBJECT public: - OpsSolarSystem( TQWidget *tqparent=0, const char *name=0, WFlags fl = 0 ); + OpsSolarSystem( TQWidget *parent=0, const char *name=0, WFlags fl = 0 ); ~OpsSolarSystem(); private slots: diff --git a/kstars/kstars/simclock.cpp b/kstars/kstars/simclock.cpp index 74af0865..41d8c71e 100644 --- a/kstars/kstars/simclock.cpp +++ b/kstars/kstars/simclock.cpp @@ -25,9 +25,9 @@ int SimClock::idgen = 1; int SimClock::TimerInterval = 100; //msec -SimClock::SimClock(TQObject *tqparent, const KStarsDateTime &when) : +SimClock::SimClock(TQObject *parent, const KStarsDateTime &when) : DCOPObject("clock#" + TQCString().setNum(idgen++)), - TQObject(tqparent), + TQObject(parent), tmr(this) { if (! when.isValid() ) tmr.stop(); @@ -43,7 +43,7 @@ SimClock::SimClock(TQObject *tqparent, const KStarsDateTime &when) : SimClock::SimClock (const SimClock &old) : DCOPObject("clock#" + TQCString().setNum(idgen++)), - TQObject(old.tqparent()), + TQObject(old.parent()), SimClockInterface(), tmr(this) { diff --git a/kstars/kstars/simclock.h b/kstars/kstars/simclock.h index 6bf9355c..a4b16787 100644 --- a/kstars/kstars/simclock.h +++ b/kstars/kstars/simclock.h @@ -37,10 +37,10 @@ class SimClock : public TQObject, public SimClockInterface { public: /** * Constructor - * @param tqparent tqparent object for the clock + * @param parent parent object for the clock * @param when the date/time to which the SimClock should be initialized in UTC */ - SimClock(TQObject *tqparent = 0, const KStarsDateTime &when = KStarsDateTime::tqcurrentDateTime() ); + SimClock(TQObject *parent = 0, const KStarsDateTime &when = KStarsDateTime::tqcurrentDateTime() ); /** * Constructor * @param old a SimClock to initialize from. diff --git a/kstars/kstars/skymap.cpp b/kstars/kstars/skymap.cpp index 27f72614..4dab3cee 100644 --- a/kstars/kstars/skymap.cpp +++ b/kstars/kstars/skymap.cpp @@ -51,13 +51,13 @@ #include "starobject.h" #include "customcatalog.h" -SkyMap::SkyMap(KStarsData *d, TQWidget *tqparent, const char *name ) - : TQWidget (tqparent,name), computeSkymap(true), angularDistanceMode(false), +SkyMap::SkyMap(KStarsData *d, TQWidget *parent, const char *name ) + : TQWidget (parent,name), computeSkymap(true), angularDistanceMode(false), ksw(0), data(d), pmenu(0), sky(0), sky2(0), IBoxes(0), ClickedObject(0), FocusObject(0), TransientObject(0), starpix(0), pts(0), sp(0) { - if ( tqparent ) ksw = (KStars*) tqparent->tqparent(); + if ( parent ) ksw = (KStars*) parent->parent(); else ksw = 0; pts = new TQPointArray( 2000 ); // points for milkyway and horizon @@ -121,7 +121,7 @@ SkyMap::SkyMap(KStarsData *d, TQWidget *tqparent, const char *name ) connect( this, TQT_SIGNAL( destinationChanged() ), this, TQT_SLOT( slewFocus() ) ); //Initialize Refraction correction lookup table arrays. RefractCorr1 is for calculating - //the aptqparent altitude from the true altitude, and RefractCorr2 is for the reverse. + //the apparent altitude from the true altitude, and RefractCorr2 is for the reverse. for ( unsigned int index = 0; index <184; ++index ) { double alt = -1.75 + index*0.5; //start at -1.75 degrees to get midpoint value for each interval. @@ -1102,7 +1102,7 @@ SkyPoint SkyMap::dXdYToRaDec( double dx, double dy, bool useAltAz, dms *LST, con az = focus()->az()->Degrees() + deltaAz.Degrees(); alt.setRadians( asin( cosc*sinAlt0 + ( dy*sinc*cosAlt0 )/r ) ); - if ( doRefract ) alt.setD( refract( &alt, false ).Degrees() ); //find true altitude from aptqparent altitude + if ( doRefract ) alt.setD( refract( &alt, false ).Degrees() ); //find true altitude from apparent altitude az.SinCos( sinAz, cosAz ); alt.SinCos( sinAlt, cosAlt ); @@ -1141,7 +1141,7 @@ SkyPoint SkyMap::dXdYToRaDec( double dx, double dy, bool useAltAz, dms *LST, con } } -dms SkyMap::refract( const dms *alt, bool findAptqparent ) { +dms SkyMap::refract( const dms *alt, bool findApparent ) { if ( alt->Degrees() <= -2.000 ) return dms( alt->Degrees() ); int index = int( ( alt->Degrees() + 2.0 )*2. ); //RefractCorr arrays start at alt=-2.0 degrees. @@ -1152,7 +1152,7 @@ dms SkyMap::refract( const dms *alt, bool findAptqparent ) { return dms( alt->Degrees() ); } - if ( findAptqparent ) { + if ( findApparent ) { result.setD( alt->Degrees() + RefractCorr1[index] ); } else { result.setD( alt->Degrees() + RefractCorr2[index] ); @@ -1252,18 +1252,18 @@ void SkyMap::setZoomMouseCursor() p.drawLine( mx + 5, my + 5, mx + 11, my + 11 ); p.end(); -// create a tqmask to make parts of the pixmap invisible - TQBitmap tqmask (32, 32); - tqmask.fill (color0); // all is invisible +// create a mask to make parts of the pixmap invisible + TQBitmap mask (32, 32); + mask.fill (color0); // all is invisible - p.begin (&tqmask); + p.begin (&mask); // paint over the parts which should be visible p.setPen (TQPen (color1, 3)); p.drawEllipse( mx - 7, my - 7, 14, 14 ); p.drawLine( mx + 5, my + 5, mx + 12, my + 12 ); p.end(); - cursorPix.setMask (tqmask); // set the tqmask + cursorPix.setMask (mask); // set the mask TQCursor cursor (cursorPix); setCursor (cursor); } @@ -1289,11 +1289,11 @@ void SkyMap::setDefaultMouseCursor() p.drawLine (mx + 2, my - 2, mx + 8, mx - 8); p.end(); -// create a tqmask to make parts of the pixmap invisible - TQBitmap tqmask (32, 32); - tqmask.fill (color0); // all is invisible +// create a mask to make parts of the pixmap invisible + TQBitmap mask (32, 32); + mask.fill (color0); // all is invisible - p.begin (&tqmask); + p.begin (&mask); // paint over the parts which should be visible p.setPen (TQPen (color1, 3)); // 1. diagonal @@ -1304,7 +1304,7 @@ void SkyMap::setDefaultMouseCursor() p.drawLine (mx + 2, my - 2, mx + 8, mx - 8); p.end(); - cursorPix.setMask (tqmask); // set the tqmask + cursorPix.setMask (mask); // set the mask TQCursor cursor (cursorPix); setCursor (cursor); } diff --git a/kstars/kstars/skymap.h b/kstars/kstars/skymap.h index 22843b14..d407bd78 100644 --- a/kstars/kstars/skymap.h +++ b/kstars/kstars/skymap.h @@ -64,7 +64,7 @@ public: *Constructor. Read stored settings from KConfig object (focus position, *zoom factor, sky color, etc.). Run initPopupMenus(). */ - SkyMap( KStarsData *d, TQWidget *tqparent=0, const char *name=0); + SkyMap( KStarsData *d, TQWidget *parent=0, const char *name=0); /** *Destructor (empty) @@ -428,13 +428,13 @@ public slots: *simply assigned the nearest stored value. The precaclulated values are stored in the *RefractCorr1 and RefractCorr2 arrays, and these are initialized in the SkyMap constructor. * - *There are two cases: the true altitude is known, and the aptqparent altitude is needed; - *or the aptqparent altitude is known and the true altitude is needed. + *There are two cases: the true altitude is known, and the apparent altitude is needed; + *or the apparent altitude is known and the true altitude is needed. *@param alt The input altitude - *@param findAptqparent if TRUE, then alt is the true altitude, and we'll find the aptqparent alt. + *@param findApparent if TRUE, then alt is the true altitude, and we'll find the apparent alt. *@return the corrected altitude, as a dms object. */ - dms refract( const dms *alt, bool findAptqparent ); + dms refract( const dms *alt, bool findApparent ); /**Step the Focus point toward the Destination point. Do this iteratively, redrawing the Sky *Map after each step, until the Focus point is within 1 step of the Destination point. diff --git a/kstars/kstars/skyobjectname.cpp b/kstars/kstars/skyobjectname.cpp index c4ba6937..696803b5 100644 --- a/kstars/kstars/skyobjectname.cpp +++ b/kstars/kstars/skyobjectname.cpp @@ -23,8 +23,8 @@ SkyObjectName::SkyObjectName( const TQString &str, SkyObject *obj ) { } -SkyObjectNameListItem::SkyObjectNameListItem ( TQListBox *tqparent, SkyObjectName *obj ) - : TQListBoxText ( tqparent ), object ( obj ) +SkyObjectNameListItem::SkyObjectNameListItem ( TQListBox *parent, SkyObjectName *obj ) + : TQListBoxText ( parent ), object ( obj ) { setText( obj->text() ); } diff --git a/kstars/kstars/skyobjectname.h b/kstars/kstars/skyobjectname.h index 7e3ca979..15d0bc32 100644 --- a/kstars/kstars/skyobjectname.h +++ b/kstars/kstars/skyobjectname.h @@ -79,7 +79,7 @@ class SkyObjectNameListItem : public TQListBoxText { public: /**Constructor */ - SkyObjectNameListItem (TQListBox *tqparent, SkyObjectName *name ); + SkyObjectNameListItem (TQListBox *parent, SkyObjectName *name ); /**Destructor (empty)*/ ~SkyObjectNameListItem() {} diff --git a/kstars/kstars/skypoint.h b/kstars/kstars/skypoint.h index 7c6a0b4a..335c9557 100644 --- a/kstars/kstars/skypoint.h +++ b/kstars/kstars/skypoint.h @@ -292,7 +292,7 @@ public: */ virtual void updateCoords( KSNumbers *num, bool includePlanets=true, const dms *lat=0, const dms *LST=0 ); -/**Computes the aptqparent coordinates for this SkyPoint for any epoch, +/**Computes the apparent coordinates for this SkyPoint for any epoch, *accounting for the effects of precession, nutation, and aberration. *Similar to updateCoords(), but the starting epoch need not be *J2000, and the target epoch need not be the present time. diff --git a/kstars/kstars/stardatasink.cpp b/kstars/kstars/stardatasink.cpp index e0f9f09f..e77b3820 100644 --- a/kstars/kstars/stardatasink.cpp +++ b/kstars/kstars/stardatasink.cpp @@ -20,8 +20,8 @@ #include "dms.h" #include "kstarsdata.h" -StarDataSink::StarDataSink(KStarsData *tqparent, const char *name) : TQObject(tqparent, name) { - ksData = tqparent; +StarDataSink::StarDataSink(KStarsData *parent, const char *name) : TQObject(parent, name) { + ksData = parent; receivedBlocks = 0; nameListCount = ksData->ObjNames.count(); } diff --git a/kstars/kstars/stardatasink.h b/kstars/kstars/stardatasink.h index 57bda9e5..b655ef8c 100644 --- a/kstars/kstars/stardatasink.h +++ b/kstars/kstars/stardatasink.h @@ -42,7 +42,7 @@ class StarDataSink : public TQObject, public TQDataSink { public: /** constructor */ - StarDataSink( KStarsData *tqparent, const char *name=0 ); + StarDataSink( KStarsData *parent, const char *name=0 ); /** destructor */ ~StarDataSink(); diff --git a/kstars/kstars/starpixmap.cpp b/kstars/kstars/starpixmap.cpp index fe04bc1d..1b4e006a 100644 --- a/kstars/kstars/starpixmap.cpp +++ b/kstars/kstars/starpixmap.cpp @@ -69,7 +69,7 @@ void StarPixmap::loadPixmaps (int newColorMode, int newColorIntensity) { if (colorIntensity < 0) colorIntensity = 0; // min TQPixmap pix (STARSIZE, STARSIZE); - TQBitmap tqmask (STARSIZE, STARSIZE); + TQBitmap mask (STARSIZE, STARSIZE); TQImage image; TQPainter p; TQMemArray starColor; @@ -104,9 +104,9 @@ void StarPixmap::loadPixmaps (int newColorMode, int newColorIntensity) { p.end(); } - tqmask.fill (TQt::color0); + mask.fill (TQt::color0); - p.begin (&tqmask); + p.begin (&mask); p.setPen (TQPen ( TQt::color1, 1)); p.setBrush( TQBrush( TQt::color1 ) ); p.drawEllipse(0, 0, STARSIZE, STARSIZE); @@ -117,7 +117,7 @@ void StarPixmap::loadPixmaps (int newColorMode, int newColorIntensity) { TQImage tmp = pix.convertToImage(); pix.convertFromImage( KImageEffect::blur( tmp, 100.0 ) ); - pix.setMask (tqmask); // set the tqmask + pix.setMask (mask); // set the mask image = pix.convertToImage(); // create the image for smoothScale() for (int i = 0; i < 26; i++) diff --git a/kstars/kstars/streamwg.cpp b/kstars/kstars/streamwg.cpp index 36e991c5..b4d29e29 100644 --- a/kstars/kstars/streamwg.cpp +++ b/kstars/kstars/streamwg.cpp @@ -40,7 +40,7 @@ FILE *wfp; - StreamWG::StreamWG(INDIStdDevice *inStdDev, TQWidget * tqparent, const char * name) : streamForm(tqparent, name) + StreamWG::StreamWG(INDIStdDevice *inStdDev, TQWidget * parent, const char * name) : streamForm(parent, name) { stdDev = inStdDev; @@ -268,7 +268,7 @@ void StreamWG::captureImage() } -VideoWG::VideoWG(TQWidget * tqparent, const char * name) : TQFrame(tqparent, name, TQt::WNoAutoErase) +VideoWG::VideoWG(TQWidget * parent, const char * name) : TQFrame(parent, name, TQt::WNoAutoErase) { streamImage = NULL; grayTable=new TQRgb[256]; diff --git a/kstars/kstars/streamwg.h b/kstars/kstars/streamwg.h index a4aeb907..b80ecd26 100644 --- a/kstars/kstars/streamwg.h +++ b/kstars/kstars/streamwg.h @@ -32,7 +32,7 @@ TQ_OBJECT public: - StreamWG(INDIStdDevice *inStdDev, TQWidget * tqparent =0, const char * name =0); + StreamWG(INDIStdDevice *inStdDev, TQWidget * parent =0, const char * name =0); ~StreamWG(); friend class VideoWG; @@ -70,7 +70,7 @@ TQ_OBJECT public: - VideoWG(TQWidget * tqparent =0, const char * name =0); + VideoWG(TQWidget * parent =0, const char * name =0); ~VideoWG(); friend class StreamWG; diff --git a/kstars/kstars/telescopeprop.cpp b/kstars/kstars/telescopeprop.cpp index b391d213..572c51d1 100644 --- a/kstars/kstars/telescopeprop.cpp +++ b/kstars/kstars/telescopeprop.cpp @@ -29,11 +29,11 @@ #include "indimenu.h" #include "indidriver.h" -telescopeProp::telescopeProp(TQWidget* tqparent, const char* name, bool modal, WFlags fl) -: scopeProp(tqparent,name, modal,fl) +telescopeProp::telescopeProp(TQWidget* parent, const char* name, bool modal, WFlags fl) +: scopeProp(parent,name, modal,fl) { - ksw = (KStars *) tqparent; + ksw = (KStars *) parent; ksw->establishINDI(); indi_driver = ksw->getINDIDriver(); diff --git a/kstars/kstars/telescopeprop.h b/kstars/kstars/telescopeprop.h index 3bd3de66..2f0791a7 100644 --- a/kstars/kstars/telescopeprop.h +++ b/kstars/kstars/telescopeprop.h @@ -29,7 +29,7 @@ class telescopeProp : public scopeProp TQ_OBJECT public: - telescopeProp(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + telescopeProp(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~telescopeProp(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/kstars/kstars/telescopewizardprocess.cpp b/kstars/kstars/telescopewizardprocess.cpp index b2be4995..a732a089 100644 --- a/kstars/kstars/telescopewizardprocess.cpp +++ b/kstars/kstars/telescopewizardprocess.cpp @@ -40,7 +40,7 @@ #define TIMEOUT_THRESHHOLD 20 -telescopeWizardProcess::telescopeWizardProcess( TQWidget* tqparent, const char* name ) : telescopeWizard(tqparent, name) +telescopeWizardProcess::telescopeWizardProcess( TQWidget* parent, const char* name ) : telescopeWizard(parent, name) { currentPort = -1; timeOutCount = 0; @@ -57,7 +57,7 @@ telescopeWizardProcess::telescopeWizardProcess( TQWidget* tqparent, const char* backB->hide(); currentPage = INTRO_P; - ksw = (KStars *) tqparent; + ksw = (KStars *) parent; ksw->establishINDI(); @@ -91,7 +91,7 @@ telescopeWizardProcess::telescopeWizardProcess( TQWidget* tqparent, const char* portList << "/dev/ttyS0" << "/dev/ttyS1" << "/dev/ttyS2" << "/dev/ttyS3" << "/dev/ttyS4" << "/dev/ttyUSB0" << "/dev/ttyUSB1" << "/dev/ttyUSB2" << "/dev/ttyUSB3";// << "/dev/ttyUSB4"; - connect(helpB, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(appHelpActivated())); + connect(helpB, TQT_SIGNAL(clicked()), parent, TQT_SLOT(appHelpActivated())); connect(nextB, TQT_SIGNAL(clicked()), this, TQT_SLOT(processNext())); connect(backB, TQT_SIGNAL(clicked()), this, TQT_SLOT(processBack())); connect(setTimeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(newTime())); diff --git a/kstars/kstars/telescopewizardprocess.h b/kstars/kstars/telescopewizardprocess.h index cd76ebb2..200a4586 100644 --- a/kstars/kstars/telescopewizardprocess.h +++ b/kstars/kstars/telescopewizardprocess.h @@ -29,7 +29,7 @@ Q_OBJECT TQ_OBJECT public: - telescopeWizardProcess( TQWidget* tqparent = 0, const char* name = 0); + telescopeWizardProcess( TQWidget* parent = 0, const char* name = 0); ~telescopeWizardProcess(); unsigned int currentPage; diff --git a/kstars/kstars/thumbnaileditor.cpp b/kstars/kstars/thumbnaileditor.cpp index 53235044..24c00ca0 100644 --- a/kstars/kstars/thumbnaileditor.cpp +++ b/kstars/kstars/thumbnaileditor.cpp @@ -29,10 +29,10 @@ #include "thumbnaileditorui.h" #include "thumbnailpicker.h" -ThumbnailEditor::ThumbnailEditor( TQWidget *tqparent, const char *name ) - : KDialogBase( KDialogBase::Plain, i18n( "Edit Thumbnail Image" ), Ok|Cancel, Ok, tqparent, name ) +ThumbnailEditor::ThumbnailEditor( TQWidget *parent, const char *name ) + : KDialogBase( KDialogBase::Plain, i18n( "Edit Thumbnail Image" ), Ok|Cancel, Ok, parent, name ) { - tp = (ThumbnailPicker*)tqparent; + tp = (ThumbnailPicker*)parent; TQFrame *page = plainPage(); TQHBoxLayout *hlay = new TQHBoxLayout( page, 0, 0 ); @@ -75,7 +75,7 @@ TQPixmap ThumbImage::croppedImage() { return result; } -ThumbImage::ThumbImage( TQWidget *tqparent, const char *name ) : TQLabel( tqparent, name ) +ThumbImage::ThumbImage( TQWidget *parent, const char *name ) : TQLabel( parent, name ) { setBackgroundMode( TQWidget::NoBackground ); bMouseButtonDown = false; diff --git a/kstars/kstars/thumbnaileditor.h b/kstars/kstars/thumbnaileditor.h index 74300aae..c15d60e8 100644 --- a/kstars/kstars/thumbnaileditor.h +++ b/kstars/kstars/thumbnaileditor.h @@ -30,7 +30,7 @@ class ThumbImage : public TQLabel Q_OBJECT TQ_OBJECT public: - ThumbImage( TQWidget *tqparent, const char *name = 0 ); + ThumbImage( TQWidget *parent, const char *name = 0 ); ~ThumbImage(); void setImage( TQPixmap *pm ) { Image = pm; setFixedSize( Image->width(), Image->height() ); } @@ -65,7 +65,7 @@ class ThumbnailEditor : public KDialogBase Q_OBJECT TQ_OBJECT public: - ThumbnailEditor( TQWidget *tqparent, const char *name=0 ); + ThumbnailEditor( TQWidget *parent, const char *name=0 ); ~ThumbnailEditor(); TQPixmap thumbnail(); diff --git a/kstars/kstars/thumbnailpicker.cpp b/kstars/kstars/thumbnailpicker.cpp index 0d7d0265..5b0d4213 100644 --- a/kstars/kstars/thumbnailpicker.cpp +++ b/kstars/kstars/thumbnailpicker.cpp @@ -43,9 +43,9 @@ #include "detaildialog.h" #include "skyobject.h" -ThumbnailPicker::ThumbnailPicker( SkyObject *o, const TQPixmap ¤t, TQWidget *tqparent, const char *name ) - : KDialogBase( KDialogBase::Plain, i18n( "Choose Thumbnail Image" ), Ok|Cancel, Ok, tqparent, name ), - SelectedImageIndex(-1), dd((DetailDialog*)tqparent), Object(o), bImageFound( false ) +ThumbnailPicker::ThumbnailPicker( SkyObject *o, const TQPixmap ¤t, TQWidget *parent, const char *name ) + : KDialogBase( KDialogBase::Plain, i18n( "Choose Thumbnail Image" ), Ok|Cancel, Ok, parent, name ), + SelectedImageIndex(-1), dd((DetailDialog*)parent), Object(o), bImageFound( false ) { Image = new TQPixmap( current ); ImageRect = new TQRect( 0, 0, 200, 200 ); diff --git a/kstars/kstars/thumbnailpicker.h b/kstars/kstars/thumbnailpicker.h index 26e82bda..5e7fdba4 100644 --- a/kstars/kstars/thumbnailpicker.h +++ b/kstars/kstars/thumbnailpicker.h @@ -39,7 +39,7 @@ class ThumbnailPicker : public KDialogBase Q_OBJECT TQ_OBJECT public: - ThumbnailPicker( SkyObject *o, const TQPixmap ¤t, TQWidget *tqparent=0, const char *name=0 ); + ThumbnailPicker( SkyObject *o, const TQPixmap ¤t, TQWidget *parent=0, const char *name=0 ); ~ThumbnailPicker(); TQPixmap* image() { return Image; } diff --git a/kstars/kstars/timebox.cpp b/kstars/kstars/timebox.cpp index c97b4a89..c98ab034 100644 --- a/kstars/kstars/timebox.cpp +++ b/kstars/kstars/timebox.cpp @@ -24,7 +24,7 @@ #include #include -timeBox::timeBox(TQWidget *tqparent, const char *name, bool tt) : TQLineEdit(tqparent,name) +timeBox::timeBox(TQWidget *parent, const char *name, bool tt) : TQLineEdit(parent,name) { if (tt) { diff --git a/kstars/kstars/timebox.h b/kstars/kstars/timebox.h index 297b89aa..7e515731 100644 --- a/kstars/kstars/timebox.h +++ b/kstars/kstars/timebox.h @@ -38,12 +38,12 @@ class timeBox : public TQLineEdit { public: /** * Constructor for the timeBox object. - * @param tqparent is the tqparent TQWidget + * @param parent is the parent TQWidget * @param n name is the name of the object * @param tt boolean. true means that the object will hold a Time. * false means that the object will hold a Date. */ - timeBox(TQWidget *tqparent, const char *n, bool tt=TRUE); + timeBox(TQWidget *parent, const char *n, bool tt=TRUE); ~timeBox(); diff --git a/kstars/kstars/timedialog.cpp b/kstars/kstars/timedialog.cpp index 7a64b5b2..b07b74b9 100644 --- a/kstars/kstars/timedialog.cpp +++ b/kstars/kstars/timedialog.cpp @@ -29,10 +29,10 @@ #include "simclock.h" #include "libkdeedu/extdate/extdatepicker.h" -TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* tqparent ) - : KDialogBase( KDialogBase::Plain, i18n( "set clock to a new time", "Set Time" ), Ok|Cancel, Ok, tqparent ) +TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* parent ) + : KDialogBase( KDialogBase::Plain, i18n( "set clock to a new time", "Set Time" ), Ok|Cancel, Ok, parent ) { - ksw = (KStars*) tqparent; + ksw = (KStars*) parent; TQFrame *page = plainPage(); vlay = new TQVBoxLayout( page, 2, 2 ); diff --git a/kstars/kstars/timedialog.h b/kstars/kstars/timedialog.h index f18e4d3b..d13c829d 100644 --- a/kstars/kstars/timedialog.h +++ b/kstars/kstars/timedialog.h @@ -49,7 +49,7 @@ public: *Constructor. Creates widgets and packs them into TQLayouts. *Connects Signals and Slots. */ - TimeDialog( const KStarsDateTime &now, TQWidget* tqparent = 0 ); + TimeDialog( const KStarsDateTime &now, TQWidget* parent = 0 ); /** *Destructor (empty) diff --git a/kstars/kstars/timespinbox.cpp b/kstars/kstars/timespinbox.cpp index 828e0330..72549f9b 100644 --- a/kstars/kstars/timespinbox.cpp +++ b/kstars/kstars/timespinbox.cpp @@ -37,8 +37,8 @@ #define SIDEREAL_YEAR 31558149.77 #define TROPICAL_YEAR 31556925.19 -TimeSpinBox::TimeSpinBox( TQWidget *tqparent, const char *name, bool _daysonly ) - : TQSpinBox ( -41, 41, 1 /* step */, tqparent, name ) +TimeSpinBox::TimeSpinBox( TQWidget *parent, const char *name, bool _daysonly ) + : TQSpinBox ( -41, 41, 1 /* step */, parent, name ) { setValidator( 0 ); setButtonSymbols( TQSpinBox::PlusMinus ); diff --git a/kstars/kstars/timespinbox.h b/kstars/kstars/timespinbox.h index 46d82a1a..77498c00 100644 --- a/kstars/kstars/timespinbox.h +++ b/kstars/kstars/timespinbox.h @@ -33,7 +33,7 @@ Q_OBJECT TQ_OBJECT public: /**Constructor */ - TimeSpinBox( TQWidget *tqparent, const char* name=0, bool daysOnly = false ); + TimeSpinBox( TQWidget *parent, const char* name=0, bool daysOnly = false ); /**Destructor (empty)*/ ~TimeSpinBox() {} diff --git a/kstars/kstars/timestepbox.cpp b/kstars/kstars/timestepbox.cpp index ff956136..6b661592 100644 --- a/kstars/kstars/timestepbox.cpp +++ b/kstars/kstars/timestepbox.cpp @@ -23,8 +23,8 @@ #include "timestepbox.h" -TimeStepBox::TimeStepBox( TQWidget *tqparent, const char* name, bool daysonly ) - : TQFrame( tqparent, name ) { +TimeStepBox::TimeStepBox( TQWidget *parent, const char* name, bool daysonly ) + : TQFrame( parent, name ) { timeBox = new TimeSpinBox( this, "timebox", daysonly ); unitBox = new TimeUnitBox( this, "unitbox", daysonly ); diff --git a/kstars/kstars/timestepbox.h b/kstars/kstars/timestepbox.h index b335ee0d..6be45ead 100644 --- a/kstars/kstars/timestepbox.h +++ b/kstars/kstars/timestepbox.h @@ -38,7 +38,7 @@ Q_OBJECT TQ_OBJECT public: /**Constructor. */ - TimeStepBox( TQWidget *tqparent=0, const char* name=0, bool daysonly=false ); + TimeStepBox( TQWidget *parent=0, const char* name=0, bool daysonly=false ); /**Destructor. (empty)*/ ~TimeStepBox() {} diff --git a/kstars/kstars/timeunitbox.cpp b/kstars/kstars/timeunitbox.cpp index 49cb9eac..0b89f057 100644 --- a/kstars/kstars/timeunitbox.cpp +++ b/kstars/kstars/timeunitbox.cpp @@ -22,8 +22,8 @@ #include -TimeUnitBox::TimeUnitBox(TQWidget *tqparent, const char *name, bool daysonly ) - : TQVBox( tqparent, name ) { +TimeUnitBox::TimeUnitBox(TQWidget *parent, const char *name, bool daysonly ) + : TQVBox( parent, name ) { UpButton = new TQPushButton( "+", this ); UpButton->setMaximumWidth( 22 ); diff --git a/kstars/kstars/timeunitbox.h b/kstars/kstars/timeunitbox.h index 9926338f..c1755ebd 100644 --- a/kstars/kstars/timeunitbox.h +++ b/kstars/kstars/timeunitbox.h @@ -48,7 +48,7 @@ class TimeUnitBox : public TQVBox { TQ_OBJECT public: /**Constructor*/ - TimeUnitBox(TQWidget *tqparent=0, const char *name=0, bool daysonly = false); + TimeUnitBox(TQWidget *parent=0, const char *name=0, bool daysonly = false); /**Destructor (empty)*/ ~TimeUnitBox(); /**@return the value of UnitStep for the current spinbox value() */ diff --git a/kstars/kstars/toggleaction.cpp b/kstars/kstars/toggleaction.cpp index 5242f896..a0b59a64 100644 --- a/kstars/kstars/toggleaction.cpp +++ b/kstars/kstars/toggleaction.cpp @@ -19,8 +19,8 @@ ToggleAction::ToggleAction(const TQString& ontext, const TQIconSet& onpix, const TQString& offtext, const TQIconSet& offpix, - int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) : - KAction(ontext, onpix, accel, receiver, slot, tqparent, name), + int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) : + KAction(ontext, onpix, accel, receiver, slot, parent, name), officon(offpix), onicon(onpix), offcap(offtext), @@ -29,8 +29,8 @@ ToggleAction::ToggleAction(const TQString& ontext, const TQIconSet& onpix, {} ToggleAction::ToggleAction(const TQString& ontext, const TQString& offtext, - int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) : - KAction(ontext, accel, receiver, slot, tqparent, name), + int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) : + KAction(ontext, accel, receiver, slot, parent, name), officon(), onicon(), offcap(offtext), diff --git a/kstars/kstars/toggleaction.h b/kstars/kstars/toggleaction.h index a2f05a98..fb3e26e4 100644 --- a/kstars/kstars/toggleaction.h +++ b/kstars/kstars/toggleaction.h @@ -35,9 +35,9 @@ class ToggleAction : public KAction { public: /**Constructor. */ - ToggleAction(const TQString& ontext, const TQIconSet& onpix, const TQString& offtext, const TQIconSet& offpix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent = 0, const char* name = 0 ) ; + ToggleAction(const TQString& ontext, const TQIconSet& onpix, const TQString& offtext, const TQIconSet& offpix, int accel, const TQObject* receiver, const char* slot, TQObject* parent = 0, const char* name = 0 ) ; /**Constructor. Same as above, but without icons. */ - ToggleAction(const TQString& ontext, const TQString& offtext, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent = 0, const char* name = 0 ) ; + ToggleAction(const TQString& ontext, const TQString& offtext, int accel, const TQObject* receiver, const char* slot, TQObject* parent = 0, const char* name = 0 ) ; /**Sets the ToolTip text for the "on" state. *@p tip the tooltip string diff --git a/kstars/kstars/tools/altvstime.cpp b/kstars/kstars/tools/altvstime.cpp index 27f94fc4..17766e13 100644 --- a/kstars/kstars/tools/altvstime.cpp +++ b/kstars/kstars/tools/altvstime.cpp @@ -41,10 +41,10 @@ #include "kstarsdatetime.h" #include "libkdeedu/extdate/extdatetimeedit.h" -AltVsTime::AltVsTime( TQWidget* tqparent) : - KDialogBase( KDialogBase::Plain, i18n( "Altitude vs. Time" ), Close, Close, tqparent ) +AltVsTime::AltVsTime( TQWidget* parent) : + KDialogBase( KDialogBase::Plain, i18n( "Altitude vs. Time" ), Close, Close, parent ) { - ks = (KStars*) tqparent; + ks = (KStars*) parent; TQFrame *page = plainPage(); @@ -495,8 +495,8 @@ double AltVsTime::getEpoch (TQString eName) return epoch; } -AVTPlotWidget::AVTPlotWidget( double x1, double x2, double y1, double y2, TQWidget *tqparent, const char* name ) - : KStarsPlotWidget( x1, x2, y1, y2, tqparent, name ) +AVTPlotWidget::AVTPlotWidget( double x1, double x2, double y1, double y2, TQWidget *parent, const char* name ) + : KStarsPlotWidget( x1, x2, y1, y2, parent, name ) { //Default SunRise/SunSet values SunRise = 0.25; diff --git a/kstars/kstars/tools/altvstime.h b/kstars/kstars/tools/altvstime.h index 04b6448b..b53252c3 100644 --- a/kstars/kstars/tools/altvstime.h +++ b/kstars/kstars/tools/altvstime.h @@ -52,7 +52,7 @@ class AVTPlotWidget : public KStarsPlotWidget public: /**Constructor */ - AVTPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, TQWidget *tqparent=0, const char* name=0 ); + AVTPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, TQWidget *parent=0, const char* name=0 ); /**Set the fractional positions of the Sunrise and Sunset positions, *in units where last midnight was 0.0, and next midnight is 1.0. @@ -99,7 +99,7 @@ class AltVsTime : public KDialogBase public: /**Constructor */ - AltVsTime( TQWidget* tqparent = 0); + AltVsTime( TQWidget* parent = 0); /**Destructor */ diff --git a/kstars/kstars/tools/astrocalc.cpp b/kstars/kstars/tools/astrocalc.cpp index 98e9087b..bf477300 100644 --- a/kstars/kstars/tools/astrocalc.cpp +++ b/kstars/kstars/tools/astrocalc.cpp @@ -38,8 +38,8 @@ #include -AstroCalc::AstroCalc( TQWidget* tqparent ) : - KDialogBase( tqparent, "starscalculator", true, i18n("Calculator"), Close ), +AstroCalc::AstroCalc( TQWidget* parent ) : + KDialogBase( parent, "starscalculator", true, i18n("Calculator"), Close ), JDFrame(0), GeodCoordFrame(0), GalFrame(0), SidFrame(0), PrecFrame(0), AppFrame(0), DayFrame(0), AzelFrame(0), PlanetsFrame(0), EquinoxFrame(0), EclFrame(0), AngDistFrame(0) @@ -78,7 +78,7 @@ AstroCalc::AstroCalc( TQWidget* tqparent ) : TQListViewItem * coordItem = new TQListViewItem(navigationPanel,i18n("Celestial Coordinates")); new TQListViewItem(coordItem,i18n("Galactic Coordinates")); new TQListViewItem(coordItem,i18n("Precession")); - new TQListViewItem(coordItem,i18n("Aptqparent Coordinates")); + new TQListViewItem(coordItem,i18n("Apparent Coordinates")); new TQListViewItem(coordItem,i18n("Horizontal Coordinates")); new TQListViewItem(coordItem,i18n("Ecliptic Coordinates")); new TQListViewItem(coordItem,i18n("Angular Distance")); @@ -119,7 +119,7 @@ void AstroCalc::slotItemSelection(TQListViewItem *item) genGalFrame(); if(!(election.compare(i18n("Precession")))) genPrecFrame(); - if(!(election.compare(i18n("Aptqparent Coordinates")))) + if(!(election.compare(i18n("Apparent Coordinates")))) genAppFrame(); if(!(election.compare(i18n("Horizontal Coordinates")))) genAzelFrame(); @@ -190,7 +190,7 @@ void AstroCalc::genCoordText(void) "
  • " "Galactic: Galactic/Equatorial coordinates conversion" "
  • " - "Aptqparent: Computation of current equatorial coordinates" + "Apparent: Computation of current equatorial coordinates" " from a given epoch" "
  • " "Ecliptic: Ecliptic/Equatorial coordinates conversion" @@ -270,7 +270,7 @@ void AstroCalc::delRightPanel(void) delete EclFrame; else if (rightPanel == Precessor) delete PrecFrame; - else if (rightPanel == Aptqparent) + else if (rightPanel == Apparent) delete AppFrame; else if (rightPanel == Azel) delete AzelFrame; @@ -342,8 +342,8 @@ void AstroCalc::genPrecFrame(void) void AstroCalc::genAppFrame(void) { delRightPanel(); - AppFrame = new modCalcApCoord(split,"Aptqparent"); - rightPanel = Aptqparent; + AppFrame = new modCalcApCoord(split,"Apparent"); + rightPanel = Apparent; } void AstroCalc::genAzelFrame(void) diff --git a/kstars/kstars/tools/astrocalc.h b/kstars/kstars/tools/astrocalc.h index c88bd104..fe8b5f49 100644 --- a/kstars/kstars/tools/astrocalc.h +++ b/kstars/kstars/tools/astrocalc.h @@ -60,7 +60,7 @@ Q_OBJECT TQ_OBJECT public: /** construtor */ - AstroCalc(TQWidget *tqparent = 0); + AstroCalc(TQWidget *parent = 0); /** destructor */ ~AstroCalc(); @@ -101,7 +101,7 @@ TQ_OBJECT /**Generate frame for Precession frame. */ void genPrecFrame(void); - /**Generate frame for aptqparent coordinates frame. */ + /**Generate frame for apparent coordinates frame. */ void genAppFrame(void); /**Generate frame for horizontal coordinates frame. */ @@ -137,7 +137,7 @@ TQ_OBJECT TQVBox *vbox, *rightBox; TQString previousElection; - enum typeOfPanel {GenText, TimeText, GeoText, SolarText, CoordText, JD, SidTime, DayLength, Equinox, GeoCoord, Galactic, Precessor, Aptqparent, Azel, Planets, Ecliptic, AngDist, Vlsr}; + enum typeOfPanel {GenText, TimeText, GeoText, SolarText, CoordText, JD, SidTime, DayLength, Equinox, GeoCoord, Galactic, Precessor, Apparent, Azel, Planets, Ecliptic, AngDist, Vlsr}; typeOfPanel rightPanel; modCalcJD *JDFrame; diff --git a/kstars/kstars/tools/jmoontool.cpp b/kstars/kstars/tools/jmoontool.cpp index f4d63cf3..90303b38 100644 --- a/kstars/kstars/tools/jmoontool.cpp +++ b/kstars/kstars/tools/jmoontool.cpp @@ -30,10 +30,10 @@ #include "dms.h" #include "ksnumbers.h" -JMoonTool::JMoonTool(TQWidget *tqparent, const char *name) - : KDialogBase( KDialogBase::Plain, i18n("Jupiter Moons Tool"), Close, Close, tqparent, name ) +JMoonTool::JMoonTool(TQWidget *parent, const char *name) + : KDialogBase( KDialogBase::Plain, i18n("Jupiter Moons Tool"), Close, Close, parent, name ) { - ksw = (KStars*)tqparent; + ksw = (KStars*)parent; TQFrame *page = plainPage(); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 ); diff --git a/kstars/kstars/tools/jmoontool.h b/kstars/kstars/tools/jmoontool.h index 7c0abee4..2b4d04bc 100644 --- a/kstars/kstars/tools/jmoontool.h +++ b/kstars/kstars/tools/jmoontool.h @@ -32,7 +32,7 @@ class JMoonTool : public KDialogBase Q_OBJECT TQ_OBJECT public: - JMoonTool(TQWidget *tqparent = 0, const char *name = 0); + JMoonTool(TQWidget *parent = 0, const char *name = 0); ~JMoonTool(); protected: diff --git a/kstars/kstars/tools/kstarsplotwidget.cpp b/kstars/kstars/tools/kstarsplotwidget.cpp index 03cc4c38..edb62980 100644 --- a/kstars/kstars/tools/kstarsplotwidget.cpp +++ b/kstars/kstars/tools/kstarsplotwidget.cpp @@ -28,8 +28,8 @@ -KStarsPlotWidget::KStarsPlotWidget( double x1, double x2, double y1, double y2, TQWidget *tqparent, const char* name ) - : KPlotWidget( x1, x2, y1, y2, tqparent, name ), +KStarsPlotWidget::KStarsPlotWidget( double x1, double x2, double y1, double y2, TQWidget *parent, const char* name ) + : KPlotWidget( x1, x2, y1, y2, parent, name ), dXtick2(0.0), dYtick2(0.0), nmajX2(0), nminX2(0), nmajY2(0), nminY2(0), XAxisType(DOUBLE), YAxisType(DOUBLE), XAxisType_0(DOUBLE), YAxisType_0(DOUBLE), @@ -283,7 +283,7 @@ void KStarsPlotWidget::updateTickmarks() { void KStarsPlotWidget::drawBox( TQPainter *p ) { int pW = PixRect.width(), pH = PixRect.height(); - //First, fill in padding region with bgColor() to tqmask out-of-bounds plot data + //First, fill in padding region with bgColor() to mask out-of-bounds plot data p->setPen( bgColor() ); p->setBrush( bgColor() ); diff --git a/kstars/kstars/tools/kstarsplotwidget.h b/kstars/kstars/tools/kstarsplotwidget.h index be672454..2108a1e7 100644 --- a/kstars/kstars/tools/kstarsplotwidget.h +++ b/kstars/kstars/tools/kstarsplotwidget.h @@ -42,7 +42,7 @@ class KStarsPlotWidget : public KPlotWidget { public: /**Constructor */ - KStarsPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, TQWidget *tqparent=0, const char* name=0 ); + KStarsPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, TQWidget *parent=0, const char* name=0 ); /**Destructor (empty) */ diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp index 1cc0b8e1..3b5e4524 100644 --- a/kstars/kstars/tools/lcgenerator.cpp +++ b/kstars/kstars/tools/lcgenerator.cpp @@ -39,11 +39,11 @@ #include -LCGenerator::LCGenerator( TQWidget* tqparent) - : KDialogBase( tqparent, "lcgenerator", false, i18n( "AAVSO Light Curve Generator"),0) , Hostprefix("http://www.aavso.org/cgi-bin/kstar.pl"), JDCutOff(2437600) +LCGenerator::LCGenerator( TQWidget* parent) + : KDialogBase( parent, "lcgenerator", false, i18n( "AAVSO Light Curve Generator"),0) , Hostprefix("http://www.aavso.org/cgi-bin/kstar.pl"), JDCutOff(2437600) { - ksw = (KStars*) tqparent; + ksw = (KStars*) parent; createGUI(); downloadJob = 0; @@ -398,7 +398,7 @@ void LCGenerator::DownloadCurve(TQString FinalStartDate, TQString FinalEndDate, KURL url(buf); TQString message = i18n( "Light Curve produced by the American Amateur Variable Star Observers" ); - // tqparent of imageview is KStars + // parent of imageview is KStars new ImageViewer(&url, message, ksw, "lightcurve"); } @@ -471,7 +471,7 @@ downloadJob = 0; void LCGenerator::closeEvent (TQCloseEvent *ev) { if (ev) // not if closeEvent (0) is called, because segfault - ev->accept(); // tqparent-widgets should not get this event, so it will be filtered + ev->accept(); // parent-widgets should not get this event, so it will be filtered //this->~LCGenerator(); // destroy the object, so the object can only allocated with operator new, not as a global/local variable } diff --git a/kstars/kstars/tools/lcgenerator.h b/kstars/kstars/tools/lcgenerator.h index 6d570060..622bfcea 100644 --- a/kstars/kstars/tools/lcgenerator.h +++ b/kstars/kstars/tools/lcgenerator.h @@ -58,9 +58,9 @@ Q_OBJECT public: /**Constructor - *@p tqparent pointer to the tqparent widget + *@p parent pointer to the parent widget */ - LCGenerator( TQWidget* tqparent = 0); + LCGenerator( TQWidget* parent = 0); /**Destructor */ ~LCGenerator(); diff --git a/kstars/kstars/tools/modcalcapcoord.cpp b/kstars/kstars/tools/modcalcapcoord.cpp index 6def95fa..23247d69 100644 --- a/kstars/kstars/tools/modcalcapcoord.cpp +++ b/kstars/kstars/tools/modcalcapcoord.cpp @@ -62,7 +62,7 @@ SkyPoint modCalcApCoord::getEquCoords (void) { void modCalcApCoord::showCurrentTime (void) { - KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); + KStars *ks = (KStars*) parent()->parent()->parent(); KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); datBox->setDate( dt.date() ); diff --git a/kstars/kstars/tools/modcalcapcoorddlg.ui b/kstars/kstars/tools/modcalcapcoorddlg.ui index eb635c5d..9547d585 100644 --- a/kstars/kstars/tools/modcalcapcoorddlg.ui +++ b/kstars/kstars/tools/modcalcapcoorddlg.ui @@ -13,7 +13,7 @@ - Aptqparent Coordinates + Apparent Coordinates StrongFocus @@ -272,7 +272,7 @@ outputBox - Aptqparent Coordinates + Apparent Coordinates diff --git a/kstars/kstars/tools/modcalcazel.cpp b/kstars/kstars/tools/modcalcazel.cpp index a227c577..0943be7e 100644 --- a/kstars/kstars/tools/modcalcazel.cpp +++ b/kstars/kstars/tools/modcalcazel.cpp @@ -79,7 +79,7 @@ SkyPoint modCalcAzel::getHorCoords (void) void modCalcAzel::showCurrentDateTime (void) { - KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); + KStars *ks = (KStars*) parent()->parent()->parent(); KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); @@ -130,7 +130,7 @@ void modCalcAzel::getGeoLocation (void) void modCalcAzel::initGeo(void) { - KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars + KStars *ks = (KStars*) parent()->parent()->parent(); // TQSplitter->AstroCalc->KStars geoPlace = new GeoLocation( ks->geo() ); } @@ -139,7 +139,7 @@ void modCalcAzel::initGeo(void) void modCalcAzel::showLongLat(void) { - KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars + KStars *ks = (KStars*) parent()->parent()->parent(); // TQSplitter->AstroCalc->KStars longBox->show( ks->geo()->lng() ); latBox->show( ks->geo()->lat() ); longBoxBatch->show( ks->geo()->lng() ); diff --git a/kstars/kstars/tools/modcalcazeldlg.ui b/kstars/kstars/tools/modcalcazeldlg.ui index 5ab69991..aee913c2 100644 --- a/kstars/kstars/tools/modcalcazeldlg.ui +++ b/kstars/kstars/tools/modcalcazeldlg.ui @@ -184,7 +184,7 @@ radioApCoords - Aptqparent coordinates + Apparent coordinates true diff --git a/kstars/kstars/tools/modcalcdaylength.cpp b/kstars/kstars/tools/modcalcdaylength.cpp index b4b1ebe9..fa922c1f 100644 --- a/kstars/kstars/tools/modcalcdaylength.cpp +++ b/kstars/kstars/tools/modcalcdaylength.cpp @@ -46,7 +46,7 @@ void modCalcDayLength::showCurrentDate (void) void modCalcDayLength::initGeo(void) { - KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars + KStars *ks = (KStars*) parent()->parent()->parent(); // TQSplitter->AstroCalc->KStars geoPlace = ks->geo(); longBox->show( geoPlace->lng() ); latBox->show( geoPlace->lat() ); @@ -96,7 +96,7 @@ void modCalcDayLength::slotComputePosTime() getGeoLocation(); KSNumbers * num = new KSNumbers(jd0); - KSSun *Sun = new KSSun(((KStars*) tqparent()->tqparent()->tqparent())->data()); + KSSun *Sun = new KSSun(((KStars*) parent()->parent()->parent())->data()); Sun->findPosition(num); TQTime setTQtime = Sun->riseSetTime( jd0 , geoPlace, false ); diff --git a/kstars/kstars/tools/modcalcequinox.cpp b/kstars/kstars/tools/modcalcequinox.cpp index 5978b44e..1948f5a3 100644 --- a/kstars/kstars/tools/modcalcequinox.cpp +++ b/kstars/kstars/tools/modcalcequinox.cpp @@ -64,7 +64,7 @@ void modCalcEquinox::slotComputeEquinoxesAndSolstices (void) { long double julianDay = 0., jdf = 0.; float deltaJd; - KStarsData *kd = (KStarsData*) tqparent()->tqparent()->tqparent(); + KStarsData *kd = (KStarsData*) parent()->parent()->parent(); KSSun *Sun = new KSSun(kd); int year0 = getYear( yearEdit->text() ); @@ -174,7 +174,7 @@ void modCalcEquinox::processLines( TQTextStream &istream ) { int yearB; int i = 0; long double jdsp = 0., jdsu = 0., jdau = 0., jdwin = 0., jdsp1 = 0.; - KStarsData *kd = (KStarsData*) tqparent()->tqparent()->tqparent(); + KStarsData *kd = (KStarsData*) parent()->parent()->parent(); KSSun *Sun = new KSSun(kd); while ( ! istream.eof() ) { diff --git a/kstars/kstars/tools/modcalcgeodcoord.cpp b/kstars/kstars/tools/modcalcgeodcoord.cpp index 10f2aba0..2f750758 100644 --- a/kstars/kstars/tools/modcalcgeodcoord.cpp +++ b/kstars/kstars/tools/modcalcgeodcoord.cpp @@ -58,7 +58,7 @@ modCalcGeodCoord::~modCalcGeodCoord(){ void modCalcGeodCoord::showLongLat(void) { - KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars + KStars *ks = (KStars*) parent()->parent()->parent(); // TQSplitter->AstroCalc->KStars lonGeoBox->show( ks->geo()->lng() ); latGeoBox->show( ks->geo()->lat() ); altGeoBox->setText( TQString("0.0") ); diff --git a/kstars/kstars/tools/modcalcjd.cpp b/kstars/kstars/tools/modcalcjd.cpp index 4f027e86..a679b8b9 100644 --- a/kstars/kstars/tools/modcalcjd.cpp +++ b/kstars/kstars/tools/modcalcjd.cpp @@ -101,7 +101,7 @@ void modCalcJD::slotClearTime (void) void modCalcJD::showCurrentTime (void) { - KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); + KStars *ks = (KStars*) parent()->parent()->parent(); KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); datBox->setDate( dt.date() ); diff --git a/kstars/kstars/tools/modcalcplanets.cpp b/kstars/kstars/tools/modcalcplanets.cpp index 9354f7a0..588810a5 100644 --- a/kstars/kstars/tools/modcalcplanets.cpp +++ b/kstars/kstars/tools/modcalcplanets.cpp @@ -50,7 +50,7 @@ modCalcPlanets::~modCalcPlanets(){ void modCalcPlanets::showCurrentDateTime (void) { - KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars + KStars *ks = (KStars*) parent()->parent()->parent(); // TQSplitter->AstroCalc->KStars KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); dateBox->setDate( dt.date() ); @@ -68,7 +68,7 @@ KStarsDateTime modCalcPlanets::getDateTime (void) void modCalcPlanets::showLongLat(void) { - KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars + KStars *ks = (KStars*) parent()->parent()->parent(); // TQSplitter->AstroCalc->KStars longBox->show( ks->geo()->lng() ); latBox->show( ks->geo()->lat() ); @@ -90,7 +90,7 @@ GeoLocation modCalcPlanets::getObserverPosition (void) void modCalcPlanets::slotComputePosition (void) { - KStarsData *kd = (KStarsData*) tqparent()->tqparent()->tqparent(); + KStarsData *kd = (KStarsData*) parent()->parent()->parent(); KStarsDateTime dt = getDateTime(); long double julianDay = dt.djd(); GeoLocation position( getObserverPosition() ); @@ -366,7 +366,7 @@ void modCalcPlanets::processLines( TQTextStream &istream ) { ExtDate dtB; dms longB, latB, hlongB, hlatB, glongB, glatB, raB, decB, azmB, altB; double rSunB(0.0), rEarthB(0.0); - KStarsData *kd = (KStarsData*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars + KStarsData *kd = (KStarsData*) parent()->parent()->parent(); // TQSplitter->AstroCalc->KStars PlanetCatalog PCat( kd ); PCat.initialize(); diff --git a/kstars/kstars/tools/modcalcsidtime.cpp b/kstars/kstars/tools/modcalcsidtime.cpp index 126fdb7d..0905b45f 100644 --- a/kstars/kstars/tools/modcalcsidtime.cpp +++ b/kstars/kstars/tools/modcalcsidtime.cpp @@ -44,7 +44,7 @@ modCalcSidTime::~modCalcSidTime(void) { void modCalcSidTime::showCurrentTimeAndLong (void) { - KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); + KStars *ks = (KStars*) parent()->parent()->parent(); // modCalcSidTimeDlg -> TQSplitter->AstroCalc->KStars showUT( ks->data()->ut().time() ); diff --git a/kstars/kstars/tools/modcalcvlsr.cpp b/kstars/kstars/tools/modcalcvlsr.cpp index 27acb57b..828eb340 100644 --- a/kstars/kstars/tools/modcalcvlsr.cpp +++ b/kstars/kstars/tools/modcalcvlsr.cpp @@ -141,7 +141,7 @@ void modCalcVlsr::getGeoLocation (void) void modCalcVlsr::showCurrentDateTime (void) { - KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); + KStars *ks = (KStars*) parent()->parent()->parent(); KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); @@ -154,7 +154,7 @@ void modCalcVlsr::showCurrentDateTime (void) // SIRVE para algo? void modCalcVlsr::initGeo(void) { - KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars + KStars *ks = (KStars*) parent()->parent()->parent(); // TQSplitter->AstroCalc->KStars geoPlace = new GeoLocation( ks->geo() ); } @@ -163,7 +163,7 @@ void modCalcVlsr::initGeo(void) void modCalcVlsr::showLongLat(void) { - KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars + KStars *ks = (KStars*) parent()->parent()->parent(); // TQSplitter->AstroCalc->KStars longBox->show( ks->geo()->lng() ); latBox->show( ks->geo()->lat() ); longBoxBatch->show( ks->geo()->lng() ); diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp index 323d5f62..3e73048f 100644 --- a/kstars/kstars/tools/observinglist.cpp +++ b/kstars/kstars/tools/observinglist.cpp @@ -53,9 +53,9 @@ #include "devicemanager.h" #include "indistd.h" -ObservingList::ObservingList( KStars *_ks, TQWidget* tqparent ) +ObservingList::ObservingList( KStars *_ks, TQWidget* parent ) : KDialogBase( KDialogBase::Plain, i18n( "Observing List" ), - Close, Close, tqparent, "observinglist", false ), ks( _ks ), LogObject(0), oCurrent(0), + Close, Close, parent, "observinglist", false ), ks( _ks ), LogObject(0), oCurrent(0), noNameStars(0), isModified(false), bIsLarge(true) { TQFrame *page = plainPage(); diff --git a/kstars/kstars/tools/observinglist.h b/kstars/kstars/tools/observinglist.h index 70671d48..7aa9af64 100644 --- a/kstars/kstars/tools/observinglist.h +++ b/kstars/kstars/tools/observinglist.h @@ -63,7 +63,7 @@ class ObservingList : public KDialogBase public: /**@short Cunstructor */ - ObservingList( KStars *_ks, TQWidget* tqparent = 0 ); + ObservingList( KStars *_ks, TQWidget* parent = 0 ); /**@short Destuctor (empty) */ ~ObservingList() {} diff --git a/kstars/kstars/tools/obslistwizard.cpp b/kstars/kstars/tools/obslistwizard.cpp index 1e65c24d..7fec4a81 100644 --- a/kstars/kstars/tools/obslistwizard.cpp +++ b/kstars/kstars/tools/obslistwizard.cpp @@ -34,10 +34,10 @@ #include "obslistwizard.h" -ObsListWizard::ObsListWizard( TQWidget *tqparent, const char *name ) - : KDialogBase( KDialogBase::Plain, i18n("Observing List Wizard"), Ok|Cancel, Ok, tqparent, name ) +ObsListWizard::ObsListWizard( TQWidget *parent, const char *name ) + : KDialogBase( KDialogBase::Plain, i18n("Observing List Wizard"), Ok|Cancel, Ok, parent, name ) { - ksw = (KStars*)tqparent; + ksw = (KStars*)parent; TQFrame *page = plainPage(); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 ); diff --git a/kstars/kstars/tools/obslistwizard.h b/kstars/kstars/tools/obslistwizard.h index 0551ebfa..cf3675ee 100644 --- a/kstars/kstars/tools/obslistwizard.h +++ b/kstars/kstars/tools/obslistwizard.h @@ -35,7 +35,7 @@ class ObsListWizard : public KDialogBase public: /**@short Constructor */ - ObsListWizard( TQWidget *tqparent = 0, const char *name = 0 ); + ObsListWizard( TQWidget *parent = 0, const char *name = 0 ); /**@short Destructor */ ~ObsListWizard(); diff --git a/kstars/kstars/tools/planetviewer.cpp b/kstars/kstars/tools/planetviewer.cpp index 706ab7df..dc93e672 100644 --- a/kstars/kstars/tools/planetviewer.cpp +++ b/kstars/kstars/tools/planetviewer.cpp @@ -35,8 +35,8 @@ #define AUMAX 48 -PlanetViewer::PlanetViewer(TQWidget *tqparent, const char *name) - : KDialogBase( KDialogBase::Plain, i18n("Solar System Viewer"), Close, Close, tqparent, name ), PCat( ((KStars*)tqparent)->data() ), scale(1.0), isClockRunning(false), tmr(this) +PlanetViewer::PlanetViewer(TQWidget *parent, const char *name) + : KDialogBase( KDialogBase::Plain, i18n("Solar System Viewer"), Close, Close, parent, name ), PCat( ((KStars*)parent)->data() ), scale(1.0), isClockRunning(false), tmr(this) { TQFrame *page = plainPage(); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, spacingHint() ); @@ -49,7 +49,7 @@ PlanetViewer::PlanetViewer(TQWidget *tqparent, const char *name) pw->timeStep->tsbox()->setValue( 1 ); //start with 1-day timestep pw->RunButton->setPixmap( KGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Toolbar ) ); - pw->dateBox->setDate( ((KStars*)tqparent)->data()->lt().date() ); + pw->dateBox->setDate( ((KStars*)parent)->data()->lt().date() ); vlay->addWidget( pw ); resize( 500, 500 ); @@ -68,7 +68,7 @@ PlanetViewer::PlanetViewer(TQWidget *tqparent, const char *name) setCenterPlanet(""); PCat.initialize(); - ut = ((KStars*)tqparent)->data()->ut(); + ut = ((KStars*)parent)->data()->ut(); KSNumbers num( ut.djd() ); PCat.findPosition( &num, 0, 0 ); //NULL args: don't need geocent. coords. @@ -168,7 +168,7 @@ void PlanetViewer::updatePlanets() { } void PlanetViewer::slotToday() { - KStars *ks = (KStars*)tqparent(); + KStars *ks = (KStars*)parent(); pw->dateBox->setDate( ks->data()->lt().date() ); } @@ -236,8 +236,8 @@ PVPlotWidget::PVPlotWidget( double x1, double x2, double y1, double y2, TQWidget pv = (PlanetViewer*)tqtopLevelWidget(); } -PVPlotWidget::PVPlotWidget( TQWidget *tqparent, const char *name ) : - KStarsPlotWidget( 0.0, 1.0, 0.0, 1.0, tqparent, name ), +PVPlotWidget::PVPlotWidget( TQWidget *parent, const char *name ) : + KStarsPlotWidget( 0.0, 1.0, 0.0, 1.0, parent, name ), mouseButtonDown(false), oldx(0), oldy(0) { setFocusPolicy( TQ_StrongFocus ); setMouseTracking (true); diff --git a/kstars/kstars/tools/planetviewer.h b/kstars/kstars/tools/planetviewer.h index 9bffc9ba..9fd053d4 100644 --- a/kstars/kstars/tools/planetviewer.h +++ b/kstars/kstars/tools/planetviewer.h @@ -36,7 +36,7 @@ class PlanetViewer : public KDialogBase Q_OBJECT TQ_OBJECT public: - PlanetViewer(TQWidget *tqparent = 0, const char *name = 0); + PlanetViewer(TQWidget *parent = 0, const char *name = 0); ~PlanetViewer(); TQString centerPlanet() const { return CenterPlanet; } @@ -81,8 +81,8 @@ Q_OBJECT TQ_OBJECT public: PVPlotWidget( double x1, double x2, double y1, double y2, - TQWidget *tqparent=0, const char *name=0 ); - PVPlotWidget( TQWidget *tqparent=0, const char *name=0 ); + TQWidget *parent=0, const char *name=0 ); + PVPlotWidget( TQWidget *parent=0, const char *name=0 ); ~PVPlotWidget(); public slots: diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp index 18736f98..cedd739d 100644 --- a/kstars/kstars/tools/scriptbuilder.cpp +++ b/kstars/kstars/tools/scriptbuilder.cpp @@ -100,14 +100,14 @@ #include "timestepbox.h" #include "libkdeedu/extdate/extdatewidget.h" -ScriptBuilder::ScriptBuilder( TQWidget *tqparent, const char *name ) - : KDialogBase( KDialogBase::Plain, i18n( "Script Builder" ), Close, Close, tqparent, name ), +ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name ) + : KDialogBase( KDialogBase::Plain, i18n( "Script Builder" ), Close, Close, parent, name ), UnsavedChanges(false), currentFileURL(), currentDir( TQDir::homeDirPath() ), currentScriptName(), currentAuthor() { TQFrame *page = plainPage(); - ks = (KStars*)tqparent; + ks = (KStars*)parent; TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 ); sb = new ScriptBuilderUI( page ); vlay->addWidget( sb ); @@ -803,7 +803,7 @@ void ScriptBuilder::slotSave() { //Warn user if file exists if (TQFile::exists(currentFileURL.path())) { - int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(tqparent()), + int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), i18n( "A file named \"%1\" already exists. " "Overwrite it?" ).tqarg(currentFileURL.fileName()), i18n( "Overwrite File?" ), @@ -935,7 +935,7 @@ void ScriptBuilder::writeScript( TQTextStream &ostream ) { ostream << mainpre << sf->scriptLine() << endl; if (sb->AppendINDIWait->isChecked() && !sf->INDIProperty().isEmpty()) { - // Special case for telescope action, we need to know the tqparent property + // Special case for telescope action, we need to know the parent property if (sf->INDIProperty() == "CHECK") { if (sf->argVal(1) == "SLEW" || sf->argVal(1) == "TRACK" || sf->argVal(1) == "SYNC") diff --git a/kstars/kstars/tools/scriptbuilder.h b/kstars/kstars/tools/scriptbuilder.h index 888028bd..034d0bcc 100644 --- a/kstars/kstars/tools/scriptbuilder.h +++ b/kstars/kstars/tools/scriptbuilder.h @@ -70,7 +70,7 @@ class ScriptBuilder : public KDialogBase Q_OBJECT TQ_OBJECT public: - ScriptBuilder( TQWidget *tqparent, const char *name=0 ); + ScriptBuilder( TQWidget *parent, const char *name=0 ); ~ScriptBuilder(); bool unsavedChanges() const { return UnsavedChanges; } @@ -169,7 +169,7 @@ private: ScriptBuilderUI *sb; - KStars *ks; //tqparent needed for sub-dialogs + KStars *ks; //parent needed for sub-dialogs TQPtrList KStarsFunctionList; TQPtrList INDIFunctionList; TQPtrList ScriptList; -- cgit v1.2.1