From a374efce3a207b39514be3c52264091400ce297e Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 04:44:41 +0000 Subject: TQt4 port kdeedu This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kstars/ChangeLog | 2 +- kstars/README.i18n | 2 +- kstars/README.timekeeping | 2 +- kstars/TODO | 2 +- kstars/configure.in.in | 15 ++ kstars/kstars/Options.kcfgc | 2 +- kstars/kstars/addcatdialog.cpp | 20 +- kstars/kstars/addcatdialog.h | 3 +- kstars/kstars/addcatdialogui.ui | 52 ++--- kstars/kstars/addlinkdialog.cpp | 4 +- kstars/kstars/addlinkdialog.h | 3 +- kstars/kstars/addlinkdialogui.ui | 30 +-- kstars/kstars/ccdpreviewui.ui | 74 +++--- kstars/kstars/ccdpreviewwg.cpp | 26 +-- kstars/kstars/ccdpreviewwg.h | 14 +- kstars/kstars/colorscheme.cpp | 22 +- kstars/kstars/colorscheme.h | 2 +- kstars/kstars/conbridlg.cpp | 8 +- kstars/kstars/conbridlg.h | 5 +- kstars/kstars/contrastbrightnessgui.ui | 14 +- kstars/kstars/data/Cities.dat | 2 +- kstars/kstars/data/info_url.dat | 2 +- kstars/kstars/data/tips | 6 +- kstars/kstars/deepskyobject.cpp | 2 +- kstars/kstars/deepskyobject.h | 4 +- kstars/kstars/detaildialog.cpp | 112 +++++----- kstars/kstars/detaildialog.h | 15 +- kstars/kstars/details_data.ui | 78 +++---- kstars/kstars/details_database.ui | 6 +- kstars/kstars/details_links.ui | 26 +-- kstars/kstars/details_log.ui | 8 +- kstars/kstars/details_position.ui | 118 +++++----- kstars/kstars/devicemanager.cpp | 26 +-- kstars/kstars/devicemanager.h | 11 +- kstars/kstars/devmanager.ui | 54 ++--- kstars/kstars/dms.cpp | 22 +- kstars/kstars/dms.h | 2 +- kstars/kstars/dmsbox.cpp | 4 +- kstars/kstars/dmsbox.h | 7 +- kstars/kstars/draglistbox.cpp | 6 +- kstars/kstars/draglistbox.h | 7 +- kstars/kstars/filesource.cpp | 2 +- kstars/kstars/filesource.h | 2 +- kstars/kstars/finddialog.cpp | 24 +- kstars/kstars/finddialog.h | 9 +- kstars/kstars/fitsheaderdialog.ui | 10 +- kstars/kstars/fitshistogram.cpp | 24 +- kstars/kstars/fitshistogram.h | 5 +- kstars/kstars/fitsimage.cpp | 22 +- kstars/kstars/fitsimage.h | 12 +- kstars/kstars/fitsprocess.cpp | 8 +- kstars/kstars/fitsprocess.h | 4 +- kstars/kstars/fitsviewer.cpp | 92 ++++---- kstars/kstars/fitsviewer.h | 5 +- kstars/kstars/focusdialog.cpp | 12 +- kstars/kstars/focusdialog.h | 5 +- kstars/kstars/focusdialogdlg.ui | 32 +-- kstars/kstars/fov.cpp | 8 +- kstars/kstars/fov.h | 6 +- kstars/kstars/fovdialog.cpp | 30 +-- kstars/kstars/fovdialog.h | 6 +- kstars/kstars/fovdialogui.ui | 26 +-- kstars/kstars/geolocation.h | 2 +- kstars/kstars/histdialog.ui | 58 ++--- kstars/kstars/imagereductiondlg.cpp | 8 +- kstars/kstars/imagereductiondlg.h | 3 +- kstars/kstars/imagereductionui.ui | 104 ++++----- kstars/kstars/imagesequence.cpp | 40 ++-- kstars/kstars/imagesequence.h | 5 +- kstars/kstars/imageviewer.cpp | 18 +- kstars/kstars/imageviewer.h | 5 +- kstars/kstars/imgsequencedlgui.ui | 92 ++++---- kstars/kstars/indi/LICENSE | 4 +- kstars/kstars/indi/Makefile.am | 17 ++ kstars/kstars/indi/apmount.cpp | 9 +- kstars/kstars/indi/apogee/ApnCamera.cpp | 82 +++---- kstars/kstars/indi/apogee/ApnCamera.h | 10 +- kstars/kstars/indi/apogee/ApnCamera_Linux.cpp | 4 +- kstars/kstars/indi/apogee/ApnCamera_NET.cpp | 2 +- kstars/kstars/indi/apogee/ApnCamera_USB.cpp | 4 +- kstars/kstars/indi/apogee/Apogee.h | 8 +- kstars/kstars/indi/apogee/CameraIO_Linux.cpp | 86 +++---- kstars/kstars/indi/apogee/CameraIO_Linux.h | 32 +-- kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp | 8 +- kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp | 8 +- kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp | 8 +- kstars/kstars/indi/apogee/CameraIO_PCI.cpp | 6 +- kstars/kstars/indi/apogee/Camera_Example.cpp | 22 +- kstars/kstars/indi/apogee/Makefile.am | 4 +- kstars/kstars/indi/apogee_ppi.cpp | 38 ++-- kstars/kstars/indi/base64.c | 2 +- kstars/kstars/indi/celestrongps.cpp | 10 +- kstars/kstars/indi/fitsrw.c | 14 +- kstars/kstars/indi/fli/libfli.c | 12 +- kstars/kstars/indi/fli/libfli.h | 2 +- kstars/kstars/indi/fli_ccd.c | 10 +- kstars/kstars/indi/indiapi.h | 10 +- kstars/kstars/indi/indicom.c | 4 +- kstars/kstars/indi/indicom.h | 4 +- kstars/kstars/indi/indiserver.c | 4 +- kstars/kstars/indi/lilxml.c | 14 +- kstars/kstars/indi/lilxml.h | 16 +- kstars/kstars/indi/lx200_16.cpp | 4 +- kstars/kstars/indi/lx200autostar.cpp | 2 +- kstars/kstars/indi/lx200basic.cpp | 2 +- kstars/kstars/indi/lx200classic.cpp | 2 +- kstars/kstars/indi/lx200driver.c | 16 +- kstars/kstars/indi/lx200driver.h | 6 +- kstars/kstars/indi/lx200generic.cpp | 17 +- kstars/kstars/indi/lx200gps.cpp | 8 +- kstars/kstars/indi/sbigccd.cpp | 8 +- kstars/kstars/indi/skycommander.c | 2 +- kstars/kstars/indi/temmadriver.h | 4 +- kstars/kstars/indi/v4lphilips.cpp | 6 +- kstars/kstars/indi/webcam/Makefile.am | 3 + kstars/kstars/indi/webcam/ccvt_c2.c | 2 +- kstars/kstars/indi/webcam/port.cpp | 6 +- kstars/kstars/indi/webcam/port.h | 8 +- kstars/kstars/indi/webcam/pwc-ioctl.h | 6 +- kstars/kstars/indi/webcam/v4l1_pwc.cpp | 4 +- kstars/kstars/indi/webcam/v4l1_pwc.h | 2 +- kstars/kstars/indi/webcam/v4l2_base.cpp | 62 ++--- kstars/kstars/indi/webcam/videodev.h | 4 +- kstars/kstars/indi/webcam/videodev2.h | 24 +- kstars/kstars/indiconf.ui | 66 +++--- kstars/kstars/indidevice.cpp | 34 +-- kstars/kstars/indidevice.h | 13 +- kstars/kstars/indidriver.cpp | 56 ++--- kstars/kstars/indidriver.h | 10 +- kstars/kstars/indielement.cpp | 30 +-- kstars/kstars/indielement.h | 17 +- kstars/kstars/indifitsconf.cpp | 4 +- kstars/kstars/indifitsconf.h | 3 +- kstars/kstars/indigroup.cpp | 10 +- kstars/kstars/indigroup.h | 6 +- kstars/kstars/indihostconf.ui | 40 ++-- kstars/kstars/indimenu.cpp | 14 +- kstars/kstars/indimenu.h | 13 +- kstars/kstars/indiproperty.cpp | 50 ++--- kstars/kstars/indiproperty.h | 19 +- kstars/kstars/indistd.cpp | 88 ++++---- kstars/kstars/indistd.h | 12 +- kstars/kstars/infobox.cpp | 6 +- kstars/kstars/infobox.h | 9 +- kstars/kstars/infoboxes.cpp | 26 +-- kstars/kstars/infoboxes.h | 3 +- kstars/kstars/kscomet.cpp | 4 +- kstars/kstars/ksfilereader.h | 1 + kstars/kstars/ksnewstuff.cpp | 18 +- kstars/kstars/ksnewstuff.h | 8 +- kstars/kstars/ksplanet.h | 4 +- kstars/kstars/ksplanetbase.cpp | 2 +- kstars/kstars/ksplanetbase.h | 8 +- kstars/kstars/kspopupmenu.cpp | 32 +-- kstars/kstars/kspopupmenu.h | 3 +- kstars/kstars/kssun.cpp | 2 +- kstars/kstars/kstars.cpp | 6 +- kstars/kstars/kstars.h | 7 +- kstars/kstars/kstarsactions.cpp | 94 ++++---- kstars/kstars/kstarsdata.cpp | 156 ++++++------- kstars/kstars/kstarsdata.h | 13 +- kstars/kstars/kstarsdatetime.cpp | 8 +- kstars/kstars/kstarsdatetime.h | 2 +- kstars/kstars/kstarsdcop.cpp | 66 +++--- kstars/kstars/kstarsinit.cpp | 118 +++++----- kstars/kstars/kstarssplash.cpp | 26 +-- kstars/kstars/kstarssplash.h | 7 +- kstars/kstars/kswizard.cpp | 6 +- kstars/kstars/kswizard.h | 5 +- kstars/kstars/kswizardui.ui | 168 +++++++------- kstars/kstars/locationdialog.cpp | 42 ++-- kstars/kstars/locationdialog.h | 11 +- kstars/kstars/magnitudespinbox.cpp | 8 +- kstars/kstars/magnitudespinbox.h | 6 +- kstars/kstars/main.cpp | 28 +-- kstars/kstars/mapcanvas.cpp | 12 +- kstars/kstars/mapcanvas.h | 11 +- kstars/kstars/newfovui.ui | 174 +++++++------- kstars/kstars/objectnamelist.cpp | 4 +- kstars/kstars/objectnamelist.h | 10 +- kstars/kstars/opsadvanced.h | 3 +- kstars/kstars/opsadvancedui.ui | 72 +++--- kstars/kstars/opscatalog.cpp | 8 +- kstars/kstars/opscatalog.h | 3 +- kstars/kstars/opscatalogui.ui | 86 +++---- kstars/kstars/opscolors.cpp | 20 +- kstars/kstars/opscolors.h | 3 +- kstars/kstars/opscolorsui.ui | 40 ++-- kstars/kstars/opsguides.cpp | 4 +- kstars/kstars/opsguides.h | 3 +- kstars/kstars/opsguidesui.ui | 40 ++-- kstars/kstars/opssolarsystem.cpp | 8 +- kstars/kstars/opssolarsystem.h | 3 +- kstars/kstars/opssolarsystemui.ui | 72 +++--- kstars/kstars/planetcatalog.cpp | 2 +- kstars/kstars/planetcatalog.h | 3 +- kstars/kstars/simclock.cpp | 10 +- kstars/kstars/simclock.h | 5 +- kstars/kstars/skymap.cpp | 46 ++-- kstars/kstars/skymap.h | 35 +-- kstars/kstars/skymapdraw.cpp | 18 +- kstars/kstars/skymapevents.cpp | 26 +-- kstars/kstars/skyobject.cpp | 30 +-- kstars/kstars/skyobject.h | 2 +- kstars/kstars/skyobjectname.cpp | 4 +- kstars/kstars/skyobjectname.h | 4 +- kstars/kstars/skypoint.cpp | 22 +- kstars/kstars/skypoint.h | 6 +- kstars/kstars/stardatasink.cpp | 4 +- kstars/kstars/stardatasink.h | 5 +- kstars/kstars/starobject.cpp | 2 +- kstars/kstars/starobject.h | 2 +- kstars/kstars/starpixmap.cpp | 18 +- kstars/kstars/statform.ui | 24 +- kstars/kstars/streamformui.ui | 22 +- kstars/kstars/streamwg.cpp | 18 +- kstars/kstars/streamwg.h | 14 +- kstars/kstars/telescopeprop.cpp | 12 +- kstars/kstars/telescopeprop.h | 3 +- kstars/kstars/telescopepropui.ui | 48 ++-- kstars/kstars/telescopewizard.ui | 134 +++++------ kstars/kstars/telescopewizardprocess.cpp | 32 +-- kstars/kstars/telescopewizardprocess.h | 3 +- kstars/kstars/thumbnaileditor.cpp | 12 +- kstars/kstars/thumbnaileditor.h | 8 +- kstars/kstars/thumbnaileditorui.ui | 14 +- kstars/kstars/thumbnailpicker.cpp | 22 +- kstars/kstars/thumbnailpicker.h | 3 +- kstars/kstars/thumbnailpickerui.ui | 60 ++--- kstars/kstars/timebox.cpp | 22 +- kstars/kstars/timebox.h | 6 +- kstars/kstars/timedialog.cpp | 10 +- kstars/kstars/timedialog.h | 9 +- kstars/kstars/timespinbox.cpp | 4 +- kstars/kstars/timespinbox.h | 7 +- kstars/kstars/timestepbox.cpp | 4 +- kstars/kstars/timestepbox.h | 3 +- kstars/kstars/timeunitbox.cpp | 4 +- kstars/kstars/timeunitbox.h | 3 +- kstars/kstars/timezonerule.cpp | 8 +- kstars/kstars/timezonerule.h | 4 +- kstars/kstars/toggleaction.cpp | 8 +- kstars/kstars/toggleaction.h | 5 +- kstars/kstars/tools/altvstime.cpp | 38 ++-- kstars/kstars/tools/altvstime.h | 6 +- kstars/kstars/tools/altvstimeui.ui | 64 +++--- kstars/kstars/tools/argchangeviewoption.ui | 20 +- kstars/kstars/tools/argexportimage.ui | 52 ++--- kstars/kstars/tools/argloadcolorscheme.ui | 6 +- kstars/kstars/tools/arglooktoward.ui | 18 +- kstars/kstars/tools/argprintimage.ui | 12 +- kstars/kstars/tools/argsetactionindi.ui | 26 +-- kstars/kstars/tools/argsetaltaz.ui | 18 +- kstars/kstars/tools/argsetccdtempindi.ui | 26 +-- kstars/kstars/tools/argsetcolor.ui | 44 ++-- kstars/kstars/tools/argsetfilternumindi.ui | 26 +-- kstars/kstars/tools/argsetfocusspeedindi.ui | 14 +- kstars/kstars/tools/argsetfocustimeoutindi.ui | 26 +-- kstars/kstars/tools/argsetframetypeindi.ui | 28 +-- kstars/kstars/tools/argsetgeolocation.ui | 38 ++-- kstars/kstars/tools/argsetgeolocationindi.ui | 26 +-- kstars/kstars/tools/argsetlocaltime.ui | 16 +- kstars/kstars/tools/argsetportindi.ui | 16 +- kstars/kstars/tools/argsetradec.ui | 16 +- kstars/kstars/tools/argsetscopeactionindi.ui | 28 +-- kstars/kstars/tools/argsettargetcoordindi.ui | 26 +-- kstars/kstars/tools/argsettargetnameindi.ui | 30 +-- kstars/kstars/tools/argsettrack.ui | 16 +- kstars/kstars/tools/argsetutcindi.ui | 26 +-- kstars/kstars/tools/argshutdownindi.ui | 18 +- kstars/kstars/tools/argstartexposureindi.ui | 26 +-- kstars/kstars/tools/argstartfocusindi.ui | 28 +-- kstars/kstars/tools/argstartindi.ui | 26 +-- kstars/kstars/tools/argswitchindi.ui | 26 +-- kstars/kstars/tools/argtimescale.ui | 14 +- kstars/kstars/tools/argwaitfor.ui | 18 +- kstars/kstars/tools/argwaitforkey.ui | 16 +- kstars/kstars/tools/argzoom.ui | 16 +- kstars/kstars/tools/astrocalc.cpp | 28 +-- kstars/kstars/tools/astrocalc.h | 12 +- kstars/kstars/tools/jmoontool.cpp | 22 +- kstars/kstars/tools/jmoontool.h | 3 +- kstars/kstars/tools/kstarsplotwidget.cpp | 64 +++--- kstars/kstars/tools/kstarsplotwidget.h | 3 +- kstars/kstars/tools/lcgenerator.cpp | 26 +-- kstars/kstars/tools/lcgenerator.h | 5 +- kstars/kstars/tools/modcalcangdist.cpp | 6 +- kstars/kstars/tools/modcalcangdist.h | 1 + kstars/kstars/tools/modcalcangdistdlg.ui | 98 ++++---- kstars/kstars/tools/modcalcapcoord.cpp | 18 +- kstars/kstars/tools/modcalcapcoord.h | 3 +- kstars/kstars/tools/modcalcapcoorddlg.ui | 124 +++++----- kstars/kstars/tools/modcalcazel.cpp | 22 +- kstars/kstars/tools/modcalcazel.h | 1 + kstars/kstars/tools/modcalcazeldlg.ui | 160 ++++++------- kstars/kstars/tools/modcalcdaylength.cpp | 38 ++-- kstars/kstars/tools/modcalcdaylength.h | 3 +- kstars/kstars/tools/modcalcdaylengthdlg.ui | 88 ++++---- kstars/kstars/tools/modcalceclipticcoords.cpp | 6 +- kstars/kstars/tools/modcalceclipticcoords.h | 3 +- kstars/kstars/tools/modcalceclipticcoordsdlg.ui | 120 +++++----- kstars/kstars/tools/modcalcequinox.cpp | 18 +- kstars/kstars/tools/modcalcequinox.h | 5 +- kstars/kstars/tools/modcalcequinoxdlg.ui | 78 +++---- kstars/kstars/tools/modcalcgalcoord.cpp | 6 +- kstars/kstars/tools/modcalcgalcoord.h | 3 +- kstars/kstars/tools/modcalcgalcoorddlg.ui | 118 +++++----- kstars/kstars/tools/modcalcgeodcoord.cpp | 8 +- kstars/kstars/tools/modcalcgeodcoord.h | 3 +- kstars/kstars/tools/modcalcgeoddlg.ui | 108 ++++----- kstars/kstars/tools/modcalcjd.cpp | 10 +- kstars/kstars/tools/modcalcjd.h | 3 +- kstars/kstars/tools/modcalcjddlg.ui | 78 +++---- kstars/kstars/tools/modcalcplanets.cpp | 28 +-- kstars/kstars/tools/modcalcplanets.h | 1 + kstars/kstars/tools/modcalcplanetsdlg.ui | 212 +++++++++--------- kstars/kstars/tools/modcalcprec.cpp | 10 +- kstars/kstars/tools/modcalcprec.h | 1 + kstars/kstars/tools/modcalcprecdlg.ui | 98 ++++---- kstars/kstars/tools/modcalcsidtime.cpp | 14 +- kstars/kstars/tools/modcalcsidtime.h | 1 + kstars/kstars/tools/modcalcsidtimedlg.ui | 130 +++++------ kstars/kstars/tools/modcalcvlsr.cpp | 18 +- kstars/kstars/tools/modcalcvlsr.h | 1 + kstars/kstars/tools/modcalcvlsrdlg.ui | 188 ++++++++-------- kstars/kstars/tools/observinglist.cpp | 48 ++-- kstars/kstars/tools/observinglist.h | 5 +- kstars/kstars/tools/observinglistui.ui | 54 ++--- kstars/kstars/tools/obslistwizard.cpp | 78 +++---- kstars/kstars/tools/obslistwizard.h | 3 +- kstars/kstars/tools/obslistwizardui.ui | 142 ++++++------ kstars/kstars/tools/optionstreeview.ui | 16 +- kstars/kstars/tools/planetviewer.cpp | 24 +- kstars/kstars/tools/planetviewer.h | 8 +- kstars/kstars/tools/planetviewerui.ui | 14 +- kstars/kstars/tools/scriptbuilder.cpp | 286 ++++++++++++------------ kstars/kstars/tools/scriptbuilder.h | 5 +- kstars/kstars/tools/scriptbuilderui.ui | 96 ++++---- kstars/kstars/tools/scriptfunction.cpp | 74 +++--- kstars/kstars/tools/scriptnamedialog.ui | 24 +- kstars/kstars/tools/wutdialog.cpp | 30 +-- kstars/kstars/tools/wutdialog.h | 1 + kstars/kstars/tools/wutdialogui.ui | 98 ++++---- 343 files changed, 4429 insertions(+), 4306 deletions(-) (limited to 'kstars') diff --git a/kstars/ChangeLog b/kstars/ChangeLog index 5c2b696a..fe69e108 100644 --- a/kstars/ChangeLog +++ b/kstars/ChangeLog @@ -259,7 +259,7 @@ Added Milky Way countour. Added spectral type of stars to popup menu. Automated object tracking when an object is centered. Display name and coordinates of centered object in the infoPanel. -Fixed "extra layout" error messages. +Fixed "extra tqlayout" error messages. Improved efficiency of KSPlanet::findPosition(). Initial startup parameters make more sense. If focus point is below horizon when KStars restarts, a warning message diff --git a/kstars/README.i18n b/kstars/README.i18n index 6953afba..4ee54256 100644 --- a/kstars/README.i18n +++ b/kstars/README.i18n @@ -48,7 +48,7 @@ this document to answer some questions you might have. figure out the file format; briefly, it's a colon-delimited line with fields: object name, link text, link URL - Note that your alternate info_url.dat file will completely replace + Note that your alternate info_url.dat file will completely tqreplace the default, so if you want to include some links from the original, you will need to copy them over. Some of the sites we link to provide versions of their pages in other languages (e.g., seds.org). So diff --git a/kstars/README.timekeeping b/kstars/README.timekeeping index 412c371a..753fadc0 100644 --- a/kstars/README.timekeeping +++ b/kstars/README.timekeeping @@ -96,7 +96,7 @@ time has passed since the last update. For example, the LastNumUpdate variable stores the julian day of the last time object coordinates were updated for precession/nutation/aberration. This needs to happen once per simulation day, so whenever (CurrentDate-LastNumUpdate) exceeds 1.0, -it signals the update (by setting needNewCoords=true) and resets +it Q_SIGNALS the update (by setting needNewCoords=true) and resets LastNumUpdate to CurrentDate. Similarly, we use LastPlanetUpdate to update planet coordinates 100 times per day. LastSkyUpdate monitors the last time the horizontal coordinates were updated (the update diff --git a/kstars/TODO b/kstars/TODO index fa6e56ab..4d949331 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 parent deselected: +- OpsDialog: child widgets should disable when tqparent deselected: Stars, Asteroids, Comets, CNames, MW, Hide obj. - OpsDialog: Remove All Trails button does nothing diff --git a/kstars/configure.in.in b/kstars/configure.in.in index 5bc872a4..19f17c3b 100644 --- a/kstars/configure.in.in +++ b/kstars/configure.in.in @@ -42,6 +42,17 @@ AC_ARG_ENABLE(libusb, dnl check if libusb is available if test "${use_libusb}" != false ; then + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + ac_save_CXXFLAGS="$CXXFLAGS" + ac_save_LDFLAGS="$LDFLAGS" + if test -z "$qt_includes"; then + CXXFLAGS="$CXXFLAGS" + else + CXXFLAGS="$CXXFLAGS -I$qt_includes" + fi + LDFLAGS="$LDFLAGS -ltqt" + AC_SUBST(LIBUSB) AC_CHECK_HEADERS(usb.h, [have_libusb="yes"], [ AC_MSG_WARN([usb.h not found, use --enable-libusb=PATH. Otherwise, INDI will compile without Apogee USB support.]) ]) @@ -52,6 +63,10 @@ if test "${use_libusb}" != false ; then [ AC_MSG_WARN([libusb not found. INDI will compile without Apogee USB support.]) ]) LIBS="$ac_save_LIBS" + CXXFLAGS="$ac_save_CXXFLAGS" + LDFLAGS="$ac_save_LDFLAGS" + AC_LANG_RESTORE + fi dnl check if v4l2 is available diff --git a/kstars/kstars/Options.kcfgc b/kstars/kstars/Options.kcfgc index e82fba2f..bb476ff4 100644 --- a/kstars/kstars/Options.kcfgc +++ b/kstars/kstars/Options.kcfgc @@ -1,5 +1,5 @@ File=kstars.kcfg -IncludeFiles=qpoint.h +IncludeFiles=tqpoint.h ClassName=Options Singleton=yes Mutators=true diff --git a/kstars/kstars/addcatdialog.cpp b/kstars/kstars/addcatdialog.cpp index 07af36ff..5264faa8 100644 --- a/kstars/kstars/addcatdialog.cpp +++ b/kstars/kstars/addcatdialog.cpp @@ -30,8 +30,8 @@ #include "addcatdialog.h" -AddCatDialog::AddCatDialog( TQWidget *parent ) - : KDialogBase( KDialogBase::Plain, i18n( "Import Catalog" ), Help|Ok|Cancel, Ok, parent ) { +AddCatDialog::AddCatDialog( TQWidget *tqparent ) + : KDialogBase( KDialogBase::Plain, i18n( "Import Catalog" ), Help|Ok|Cancel, Ok, tqparent ) { 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*) topLevelWidget()->parent(); + KStars *ksw = (KStars*) tqtopLevelWidget()->tqparent(); //Create the catalog file contents: first the header CatalogContents = writeCatalogHeader(); @@ -145,10 +145,10 @@ TQString AddCatDialog::writeCatalogHeader() { TQString name = ( acd->CatalogName->text().isEmpty() ? i18n("Custom") : acd->CatalogName->text() ); TQString pre = ( acd->Prefix->text().isEmpty() ? "CC" : acd->Prefix->text() ); - TQString h = TQString("# Name: %1\n").arg( name ); - h += TQString("# Prefix: %1\n").arg( pre ); - h += TQString("# Color: %1\n").arg( acd->ColorButton->color().name() ); - h += TQString("# Epoch: %1\n").arg( acd->Epoch->value() ); + TQString h = TQString("# Name: %1\n").tqarg( name ); + h += TQString("# Prefix: %1\n").tqarg( pre ); + h += TQString("# Color: %1\n").tqarg( acd->ColorButton->color().name() ); + h += TQString("# Epoch: %1\n").tqarg( acd->Epoch->value() ); h += TQString("# "); for ( uint i=0; i < acd->FieldList->count(); ++i ) { @@ -194,7 +194,7 @@ void AddCatDialog::slotShowDataFile() { void AddCatDialog::slotPreviewCatalog() { if ( validateDataFile() ) { - KMessageBox::informationList( 0, i18n( "Preview of %1" ).arg( acd->CatalogName->text() ), + KMessageBox::informationList( 0, i18n( "Preview of %1" ).tqarg( acd->CatalogName->text() ), TQStringList::split( "\n", CatalogContents ), i18n( "Catalog Preview" ) ); } } @@ -210,7 +210,7 @@ void AddCatDialog::slotCreateCatalog() { KURL u( acd->CatalogURL->url() ); int r=KMessageBox::warningContinueCancel( 0, i18n( "A file named \"%1\" already exists. " - "Overwrite it?" ).arg( u.fileName() ), + "Overwrite it?" ).tqarg( u.fileName() ), i18n( "Overwrite File?" ), i18n( "&Overwrite" ) ); @@ -220,7 +220,7 @@ void AddCatDialog::slotCreateCatalog() { TQFile OutFile( acd->CatalogURL->url() ); if ( ! OutFile.open( IO_WriteOnly ) ) { KMessageBox::sorry( 0, - i18n( "Could not open the file %1 for writing." ).arg( acd->CatalogURL->url() ), + i18n( "Could not open the file %1 for writing." ).tqarg( acd->CatalogURL->url() ), i18n( "Error Opening Output File" ) ); } else { TQTextStream outStream( &OutFile ); diff --git a/kstars/kstars/addcatdialog.h b/kstars/kstars/addcatdialog.h index be839181..93e18c84 100644 --- a/kstars/kstars/addcatdialog.h +++ b/kstars/kstars/addcatdialog.h @@ -36,10 +36,11 @@ class AddCatDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /**Default constructor */ - AddCatDialog( TQWidget *parent=0 ); + AddCatDialog( TQWidget *tqparent=0 ); /**Destructor (empty) */ diff --git a/kstars/kstars/addcatdialogui.ui b/kstars/kstars/addcatdialogui.ui index 39488947..1e25a747 100644 --- a/kstars/kstars/addcatdialogui.ui +++ b/kstars/kstars/addcatdialogui.ui @@ -1,10 +1,10 @@ AddCatDialogUI - + AddCatDialogUI - + 0 0 @@ -19,7 +19,7 @@ unnamed - + groupBox4 @@ -62,7 +62,7 @@ - + groupBox1 @@ -73,15 +73,15 @@ unnamed - + - layout7 + tqlayout7 unnamed - + textLabel1_3 @@ -107,15 +107,15 @@ - + - layout8 + tqlayout8 unnamed - + textLabel1_3_2 @@ -143,9 +143,9 @@ - + - layout27 + tqlayout27 @@ -167,7 +167,7 @@ The coordinate epoch for the catalog - + textLabel4 @@ -175,15 +175,15 @@ Catalog name prefix: - + - layout13 + tqlayout13 unnamed - + textLabel1_4 @@ -208,7 +208,7 @@ - + textLabel3 @@ -216,9 +216,9 @@ Coordinate epoch: - + - layout12 + tqlayout12 @@ -234,7 +234,7 @@ Expanding - + 40 20 @@ -256,9 +256,9 @@ - + - layout4 + tqlayout4 @@ -272,7 +272,7 @@ Enter the filename for the output catalog file - + textLabel1_2 @@ -280,7 +280,7 @@ Catalog name: - + textLabel1 @@ -308,7 +308,7 @@ Expanding - + 20 16 @@ -350,7 +350,7 @@ CatalogName CatalogURL - + kurlrequester.h klineedit.h diff --git a/kstars/kstars/addlinkdialog.cpp b/kstars/kstars/addlinkdialog.cpp index a5f5978e..1c6aa548 100644 --- a/kstars/kstars/addlinkdialog.cpp +++ b/kstars/kstars/addlinkdialog.cpp @@ -25,8 +25,8 @@ #include "addlinkdialog.h" #include "skyobject.h" -AddLinkDialog::AddLinkDialog( TQWidget *parent, const TQString &oname ) - : KDialogBase( KDialogBase::Plain, i18n( "Add Custom URL to %1" ).arg( oname ), Ok|Cancel, Ok, parent ), ObjectName( oname ) { +AddLinkDialog::AddLinkDialog( TQWidget *tqparent, const TQString &oname ) + : KDialogBase( KDialogBase::Plain, i18n( "Add Custom URL to %1" ).tqarg( oname ), Ok|Cancel, Ok, tqparent ), ObjectName( oname ) { TQFrame *page = plainPage(); setMainWidget(page); diff --git a/kstars/kstars/addlinkdialog.h b/kstars/kstars/addlinkdialog.h index 87dfa14e..b99de203 100644 --- a/kstars/kstars/addlinkdialog.h +++ b/kstars/kstars/addlinkdialog.h @@ -36,9 +36,10 @@ class SkyMap; class AddLinkDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /**Constructor. */ - AddLinkDialog( TQWidget* parent = 0, const TQString &oname=i18n("object") ); + AddLinkDialog( TQWidget* tqparent = 0, const TQString &oname=i18n("object") ); /**Destructor (empty) */ ~AddLinkDialog() {} diff --git a/kstars/kstars/addlinkdialogui.ui b/kstars/kstars/addlinkdialogui.ui index 3e5bdf53..b2754fbb 100644 --- a/kstars/kstars/addlinkdialogui.ui +++ b/kstars/kstars/addlinkdialogui.ui @@ -1,10 +1,10 @@ AddLinkDialogUI - + AddLinkDialogUI - + 0 0 @@ -16,7 +16,7 @@ unnamed - + TypeBox @@ -27,7 +27,7 @@ unnamed - + ImageRadio @@ -35,7 +35,7 @@ Image - + InfoRadio @@ -45,9 +45,9 @@ - + - layout2 + tqlayout2 @@ -58,7 +58,7 @@ DescBox - + DescLabel @@ -66,7 +66,7 @@ Description: - + URLLabel @@ -86,7 +86,7 @@ 0 - + 450 0 @@ -95,9 +95,9 @@ - + - layout1 + tqlayout1 @@ -113,7 +113,7 @@ Expanding - + 40 20 @@ -140,7 +140,7 @@ Expanding - + 20 40 @@ -149,5 +149,5 @@ - + diff --git a/kstars/kstars/ccdpreviewui.ui b/kstars/kstars/ccdpreviewui.ui index 93a4d804..5dc5fb3c 100644 --- a/kstars/kstars/ccdpreviewui.ui +++ b/kstars/kstars/ccdpreviewui.ui @@ -1,10 +1,10 @@ CCDPreviewForm - + CCDPreviewForm - + 0 0 @@ -19,9 +19,9 @@ unnamed - + - layout2 + tqlayout2 @@ -31,13 +31,13 @@ playB - + 32 32 - + 32 32 @@ -57,13 +57,13 @@ captureB - + 32 32 - + 32 32 @@ -97,7 +97,7 @@ Expanding - + 300 21 @@ -106,7 +106,7 @@ - + videoFrame @@ -118,7 +118,7 @@ 0 - + 160 120 @@ -131,23 +131,23 @@ Sunken - + - layout19 + tqlayout19 unnamed - + - layout7 + tqlayout7 unnamed - + brightnessLabel @@ -163,7 +163,7 @@ Brightness: - + contrastLabel @@ -179,7 +179,7 @@ Contrast: - + gammaLabel @@ -195,7 +195,7 @@ Gamma: - + textLabel1_2 @@ -214,7 +214,7 @@ - + textLabel1 @@ -235,15 +235,15 @@ - + - layout18 + tqlayout18 unnamed - + brightnessBar @@ -268,7 +268,7 @@ Horizontal - + contrastBar @@ -293,7 +293,7 @@ Horizontal - + gammaBar @@ -315,17 +315,17 @@ Horizontal - + - layout17 + tqlayout17 unnamed - + - layout11 + tqlayout11 @@ -339,7 +339,7 @@ Enter the telescope focal length in mm - + FWHMLabel @@ -351,7 +351,7 @@ 0 - + 100 0 @@ -363,7 +363,7 @@ -- - + AlignCenter @@ -372,15 +372,15 @@ - + - layout8 + tqlayout8 unnamed - + textLabel1_3 @@ -399,7 +399,7 @@ Full Width at Half Maximum - + textLabel3 @@ -425,7 +425,7 @@ - + kpushbutton.h kpushbutton.h diff --git a/kstars/kstars/ccdpreviewwg.cpp b/kstars/kstars/ccdpreviewwg.cpp index 18ee3892..e9269e60 100644 --- a/kstars/kstars/ccdpreviewwg.cpp +++ b/kstars/kstars/ccdpreviewwg.cpp @@ -49,7 +49,7 @@ FILE *CCDwfp; - CCDPreviewWG::CCDPreviewWG(INDIStdDevice *inStdDev, TQWidget * parent, const char * name) : CCDPreviewForm(parent, name) + CCDPreviewWG::CCDPreviewWG(INDIStdDevice *inStdDev, TQWidget * tqparent, const char * name) : CCDPreviewForm(tqparent, name) { stdDev = inStdDev; @@ -106,7 +106,7 @@ void CCDPreviewWG::setColorFrame(bool color) TQString errMsg; struct sockaddr_in pin; struct hostent *serverHostName = gethostbyname(host.ascii()); - errMsg = TQString("Connection to INDI host at %1 on port %2 failed.").arg(host).arg(port); + errMsg = TQString("Connection to INDI host at %1 on port %2 failed.").tqarg(host).tqarg(port); memset(&pin, 0, sizeof(pin)); pin.sin_family = AF_INET; @@ -168,8 +168,8 @@ void CCDPreviewWG::setCtrl(int wd, int ht,int po, int bpp,unsigned long mgd) for (i=0;itotalBaseCount;i++) { streamFrame->streamBuffer[i]=0; } - resize(wd + layout()->margin() * 2 , ht + playB->height() + brightnessLabel->height() - + contrastLabel->height() + gammaLabel->height() + focalEdit->height() + FWHMLabel->height() + layout()->margin() * 2 + layout()->spacing()*6); + resize(wd + tqlayout()->margin() * 2 , ht + playB->height() + brightnessLabel->height() + + contrastLabel->height() + gammaLabel->height() + focalEdit->height() + FWHMLabel->height() + tqlayout()->margin() * 2 + tqlayout()->spacing()*6); streamFrame->resize(wd, ht); } @@ -197,14 +197,14 @@ void CCDPreviewWG::updateFWHM() fwhm_arcsec = (206.26 / focal_length) * fwhm * mu; - FWHMLabel->setText(TQString("%1").arg(fwhm_arcsec, 0, 'g', 3)); + FWHMLabel->setText(TQString("%1").tqarg(fwhm_arcsec, 0, 'g', 3)); } void CCDPreviewWG::resizeEvent(TQResizeEvent *ev) { - streamFrame->resize(ev->size().width() - layout()->margin() * 2, ev->size().height() - playB->height() - layout()->margin() * 2 - layout()->spacing()); + streamFrame->resize(ev->size().width() - tqlayout()->margin() * 2, ev->size().height() - playB->height() - tqlayout()->margin() * 2 - tqlayout()->spacing()); } void CCDPreviewWG::playPressed() @@ -263,30 +263,30 @@ void CCDPreviewWG::captureImage() if ( ! KIO::NetAccess::upload( tmpfile.name(), currentFileURL, (TQWidget*) 0 ) ) { - TQString message = i18n( "Could not upload image to remote location: %1" ).arg( currentFileURL.prettyURL() ); + TQString message = i18n( "Could not upload image to remote location: %1" ).tqarg( currentFileURL.prettyURL() ); KMessageBox::sorry( 0, message, i18n( "Could not upload file" ) ); } } } else { - TQString message = i18n( "Invalid URL: %1" ).arg( currentFileURL.url() ); + TQString message = i18n( "Invalid URL: %1" ).tqarg( currentFileURL.url() ); KMessageBox::sorry( 0, message, i18n( "Invalid URL" ) ); } } -CCDVideoWG::CCDVideoWG(TQWidget * parent, const char * name) : TQFrame(parent, name, Qt::WNoAutoErase) +CCDVideoWG::CCDVideoWG(TQWidget * tqparent, const char * name) : TQFrame(tqparent, name, TQt::WNoAutoErase) { streamImage = NULL; streamBuffer = NULL; displayBuffer = NULL; - grayTable=new QRgb[256]; + grayTable=new TQRgb[256]; for (int i=0;i<256;i++) { - grayTable[i]=qRgb(i,i,i); + grayTable[i]=tqRgb(i,i,i); } - grayTable[255]=qRgb(255,0,0); + grayTable[255]=tqRgb(255,0,0); } CCDVideoWG::~CCDVideoWG() @@ -375,7 +375,7 @@ void CCDVideoWG::redrawVideoWG(void) if (val>255.0) { val=255.0; } - val=qRound(val*(254.0/255.0)); + val=tqRound(val*(254.0/255.0)); displayBuffer[Width*y+x]=(int) val; } else { diff --git a/kstars/kstars/ccdpreviewwg.h b/kstars/kstars/ccdpreviewwg.h index ee079f81..d6eddbfc 100644 --- a/kstars/kstars/ccdpreviewwg.h +++ b/kstars/kstars/ccdpreviewwg.h @@ -31,9 +31,10 @@ enum Pixelorder {PIXELORDER_NORMAL=1, PIXELORDER_DUAL=2}; class CCDPreviewWG : public CCDPreviewForm { Q_OBJECT + TQ_OBJECT public: - CCDPreviewWG(INDIStdDevice *inStdDev, TQWidget * parent =0, const char * name =0); + CCDPreviewWG(INDIStdDevice *inStdDev, TQWidget * tqparent =0, const char * name =0); ~CCDPreviewWG(); friend class CCDVideoWG; @@ -70,12 +71,13 @@ enum Pixelorder {PIXELORDER_NORMAL=1, PIXELORDER_DUAL=2}; void updateFWHM(); }; - class CCDVideoWG : public QFrame + class CCDVideoWG : public TQFrame { Q_OBJECT + TQ_OBJECT public: - CCDVideoWG(TQWidget * parent =0, const char * name =0); + CCDVideoWG(TQWidget * tqparent =0, const char * name =0); ~CCDVideoWG(); friend class CCDPreviewWG; @@ -85,9 +87,9 @@ enum Pixelorder {PIXELORDER_NORMAL=1, PIXELORDER_DUAL=2}; private: void redrawVideoWG(void); long totalBaseCount; - QRgb *grayTable; - QImage *streamImage; - QPixmap qPix; + TQRgb *grayTable; + TQImage *streamImage; + TQPixmap qPix; KPixmapIO kPixIO; unsigned char *streamBuffer; unsigned char *displayBuffer; diff --git a/kstars/kstars/colorscheme.cpp b/kstars/kstars/colorscheme.cpp index 5449c48e..66981101 100644 --- a/kstars/kstars/colorscheme.cpp +++ b/kstars/kstars/colorscheme.cpp @@ -144,7 +144,7 @@ void ColorScheme::copy( const ColorScheme &cs ) { TQString ColorScheme::colorNamed( const TQString &name ) const { //TQString color( Palette[ name ] ); if ( ! hasColorNamed( name ) ) { - kdWarning() << i18n( "No color named \"%1\" found in color scheme." ).arg( name ) << endl; + kdWarning() << i18n( "No color named \"%1\" found in color scheme." ).tqarg( name ) << endl; //color = "#FFFFFF"; //set to white if no color found return "#FFFFFF"; } @@ -168,7 +168,7 @@ TQString ColorScheme::keyAt( int i ) const { } TQString ColorScheme::nameFromKey( const TQString &key ) const { - return nameAt( KeyName.findIndex( key ) ); + return nameAt( KeyName.tqfindIndex( key ) ); } void ColorScheme::setColor( const TQString &key, const TQString &color ) { @@ -191,8 +191,8 @@ bool ColorScheme::load( const TQString &filename ) { bool ok(false); int newmode = line.left(1).toInt( &ok ); if ( ok ) setStarColorMode( newmode ); - if ( line.contains(':') ) { - int newintens = line.mid( line.find(':')+1, 2 ).toInt( &ok ); + if ( line.tqcontains(':') ) { + int newintens = line.mid( line.tqfind(':')+1, 2 ).toInt( &ok ); if ( ok ) setStarColorIntensity( newintens ); } @@ -201,19 +201,19 @@ bool ColorScheme::load( const TQString &filename ) { while ( !stream.eof() ) { line = stream.readLine(); - if ( line.contains(':')==1 ) { //the new color preset format contains a ":" in each line, followed by the name of the color + if ( line.tqcontains(':')==1 ) { //the new color preset format contains a ":" in each line, followed by the name of the color ++inew; if ( iold ) return false; //we read at least one line without a colon...file is corrupted. //If this line has a valid Key, set the color. - TQString tkey = line.mid( line.find(':')+1 ).stripWhiteSpace(); - TQString tname = line.left( line.find(':')-1 ); + TQString tkey = line.mid( line.tqfind(':')+1 ).stripWhiteSpace(); + TQString tname = line.left( line.tqfind(':')-1 ); - if ( KeyName.contains( tkey ) ) { + if ( KeyName.tqcontains( tkey ) ) { setColor( tkey, tname ); } else { //attempt to translate from old color ID TQString k( line.mid( 5 ).stripWhiteSpace() + "Color" ); - if ( KeyName.contains( k ) ) { + if ( KeyName.tqcontains( k ) ) { setColor( k, tname ); } else { kdWarning() << "Could not use the key \"" << tkey << @@ -248,7 +248,7 @@ bool ColorScheme::save( const TQString &name ) { TQString filename = name.lower().stripWhiteSpace(); if ( !filename.isEmpty() ) { for( unsigned int i=0; ireadEntry( TQString(*it), TQString( *Default.at( KeyName.findIndex(*it) ) ) ) ); + setColor( TQString(*it), conf->readEntry( TQString(*it), TQString( *Default.at( KeyName.tqfindIndex(*it) ) ) ) ); setStarColorMode( conf->readNumEntry( "StarColorMode", 0 ) ); setStarColorIntensity( conf->readNumEntry( "StarColorIntensity", 5 ) ); diff --git a/kstars/kstars/colorscheme.h b/kstars/kstars/colorscheme.h index e61c455b..22edb1e6 100644 --- a/kstars/kstars/colorscheme.h +++ b/kstars/kstars/colorscheme.h @@ -65,7 +65,7 @@ class ColorScheme { TQString colorNamed( const TQString &name ) const; /**@p i the index of the color to retrieve - *@return a color by its index in the QMap + *@return a color by its index in the TQMap */ TQString colorAt( int i ) const; diff --git a/kstars/kstars/conbridlg.cpp b/kstars/kstars/conbridlg.cpp index ec9aa240..d2178857 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 *parent) : - KDialogBase(KDialogBase::Plain, i18n( "Brightness/Contrast" ), Ok|Cancel, Ok, parent ) +ContrastBrightnessDlg::ContrastBrightnessDlg(TQWidget *tqparent) : + KDialogBase(KDialogBase::Plain, i18n( "Brightness/Contrast" ), Ok|Cancel, Ok, tqparent ) { float pixdiff, datadiff; contrast = brightness = 0; - viewer = (FITSViewer *) parent; + viewer = (FITSViewer *) tqparent; displayImage = viewer->image->displayImage; tempImage = new TQImage(displayImage->copy()); width = displayImage->width(); @@ -231,7 +231,7 @@ void ContrastBrightnessDlg::setBrightness(int brightnessValue) } -TQSize ContrastBrightnessDlg::sizeHint() const +TQSize ContrastBrightnessDlg::tqsizeHint() const { return TQSize(400,130); } diff --git a/kstars/kstars/conbridlg.h b/kstars/kstars/conbridlg.h index 62193855..eaabcf2e 100644 --- a/kstars/kstars/conbridlg.h +++ b/kstars/kstars/conbridlg.h @@ -29,11 +29,12 @@ class ContrastBrightnessDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ContrastBrightnessDlg(TQWidget *parent=0); + ContrastBrightnessDlg(TQWidget *tqparent=0); ~ContrastBrightnessDlg(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; void range(int min, int max, int & num); void range(float min, float max, float & num); diff --git a/kstars/kstars/contrastbrightnessgui.ui b/kstars/kstars/contrastbrightnessgui.ui index b05db5b3..70e54fa2 100644 --- a/kstars/kstars/contrastbrightnessgui.ui +++ b/kstars/kstars/contrastbrightnessgui.ui @@ -1,10 +1,10 @@ ConBriForm - + ConBriForm - + 0 0 @@ -19,7 +19,7 @@ unnamed - + briSlider @@ -36,7 +36,7 @@ NoMarks - + conLabel @@ -66,7 +66,7 @@ -128 - + briLabel @@ -74,7 +74,7 @@ Brightness: - + conSlider @@ -118,7 +118,7 @@ setValue(int) - + knuminput.h knuminput.h diff --git a/kstars/kstars/data/Cities.dat b/kstars/kstars/data/Cities.dat index 2adacf45..4528bb50 100644 --- a/kstars/kstars/data/Cities.dat +++ b/kstars/kstars/data/Cities.dat @@ -1271,7 +1271,7 @@ Kings Beach : Queensland : Australia Kingsport : Tennessee : USA : 36 : 32 : 42 : N : 82 : 32 : 35 : W : -5.0 : US Kingston : : Jamaica : 18 : 0 : 0 : N : 76 : 44 : 59 : W : -5.0 : -- Kingston : Ontario : Canada : 44 : 13 : 11 : N : 76 : 35 : 59 : W : -5.0 : US -Kinshasa : : Congo (Democratic Republic) : 4 : 22 : 58 : S : 15 : 26 : 59 : E : x : -- +Kinshasa : : Congo (Detqmocratic Republic) : 4 : 22 : 58 : S : 15 : 26 : 59 : E : x : -- Kiruna : : Sweden : 67 : 49 : 0 : N : 20 : 19 : 0 : E : 1.0 : EU Kisangani : : Dem rep of Congo : 0 : 31 : 0 : N : 25 : 11 : 0 : E : 1.0 : -- Kismayu : : Somalia : 0 : 23 : 0 : S : 42 : 33 : 0 : E : 3.0 : -- diff --git a/kstars/kstars/data/info_url.dat b/kstars/kstars/data/info_url.dat index 225a24d5..c3c0e8d4 100644 --- a/kstars/kstars/data/info_url.dat +++ b/kstars/kstars/data/info_url.dat @@ -185,7 +185,7 @@ Mars:NASA JPL Page:http://www.jpl.nasa.gov/solar_system/planets/mars_index.html Mars:Welcome to Mars!:http://www.amnh.org/rose/mars/index.html Mars:The Whole Mars Catalog:http://www.spaceref.com/mars/ Mars:The Mars Society:http://www.marssociety.org/ -Mars:The "face" on Mars:http://mars.jpl.nasa.gov/mgs/msss/camera/images/moc_5_24_01/face/index.html +Mars:The "face" on Mars:http://mars.jpl.nasa.gov/mgs/msss/camera/images/tqmoc_5_24_01/face/index.html Jupiter:Wikipedia Page:http://en.wikipedia.org/wiki/Jupiter_(planet) Jupiter:SEDS Information Page:http://www.seds.org/nineplanets/nineplanets/jupiter.html Jupiter:NASA JPL Page:http://www.jpl.nasa.gov/solar_system/planets/jupiter_index.html diff --git a/kstars/kstars/data/tips b/kstars/kstars/data/tips index 91f82248..1cbcc989 100644 --- a/kstars/kstars/data/tips +++ b/kstars/kstars/data/tips @@ -83,7 +83,7 @@

The status bar displays the current sky coordinates of the mouse cursor, - in both Equatorial and Horizontal coordinate systems. + in both Equatorial andQt::Horizontal coordinate systems.

@@ -109,7 +109,7 @@ -

To switch between Equatorial and Horizontal coordinate +

To switch between Equatorial andQt::Horizontal coordinate systems, use the "View->Coordinates" menu item, or press the spacebar.

@@ -360,7 +360,7 @@

You can construct your own field-of-view (FOV) symbols, using the FOV Editor under the Tools menu. You can set the angular size, the - shape, and the color of your new symbols. + tqshape, and the color of your new symbols.

diff --git a/kstars/kstars/deepskyobject.cpp b/kstars/kstars/deepskyobject.cpp index 280729e5..5e0597f5 100644 --- a/kstars/kstars/deepskyobject.cpp +++ b/kstars/kstars/deepskyobject.cpp @@ -88,7 +88,7 @@ void DeepSkyObject::setCatalog( const TQString &cat ) { TQImage* DeepSkyObject::readImage( void ) { TQFile file; if ( Image==0 ) { //Image not currently set; try to load it from disk. - TQString fname = name().lower().replace( TQRegExp(" "), "" ) + ".png"; + TQString fname = name().lower().tqreplace( TQRegExp(" "), "" ) + ".png"; if ( KSUtils::openDataFile( file, fname ) ) { file.close(); diff --git a/kstars/kstars/deepskyobject.h b/kstars/kstars/deepskyobject.h index c10305aa..6faf1494 100644 --- a/kstars/kstars/deepskyobject.h +++ b/kstars/kstars/deepskyobject.h @@ -107,7 +107,7 @@ public: */ TQString catalog( void ) const; -/**Set the internal Catalog value according to the QString +/**Set the internal Catalog value according to the TQString *argument: * "M" : CAT_MESSIER * "NGC" : CAT_NGC @@ -181,7 +181,7 @@ public: /**Show Deep-sky object popup menu. Overloaded from virtual *SkyObject::showPopupMenu() *@param pmenu pointer to the KSPopupMenu object - *@param pos QPojnt holding the x,y coordinates for the menu + *@param pos TQPojnt holding the x,y coordinates for the menu */ virtual void showPopupMenu( KSPopupMenu *pmenu, TQPoint pos ) { pmenu->createDeepSkyObjectMenu( this ); pmenu->popup( pos ); } diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp index 4bbb6a91..1194d4bd 100644 --- a/kstars/kstars/detaildialog.cpp +++ b/kstars/kstars/detaildialog.cpp @@ -57,7 +57,7 @@ #include "devicemanager.h" #include "indistd.h" -LogEdit::LogEdit( TQWidget *parent, const char *name ) : KTextEdit( parent, name ) +LogEdit::LogEdit( TQWidget *tqparent, const char *name ) : KTextEdit( tqparent, name ) { setFrameStyle( TQFrame::StyledPanel ); setFrameShadow( TQFrame::Plain ); @@ -69,13 +69,13 @@ void LogEdit::focusOutEvent( TQFocusEvent *e ) { TQWidget::focusOutEvent(e); } -ClickLabel::ClickLabel( TQWidget *parent, const char *name ) : TQLabel( parent, name ) +ClickLabel::ClickLabel( TQWidget *tqparent, const char *name ) : TQLabel( tqparent, name ) {} DetailDialog::DetailDialog(SkyObject *o, const KStarsDateTime &ut, GeoLocation *geo, - 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) + 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) { //Modify color palette setPaletteBackgroundColor( palette().color( TQPalette::Active, TQColorGroup::Base ) ); @@ -135,20 +135,20 @@ void DetailDialog::createGeneralTab() Data->Names->setText( s->longname() ); Data->Type->setText( s->sptype() + " " + i18n("star") ); - Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).arg( + Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).tqarg( KGlobal::locale()->formatNumber( s->mag(), 1 ) ) ); //show to tenths place //distance if ( s->distance() > 2000. || s->distance() < 0. ) // parallax < 0.5 mas Data->Distance->setText( TQString(i18n("larger than 2000 parsecs", "> 2000 pc") ) ); else if ( s->distance() > 50.0 ) //show to nearest integer - Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).arg( + Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).tqarg( TQString::number( int( s->distance() + 0.5 ) ) ) ); else if ( s->distance() > 10.0 ) //show to tenths place - Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).arg( + Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).tqarg( KGlobal::locale()->formatNumber( s->distance(), 1 ) ) ); else //show to hundredths place - Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).arg( + Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).tqarg( KGlobal::locale()->formatNumber( s->distance(), 2 ) ) ); //Note multiplicity/variablility in angular size label @@ -183,28 +183,28 @@ void DetailDialog::createGeneralTab() //Magnitude: The moon displays illumination fraction instead if ( selectedObject->name() == "Moon" ) { Data->MagLabel->setText( i18n("Illumination:") ); - Data->Mag->setText( TQString("%1 %").arg( int( ((KSMoon *)selectedObject)->illum()*100. ) ) ); + Data->Mag->setText( TQString("%1 %").tqarg( int( ((KSMoon *)selectedObject)->illum()*100. ) ) ); } else { - Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).arg( + Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).tqarg( KGlobal::locale()->formatNumber( ps->mag(), 1 ) ) ); //show to tenths place } //Distance from Earth. The moon requires a unit conversion if ( ps->name() == "Moon" ) { - Data->Distance->setText( i18n("distance in kilometers", "%1 km").arg( + Data->Distance->setText( i18n("distance in kilometers", "%1 km").tqarg( KGlobal::locale()->formatNumber( ps->rearth()*AU_KM ) ) ); } else { - Data->Distance->setText( i18n("distance in Astronomical Units", "%1 AU").arg( + Data->Distance->setText( i18n("distance in Astronomical Units", "%1 AU").tqarg( KGlobal::locale()->formatNumber( ps->rearth() ) ) ); } //Angular size; moon and sun in arcmin, others in arcsec if ( ps->angSize() ) { if ( ps->name() == "Sun" || ps->name() == "Moon" ) - Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").arg( + Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").tqarg( KGlobal::locale()->formatNumber( ps->angSize() ) ) ); else - Data->AngSize->setText( i18n("angular size in arcseconds", "%1 arcsec").arg( + Data->AngSize->setText( i18n("angular size in arcseconds", "%1 arcsec").tqarg( KGlobal::locale()->formatNumber( ps->angSize()*60.0 ) ) ); } else { Data->AngSize->setText( "--" ); @@ -230,11 +230,11 @@ void DetailDialog::createGeneralTab() if ( dso->ugc() != 0 ) { if ( ! oname.isEmpty() ) oname += ", "; - oname += "UGC " + TQString("%1").arg( dso->ugc() ); + oname += "UGC " + TQString("%1").tqarg( dso->ugc() ); } if ( dso->pgc() != 0 ) { if ( ! oname.isEmpty() ) oname += ", "; - oname += "PGC " + TQString("%1").arg( dso->pgc() ); + oname += "PGC " + TQString("%1").tqarg( dso->pgc() ); } if ( ! oname.isEmpty() ) pname += ", " + oname; @@ -245,7 +245,7 @@ void DetailDialog::createGeneralTab() if ( dso->mag() > 90.0 ) Data->Mag->setText( "--" ); else - Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).arg( + Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).tqarg( KGlobal::locale()->formatNumber( dso->mag(), 1 ) ) ); //show to tenths place //No distances at this point... @@ -253,10 +253,10 @@ void DetailDialog::createGeneralTab() //Only show decimal place for small angular sizes if ( dso->a() > 10.0 ) - Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").arg( + Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").tqarg( int( dso->a() ) ) ); else if ( dso->a() ) - Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").arg( + Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").tqarg( KGlobal::locale()->formatNumber( dso->a(), 1 ) ) ); else Data->AngSize->setText( "--" ); @@ -313,10 +313,10 @@ void DetailDialog::createPositionTab( const KStarsDateTime &ut, GeoLocation *geo //because we don't want a thousands-place separator! TQString sEpoch = TQString::number( ut.epoch(), 'f', 1 ); //Replace the decimal point with localized decimal symbol - sEpoch.replace( ".", KGlobal::locale()->decimalSymbol() ); + sEpoch.tqreplace( ".", KGlobal::locale()->decimalSymbol() ); - Pos->RALabel->setText( i18n( "RA (%1):" ).arg( sEpoch ) ); - Pos->DecLabel->setText( i18n( "Dec (%1):" ).arg( sEpoch ) ); + Pos->RALabel->setText( i18n( "RA (%1):" ).tqarg( sEpoch ) ); + Pos->DecLabel->setText( i18n( "Dec (%1):" ).tqarg( sEpoch ) ); Pos->RA->setText( selectedObject->ra()->toHMSString() ); Pos->Dec->setText( selectedObject->dec()->toDMSString() ); Pos->Az->setText( selectedObject->az()->toDMSString() ); @@ -331,7 +331,7 @@ void DetailDialog::createPositionTab( const KStarsDateTime &ut, GeoLocation *geo ha.setH( 24.0 - ha.Hours() ); sgn = '-'; } - Pos->HA->setText( TQString("%1%2").arg(sgn).arg( ha.toHMSString() ) ); + Pos->HA->setText( TQString("%1%2").tqarg(sgn).tqarg( ha.toHMSString() ) ); //Airmass is approximated as the secant of the zenith distance, //equivalent to 1./sin(Alt). Beware of Inf at Alt=0! @@ -484,7 +484,7 @@ void DetailDialog::createLogTab() vlay->addWidget( Log ); if ( selectedObject->userLog.isEmpty() ) - Log->UserLog->setText(i18n("Record here observation logs and/or data on %1.").arg(selectedObject->translatedName())); + Log->UserLog->setText(i18n("Record here observation logs and/or data on %1.").tqarg(selectedObject->translatedName())); else Log->UserLog->setText(selectedObject->userLog); @@ -658,7 +658,7 @@ void DetailDialog::removeLinkDialog() currentItemTitle = Links->ImagesList->currentText(); } - if (KMessageBox::warningContinueCancel( 0, i18n("Are you sure you want to remove the %1 link?").arg(currentItemTitle), i18n("Delete Confirmation"),KStdGuiItem::del())!=KMessageBox::Continue) + if (KMessageBox::warningContinueCancel( 0, i18n("Are you sure you want to remove the %1 link?").tqarg(currentItemTitle), i18n("Delete Confirmation"),KStdGuiItem::del())!=KMessageBox::Continue) return; switch (type) @@ -706,9 +706,9 @@ bool DetailDialog::verifyUserData(int type) for (i=0; iname() && title == currentItemTitle) { ObjectFound = true; @@ -723,9 +723,9 @@ bool DetailDialog::verifyUserData(int type) for (i=0; iname() && title == currentItemTitle) { ObjectFound = true; @@ -774,7 +774,7 @@ bool DetailDialog::readUserFile(int type)//, int sourceFileType) return true; } -void DetailDialog::populateADVTree(TQListViewItem *parent) +void DetailDialog::populateADVTree(TQListViewItem *tqparent) { // list done if (!treeIt->current()) @@ -782,20 +782,20 @@ void DetailDialog::populateADVTree(TQListViewItem *parent) // if relative top level [KSLABEL] if (treeIt->current()->Type == 0) - forkTree(parent); + forkTree(tqparent); while (treeIt->current()) { if (treeIt->current()->Type == 0) { - forkTree(parent); + forkTree(tqparent); continue; } else if (treeIt->current()->Type == 1) break; - if (parent) - new TQListViewItem( parent, treeIt->current()->Name); + if (tqparent) + new TQListViewItem( tqparent, treeIt->current()->Name); else new TQListViewItem( Adv->ADVTree, treeIt->current()->Name); @@ -803,11 +803,11 @@ void DetailDialog::populateADVTree(TQListViewItem *parent) } } -void DetailDialog::forkTree(TQListViewItem *parent) +void DetailDialog::forkTree(TQListViewItem *tqparent) { TQListViewItem *current = 0; - if (parent) - current = new TQListViewItem(parent, treeIt->current()->Name); + if (tqparent) + current = new TQListViewItem(tqparent, treeIt->current()->Name); else current = new TQListViewItem(Adv->ADVTree, treeIt->current()->Name); @@ -845,13 +845,13 @@ TQString DetailDialog::parseADVData(TQString link) TQString subLink; int index; - if ( (index = link.find("KSOBJ")) != -1) + if ( (index = link.tqfind("KSOBJ")) != -1) { link.remove(index, 5); link = link.insert(index, selectedObject->name()); } - if ( (index = link.find("KSRA")) != -1) + if ( (index = link.tqfind("KSRA")) != -1) { link.remove(index, 4); subLink = TQString().sprintf("%02d%02d%02d", selectedObject->ra0()->hour(), selectedObject->ra0()->minute(), selectedObject->ra0()->second()); @@ -860,7 +860,7 @@ TQString DetailDialog::parseADVData(TQString link) link = link.insert(index, subLink); } - if ( (index = link.find("KSDEC")) != -1) + if ( (index = link.tqfind("KSDEC")) != -1) { link.remove(index, 5); if (selectedObject->dec()->degree() < 0) @@ -905,8 +905,8 @@ void DetailDialog::centerTelescope() int selectedCoord(0); SkyPoint sp; - // Find the first device with EQUATORIAL_EOD_COORD or EQUATORIAL_COORD and with SLEW element - // i.e. the first telescope we find! + // Find the first device with ETQUATORIAL_EOD_COORD or ETQUATORIAL_COORD and with SLEW element + // i.e. the first telescope we tqfind! INDIMenu *imenu = ksw->getINDIMenu(); @@ -917,10 +917,10 @@ void DetailDialog::centerTelescope() { indidev = imenu->mgr.at(i)->indi_dev.at(j); indidev->stdDev->currentObject = NULL; - prop = indidev->findProp("EQUATORIAL_EOD_COORD"); + prop = indidev->findProp("ETQUATORIAL_EOD_COORD"); if (prop == NULL) { - prop = indidev->findProp("EQUATORIAL_COORD"); + prop = indidev->findProp("ETQUATORIAL_COORD"); if (prop == NULL) { prop = indidev->findProp("HORIZONTAL_COORD"); @@ -938,7 +938,7 @@ void DetailDialog::centerTelescope() if (ConnectEle->state == PS_OFF) { - KMessageBox::error(0, i18n("Telescope %1 is offline. Please connect and retry again.").arg(indidev->label)); + KMessageBox::error(0, i18n("Telescope %1 is offline. Please connect and retry again.").tqarg(indidev->label)); return; } @@ -953,7 +953,7 @@ void DetailDialog::centerTelescope() if (!DecEle) continue; break; - // Horizontal + //Qt::Horizontal case 1: if (prop->perm == PP_RO) continue; AzEle = prop->findElement("AZ"); @@ -990,10 +990,10 @@ void DetailDialog::centerTelescope() sp.set (ksw->map()->clickedPoint()->ra(), ksw->map()->clickedPoint()->dec()); if (useJ2000) - sp.apparentCoord(ksw->data()->ut().djd(), (long double) J2000); + sp.aptqparentCoord(ksw->data()->ut().djd(), (long double) J2000); - RAEle->write_w->setText(TQString("%1:%2:%3").arg(sp.ra()->hour()).arg(sp.ra()->minute()).arg(sp.ra()->second())); - DecEle->write_w->setText(TQString("%1:%2:%3").arg(sp.dec()->degree()).arg(sp.dec()->arcmin()).arg(sp.dec()->arcsec())); + RAEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.ra()->hour()).tqarg(sp.ra()->minute()).tqarg(sp.ra()->second())); + DecEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.dec()->degree()).tqarg(sp.dec()->arcmin()).tqarg(sp.dec()->arcsec())); break; @@ -1009,8 +1009,8 @@ void DetailDialog::centerTelescope() sp.setAlt(*ksw->map()->clickedPoint()->alt()); } - AzEle->write_w->setText(TQString("%1:%2:%3").arg(sp.az()->degree()).arg(sp.az()->arcmin()).arg(sp.az()->arcsec())); - AltEle->write_w->setText(TQString("%1:%2:%3").arg(sp.alt()->degree()).arg(sp.alt()->arcmin()).arg(sp.alt()->arcsec())); + AzEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.az()->degree()).tqarg(sp.az()->arcmin()).tqarg(sp.az()->arcsec())); + AltEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.alt()->degree()).tqarg(sp.alt()->arcmin()).tqarg(sp.alt()->arcsec())); break; } @@ -1040,7 +1040,7 @@ void DetailDialog::showThumbnail() { //If no image found, load "no image" image //If that isn't found, make it blank. TQFile file; - TQString fname = "thumb-" + selectedObject->name().lower().replace( TQRegExp(" "), "" ) + ".png"; + TQString fname = "thumb-" + selectedObject->name().lower().tqreplace( TQRegExp(" "), "" ) + ".png"; if ( KSUtils::openDataFile( file, fname ) ) { file.close(); Thumbnail->load( file.name(), "PNG" ); @@ -1060,7 +1060,7 @@ void DetailDialog::updateThumbnail() { if ( tp.exec() == TQDialog::Accepted ) { TQString fname = locateLocal( "appdata", "thumb-" - + selectedObject->name().lower().replace( TQRegExp(" "), "" ) + ".png" ); + + selectedObject->name().lower().tqreplace( TQRegExp(" "), "" ) + ".png" ); Data->Image->setPixmap( *(tp.image()) ); diff --git a/kstars/kstars/detaildialog.h b/kstars/kstars/detaildialog.h index 301a2a13..dd6a5f8a 100644 --- a/kstars/kstars/detaildialog.h +++ b/kstars/kstars/detaildialog.h @@ -56,8 +56,9 @@ struct ADVTreeData */ class LogEdit : public KTextEdit { Q_OBJECT + TQ_OBJECT public: - LogEdit( TQWidget *parent=0, const char *name=0 ); + LogEdit( TQWidget *tqparent=0, const char *name=0 ); ~LogEdit() {} signals: @@ -73,15 +74,16 @@ protected: */ class ClickLabel : public TQLabel { Q_OBJECT + TQ_OBJECT public: - ClickLabel( TQWidget *parent=0, const char *name=0 ); + ClickLabel( TQWidget *tqparent=0, const char *name=0 ); ~ClickLabel() {} signals: void clicked(); protected: - void mousePressEvent( TQMouseEvent *e ) { if ( e->button() == LeftButton ) emit clicked(); } + void mousePressEvent( TQMouseEvent *e ) { if ( e->button() == Qt::LeftButton ) emit clicked(); } }; /**@class DetailDialog is a window showing detailed information for a selected object. @@ -104,10 +106,11 @@ protected: class DetailDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /**Constructor */ - DetailDialog(SkyObject *o, const KStarsDateTime &ut, GeoLocation *geo, TQWidget *parent=0, const char *name=0); + DetailDialog(SkyObject *o, const KStarsDateTime &ut, GeoLocation *geo, TQWidget *tqparent=0, const char *name=0); /**Destructor (empty) */ @@ -211,11 +214,11 @@ private: /**Populate the TreeView of known astronomical databases in the Advanced Tab */ - void populateADVTree(TQListViewItem *parent); + void populateADVTree(TQListViewItem *tqparent); /**For the databases TreeView */ - void forkTree(TQListViewItem *parent); + void forkTree(TQListViewItem *tqparent); /**Data for the Advanced Tab TreeView is stored in the file advinterface.dat. *This function parses advinterface.dat. diff --git a/kstars/kstars/details_data.ui b/kstars/kstars/details_data.ui index 2f7893b0..9a85a18f 100644 --- a/kstars/kstars/details_data.ui +++ b/kstars/kstars/details_data.ui @@ -1,10 +1,10 @@ DetailsDataUI - + DetailsDataUI - + 0 0 @@ -19,9 +19,9 @@ unnamed - + - layout67 + tqlayout67 @@ -30,7 +30,7 @@ 0 - + Names @@ -45,11 +45,11 @@ <p align="center">Primary Name, Other Names</p> - + WordBreak|AlignCenter - + DataFrame @@ -74,25 +74,25 @@ unnamed - + - layout20 + tqlayout20 unnamed - + - layout12 + tqlayout12 unnamed - + - layout60_2 + tqlayout60_2 @@ -121,7 +121,7 @@ Object Type - + InLabel @@ -141,7 +141,7 @@ in - + AlignTop @@ -180,7 +180,7 @@ Expanding - + 140 20 @@ -199,16 +199,16 @@ Expanding - + 20 16 - + - layout19 + tqlayout19 @@ -235,7 +235,7 @@ Expanding - + 77 20 @@ -246,17 +246,17 @@ - + - layout22 + tqlayout22 unnamed - + - layout21 + tqlayout21 @@ -317,7 +317,7 @@ 0.00 mag - + MagLabel @@ -345,11 +345,11 @@ Magnitude: - + AlignTop - + DistanceLabel @@ -377,7 +377,7 @@ Distance: - + AlignTop @@ -405,7 +405,7 @@ 0.00 pc - + AngSizeLabel @@ -433,7 +433,7 @@ Size: - + AlignTop @@ -449,16 +449,16 @@ Expanding - + 20 8 - + - layout36_2 + tqlayout36_2 @@ -481,16 +481,16 @@ Expanding - + 16 20 - + - layout35_2 + tqlayout35_2 @@ -532,7 +532,7 @@ Expanding - + 20 20 @@ -557,7 +557,7 @@ Fixed - + 20 8 @@ -590,7 +590,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082 - + kactivelabel.h kpushbutton.h diff --git a/kstars/kstars/details_database.ui b/kstars/kstars/details_database.ui index a32f4b30..974372d6 100644 --- a/kstars/kstars/details_database.ui +++ b/kstars/kstars/details_database.ui @@ -1,10 +1,10 @@ DetailsDatabaseUI - + DetailsDatabaseUI - + 0 0 @@ -48,7 +48,7 @@ - + klistview.h diff --git a/kstars/kstars/details_links.ui b/kstars/kstars/details_links.ui index dbe0b75e..9b661310 100644 --- a/kstars/kstars/details_links.ui +++ b/kstars/kstars/details_links.ui @@ -1,10 +1,10 @@ DetailsLinksUI - + DetailsLinksUI - + 0 0 @@ -19,9 +19,9 @@ unnamed - + - layout79 + tqlayout79 @@ -30,7 +30,7 @@ 0 - + InfoTitle @@ -66,16 +66,16 @@ Fixed - + 20 16 - + - layout80 + tqlayout80 @@ -84,7 +84,7 @@ 0 - + ImagesTitle @@ -113,9 +113,9 @@ - + - layout91 + tqlayout91 @@ -163,7 +163,7 @@ Expanding - + 40 20 @@ -176,7 +176,7 @@ - + klistbox.h klistbox.h diff --git a/kstars/kstars/details_log.ui b/kstars/kstars/details_log.ui index 51d337f8..94e77070 100644 --- a/kstars/kstars/details_log.ui +++ b/kstars/kstars/details_log.ui @@ -1,10 +1,10 @@ DetailsLogUI - + DetailsLogUI - + 0 0 @@ -22,7 +22,7 @@ 0 - + LogTitle @@ -73,5 +73,5 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082 - + diff --git a/kstars/kstars/details_position.ui b/kstars/kstars/details_position.ui index f2e96b9b..3cef8785 100644 --- a/kstars/kstars/details_position.ui +++ b/kstars/kstars/details_position.ui @@ -1,10 +1,10 @@ DetailsPositionUI - + DetailsPositionUI - + 0 0 @@ -19,9 +19,9 @@ unnamed - + - layout56 + tqlayout56 @@ -30,7 +30,7 @@ 0 - + CoordTitle @@ -43,7 +43,7 @@ <p align="center">Coordinates</p> - + CoordFrame @@ -68,17 +68,17 @@ unnamed - + - layout54 + tqlayout54 unnamed - + - layout50 + tqlayout50 @@ -134,7 +134,7 @@ 00:00:00 - + DecLabel @@ -154,11 +154,11 @@ Dec (2000.0): - + AlignTop - + RALabel @@ -178,7 +178,7 @@ RA (2000.0): - + AlignTop @@ -194,16 +194,16 @@ Expanding - + 90 16 - + - layout50_2 + tqlayout50_2 @@ -259,7 +259,7 @@ 00:00:00 - + AltLabel @@ -279,11 +279,11 @@ Altitude: - + AlignTop - + AzLabel @@ -303,7 +303,7 @@ Azimuth: - + AlignTop @@ -321,30 +321,30 @@ Expanding - + 20 0 - + - layout55 + tqlayout55 unnamed - + - layout53 + tqlayout53 unnamed - + HALabel @@ -364,7 +364,7 @@ Hour angle: - + AlignTop @@ -405,22 +405,22 @@ Expanding - + 170 20 - + - layout52 + tqlayout52 unnamed - + AirmassLabel @@ -440,7 +440,7 @@ Airmass: - + AlignTop @@ -487,16 +487,16 @@ Fixed - + 20 16 - + - layout76 + tqlayout76 @@ -505,7 +505,7 @@ 0 - + RSTTitle @@ -518,7 +518,7 @@ <p align="center">Rise/Set/Transit</p> - + RSTFrame @@ -543,17 +543,17 @@ unnamed - + - layout142 + tqlayout142 unnamed - + - layout141 + tqlayout141 @@ -609,7 +609,7 @@ 00:00 - + TimeSetLabel @@ -629,11 +629,11 @@ Set time: - + AlignTop - + TimeTransitLabel @@ -653,11 +653,11 @@ Transit time: - + AlignTop - + TimeRiseLabel @@ -677,7 +677,7 @@ Rise time: - + AlignTop @@ -718,16 +718,16 @@ Expanding - + 83 20 - + - layout140 + tqlayout140 @@ -758,7 +758,7 @@ 00:00:00 - + AzSetLabel @@ -778,11 +778,11 @@ Azimuth at set: - + AlignTop - + AltTransitLabel @@ -802,7 +802,7 @@ Altitude at transit: - + AlignTop @@ -856,7 +856,7 @@ 00:00:00 - + AzRiseLabel @@ -876,7 +876,7 @@ Azimuth at rise: - + AlignTop @@ -894,7 +894,7 @@ Expanding - + 20 0 @@ -909,7 +909,7 @@ - + kactivelabel.h kactivelabel.h diff --git a/kstars/kstars/devicemanager.cpp b/kstars/kstars/devicemanager.cpp index 0f95455c..705ddfe0 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' parent -** of devices, while indimenu is 'GUI' parent of devices +** The device Manager can be thought of as the 'networking' tqparent +** of devices, while indimenu is 'GUI' tqparent of devices *******************************************************************/ -DeviceManager::DeviceManager(INDIMenu *INDIparent, int inID) +DeviceManager::DeviceManager(INDIMenu *INDItqparent, int inID) { - parent = INDIparent; + tqparent = INDItqparent; mgrID = inID; indi_dev.setAutoDelete(true); @@ -87,7 +87,7 @@ bool DeviceManager::indiConnect(TQString inHost, TQString inPort) TQString errMsg; struct sockaddr_in pin; struct hostent *serverHostName = gethostbyname(host.ascii()); - errMsg = TQString("Connection to INDI host at %1 on port %2 failed.").arg(host).arg(port); + errMsg = TQString("Connection to INDI host at %1 on port %2 failed.").tqarg(host).tqarg(port); memset(&pin, 0, sizeof(pin)); pin.sin_family = AF_INET; @@ -154,8 +154,8 @@ void DeviceManager::dataReceived() tcflush(serverFD, TCIFLUSH); sNotifier->disconnect(); close(serverFD); - parent->removeDeviceMgr(mgrID); - KMessageBox::error(0, TQString::fromLatin1(errmsg)); + tqparent->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 (parent->currentLabel.isEmpty()) - parent->setCustomLabel(valuXMLAtt(ap)); + if (tqparent->currentLabel.isEmpty()) + tqparent->setCustomLabel(valuXMLAtt(ap)); - dp = new INDI_D(parent, this, TQString(valuXMLAtt(ap)), parent->currentLabel); + dp = new INDI_D(tqparent, this, TQString(valuXMLAtt(ap)), tqparent->currentLabel); indi_dev.append(dp); emit newDevice(); // Reset label - parent->currentLabel = ""; + tqparent->currentLabel = ""; /* ok */ return dp; @@ -397,7 +397,7 @@ void DeviceManager::doMsg (XMLEle *msg, INDI_D *dp) if (timestamp) txt_w->insert(TQString(valuXMLAtt(timestamp)) + TQString(" ")); else - txt_w->insert( KStarsDateTime::currentDateTime().toString("yyyy/mm/dd - h:m:s ap ")); + txt_w->insert( KStarsDateTime::tqcurrentDateTime().toString("yyyy/mm/dd - h:m:s ap ")); /* finally! the msg */ message = findXMLAtt(msg, "message"); @@ -405,7 +405,7 @@ void DeviceManager::doMsg (XMLEle *msg, INDI_D *dp) txt_w->insert( TQString(valuXMLAtt(message)) + TQString("\n")); if ( Options::indiMessages() ) - parent->ksw->statusBar()->changeItem( TQString(valuXMLAtt(message)), 0); + tqparent->ksw->statusBar()->changeItem( TQString(valuXMLAtt(message)), 0); } diff --git a/kstars/kstars/devicemanager.h b/kstars/kstars/devicemanager.h index fe9af04c..78b2b933 100644 --- a/kstars/kstars/devicemanager.h +++ b/kstars/kstars/devicemanager.h @@ -23,14 +23,15 @@ class TQSocketNotifier; // INDI device manager -class DeviceManager : public QObject +class DeviceManager : public TQObject { Q_OBJECT + TQ_OBJECT public: - DeviceManager(INDIMenu *INDIparent, int inID); + DeviceManager(INDIMenu *INDItqparent, int inID); ~DeviceManager(); - INDIMenu *parent; + INDIMenu *tqparent; TQPtrList indi_dev; @@ -39,8 +40,8 @@ class DeviceManager : public QObject FILE *serverFP; LilXML *XMLParser; TQSocketNotifier *sNotifier; - QString host; - QString port; + TQString host; + TQString port; int dispatchCommand (XMLEle *root, char errmsg[]); diff --git a/kstars/kstars/devmanager.ui b/kstars/kstars/devmanager.ui index 54dc4b3f..f1181256 100644 --- a/kstars/kstars/devmanager.ui +++ b/kstars/kstars/devmanager.ui @@ -1,10 +1,10 @@ devManager - + devManager - + 0 0 @@ -22,11 +22,11 @@ unnamed - + ConfTabWidget - + tab @@ -51,7 +51,7 @@ - Status + tqStatus true @@ -104,14 +104,14 @@ 0 - + 0 125 - + serverLogGroup @@ -122,11 +122,11 @@ unnamed - + serverLogText - + 0 90 @@ -144,7 +144,7 @@ - + indiModeGroup @@ -155,7 +155,7 @@ unnamed - + localR @@ -166,7 +166,7 @@ true - + serverR @@ -176,9 +176,9 @@ - + - layout6 + tqlayout6 @@ -216,7 +216,7 @@ Expanding - + 61 20 @@ -227,7 +227,7 @@ - + TabPage @@ -241,7 +241,7 @@ - Status + tqStatus true @@ -276,15 +276,15 @@ clientListView - + - layout5_2 + tqlayout5_2 unnamed - + groupBox1_2 @@ -321,7 +321,7 @@ - + groupBox2_2 @@ -366,7 +366,7 @@ Expanding - + 20 31 @@ -378,9 +378,9 @@ - + - layout6 + tqlayout6 @@ -396,14 +396,14 @@ Expanding - + 289 20 - + cancelB @@ -426,7 +426,7 @@ close() - + klistview.h kpushbutton.h diff --git a/kstars/kstars/dms.cpp b/kstars/kstars/dms.cpp index 724f9af2..587cca2c 100644 --- a/kstars/kstars/dms.cpp +++ b/kstars/kstars/dms.cpp @@ -59,19 +59,19 @@ bool dms::setFromString( const TQString &str, bool isDeg ) { //remove any instances of unit characters. //h, d, m, s, ', ", or the degree symbol (ASCII 176) - entry.replace( TQRegExp("h"), "" ); - entry.replace( TQRegExp("d"), "" ); - entry.replace( TQRegExp("m"), "" ); - entry.replace( TQRegExp("s"), "" ); + entry.tqreplace( TQRegExp("h"), "" ); + entry.tqreplace( TQRegExp("d"), "" ); + entry.tqreplace( TQRegExp("m"), "" ); + entry.tqreplace( TQRegExp("s"), "" ); TQString sdeg; sdeg.sprintf("%c", 176); - entry.replace( TQRegExp(sdeg), "" ); - entry.replace( TQRegExp("\'"), "" ); - entry.replace( TQRegExp("\""), "" ); + entry.tqreplace( TQRegExp(sdeg), "" ); + entry.tqreplace( TQRegExp("\'"), "" ); + entry.tqreplace( TQRegExp("\""), "" ); //Account for localized decimal-point settings //TQString::toDouble() requires that the decimal symbol is "." - entry.replace( KGlobal::locale()->decimalSymbol(), "." ); + entry.tqreplace( KGlobal::locale()->decimalSymbol(), "." ); //empty entry returns false if ( entry.isEmpty() ) { @@ -99,7 +99,7 @@ bool dms::setFromString( const TQString &str, bool isDeg ) { TQStringList fields; //check for colon-delimiters or space-delimiters - if ( entry.contains(':') ) + if ( entry.tqcontains(':') ) fields = TQStringList::split( ':', entry ); else fields = TQStringList::split( " ", entry ); @@ -120,8 +120,8 @@ bool dms::setFromString( const TQString &str, bool isDeg ) { else { double mx = fields[1].toDouble( &checkValue ); if ( checkValue ) { - fields[1] = TQString("%1").arg( int(mx) ); - fields.append( TQString("%1").arg( int( 60.0*(mx - int(mx)) ) ) ); + fields[1] = TQString("%1").tqarg( int(mx) ); + fields.append( TQString("%1").tqarg( int( 60.0*(mx - int(mx)) ) ) ); } else { setD( 0.0 ); return false; diff --git a/kstars/kstars/dms.h b/kstars/kstars/dms.h index 7cbbaa22..165b5ce1 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 parent angle itself. + *@warning does not change the value of the tqparent angle itself. */ const dms reduce( void ) const; diff --git a/kstars/kstars/dmsbox.cpp b/kstars/kstars/dmsbox.cpp index 1857b1bf..9faa30d5 100644 --- a/kstars/kstars/dmsbox.cpp +++ b/kstars/kstars/dmsbox.cpp @@ -26,8 +26,8 @@ #include #include -dmsBox::dmsBox(TQWidget *parent, const char *name, bool dg) - : KLineEdit(parent,name), EmptyFlag(true) { +dmsBox::dmsBox(TQWidget *tqparent, const char *name, bool dg) + : KLineEdit(tqparent,name), EmptyFlag(true) { setMaxLength(14); setMaximumWidth(160); setDegType( dg ); diff --git a/kstars/kstars/dmsbox.h b/kstars/kstars/dmsbox.h index c98bc2c1..81590a4e 100644 --- a/kstars/kstars/dmsbox.h +++ b/kstars/kstars/dmsbox.h @@ -42,16 +42,17 @@ class dmsBox : public KLineEdit { Q_OBJECT -Q_PROPERTY (bool degType READ degType WRITE setDegType) + TQ_OBJECT +TQ_PROPERTY (bool degType READ degType WRITE setDegType) public: /**Constructor for the dmsBox object. - *@param parent pointer to the parent QWidget + *@param tqparent pointer to the tqparent TQWidget *@param ni the name of the object *@param deg if TRUE use deg/arcmin/arcsec; otherwise * use hours/min/sec. */ - dmsBox(TQWidget *parent, const char *ni=0, bool deg=TRUE); + dmsBox(TQWidget *tqparent, const char *ni=0, bool deg=TRUE); /**Destructor (empty)*/ ~dmsBox(); diff --git a/kstars/kstars/draglistbox.cpp b/kstars/kstars/draglistbox.cpp index 74cd169f..bed2895b 100644 --- a/kstars/kstars/draglistbox.cpp +++ b/kstars/kstars/draglistbox.cpp @@ -21,8 +21,8 @@ #include "draglistbox.h" -DragListBox::DragListBox( TQWidget *parent, const char *name, WFlags f ) - : KListBox( parent, name, f ) { +DragListBox::DragListBox( TQWidget *tqparent, const char *name, WFlags f ) + : KListBox( tqparent, name, f ) { setAcceptDrops( TRUE ); dragging = FALSE; @@ -36,7 +36,7 @@ void DragListBox::dragEnterEvent( TQDragEnterEvent *evt ) evt->accept(); } -bool DragListBox::contains( const TQString &s ) const { +bool DragListBox::tqcontains( const TQString &s ) const { for ( uint i=0; i class TQDragEnterEvent; -class QDragDropEvent; +class TQDragDropEvent; /**@class DragListBox *@short Extension of KListBox that allows Drag-and-Drop @@ -32,17 +32,18 @@ class QDragDropEvent; class DragListBox : public KListBox { Q_OBJECT + TQ_OBJECT public: /**@short Default constructor */ - DragListBox( TQWidget *parent = 0, const char *name = 0, WFlags = 0 ); + DragListBox( TQWidget *tqparent = 0, const char *name = 0, WFlags = 0 ); /**@short Default destructor */ ~DragListBox(); int ignoreIndex() const { return IgnoreIndex; } - bool contains( const TQString &s ) const; + bool tqcontains( const TQString &s ) const; void dragEnterEvent( TQDragEnterEvent *evt ); void dropEvent( TQDropEvent *evt ); diff --git a/kstars/kstars/filesource.cpp b/kstars/kstars/filesource.cpp index 8e38d9a4..8a1854a4 100644 --- a/kstars/kstars/filesource.cpp +++ b/kstars/kstars/filesource.cpp @@ -27,7 +27,7 @@ FileSource::FileSource(KStarsData *ksdata, float magnitude) // kdDebug() << "count()=" << data->starList.count() << endl; fileNumber = ksdata->starList.count() / 1000 + 1; lineNumber = ksdata->starList.count() % 1000; - // the first file contains 12 comment lines at the beginning which must skipped + // the first file tqcontains 12 comment lines at the beginning which must skipped if (fileNumber == 1) { lineNumber += 12; } // kdDebug() << "fileNumber=" << fileNumber << " lineNumber=" << lineNumber << endl; diff --git a/kstars/kstars/filesource.h b/kstars/kstars/filesource.h index d9ab95d9..7de46055 100644 --- a/kstars/kstars/filesource.h +++ b/kstars/kstars/filesource.h @@ -90,7 +90,7 @@ class FileSource : public TQDataSource { *A low value needs longer to reload data, but it doesn't interrupt the *main event loop (it's smoother). *But it's important to know that 500 lines to read is very fast, but - *appending to QList in StarDataSink will take the most time and this + *appending to TQList in StarDataSink will take the most time and this *will also defined with this value. */ #define maxLines 500 diff --git a/kstars/kstars/finddialog.cpp b/kstars/kstars/finddialog.cpp index 29dfa6cb..c7719cc4 100644 --- a/kstars/kstars/finddialog.cpp +++ b/kstars/kstars/finddialog.cpp @@ -33,8 +33,8 @@ #include "objectnamelist.h" -FindDialog::FindDialog( TQWidget* parent ) : - KDialogBase( KDialogBase::Plain, i18n( "Find Object" ), Ok|Cancel, Ok, parent ), +FindDialog::FindDialog( TQWidget* tqparent ) : + KDialogBase( KDialogBase::Plain, i18n( "Find Object" ), Ok|Cancel, Ok, tqparent ), vlay(0), hlay(0), SearchList(0), SearchBox(0), filterTypeLabel(0), filterType(0), currentitem(0) { @@ -48,7 +48,7 @@ FindDialog::FindDialog( TQWidget* parent ) : SearchBox = new TQLineEdit( page, "SearchBox" ); filterTypeLabel = new TQLabel( page, "filterTypeLabel" ); - filterTypeLabel->setAlignment( AlignRight ); + filterTypeLabel->tqsetAlignment( AlignRight ); filterTypeLabel->setText( i18n( "Filter by type: " ) ); filterType = new TQComboBox( page, "filterType" ); @@ -73,7 +73,7 @@ FindDialog::FindDialog( TQWidget* parent ) : SearchList->setVScrollBarMode( TQListBox::AlwaysOn ); SearchList->setHScrollBarMode( TQListBox::AlwaysOff ); -//Pack Widgets into layout manager +//Pack Widgets into tqlayout manager hlay->addWidget( filterTypeLabel, 0, 0 ); hlay->addWidget( filterType, 0, 0 ); @@ -108,13 +108,13 @@ FindDialog::~FindDialog() { } void FindDialog::init() { - SearchBox->clear(); // QLineEdit + SearchBox->clear(); // TQLineEdit filterType->setCurrentItem(0); // show all types of objects filter(); } void FindDialog::filter() { //Filter the list of names with the string in the SearchBox - KStars *p = (KStars *)parent(); + KStars *p = (KStars *)tqparent(); SearchList->clear(); ObjectNameList &ObjNames = p->data()->ObjNames; @@ -132,13 +132,13 @@ void FindDialog::filter() { //Filter the list of names with the string in the S } } setListItemEnabled(); // Automatically highlight first item - SearchBox->setFocus(); // set cursor to QLineEdit + SearchBox->setFocus(); // set cursor to TQLineEdit } void FindDialog::filterByType() { - KStars *p = (KStars *)parent(); + KStars *p = (KStars *)tqparent(); - SearchList->clear(); // QListBox + SearchList->clear(); // TQListBox TQString searchFor = SearchBox->text().lower(); // search string ObjectNameList &ObjNames = p->data()->ObjNames; @@ -158,7 +158,7 @@ void FindDialog::filterByType() { } setListItemEnabled(); // Automatically highlight first item - SearchBox->setFocus(); // set cursor to QLineEdit + SearchBox->setFocus(); // set cursor to TQLineEdit } void FindDialog::setListItemEnabled() { @@ -169,7 +169,7 @@ void FindDialog::setListItemEnabled() { void FindDialog::updateSelection (TQListBoxItem *it) { currentitem = (SkyObjectNameListItem *) it; - SearchBox->setFocus(); // set cursor to QLineEdit + SearchBox->setFocus(); // set cursor to TQLineEdit } void FindDialog::setFilter( int f ) { @@ -198,7 +198,7 @@ void FindDialog::setFilter( int f ) { void FindDialog::slotOk() { //If no valid object selected, show a sorry-box. Otherwise, emit accept() if ( currentItem() == 0 ) { - TQString message = i18n( "No object named %1 found." ).arg( SearchBox->text() ); + TQString message = i18n( "No object named %1 found." ).tqarg( SearchBox->text() ); KMessageBox::sorry( 0, message, i18n( "Bad object name" ) ); } else { accept(); diff --git a/kstars/kstars/finddialog.h b/kstars/kstars/finddialog.h index 71059da0..b3e559d4 100644 --- a/kstars/kstars/finddialog.h +++ b/kstars/kstars/finddialog.h @@ -35,9 +35,9 @@ class TQListBoxItem; class SkyObjectNameListItem; /**@class FindDialog - *Dialog window for finding SkyObjects by name. The dialog contains + *Dialog window for finding SkyObjects by name. The dialog tqcontains *a TQListBox showing the list of named objects, a TQLineEdit for filtering - *the list by name, and a QCombobox for filtering the list by object type. + *the list by name, and a TQCombobox for filtering the list by object type. * *@short Find Object Dialog *@author Jason Harris @@ -46,12 +46,13 @@ class SkyObjectNameListItem; class FindDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: -/**Constructor. Creates all widgets and packs them in QLayouts. Connects +/**Constructor. Creates all widgets and packs them in TQLayouts. Connects *Signals and Slots. Runs initObjectList(). */ - FindDialog( TQWidget* parent = 0 ); + FindDialog( TQWidget* tqparent = 0 ); /**Destructor */ diff --git a/kstars/kstars/fitsheaderdialog.ui b/kstars/kstars/fitsheaderdialog.ui index 2a071439..d88eda84 100644 --- a/kstars/kstars/fitsheaderdialog.ui +++ b/kstars/kstars/fitsheaderdialog.ui @@ -1,10 +1,10 @@ fitsHeaderDialog - + fitsHeaderDialog - + 0 0 @@ -82,14 +82,14 @@ Expanding - + 300 20 - + closeB @@ -113,5 +113,5 @@ close() - + diff --git a/kstars/kstars/fitshistogram.cpp b/kstars/kstars/fitshistogram.cpp index 3d28de46..ddeb1897 100644 --- a/kstars/kstars/fitshistogram.cpp +++ b/kstars/kstars/fitshistogram.cpp @@ -37,9 +37,9 @@ - FITSHistogram::FITSHistogram(TQWidget *parent, const char * name) : histDialog(parent, name) + FITSHistogram::FITSHistogram(TQWidget *tqparent, const char * name) : histDialog(tqparent, name) { - viewer = (FITSViewer *) parent; + viewer = (FITSViewer *) tqparent; setModal(false); @@ -54,7 +54,7 @@ type = 0; napply=0; - histFrame->setCursor(Qt::CrossCursor); + histFrame->setCursor(TQt::CrossCursor); histFrame->setMouseTracking(true); setMouseTracking(true); @@ -75,14 +75,14 @@ void FITSHistogram::updateBoxes() { if (minSlider->value() == BARS) - minOUT->setText(TQString("%1").arg((int) viewer->stats.max)); + minOUT->setText(TQString("%1").tqarg((int) viewer->stats.max)); else - minOUT->setText(TQString("%1").arg( (int) ( ceil (minSlider->value() * binSize) + viewer->stats.min))); + minOUT->setText(TQString("%1").tqarg( (int) ( ceil (minSlider->value() * binSize) + viewer->stats.min))); if (maxSlider->value() == BARS) - maxOUT->setText(TQString("%1").arg((int) viewer->stats.max)); + maxOUT->setText(TQString("%1").tqarg((int) viewer->stats.max)); else - maxOUT->setText(TQString("%1").arg( (int) ( ceil (maxSlider->value() * binSize) + viewer->stats.min))); + maxOUT->setText(TQString("%1").tqarg( (int) ( ceil (maxSlider->value() * binSize) + viewer->stats.min))); update(); } @@ -165,7 +165,7 @@ void FITSHistogram::constructHistogram(float * buffer) kdDebug() << "Maximum height is " << maxHeight << " -- binsize " << binSize << endl; histogram = new TQPixmap(500, 150, 1); - histogram->fill(Qt::black); + histogram->fill(TQt::black); TQPainter p(histogram); TQPen pen( white, 1); p.setPen(pen); @@ -217,9 +217,9 @@ void FITSHistogram::updateIntenFreq(int x) int index = (int) ceil(x * binSize); - intensityOUT->setText(TQString("%1").arg((int) ( index + viewer->stats.min))); + intensityOUT->setText(TQString("%1").tqarg((int) ( index + viewer->stats.min))); - frequencyOUT->setText(TQString("%1").arg(histArray[x])); + frequencyOUT->setText(TQString("%1").tqarg(histArray[x])); } @@ -234,9 +234,9 @@ int FITSHistogram::findMax() return max; } -FITSHistogramCommand::FITSHistogramCommand(TQWidget * parent, FITSHistogram *inHisto, int newType, int lmin, int lmax) +FITSHistogramCommand::FITSHistogramCommand(TQWidget * tqparent, FITSHistogram *inHisto, int newType, int lmin, int lmax) { - viewer = (FITSViewer *) parent; + viewer = (FITSViewer *) tqparent; type = newType; histo = inHisto; oldImage = new TQImage(); diff --git a/kstars/kstars/fitshistogram.h b/kstars/kstars/fitshistogram.h index fe30c2d1..2d8fdfd4 100644 --- a/kstars/kstars/fitshistogram.h +++ b/kstars/kstars/fitshistogram.h @@ -29,9 +29,10 @@ class FITSHistogram : public histDialog { Q_OBJECT + TQ_OBJECT public: - FITSHistogram(TQWidget *parent, const char * name = 0); + FITSHistogram(TQWidget *tqparent, const char * name = 0); ~FITSHistogram(); void constructHistogram(float *buffer); @@ -63,7 +64,7 @@ class FITSHistogramCommand : public KCommand { public: - FITSHistogramCommand(TQWidget * parent, FITSHistogram *inHisto, int newType, int lmin, int lmax); + FITSHistogramCommand(TQWidget * tqparent, FITSHistogram *inHisto, int newType, int lmin, int lmax); ~FITSHistogramCommand(); void execute(); diff --git a/kstars/kstars/fitsimage.cpp b/kstars/kstars/fitsimage.cpp index d5d5ce3c..226cc74a 100644 --- a/kstars/kstars/fitsimage.cpp +++ b/kstars/kstars/fitsimage.cpp @@ -52,7 +52,7 @@ /* Load info */ typedef struct { - uint replace; /* replacement for blank/NaN-values */ + uint tqreplace; /* replacement for blank/NaN-values */ uint use_datamin;/* Use DATAMIN/MAX-scaling if possible */ uint compose; /* compose images with naxis==3 */ } FITSLoadVals; @@ -64,9 +64,9 @@ static FITSLoadVals plvals = 0 /* Dont compose images */ }; -FITSImage::FITSImage(TQWidget * parent, const char * name) : TQScrollView(parent, name), zoomFactor(1.2) +FITSImage::FITSImage(TQWidget * tqparent, const char * name) : TQScrollView(tqparent, name), zoomFactor(1.2) { - viewer = (FITSViewer *) parent; + viewer = (FITSViewer *) tqparent; reducedImgBuffer = NULL; displayImage = NULL; @@ -74,9 +74,9 @@ FITSImage::FITSImage(TQWidget * parent, const char * name) : TQScrollView(parent addChild(imgFrame); currentZoom = 0.0; - grayTable=new QRgb[256]; + grayTable=new TQRgb[256]; for (int i=0;i<256;i++) - grayTable[i]=qRgb(i,i,i); + grayTable[i]=tqRgb(i,i,i); viewport()->setMouseTracking(true); imgFrame->setMouseTracking(true); @@ -161,14 +161,14 @@ void FITSImage::contentsMouseMoveEvent ( TQMouseEvent * e ) if (validPoint) { - viewer->statusBar()->changeItem(TQString("%1 , %2").arg( (int) x).arg( (int) y), 0); + viewer->statusBar()->changeItem(TQString("%1 , %2").tqarg( (int) x).tqarg( (int) y), 0); viewer->statusBar()->changeItem( KGlobal::locale()->formatNumber( viewer->imgBuffer[(int) (y * width + x)], 3 ), 1 ); - setCursor(Qt::CrossCursor); + setCursor(TQt::CrossCursor); } else { //viewer->statusBar()->changeItem(TQString("(X,Y)"), 0); - setCursor(Qt::ArrowCursor); + setCursor(TQt::ArrowCursor); } } @@ -299,7 +299,7 @@ int FITSImage::loadFits (const char *filename) } trans.datamin = 0.0; trans.datamax = 255.0; - trans.replacement = plvals.replace; + trans.replacement = plvals.tqreplace; trans.dsttyp = 'c'; //displayImage->create(width, height, 32); @@ -338,7 +338,7 @@ int FITSImage::loadFits (const char *filename) //for (j=0; j < width; j++) //{ //val = dest[j]; - //displayImage->setPixel(j, i, qRgb(val, val, val)); + //displayImage->setPixel(j, i, tqRgb(val, val, val)); //} for (j = 0 ; j < width; j++) displayImage->setPixel(j, i, dest[j]); @@ -459,7 +459,7 @@ void FITSImage::fitsZoomDefault() } -FITSFrame::FITSFrame(FITSImage * img, TQWidget * parent, const char * name) : TQFrame(parent, name, Qt::WNoAutoErase) +FITSFrame::FITSFrame(FITSImage * img, TQWidget * tqparent, const char * name) : TQFrame(tqparent, name, TQt::WNoAutoErase) { image = img; setPaletteBackgroundColor(image->viewport()->paletteBackgroundColor()); diff --git a/kstars/kstars/fitsimage.h b/kstars/kstars/fitsimage.h index 72efc408..d0befa9b 100644 --- a/kstars/kstars/fitsimage.h +++ b/kstars/kstars/fitsimage.h @@ -44,6 +44,7 @@ class FITSFrame; class FITSImage : public TQScrollView { Q_OBJECT + TQ_OBJECT public: @@ -56,7 +57,7 @@ class FITSImage : public TQScrollView { friend class FITSChangeCommand; friend class FITSProcessCommand; - FITSImage(TQWidget * parent, const char * name = 0); + FITSImage(TQWidget * tqparent, const char * name = 0); ~FITSImage(); enum scaleType { FITSAuto = 0 , FITSLinear, FITSLog, FITSSqrt, FITSCustom }; @@ -73,7 +74,7 @@ class FITSImage : public TQScrollView { void clearMem(); private: - FITSViewer *viewer; /* parent FITSViewer */ + FITSViewer *viewer; /* tqparent FITSViewer */ FITSFrame *imgFrame; /* Frame holding the image */ TQImage *displayImage; /* FITS image that is displayed in the GUI */ TQImage *templateImage; /* backup image for currentImage */ @@ -85,7 +86,7 @@ class FITSImage : public TQScrollView { double currentWidth,currentHeight; /* Current width and height due to zoom */ const double zoomFactor; /* Image zoom factor */ double currentZoom; /* Current Zoom level */ - QRgb *grayTable; + TQRgb *grayTable; unsigned char *reducedImgBuffer; /* scaled image buffer (0-255) range */ @@ -105,12 +106,13 @@ class FITSImage : public TQScrollView { void fitsZoomDefault(); }; -class FITSFrame : public QFrame +class FITSFrame : public TQFrame { Q_OBJECT + TQ_OBJECT public: - FITSFrame(FITSImage * img, TQWidget * parent = 0, const char * name = 0); + FITSFrame(FITSImage * img, TQWidget * tqparent = 0, const char * name = 0); ~FITSFrame(); private: diff --git a/kstars/kstars/fitsprocess.cpp b/kstars/kstars/fitsprocess.cpp index 6a4d7fcd..ebb9e11d 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 *parent, TQStringList darkFiles, TQStringList flatFiles, TQStringList darkflatFiles, int darkMode, int flatMode, int darkflatMode) + FITSProcess::FITSProcess(FITSViewer *tqparent, TQStringList darkFiles, TQStringList flatFiles, TQStringList darkflatFiles, int darkMode, int flatMode, int darkflatMode) { float * buffer = NULL; darkCombineMode = darkMode; flatCombineMode = flatMode; darkflatCombineMode = darkflatMode; - viewer = parent; + viewer = tqparent; finalDark = NULL; finalFlat = NULL; finalDarkFlat = NULL; @@ -311,10 +311,10 @@ void FITSProcess::reduce() } -FITSProcessCommand::FITSProcessCommand(FITSViewer *parent) +FITSProcessCommand::FITSProcessCommand(FITSViewer *tqparent) { - viewer = parent; + viewer = tqparent; 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 da0e597e..0917148f 100644 --- a/kstars/kstars/fitsprocess.h +++ b/kstars/kstars/fitsprocess.h @@ -36,7 +36,7 @@ class TQImage; class FITSProcess { public: - FITSProcess(FITSViewer *parent, TQStringList darkFiles, TQStringList flatFiles, TQStringList darkflatFiles, int darkMode, int flatMode, int darkflatMode); + FITSProcess(FITSViewer *tqparent, 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 *parent); + FITSProcessCommand(FITSViewer *tqparent); ~FITSProcessCommand(); void execute(); diff --git a/kstars/kstars/fitsviewer.cpp b/kstars/kstars/fitsviewer.cpp index 2d0ca2ed..ccf0f75d 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 *parent, const char *name) - : KMainWindow (parent, name) +FITSViewer::FITSViewer (const KURL *url, TQWidget *tqparent, const char *name) + : KMainWindow (tqparent, name) { image = NULL; currentURL = *url; @@ -118,7 +118,7 @@ FITSViewer::FITSViewer (const KURL *url, TQWidget *parent, const char *name) statusBar()->insertItem("", 2); statusBar()->setItemFixed(2, 100); statusBar()->insertItem(i18n("Welcome to KStars FITS Viewer"), 3, 1, true); - statusBar()->setItemAlignment(3 , Qt::AlignLeft); + statusBar()->setItemAlignment(3 , TQt::AlignLeft); /* FITS initializations */ if (!initFITS()) @@ -131,41 +131,41 @@ FITSViewer::FITSViewer (const KURL *url, TQWidget *parent, const char *name) if (KSUtils::openDataFile( tempFile, "imgreduction.png" ) ) { - new KAction( i18n("Image Reduction"), tempFile.name(), KShortcut( "Ctrl+R" ), this, TQT_SLOT( imageReduction()), actionCollection(), "image_reduce"); + new KAction( i18n("Image Reduction"), tempFile.name(), KShortcut( "Ctrl+R" ), TQT_TQOBJECT(this), TQT_SLOT( imageReduction()), actionCollection(), "image_reduce"); tempFile.close(); } else - new KAction( i18n("Image Reduction"), "blend", KShortcut( "Ctrl+R" ), this, TQT_SLOT( imageReduction()), actionCollection(), "image_reduce"); + new KAction( i18n("Image Reduction"), "blend", KShortcut( "Ctrl+R" ), TQT_TQOBJECT(this), TQT_SLOT( imageReduction()), actionCollection(), "image_reduce"); /*if (KSUtils::openDataFile( tempFile, "bricon.png" ) ) { - new KAction( i18n("Brightness/Contrast"), tempFile.name(), KShortcut( "Ctrl+T" ), this, TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); + new KAction( i18n("Brightness/Contrast"), tempFile.name(), KShortcut( "Ctrl+T" ), TQT_TQOBJECT(this), TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); tempFile.close(); } else*/ - new KAction( i18n("Brightness/Contrast"), "contrast+", KShortcut( "Ctrl+T" ), this, TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); + new KAction( i18n("Brightness/Contrast"), "contrast+", KShortcut( "Ctrl+T" ), TQT_TQOBJECT(this), TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); if (KSUtils::openDataFile( tempFile, "histogram.png" ) ) { - new KAction ( i18n("Histogram"), tempFile.name(), KShortcut("Ctrl+H"), this, TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram"); + new KAction ( i18n("Histogram"), tempFile.name(), KShortcut("Ctrl+H"), TQT_TQOBJECT(this), TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram"); tempFile.close(); } else - new KAction ( i18n("Histogram"), "wizard", KShortcut("Ctrl+H"), this, TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram"); + new KAction ( i18n("Histogram"), "wizard", KShortcut("Ctrl+H"), TQT_TQOBJECT(this), TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram"); - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::close(this, TQT_SLOT(slotClose()), actionCollection()); - KStdAction::copy(this, TQT_SLOT(fitsCOPY()), actionCollection()); - KStdAction::zoomIn(image, TQT_SLOT(fitsZoomIn()), actionCollection()); - KStdAction::zoomOut(image, TQT_SLOT(fitsZoomOut()), actionCollection()); + KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection()); + KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection()); + KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection()); + KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(fitsCOPY()), actionCollection()); + KStdAction::zoomIn(TQT_TQOBJECT(image), TQT_SLOT(fitsZoomIn()), actionCollection()); + KStdAction::zoomOut(TQT_TQOBJECT(image), TQT_SLOT(fitsZoomOut()), actionCollection()); new KAction( i18n( "&Default Zoom" ), "viewmagfit.png", KShortcut( "Ctrl+D" ), - image, TQT_SLOT(fitsZoomDefault()), actionCollection(), "zoom_default" ); - new KAction( i18n( "Statistics"), "sum", 0, this, TQT_SLOT(fitsStatistics()), actionCollection(), "image_stats"); - new KAction( i18n( "FITS Header"), "frame_spreadsheet.png", 0, this, TQT_SLOT(fitsHeader()), actionCollection(), "fits_editor"); + TQT_TQOBJECT(image), TQT_SLOT(fitsZoomDefault()), actionCollection(), "zoom_default" ); + new KAction( i18n( "Statistics"), "sum", 0, TQT_TQOBJECT(this), TQT_SLOT(fitsStatistics()), actionCollection(), "image_stats"); + new KAction( i18n( "FITS Header"), "frame_spreadsheet.png", 0, TQT_TQOBJECT(this), TQT_SLOT(fitsHeader()), actionCollection(), "fits_editor"); - /* Create GUI */ + /* Create GUI */ createGUI("fitsviewer.rc"); /* initially resize in accord with KDE rules */ @@ -311,7 +311,7 @@ float * FITSViewer::loadData(const char *filename, float *buffer) if (fread(tempData, 1, width * height * bpp, ifp->fp) != (unsigned int) (width * height * bpp)) { - KMessageBox::error(0, i18n("Unable to read FITS data from file. %1.\n").arg(strerror(errno))); + KMessageBox::error(0, i18n("Unable to read FITS data from file. %1.\n").tqarg(strerror(errno))); return (NULL); } @@ -388,7 +388,7 @@ void FITSViewer::calculateStats() kdDebug() << "Average: " << stats.average << " - stddev: " << stats.stddev << endl; kdDebug() << "Width: " << stats.width << " - Height " << stats.height << " - bitpix " << stats.bitpix << endl;*/ - statusBar()->changeItem( TQString("%1 x %2").arg( (int) stats.width).arg( (int) stats.height), 2); + statusBar()->changeItem( TQString("%1 x %2").tqarg( (int) stats.width).tqarg( (int) stats.height), 2); } @@ -549,13 +549,13 @@ void FITSViewer::fileSave() currentURL = backupCurrent; return; } - if (currentURL.path().contains('.') == 0) currentURL.setPath(currentURL.path() + ".fits"); + if (currentURL.path().tqcontains('.') == 0) currentURL.setPath(currentURL.path() + ".fits"); if (TQFile::exists(currentURL.path())) { - int r=KMessageBox::warningContinueCancel(static_cast(parent()), + int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(tqparent()), i18n( "A file named \"%1\" already exists. " - "Overwrite it?" ).arg(currentURL.fileName()), + "Overwrite it?" ).tqarg(currentURL.fileName()), i18n( "Overwrite File?" ), i18n( "&Overwrite" ) ); @@ -588,8 +588,8 @@ void FITSViewer::fileSave() { recordList = record[j]; - if ( (index = recordList.find("BITPIX")) != -1) - recordList.replace(index, FITS_CARD_SIZE, bitpixRec); + if ( (index = recordList.tqfind("BITPIX")) != -1) + recordList.tqreplace(index, FITS_CARD_SIZE, bitpixRec); fwrite(recordList.ascii(), 1, FITS_RECORD_SIZE, ifp->fp); } @@ -692,7 +692,7 @@ void FITSViewer::fileSave() } else { - TQString message = i18n( "Invalid URL: %1" ).arg( currentURL.url() ); + TQString message = i18n( "Invalid URL: %1" ).tqarg( currentURL.url() ); KMessageBox::sorry( 0, message, i18n( "Invalid URL" ) ); } @@ -880,15 +880,15 @@ void FITSViewer::fitsStatistics() calculateStats(); - stat.widthOUT->setText(TQString("%1").arg(stats.width)); - stat.heightOUT->setText(TQString("%1").arg(stats.height)); - stat.bitpixOUT->setText(TQString("%1").arg(stats.bitpix)); - stat.maxOUT->setText(TQString("%1").arg(stats.max)); - stat.minOUT->setText(TQString("%1").arg(stats.min)); - stat.atMaxOUT->setText(TQString("%1").arg(stats.maxAt)); - stat.atMinOUT->setText(TQString("%1").arg(stats.minAt)); - stat.meanOUT->setText(TQString("%1").arg(stats.average)); - stat.stddevOUT->setText(TQString("%1").arg(stats.stddev)); + stat.widthOUT->setText(TQString("%1").tqarg(stats.width)); + stat.heightOUT->setText(TQString("%1").tqarg(stats.height)); + stat.bitpixOUT->setText(TQString("%1").tqarg(stats.bitpix)); + stat.maxOUT->setText(TQString("%1").tqarg(stats.max)); + stat.minOUT->setText(TQString("%1").tqarg(stats.min)); + stat.atMaxOUT->setText(TQString("%1").tqarg(stats.maxAt)); + stat.atMinOUT->setText(TQString("%1").tqarg(stats.minAt)); + stat.meanOUT->setText(TQString("%1").tqarg(stats.average)); + stat.stddevOUT->setText(TQString("%1").tqarg(stats.stddev)); stat.exec(); @@ -903,7 +903,7 @@ void FITSViewer::fitsHeader() fitsHeaderDialog header(this); header.headerView->setSorting(-1); - header.headerView->setColumnAlignment(1, Qt::AlignHCenter); + header.headerView->setColumnAlignment(1, TQt::AlignHCenter); for (unsigned int i=0; i < record.count(); i++) { @@ -914,14 +914,14 @@ void FITSViewer::fitsHeader() { property = recordList.left(FITS_CARD_SIZE); - equal = property.find('='); + equal = property.tqfind('='); if (equal == -1) { - if (property.contains(" ") != FITS_CARD_SIZE) + if (property.tqcontains(" ") != FITS_CARD_SIZE) cards << property << "" << ""; recordList.remove(0, FITS_CARD_SIZE); - if (property.find("END") != -1) + if (property.tqfind("END") != -1) break; else continue; @@ -929,11 +929,11 @@ void FITSViewer::fitsHeader() cards << property.left(equal); - slash = property.find("'"); + slash = property.tqfind("'"); if (slash != -1) - slash = property.find("'", slash + 1) + 1; + slash = property.tqfind("'", slash + 1) + 1; else - slash = property.find('/') - 1; + slash = property.tqfind('/') - 1; cards << property.mid(equal + 2, slash - (equal + 2)).simplifyWhiteSpace().remove("'"); cards << property.mid(slash + 1, FITS_CARD_SIZE - (slash + 1)).simplifyWhiteSpace(); @@ -952,9 +952,9 @@ void FITSViewer::fitsHeader() } -FITSChangeCommand::FITSChangeCommand(TQWidget * parent, int inType, TQImage* newIMG, TQImage *oldIMG) +FITSChangeCommand::FITSChangeCommand(TQWidget * tqparent, int inType, TQImage* newIMG, TQImage *oldIMG) { - viewer = (FITSViewer *) parent; + viewer = (FITSViewer *) tqparent; newImage = new TQImage(); oldImage = new TQImage(); *newImage = newIMG->copy(); diff --git a/kstars/kstars/fitsviewer.h b/kstars/kstars/fitsviewer.h index f630654a..37f1167c 100644 --- a/kstars/kstars/fitsviewer.h +++ b/kstars/kstars/fitsviewer.h @@ -47,6 +47,7 @@ class FITSHistogram; class FITSViewer : public KMainWindow { Q_OBJECT + TQ_OBJECT public: @@ -59,7 +60,7 @@ class FITSViewer : public KMainWindow { friend class FITSProcessCommand; /**Constructor. */ - FITSViewer (const KURL *imageName, TQWidget *parent, const char *name = 0); + FITSViewer (const KURL *imageName, TQWidget *tqparent, const char *name = 0); ~FITSViewer(); @@ -124,7 +125,7 @@ class FITSViewer : public KMainWindow { class FITSChangeCommand : public KCommand { public: - FITSChangeCommand(TQWidget * parent, int inType, TQImage *newIMG, TQImage *oldIMG); + FITSChangeCommand(TQWidget * tqparent, int inType, TQImage *newIMG, TQImage *oldIMG); ~FITSChangeCommand(); void execute(); diff --git a/kstars/kstars/focusdialog.cpp b/kstars/kstars/focusdialog.cpp index 4f243f0e..600b34a5 100644 --- a/kstars/kstars/focusdialog.cpp +++ b/kstars/kstars/focusdialog.cpp @@ -32,8 +32,8 @@ #include "dmsbox.h" #include "focusdialog.h" -FocusDialog::FocusDialog( TQWidget *parent ) - : KDialogBase( KDialogBase::Plain, i18n( "Set Focus Manually" ), Ok|Cancel, Ok, parent ) { +FocusDialog::FocusDialog( TQWidget *tqparent ) + : KDialogBase( KDialogBase::Plain, i18n( "Set Focus Manually" ), Ok|Cancel, Ok, tqparent ) { Point = 0; //initialize pointer to null UsedAltAz = false; //assume RA/Dec by default @@ -42,7 +42,7 @@ FocusDialog::FocusDialog( TQWidget *parent ) setMainWidget(page); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, spacingHint() ); fdlg = new FocusDialogDlg(page); - fdlg->epochName->setValidator( new KDoubleValidator( fdlg->epochName ) ); + fdlg->epochName->setValidator( new KDoubleValidator( TQT_TQOBJECT(fdlg->epochName) ) ); vlay->addWidget( fdlg ); connect( fdlg->raBox, TQT_SIGNAL(textChanged( const TQString & ) ), this, TQT_SLOT( checkLineEdits() ) ); @@ -81,7 +81,7 @@ void FocusDialog::validatePoint() { dms dec( fdlg->decBox->createDms( true, &decOk ) ); TQString message; - KStars *ks = (KStars*) parent(); + KStars *ks = (KStars*) tqparent(); if ( raOk && decOk ) { //make sure values are in valid range @@ -97,7 +97,7 @@ void FocusDialog::validatePoint() { Point = new SkyPoint( ra, dec ); double epoch0 = getEpoch( fdlg->epochName->text() ); long double jd0 = epochToJd ( epoch0 ); - Point->apparentCoord(jd0, ks->data()->ut().djd() ); + Point->aptqparentCoord(jd0, ks->data()->ut().djd() ); TQDialog::accept(); } else { @@ -152,7 +152,7 @@ long double FocusDialog::epochToJd (double epoch) { } -TQSize FocusDialog::sizeHint() const +TQSize FocusDialog::tqsizeHint() const { return TQSize(240,210); } diff --git a/kstars/kstars/focusdialog.h b/kstars/kstars/focusdialog.h index 6ca6858d..9b4d4807 100644 --- a/kstars/kstars/focusdialog.h +++ b/kstars/kstars/focusdialog.h @@ -35,9 +35,10 @@ class FocusDialogDlg; class FocusDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /**Constructor. */ - FocusDialog( TQWidget *parent=0 ); + FocusDialog( TQWidget *tqparent=0 ); /**Destructor (empty). */ ~FocusDialog(); @@ -46,7 +47,7 @@ public: SkyPoint* point() const { return Point; } /**@return suggested size of focus window. */ - TQSize sizeHint() const; + TQSize tqsizeHint() const; /**@return whether user set the AltAz coords */ bool usedAltAz() const { return UsedAltAz; } diff --git a/kstars/kstars/focusdialogdlg.ui b/kstars/kstars/focusdialogdlg.ui index f1cc486c..97600b6a 100644 --- a/kstars/kstars/focusdialogdlg.ui +++ b/kstars/kstars/focusdialogdlg.ui @@ -1,10 +1,10 @@ FocusDialogDlg - + FocusDialogDlg - + 0 0 @@ -16,11 +16,11 @@ unnamed - + fdTab - + rdTab @@ -31,7 +31,7 @@ unnamed - + raLabel @@ -61,7 +61,7 @@ Enter new Declination - + decLabel @@ -69,7 +69,7 @@ New dec: - + epochLabel @@ -77,7 +77,7 @@ Epoch: - + epochName @@ -90,7 +90,7 @@ - + aaTab @@ -101,7 +101,7 @@ unnamed - + azLabel @@ -109,7 +109,7 @@ New azimuth: - + altLabel @@ -138,7 +138,7 @@ Expanding - + 20 20 @@ -155,7 +155,7 @@ Expanding - + 20 20 @@ -201,10 +201,10 @@ 789c6dd7594f23471007f0f7fd14d6d6db2aaaf58c3db647511eb831b7317794879ac30760cc61c010e5bba7dcf5af5688167664fdb66bbaababbb67cccf1f8dab93c3c68f9fdf5e16b298968d7222cf8d1fd5eb6cf6f1e75f7ffcfded7b9a3656ff9aad46fafdb76fdf078b46d9389a3fd42bf04841699e964933b830b79a7019dd0b96955b895b5a703bcd572e08eea576ff6570ae0eedd477b792103f854b8b2fc6d1163f77237e646e37113f89b6f8307e3bf1785a8b0eedbc696eb7ad9db7e01ee6476ee4ffe0c6fd158c7c69182cde4eec6e87fea50dfbf8176e6ba7d07f96669999cfa325ccaf862bcc97a36dbccf60f178cee11cde706761f16917ae30fe6b7488a7851bf14d7327417f676eb4f756eea41e2f57e6d83e83919f6cba117f04235fd9765b3b0fa36dfc398cf973edc67a6fb951ffe768ab6765ee26b8dff213ef5f4630e2b9e7463ea7ee8ee5ff60ee2618af8eb6fe3238437eb91bf1299cdbfacad3cadd5617f5a11738c7fe4adcb8ffd68d7aeec15e8fc3683b9f62ee2518ef33dafa3f75e3bc957086f86eb4d56f3db8e8e6dd56f01a5cc1bbe65e629673d8ebd18d0efdc9058cf9f2c08df9e630ce037db8719ec37c7a9a7fb708f10267b65e7cef46fb3e9ca3fd23dad6ef0cf67abe99f304f95ec3a8871cbb71be52d8d777e8b6fee412f6f958be3adf5ea817b561afe7d86ded7c67ce13c46fc37ede2766c17a17059cd9f38e466e8c3f8eb6fd700f0b9ef7095c37cd3d37de178f2be76dcf876fa343bd790267f012f67a77cc319f69b4ed872e2ca8e732daeabfe3c6fa9cc235f21f9b8bd4f2a5cd687bfedbfd659ee7ede017b842becf6eb44fa3cbd0df8559b0ffe808ceb0ff37e01afba3652e52cc87a26dbe276ecca7097790ff73b4cdef0616ac4fdf6df1c2d1d67ee8c6f80318eb4bd1180ff529513f0ecf7b694b62f5a002ceccb2662e523c2fb7605f9f0fd8fbbf75e3bc2dcd3e9ebcb9f17ce8c05e8f83685bcf701e44eb2db65e4fd1b65eebe62245be53b8c6f3ffdd8dfd3933fbf884761f5f0edcd88f951bf118bf44bde926dae24fe01ae7af76e3f9169e2f45bb143c0f5fdcf6fea23b18f773eac6f3e63ddac6db75e37df5e8c6fbae65aebcde6d37beaf84f528aa52f03c9dc3359ea79939c627d136deab1befaf75b883ef23e76e3ccfaea36d7dc2f795322b05ebfb0ad738af7db7ad371f99fd7e59b8b13f276e9cdf1318f5e54337e6d78cb67cf761ec170efba1acaa1afd9db92d3f3a36d729ea77efc6f33cbccf2beddfe6478fe6d85e45dbfd851bf1577007f5d877e3bc86f5a9ea3a2d6cffdfc1debe116df5db73a39e37b0e777191dda257c7fa83b6e8a2eaae00eeceb13d6b7d69f325b79b058fd32b170c1a55ebffaac2ccae2b9e6118f79c253bd6ef9ee3fd7587fef79c60f7acf3cc617fcc84ffcac6d8ffcc20b7ee5377ee7257ff027aff1bac66ff0269716cf5b1ab7cd3bbcabb17ddee37d3ee0433ee2633ee1019ff290cff89c2ff89229c48b66f1ac3d5df135df7093134eb9c56dcef4b3c35dee71ce393111dbfa8c784a4205955451cd1d1ad1982634a55bbad3f80eddd38c1ef882e66cf52ab5ff2b8d7ea4277aa6175ad06bb866f446efb4d4df0ffad4fed762ffb7b44e1b9cd2266dd142c75e5ddb3cd0bb3e347a477bd9d5f83ee245e3f7689f0ee830f67d44c77412ee186946033aa5e197fecfe85c7bf7be2fe892aee89a6ea84989f6bfa434f4eff9df52c509b5d0779b32ea684d13ea528f728d1e882ebfce37f6cf077422b4ea5b440ad14af1a15452ab473aee52c65ff39789b64fe955f44eb9937b5d858c5b32d377c0c32a7fee7ecd5fe61aff284ff22c2fb290577993775db1443fb53ef2219f5ff2bf93356d5b970dd9d41eb77820dbb223bbab155ed55ffab2f725ffb1eccb81aed6931cca116ab490633909d10339fd5ffdef795d869ae7923bc27226e772415d5986b51d683663b9d4fcfbb1ff190fe54aaec35aeaa577ee20f24673e94b531249a585fc2b69ebfe3ed7dae91f75ba964b5c03e9d344ba1add93bce0826c3f87f3b2a9fb6f18aeba10ba2f563f25eb1b563771a5d17531e2513c5fba538b3111cd690dd73c7ef6a95f4c8aa99de12fe77da4951de9ffffea730be7fd9fdfbffd0b690edc6c - + checkLineEdits() - - + + dmsbox.h dmsbox.h diff --git a/kstars/kstars/fov.cpp b/kstars/kstars/fov.cpp index 2820221a..572bca0f 100644 --- a/kstars/kstars/fov.cpp +++ b/kstars/kstars/fov.cpp @@ -73,11 +73,11 @@ FOV::FOV( TQString sname ) { void FOV::draw( TQPainter &p, float pixelsize ) { p.setPen( TQColor( color() ) ); - p.setBrush( Qt::NoBrush ); + p.setBrush( TQt::NoBrush ); int w = p.viewport().width(); int h = p.viewport().height(); - switch ( shape() ) { + switch ( tqshape() ) { case 0: { //Square int s = int( pixelsize ); p.drawRect( (w - s)/2, (h - s)/2, s, s ); @@ -128,9 +128,9 @@ void FOV::draw( TQPainter &p, float pixelsize ) { } case 4: { // Solid Circle int s = int( pixelsize ); - p.setBrush( TQBrush ( TQColor( color() ), Qt::Dense4Pattern) ); + p.setBrush( TQBrush ( TQColor( color() ), TQt::Dense4Pattern) ); p.drawEllipse( (w - s)/2, (h - s)/2, s, s ); - p.setBrush(Qt::NoBrush); + p.setBrush(TQt::NoBrush); break; } } diff --git a/kstars/kstars/fov.h b/kstars/kstars/fov.h index 03d2f5c7..f37512ab 100644 --- a/kstars/kstars/fov.h +++ b/kstars/kstars/fov.h @@ -32,21 +32,21 @@ class FOV { public: FOV(); FOV( TQString name ); //in this case, read params from fov.dat - FOV( TQString name, float size, int shape=0, TQString color="#FFFFFF" ); + FOV( TQString name, float size, int tqshape=0, TQString color="#FFFFFF" ); ~FOV() {} // enum SHAPE { FOV_SQUARE=0, FOV_CIRCLE=1, FOV_CROSSHAIRS=2, FOV_BULLSEYE=3, FOV_UNKNOWN }; TQString name() const { return Name; } void setName( const TQString &n ) { Name = n; } - int shape() const { return Shape; } + int tqshape() const { return Shape; } void setShape( int s ) { Shape = s; } float size() const { return Size; } void setSize( float s ) { Size = s; } TQString color() const { return Color; } void setColor( const TQString &c ) { Color = c; } - /**@short draw the FOV symbol on a QPainter + /**@short draw the FOV symbol on a TQPainter *@param p reference to the target TQPainter. The painter should already be started. *@param size the size of the target symbol, in pixels. */ diff --git a/kstars/kstars/fovdialog.cpp b/kstars/kstars/fovdialog.cpp index 05080043..6cf848ac 100644 --- a/kstars/kstars/fovdialog.cpp +++ b/kstars/kstars/fovdialog.cpp @@ -39,10 +39,10 @@ //---------FOVDialog---------------// -FOVDialog::FOVDialog( TQWidget *parent ) - : KDialogBase( KDialogBase::Plain, i18n( "Set FOV Indicator" ), Ok|Cancel, Ok, parent ) { +FOVDialog::FOVDialog( TQWidget *tqparent ) + : KDialogBase( KDialogBase::Plain, i18n( "Set FOV Indicator" ), Ok|Cancel, Ok, tqparent ) { - ks = (KStars*)parent; + ks = (KStars*)TQT_TQWIDGET(tqparent); TQFrame *page = plainPage(); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 ); @@ -134,7 +134,7 @@ void FOVDialog::paintEvent( TQPaintEvent * ) { TQFont smallFont = p.font(); smallFont.setPointSize( p.font().pointSize() - 2 ); p.setFont( smallFont ); - p.drawText( 0, fov->ViewBox->contentsRect().height(), i18n("angular size in arcminutes", "%1 arcmin").arg( KGlobal::locale()->formatNumber( f->size() ), 3 ) ); + p.drawText( 0, fov->ViewBox->contentsRect().height(), i18n("angular size in arcminutes", "%1 arcmin").tqarg( KGlobal::locale()->formatNumber( f->size() ), 3 ) ); } } @@ -164,14 +164,14 @@ void FOVDialog::slotEditFOV() { newfdlg.ui->FOVName->setText( f->name() ); newfdlg.ui->FOVEdit->setText( KGlobal::locale()->formatNumber( f->size(), 3 ) ); newfdlg.ui->ColorButton->setColor( TQColor( f->color() ) ); - newfdlg.ui->ShapeBox->setCurrentItem( f->shape() ); + newfdlg.ui->ShapeBox->setCurrentItem( f->tqshape() ); newfdlg.slotUpdateFOV(); if ( newfdlg.exec() == TQDialog::Accepted ) { FOV *newfov = new FOV( newfdlg.ui->FOVName->text(), newfdlg.ui->FOVEdit->text().toDouble(), newfdlg.ui->ShapeBox->currentItem(), newfdlg.ui->ColorButton->color().name() ); fov->FOVListBox->changeItem( newfdlg.ui->FOVName->text(), fov->FOVListBox->currentItem() ); - FOVList.replace( fov->FOVListBox->currentItem(), newfov ); + FOVList.tqreplace( fov->FOVListBox->currentItem(), newfov ); } } @@ -192,8 +192,8 @@ void FOVDialog::slotRemoveFOV() { } //-------------NewFOV------------------// -NewFOV::NewFOV( TQWidget *parent ) - : KDialogBase( KDialogBase::Plain, i18n( "New FOV Indicator" ), Ok|Cancel, Ok, parent ), f() { +NewFOV::NewFOV( TQWidget *tqparent ) + : KDialogBase( KDialogBase::Plain, i18n( "New FOV Indicator" ), Ok|Cancel, Ok, tqparent ), f() { TQFrame *page = plainPage(); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 ); ui = new NewFOVUI( page ); @@ -231,21 +231,21 @@ void NewFOV::paintEvent( TQPaintEvent * ) { p.begin( ui->ViewBox ); p.fillRect( ui->ViewBox->contentsRect(), TQColor( "black" ) ); f.draw( p, (float)( 0.3*ui->ViewBox->contentsRect().width() ) ); - p.drawText( 0, 0, i18n("angular size in arcminutes", "%1 arcmin").arg( KGlobal::locale()->formatNumber( f.size() ), 3 ) ); + p.drawText( 0, 0, i18n("angular size in arcminutes", "%1 arcmin").tqarg( KGlobal::locale()->formatNumber( f.size() ), 3 ) ); p.end(); } void NewFOV::slotComputeFOV() { //DEBUG - kdDebug() << ":" << sender()->name() << ":" << endl; - if ( sender()->name() == TQString( "ComputeEyeFOV" ) ) kdDebug() << "A" << endl; - if ( sender()->name() == TQString( "ComputeEyeFOV" ) && ui->TLength1->value() > 0.0 ) kdDebug() << "B" << endl; + kdDebug() << ":" << TQT_TQOBJECT(const_cast(sender()))->name() << ":" << endl; + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "ComputeEyeFOV" ) ) kdDebug() << "A" << endl; + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "ComputeEyeFOV" ) && ui->TLength1->value() > 0.0 ) kdDebug() << "B" << endl; - if ( sender()->name() == TQString( "ComputeEyeFOV" ) && ui->TLength1->value() > 0.0 ) + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "ComputeEyeFOV" ) && ui->TLength1->value() > 0.0 ) ui->FOVEdit->setText( KGlobal::locale()->formatNumber( ui->EyeFOV->value() * ui->EyeLength->value() / ui->TLength1->value() ) ); - else if ( sender()->name() == TQString( "ComputeCameraFOV" ) && ui->TLength2->value() > 0.0 ) + else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "ComputeCameraFOV" ) && ui->TLength2->value() > 0.0 ) ui->FOVEdit->setText( KGlobal::locale()->formatNumber( ui->ChipSize->value() * 3438.0 / ui->TLength2->value() ) ); - else if ( sender()->name() == TQString( "ComputeHPBW" ) && ui->RTDiameter->value() > 0.0 && ui->WaveLength->value() > 0.0 ) { + else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "ComputeHPBW" ) && ui->RTDiameter->value() > 0.0 && ui->WaveLength->value() > 0.0 ) { ui->FOVEdit->setText( KGlobal::locale()->formatNumber( 34.34 * 1.2 * ui->WaveLength->value() / ui->RTDiameter->value() ) ); // Beam width for an antenna is usually a circle on the sky. ui->ShapeBox->setCurrentItem(4); diff --git a/kstars/kstars/fovdialog.h b/kstars/kstars/fovdialog.h index 8f7b6de8..02429390 100644 --- a/kstars/kstars/fovdialog.h +++ b/kstars/kstars/fovdialog.h @@ -34,8 +34,9 @@ class NewFOVUI; class FOVDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - FOVDialog( TQWidget *parent=0 ); + FOVDialog( TQWidget *tqparent=0 ); ~FOVDialog(); unsigned int currentItem() const; TQPtrList FOVList; @@ -63,8 +64,9 @@ private: class NewFOV : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - NewFOV( TQWidget *parent=0 ); + NewFOV( TQWidget *tqparent=0 ); ~NewFOV() {} NewFOVUI *ui; diff --git a/kstars/kstars/fovdialogui.ui b/kstars/kstars/fovdialogui.ui index 66ae1f5a..818f39bf 100644 --- a/kstars/kstars/fovdialogui.ui +++ b/kstars/kstars/fovdialogui.ui @@ -1,10 +1,10 @@ FOVDialogUI - + FOVDialogUI - + 0 0 @@ -23,7 +23,7 @@ FOVListBox - + 160 0 @@ -36,9 +36,9 @@ The list of defined field-of-view (FOV) symbols. You can add a symbol to the list using the "New" button, remove a symbol using the "Remove" button, and modify a symbol using the "Edit" button. A schematic of the highlighted symbol is drawn at right. - + - layout4 + tqlayout4 @@ -55,7 +55,7 @@ Add a new FOV symbol - Add a new field-of-view (FOV) symbol to the list. You can define the size, shape, and color of the new symbol. + Add a new field-of-view (FOV) symbol to the list. You can define the size, tqshape, and color of the new symbol. @@ -68,7 +68,7 @@ Fixed - + 20 16 @@ -86,7 +86,7 @@ Modify the highlighted FOV symbol - Press this button to modify the highlighted FOV symbol. You can change its size, shape and color. + Press this button to modify the highlighted FOV symbol. You can change its size, tqshape and color. @@ -113,14 +113,14 @@ Fixed - + 20 20 - + ViewBox @@ -132,7 +132,7 @@ 0 - + 80 80 @@ -169,7 +169,7 @@ Expanding - + 20 60 @@ -182,7 +182,7 @@ - + klistbox.h kpushbutton.h diff --git a/kstars/kstars/geolocation.h b/kstars/kstars/geolocation.h index c3b6524e..b1fa7e37 100644 --- a/kstars/kstars/geolocation.h +++ b/kstars/kstars/geolocation.h @@ -282,7 +282,7 @@ public: */ void geodToCart (void); -/**The geoid is an elliposid which fits the shape of the Earth. It is +/**The geoid is an elliposid which fits the tqshape of the Earth. It is *characterized by two parameters: the semimajor axis and the *flattening. * diff --git a/kstars/kstars/histdialog.ui b/kstars/kstars/histdialog.ui index 38b268e6..202106fc 100644 --- a/kstars/kstars/histdialog.ui +++ b/kstars/kstars/histdialog.ui @@ -1,10 +1,10 @@ histDialog - + histDialog - + 0 0 @@ -20,13 +20,13 @@ 0 - + 640 325 - + 640 325 @@ -42,15 +42,15 @@ unnamed - + - layout17 + tqlayout17 unnamed - + maxSlider @@ -58,7 +58,7 @@ Horizontal - + histFrame @@ -70,13 +70,13 @@ 0 - + 500 150 - + 500 150 @@ -89,7 +89,7 @@ Raised - + minSlider @@ -99,15 +99,15 @@ - + - layout5 + tqlayout5 unnamed - + maxLabel @@ -141,7 +141,7 @@ Expanding - + 130 20 @@ -164,7 +164,7 @@ true - + intensityLabel @@ -188,7 +188,7 @@ true - + frequencyLabel @@ -196,7 +196,7 @@ Frequency: - + minLabel @@ -222,9 +222,9 @@ - + - layout13 + tqlayout13 @@ -240,14 +240,14 @@ Expanding - + 270 20 - + applyB @@ -261,7 +261,7 @@ true - + cancelB @@ -274,7 +274,7 @@ - + scaleGroup @@ -285,7 +285,7 @@ unnamed - + autoR @@ -296,7 +296,7 @@ true - + linearR @@ -304,7 +304,7 @@ Linear - + logR @@ -312,7 +312,7 @@ Logarithmic - + sqrtR @@ -332,7 +332,7 @@ reject() - + klineedit.h klineedit.h diff --git a/kstars/kstars/imagereductiondlg.cpp b/kstars/kstars/imagereductiondlg.cpp index bfcafebc..842e9618 100644 --- a/kstars/kstars/imagereductiondlg.cpp +++ b/kstars/kstars/imagereductiondlg.cpp @@ -24,7 +24,7 @@ #include "imagereductiondlg.h" - ImageReductionDlg::ImageReductionDlg(TQWidget * parent, const char * name) : imageReductionUI(parent, name) + ImageReductionDlg::ImageReductionDlg(TQWidget * tqparent, const char * name) : imageReductionUI(tqparent, name) { connect(darkAddB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addDarkFile())); connect(flatAddB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addFlatFile())); @@ -52,7 +52,7 @@ ImageReductionDlg::~ImageReductionDlg() void ImageReductionDlg::addDarkFile() { - KURL::List fileURLs = KFileDialog::getOpenURLs( TQString::null, "*.fits *.fit *.fts|Flexible Image Transport System", 0, i18n("Dark Frames")); + KURL::List fileURLs = KFileDialog::getOpenURLs( TQString(), "*.fits *.fit *.fts|Flexible Image Transport System", 0, i18n("Dark Frames")); const int limit = (int) fileURLs.size(); for (int i=0; i < limit ; ++i) @@ -65,7 +65,7 @@ void ImageReductionDlg::addDarkFile() void ImageReductionDlg::addFlatFile() { - KURL::List fileURLs = KFileDialog::getOpenURLs( TQString::null, "*.fits *.fit *.fts|Flexible Image Transport System", 0, i18n("Flat Frames")); + KURL::List fileURLs = KFileDialog::getOpenURLs( TQString(), "*.fits *.fit *.fts|Flexible Image Transport System", 0, i18n("Flat Frames")); const int limit = (int) fileURLs.size(); @@ -79,7 +79,7 @@ void ImageReductionDlg::addFlatFile() void ImageReductionDlg::addDarkFlatFile() { - KURL::List fileURLs = KFileDialog::getOpenURLs( TQString::null, "*.fits *.fit *.fts|Flexible Image Transport System", 0, i18n("Dark Flat Frames")); + KURL::List fileURLs = KFileDialog::getOpenURLs( TQString(), "*.fits *.fit *.fts|Flexible Image Transport System", 0, i18n("Dark Flat Frames")); const int limit = (int) fileURLs.size(); for (int i=0; i < limit; ++i) diff --git a/kstars/kstars/imagereductiondlg.h b/kstars/kstars/imagereductiondlg.h index 2e7bff26..03feba93 100644 --- a/kstars/kstars/imagereductiondlg.h +++ b/kstars/kstars/imagereductiondlg.h @@ -23,9 +23,10 @@ class ImageReductionDlg : public imageReductionUI { Q_OBJECT + TQ_OBJECT public: - ImageReductionDlg(TQWidget * parent, const char * name = 0); + ImageReductionDlg(TQWidget * tqparent, const char * name = 0); ~ImageReductionDlg(); diff --git a/kstars/kstars/imagereductionui.ui b/kstars/kstars/imagereductionui.ui index 218e9ec2..38c43c9c 100644 --- a/kstars/kstars/imagereductionui.ui +++ b/kstars/kstars/imagereductionui.ui @@ -1,10 +1,10 @@ imageReductionUI - + imageReductionUI - + 0 0 @@ -19,15 +19,15 @@ unnamed - + - layout13 + tqlayout13 unnamed - + darkFrameGroup @@ -46,7 +46,7 @@ unnamed - + File Name @@ -77,9 +77,9 @@ LastColumn - + - layout8 + tqlayout8 @@ -95,14 +95,14 @@ Expanding - + 71 20 - + darkAddB @@ -110,7 +110,7 @@ Add... - + darkRemoveB @@ -121,7 +121,7 @@ Remove - + darkDetailsB @@ -136,7 +136,7 @@ - + darkbg @@ -147,7 +147,7 @@ unnamed - + darkAverageB @@ -158,7 +158,7 @@ true - + darkMedianB @@ -176,7 +176,7 @@ Expanding - + 20 31 @@ -187,9 +187,9 @@ - + - layout1 + tqlayout1 @@ -197,15 +197,15 @@ - + - layout14 + tqlayout14 unnamed - + FlatFieldFrameGroup @@ -224,7 +224,7 @@ unnamed - + File Name @@ -255,9 +255,9 @@ LastColumn - + - layout7 + tqlayout7 @@ -273,14 +273,14 @@ Expanding - + 71 20 - + flatAddB @@ -288,7 +288,7 @@ Add... - + flatRemoveB @@ -299,7 +299,7 @@ Remove - + flatDetailsB @@ -314,7 +314,7 @@ - + flatFieldbg @@ -325,7 +325,7 @@ unnamed - + flatAverageB @@ -336,7 +336,7 @@ true - + flatMedianB @@ -354,7 +354,7 @@ Expanding - + 20 31 @@ -365,15 +365,15 @@ - + - layout14_2 + tqlayout14_2 unnamed - + FlatFieldDarkFrameG @@ -392,7 +392,7 @@ unnamed - + File Name @@ -423,9 +423,9 @@ LastColumn - + - layout7_2 + tqlayout7_2 @@ -441,14 +441,14 @@ Expanding - + 71 20 - + darkflatAddB @@ -456,7 +456,7 @@ Add... - + darkflatRemoveB @@ -467,7 +467,7 @@ Remove - + darkflatDetailsB @@ -482,7 +482,7 @@ - + darkflatFieldbg @@ -493,7 +493,7 @@ unnamed - + darkflatAverageB @@ -504,7 +504,7 @@ true - + darkflatMedian @@ -522,7 +522,7 @@ Expanding - + 20 31 @@ -533,9 +533,9 @@ - + - layout12 + tqlayout12 @@ -551,14 +551,14 @@ Expanding - + 210 20 - + buttonOk @@ -575,7 +575,7 @@ true - + buttonCancel @@ -607,5 +607,5 @@ reject() - + diff --git a/kstars/kstars/imagesequence.cpp b/kstars/kstars/imagesequence.cpp index 7ad344da..adf1f3f9 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* parent, const char* name, bool modal, WFlags fl) -: imgSequenceDlg(parent,name, modal,fl) +imagesequence::imagesequence(TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: imgSequenceDlg(tqparent,name, modal,fl) { - ksw = (KStars *) parent; + ksw = (KStars *) tqparent; INDIMenu *devMenu = ksw->getINDIMenu(); if (devMenu) @@ -79,7 +79,7 @@ imagesequence::~imagesequence() { } -bool imagesequence::updateStatus() +bool imagesequence::updatetqStatus() { bool result; @@ -249,8 +249,8 @@ void imagesequence::startSequence() currentFilter = filterCombo->currentText(); lastFilter = filterCombo->currentItem(); - fullImgCountOUT->setText( TQString("%1").arg(seqTotalCount)); - currentImgCountOUT->setText(TQString("%1").arg(seqCurrentCount)); + fullImgCountOUT->setText( TQString("%1").tqarg(seqTotalCount)); + currentImgCountOUT->setText(TQString("%1").tqarg(seqCurrentCount)); // Ok, now let's connect signals and slots for this device connect(stdDevCCD, TQT_SIGNAL(FITSReceived(TQString)), this, TQT_SLOT(newFITS(TQString))); @@ -290,7 +290,7 @@ void imagesequence::stopSequence() if (stdDevCCD) { - stdDevCCD->seqCount = 0; + stdDevCCD->setqCount = 0; stdDevCCD->batchMode = false; stdDevCCD->ISOMode = false; @@ -315,7 +315,7 @@ void imagesequence::checkCCD(int ccdNum) if (!idevice) { - KMessageBox::error(this, i18n("INDI device %1 no longer exists.").arg(targetCCD)); + KMessageBox::error(this, i18n("INDI device %1 no longer exists.").tqarg(targetCCD)); CCDCombo->removeItem(ccdNum); lastCCD = CCDCombo->currentItem(); if (lastCCD != -1) @@ -325,7 +325,7 @@ void imagesequence::checkCCD(int ccdNum) if (!idevice->isOn()) { - KMessageBox::error(this, i18n("%1 is disconnected. Establish a connection to the device using the INDI Control Panel.").arg(targetCCD)); + KMessageBox::error(this, i18n("%1 is disconnected. Establish a connection to the device using the INDI Control Panel.").tqarg(targetCCD)); CCDCombo->setCurrentItem(lastCCD); return; @@ -344,7 +344,7 @@ void imagesequence::newFITS(TQString deviceLabel) seqCurrentCount++; imgProgress->setProgress(seqCurrentCount); - currentImgCountOUT->setText( TQString("%1").arg(seqCurrentCount)); + currentImgCountOUT->setText( TQString("%1").tqarg(seqCurrentCount)); // if we're done if (seqCurrentCount == seqTotalCount) @@ -395,7 +395,7 @@ bool imagesequence::verifyCCDIntegrity() if (!idevice) { - KMessageBox::error(this, i18n("INDI device %1 no longer exists.").arg(targetCCD)); + KMessageBox::error(this, i18n("INDI device %1 no longer exists.").tqarg(targetCCD)); CCDCombo->removeItem(CCDCombo->currentItem()); lastCCD = CCDCombo->currentItem(); return false; @@ -403,7 +403,7 @@ bool imagesequence::verifyCCDIntegrity() if (!idevice->isOn()) { - KMessageBox::error(this, i18n("%1 is disconnected. Establish a connection to the device using the INDI Control Panel.").arg(currentCCD)); + KMessageBox::error(this, i18n("%1 is disconnected. Establish a connection to the device using the INDI Control Panel.").tqarg(currentCCD)); return false; } @@ -449,7 +449,7 @@ bool imagesequence::verifyFilterIntegrity() filterDevice = devMenu->findDeviceByLabel(targetFilter); if (filterDevice == NULL) { - KMessageBox::error(this, i18n("INDI device %1 no longer exists.").arg(targetFilter)); + KMessageBox::error(this, i18n("INDI device %1 no longer exists.").tqarg(targetFilter)); filterCombo->removeItem(filterCombo->currentItem()); filterCombo->setCurrentItem(0); currentFilter = filterCombo->currentText(); @@ -461,7 +461,7 @@ bool imagesequence::verifyFilterIntegrity() // #2 Make sure it's connected if (!filterDevice->isOn()) { - KMessageBox::error(this, i18n("%1 is disconnected. Establish a connection to the device using the INDI Control Panel.").arg(targetFilter)); + KMessageBox::error(this, i18n("%1 is disconnected. Establish a connection to the device using the INDI Control Panel.").tqarg(targetFilter)); filterCombo->setCurrentItem(0); currentFilter = filterCombo->currentText(); filterPosCombo->clear(); @@ -568,7 +568,7 @@ void imagesequence::captureImage() if (seqExpose < exposeElem->min || seqExpose > exposeElem->max) { stopSequence(); - KMessageBox::error(this, i18n("Expose duration is invalid. %1 supports expose durations from %2 to %3 seconds only.").arg(currentCCD).arg(exposeElem->min).arg(exposeElem->max)); + KMessageBox::error(this, i18n("Expose duration is invalid. %1 supports expose durations from %2 to %3 seconds only.").tqarg(currentCCD).tqarg(exposeElem->min).tqarg(exposeElem->max)); return; } @@ -580,7 +580,7 @@ void imagesequence::captureImage() exposeElem->spinChanged(seqExpose); } else - exposeElem->write_w->setText( TQString("%1").arg(seqExpose)); + exposeElem->write_w->setText( TQString("%1").tqarg(seqExpose)); } @@ -609,19 +609,19 @@ void imagesequence::updateFilterCombo(int filterNum) if (filterList.empty()) for (unsigned int i=0; i <= filterMax; i++) - filterList << TQString("%1").arg(i); + filterList << TQString("%1").tqarg(i); // Fill filter combo if (filterList.count() <= filterMax) { filterPosCombo->insertStringList(filterList); for (unsigned int i = filterList.count() ; i <= filterMax ; i++) - filterPosCombo->insertItem(TQString("%1").arg(i)); + filterPosCombo->insertItem(TQString("%1").tqarg(i)); } else { // filterMax < filterList.count() for (unsigned int i = 0 ; i <= filterMax ; i++) - filterPosCombo->insertItem(TQString("%1").arg(filterList[i])); + filterPosCombo->insertItem(TQString("%1").tqarg(filterList[i])); } @@ -668,7 +668,7 @@ void imagesequence::selectFilter() filterElem->spinChanged(filterElem->targetValue); } else - filterElem->write_w->setText(TQString("%1").arg(filterElem->targetValue)); + filterElem->write_w->setText(TQString("%1").tqarg(filterElem->targetValue)); // We're done! Send it to the driver filterProp->newText(); diff --git a/kstars/kstars/imagesequence.h b/kstars/kstars/imagesequence.h index 8d467593..ceeacfbb 100644 --- a/kstars/kstars/imagesequence.h +++ b/kstars/kstars/imagesequence.h @@ -21,13 +21,14 @@ class INDIStdDevice; class imagesequence : public imgSequenceDlg { Q_OBJECT + TQ_OBJECT public: - imagesequence(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + imagesequence(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~imagesequence(); -bool updateStatus(); +bool updatetqStatus(); private: KStars *ksw; diff --git a/kstars/kstars/imageviewer.cpp b/kstars/kstars/imageviewer.cpp index 4d3e5a15..b92ee486 100644 --- a/kstars/kstars/imageviewer.cpp +++ b/kstars/kstars/imageviewer.cpp @@ -29,17 +29,17 @@ #include -ImageViewer::ImageViewer (const KURL *url, const TQString &capText, TQWidget *parent, const char *name) - : KMainWindow (parent, name), imageURL (*url), fileIsImage (false), +ImageViewer::ImageViewer (const KURL *url, const TQString &capText, TQWidget *tqparent, const char *name) + : KMainWindow (tqparent, 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 // JH: easier to just disable its mobility toolBar()->setMovingEnabled( false ); - KAction *action = new KAction (i18n ("Close Window"), "fileclose", CTRL+Key_Q, this, TQT_SLOT (close()), actionCollection()); + KAction *action = new KAction (i18n ("Close Window"), "fileclose", CTRL+Key_Q, TQT_TQOBJECT(this), TQT_SLOT (close()), actionCollection()); action->plug (toolBar()); - action = new KAction (i18n ("Save Image"), "filesave", CTRL+Key_S, this, TQT_SLOT (saveFileToDisc()), actionCollection()); + action = new KAction (i18n ("Save Image"), "filesave", CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT (saveFileToDisc()), actionCollection()); action->plug (toolBar()); statusBar()->insertItem( capText, 0, 1, true ); @@ -60,9 +60,9 @@ ImageViewer::~ImageViewer() { if (!file->remove()) // if the file was not complete downloaded the suffix is ".part" { - kdDebug()<name())<name())<setName (file->name() + ".part"); // set new suffix to filename - kdDebug()<name())<name())<remove()) kdDebug()<<"file removed\n"; else @@ -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(); // parent-widgets should not get this event, so it will be filtered + ev->accept(); // tqparent-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,9 +208,9 @@ void ImageViewer::saveFileToDisc() TQFile f (newURL.directory() + "/" + newURL.fileName()); if (f.exists()) { - int r=KMessageBox::warningContinueCancel(static_cast(parent()), + int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(tqparent()), i18n( "A file named \"%1\" already exists. " - "Overwrite it?" ).arg(newURL.fileName()), + "Overwrite it?" ).tqarg(newURL.fileName()), i18n( "Overwrite File?" ), i18n( "&Overwrite" ) ); if(r==KMessageBox::Cancel) return; diff --git a/kstars/kstars/imageviewer.h b/kstars/kstars/imageviewer.h index 0c317a25..ed475f6c 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 parent-widget can be used at + *The download-slave works asynchron so the tqparent-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. */ @@ -47,10 +47,11 @@ class TQFile; class ImageViewer : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /**Constructor. */ - ImageViewer (const KURL *imageName, const TQString &capText, TQWidget *parent, const char *name = 0); + ImageViewer (const KURL *imageName, const TQString &capText, TQWidget *tqparent, const char *name = 0); /**Destructor. If there is a partially downloaded image file, delete it.*/ ~ImageViewer(); diff --git a/kstars/kstars/imgsequencedlgui.ui b/kstars/kstars/imgsequencedlgui.ui index 024493fe..f73c9575 100644 --- a/kstars/kstars/imgsequencedlgui.ui +++ b/kstars/kstars/imgsequencedlgui.ui @@ -1,10 +1,10 @@ imgSequenceDlg - + imgSequenceDlg - + 0 0 @@ -25,7 +25,7 @@ unnamed - + progressGroup @@ -36,23 +36,23 @@ unnamed - + - layout25 + tqlayout25 unnamed - + - layout24 + tqlayout24 unnamed - + progressLabel @@ -60,11 +60,11 @@ Progress: - + currentImgCountOUT - + 50 0 @@ -77,7 +77,7 @@ - + textLabel1_4_2_2 @@ -85,11 +85,11 @@ of - + fullImgCountOUT - + 50 0 @@ -102,7 +102,7 @@ - + completedLabel @@ -141,7 +141,7 @@ Expanding - + 51 20 @@ -150,9 +150,9 @@ - + - layout9 + tqlayout9 @@ -168,14 +168,14 @@ Expanding - + 270 20 - + startB @@ -189,7 +189,7 @@ true - + stopB @@ -206,7 +206,7 @@ true - + closeB @@ -219,15 +219,15 @@ - + - layout10 + tqlayout10 unnamed - + setupGroup @@ -238,23 +238,23 @@ unnamed - + - layout30 + tqlayout30 unnamed - + - layout29 + tqlayout29 unnamed - + textLabel1_5 @@ -268,7 +268,7 @@ - + textLabel1 @@ -282,7 +282,7 @@ - + exposureLabel @@ -296,7 +296,7 @@ - + textLabel1_2 @@ -310,7 +310,7 @@ - + textLabel1_3 @@ -326,15 +326,15 @@ - + - layout28 + tqlayout28 unnamed - + CCDCombo @@ -375,7 +375,7 @@ - + ISOCheck @@ -391,7 +391,7 @@ - + setupGroup_2 @@ -402,15 +402,15 @@ unnamed - + - layout29_2 + tqlayout29_2 unnamed - + textLabel1_5_2 @@ -424,7 +424,7 @@ - + textLabel1_2_2 @@ -440,12 +440,12 @@ - + filterPosCombo - + filterCombo @@ -460,7 +460,7 @@ Expanding - + 21 81 @@ -483,7 +483,7 @@ stopB closeB - + kprogress.h klineedit.h diff --git a/kstars/kstars/indi/LICENSE b/kstars/kstars/indi/LICENSE index ae23fcfd..fbb61ee9 100644 --- a/kstars/kstars/indi/LICENSE +++ b/kstars/kstars/indi/LICENSE @@ -135,7 +135,7 @@ included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated +all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. @@ -257,7 +257,7 @@ linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline +structure tqlayouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the diff --git a/kstars/kstars/indi/Makefile.am b/kstars/kstars/indi/Makefile.am index 29aa23a6..ff4982c2 100644 --- a/kstars/kstars/indi/Makefile.am +++ b/kstars/kstars/indi/Makefile.am @@ -1,3 +1,6 @@ +# set the include path for X, qt and KDE +INCLUDES= $(all_includes) + appdatadir = $(kde_datadir)/kstars appdata_DATA = drivers.xml apogee_caminfo.xml @@ -17,45 +20,59 @@ noinst_LIBRARIES = liblilxml.a libindicom.a indiserver_SOURCES = indiserver.c fq.c indiserver_LDADD = liblilxml.a ${LIBPTHREAD} ${USE_THREADS} $(LIBSOCKET) +indiserver_LDFLAGS = $(LIB_QT) lx200generic_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c lx200autostar.cpp lx200_16.cpp lx200gps.cpp lx200generic.cpp lx200classic.cpp lx200generic_LDADD = liblilxml.a libindicom.a -lm +lx200generic_LDFLAGS = $(LIB_QT) lx200basic_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c lx200basic.cpp lx200basic_LDADD = liblilxml.a libindicom.a +lx200basic_LDFLAGS = $(LIB_QT) celestrongps_SOURCES = indidrivermain.c base64.c eventloop.c celestronprotocol.c celestrongps.cpp celestrongps_LDADD = liblilxml.a libindicom.a -lm +celestrongps_LDFLAGS = $(LIB_QT) apmount_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c apmount.cpp apmount_LDADD = liblilxml.a libindicom.a +apmount_LDFLAGS = $(LIB_QT) fliccd_SOURCES = eventloop.c base64.c fli_ccd.c indidrivermain.c fliccd_LDADD = fli/libfli.la libindicom.a liblilxml.a -lm -lz $(LIBSOCKET) +fliccd_LDFLAGS = $(LIB_QT) fliwheel_SOURCES = eventloop.c base64.c fli_wheel.c indidrivermain.c fliwheel_LDADD = fli/libfli.la libindicom.a liblilxml.a -lm +fliwheel_LDFLAGS = $(LIB_QT) v4ldriver_SOURCES = eventloop.c base64.c indidrivermain.c v4ldriver.cpp indi_v4l.cpp v4ldriver_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lm -lz +v4ldriver_LDFLAGS = $(LIB_QT) v4lphilips_SOURCES = eventloop.c base64.c indidrivermain.c v4ldriver.cpp v4lphilips.cpp indi_philips.cpp v4lphilips_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lm -lz +v4lphilips_LDFLAGS = $(LIB_QT) meade_lpi_SOURCES = eventloop.c base64.c indidrivermain.c v4ldriver.cpp indi_lpi.cpp meade_lpi_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lz +meade_lpi_LDFLAGS = $(LIB_QT) temma_SOURCES = indidrivermain.c base64.c eventloop.c temmadriver.c temma_LDADD = liblilxml.a libindicom.a -lm +temma_LDFLAGS = $(LIB_QT) skycommander_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c skycommander.c skycommander_LDADD = liblilxml.a libindicom.a -lm +skycommander_LDFLAGS = $(LIB_QT) apogee_ppi_SOURCES = apogee_ppi.cpp base64.c eventloop.c indidrivermain.c apogee_ppi_LDADD = libindicom.a liblilxml.a apogee/libapogee_PPI.la -lz +apogee_ppi_LDFLAGS = $(LIB_QT) sbigccd_SOURCES = sbigccd.cpp base64.c eventloop.c indidrivermain.c sbigccd_LDADD = libindicom.a liblilxml.a -lz +sbigccd_LDFLAGS = $(LIB_QT) install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(bindir) diff --git a/kstars/kstars/indi/apmount.cpp b/kstars/kstars/indi/apmount.cpp index d1c05b66..b400dbcb 100644 --- a/kstars/kstars/indi/apmount.cpp +++ b/kstars/kstars/indi/apmount.cpp @@ -40,7 +40,8 @@ #if !(TIMEZONE_IS_INT) -static int daylight = 0; +//static int daylight = 0; +int daylight = 0; #endif static inline double timezoneOffset() @@ -230,7 +231,7 @@ void APMount::initProperties() fillNumber(&EqN[0], "RA", "RA H:M:S", "%10.6m", 0., 24., 0., 0.); fillNumber(&EqN[1], "DEC", "Dec D:M:S", "%10.6m", -90., 90., 0., 0.); - fillNumberVector(&EqNP, EqN, NARRAY(EqN), mydev, "EQUATORIAL_EOD_COORD" , "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE); + fillNumberVector(&EqNP, EqN, NARRAY(EqN), mydev, "ETQUATORIAL_EOD_COORD" , "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE); fillNumber(&GeoN[0], "LAT", "Lat. D:M:S +N", "%10.6m", -90., 90., 0., 0.); fillNumber(&GeoN[1], "LONG", "Long. D:M:S +E", "%10.6m", 0., 360., 0., 0.); @@ -728,9 +729,9 @@ void APMount::ISNewSwitch (const char *dev, const char *name, ISState *states, c IUUpdateSwitches(&AlignmentSP, states, names, n); index = getOnSwitch(&AlignmentSP); - if ( ( err = setAlignmentMode(index) < 0) ) + if ( ( err = tqsetAlignmentMode(index) < 0) ) { - handleError(&AlignmentSP, err, "Setting alignment"); + handleError(&AlignmentSP, err, "Setting tqalignment"); return; } diff --git a/kstars/kstars/indi/apogee/ApnCamera.cpp b/kstars/kstars/indi/apogee/ApnCamera.cpp index 4e8c1b00..f96d228a 100644 --- a/kstars/kstars/indi/apogee/ApnCamera.cpp +++ b/kstars/kstars/indi/apogee/ApnCamera.cpp @@ -45,7 +45,7 @@ bool CApnCamera::Expose( double Duration, bool Light ) unsigned short TotalVPixels; - while ( read_ImagingStatus() != Apn_Status_Flushing ) + while ( read_ImagingtqStatus() != Apn_Status_Flushing ) { Sleep( 20 ); } @@ -128,7 +128,7 @@ bool CApnCamera::Expose( double Duration, bool Light ) PostRoiRows = 1; } - // Set up the geometry for a full frame device + // Set up the tqgeometry for a full frame device if ( m_ApnSensorInfo->m_EnableSingleRowOffset ) { PreRoiVBinning += PreRoiRows; @@ -296,7 +296,7 @@ unsigned short CApnCamera::GetExposurePixelsV() double CApnCamera::read_InputVoltage() { - UpdateGeneralStatus(); + UpdateGeneraltqStatus(); return m_pvtInputVoltage; } @@ -329,7 +329,7 @@ unsigned short CApnCamera::read_FirmwareVersion() bool CApnCamera::read_ShutterState() { - UpdateGeneralStatus(); + UpdateGeneraltqStatus(); return m_pvtShutterState; } @@ -559,15 +559,15 @@ void CApnCamera::write_DataBits( Apn_Resolution BitResolution ) } } -Apn_Status CApnCamera::read_ImagingStatus() +Apn_tqStatus CApnCamera::read_ImagingtqStatus() { bool Exposing, Active, Done, Flushing, WaitOnTrigger; bool DataHalted, RamError; - UpdateGeneralStatus(); + UpdateGeneraltqStatus(); - // Update the ImagingStatus + // Update the ImagingtqStatus Exposing = false; Active = false; Done = false; @@ -599,42 +599,42 @@ Apn_Status CApnCamera::read_ImagingStatus() if ( RamError ) { - m_pvtImagingStatus = Apn_Status_PatternError; + m_pvtImagingtqStatus = Apn_Status_PatternError; } else { if ( DataHalted ) { - m_pvtImagingStatus = Apn_Status_DataError; + m_pvtImagingtqStatus = Apn_Status_DataError; } else { if ( WaitOnTrigger ) { - m_pvtImagingStatus = Apn_Status_WaitingOnTrigger; + m_pvtImagingtqStatus = Apn_Status_WaitingOnTrigger; } else { if ( Done && m_pvtImageInProgress ) { m_pvtImageReady = true; - m_pvtImagingStatus = Apn_Status_ImageReady; + m_pvtImagingtqStatus = Apn_Status_ImageReady; } else { if ( Active ) { if ( Exposing ) - m_pvtImagingStatus = Apn_Status_Exposing; + m_pvtImagingtqStatus = Apn_Status_Exposing; else - m_pvtImagingStatus = Apn_Status_ImagingActive; + m_pvtImagingtqStatus = Apn_Status_ImagingActive; } else { if ( Flushing ) - m_pvtImagingStatus = Apn_Status_Flushing; + m_pvtImagingtqStatus = Apn_Status_Flushing; else - m_pvtImagingStatus = Apn_Status_Idle; + m_pvtImagingtqStatus = Apn_Status_Idle; } } } @@ -642,39 +642,39 @@ Apn_Status CApnCamera::read_ImagingStatus() } /* - switch( m_pvtImagingStatus ) + switch( m_pvtImagingtqStatus ) { case Apn_Status_DataError: - OutputDebugString( "ImagingStatus: Apn_Status_DataError" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_DataError" ); break; case Apn_Status_PatternError: - OutputDebugString( "ImagingStatus: Apn_Status_PatternError" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_PatternError" ); break; case Apn_Status_Idle: - OutputDebugString( "ImagingStatus: Apn_Status_Idle" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_Idle" ); break; case Apn_Status_Exposing: - OutputDebugString( "ImagingStatus: Apn_Status_Exposing" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_Exposing" ); break; case Apn_Status_ImagingActive: - OutputDebugString( "ImagingStatus: Apn_Status_ImagingActive" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_ImagingActive" ); break; case Apn_Status_ImageReady: - OutputDebugString( "ImagingStatus: Apn_Status_ImageReady" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_ImageReady" ); break; case Apn_Status_Flushing: - OutputDebugString( "ImagingStatus: Apn_Status_Flushing" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_Flushing" ); break; case Apn_Status_WaitingOnTrigger: - OutputDebugString( "ImagingStatus: Apn_Status_WaitingOnTrigger" ); + OutputDebugString( "ImagingtqStatus: Apn_Status_WaitingOnTrigger" ); break; default: - OutputDebugString( "ImagingStatus: UNDEFINED!!" ); + OutputDebugString( "ImagingtqStatus: UNDEFINED!!" ); break; } */ - return m_pvtImagingStatus; + return m_pvtImagingtqStatus; } Apn_LedMode CApnCamera::read_LedMode() @@ -763,16 +763,16 @@ void CApnCamera::write_CoolerEnable( bool CoolerEnable ) m_pvtCoolerEnable = CoolerEnable; } -Apn_CoolerStatus CApnCamera::read_CoolerStatus() +Apn_CoolertqStatus CApnCamera::read_CoolertqStatus() { bool CoolerAtTemp; bool CoolerActive; bool CoolerTempRevised; - UpdateGeneralStatus(); + UpdateGeneraltqStatus(); - // Update CoolerStatus + // Update CoolertqStatus CoolerActive = false; CoolerAtTemp = false; CoolerTempRevised = false; @@ -789,25 +789,25 @@ Apn_CoolerStatus CApnCamera::read_CoolerStatus() // Now derive our cooler state if ( !CoolerActive ) { - m_pvtCoolerStatus = Apn_CoolerStatus_Off; + m_pvtCoolertqStatus = Apn_CoolerStatus_Off; } else { if ( CoolerTempRevised ) { - m_pvtCoolerStatus = Apn_CoolerStatus_Revision; + m_pvtCoolertqStatus = Apn_CoolerStatus_Revision; } else { if ( CoolerAtTemp ) - m_pvtCoolerStatus = Apn_CoolerStatus_AtSetPoint; + m_pvtCoolertqStatus = Apn_CoolerStatus_AtSetPoint; else - m_pvtCoolerStatus = Apn_CoolerStatus_RampingToSetPoint; + m_pvtCoolertqStatus = Apn_CoolerStatus_RampingToSetPoint; } } - return m_pvtCoolerStatus; + return m_pvtCoolertqStatus; } double CApnCamera::read_CoolerSetPoint() @@ -874,14 +874,14 @@ void CApnCamera::write_CoolerBackoffPoint( double BackoffPoint ) double CApnCamera::read_CoolerDrive() { - UpdateGeneralStatus(); + UpdateGeneraltqStatus(); return m_pvtCoolerDrive; } double CApnCamera::read_TempCCD() { - // UpdateGeneralStatus(); + // UpdateGeneraltqStatus(); unsigned short TempReg; unsigned short TempAvg; @@ -910,7 +910,7 @@ double CApnCamera::read_TempCCD() double CApnCamera::read_TempHeatsink() { - // UpdateGeneralStatus(); + // UpdateGeneraltqStatus(); unsigned short TempReg; unsigned short TempAvg; @@ -1493,7 +1493,7 @@ long CApnCamera::InitDefaults() unsigned short PreRoiRows, PostRoiRows; unsigned short PreRoiVBinning, PostRoiVBinning; - unsigned short UnbinnedRoiY; // Vertical ROI pixels + unsigned short UnbinnedRoiY; //Qt::Vertical ROI pixels // Read the Camera ID register @@ -1782,8 +1782,8 @@ long CApnCamera::InitDefaults() Write( FPGA_REG_TEMP_RAMP_DOWN_A, m_ApnSensorInfo->m_TempRampRateOne ); Write( FPGA_REG_TEMP_RAMP_DOWN_B, m_ApnSensorInfo->m_TempRampRateTwo ); // the collor code not only determines the m_pvtCoolerEnable state, but - // also implicitly calls UpdateGeneralStatus() as part of read_CoolerStatus() - if ( read_CoolerStatus() == Apn_CoolerStatus_Off ) + // also implicitly calls UpdateGeneraltqStatus() as part of read_CoolertqStatus() + if ( read_CoolertqStatus() == Apn_CoolerStatus_Off ) m_pvtCoolerEnable = false; else m_pvtCoolerEnable = true; @@ -1827,7 +1827,7 @@ long CApnCamera::WriteTwelveBitOffset() return 0; } -void CApnCamera::UpdateGeneralStatus() +void CApnCamera::UpdateGeneraltqStatus() { unsigned short StatusReg; unsigned short HeatsinkTempReg; diff --git a/kstars/kstars/indi/apogee/ApnCamera.h b/kstars/kstars/indi/apogee/ApnCamera.h index b0e6af03..90f49ff2 100644 --- a/kstars/kstars/indi/apogee/ApnCamera.h +++ b/kstars/kstars/indi/apogee/ApnCamera.h @@ -129,7 +129,7 @@ public: void write_DataBits( Apn_Resolution BitResolution ); - Apn_Status read_ImagingStatus(); + Apn_tqStatus read_ImagingtqStatus(); Apn_LedMode read_LedMode(); void write_LedMode( Apn_LedMode LedMode ); @@ -138,7 +138,7 @@ public: bool read_CoolerEnable(); void write_CoolerEnable( bool CoolerEnable ); - Apn_CoolerStatus read_CoolerStatus(); + Apn_CoolertqStatus read_CoolertqStatus(); double read_CoolerSetPoint(); void write_CoolerSetPoint( double SetPoint ); double read_CoolerBackoffPoint(); @@ -231,7 +231,7 @@ public: long InitTwelveBitAD(); long WriteTwelveBitOffset(); - void UpdateGeneralStatus(); + void UpdateGeneraltqStatus(); // Internal private variables bool m_ResetVerticalArrays; @@ -264,8 +264,8 @@ public: double m_pvtCoolerBackoffPoint; - Apn_CoolerStatus m_pvtCoolerStatus; - Apn_Status m_pvtImagingStatus; + Apn_CoolertqStatus m_pvtCoolertqStatus; + Apn_tqStatus m_pvtImagingtqStatus; bool m_pvtShutterState; bool m_pvtImageInProgress; bool m_pvtImageReady; diff --git a/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp b/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp index cce9ba37..095dcf0a 100644 --- a/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp +++ b/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp @@ -16,14 +16,14 @@ bool CApnCamera::read_Present() { // OutputDebugString( "read_Present()" ); - USHORT ApStatus; + USHORT AptqStatus; USHORT DatumA; USHORT DatumB; char szMsg[80]; DatumA = 0x0; DatumB = 0x0; - ApStatus = 0; + AptqStatus = 0; Write( FPGA_REG_SCRATCH, 0x8086 ); Read( FPGA_REG_SCRATCH, DatumA ); diff --git a/kstars/kstars/indi/apogee/ApnCamera_NET.cpp b/kstars/kstars/indi/apogee/ApnCamera_NET.cpp index 0f739121..9113ae8f 100644 --- a/kstars/kstars/indi/apogee/ApnCamera_NET.cpp +++ b/kstars/kstars/indi/apogee/ApnCamera_NET.cpp @@ -92,7 +92,7 @@ bool CApnCamera::GetImageData( unsigned short *pImageBuffer, while ( !ImageReady() ) { Sleep( 50 ); - read_ImagingStatus(); + read_ImagingtqStatus(); } Width = m_pvtWidth; diff --git a/kstars/kstars/indi/apogee/ApnCamera_USB.cpp b/kstars/kstars/indi/apogee/ApnCamera_USB.cpp index a6bbad42..1661d028 100644 --- a/kstars/kstars/indi/apogee/ApnCamera_USB.cpp +++ b/kstars/kstars/indi/apogee/ApnCamera_USB.cpp @@ -76,7 +76,7 @@ bool CApnCamera::GetImageData( unsigned short *pImageBuffer, while ( !ImageReady() ) { Sleep( 50 ); - read_ImagingStatus(); + read_ImagingtqStatus(); } Width = m_pvtWidth; @@ -161,7 +161,7 @@ long CApnCamera::PostStopExposure( bool DigitizeData ) while ( !ImageReady() ) { Sleep( 50 ); - read_ImagingStatus(); + read_ImagingtqStatus(); } pRequestData = new USHORT[m_pvtWidth*m_pvtHeight]; diff --git a/kstars/kstars/indi/apogee/Apogee.h b/kstars/kstars/indi/apogee/Apogee.h index d97740b2..70c1c359 100644 --- a/kstars/kstars/indi/apogee/Apogee.h +++ b/kstars/kstars/indi/apogee/Apogee.h @@ -29,7 +29,7 @@ #define Apn_CameraMode_ExternalTrigger 3 #define Apn_CameraMode_ExternalShutter 4 -#define Apn_Status int +#define Apn_tqStatus int #define Apn_Status_DataError -2 #define Apn_Status_PatternError -1 #define Apn_Status_Idle 0 @@ -54,7 +54,7 @@ #define Apn_LedState_ExtStartReadout 6 #define Apn_LedState_AtTemp 7 -#define Apn_CoolerStatus int +#define Apn_CoolertqStatus int #define Apn_CoolerStatus_Off 0 #define Apn_CoolerStatus_RampingToSetPoint 1 #define Apn_CoolerStatus_AtSetPoint 2 @@ -67,7 +67,7 @@ #define Apn_FanMode_High 3 -#define Camera_Status int +#define Camera_tqStatus int #define Camera_Status_Idle 0 #define Camera_Status_Waiting 1 #define Camera_Status_Exposing 2 @@ -76,7 +76,7 @@ #define Camera_Status_ImageReady 5 #define Camera_Status_Flushing 6 -#define Camera_CoolerStatus int +#define Camera_CoolertqStatus int #define Camera_CoolerStatus_Off 0 #define Camera_CoolerStatus_RampingToSetPoint 1 #define Camera_CoolerStatus_Correcting 2 diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp index 67d217ec..2b97db7e 100644 --- a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp @@ -56,8 +56,8 @@ CCameraIO::CCameraIO() m_WaitingforLine = false; m_WaitingforTrigger = false; - m_Status = Camera_Status_Idle; - m_CoolerStatus = Camera_CoolerStatus_Off; + m_tqStatus = Camera_Status_Idle; + m_CoolertqStatus = Camera_CoolerStatus_Off; m_ExposureBinX = 0; m_ExposureBinY = 0; @@ -88,7 +88,7 @@ CCameraIO::CCameraIO() m_FastShutterBits_Mode = 0; m_FastShutterBits_Test = 0; - m_IRQMask = 0; + m_IRTQMask = 0; saveIRQS = 0; } @@ -240,7 +240,7 @@ bool CCameraIO::FilterHome() // Check for strobe unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( val & RegBit_GotTrigger ) { // Cycle all the way around if it's on the first time @@ -268,13 +268,13 @@ bool CCameraIO::FilterHome() Sleep ( STEP_DELAY ); val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( val & RegBit_GotTrigger ) { Sleep ( 10 ); val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( val & RegBit_GotTrigger ) { // Restore normal priority @@ -502,12 +502,12 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize int i; unsigned short BIC = m_ExposureBIC + m_ExposureStartX; - // Update internal variables in case application did not poll read_Status + // Update internal variables in case application did not poll read_tqStatus m_WaitingforTrigger = false; m_WaitingforLine = false; if ( m_WaitingforImage ) - { // In case application did not poll read_Status + { // In case application did not poll read_tqStatus m_WaitingforImage = false; ///////////////////////////////////// @@ -516,7 +516,7 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_FrameDone ) != 0 ) break; if ( clock() > StopTime ) return false; // Timed out @@ -553,7 +553,7 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break; // Line done if ( clock() > StopTime ) @@ -611,7 +611,7 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize if ( m_HighPriority ) SetPriorityClass ( hProcess, Class ); } -// UnmaskIrqs(); +// UntqmaskIrqs(); if ( ret ) { // We were successfull @@ -679,7 +679,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize ) int i; if ( m_WaitingforLine ) - { // In case application did not poll read_Status + { // In case application did not poll read_tqStatus m_WaitingforLine = false; ///////////////////////////////////// @@ -688,7 +688,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize ) while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break; // Line done if ( clock() > StopTime ) @@ -746,7 +746,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize ) if ( m_HighPriority ) SetPriorityClass ( hProcess, Class ); } -// UnmaskIrqs(); +// UntqmaskIrqs(); return ret; } @@ -763,10 +763,10 @@ bool CCameraIO::Snap( double Duration, bool Light, unsigned short* pImageData, s if ( m_WaitingforTrigger ) { - Camera_Status stat; + Camera_tqStatus stat; while ( true ) { // This will wait forever if no trigger happens - stat = read_Status(); + stat = read_tqStatus(); if ( stat == Camera_Status_Exposing ) break; Sleep( 220 ); // dont bog down the CPU while polling } @@ -778,7 +778,7 @@ bool CCameraIO::Snap( double Duration, bool Light, unsigned short* pImageData, s clock_t StopTime = clock() + long( ( 1.2 * Duration + m_Timeout ) * CLOCKS_PER_SEC ); while ( true ) { - Camera_Status stat = read_Status(); + Camera_tqStatus stat = read_tqStatus(); if ( stat == Camera_Status_ImageReady ) break; if ( clock() > StopTime ) return false; // Timed out, no image available @@ -791,43 +791,43 @@ bool CCameraIO::Snap( double Duration, bool Light, unsigned short* pImageData, s //////////////////////////////////////////////////////////// // Camera Settings -Camera_Status CCameraIO::read_Status() +Camera_tqStatus CCameraIO::read_tqStatus() { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( val & RegBit_Exposing ) //11.0 { ATLTRACE( "Exposing\r\n" ); m_WaitingforTrigger = false; - m_Status = Camera_Status_Exposing; + m_tqStatus = Camera_Status_Exposing; } else if ( m_WaitingforTrigger ) - m_Status = Camera_Status_Waiting; + m_tqStatus = Camera_Status_Waiting; else if ( m_WaitingforImage && ( val & RegBit_FrameDone ) ) //11.11 { ATLTRACE( "ImageReady\r\n" ); m_WaitingforImage = false; - m_Status = Camera_Status_ImageReady; + m_tqStatus = Camera_Status_ImageReady; } else if ( m_WaitingforLine && ( val & RegBit_LineDone ) ) //11.1 { ATLTRACE( "LineReady\r\n" ); m_WaitingforLine = false; - m_Status = Camera_Status_LineReady; + m_tqStatus = Camera_Status_LineReady; } else if ( m_WaitingforImage || m_WaitingforLine ) { ATLTRACE( "Flushing\r\n" ); - m_Status = Camera_Status_Flushing; + m_tqStatus = Camera_Status_Flushing; } else - m_Status = Camera_Status_Idle; + m_tqStatus = Camera_Status_Idle; - return m_Status; + return m_tqStatus; } bool CCameraIO::read_Present() @@ -839,13 +839,13 @@ bool CCameraIO::read_Present() bool FailedLoopback = false; unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( !( val & RegBit_LoopbackTest ) ) FailedLoopback = true; m_RegShadow[ Reg_BICCounter ] &= ~RegBit_LoopbackTest; // clear bit to 0 Write( Reg_BICCounter, m_RegShadow[ Reg_BICCounter ] ); - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( val & RegBit_LoopbackTest ) FailedLoopback = true; */ @@ -884,7 +884,7 @@ bool CCameraIO::read_Present() bool CCameraIO::read_Shutter() { unsigned short regval = 0; - Read( Reg_Status, regval ); + Read( Reg_tqStatus, regval ); if ( !( regval & RegBit_Exposing ) ) { // We are not exposing, but might have finnshed an exposure // and have not called GetImage yet, so update our internal variable @@ -917,7 +917,7 @@ void CCameraIO::write_ForceShutterOpen( bool val ) m_RegShadow[ Reg_Command ] &= ~RegBit_ShutterOverride; // clear bit to 0 unsigned short regval = 0; - Read( Reg_Status, regval ); + Read( Reg_tqStatus, regval ); if ( ( regval & RegBit_Exposing ) ) { // Shutter will remain open if a Light frame is being taken @@ -1076,7 +1076,7 @@ void CCameraIO::write_CoolerSetPoint( double val ) Write( Reg_TempSetPoint, m_RegShadow[ Reg_TempSetPoint ] ); } -Camera_CoolerStatus CCameraIO::read_CoolerStatus() +Camera_CoolertqStatus CCameraIO::read_CoolertqStatus() { unsigned short val = 0; Read( Reg_CommandReadback, val ); @@ -1084,34 +1084,34 @@ Camera_CoolerStatus CCameraIO::read_CoolerStatus() if ( val & RegBit_CoolerEnable ) //12.15 { unsigned short val2 = 0; - Read( Reg_Status, val2 ); + Read( Reg_tqStatus, val2 ); if ( val & RegBit_CoolerShutdown ) //12.8 { if ( val2 & RegBit_ShutdownComplete ) //11.6 - m_CoolerStatus = Camera_CoolerStatus_AtAmbient; + m_CoolertqStatus = Camera_CoolerStatus_AtAmbient; else - m_CoolerStatus = Camera_CoolerStatus_RampingToAmbient; + m_CoolertqStatus = Camera_CoolerStatus_RampingToAmbient; } else { if ( val2 & RegBit_TempAtMax ) //11.5 - m_CoolerStatus = Camera_CoolerStatus_AtMax; + m_CoolertqStatus = Camera_CoolerStatus_AtMax; else if ( val2 & RegBit_TempAtMin ) //11.4 - m_CoolerStatus = Camera_CoolerStatus_AtMin; + m_CoolertqStatus = Camera_CoolerStatus_AtMin; else if ( val2 & RegBit_TempAtSetPoint ) //11.7 - m_CoolerStatus = Camera_CoolerStatus_AtSetPoint; + m_CoolertqStatus = Camera_CoolerStatus_AtSetPoint; // Check against last known cooler status - else if ( m_CoolerStatus == Camera_CoolerStatus_AtSetPoint ) - m_CoolerStatus = Camera_CoolerStatus_Correcting; + else if ( m_CoolertqStatus == Camera_CoolerStatus_AtSetPoint ) + m_CoolertqStatus = Camera_CoolerStatus_Correcting; else - m_CoolerStatus = Camera_CoolerStatus_RampingToSetPoint; + m_CoolertqStatus = Camera_CoolerStatus_RampingToSetPoint; } } else - m_CoolerStatus = Camera_CoolerStatus_Off; + m_CoolertqStatus = Camera_CoolerStatus_Off; - return m_CoolerStatus; + return m_CoolertqStatus; } Camera_CoolerMode CCameraIO::read_CoolerMode() @@ -1319,7 +1319,7 @@ void CCameraIO::Flush( short Rows ) while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_FrameDone ) != 0 ) break; if ( clock() > StopTime ) break; // Timed out diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.h b/kstars/kstars/indi/apogee/CameraIO_Linux.h index d6a61e1c..62f50421 100644 --- a/kstars/kstars/indi/apogee/CameraIO_Linux.h +++ b/kstars/kstars/indi/apogee/CameraIO_Linux.h @@ -104,8 +104,8 @@ const long Reg_TempData = 9; // Register 10 const unsigned short RegBitShift_TempData = 0; // Bit 0 const unsigned short RegBitMask_TempData = 0xFF; // 8 bits -const long RegISA_Status = 0x006; // Register 11 in firmware -const long Reg_Status = 10; // Register 11 +const long RegISA_tqStatus = 0x006; // Register 11 in firmware +const long Reg_tqStatus = 10; // Register 11 const unsigned short RegBit_Exposing = 0x1; // Bit 0 const unsigned short RegBit_LineDone = 0x2; // Bit 1 const unsigned short RegBit_CacheReadOK = 0x4; // Bit 2 @@ -139,7 +139,7 @@ const long RegPCI_BICCounter = 0x01C; // Register 8 in PCI fir const long RegPCI_BICCounterRead = 0x03C; const long RegPCI_ImageData = 0x000; // Register 9 in PCI firmware const long RegPCI_TempData = 0x004; // Register 10 in PCI firmware -const long RegPCI_Status = 0x00C; // Register 11 in firmware +const long RegPCI_tqStatus = 0x00C; // Register 11 in firmware const long RegPCI_CommandReadback = 0x010; // Register 12 in PCI firmware @@ -161,7 +161,7 @@ public: //////////////////////////////////////////////////////////// // Camera Settings - Camera_Status read_Status(); // Current camera state + Camera_tqStatus read_tqStatus(); // Current camera state // <0: error codes // 0: idle // 1: flushing @@ -223,7 +223,7 @@ public: double read_CoolerSetPoint(); // Returns/sets setpoint temperature in degrees void write_CoolerSetPoint( double val ); // Celcius. - Camera_CoolerStatus read_CoolerStatus(); // Returns current cooler status + Camera_CoolertqStatus read_CoolertqStatus(); // Returns current cooler status Camera_CoolerMode read_CoolerMode(); // Returns/sets current cooler operation mode. void write_CoolerMode( Camera_CoolerMode val ); @@ -238,7 +238,7 @@ public: // Exposure Settings // The following variables are latched in Expose method, until next Reset or GetImage - short m_BinX, m_BinY; // Horizontal and vertical binning. + short m_BinX, m_BinY; //Qt::Horizontal and vertical binning. short m_StartX, m_StartY; // Zero based subframe start position in unbinned pixels. short m_NumX, m_NumY; // Subframe size in binned pixels. @@ -249,7 +249,7 @@ public: short m_Columns, m_Rows; // Total columns/rows on CCD (physical). short m_ImgColumns, m_ImgRows; // Unbinned columns/rows in imaging area short m_SkipC, m_SkipR; // Deleted data columns/rows not to be displayed or saved - short m_HFlush, m_VFlush; // Horizontal/Vertical flush binning. + short m_HFlush, m_VFlush; //Qt::Horizontal/Vertical flush binning. short m_BIC, m_BIR; // Before Image Column/Row count (dark non-imaging pixels). //////////////////////////////////////////////////////////// @@ -271,8 +271,8 @@ public: // Mask user requested set of IRQS // void MaskIrqs(); - // Restore default IRQ mask -// void UnmaskIrqs(); + // Restore default IRQ tqmask +// void UntqmaskIrqs(); // Starts flushing the camera (which should be the normal idle state) // If Rows is non-negative, only the specified number of rows are flushed, @@ -300,7 +300,7 @@ public: // The Duration parameter is the exposure time in seconds. The Light parameter controls // the status of the shutter during the exposure, Light = True opens the shutter, Light - // = False closes the shutter. Returns immediately after invocation, poll the CameraStatus + // = False closes the shutter. Returns immediately after invocation, poll the CameratqStatus // property to determine the start time of a triggered exposure and the end of an exposure. bool Expose( double Duration, bool Light ); @@ -314,7 +314,7 @@ public: // Drift scan methods // Begins clocking and digitization of a single line of data begining with a vertical clock - // sequence and ending with a buffer full of line data. Poll the CameraStatus property to + // sequence and ending with a buffer full of line data. Poll the CameratqStatus property to // determine when the data is ready for download. bool DigitizeLine(); @@ -346,7 +346,7 @@ public: short m_FilterStepPos; // Current filter position in our internal array bool m_Shutter; // Last known shutter state - Camera_Status m_Status; // Last known camera status + Camera_tqStatus m_tqStatus; // Last known camera status Camera_Interface m_Interface; // String acronyms may be used in INI file. // 0 or ISA: Industry Standard Architecture bus @@ -356,8 +356,8 @@ public: Camera_SensorType m_SensorType; // 0 or CCD: Charge Coupled Device // 1 or CMOS: Complementary Metal-Oxide-Silicon - Camera_CoolerStatus m_CoolerStatus; // Last known cooler status. - unsigned int m_IRQMask; // Set of IRQs masked on user request // 0: Off + Camera_CoolertqStatus m_CoolertqStatus; // Last known cooler status. + unsigned int m_IRTQMask; // Set of IRQs tqmasked on user request // 0: Off // 1: Ramping to set point // 2: Correcting // 3: Ramping to ambient @@ -367,12 +367,12 @@ public: // 7: At set point // Latched public variables used during Exposure..GetImage sequence - short m_ExposureBinX, m_ExposureBinY; // Horizontal and vertical binning. + short m_ExposureBinX, m_ExposureBinY; //Qt::Horizontal and vertical binning. short m_ExposureStartX, m_ExposureStartY; // Subframe start position in unbinned pixels. short m_ExposureNumX, m_ExposureNumY; // Subframe size in binned pixels. short m_ExposureColumns, m_ExposureRows; // Total columns/rows on CCD (physical). short m_ExposureSkipC, m_ExposureSkipR; // Deleted data columns/rows not to be displayed or saved to disk. - short m_ExposureHFlush, m_ExposureVFlush; // Horizontal/Vertical flush binning. + short m_ExposureHFlush, m_ExposureVFlush; //Qt::Horizontal/Vertical flush binning. short m_ExposureBIC, m_ExposureBIR; // Before Image Column/Row count (dark non-imaging pixels). unsigned short m_ExposureAIC; // Calculated After Image Column count (dark non-imaging pixels). unsigned short m_ExposureRemainingLines; // Number of lines to be clocked out by GetImage diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp index 16a6bb72..bbff2080 100644 --- a/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp @@ -145,8 +145,8 @@ long CCameraIO::Read( unsigned short reg, unsigned short& val ) case Reg_TempData: realreg = RegISA_TempData; break; - case Reg_Status: - realreg = RegISA_Status; + case Reg_tqStatus: + realreg = RegISA_tqStatus; break; case Reg_CommandReadback: realreg = RegISA_CommandReadback; @@ -212,7 +212,7 @@ long CCameraIO::ReadLine( long SkipPixels, long Pixels,unsigned short* pLineBuff while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done if ( clock() > StopTime ) return 1; // Timed out @@ -301,7 +301,7 @@ long CCameraIO::InternalReadLine( bool KeepData, long SkipC, long XEnd, unsigned while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done clock_t CurrentTime = clock(); diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp index a83a594e..15c139dd 100644 --- a/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp @@ -199,8 +199,8 @@ long CCameraIO::Read( unsigned short reg, unsigned short& val ) case Reg_TempData: RegNumber = RegPCI_TempData; break; - case Reg_Status: - RegNumber = RegPCI_Status; + case Reg_tqStatus: + RegNumber = RegPCI_tqStatus; break; case Reg_CommandReadback: RegNumber = RegPCI_CommandReadback; @@ -266,7 +266,7 @@ long CCameraIO::ReadLine( long SkipPixels, long Pixels,unsigned short* pLineBuff while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done if ( clock() > StopTime ) return 1; // Timed out @@ -355,7 +355,7 @@ long CCameraIO::InternalReadLine( bool KeepData, long SkipC, long XEnd, unsigned while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done clock_t CurrentTime = clock(); diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp index 7025d9ce..bb143e55 100644 --- a/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp @@ -147,8 +147,8 @@ long CCameraIO::Read( unsigned short reg, unsigned short& val ) case Reg_TempData: realreg = RegISA_TempData; break; - case Reg_Status: - realreg = RegISA_Status; + case Reg_tqStatus: + realreg = RegISA_tqStatus; break; case Reg_CommandReadback: realreg = RegISA_CommandReadback; @@ -216,7 +216,7 @@ long CCameraIO::ReadLine( long SkipPixels, long Pixels,unsigned short* pLineBuff while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done if ( clock() > StopTime ) return 1; // Timed out @@ -307,7 +307,7 @@ long CCameraIO::InternalReadLine( bool KeepData, long SkipC, long XEnd, unsigned while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done clock_t CurrentTime = clock(); diff --git a/kstars/kstars/indi/apogee/CameraIO_PCI.cpp b/kstars/kstars/indi/apogee/CameraIO_PCI.cpp index 3e6cc43e..ba9ce96d 100644 --- a/kstars/kstars/indi/apogee/CameraIO_PCI.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_PCI.cpp @@ -65,8 +65,8 @@ long CCameraIO_PCI::Read(unsigned short reg, unsigned short& val) case Reg_TempData: RegNumber = RegPCI_TempData; break; - case Reg_Status: - RegNumber = RegPCI_Status; + case Reg_tqStatus: + RegNumber = RegPCI_tqStatus; break; case Reg_CommandReadback: RegNumber = RegPCI_CommandReadback; @@ -268,7 +268,7 @@ long CCameraIO_PCI::ReadLine( long SkipPixels, long Pixels, unsigned short* pLin while ( true ) { unsigned short val = 0; - Read( Reg_Status, val ); + Read( Reg_tqStatus, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done if ( clock() > StopTime ) return 1; // Timed out diff --git a/kstars/kstars/indi/apogee/Camera_Example.cpp b/kstars/kstars/indi/apogee/Camera_Example.cpp index f1f64121..52a95f43 100644 --- a/kstars/kstars/indi/apogee/Camera_Example.cpp +++ b/kstars/kstars/indi/apogee/Camera_Example.cpp @@ -295,9 +295,9 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) } ///////////////////////////////////////////////////////////////////////////////// - // Necessary geometry settings + // Necessary tqgeometry settings - if (CfgGet (inifp, "geometry", "rows", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "rows", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXTOTALROWS ) cam->m_Rows = val; @@ -310,7 +310,7 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) return CCD_OPEN_CFGDATA; // rows MUST be defined } - if (CfgGet (inifp, "geometry", "columns", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "columns", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXTOTALCOLUMNS ) cam->m_Columns = val; @@ -490,31 +490,31 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) ///////////////////////////////////////////////////////////////////////////////// // Geometry - if (CfgGet (inifp, "geometry", "bic", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "bic", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXCOLUMNS ) cam->m_BIC = val; } - if (CfgGet (inifp, "geometry", "bir", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "bir", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXROWS ) cam->m_BIR = val; } - if (CfgGet (inifp, "geometry", "skipc", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "skipc", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 0 && val <= MAXCOLUMNS ) cam->m_SkipC = val; } - if (CfgGet (inifp, "geometry", "skipr", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "skipr", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 0 && val <= MAXROWS ) cam->m_SkipR = val; } - if (CfgGet (inifp, "geometry", "imgcols", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "imgcols", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXTOTALCOLUMNS ) cam->m_ImgColumns = val; @@ -522,7 +522,7 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) else cam->m_ImgColumns = cam->m_Columns - cam->m_BIC - cam->m_SkipC; - if (CfgGet (inifp, "geometry", "imgrows", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "imgrows", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXTOTALROWS ) cam->m_ImgRows = val; @@ -530,13 +530,13 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) else cam->m_ImgRows = cam->m_Rows - cam->m_BIR - cam->m_SkipR; - if (CfgGet (inifp, "geometry", "hflush", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "hflush", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXHBIN ) cam->m_HFlush = val; } - if (CfgGet (inifp, "geometry", "vflush", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "tqgeometry", "vflush", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXVBIN ) cam->m_VFlush = val; diff --git a/kstars/kstars/indi/apogee/Makefile.am b/kstars/kstars/indi/apogee/Makefile.am index 3d62dadc..a49927d4 100644 --- a/kstars/kstars/indi/apogee/Makefile.am +++ b/kstars/kstars/indi/apogee/Makefile.am @@ -1,4 +1,6 @@ -INCLUDES = +# set the include path for X, qt and KDE +INCLUDES= $(all_includes) + METASOURCES = AUTO if HAVE_LIBUSB diff --git a/kstars/kstars/indi/apogee_ppi.cpp b/kstars/kstars/indi/apogee_ppi.cpp index 9898018f..6eb7063c 100644 --- a/kstars/kstars/indi/apogee_ppi.cpp +++ b/kstars/kstars/indi/apogee_ppi.cpp @@ -393,7 +393,7 @@ void ApogeeCam::ISNewNumber (const char */*dev*/, const char *name, double value void ApogeeCam::ISPoll() { static int mtc=5; - int readStatus=0; + int readtqStatus=0; double ccdTemp; if (!isCCDConnected()) @@ -407,16 +407,16 @@ void ApogeeCam::ISPoll() case IPS_BUSY: - readStatus = cam->read_Status(); - if (readStatus < 0) + readtqStatus = cam->read_tqStatus(); + if (readtqStatus < 0) { - IDLog("Error in exposure! Read status: %d\n", readStatus); + IDLog("Error in exposure! Read status: %d\n", readtqStatus); ExposeTimeNP.s = IPS_ALERT; ExposeTimeN[0].value = 0; - IDSetNumber(&ExposeTimeNP, "Error in exposure procedure. Read states: %d", readStatus); + IDSetNumber(&ExposeTimeNP, "Error in exposure procedure. Read states: %d", readtqStatus); return; } - else if (readStatus == Camera_Status_ImageReady) + else if (readtqStatus == Camera_Status_ImageReady) { ExposeTimeN[0].value = 0; ExposeTimeNP.s = IPS_OK; @@ -891,7 +891,7 @@ bool ApogeeCam::initCamera() { LilXML *XMLParser = newLilXML(); XMLEle *root = NULL, *camera = NULL, *ele = NULL; - XMLEle *system = NULL, *geometry = NULL, *temp = NULL, *ccd = NULL; + XMLEle *system = NULL, *tqgeometry = NULL, *temp = NULL, *ccd = NULL; XMLAtt *ap; FILE *spFile = NULL; char errmsg[1024]; @@ -948,7 +948,7 @@ bool ApogeeCam::initCamera() // Let's get the subsections now system = findXMLEle(camera, "System"); - geometry = findXMLEle(camera, "Geometry"); + tqgeometry = findXMLEle(camera, "Geometry"); temp = findXMLEle(camera, "Temp"); ccd = findXMLEle(camera, "CCD"); @@ -960,7 +960,7 @@ bool ApogeeCam::initCamera() return false; } - if (geometry == NULL) + if (tqgeometry == NULL) { IDLog("Error: Unable to find Geometry element in camera.\n"); IDMessage(mydev, "Error: Unable to find Geometry element in camera."); @@ -1000,7 +1000,7 @@ bool ApogeeCam::initCamera() bAddr = hextoi(valuXMLAtt(findXMLAtt(system, "Base"))) & 0xFFF; // Rows - ap = findXMLAtt(geometry, "Rows"); + ap = findXMLAtt(tqgeometry, "Rows"); if (!ap) { IDLog("Error: Unable to find attribute Rows.\n"); @@ -1012,7 +1012,7 @@ bool ApogeeCam::initCamera() cam->m_Rows = hextoi(valuXMLAtt(ap)); // Columns - ap = findXMLAtt(geometry, "Columns"); + ap = findXMLAtt(tqgeometry, "Columns"); if (!ap) { IDLog("Error: Unable to find attribute Columns.\n"); @@ -1210,7 +1210,7 @@ bool ApogeeCam::initCamera() } // BIC - ele = findXMLEle(geometry, "BIC"); + ele = findXMLEle(tqgeometry, "BIC"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1219,7 +1219,7 @@ bool ApogeeCam::initCamera() } // BIR - ele = findXMLEle(geometry, "BIR"); + ele = findXMLEle(tqgeometry, "BIR"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1228,7 +1228,7 @@ bool ApogeeCam::initCamera() } // SKIPC - ele = findXMLEle(geometry, "SKIPC"); + ele = findXMLEle(tqgeometry, "SKIPC"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1237,7 +1237,7 @@ bool ApogeeCam::initCamera() } // SKIPR - ele = findXMLEle(geometry, "SKIPR"); + ele = findXMLEle(tqgeometry, "SKIPR"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1246,7 +1246,7 @@ bool ApogeeCam::initCamera() } // IMG COlS - ele = findXMLEle(geometry, "ImgCols"); + ele = findXMLEle(tqgeometry, "ImgCols"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1257,7 +1257,7 @@ bool ApogeeCam::initCamera() cam->m_ImgColumns = cam->m_Columns - cam->m_BIC - cam->m_SkipC; // IMG ROWS - ele = findXMLEle(geometry, "ImgRows"); + ele = findXMLEle(tqgeometry, "ImgRows"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1268,7 +1268,7 @@ bool ApogeeCam::initCamera() cam->m_ImgRows = cam->m_Rows - cam->m_BIR - cam->m_SkipR; // Hor Flush - ele = findXMLEle(geometry, "HFlush"); + ele = findXMLEle(tqgeometry, "HFlush"); if (ele) { val = hextoi(pcdataXMLEle(ele)); @@ -1277,7 +1277,7 @@ bool ApogeeCam::initCamera() } // Ver Flush - ele = findXMLEle(geometry, "VFlush"); + ele = findXMLEle(tqgeometry, "VFlush"); if (ele) { val = hextoi(pcdataXMLEle(ele)); diff --git a/kstars/kstars/indi/base64.c b/kstars/kstars/indi/base64.c index 28424512..e83db546 100644 --- a/kstars/kstars/indi/base64.c +++ b/kstars/kstars/indi/base64.c @@ -30,7 +30,7 @@ #include "base64.h" static const char base64digits[] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; #define BAD (-1) static const char base64val[] = { diff --git a/kstars/kstars/indi/celestrongps.cpp b/kstars/kstars/indi/celestrongps.cpp index a187aaf8..e25c95ac 100644 --- a/kstars/kstars/indi/celestrongps.cpp +++ b/kstars/kstars/indi/celestrongps.cpp @@ -65,7 +65,7 @@ static INumber eq[] = { }; //TODO decide appropiate TIME_OUT static INumberVectorProperty eqNum = { - mydev, "EQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE, + mydev, "ETQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE, eq, NARRAY(eq), "", 0}; /* Fundamental group */ @@ -125,7 +125,7 @@ CelestronGPS::CelestronGPS() JD = 0; - // Children call parent routines, this is the default + // Children call tqparent routines, this is the default IDLog("initilizaing from Celeston GPS device...\n"); } @@ -316,7 +316,7 @@ void CelestronGPS::ISNewNumber (const char *dev, const char *name, double values JD = UTtoJD(tp); IDLog("We recevined JNOW RA %f - DEC %f\n", newRA, newDEC);; - /*apparentCoord( (double) J2000, JD, &newRA, &newDEC); + /*aptqparentCoord( (double) J2000, JD, &newRA, &newDEC); IDLog("Processed to RA %f - DEC %f\n", newRA, newDEC);*/ //eqNum.np[0].value = values[0]; @@ -637,7 +637,7 @@ void CelestronGPS::ISPoll() currentRA = targetRA; currentDEC = targetDEC; - /*apparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ + /*aptqparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ eqNum.np[0].value = currentRA; eqNum.np[1].value = currentDEC; @@ -693,7 +693,7 @@ void CelestronGPS::ISPoll() currentRA = GetRA(); currentDEC = GetDec(); - /*apparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ + /*aptqparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ eqNum.np[0].value = currentRA; diff --git a/kstars/kstars/indi/fitsrw.c b/kstars/kstars/indi/fitsrw.c index b21622bf..69b934b2 100644 --- a/kstars/kstars/indi/fitsrw.c +++ b/kstars/kstars/indi/fitsrw.c @@ -1676,7 +1676,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, {double offs, scale; double datadiff, pixdiff; unsigned char pixbuffer[4096], *pix, *cdata; - unsigned char creplace; + unsigned char ctqreplace; int transcount = 0; long tdata, tmin, tmax; int maxelem; @@ -1706,7 +1706,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, if (tmax < 0) tmax = 0; else if (tmax > 255) tmax = 255; cdata = (unsigned char *)buf; - creplace = (unsigned char)trans->replacement; + ctqreplace = (unsigned char)trans->replacement; switch (hdulist->bitpix) { @@ -1727,7 +1727,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, { bp8 = (FITS_BITPIX8)*(pix++); if (bp8 == bp8blank) /* Is it a blank pixel ? */ - *(cdata++) = creplace; + *(cdata++) = ctqreplace; else /* Do transform */ { tdata = (long)(bp8 * scale + offs); @@ -1770,7 +1770,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, { FITS_GETBITPIX16 (pix, bp16); if (bp16 == bp16blank) - *(cdata++) = creplace; + *(cdata++) = ctqreplace; else { tdata = (long)(bp16 * scale + offs); @@ -1815,7 +1815,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, { FITS_GETBITPIX32 (pix, bp32); if (bp32 == bp32blank) - *(cdata++) = creplace; + *(cdata++) = ctqreplace; else { tdata = (long)(bp32 * scale + offs); @@ -1856,7 +1856,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, while (maxelem--) { if (fits_nan_32 (pix)) /* An IEEE special value ? */ - *(cdata++) = creplace; + *(cdata++) = ctqreplace; else /* Do transform */ { FITS_GETBITPIXM32 (pix, bpm32); @@ -1884,7 +1884,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, while (maxelem--) { if (fits_nan_64 (pix)) - *(cdata++) = creplace; + *(cdata++) = ctqreplace; else { FITS_GETBITPIXM64 (pix, bpm64); diff --git a/kstars/kstars/indi/fli/libfli.c b/kstars/kstars/indi/fli/libfli.c index 68df7945..f089403c 100644 --- a/kstars/kstars/indi/fli/libfli.c +++ b/kstars/kstars/indi/fli/libfli.c @@ -489,7 +489,7 @@ LIBFLIAPI FLIGetVisibleArea(flidev_t dev, long* ul_x, long* ul_y, @see FLIExposeFrame @see FLICancelExposure - @see FLIGetExposureStatus + @see FLIGetExposuretqStatus */ LIBFLIAPI FLISetExposureTime(flidev_t dev, long exptime) { @@ -554,7 +554,7 @@ LIBFLIAPI FLISetImageArea(flidev_t dev, long ul_x, long ul_y, @param dev Camera to set horizontal bin factor of. - @param hbin Horizontal bin factor. + @param hbinQt::Horizontal bin factor. @return Zero on success. @return Non-zero on failure. @@ -577,7 +577,7 @@ LIBFLIAPI FLISetHBin(flidev_t dev, long hbin) @param dev Camera to set vertical bin factor of. - @param vbin Vertical bin factor. + @param vbinQt::Vertical bin factor. @return Zero on success. @return Non-zero on failure. @@ -626,7 +626,7 @@ LIBFLIAPI FLISetFrameType(flidev_t dev, fliframe_t frametype) @return Non-zero on failure. @see FLIExposeFrame - @see FLIGetExposureStatus + @see FLIGetExposuretqStatus @see FLISetExposureTime */ LIBFLIAPI FLICancelExposure(flidev_t dev) @@ -652,7 +652,7 @@ LIBFLIAPI FLICancelExposure(flidev_t dev) @see FLICancelExposure @see FLISetExposureTime */ -LIBFLIAPI FLIGetExposureStatus(flidev_t dev, long *timeleft) +LIBFLIAPI FLIGetExposuretqStatus(flidev_t dev, long *timeleft) { CHKDEVICE(dev); @@ -752,7 +752,7 @@ LIBFLIAPI FLIGrabRow(flidev_t dev, void *buff, size_t width) @see FLISetBitDepth @see FLIGrabFrame @see FLICancelExposure - @see FLIGetExposureStatus + @see FLIGetExposuretqStatus */ LIBFLIAPI FLIExposeFrame(flidev_t dev) { diff --git a/kstars/kstars/indi/fli/libfli.h b/kstars/kstars/indi/fli/libfli.h index 351a9e8e..ca6a7200 100644 --- a/kstars/kstars/indi/fli/libfli.h +++ b/kstars/kstars/indi/fli/libfli.h @@ -176,7 +176,7 @@ LIBFLIAPI FLISetHBin(flidev_t dev, long hbin); LIBFLIAPI FLISetVBin(flidev_t dev, long vbin); LIBFLIAPI FLISetFrameType(flidev_t dev, fliframe_t frametype); LIBFLIAPI FLICancelExposure(flidev_t dev); -LIBFLIAPI FLIGetExposureStatus(flidev_t dev, long *timeleft); +LIBFLIAPI FLIGetExposuretqStatus(flidev_t dev, long *timeleft); LIBFLIAPI FLISetTemperature(flidev_t dev, double temperature); LIBFLIAPI FLIGetTemperature(flidev_t dev, double *temperature); LIBFLIAPI FLIGrabRow(flidev_t dev, void *buff, size_t width); diff --git a/kstars/kstars/indi/fli_ccd.c b/kstars/kstars/indi/fli_ccd.c index 4fa9a95a..1cd195cd 100644 --- a/kstars/kstars/indi/fli_ccd.c +++ b/kstars/kstars/indi/fli_ccd.c @@ -76,8 +76,8 @@ extern int errno; #define MAX_CCD_TEMP 45 /* Max CCD temperature */ #define MIN_CCD_TEMP -55 /* Min CCD temperature */ -#define MAX_X_BIN 16. /* Max Horizontal binning */ -#define MAX_Y_BIN 16. /* Max Vertical binning */ +#define MAX_X_BIN 16. /* MaxQt::Horizontal binning */ +#define MAX_Y_BIN 16. /* MaxQt::Vertical binning */ #define MAX_PIXELS 4096 /* Max number of pixels in one dimension */ #define POLLMS 1000 /* Polling time (ms) */ #define TEMP_THRESHOLD .25 /* Differential temperature threshold (C)*/ @@ -610,13 +610,13 @@ void ISPoll(void *p) break; case IPS_BUSY: - if ( (err = FLIGetExposureStatus(fli_dev, &timeleft))) + if ( (err = FLIGetExposuretqStatus(fli_dev, &timeleft))) { ExposeTimeNP.s = IPS_IDLE; ExposeTimeN[0].value = 0; - IDSetNumber(&ExposeTimeNP, "FLIGetExposureStatus() failed. %s.", strerror((int)-err)); - IDLog("FLIGetExposureStatus() failed. %s.\n", strerror((int)-err)); + IDSetNumber(&ExposeTimeNP, "FLIGetExposuretqStatus() failed. %s.", strerror((int)-err)); + IDLog("FLIGetExposuretqStatus() failed. %s.\n", strerror((int)-err)); break; } diff --git a/kstars/kstars/indi/indiapi.h b/kstars/kstars/indi/indiapi.h index 324b7824..d2ffd6fe 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 parent */ + /** pointer to tqparent */ 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 parent */ + struct _INumberVectorProperty *nvp; /** pointer to tqparent */ 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 parent */ + struct _ISwitchVectorProperty *svp; /** pointer to tqparent */ 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 parent */ + struct _ILightVectorProperty *lvp; /** pointer to tqparent */ 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 parent */ + /** pointer to tqparent */ struct _IBLOBVectorProperty *bvp; /** handy place to hang helper info */ void *aux0, *aux1, *aux2; diff --git a/kstars/kstars/indi/indicom.c b/kstars/kstars/indi/indicom.c index 15b02c8e..6b648f99 100644 --- a/kstars/kstars/indi/indicom.c +++ b/kstars/kstars/indi/indicom.c @@ -63,7 +63,7 @@ void updateAstroValues( double jd ); void nutate(double *RA, double *Dec); void aberrate(double *RA, double *Dec); void precessFromAnyEpoch(double jd0, double jdf, double *RA, double *Dec); -void apparentCoord(double jd0, double jdf, double *RA, double *Dec); +void aptqparentCoord(double jd0, double jdf, double *RA, double *Dec); void getSexComponents(double value, int *d, int *m, int *s); double K = ( 20.49552 / 3600. ); @@ -370,7 +370,7 @@ void precessFromAnyEpoch(double jd0, double jdf, double *RA, double *Dec) *RA = ( *RA + 360.0 ); } -void apparentCoord(double jd0, double jdf, double *RA, double *Dec) +void aptqparentCoord(double jd0, double jdf, double *RA, double *Dec) { *RA = *RA * 15.0; diff --git a/kstars/kstars/indi/indicom.h b/kstars/kstars/indi/indicom.h index 726c7dcd..6f59a63d 100644 --- a/kstars/kstars/indi/indicom.h +++ b/kstars/kstars/indi/indicom.h @@ -169,13 +169,13 @@ void aberrate(double *RA, double *Dec); */ void precessFromAnyEpoch(double jd0, double jdf, double *RA, double *Dec); -/** \brief Calculate the apparent coordiantes for RA and Dec from any epoch to any epoch. +/** \brief Calculate the aptqparent 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. \param Dec a pointer to a double containing the delination in degrees. The function stores the processed delination back in this variable. */ -void apparentCoord(double jd0, double jdf, double *RA, double *Dec); +void aptqparentCoord(double jd0, double jdf, double *RA, double *Dec); /*@}*/ diff --git a/kstars/kstars/indi/indiserver.c b/kstars/kstars/indi/indiserver.c index ad4d2ffd..2f73ca5d 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); /* parent will notice EOF shortly */ + _exit (1); /* tqparent will notice EOF shortly */ } /* don't need child's side of pipes */ @@ -710,7 +710,7 @@ send2Clients (ClInfo *notme, XMLEle *root, char *dev) pthread_mutex_unlock (&client_m); } -/* free Msg mp and everything it contains */ +/* free Msg mp and everything it tqcontains */ static void freeMsg (Msg *mp) { diff --git a/kstars/kstars/indi/lilxml.c b/kstars/kstars/indi/lilxml.c index c8344b5e..4d52aaf2 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; /* parent element, or NULL if root */ + struct _xml_ele *pe; /* tqparent element, or NULL if root */ XMLAtt **at; /* list of attributes */ int nat; /* number of attributes */ int ait; /* used to iterate over at[] */ @@ -130,7 +130,7 @@ delLilXML (LilXML *lp) freemem (lp); } -/* delete ep and all its children */ +/* delete ep and all its tqchildren */ void delXMLEle (XMLEle *ep) { @@ -294,16 +294,16 @@ nextXMLAtt (XMLEle *ep, int init) return (ep->at[ait]); } -/* return parent of given XMLEle */ +/* return tqparent of given XMLEle */ XMLEle * -parentXMLEle (XMLEle *ep) +tqparentXMLEle (XMLEle *ep) { return (ep->pe); } -/* return parent element of given XMLAtt */ +/* return tqparent element of given XMLAtt */ XMLEle * -parentXMLAtt (XMLAtt *ap) +tqparentXMLAtt (XMLAtt *ap) { return (ap->ce); } @@ -632,7 +632,7 @@ pushXMLEle(LilXML *lp) resetEndTag(lp); } -/* point ce to parent of current ce. +/* point ce to tqparent of current ce. * endtag no longer valid. */ static void diff --git a/kstars/kstars/indi/lilxml.h b/kstars/kstars/indi/lilxml.h index 98bfdd2b..1b638f5b 100644 --- a/kstars/kstars/indi/lilxml.h +++ b/kstars/kstars/indi/lilxml.h @@ -130,15 +130,15 @@ extern XMLEle *nextXMLEle (XMLEle *ep, int first); extern XMLAtt *nextXMLAtt (XMLEle *ep, int first); /* tree functions */ -/** \brief Return the parent of an XML element. - \return a pointer to the XML element parent. +/** \brief Return the tqparent of an XML element. + \return a pointer to the XML element tqparent. */ -extern XMLEle *parentXMLEle (XMLEle *ep); +extern XMLEle *tqparentXMLEle (XMLEle *ep); -/** \brief Return the parent of an XML attribute. - \return a pointer to the XML element parent. +/** \brief Return the tqparent of an XML attribute. + \return a pointer to the XML element tqparent. */ -extern XMLEle *parentXMLAtt (XMLAtt *ap); +extern XMLEle *tqparentXMLAtt (XMLAtt *ap); /* access functions */ /** \brief Return the tag of an XML element. @@ -171,13 +171,13 @@ extern char *valuXMLAtt (XMLAtt *ap); */ extern int pcdatalenXMLEle (XMLEle *ep); -/** \brief Return the number of nested XML elements in a parent XML element. +/** \brief Return the number of nested XML elements in a tqparent 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 parent XML element. +/** \brief Return the number of XML attributes in a tqparent 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 fe37df18..e9e95534 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 parent first + // process tqparent first LX200Autostar::ISGetProperties(dev); IDDefNumber (&horNum, NULL); @@ -304,7 +304,7 @@ void LX200_16::handleAltAzSlew() case IPS_BUSY: - if ( (err = getHomeSearchStatus(&searchResult)) < 0) + if ( (err = getHomeSearchtqStatus(&searchResult)) < 0) { handleError(&HomeSearchSw, err, "Home search"); return; diff --git a/kstars/kstars/indi/lx200autostar.cpp b/kstars/kstars/indi/lx200autostar.cpp index 79c3d575..4a397eff 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 parent + // process tqparent LX200Generic::getBasicData(); } diff --git a/kstars/kstars/indi/lx200basic.cpp b/kstars/kstars/indi/lx200basic.cpp index a812caa6..1d41e652 100644 --- a/kstars/kstars/indi/lx200basic.cpp +++ b/kstars/kstars/indi/lx200basic.cpp @@ -165,7 +165,7 @@ void LX200Basic::initProperties() fillNumber(&EqN[0], "RA", "RA H:M:S", "%10.6m", 0., 24., 0., 0.); fillNumber(&EqN[1], "DEC", "Dec D:M:S", "%10.6m", -90., 90., 0., 0.); - fillNumberVector(&EqNP, EqN, NARRAY(EqN), mydev, "EQUATORIAL_EOD_COORD" , "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE); + fillNumberVector(&EqNP, EqN, NARRAY(EqN), mydev, "ETQUATORIAL_EOD_COORD" , "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE); } diff --git a/kstars/kstars/indi/lx200classic.cpp b/kstars/kstars/indi/lx200classic.cpp index 5788bd16..cd074209 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 parent first + // process tqparent first LX200Generic::getBasicData(); } diff --git a/kstars/kstars/indi/lx200driver.c b/kstars/kstars/indi/lx200driver.c index 9c521cfe..bd85ba88 100644 --- a/kstars/kstars/indi/lx200driver.c +++ b/kstars/kstars/indi/lx200driver.c @@ -78,8 +78,8 @@ int getCalenderDate(char *date); int getSiteName(char *siteName, int siteNum); /* Get Number of Bars */ int getNumberOfBars(int *value); -/* Get Home Search Status */ -int getHomeSearchStatus(int *status); +/* Get Home Search tqStatus */ +int getHomeSearchtqStatus(int *status); /* Get OTA Temperature */ int getOTATemp(double * value); /* Get time format: 12 or 24 */ @@ -99,7 +99,7 @@ int setStandardProcedure(char * writeData); /* Set Slew Mode */ int setSlewMode(int slewMode); /* Set Alignment mode */ -int setAlignmentMode(unsigned int alignMode); +int tqsetAlignmentMode(unsigned int alignMode); /* Set Object RA */ int setObjectRA(double ra); /* set Object DEC */ @@ -203,7 +203,7 @@ int testTelescope() int testAP() { int i=0; - char currentDate[64]; + char tqcurrentDate[64]; fprintf(stderr, "Testing telescope's connection...\n"); @@ -211,7 +211,7 @@ int testAP() / We're going to request the calander date */ for (i=0; i < 2; i++) { - if (!getCalenderDate(currentDate)) + if (!getCalenderDate(tqcurrentDate)) return 0; usleep(50000); @@ -534,7 +534,7 @@ int getNumberOfBars(int *value) return 0; } -int getHomeSearchStatus(int *status) +int getHomeSearchtqStatus(int *status) { char tempString[16]; @@ -726,9 +726,9 @@ int setCommandXYZ(int x, int y, int z, const char *cmd) return (setStandardProcedure(tempString)); } -int setAlignmentMode(unsigned int alignMode) +int tqsetAlignmentMode(unsigned int alignMode) { - fprintf(stderr , "Set alignment mode %d\n", alignMode); + fprintf(stderr , "Set tqalignment mode %d\n", alignMode); switch (alignMode) { diff --git a/kstars/kstars/indi/lx200driver.h b/kstars/kstars/indi/lx200driver.h index 06b8017f..529dfa02 100644 --- a/kstars/kstars/indi/lx200driver.h +++ b/kstars/kstars/indi/lx200driver.h @@ -157,8 +157,8 @@ int getCalenderDate(char *date); int getSiteName(char *siteName, int siteNum); /* Get Number of Bars */ int getNumberOfBars(int *value); -/* Get Home Search Status */ -int getHomeSearchStatus(int *status); +/* Get Home Search tqStatus */ +int getHomeSearchtqStatus(int *status); /* Get OTA Temperature */ int getOTATemp(double * value); /* Get time format: 12 or 24 */ @@ -178,7 +178,7 @@ int setStandardProcedure(char * writeData); /* Set Slew Mode */ int setSlewMode(int slewMode); /* Set Alignment mode */ -int setAlignmentMode(unsigned int alignMode); +int tqsetAlignmentMode(unsigned int alignMode); /* Set Object RA */ int setObjectRA(double ra); /* set Object DEC */ diff --git a/kstars/kstars/indi/lx200generic.cpp b/kstars/kstars/indi/lx200generic.cpp index b4f6d792..d498ba62 100644 --- a/kstars/kstars/indi/lx200generic.cpp +++ b/kstars/kstars/indi/lx200generic.cpp @@ -41,7 +41,8 @@ #if !(TIMEZONE_IS_INT) -static int daylight = 0; +//static int daylight = 0; +int daylight = 0; #endif static inline double timezoneOffset() @@ -117,7 +118,7 @@ INumber eq[] = { //TODO decide appropiate TIME_OUT // N.B. No Static identifier as it is needed for external linkage INumberVectorProperty eqNum = { - mydev, "EQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE, + mydev, "ETQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE, eq, NARRAY(eq), "", 0}; /* Fundamental group */ @@ -327,7 +328,7 @@ LX200Generic::LX200Generic() IDLog("Julian Day is %g\n", JD); - // Children call parent routines, this is the default + // Children call tqparent routines, this is the default IDLog("initilizaing from generic LX200 device...\n"); IDLog("INDI Version: 2004-02-17\n"); @@ -561,7 +562,7 @@ void LX200Generic::ISNewNumber (const char *dev, const char *name, double values IDLog("We received J2000 RA %g - DEC %g\n", newRA, newDEC); IDLog("We received J2000 RA %s - DEC %s\n", RAStr, DecStr); - /*apparentCoord( (double) J2000, JD, &newRA, &newDEC); + /*aptqparentCoord( (double) J2000, JD, &newRA, &newDEC); fs_sexa(RAStr, newRA, 2, 3600); fs_sexa(DecStr, newDEC, 2, 3600); @@ -906,9 +907,9 @@ void LX200Generic::ISNewSwitch (const char *dev, const char *name, ISState *stat IUUpdateSwitches(&AlignmentSw, states, names, n); index = getOnSwitch(&AlignmentSw); - if ( ( err = setAlignmentMode(index) < 0) ) + if ( ( err = tqsetAlignmentMode(index) < 0) ) { - handleError(&AlignmentSw, err, "Setting alignment"); + handleError(&AlignmentSw, err, "Setting tqalignment"); return; } @@ -1405,7 +1406,7 @@ void LX200Generic::ISPoll() case IPS_BUSY: getLX200RA(¤tRA); getLX200DEC(¤tDEC); - /*apparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ + /*aptqparentCoord( JD, (double) J2000, ¤tRA, ¤tDEC);*/ eqNum.np[0].value = currentRA; eqNum.np[1].value = currentDEC; @@ -1789,7 +1790,7 @@ void LX200Generic::getAlignment() signed char align = ACK(); if (align < 0) { - IDSetSwitch (&AlignmentSw, "Failed to get telescope alignment."); + IDSetSwitch (&AlignmentSw, "Failed to get telescope tqalignment."); return; } diff --git a/kstars/kstars/indi/lx200gps.cpp b/kstars/kstars/indi/lx200gps.cpp index 451a7269..158cd14a 100644 --- a/kstars/kstars/indi/lx200gps.cpp +++ b/kstars/kstars/indi/lx200gps.cpp @@ -42,7 +42,7 @@ static ISwitch AzRaBackSlashS[] = {{ "Activate", "", ISS_OFF, 0, 0}}; static ISwitch OTAUpdateS[] = {{ "Update", "", ISS_OFF, 0, 0}}; static ISwitchVectorProperty GPSPowerSw = { mydev, "GPS Power", "", GPSGroup, IP_RW, ISR_1OFMANY, 0 , IPS_IDLE, GPSPowerS, NARRAY(GPSPowerS), "", 0}; -static ISwitchVectorProperty GPSStatusSw = { mydev, "GPS Status", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, GPSStatusS, NARRAY(GPSStatusS), "", 0}; +static ISwitchVectorProperty GPSStatusSw = { mydev, "GPS tqStatus", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, GPSStatusS, NARRAY(GPSStatusS), "", 0}; static ISwitchVectorProperty GPSUpdateSw = { mydev, "GPS System", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, GPSUpdateS, NARRAY(GPSUpdateS), "", 0}; static ISwitchVectorProperty AltDecPecSw = { mydev, "Alt/Dec PEC", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, AltDecPecS, NARRAY(AltDecPecS), "", 0}; static ISwitchVectorProperty AzRaPecSw = { mydev, "Az/Ra PEC", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, AzRaPecS, NARRAY(AzRaPecS), "", 0}; @@ -83,7 +83,7 @@ void LX200GPS::ISGetProperties (const char *dev) if (dev && strcmp (thisDevice, dev)) return; -// process parent first +// process tqparent first LX200_16::ISGetProperties(dev); IDDefSwitch (&GPSPowerSw, NULL); @@ -139,7 +139,7 @@ void LX200GPS::ISNewNumber (const char *dev, const char *name, double values[], return; } - /* GPS Status Update */ + /* GPS tqStatus Update */ if (!strcmp(name,GPSStatusSw.name)) { if (checkPower(&GPSStatusSw)) @@ -334,7 +334,7 @@ void LX200GPS::ISNewNumber (const char *dev, const char *name, double values[], //getOTATemp(&OTATemp.np[0].value); //IDSetNumber(&OTATemp, NULL); - // process parent + // process tqparent LX200_16::getBasicData(); } diff --git a/kstars/kstars/indi/sbigccd.cpp b/kstars/kstars/indi/sbigccd.cpp index fb35cf59..9eef1a42 100644 --- a/kstars/kstars/indi/sbigccd.cpp +++ b/kstars/kstars/indi/sbigccd.cpp @@ -326,7 +326,7 @@ void SBIGCam::ISStaticPoll(void *p) void SBIGCam::ISPoll() { static int mtc=5; - int readStatus=0; + int readtqStatus=0; double ccdTemp (0); switch (ExposeTimeNP.s) @@ -340,8 +340,8 @@ void SBIGCam::ISPoll() // JM: Here we check the status of the camera (whether it's still capturing an image or has finished that) // ISPoll is called once per second. e.g. below for how we do this for Apogee Cameras /* - readStatus = cam->read_Status(); - if (readStatus < 0) + readtqStatus = cam->read_tqStatus(); + if (readtqStatus < 0) { IDLog("Error in exposure!\n"); ExposeTimeNP.s = IPS_IDLE; @@ -349,7 +349,7 @@ void SBIGCam::ISPoll() IDSetNumber(&ExposeTimeNP, "Error in exposure procedure."); return; } - else if (readStatus == Camera_Status_ImageReady) + else if (readtqStatus == Camera_Status_ImageReady) { ExposeTimeN[0].value = 0; ExposeTimeNP.s = IPS_OK; diff --git a/kstars/kstars/indi/skycommander.c b/kstars/kstars/indi/skycommander.c index 261b6808..6bf23437 100644 --- a/kstars/kstars/indi/skycommander.c +++ b/kstars/kstars/indi/skycommander.c @@ -54,7 +54,7 @@ INumber eq[] = { {"DEC", "Dec D:M:S", "%10.6m", -90., 90., 0., 0., 0, 0, 0}, }; INumberVectorProperty eqNum = { - mydev, "EQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RO, 0, IPS_IDLE, + mydev, "ETQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RO, 0, IPS_IDLE, eq, NARRAY(eq), "", 0}; diff --git a/kstars/kstars/indi/temmadriver.h b/kstars/kstars/indi/temmadriver.h index 79926c3f..8bd2ccc1 100644 --- a/kstars/kstars/indi/temmadriver.h +++ b/kstars/kstars/indi/temmadriver.h @@ -172,14 +172,14 @@ static ITextVectorProperty Port = { IP_RW, 0, IPS_OK, PortT, NARRAY(PortT), "", 0}; /*******************************/ -/* EQUATORIAL_COORD RW property */ +/* ETQUATORIAL_COORD RW property */ /*******************************/ static INumber eq[] = { {"RA" ,"RA H:M:S" , "%10.6m", 0, 24, 0, 0, 0, 0, 0}, {"DEC", "Dec D:M:S", "%10.6m", -90, 90, 0, 0, 0, 0, 0} }; static INumberVectorProperty eqNum = { - mydev, "EQUATORIAL_EOD_COORD", "Equatorial JNow", + mydev, "ETQUATORIAL_EOD_COORD", "Equatorial JNow", MAIN_GROUP , IP_RW, 0, IPS_IDLE, eq, NARRAY(eq), "", 0}; /*******************************/ diff --git a/kstars/kstars/indi/v4lphilips.cpp b/kstars/kstars/indi/v4lphilips.cpp index cc15d43d..f759e097 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 parent + // Call tqparent 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 parent + // Call tqparent 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 parent + // Call tqparent V4L_Driver::ISNewNumber(dev, name, values, names, n); } diff --git a/kstars/kstars/indi/webcam/Makefile.am b/kstars/kstars/indi/webcam/Makefile.am index 565859da..3b73d055 100644 --- a/kstars/kstars/indi/webcam/Makefile.am +++ b/kstars/kstars/indi/webcam/Makefile.am @@ -1,3 +1,6 @@ +# set the include path for X, qt and KDE +INCLUDES= $(all_includes) + if HAVE_V4L2 libwebcam_linux = libwebcam_v4l2_linux.la else diff --git a/kstars/kstars/indi/webcam/ccvt_c2.c b/kstars/kstars/indi/webcam/ccvt_c2.c index 52ed276d..1fb7bcbf 100644 --- a/kstars/kstars/indi/webcam/ccvt_c2.c +++ b/kstars/kstars/indi/webcam/ccvt_c2.c @@ -8,7 +8,7 @@ #include "ccvt_types.h" /* by suitable definition of PIXTYPE, can do yuv to rgb or bgr, with or -without word alignment */ +without word tqalignment */ /* This doesn't exactly earn a prize in a programming beauty contest. */ diff --git a/kstars/kstars/indi/webcam/port.cpp b/kstars/kstars/indi/webcam/port.cpp index fce53a18..971cd9ad 100644 --- a/kstars/kstars/indi/webcam/port.cpp +++ b/kstars/kstars/indi/webcam/port.cpp @@ -20,9 +20,9 @@ // I/O ports wrapper code // This file might need tweaking if you're trying to port my code to other // x86 Unix platforms. Code is already available for Linux, FreeBSD, and -// QNX; see the Makefile. +// TQNX; see the Makefile. // -// QNX code by: Anders Arpteg +// TQNX code by: Anders Arpteg // FreeBSD code by: Patrick Reynolds and Charles // Henrich @@ -43,7 +43,7 @@ #else #include #endif /* arm */ -#elif defined(QNX) +#elif defined(TQNX) #include #elif defined(__FreeBSD__) #include diff --git a/kstars/kstars/indi/webcam/port.h b/kstars/kstars/indi/webcam/port.h index c5896858..2e398019 100644 --- a/kstars/kstars/indi/webcam/port.h +++ b/kstars/kstars/indi/webcam/port.h @@ -20,9 +20,9 @@ // I/O ports wrapper definitions and prototypes // This file might need tweaking if you're trying to port my code to other // x86 Unix platforms. Code is already available for Linux, FreeBSD, and -// QNX; see the Makefile. +// TQNX; see the Makefile. // -// QNX code by: Anders Arpteg +// TQNX code by: Anders Arpteg // FreeBSD code by: Patrick Reynolds and Charles // Henrich // Inlining implemented by: Philip Blundell @@ -38,7 +38,7 @@ #if !defined(arm) && !defined(__hppa__) && !defined(__sparc__) && !defined(__ppc__) && !defined(__powerpc__) && !defined(__s390__) && !defined(__s390x__) && !defined(__mips__) && !defined(__mc68000__) #include #endif /* !arm */ -#elif defined(QNX) +#elif defined(TQNX) #include #elif defined(__FreeBSD__) #include @@ -90,7 +90,7 @@ public: inline void write_control(int data) { outb(control_reg = data, port2); } inline void setbit_control(int data) { outb(control_reg |= data, port2); } inline void clearbit_control(int data) { outb(control_reg &= ~data, port2); } -#else // Solaris, QNX, and *BSD use (port, data) instead +#else // Solaris, TQNX, and *BSD use (port, data) instead inline void write_data(int data) { outb(port, data); } inline void write_control(int data) { outb(port2, control_reg = data); } inline void setbit_control(int data) { outb(port2, control_reg |= data); } diff --git a/kstars/kstars/indi/webcam/pwc-ioctl.h b/kstars/kstars/indi/webcam/pwc-ioctl.h index 9b650298..e161acdb 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 mask and shift to filter out this value. + defines provide a tqmask and shift to filter out this value. In 'Snapshot' mode the camera freezes its automatic exposure and colour balance controls. @@ -121,9 +121,9 @@ struct pwc_leds the preferred mode is not available. */ /* Set preferred compression quality (0 = uncompressed, 3 = highest compression) */ -#define VIDIOCPWCSCQUAL _IOW('v', 195, int) +#define VIDIOCPWCSCTQUAL _IOW('v', 195, int) /* Get preferred compression quality */ -#define VIDIOCPWCGCQUAL _IOR('v', 195, int) +#define VIDIOCPWCGCTQUAL _IOR('v', 195, int) /* This is a probe function; since so many devices are supported, it diff --git a/kstars/kstars/indi/webcam/v4l1_pwc.cpp b/kstars/kstars/indi/webcam/v4l1_pwc.cpp index 9f644885..f87d9c82 100644 --- a/kstars/kstars/indi/webcam/v4l1_pwc.cpp +++ b/kstars/kstars/indi/webcam/v4l1_pwc.cpp @@ -259,13 +259,13 @@ int V4L1_PWC::setExposure(int val, char *errmsg) void V4L1_PWC::setCompression(int val) { - ioctl(fd, VIDIOCPWCSCQUAL, &val); + ioctl(fd, VIDIOCPWCSCTQUAL, &val); } int V4L1_PWC::getCompression() { int gain; - ioctl(fd, VIDIOCPWCGCQUAL , &gain); + ioctl(fd, VIDIOCPWCGCTQUAL , &gain); if (gain < 0) gain*=-1; return gain; } diff --git a/kstars/kstars/indi/webcam/v4l1_pwc.h b/kstars/kstars/indi/webcam/v4l1_pwc.h index fd2e2032..3790daa2 100644 --- a/kstars/kstars/indi/webcam/v4l1_pwc.h +++ b/kstars/kstars/indi/webcam/v4l1_pwc.h @@ -34,7 +34,7 @@ class V4L1_PWC : public V4L1_Base int connectCam(const char * devpath, char *errmsg); - /* Philips related, from QAstrocam */ + /* Philips related, from TQAstrocam */ int saveSettings(char *errmsg); void restoreSettings(); void restoreFactorySettings(); diff --git a/kstars/kstars/indi/webcam/v4l2_base.cpp b/kstars/kstars/indi/webcam/v4l2_base.cpp index 26ec3d51..a4ba8d72 100644 --- a/kstars/kstars/indi/webcam/v4l2_base.cpp +++ b/kstars/kstars/indi/webcam/v4l2_base.cpp @@ -168,7 +168,7 @@ int V4L2_Base::read_frame(char *errmsg) buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; buf.memory = V4L2_MEMORY_MMAP; - if (-1 == xioctl (fd, VIDIOC_DQBUF, &buf)) { + if (-1 == xioctl (fd, VIDIOC_DTQBUF, &buf)) { switch (errno) { case EAGAIN: return 0; @@ -179,7 +179,7 @@ int V4L2_Base::read_frame(char *errmsg) /* fall through */ default: - return errno_exit ("VIDIOC_DQBUF", errmsg); + return errno_exit ("VIDIOC_DTQBUF", errmsg); } } @@ -206,8 +206,8 @@ int V4L2_Base::read_frame(char *errmsg) break; } - if (-1 == xioctl (fd, VIDIOC_QBUF, &buf)) - return errno_exit ("VIDIOC_QBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf)) + return errno_exit ("VIDIOC_TQBUF", errmsg); if (dropFrame) { @@ -227,7 +227,7 @@ int V4L2_Base::read_frame(char *errmsg) buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; buf.memory = V4L2_MEMORY_USERPTR; - if (-1 == xioctl (fd, VIDIOC_DQBUF, &buf)) { + if (-1 == xioctl (fd, VIDIOC_DTQBUF, &buf)) { switch (errno) { case EAGAIN: return 0; @@ -238,7 +238,7 @@ int V4L2_Base::read_frame(char *errmsg) /* fall through */ default: - errno_exit ("VIDIOC_DQBUF", errmsg); + errno_exit ("VIDIOC_DTQBUF", errmsg); } } @@ -251,8 +251,8 @@ int V4L2_Base::read_frame(char *errmsg) //process_image ((void *) buf.m.userptr); - if (-1 == xioctl (fd, VIDIOC_QBUF, &buf)) - errno_exit ("VIDIOC_QBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf)) + errno_exit ("VIDIOC_TQBUF", errmsg); break; } @@ -309,8 +309,8 @@ int V4L2_Base::start_capturing(char * errmsg) buf.memory = V4L2_MEMORY_MMAP; buf.index = i; - if (-1 == xioctl (fd, VIDIOC_QBUF, &buf)) - return errno_exit ("VIDIOC_QBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf)) + return errno_exit ("VIDIOC_TQBUF", errmsg); } @@ -336,8 +336,8 @@ int V4L2_Base::start_capturing(char * errmsg) buf.m.userptr = (unsigned long) buffers[i].start; buf.length = buffers[i].length; - if (-1 == xioctl (fd, VIDIOC_QBUF, &buf)) - return errno_exit ("VIDIOC_QBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_TQBUF, &buf)) + return errno_exit ("VIDIOC_TQBUF", errmsg); } @@ -414,7 +414,7 @@ int V4L2_Base::init_mmap(char *errmsg) req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; req.memory = V4L2_MEMORY_MMAP; - if (-1 == xioctl (fd, VIDIOC_REQBUFS, &req)) { + if (-1 == xioctl (fd, VIDIOC_RETQBUFS, &req)) { if (EINVAL == errno) { fprintf (stderr, "%s does not support " "memory mapping\n", dev_name); @@ -422,7 +422,7 @@ int V4L2_Base::init_mmap(char *errmsg) "memory mapping\n", dev_name); return -1; } else { - return errno_exit ("VIDIOC_REQBUFS", errmsg); + return errno_exit ("VIDIOC_RETQBUFS", errmsg); } } @@ -453,8 +453,8 @@ int V4L2_Base::init_mmap(char *errmsg) buf.memory = V4L2_MEMORY_MMAP; buf.index = n_buffers; - if (-1 == xioctl (fd, VIDIOC_QUERYBUF, &buf)) - return errno_exit ("VIDIOC_QUERYBUF", errmsg); + if (-1 == xioctl (fd, VIDIOC_TQUERYBUF, &buf)) + return errno_exit ("VIDIOC_TQUERYBUF", errmsg); buffers[n_buffers].length = buf.length; buffers[n_buffers].start = @@ -482,13 +482,13 @@ void V4L2_Base::init_userp(unsigned int buffer_size) req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; req.memory = V4L2_MEMORY_USERPTR; - if (-1 == xioctl (fd, VIDIOC_REQBUFS, &req)) { + if (-1 == xioctl (fd, VIDIOC_RETQBUFS, &req)) { if (EINVAL == errno) { fprintf (stderr, "%s does not support " "user pointer i/o\n", dev_name); exit (EXIT_FAILURE); } else { - errno_exit ("VIDIOC_REQBUFS", errmsg); + errno_exit ("VIDIOC_RETQBUFS", errmsg); } } @@ -514,7 +514,7 @@ int V4L2_Base::init_device(char *errmsg, int pixelFormat , int width, int height { unsigned int min; - if (-1 == xioctl (fd, VIDIOC_QUERYCAP, &cap)) + if (-1 == xioctl (fd, VIDIOC_TQUERYCAP, &cap)) { if (EINVAL == errno) { fprintf (stderr, "%s is no V4L2 device\n", @@ -522,7 +522,7 @@ int V4L2_Base::init_device(char *errmsg, int pixelFormat , int width, int height snprintf(errmsg, ERRMSGSIZ, "%s is no V4L2 device\n", dev_name); return -1; } else { - return errno_exit ("VIDIOC_QUERYCAP", errmsg); + return errno_exit ("VIDIOC_TQUERYCAP", errmsg); } } @@ -953,7 +953,7 @@ void V4L2_Base::enumerate_ctrl (void) for (queryctrl.id = V4L2_CID_BASE; queryctrl.id < V4L2_CID_LASTP1; queryctrl.id++) { - if (0 == xioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) + if (0 == xioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) { cerr << "Control " << queryctrl.name << endl; @@ -969,14 +969,14 @@ void V4L2_Base::enumerate_ctrl (void) if (errno == EINVAL) continue; - errno_exit("VIDIOC_QUERYCTRL", errmsg); + errno_exit("VIDIOC_TQUERYCTRL", errmsg); return; } } for (queryctrl.id = V4L2_CID_PRIVATE_BASE; ; queryctrl.id++) { - if (0 == xioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) + if (0 == xioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) { cerr << "Private Control " << queryctrl.name << endl; @@ -989,7 +989,7 @@ void V4L2_Base::enumerate_ctrl (void) if (errno == EINVAL) break; - errno_exit ("VIDIOC_QUERYCTRL", errmsg); + errno_exit ("VIDIOC_TQUERYCTRL", errmsg); return; } @@ -1007,12 +1007,12 @@ void V4L2_Base::enumerate_menu (void) for (querymenu.index = queryctrl.minimum; querymenu.index <= queryctrl.maximum; querymenu.index++) { - if (0 == xioctl (fd, VIDIOC_QUERYMENU, &querymenu)) + if (0 == xioctl (fd, VIDIOC_TQUERYMENU, &querymenu)) { cerr << " " << querymenu.name << endl; } else { - errno_exit("VIDIOC_QUERYMENU", errmsg); + errno_exit("VIDIOC_TQUERYMENU", errmsg); return; } } @@ -1027,10 +1027,10 @@ int V4L2_Base::query_ctrl(unsigned int ctrl_id, double & ctrl_min, double & ctr queryctrl.id = ctrl_id; - if (-1 == ioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) + if (-1 == ioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) { if (errno != EINVAL) - return errno_exit ("VIDIOC_QUERYCTRL", errmsg); + return errno_exit ("VIDIOC_TQUERYCTRL", errmsg); else { @@ -1074,7 +1074,7 @@ int V4L2_Base::queryINTControls(INumberVectorProperty *nvp) for (queryctrl.id = V4L2_CID_BASE; queryctrl.id < V4L2_CID_LASTP1; queryctrl.id++) { - if (0 == ioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) + if (0 == ioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) { if (queryctrl.flags & V4L2_CTRL_FLAG_DISABLED) { @@ -1113,13 +1113,13 @@ int V4L2_Base::queryINTControls(INumberVectorProperty *nvp) } } else if (errno != EINVAL) - return errno_exit ("VIDIOC_QUERYCTRL", errmsg); + return errno_exit ("VIDIOC_TQUERYCTRL", errmsg); } for (queryctrl.id = V4L2_CID_PRIVATE_BASE; ; queryctrl.id++) { - if (0 == ioctl (fd, VIDIOC_QUERYCTRL, &queryctrl)) + if (0 == ioctl (fd, VIDIOC_TQUERYCTRL, &queryctrl)) { if (queryctrl.flags & V4L2_CTRL_FLAG_DISABLED) { diff --git a/kstars/kstars/indi/webcam/videodev.h b/kstars/kstars/indi/webcam/videodev.h index a5b0aec7..a7929058 100644 --- a/kstars/kstars/indi/webcam/videodev.h +++ b/kstars/kstars/indi/webcam/videodev.h @@ -302,9 +302,9 @@ struct video_code #define VID_HARDWARE_BT848 1 -#define VID_HARDWARE_QCAM_BW 2 +#define VID_HARDWARE_TQCAM_BW 2 #define VID_HARDWARE_PMS 3 -#define VID_HARDWARE_QCAM_C 4 +#define VID_HARDWARE_TQCAM_C 4 #define VID_HARDWARE_PSEUDO 5 #define VID_HARDWARE_SAA5249 6 #define VID_HARDWARE_AZTECH 7 diff --git a/kstars/kstars/indi/webcam/videodev2.h b/kstars/kstars/indi/webcam/videodev2.h index e3dab3a6..b6a05dbd 100644 --- a/kstars/kstars/indi/webcam/videodev2.h +++ b/kstars/kstars/indi/webcam/videodev2.h @@ -388,7 +388,7 @@ struct v4l2_buffer /* Flags for 'flags' field */ #define V4L2_BUF_FLAG_MAPPED 0x0001 /* Buffer is mapped (flag) */ -#define V4L2_BUF_FLAG_QUEUED 0x0002 /* Buffer is queued for processing */ +#define V4L2_BUF_FLAG_TQUEUED 0x0002 /* Buffer is queued for processing */ #define V4L2_BUF_FLAG_DONE 0x0004 /* Buffer is ready */ #define V4L2_BUF_FLAG_KEYFRAME 0x0008 /* Image is a keyframe (I-frame) */ #define V4L2_BUF_FLAG_PFRAME 0x0010 /* Image is a P-frame */ @@ -448,7 +448,7 @@ struct v4l2_captureparm __u32 reserved[4]; }; /* Flags for 'capability' and 'capturemode' fields */ -#define V4L2_MODE_HIGHQUALITY 0x0001 /* High quality imaging mode */ +#define V4L2_MODE_HIGHTQUALITY 0x0001 /* High quality imaging mode */ #define V4L2_CAP_TIMEPERFRAME 0x1000 /* timeperframe field is supported */ struct v4l2_outputparm @@ -624,7 +624,7 @@ struct v4l2_control __s32 value; }; -/* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ +/* Used in the VIDIOC_TQUERYCTRL ioctl for querying controls */ struct v4l2_queryctrl { __u32 id; @@ -638,7 +638,7 @@ struct v4l2_queryctrl __u32 reserved[2]; }; -/* Used in the VIDIOC_QUERYMENU ioctl for querying menu items */ +/* Used in the VIDIOC_TQUERYMENU ioctl for querying menu items */ struct v4l2_querymenu { __u32 id; @@ -829,7 +829,7 @@ struct v4l2_streamparm * I O C T L C O D E S F O R V I D E O D E V I C E S * */ -#define VIDIOC_QUERYCAP _IOR ('V', 0, struct v4l2_capability) +#define VIDIOC_TQUERYCAP _IOR ('V', 0, struct v4l2_capability) #define VIDIOC_RESERVED _IO ('V', 1) #define VIDIOC_ENUM_FMT _IOWR ('V', 2, struct v4l2_fmtdesc) #define VIDIOC_G_FMT _IOWR ('V', 4, struct v4l2_format) @@ -838,13 +838,13 @@ struct v4l2_streamparm #define VIDIOC_G_COMP _IOR ('V', 6, struct v4l2_compression) #define VIDIOC_S_COMP _IOW ('V', 7, struct v4l2_compression) #endif -#define VIDIOC_REQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers) -#define VIDIOC_QUERYBUF _IOWR ('V', 9, struct v4l2_buffer) +#define VIDIOC_RETQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers) +#define VIDIOC_TQUERYBUF _IOWR ('V', 9, struct v4l2_buffer) #define VIDIOC_G_FBUF _IOR ('V', 10, struct v4l2_framebuffer) #define VIDIOC_S_FBUF _IOW ('V', 11, struct v4l2_framebuffer) #define VIDIOC_OVERLAY _IOW ('V', 14, int) -#define VIDIOC_QBUF _IOWR ('V', 15, struct v4l2_buffer) -#define VIDIOC_DQBUF _IOWR ('V', 17, struct v4l2_buffer) +#define VIDIOC_TQBUF _IOWR ('V', 15, struct v4l2_buffer) +#define VIDIOC_DTQBUF _IOWR ('V', 17, struct v4l2_buffer) #define VIDIOC_STREAMON _IOW ('V', 18, int) #define VIDIOC_STREAMOFF _IOW ('V', 19, int) #define VIDIOC_G_PARM _IOWR ('V', 21, struct v4l2_streamparm) @@ -859,8 +859,8 @@ struct v4l2_streamparm #define VIDIOC_S_TUNER _IOW ('V', 30, struct v4l2_tuner) #define VIDIOC_G_AUDIO _IOR ('V', 33, struct v4l2_audio) #define VIDIOC_S_AUDIO _IOW ('V', 34, struct v4l2_audio) -#define VIDIOC_QUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl) -#define VIDIOC_QUERYMENU _IOWR ('V', 37, struct v4l2_querymenu) +#define VIDIOC_TQUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl) +#define VIDIOC_TQUERYMENU _IOWR ('V', 37, struct v4l2_querymenu) #define VIDIOC_G_INPUT _IOR ('V', 38, int) #define VIDIOC_S_INPUT _IOWR ('V', 39, int) #define VIDIOC_G_OUTPUT _IOR ('V', 46, int) @@ -877,7 +877,7 @@ struct v4l2_streamparm #define VIDIOC_S_CROP _IOW ('V', 60, struct v4l2_crop) #define VIDIOC_G_JPEGCOMP _IOR ('V', 61, struct v4l2_jpegcompression) #define VIDIOC_S_JPEGCOMP _IOW ('V', 62, struct v4l2_jpegcompression) -#define VIDIOC_QUERYSTD _IOR ('V', 63, v4l2_std_id) +#define VIDIOC_TQUERYSTD _IOR ('V', 63, v4l2_std_id) #define VIDIOC_TRY_FMT _IOWR ('V', 64, struct v4l2_format) #define VIDIOC_ENUMAUDIO _IOWR ('V', 65, struct v4l2_audio) #define VIDIOC_ENUMAUDOUT _IOWR ('V', 66, struct v4l2_audioout) diff --git a/kstars/kstars/indiconf.ui b/kstars/kstars/indiconf.ui index c5edd124..713a1970 100644 --- a/kstars/kstars/indiconf.ui +++ b/kstars/kstars/indiconf.ui @@ -1,10 +1,10 @@ INDIConf - + INDIConf - + 0 0 @@ -22,7 +22,7 @@ unnamed - + generalGroup @@ -33,7 +33,7 @@ unnamed - + fitsLabel @@ -41,9 +41,9 @@ Default FITS directory: - + - layout4 + tqlayout4 @@ -66,13 +66,13 @@ 0 - + 28 28 - + 28 28 @@ -84,7 +84,7 @@ - + fitsAutoDisplayCheck @@ -95,7 +95,7 @@ true - + telescopeLabel @@ -111,7 +111,7 @@ telPort_IN - + videoLabel @@ -129,7 +129,7 @@ - + Layout1 @@ -153,14 +153,14 @@ Expanding - + 20 20 - + buttonOk @@ -174,7 +174,7 @@ true - + buttonCancel @@ -187,7 +187,7 @@ - + displayGroup @@ -198,7 +198,7 @@ unnamed - + crosshairCheck @@ -212,7 +212,7 @@ Display the telescope position on the sky map - + messagesCheck @@ -238,14 +238,14 @@ Preferred - + 200 21 - + autoGroup @@ -256,7 +256,7 @@ unnamed - + timeCheck @@ -270,7 +270,7 @@ Update telescope clock upon connection - + GeoCheck @@ -286,7 +286,7 @@ - + autoGroup_2 @@ -294,21 +294,21 @@ Filter Wheel - Assign color values for your filter wheel slots + Assign color values for your filter wheel Q_SLOTS unnamed - + - layout3 + tqlayout3 unnamed - + textLabel1 @@ -316,7 +316,7 @@ Slot: - + textLabel2 @@ -326,15 +326,15 @@ - + - layout4 + tqlayout4 unnamed - + filterCombo @@ -372,7 +372,7 @@ Preferred - + 61 20 @@ -405,7 +405,7 @@ buttonOk buttonCancel - + klineedit.h kpushbutton.h diff --git a/kstars/kstars/indidevice.cpp b/kstars/kstars/indidevice.cpp index e7a36efc..02c6f8f1 100644 --- a/kstars/kstars/indidevice.cpp +++ b/kstars/kstars/indidevice.cpp @@ -8,7 +8,7 @@ version 2 of the License, or (at your option) any later version. JM Changelog: - 2003-04-28 Used indimenu.c as a template. C --> C++, Xm --> KDE/Qt + 2003-04-28 Used indimenu.c as a template. C --> C++, Xm --> KDE/TQt 2003-05-01 Added tab for devices and a group feature 2003-05-02 Added scrolling area. Most things are rewritten 2003-05-05 Device/Group seperation @@ -81,18 +81,18 @@ /* INDI standard property used across all clients to enable interoperability. */ const char * indi_std[NINDI_STD] = - {"CONNECTION", "DEVICE_PORT", "TIME", "SDTIME", "GEOGRAPHIC_COORD", "EQUATORIAL_COORD", "EQUATORIAL_EOD_COORD", "HORIZONTAL_COORD", "ABORT_MOTION", "ON_COORD_SET", "SOLAR_SYSTEM", "MOVEMENT", "PARK", "CCD_EXPOSE_DURATION", "CCD_TEMPERATURE", "CCD_FRAME", "CCD_FRAME_TYPE", "CCD_BINNING", "CCD_INFO", "CCDPREVIEW_STREAM", "CCDPREVIEW_CTRL", "VIDEO_STREAM", "FOCUS_SPEED", "FOCUS_MOTION", "FOCUS_TIMER", "FILTER_SLOT" }; + {"CONNECTION", "DEVICE_PORT", "TIME", "SDTIME", "GEOGRAPHIC_COORD", "ETQUATORIAL_COORD", "ETQUATORIAL_EOD_COORD", "HORIZONTAL_COORD", "ABORT_MOTION", "ON_COORD_SET", "SOLAR_SYSTEM", "MOVEMENT", "PARK", "CCD_EXPOSE_DURATION", "CCD_TEMPERATURE", "CCD_FRAME", "CCD_FRAME_TYPE", "CCD_BINNING", "CCD_INFO", "CCDPREVIEW_STREAM", "CCDPREVIEW_CTRL", "VIDEO_STREAM", "FOCUS_SPEED", "FOCUS_MOTION", "FOCUS_TIMER", "FILTER_SLOT" }; /******************************************************************* ** INDI Device: The work-horse. Responsible for handling its ** child properties and managing signal and changes. *******************************************************************/ -INDI_D::INDI_D(INDIMenu *menuParent, DeviceManager *parentManager, TQString inName, TQString inLabel) +INDI_D::INDI_D(INDIMenu *menuParent, DeviceManager *tqparentManager, TQString inName, TQString inLabel) { name = inName; label = inLabel; - parent = menuParent; - parentMgr = parentManager; + tqparent = menuParent; + tqparentMgr = tqparentManager; 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, parent->ksw); + stdDev = new INDIStdDevice(this, tqparent->ksw); curGroup = NULL; @@ -183,7 +183,7 @@ int INDI_D::setAnyCmd (XMLEle *root, char errmsg[]) return (-1); } - parentMgr->checkMsg (root, this); + tqparentMgr->checkMsg (root, this); return (setValue (pp, root, errmsg)); } @@ -344,7 +344,7 @@ int INDI_D::setTextValue (INDI_P *pp, XMLEle *root, char errmsg[]) } /* set the given BUTTONS or LIGHTS property from the given element. - * root should have some or children. + * root should have some or tqchildren. * return 0 if ok else -1 with reason in errmsg */ int INDI_D::setLabelState (INDI_P *pp, XMLEle *root, char errmsg[]) @@ -521,7 +521,7 @@ int INDI_D::processBlob(INDI_E *blobEL, XMLEle *ep, char errmsg[]) return (-1); } - iscomp = (dataFormat.find(".z") != -1); + iscomp = (dataFormat.tqfind(".z") != -1); dataFormat.remove(".z"); @@ -605,7 +605,7 @@ INDI_P * INDI_D::addProperty (XMLEle *root, char errmsg[]) return NULL; } - /* Remove Vertical spacer from group layout, this is done everytime + /* RemoveQt::Vertical spacer from group tqlayout, this is done everytime * a new property arrives. The spacer is then appended to the end of the * properties */ pg->propertyLayout->removeItem(pg->VerticalSpacer); @@ -634,7 +634,7 @@ INDI_P * INDI_D::addProperty (XMLEle *root, char errmsg[]) pp->timeout = ap ? atof(valuXMLAtt(ap)) : 0; /* log any messages */ - parentMgr->checkMsg (root, this); + tqparentMgr->checkMsg (root, this); pp->addGUI(root); @@ -679,7 +679,7 @@ INDI_G * INDI_D::findGroup (TQString grouptag, int create, char errmsg[]) } -/* find "perm" attribute in root, crack and set *pp. +/* tqfind "perm" attribute in root, crack and set *pp. * return 0 if ok else -1 with excuse in errmsg[] */ @@ -775,7 +775,7 @@ int INDI_D::buildTextGUI(XMLEle *root, char errmsg[]) if (pp == NULL) return (-1); - /* get the permission, it will determine layout issues */ + /* get the permission, it will determine tqlayout issues */ if (findPerm (pp, root, &p, errmsg)) { delete(pp); @@ -811,7 +811,7 @@ int INDI_D::buildNumberGUI (XMLEle *root, char *errmsg) if (pp == NULL) return (-1); - /* get the permission, it will determine layout issues */ + /* get the permission, it will determine tqlayout issues */ if (findPerm (pp, root, &p, errmsg)) { delete(pp); @@ -879,7 +879,7 @@ int INDI_D::buildSwitchesGUI (XMLEle *root, char errmsg[]) return (err); } - /* otherwise, build 1-4 button layout */ + /* otherwise, build 1-4 button tqlayout */ pp->guitype = PG_BUTTONS; err = pp->buildSwitchesGUI(root, errmsg); @@ -896,7 +896,7 @@ int INDI_D::buildSwitchesGUI (XMLEle *root, char errmsg[]) } else if (!strcmp (valuXMLAtt(ap), "AnyOfMany")) { - /* 1-4 checkboxes layout */ + /* 1-4 checkboxes tqlayout */ pp->guitype = PG_RADIO; err = pp->buildSwitchesGUI(root, errmsg); @@ -955,7 +955,7 @@ int INDI_D::buildBLOBGUI (XMLEle *root, char errmsg[]) if (!pp) return (-1); - /* get the permission, it will determine layout issues */ + /* get the permission, it will determine tqlayout issues */ if (findPerm (pp, root, &p, errmsg)) { delete(pp); diff --git a/kstars/kstars/indidevice.h b/kstars/kstars/indidevice.h index b9d7315d..1ebcefa2 100644 --- a/kstars/kstars/indidevice.h +++ b/kstars/kstars/indidevice.h @@ -70,15 +70,16 @@ class TQVBox; class INDI_D : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - INDI_D(INDIMenu *parentMenu, DeviceManager *parentManager, TQString inName, TQString inLabel); + INDI_D(INDIMenu *tqparentMenu, DeviceManager *tqparentManager, TQString inName, TQString inLabel); ~INDI_D(); TQString name; /* device name */ - QString label; /* device label */ - QVBox *deviceVBox; /* device tab frame */ + TQString label; /* device label */ + TQVBox *deviceVBox; /* device tab frame */ TQTabWidget *groupContainer; /* Groups within the device */ - QTextEdit *msgST_w; /* scrolled text for messages */ + TQTextEdit *msgST_w; /* scrolled text for messages */ unsigned char *dataBuffer; /* Generic buffer */ //TQScrollView *sv; /* Scroll view */ //TQVBoxLayout *mainLayout; @@ -95,8 +96,8 @@ class INDI_D : public KDialogBase INDI_G *curGroup; bool INDIStdSupport; - INDIMenu *parent; - DeviceManager *parentMgr; + INDIMenu *tqparent; + DeviceManager *tqparentMgr; enum DTypes { DATA_FITS, DATA_STREAM, DATA_OTHER, DATA_CCDPREVIEW }; diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp index 8c2e0db6..6ae5c5da 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 *parent) : devManager( parent ) +INDIDriver::INDIDriver(TQWidget *tqparent) : devManager( tqparent ) { @@ -56,7 +56,7 @@ INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent ) lastGroup = NULL; lastDevice = NULL; - ksw = (KStars *) parent; + ksw = (KStars *) tqparent; //FormLayout = makeVBoxMainWidget(); @@ -102,11 +102,11 @@ INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent ) TQObject::connect(clientListView, TQT_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(ClientprocessRightButton( TQListViewItem *, const TQPoint &, int ))); -TQObject::connect(ClientpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processHostStatus(int))); +TQObject::connect(ClientpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processHosttqStatus(int))); TQObject::connect(localListView, TQT_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(LocalprocessRightButton( TQListViewItem *, const TQPoint &, int ))); -TQObject::connect(LocalpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processDeviceStatus(int))); +TQObject::connect(LocalpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processDevicetqStatus(int))); TQObject::connect(ksw->getINDIMenu(), TQT_SIGNAL(driverDisconnected(int)), this, TQT_SLOT(shutdownHost(int))); @@ -146,7 +146,7 @@ for (uint i=0; i < ksw->data()->INDIHostsList.count(); i++) { if (devices[i]->mgrID == mgrID) { - affectedItem = localListView->findItem(devices[i]->label, 0); + affectedItem = localListView->tqfindItem(devices[i]->label, 0); if (!affectedItem) return; affectedItem->setPixmap(1, stopPix); affectedItem->setPixmap(2, NULL); @@ -183,22 +183,22 @@ void INDIDriver::LocalprocessRightButton( TQListViewItem *item, const TQPoint &p void INDIDriver::activateRunService() { - processDeviceStatus(0); + processDevicetqStatus(0); } void INDIDriver::activateStopService() { - processDeviceStatus(1); + processDevicetqStatus(1); } void INDIDriver::activateHostConnection() { - processHostStatus(0); + processHosttqStatus(0); } void INDIDriver::activateHostDisconnection() { - processHostStatus(1); + processHosttqStatus(1); } void INDIDriver::updateLocalButtons() @@ -244,7 +244,7 @@ for (uint i=0; i < ksw->data()->INDIHostsList.count(); i++) } -void INDIDriver::processDeviceStatus(int id) +void INDIDriver::processDevicetqStatus(int id) { if (localListView->selectedItem() == NULL) return; @@ -280,7 +280,7 @@ void INDIDriver::processDeviceStatus(int id) } localListView->selectedItem()->setPixmap(1, runningPix); - localListView->selectedItem()->setText(4, TQString("%1").arg(devices[i]->indiPort)); + localListView->selectedItem()->setText(4, TQString("%1").tqarg(devices[i]->indiPort)); runServiceB->setEnabled(false); stopServiceB->setEnabled(true); @@ -301,7 +301,7 @@ void INDIDriver::processDeviceStatus(int id) } } -void INDIDriver::processHostStatus(int id) +void INDIDriver::processHosttqStatus(int id) { int mgrID; bool toConnect = (id == 0); @@ -405,7 +405,7 @@ bool INDIDriver::runDevice(IDevice *dev) dev->proc = new KProcess; *dev->proc << "indiserver"; - *dev->proc << "-v" << "-r" << "0" << "-p" << TQString("%1").arg(dev->indiPort) << dev->driver; + *dev->proc << "-v" << "-r" << "0" << "-p" << TQString("%1").tqarg(dev->indiPort) << dev->driver; // Check Mode dev->mode = localR->isChecked() ? IDevice::M_LOCAL : IDevice::M_SERVER; @@ -471,7 +471,7 @@ void INDIDriver::saveDevicesToDisk() { if (devices[i]->deviceType == KSTARS_TELESCOPE) { - outstream << TQString("").arg(devices[i]->label).arg(devices[i]->focal_length > 0 ? devices[i]->focal_length : -1).arg(devices[i]->aperture > 0 ? devices[i]->aperture : -1) << endl; + outstream << TQString("").tqarg(devices[i]->label).tqarg(devices[i]->focal_length > 0 ? devices[i]->focal_length : -1).tqarg(devices[i]->aperture > 0 ? devices[i]->aperture : -1) << endl; outstream << " " << devices[i]->driver << "" << endl; outstream << " " << devices[i]->version << "" << endl; @@ -486,7 +486,7 @@ void INDIDriver::saveDevicesToDisk() { if (devices[i]->deviceType == KSTARS_CCD) { - outstream << TQString("").arg(devices[i]->label) << endl; + outstream << TQString("").tqarg(devices[i]->label) << endl; outstream << " " << devices[i]->driver << "" << endl; outstream << " " << devices[i]->version << "" << endl; outstream << "" << endl; @@ -500,7 +500,7 @@ void INDIDriver::saveDevicesToDisk() { if (devices[i]->deviceType == KSTARS_FILTER) { - outstream << TQString("").arg(devices[i]->label) << endl; + outstream << TQString("").tqarg(devices[i]->label) << endl; outstream << " " << devices[i]->driver << "" << endl; outstream << " " << devices[i]->version << "" << endl; outstream << "" << endl; @@ -514,7 +514,7 @@ void INDIDriver::saveDevicesToDisk() { if (devices[i]->deviceType == KSTARS_VIDEO) { - outstream << TQString("").arg(devices[i]->label) << endl; + outstream << TQString("").tqarg(devices[i]->label) << endl; outstream << " " << devices[i]->driver << "" << endl; outstream << " " << devices[i]->version << "" << endl; outstream << "" << endl; @@ -546,7 +546,7 @@ int INDIDriver::getINDIPort() lastPort+=5; - KExtendedSocket ks(TQString::null, lastPort, KExtendedSocket::passiveSocket | KExtendedSocket::noResolve); + KExtendedSocket ks(TQString(), lastPort, KExtendedSocket::passiveSocket | KExtendedSocket::noResolve); for (uint i=0 ; i < 10; i++) { @@ -640,19 +640,19 @@ bool INDIDriver::buildDeviceGroup(XMLEle *root, char errmsg[]) groupName = valuXMLAtt(ap); - if (groupName.find("Telescopes") != -1) + if (groupName.tqfind("Telescopes") != -1) groupType = KSTARS_TELESCOPE; - else if (groupName.find("CCDs") != -1) + else if (groupName.tqfind("CCDs") != -1) groupType = KSTARS_CCD; - else if (groupName.find("Filter") != -1) + else if (groupName.tqfind("Filter") != -1) groupType = KSTARS_FILTER; - else if (groupName.find("Video") != -1) + else if (groupName.tqfind("Video") != -1) groupType = KSTARS_VIDEO; - else if (groupName.find("Focusers") != -1) + else if (groupName.tqfind("Focusers") != -1) groupType = KSTARS_FOCUSER; - else if (groupName.find("Domes") != -1) + else if (groupName.tqfind("Domes") != -1) groupType = KSTARS_DOME; - else if (groupName.find("GPS") != -1) + else if (groupName.tqfind("GPS") != -1) groupType = KSTARS_GPS; @@ -781,7 +781,7 @@ void INDIDriver::addINDIHost() if (hostItem->name == ksw->data()->INDIHostsList.at(i)->name && hostItem->portnumber == ksw->data()->INDIHostsList.at(i)->portnumber) { - KMessageBox::error(0, i18n("Host: %1 Port: %2 already exists.").arg(hostItem->name).arg(hostItem->portnumber)); + KMessageBox::error(0, i18n("Host: %1 Port: %2 already exists.").tqarg(hostItem->name).tqarg(hostItem->portnumber)); return; } @@ -829,7 +829,7 @@ void INDIDriver::modifyINDIHost() currentItem->setText(1, hostConf.nameIN->text()); currentItem->setText(2, hostConf.portnumber->text()); - ksw->data()->INDIHostsList.replace(clientListView->itemIndex(currentItem), hostItem); + ksw->data()->INDIHostsList.tqreplace(clientListView->itemIndex(currentItem), hostItem); saveHosts(); } @@ -853,7 +853,7 @@ void INDIDriver::removeINDIHost() return; } - if (KMessageBox::warningContinueCancel( 0, i18n("Are you sure you want to remove the %1 client?").arg(clientListView->currentItem()->text(1)), i18n("Delete Confirmation"),KStdGuiItem::del())!=KMessageBox::Continue) + if (KMessageBox::warningContinueCancel( 0, i18n("Are you sure you want to remove the %1 client?").tqarg(clientListView->currentItem()->text(1)), i18n("Delete Confirmation"),KStdGuiItem::del())!=KMessageBox::Continue) return; ksw->data()->INDIHostsList.remove(i); diff --git a/kstars/kstars/indidriver.h b/kstars/kstars/indidriver.h index 3511112e..cdb3ec17 100644 --- a/kstars/kstars/indidriver.h +++ b/kstars/kstars/indidriver.h @@ -40,9 +40,10 @@ struct INDIHostsInfo int mgrID; }; -class IDevice : public QObject +class IDevice : public TQObject { Q_OBJECT + TQ_OBJECT public: IDevice(TQString inLabel, TQString inDriver, TQString inVersion); @@ -79,10 +80,11 @@ class INDIDriver : public devManager { Q_OBJECT + TQ_OBJECT public: - INDIDriver(TQWidget * parent = 0); + INDIDriver(TQWidget * tqparent = 0); ~INDIDriver(); KListView* deviceContainer; @@ -130,8 +132,8 @@ public slots: void updateMenuActions(); void ClientprocessRightButton( TQListViewItem *, const TQPoint &, int ); void LocalprocessRightButton( TQListViewItem *, const TQPoint &, int ); - void processDeviceStatus(int); - void processHostStatus(int); + void processDevicetqStatus(int); + void processHosttqStatus(int); void addINDIHost(); void modifyINDIHost(); void removeINDIHost(); diff --git a/kstars/kstars/indielement.cpp b/kstars/kstars/indielement.cpp index 0ae460f7..d3eacae9 100644 --- a/kstars/kstars/indielement.cpp +++ b/kstars/kstars/indielement.cpp @@ -37,7 +37,7 @@ #include /* search element for attribute. - * return XMLAtt if find, else NULL with helpful info in errmsg. + * return XMLAtt if tqfind, else NULL with helpful info in errmsg. */ XMLAtt * findAtt (XMLEle *ep, const char *name, char errmsg[]) { @@ -50,7 +50,7 @@ XMLAtt * findAtt (XMLEle *ep, const char *name, char errmsg[]) } /* search element for given child. pp is just to build a better errmsg. - * return XMLEle if find, else NULL with helpful info in errmsg. + * return XMLEle if tqfind, else NULL with helpful info in errmsg. */ XMLEle * findEle (XMLEle *ep, INDI_P *pp, const char *child, char errmsg[]) { @@ -66,12 +66,12 @@ XMLEle * findEle (XMLEle *ep, INDI_P *pp, const char *child, char errmsg[]) /******************************************************************* ** INDI Element *******************************************************************/ -INDI_E::INDI_E(INDI_P *parentProperty, TQString inName, TQString inLabel) +INDI_E::INDI_E(INDI_P *tqparentProperty, TQString inName, TQString inLabel) { name = inName; label = inLabel; - pp = parentProperty; + pp = tqparentProperty; EHBox = new TQHBoxLayout(0, 0, KDialog::spacingHint()); label_w = NULL; @@ -110,7 +110,7 @@ label_w->setMaximumWidth(ELEMENT_LABEL_WIDTH); label_w->setFrameShape( KSqueezedTextLabel::Box ); label_w->setPaletteBackgroundColor( TQColor( 224, 232, 238 ) ); label_w->setTextFormat( TQLabel::RichText ); -label_w->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) ); +label_w->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) ); if (label.length() > MAX_LABEL_LENGTH) { @@ -249,19 +249,19 @@ void INDI_E::drawLt() switch (state) { case PS_IDLE: - led_w->setColor(Qt::gray); + led_w->setColor(TQt::gray); break; case PS_OK: - led_w->setColor(Qt::green); + led_w->setColor(TQt::green); break; case PS_BUSY: - led_w->setColor(Qt::yellow); + led_w->setColor(TQt::yellow); break; case PS_ALERT: - led_w->setColor(Qt::red); + led_w->setColor(TQt::red); break; default: @@ -295,9 +295,9 @@ connect(slider_w, TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(sliderChanged(int //kdDebug() << "For element " << label << " we have step of " << step << endl; if (length == ELEMENT_FULL_WIDTH) - spin_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) ); + spin_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) ); else - spin_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) ); + spin_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) ); spin_w->setMinimumWidth( (int) (length * 0.45) ); slider_w->setMinimumWidth( (int) (length * 0.55) ); @@ -359,7 +359,7 @@ void INDI_E::setMax (double inMax) void INDI_E::setupElementWrite(int length) { write_w = new KLineEdit( pp->pg->propertyContainer); - write_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, write_w->sizePolicy().hasHeightForWidth() )); + write_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, write_w->sizePolicy().hasHeightForWidth() )); write_w->setMinimumWidth( length ); write_w->setMaximumWidth( length); @@ -373,11 +373,11 @@ void INDI_E::setupElementRead(int length) read_w = new KLineEdit( pp->pg->propertyContainer ); read_w->setMinimumWidth( length ); - read_w->setFocusPolicy( KLineEdit::NoFocus ); + read_w->setFocusPolicy( TQ_NoFocus ); read_w->setFrameShape( KLineEdit::GroupBoxPanel ); read_w->setFrameShadow( KLineEdit::Plain ); read_w->setCursorPosition( 0 ); - read_w->setAlignment( int( KLineEdit::AlignHCenter ) ); + read_w->tqsetAlignment( int( KLineEdit::AlignHCenter ) ); read_w->setReadOnly( TRUE ); read_w->setText(text); @@ -388,7 +388,7 @@ void INDI_E::setupElementRead(int length) void INDI_E::setupBrowseButton() { browse_w = new KPushButton("...", pp->pg->propertyContainer); - browse_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, browse_w->sizePolicy().hasHeightForWidth() ) ); + browse_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, browse_w->sizePolicy().hasHeightForWidth() ) ); browse_w->setMinimumWidth( MIN_SET_WIDTH ); browse_w->setMaximumWidth( MAX_SET_WIDTH ); diff --git a/kstars/kstars/indielement.h b/kstars/kstars/indielement.h index d7c18e15..a7f10f08 100644 --- a/kstars/kstars/indielement.h +++ b/kstars/kstars/indielement.h @@ -21,7 +21,7 @@ #define INDIVERSION 1.5 /* we support this or less */ -/* GUI layout */ +/* GUI tqlayout */ #define PROPERTY_LABEL_WIDTH 80 #define ELEMENT_LABEL_WIDTH 175 #define ELEMENT_READ_WIDTH 175 @@ -49,7 +49,7 @@ typedef enum {PG_NONE = 0, PG_TEXT, PG_NUMERIC, PG_BUTTONS, /* INDI std properties */ /* N.B. Need to modify corresponding entry in indidevice.cpp when changed */ enum stdProperties { CONNECTION, DEVICE_PORT, TIME, SDTIME, GEOGRAPHIC_COORD, /* General */ - EQUATORIAL_COORD, EQUATORIAL_EOD_COORD, HORIZONTAL_COORD, /* Telescope */ + ETQUATORIAL_COORD, ETQUATORIAL_EOD_COORD, HORIZONTAL_COORD, /* Telescope */ ABORT_MOTION, ON_COORD_SET, SOLAR_SYSTEM, MOVEMENT, PARK, /* Telescope */ CCD_EXPOSE_DURATION, CCD_TEMPERATURE, CCD_FRAME, /* CCD */ CCD_FRAME_TYPE, CCD_BINNING, CCD_INFO, CCDPREVIEW_STREAM, /* CCD */ @@ -86,18 +86,19 @@ XMLAtt * findAtt (XMLEle *ep , const char *name , char errmsg[]); XMLEle * findEle (XMLEle *ep , INDI_P *pp, const char *child, char errmsg[]); /* INDI Element */ -class INDI_E : public QObject +class INDI_E : public TQObject { Q_OBJECT + TQ_OBJECT public: - INDI_E(INDI_P *parentProperty, TQString inName, TQString inLabel); + INDI_E(INDI_P *tqparentProperty, TQString inName, TQString inLabel); ~INDI_E(); TQString name; /* name */ TQString label; /* label is the name by default, unless specefied */ PState state; /* control on/off t/f etc */ - INDI_P *pp; /* parent property */ + INDI_P *pp; /* tqparent property */ - TQHBoxLayout *EHBox; /* Horizontal layout */ + TQHBoxLayout *EHBox; /*Qt::Horizontal tqlayout */ /* GUI widgets, only malloced when needed */ KSqueezedTextLabel *label_w; // label @@ -105,11 +106,11 @@ class INDI_E : public QObject KLineEdit *write_w; // write field KLed *led_w; // light led KDoubleSpinBox *spin_w; // spinbox - QSlider *slider_w; // Slider + TQSlider *slider_w; // Slider KPushButton *push_w; // push button KPushButton *browse_w; // browse button TQCheckBox *check_w; // check box - TQSpacerItem *hSpacer; // Horizontal spacer + TQSpacerItem *hSpacer; //Qt::Horizontal spacer double min, max, step; // params for scale double value; // current value diff --git a/kstars/kstars/indifitsconf.cpp b/kstars/kstars/indifitsconf.cpp index 5c4cddae..53b9dd3b 100644 --- a/kstars/kstars/indifitsconf.cpp +++ b/kstars/kstars/indifitsconf.cpp @@ -23,8 +23,8 @@ #include "Options.h" -INDIFITSConf::INDIFITSConf(TQWidget* parent, const char* name, bool modal, WFlags fl) -: INDIConf(parent,name, modal,fl) +INDIFITSConf::INDIFITSConf(TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: INDIConf(tqparent,name, modal,fl) { KIconLoader *icons = KGlobal::iconLoader(); diff --git a/kstars/kstars/indifitsconf.h b/kstars/kstars/indifitsconf.h index 600fcb12..598c5ec9 100644 --- a/kstars/kstars/indifitsconf.h +++ b/kstars/kstars/indifitsconf.h @@ -15,9 +15,10 @@ class INDIFITSConf : public INDIConf { Q_OBJECT + TQ_OBJECT public: - INDIFITSConf(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + INDIFITSConf(TQWidget* tqparent = 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 0dcbb8b9..61d79061 100644 --- a/kstars/kstars/indigroup.cpp +++ b/kstars/kstars/indigroup.cpp @@ -28,18 +28,18 @@ ** belong to a group, whether they have one or not but how the group ** is displayed differs *******************************************************************/ -INDI_G::INDI_G(INDI_D *parentDevice, TQString inName) +INDI_G::INDI_G(INDI_D *tqparentDevice, TQString inName) { - dp = parentDevice; + dp = tqparentDevice; name = inName; pl.setAutoDelete(true); - // FIXME what's the parent exactly? + // FIXME what's the tqparent 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 children. + // 2. Keep it as TQVBox and let it handle its tqchildren. // Depends on which one works best. propertyContainer = new TQFrame(dp->groupContainer); propertyLayout = new TQVBoxLayout(propertyContainer, 20, KDialog::spacingHint() ); @@ -62,7 +62,7 @@ void INDI_G::addProperty(INDI_P *pp) dp->registerProperty(pp); propertyLayout->addLayout(pp->PHBox); - propertyLayout->addItem(VerticalSpacer); + propertyLayout->addItem(VerticalSpacer); pl.append(pp); } diff --git a/kstars/kstars/indigroup.h b/kstars/kstars/indigroup.h index 097e6a10..22a7d2ca 100644 --- a/kstars/kstars/indigroup.h +++ b/kstars/kstars/indigroup.h @@ -28,14 +28,14 @@ class TQVBoxLayout; class INDI_G { public: - INDI_G(INDI_D *parentDevice, TQString inName); + INDI_G(INDI_D *tqparentDevice, TQString inName); ~INDI_G(); TQString name; /* Group name */ INDI_D *dp; /* Parent device */ TQFrame *propertyContainer; /* Properties container */ - TQVBoxLayout *propertyLayout; /* Properties layout */ - TQSpacerItem *VerticalSpacer; /* Vertical spacer */ + TQVBoxLayout *propertyLayout; /* Properties tqlayout */ + TQSpacerItem *VerticalSpacer; /*Qt::Vertical spacer */ TQPtrList pl; /* malloced list of pointers to properties */ diff --git a/kstars/kstars/indihostconf.ui b/kstars/kstars/indihostconf.ui index f8b6c743..b2258c4c 100644 --- a/kstars/kstars/indihostconf.ui +++ b/kstars/kstars/indihostconf.ui @@ -1,10 +1,10 @@ INDIHostConf - + INDIHostConf - + 0 0 @@ -19,23 +19,23 @@ unnamed - + - layout7 + tqlayout7 unnamed - + - layout6 + tqlayout6 unnamed - + textLabel1_3 @@ -43,7 +43,7 @@ Name: - + textLabel1 @@ -51,7 +51,7 @@ Host: - + textLabel1_2 @@ -61,25 +61,25 @@ - + - layout5 + tqlayout5 unnamed - + nameIN - + hostname - + portnumber @@ -98,14 +98,14 @@ Expanding - + 30 35 - + Layout1 @@ -129,14 +129,14 @@ Expanding - + 20 20 - + buttonOk @@ -150,7 +150,7 @@ true - + buttonCancel @@ -186,5 +186,5 @@ buttonOk buttonCancel - + diff --git a/kstars/kstars/indimenu.cpp b/kstars/kstars/indimenu.cpp index 99181b0b..a3b0be1e 100644 --- a/kstars/kstars/indimenu.cpp +++ b/kstars/kstars/indimenu.cpp @@ -8,7 +8,7 @@ version 2 of the License, or (at your option) any later version. JM Changelog: - 2003-04-28 Used indimenu.c as a template. C --> C++, Xm --> KDE/Qt + 2003-04-28 Used indimenu.c as a template. C --> C++, Xm --> KDE/TQt 2003-05-01 Added tab for devices and a group feature 2003-05-02 Added scrolling area. Most things are rewritten 2003-05-05 Adding INDI Conf @@ -59,10 +59,10 @@ ** INDI Menu: Handles communication to server and fetching basic XML ** data. *******************************************************************/ -INDIMenu::INDIMenu(TQWidget *parent, const char *name ) : KDialogBase(KDialogBase::Tabbed, i18n("INDI Control Panel"), 0, KDialogBase::Default, parent, name, false) +INDIMenu::INDIMenu(TQWidget *tqparent, const char *name ) : KDialogBase(KDialogBase::Tabbed, i18n("INDI Control Panel"), 0, KDialogBase::Default, tqparent, name, false) { - ksw = (KStars *) parent; + ksw = (KStars *) tqparent; mgrCounter = 0; @@ -82,7 +82,7 @@ INDIMenu::~INDIMenu() ** Traverse the drivers list, check for updated drivers and take ** appropriate action *********************************************************************/ -void INDIMenu::updateStatus() +void INDIMenu::updatetqStatus() { INDIDriver *drivers = ksw->getINDIDriver(); @@ -122,7 +122,7 @@ DeviceManager *dev; if (drivers->devices[i]->state && drivers->devices[i]->managed == false && drivers->devices[i]->mode == IDevice::M_LOCAL) { dev = new DeviceManager(this, mgrCounter); - if (dev->indiConnect("localhost", TQString("%1").arg(drivers->devices[i]->indiPort))) + if (dev->indiConnect("localhost", TQString("%1").tqarg(drivers->devices[i]->indiPort))) { drivers->devices[i]->mgrID = mgrCounter; drivers->devices[i]->managed = true; @@ -222,11 +222,11 @@ void INDIMenu::setCustomLabel(TQString deviceName) for (unsigned int i=0; i < mgr.count(); i++) for (unsigned int j=0; j < mgr.at(i)->indi_dev.count(); j++) - if (mgr.at(i)->indi_dev.at(j)->label.find(deviceName) >= 0) + if (mgr.at(i)->indi_dev.at(j)->label.tqfind(deviceName) >= 0) nset++; if (nset) - currentLabel = deviceName + TQString(" %1").arg(nset+1); + currentLabel = deviceName + TQString(" %1").tqarg(nset+1); else currentLabel = deviceName; diff --git a/kstars/kstars/indimenu.h b/kstars/kstars/indimenu.h index 344d087e..81a99a79 100644 --- a/kstars/kstars/indimenu.h +++ b/kstars/kstars/indimenu.h @@ -48,25 +48,26 @@ class DeviceManager; class INDIMenu : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - INDIMenu(TQWidget * parent = 0 , const char *name = 0); + INDIMenu(TQWidget * tqparent = 0 , const char *name = 0); ~INDIMenu(); /***************************************************************** * GUI stuff ******************************************************************/ - QVBoxLayout *mainLayout; - QTabWidget *deviceContainer; + TQVBoxLayout *mainLayout; + TQTabWidget *deviceContainer; TQTextEdit *msgST_w; - QWidget *tab; + TQWidget *tab; TQPushButton *clear; - QString currentLabel; + TQString currentLabel; KStars *ksw; TQPtrList mgr; - void updateStatus(); + void updatetqStatus(); //bool removeDevice(TQString devName); void removeDeviceMgr(int mgrID); void setCustomLabel(TQString deviceName); diff --git a/kstars/kstars/indiproperty.cpp b/kstars/kstars/indiproperty.cpp index 058e154c..e47a83e6 100644 --- a/kstars/kstars/indiproperty.cpp +++ b/kstars/kstars/indiproperty.cpp @@ -49,17 +49,17 @@ /******************************************************************* ** INDI Property: contains widgets, labels, and their status *******************************************************************/ -INDI_P::INDI_P(INDI_G *parentGroup, TQString inName) +INDI_P::INDI_P(INDI_G *tqparentGroup, TQString inName) { name = inName; - pg = parentGroup; + pg = tqparentGroup; el.setAutoDelete(true); stdID = -1; - indistd = new INDIStdProperty(this, pg->dp->parent->ksw, pg->dp->stdDev); + indistd = new INDIStdProperty(this, pg->dp->tqparent->ksw, pg->dp->stdDev); PHBox = new TQHBoxLayout(0, 0, KDialogBase::spacingHint()); PVBox = new TQVBoxLayout(0, 0, KDialogBase::spacingHint()); @@ -120,21 +120,21 @@ void INDI_P::drawLt(PState lstate) switch (lstate) { case PS_IDLE: - light->setColor(Qt::gray); + light->setColor(TQt::gray); break; case PS_OK: - light->setColor(Qt::green); + light->setColor(TQt::green); emit okState(); disconnect( this, TQT_SIGNAL(okState()), 0, 0 ); break; case PS_BUSY: - light->setColor(Qt::yellow); + light->setColor(TQt::yellow); break; case PS_ALERT: - light->setColor(Qt::red); + light->setColor(TQt::red); break; default: @@ -178,7 +178,7 @@ void INDI_P::newText() f_scansexa(lp->text.ascii(), &(lp->targetValue)); if ((lp->targetValue > lp->max || lp->targetValue < lp->min)) { - KMessageBox::error(0, i18n("Invalid range for element %1. Valid range is from %2 to %3").arg(lp->label).arg(lp->min).arg(lp->max)); + KMessageBox::error(0, i18n("Invalid range for element %1. Valid range is from %2 to %3").tqarg(lp->label).tqarg(lp->min).tqarg(lp->max)); return; } } @@ -193,9 +193,9 @@ void INDI_P::newText() indistd->newText(); if (guitype == PG_TEXT) - pg->dp->parentMgr->sendNewText(this); + pg->dp->tqparentMgr->sendNewText(this); else if (guitype == PG_NUMERIC) - pg->dp->parentMgr->sendNewNumber(this); + pg->dp->tqparentMgr->sendNewNumber(this); } @@ -209,18 +209,18 @@ void INDI_P::convertSwitch(int id) if (assosiatedPopup == NULL) return; - mLabel = assosiatedPopup->text(id).replace("&", ""); + mLabel = assosiatedPopup->text(id).tqreplace("&", ""); //kdDebug() << "Name: " << name << " ID: " << id << endl; /* Special case is CCD_EXPOSE_DURATION, not a switch */ - if (stdID == CCD_EXPOSE_DURATION && mLabel.find(label) != -1) + if (stdID == CCD_EXPOSE_DURATION && mLabel.tqfind(label) != -1) { newText(); return; } /* Another special case, center telescope */ - if (mLabel.find("Crosshair") != -1) + if (mLabel.tqfind("Crosshair") != -1) { if (!indistd->stdDev->dp->isOn()) return; if (indistd->stdDev->telescopeSkyObject == NULL) return; @@ -308,7 +308,7 @@ void INDI_P::newSwitch(int id) if (indistd->newSwitch(id, lp)) return; - pg->dp->parentMgr->sendNewSwitch (this, id); + pg->dp->tqparentMgr->sendNewSwitch (this, id); } @@ -339,12 +339,12 @@ void INDI_P::newBlob() fp.setName(filename); - if ( (pos = filename.findRev(".")) != -1) + if ( (pos = filename.tqfindRev(".")) != -1) format = filename.mid (pos, filename.length()); if (!fp.open(IO_ReadOnly)) { - KMessageBox::error(0, i18n("Cannot open file %1 for reading").arg(filename)); + KMessageBox::error(0, i18n("Cannot open file %1 for reading").tqarg(filename)); valid = false; continue; } @@ -354,7 +354,7 @@ void INDI_P::newBlob() data_file = new char[fp.size()]; if (data_file == NULL) { - KMessageBox::error(0, i18n("Not enough memory to load %1").arg(filename)); + KMessageBox::error(0, i18n("Not enough memory to load %1").tqarg(filename)); fp.close(); valid = false; continue; @@ -366,7 +366,7 @@ void INDI_P::newBlob() data64 = new unsigned char[4*fp.size()/3+4]; if (data64 == NULL) { - KMessageBox::error(0, i18n("Not enough memory to convert file %1 to base64").arg(filename)); + KMessageBox::error(0, i18n("Not enough memory to convert file %1 to base64").tqarg(filename)); fp.close(); valid = false; continue; @@ -379,10 +379,10 @@ void INDI_P::newBlob() if (sending == false) { sending = true; - pg->dp->parentMgr->startBlob (pg->dp->name, name, TQString(timestamp())); + pg->dp->tqparentMgr->startBlob (pg->dp->name, name, TQString(timestamp())); } - pg->dp->parentMgr->sendOneBlob(el.at(i)->name, data64_size, format, data64); + pg->dp->tqparentMgr->sendOneBlob(el.at(i)->name, data64_size, format, data64); fp.close(); delete (data64); @@ -393,7 +393,7 @@ void INDI_P::newBlob() if (!sending && !valid) return; else if (sending) - pg->dp->parentMgr->finishBlob(); + pg->dp->tqparentMgr->finishBlob(); if (valid) state = PS_BUSY; @@ -438,19 +438,19 @@ void INDI_P::addGUI (XMLEle *root) else label_w = new TQLabel(label, pg->propertyContainer); - label_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, label_w->sizePolicy().hasHeightForWidth() ) ); + label_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, label_w->sizePolicy().hasHeightForWidth() ) ); label_w->setFrameShape( TQLabel::GroupBoxPanel ); label_w->setMinimumWidth(PROPERTY_LABEL_WIDTH); label_w->setMaximumWidth(PROPERTY_LABEL_WIDTH); label_w->setTextFormat( TQLabel::RichText ); - label_w->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignHCenter) ); + label_w->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignHCenter) ); PHBox->addWidget(label_w); light->show(); label_w->show(); - /* #3 Add the Vertical layout thay may contain several elements */ + /* #3 Add theQt::Vertical tqlayout thay may contain several elements */ PHBox->addLayout(PVBox); } @@ -600,7 +600,7 @@ int INDI_P::buildNumberGUI (XMLEle *root, char errmsg[]) void INDI_P::setupSetButton(TQString caption) { set_w = new TQPushButton(caption, pg->propertyContainer); - set_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, set_w->sizePolicy().hasHeightForWidth() ) ); + set_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, set_w->sizePolicy().hasHeightForWidth() ) ); set_w->setMinimumWidth( MIN_SET_WIDTH ); set_w->setMaximumWidth( MAX_SET_WIDTH ); diff --git a/kstars/kstars/indiproperty.h b/kstars/kstars/indiproperty.h index 493a10ba..7e98af14 100644 --- a/kstars/kstars/indiproperty.h +++ b/kstars/kstars/indiproperty.h @@ -31,17 +31,18 @@ class TQButtonGroup; /* INDI property */ -class INDI_P : public QObject +class INDI_P : public TQObject { Q_OBJECT + TQ_OBJECT public: - INDI_P(INDI_G *parentGroup, TQString inName); + INDI_P(INDI_G *tqparentGroup, TQString inName); ~INDI_P(); - QString name; /* property name */ + TQString name; /* property name */ TQString label; /* property label */ - INDI_G *pg; /* parent group */ + INDI_G *pg; /* tqparent group */ KPopupMenu *assosiatedPopup; /* assosiated popup menu, if any */ INDIStdProperty *indistd; /* Assosciated std routines class */ double timeout; /* timeout, seconds */ @@ -56,9 +57,9 @@ class INDI_P : public QObject TQLabel *label_w; /* Label widget */ TQPushButton *set_w; /* set button */ - TQSpacerItem *HorSpacer; /* Horizontal spacer */ - TQHBoxLayout *PHBox; /* Horizontal container */ - TQVBoxLayout *PVBox; /* Vertical container */ + TQSpacerItem *HorSpacer; /*Qt::Horizontal spacer */ + TQHBoxLayout *PHBox; /*Qt::Horizontal container */ + TQVBoxLayout *PVBox; /*Qt::Vertical container */ TQButtonGroup *groupB; /* group button for radio and check boxes (Elements) */ KComboBox *om_w; /* Combo box for menu */ @@ -71,8 +72,8 @@ class INDI_P : public QObject /* First step in adding a new GUI element */ void addGUI(XMLEle *root); - /* Set Property's parent group */ - void setGroup(INDI_G *parentGroup) { pg = parentGroup; } + /* Set Property's tqparent group */ + void setGroup(INDI_G *tqparentGroup) { pg = tqparentGroup; } /* Find an element within the property */ INDI_E * findElement(TQString elementName); diff --git a/kstars/kstars/indistd.cpp b/kstars/kstars/indistd.cpp index b21f46b5..4ad0c4d6 100644 --- a/kstars/kstars/indistd.cpp +++ b/kstars/kstars/indistd.cpp @@ -63,7 +63,7 @@ dp = associatedDevice; ksw = kswPtr; initDevCounter = 0; - seqCount = 0; + setqCount = 0; batchMode = false; ISOMode = false; @@ -158,7 +158,7 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d strncpy(tempFileStr, filename, 256); if ( batchMode && !ISOMode) - snprintf(filename, sizeof(filename), "%s/%s_%02d.fits", tempFileStr, seqPrefix.ascii(), seqCount); + snprintf(filename, sizeof(filename), "%s/%s_%02d.fits", tempFileStr, seqPrefix.ascii(), setqCount); else if (!batchMode && !Options::indiFITSDisplay()) { strftime (ts, sizeof(ts), "%Y-%m-%dT%H:%M:%S", tp); @@ -167,10 +167,10 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d else { strftime (ts, sizeof(ts), "%Y-%m-%dT%H:%M:%S", tp); - snprintf(filename, sizeof(filename), "%s/%s_%02d_%s.fits", tempFileStr, seqPrefix.ascii(), seqCount, ts); + snprintf(filename, sizeof(filename), "%s/%s_%02d_%s.fits", tempFileStr, seqPrefix.ascii(), setqCount, ts); } - seqCount++; + setqCount++; } else { @@ -192,12 +192,12 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d // We're done if we have DATA_OTHER if (dataType == DATA_OTHER) { - ksw->statusBar()->changeItem( i18n("Data file saved to %1").arg(filename), 0); + ksw->statusBar()->changeItem( i18n("Data file saved to %1").tqarg(filename), 0); return; } else if (dataType == DATA_FITS && (batchMode || !Options::indiFITSDisplay())) { - ksw->statusBar()->changeItem( i18n("FITS file saved to %1").arg(filename), 0); + ksw->statusBar()->changeItem( i18n("FITS file saved to %1").tqarg(filename), 0); emit FITSReceived(dp->label); return; } @@ -301,8 +301,8 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d CCDPreviewWindow->setCCDInfo(fwhm, mu); break; - case EQUATORIAL_COORD: - case EQUATORIAL_EOD_COORD: + case ETQUATORIAL_COORD: + case ETQUATORIAL_EOD_COORD: if (!dp->isOn()) break; el = pp->findElement("RA"); if (!el) return; @@ -375,7 +375,7 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d if (streamWindow) { //sNotifier->disconnect(); - //dp->parentMgr->sNotifier->disconnect(); + //dp->tqparentMgr->sNotifier->disconnect(); streamWindow->enableStream(false); streamWindow->close(); @@ -445,9 +445,9 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d { seqPrefix = newPrefix; - seqLister->setNameFilter(TQString("%1_*.fits").arg(seqPrefix)); + seqLister->setNameFilter(TQString("%1_*.fits").tqarg(seqPrefix)); - seqCount = 0; + setqCount = 0; if (ISOMode) return; @@ -472,7 +472,7 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d tempName = it.current()->name(); // find the prefix first - if (tempName.find(seqPrefix) == -1) + if (tempName.tqfind(seqPrefix) == -1) continue; strncpy(tempPrefix, tempName.ascii(), 64); @@ -486,8 +486,8 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d newFileIndex = strtol(t, NULL, 10); - if (newFileIndex >= seqCount) - seqCount = newFileIndex + 1; + if (newFileIndex >= setqCount) + setqCount = newFileIndex + 1; } delete [] (tempPrefix); @@ -509,9 +509,9 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d TQTime newTime( ksw->data()->ut().time()); ExtDate newDate( ksw->data()->ut().date()); - lp->write_w->setText(TQString("%1-%2-%3T%4:%5:%6").arg(newDate.year()).arg(newDate.month()) - .arg(newDate.day()).arg(newTime.hour()) - .arg(newTime.minute()).arg(newTime.second())); + lp->write_w->setText(TQString("%1-%2-%3T%4:%5:%6").tqarg(newDate.year()).tqarg(newDate.month()) + .tqarg(newDate.day()).tqarg(newTime.hour()) + .tqarg(newTime.minute()).tqarg(newTime.second())); pp->newText(); pp = dp->findProp("SDTIME"); @@ -543,8 +543,8 @@ void INDIStdDevice::updateLocation() longEle = pp->findElement("LONG"); if (!longEle) return; - longEle->write_w->setText(TQString("%1:%2:%3").arg(tempLong.degree()).arg(tempLong.arcmin()).arg(tempLong.arcsec())); - latEle->write_w->setText(TQString("%1:%2:%3").arg(geo->lat()->degree()).arg(geo->lat()->arcmin()).arg(geo->lat()->arcsec())); + longEle->write_w->setText(TQString("%1:%2:%3").tqarg(tempLong.degree()).tqarg(tempLong.arcmin()).tqarg(tempLong.arcsec())); + latEle->write_w->setText(TQString("%1:%2:%3").tqarg(geo->lat()->degree()).tqarg(geo->lat()->arcmin()).tqarg(geo->lat()->arcsec())); pp->newText(); } @@ -566,7 +566,7 @@ void INDIStdDevice::updateLocation() { for (unsigned int i=0; i < drivers->devices.size(); i++) { - if (drivers->devices[i]->mgrID == dp->parentMgr->mgrID) + if (drivers->devices[i]->mgrID == dp->tqparentMgr->mgrID) { if (drivers->devices[i]->deviceType == KSTARS_TELESCOPE) { @@ -619,7 +619,7 @@ void INDIStdDevice::initDeviceOptions() } if ( Options::indiMessages() ) - ksw->statusBar()->changeItem( i18n("%1 is online.").arg(dp->name), 0); + ksw->statusBar()->changeItem( i18n("%1 is online.").tqarg(dp->name), 0); ksw->map()->forceUpdateNow(); } @@ -633,7 +633,7 @@ void INDIStdDevice::initDeviceOptions() initDevCounter--; if ( initDevCounter == 0 && Options::indiMessages() ) - ksw->statusBar()->changeItem( i18n("%1 is online and ready.").arg(dp->name), 0); + ksw->statusBar()->changeItem( i18n("%1 is online and ready.").tqarg(dp->name), 0); } @@ -742,11 +742,11 @@ void INDIStdDevice::timerDone() return; } - prop = dp->findProp("EQUATORIAL_EOD_COORD"); + prop = dp->findProp("ETQUATORIAL_EOD_COORD"); if (prop == NULL) { - prop = dp->findProp("EQUATORIAL_COORD"); + prop = dp->findProp("ETQUATORIAL_COORD"); if (prop) useJ2000 = true; } @@ -767,7 +767,7 @@ void INDIStdDevice::timerDone() if (useJ2000) { sp.set(currentObject->ra(), currentObject->dec()); - sp.apparentCoord( ksw->data()->ut().djd() , (long double) J2000); + sp.aptqparentCoord( ksw->data()->ut().djd() , (long double) J2000); } // We need to get from JNow (Skypoint) to J2000 @@ -779,12 +779,12 @@ void INDIStdDevice::timerDone() DecEle = prop->findElement("DEC"); if (!DecEle) return; - RAEle->write_w->setText(TQString("%1:%2:%3").arg(sp.ra()->hour()) - .arg(sp.ra()->minute()) - .arg(sp.ra()->second())); - DecEle->write_w->setText(TQString("%1:%2:%3").arg(sp.dec()->degree()) - .arg(sp.dec()->arcmin()) - .arg(sp.dec()->arcsec())); + RAEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.ra()->hour()) + .tqarg(sp.ra()->minute()) + .tqarg(sp.ra()->second())); + DecEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.dec()->degree()) + .tqarg(sp.dec()->arcmin()) + .tqarg(sp.dec()->arcsec())); prop->newText(); } @@ -821,7 +821,7 @@ INDIStdProperty::INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, IN { for (unsigned int i=0; i < drivers->devices.size(); i++) { - if (drivers->devices[i]->mgrID == stdDev->dp->parentMgr->mgrID) + if (drivers->devices[i]->mgrID == stdDev->dp->tqparentMgr->mgrID) { if (drivers->devices[i]->deviceType == KSTARS_TELESCOPE) { @@ -849,7 +849,7 @@ INDIStdProperty::INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, IN INDI_E *RAEle(NULL), *DecEle(NULL), *AzEle(NULL), *AltEle(NULL), *nameEle(NULL); INDI_P * prop; SkyPoint sp; - int selectedCoord=0; /* 0 for Equatorial, 1 for Horizontal */ + int selectedCoord=0; /* 0 for Equatorial, 1 forQt::Horizontal */ bool useJ2000 (false); switch (pp->stdID) @@ -862,10 +862,10 @@ INDIStdProperty::INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, IN if (stdDev->devTimer->isActive()) stdDev->devTimer->stop(); - prop = pp->pg->dp->findProp("EQUATORIAL_EOD_COORD"); + prop = pp->pg->dp->findProp("ETQUATORIAL_EOD_COORD"); if (prop == NULL) { - prop = pp->pg->dp->findProp("EQUATORIAL_COORD"); + prop = pp->pg->dp->findProp("ETQUATORIAL_COORD"); if (prop == NULL) { prop = pp->pg->dp->findProp("HORIZONTAL_COORD"); @@ -889,7 +889,7 @@ INDIStdProperty::INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, IN if (!DecEle) return false; break; - // Horizontal + //Qt::Horizontal case 1: if (prop->perm == PP_RO) return false; AzEle = prop->findElement("AZ"); @@ -926,10 +926,10 @@ INDIStdProperty::INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, IN sp.set (ksw->map()->clickedPoint()->ra(), ksw->map()->clickedPoint()->dec()); if (useJ2000) - sp.apparentCoord(ksw->data()->ut().djd(), (long double) J2000); + sp.aptqparentCoord(ksw->data()->ut().djd(), (long double) J2000); - RAEle->write_w->setText(TQString("%1:%2:%3").arg(sp.ra()->hour()).arg(sp.ra()->minute()).arg(sp.ra()->second())); - DecEle->write_w->setText(TQString("%1:%2:%3").arg(sp.dec()->degree()).arg(sp.dec()->arcmin()).arg(sp.dec()->arcsec())); + RAEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.ra()->hour()).tqarg(sp.ra()->minute()).tqarg(sp.ra()->second())); + DecEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.dec()->degree()).tqarg(sp.dec()->arcmin()).tqarg(sp.dec()->arcsec())); break; @@ -945,8 +945,8 @@ INDIStdProperty::INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, IN sp.setAlt(*ksw->map()->clickedPoint()->alt()); } - AzEle->write_w->setText(TQString("%1:%2:%3").arg(sp.az()->degree()).arg(sp.az()->arcmin()).arg(sp.az()->arcsec())); - AltEle->write_w->setText(TQString("%1:%2:%3").arg(sp.alt()->degree()).arg(sp.alt()->arcmin()).arg(sp.alt()->arcsec())); + AzEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.az()->degree()).tqarg(sp.az()->arcmin()).tqarg(sp.az()->arcsec())); + AltEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.alt()->degree()).tqarg(sp.alt()->arcmin()).tqarg(sp.alt()->arcsec())); break; } @@ -1026,9 +1026,9 @@ void INDIStdProperty::newTime() ExtDate newDate( timedialog.selectedDate() ); timeEle->write_w->setText(TQString("%1-%2-%3T%4:%5:%6") - .arg(newDate.year()).arg(newDate.month()) - .arg(newDate.day()).arg(newTime.hour()) - .arg(newTime.minute()).arg(newTime.second())); + .tqarg(newDate.year()).tqarg(newDate.month()) + .tqarg(newDate.day()).tqarg(newTime.hour()) + .tqarg(newTime.minute()).tqarg(newTime.second())); pp->newText(); } else return; diff --git a/kstars/kstars/indistd.h b/kstars/kstars/indistd.h index 407ac02b..3ff79c2f 100644 --- a/kstars/kstars/indistd.h +++ b/kstars/kstars/indistd.h @@ -30,9 +30,10 @@ /* This class implmements standard properties on the device level*/ - class INDIStdDevice : public QObject + class INDIStdDevice : public TQObject { Q_OBJECT + TQ_OBJECT public: INDIStdDevice(INDI_D *associatedDevice, KStars * kswPtr); ~INDIStdDevice(); @@ -70,11 +71,11 @@ int dataType; int initDevCounter; - QString dataExt; + TQString dataExt; LilXML *parser; - QString seqPrefix; - int seqCount; + TQString seqPrefix; + int setqCount; bool batchMode; bool ISOMode; KDirLister *seqLister; @@ -94,9 +95,10 @@ }; /* This class implmements standard properties */ - class INDIStdProperty : public QObject + class INDIStdProperty : public TQObject { Q_OBJECT + TQ_OBJECT public: INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, INDIStdDevice *stdDevPtr); ~INDIStdProperty(); diff --git a/kstars/kstars/infobox.cpp b/kstars/kstars/infobox.cpp index b2f64bcd..781500bd 100644 --- a/kstars/kstars/infobox.cpp +++ b/kstars/kstars/infobox.cpp @@ -124,7 +124,7 @@ void InfoBox::draw( TQPainter &p, TQColor BGColor, unsigned int BGMode ) { TQRect r; int w,h; - r = p.boundingRect( x(), y(), p.window().width(), p.window().height(), Qt::AlignCenter, text1() ); + r = p.boundingRect( x(), y(), p.window().width(), p.window().height(), TQt::AlignCenter, text1() ); ShadedTextWidth = r.width(); ShadedTextHeight = r.height(); @@ -132,13 +132,13 @@ void InfoBox::draw( TQPainter &p, TQColor BGColor, unsigned int BGMode ) { h = ShadedTextHeight; if ( !text2().isEmpty() ) { - r = p.boundingRect( x(), y(), p.window().width(), p.window().height(), Qt::AlignCenter, text2() ); + r = p.boundingRect( x(), y(), p.window().width(), p.window().height(), TQt::AlignCenter, text2() ); if ( r.width() > w ) w = r.width(); h += r.height(); } if ( !text3().isEmpty() ) { - r = p.boundingRect( x(), y(), p.window().width(), p.window().height(), Qt::AlignCenter, text3() ); + r = p.boundingRect( x(), y(), p.window().width(), p.window().height(), TQt::AlignCenter, text3() ); if ( r.width() > w ) w = r.width(); h += r.height(); } diff --git a/kstars/kstars/infobox.h b/kstars/kstars/infobox.h index e9953404..bd943a2b 100644 --- a/kstars/kstars/infobox.h +++ b/kstars/kstars/infobox.h @@ -37,9 +37,10 @@ class TQPainter; class InfoBox : public TQObject { Q_OBJECT + TQ_OBJECT public: /**default constructor. Creates an infobox with empty text string - *and default geometry + *and default tqgeometry */ InfoBox(); @@ -169,7 +170,7 @@ public: /**@return the third line of text*/ TQString text3() const { return Text3; } - /**@return the geometry of the box*/ + /**@return the tqgeometry of the box*/ TQRect rect() const; /**@return TRUE if the box is anchored to the right window edge*/ @@ -184,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 bitmask.*/ + /**@return the box's anchor flag bittqmask.*/ int anchorFlag() const { return AnchorFlag; } - /**Set the box's anchor flag bitmask*/ + /**Set the box's anchor flag bittqmask*/ void setAnchorFlag( const int af ) { AnchorFlag = af; } enum AnchorType { diff --git a/kstars/kstars/infoboxes.cpp b/kstars/kstars/infoboxes.cpp index dff865e4..fdd95517 100644 --- a/kstars/kstars/infoboxes.cpp +++ b/kstars/kstars/infoboxes.cpp @@ -126,17 +126,17 @@ void InfoBoxes::drawBoxes( TQPainter &p, TQColor FGColor, TQColor grabColor, } bool InfoBoxes::grabBox( TQMouseEvent *e ) { - if ( GeoBox->rect().contains( e->pos() ) ) { + if ( GeoBox->rect().tqcontains( e->pos() ) ) { GrabbedBox = 1; GrabPos.setX( e->x() - GeoBox->x() ); GrabPos.setY( e->y() - GeoBox->y() ); return true; - } else if ( TimeBox->rect().contains( e->pos() ) ) { + } else if ( TimeBox->rect().tqcontains( e->pos() ) ) { GrabbedBox = 2; GrabPos.setX( e->x() - TimeBox->x() ); GrabPos.setY( e->y() - TimeBox->y() ); return true; - } else if ( FocusBox->rect().contains( e->pos() ) ) { + } else if ( FocusBox->rect().tqcontains( e->pos() ) ) { GrabbedBox = 3; GrabPos.setX( e->x() - FocusBox->x() ); GrabPos.setY( e->y() - FocusBox->y() ); @@ -180,7 +180,7 @@ bool InfoBoxes::dragBox( TQMouseEvent *e ) { } bool InfoBoxes::shadeBox( TQMouseEvent *e ) { - if ( GeoBox->rect().contains( e->pos() ) ) { + if ( GeoBox->rect().tqcontains( e->pos() ) ) { GeoBox->toggleShade(); if ( GeoBox->rect().bottom() > height() ) GeoBox->move( GeoBox->x(), height() - GeoBox->height() ); if ( GeoBox->rect().right() > width() ) GeoBox->move( width() - GeoBox->width(), GeoBox->y() ); @@ -189,7 +189,7 @@ bool InfoBoxes::shadeBox( TQMouseEvent *e ) { fixCollisions( TimeBox ); fixCollisions( FocusBox ); return true; - } else if ( TimeBox->rect().contains( e->pos() ) ) { + } else if ( TimeBox->rect().tqcontains( e->pos() ) ) { TimeBox->toggleShade(); if ( TimeBox->rect().bottom() > height() ) TimeBox->move( TimeBox->x(), height() - TimeBox->height() ); if ( TimeBox->rect().right() > width() ) TimeBox->move( width() - TimeBox->width(), TimeBox->y() ); @@ -198,7 +198,7 @@ bool InfoBoxes::shadeBox( TQMouseEvent *e ) { fixCollisions( GeoBox ); fixCollisions( FocusBox ); return true; - } else if ( FocusBox->rect().contains( e->pos() ) ) { + } else if ( FocusBox->rect().tqcontains( e->pos() ) ) { FocusBox->toggleShade(); if ( FocusBox->rect().bottom() > height() ) FocusBox->move( FocusBox->x(), height() - FocusBox->height() ); if ( FocusBox->rect().right() > width() ) FocusBox->move( width() - FocusBox->width(), FocusBox->y() ); @@ -248,7 +248,7 @@ bool InfoBoxes::fixCollisions( InfoBox *target ) { if ( Box2.width() ) Box2.setCoords( Box2.left()+1, Box2.top()+1, Box2.right()-1, Box2.bottom()-1 ); //First, make sure target box is within area rect. - if ( ! area.contains( t ) ) { + if ( ! area.tqcontains( t ) ) { /* if ( t.x() < area.x() ) target->move( area.x(), t.y() ); if ( t.y() < area.y() ) target->move( t.x(), area.y() ); if ( t.right() > area.right() ){ target->move( area.right() - t.width(), t.y() ); } @@ -280,25 +280,25 @@ bool InfoBoxes::fixCollisions( InfoBox *target ) { leftRect.moveTopLeft( TQPoint( t.x() - dLeft, t.y() ) ); } //If leftRect is outside area, set dLeft to a nonsense large value - if ( !area.contains( leftRect ) ) { dLeft = 100000; } + if ( !area.tqcontains( leftRect ) ) { dLeft = 100000; } //repeat for right, up and down directions. while ( rightRect.intersects( Box1 ) || rightRect.intersects( Box2 ) ) { ++dRight; rightRect.moveTopLeft( TQPoint( t.x() + dRight, t.y() ) ); } - if ( !area.contains( rightRect ) ) { dRight = 100000; } + if ( !area.tqcontains( rightRect ) ) { dRight = 100000; } while ( upRect.intersects( Box1 ) || upRect.intersects( Box2 ) ) { ++dUp; upRect.moveTopLeft( TQPoint( t.x(), t.y() - dUp ) ); } - if ( !area.contains( upRect ) ) { dUp = 100000; } + if ( !area.tqcontains( upRect ) ) { dUp = 100000; } while ( downRect.intersects( Box1 ) || downRect.intersects( Box2 ) ) { ++dDown; downRect.moveTopLeft( TQPoint( t.x(), t.y() + dDown ) ); } - if ( !area.contains( downRect ) ) { dDown = 100000; } + if ( !area.tqcontains( downRect ) ) { dDown = 100000; } //find the smallest displacement, and move the target box there. @@ -331,7 +331,7 @@ bool InfoBoxes::fixCollisions( InfoBox *target ) { //Final check to see if we're still inside area (we may not be if target //is bigger than area) - if ( area.contains( target->rect() ) ) return true; + if ( area.tqcontains( target->rect() ) ) return true; else return false; } @@ -351,7 +351,7 @@ bool InfoBoxes::timeChanged( const KStarsDateTime &ut, const KStarsDateTime <, //Don't use KLocale::formatNumber() for Julian Day because we don't want //thousands-place separators TQString JDString = TQString::number( ut.djd(), 'f', 2 ); - JDString.replace( ".", KGlobal::locale()->decimalSymbol() ); + JDString.tqreplace( ".", KGlobal::locale()->decimalSymbol() ); TimeBox->setText3( i18n( "Sidereal Time", "ST: " ) + STString + i18n( "Julian Day", "JD: " ) + JDString ); diff --git a/kstars/kstars/infoboxes.h b/kstars/kstars/infoboxes.h index 25ec2d23..4cea39fd 100644 --- a/kstars/kstars/infoboxes.h +++ b/kstars/kstars/infoboxes.h @@ -45,6 +45,7 @@ class KStarsDateTime; class InfoBoxes : public TQObject { Q_OBJECT + TQ_OBJECT public: /**Constructor. Create three infoboxes and place them in the skymap. *@param w The width of the region in which the boxes can be drawn @@ -65,7 +66,7 @@ public: *"grabbed" by the user *@param colorBG The background color for infoboxes * - *@todo Use Qt::white as default color instead of TQColor("white"), + *@todo Use TQt::white as default color instead of TQColor("white"), * for default values of colorText, colorGrab and colorBG, * since that's considerably faster. */ diff --git a/kstars/kstars/kscomet.cpp b/kstars/kstars/kscomet.cpp index 94ed1762..e36463d2 100644 --- a/kstars/kstars/kscomet.cpp +++ b/kstars/kstars/kscomet.cpp @@ -49,9 +49,9 @@ KSComet::KSComet( KStarsData *_kd, TQString _s, TQString imfile, P = 365.2568984 * pow(a, 1.5); //period in days //If the name contains a "/", make this name2 and make name a truncated version without the leading "P/" or "C/" - if ( name().contains( "/" ) ) { + if ( name().tqcontains( "/" ) ) { setLongName( name() ); - setName( name().mid( name().find("/") + 1 ) ); + setName( name().mid( name().tqfind("/") + 1 ) ); } } diff --git a/kstars/kstars/ksfilereader.h b/kstars/kstars/ksfilereader.h index c320e8b5..13fdd1a2 100644 --- a/kstars/kstars/ksfilereader.h +++ b/kstars/kstars/ksfilereader.h @@ -34,6 +34,7 @@ class TQString; class KSFileReader : public TQObject { Q_OBJECT + TQ_OBJECT public: /**Constructor. Read an entire file into a TQStringList object. *@p file the file to be read diff --git a/kstars/kstars/ksnewstuff.cpp b/kstars/kstars/ksnewstuff.cpp index e416388e..aec4185e 100644 --- a/kstars/kstars/ksnewstuff.cpp +++ b/kstars/kstars/ksnewstuff.cpp @@ -37,10 +37,10 @@ #include "objectnamelist.h" #include "skymap.h" -KSNewStuff::KSNewStuff( TQWidget *parent ) : - TQObject(), KNewStuff( "kstars", parent ), NGCUpdated( false ) +KSNewStuff::KSNewStuff( TQWidget *tqparent ) : + TQObject(), KNewStuff( "kstars", tqparent ), NGCUpdated( false ) { - ks = (KStars*)parent; + ks = (KStars*)tqparent; kdw = new KDirWatch( this ); kdw->addDir( KGlobal::dirs()->saveLocation("data", kapp->instanceName(), true) ); } @@ -62,7 +62,7 @@ bool KSNewStuff::install( const TQString &fileName ) archiveDir->copyTo(destDir); archive.close(); - kapp->processEvents(10000); + kapp->tqprocessEvents(10000); //read the new data into the program //this return might be the result of checking if everything is installed ok @@ -75,11 +75,11 @@ void KSNewStuff::updateData( const TQString &path ) { qd.setFilter( TQDir::Files ); //Show the Wait cursor - ks->setCursor(TQCursor(Qt::WaitCursor)); + ks->setCursor(TQCursor(TQt::WaitCursor)); //Handle the Steinicke NGC/IC catalog - if ( !NGCUpdated && qd[0].contains( "ngcic" ) ) { + if ( !NGCUpdated && qd[0].tqcontains( "ngcic" ) ) { //Build a progress dialog to show during data installation. KProgressDialog prog( 0, "newstuffprogdialog", i18n( "Please Wait" ), i18n( "Installing Steinicke NGC/IC catalog..." ), false /*modal*/ ); @@ -87,7 +87,7 @@ void KSNewStuff::updateData( const TQString &path ) { prog.setMinimumDuration( 0 /*millisec*/ ); prog.progressBar()->setTotalSteps( 0 ); //show generic progress activity prog.show(); - kapp->processEvents(1000); + kapp->tqprocessEvents(1000); //First, remove the existing NGC/IC objects from the ObjectNameList. for ( DeepSkyObject *o = ks->data()->deepSkyList.first(); o; o = ks->data()->deepSkyList.next() ) { @@ -163,10 +163,10 @@ void KSNewStuff::updateData( const TQString &path ) { } //Restore arrow cursor - ks->setCursor(TQCursor(Qt::ArrowCursor)); + ks->setCursor(TQCursor(TQt::ArrowCursor)); } -void KSNewStuff::slotProcessEvents() { kapp->processEvents( 500 ); } +void KSNewStuff::slotProcessEvents() { kapp->tqprocessEvents( 500 ); } #include "ksnewstuff.moc" diff --git a/kstars/kstars/ksnewstuff.h b/kstars/kstars/ksnewstuff.h index fc653e55..a6e4cd49 100644 --- a/kstars/kstars/ksnewstuff.h +++ b/kstars/kstars/ksnewstuff.h @@ -32,8 +32,6 @@ #include -#if KDE_IS_VERSION( 3, 2, 90 ) - #include #include #include @@ -46,12 +44,13 @@ class KStars; class KSNewStuff : public TQObject, public KNewStuff { Q_OBJECT + TQ_OBJECT public: /** *Constructor - *@p parent pointer to the parent widget + *@p tqparent pointer to the tqparent widget */ - KSNewStuff( TQWidget *parent = 0 ); + KSNewStuff( TQWidget *tqparent = 0 ); /** *Install new application data @@ -90,5 +89,4 @@ class KSNewStuff : public TQObject, public KNewStuff bool NGCUpdated; }; -#endif // KDE >= 3.2.90 #endif // KSNEWSTUFF_H diff --git a/kstars/kstars/ksplanet.h b/kstars/kstars/ksplanet.h index c30e40e7..9076795d 100644 --- a/kstars/kstars/ksplanet.h +++ b/kstars/kstars/ksplanet.h @@ -103,7 +103,7 @@ protected: typedef TQPtrVector OBArray[6]; -/**OrbitDataColl contains three groups of six QPtrVectors. Each TQPtrVector is a +/**OrbitDataColl contains three groups of six TQPtrVectors. Each TQPtrVector is a *list of OrbitData objects, representing a single sum used in computing *the planet's position. A set of six of these vectors comprises the large *"meta-sum" which yields the planet's Longitude, Latitude, or Distance value. @@ -121,7 +121,7 @@ protected: }; -/**OrbitDataManager places the OrbitDataColl objects for all planets in a QDict +/**OrbitDataManager places the OrbitDataColl objects for all planets in a TQDict *indexed by the planets' names. It also loads the positional data of each planet *from disk. *@author Mark Hollomon diff --git a/kstars/kstars/ksplanetbase.cpp b/kstars/kstars/ksplanetbase.cpp index 469c5307..9550342d 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 apparent coordinates (topocentric coordinates) + //convert geocentric coordinates to local aptqparent 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 d703f980..97296c61 100644 --- a/kstars/kstars/ksplanetbase.h +++ b/kstars/kstars/ksplanetbase.h @@ -72,7 +72,7 @@ class KSPlanetBase : public SkyObject { public: /**Constructor. Calls SkyObject constructor with type=2 (planet), - *coordinates=0.0, mag=0.0, primary name s, and all other QStrings empty. + *coordinates=0.0, mag=0.0, primary name s, and all other TQStrings empty. @param kd Some kind of data *@param s Name of planet *@param image_file filename of the planet's image @@ -263,7 +263,7 @@ public: */ void clearTrail() { Trail.clear(); } -/**@short update Horizontal coords of the trail +/**@short updateQt::Horizontal coords of the trail */ void updateTrail( dms *LST, const dms *lat ); @@ -281,7 +281,7 @@ public: /**Show Solar System object popup menu. Overloaded from virtual *SkyObject::showPopupMenu() *@param pmenu pointer to the KSPopupMenu object - *@param pos QPojnt holding the x,y coordinates for the menu + *@param pos TQPojnt holding the x,y coordinates for the menu */ virtual void showPopupMenu( KSPopupMenu *pmenu, TQPoint pos ) { pmenu->createPlanetMenu( this ); pmenu->popup( pos ); } @@ -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 apparent position. The effect is most significant for the Moon. + *body's aptqparent 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 5f1a7829..97fd16f5 100644 --- a/kstars/kstars/kspopupmenu.cpp +++ b/kstars/kstars/kspopupmenu.cpp @@ -32,10 +32,10 @@ #include "indigroup.h" #include "indiproperty.h" -KSPopupMenu::KSPopupMenu( TQWidget *parent, const char *name ) - : KPopupMenu( parent, name ) +KSPopupMenu::KSPopupMenu( TQWidget *tqparent, const char *name ) + : KPopupMenu( tqparent, name ) { - ksw = ( KStars* )parent; + ksw = ( KStars* )tqparent; } KSPopupMenu::~KSPopupMenu() @@ -43,7 +43,7 @@ KSPopupMenu::~KSPopupMenu() } void KSPopupMenu::createEmptyMenu( SkyObject *nullObj ) { - initPopupMenu( nullObj, i18n( "Empty sky" ), TQString::null, TQString::null, true, true, false, false, false, true, false ); + initPopupMenu( nullObj, i18n( "Empty sky" ), TQString(), TQString(), true, true, false, false, false, true, false ); insertItem( i18n( "First Generation Digitized Sky Survey", "Show 1st-Gen DSS Image" ), ksw->map(), TQT_SLOT( slotDSS() ) ); insertItem( i18n( "Second Generation Digitized Sky Survey", "Show 2nd-Gen DSS Image" ), ksw->map(), TQT_SLOT( slotDSS2() ) ); @@ -51,7 +51,7 @@ void KSPopupMenu::createEmptyMenu( SkyObject *nullObj ) { void KSPopupMenu::createStarMenu( StarObject *star ) { //Add name, rise/set time, center/track, and detail-window items - initPopupMenu( star, star->translatedLongName(), i18n( "Spectral type: %1" ).arg(star->sptype()), + initPopupMenu( star, star->translatedLongName(), i18n( "Spectral type: %1" ).tqarg(star->sptype()), i18n( "star" ) ); //If the star is named, add custom items to popup menu based on object's ImageList and InfoList @@ -237,7 +237,7 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr if ( s1 == i18n( "star" ) || s1 == i18n( "Empty sky" ) ) showLabel = false; pmTitle = new TQLabel( s1, this ); - pmTitle->setAlignment( AlignCenter ); + pmTitle->tqsetAlignment( AlignCenter ); TQPalette pal( pmTitle->palette() ); pal.setColor( TQPalette::Normal, TQColorGroup::Background, pal.color( TQPalette::Normal, TQColorGroup::Base ) ); pal.setColor( TQPalette::Normal, TQColorGroup::Foreground, pal.color( TQPalette::Normal, TQColorGroup::Text ) ); @@ -246,38 +246,38 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr if ( ! s2.isEmpty() ) { pmTitle2 = new TQLabel( s2, this ); - pmTitle2->setAlignment( AlignCenter ); + pmTitle2->tqsetAlignment( AlignCenter ); pmTitle2->setPalette( pal ); insertItem( pmTitle2 ); } if ( ! s3.isEmpty() ) { pmType = new TQLabel( s3, this ); - pmType->setAlignment( AlignCenter ); + pmType->tqsetAlignment( AlignCenter ); pmType->setPalette( pal ); insertItem( pmType ); } TQString c = obj->constellation( ksw->data()->csegmentList, ksw->data()->cnameList ); pmConstellation = new TQLabel( c, this ); - pmConstellation->setAlignment( AlignCenter ); + pmConstellation->tqsetAlignment( AlignCenter ); pmConstellation->setPalette( pal ); insertItem( pmConstellation ); //Insert Rise/Set/Transit labels if ( showRiseSet && obj ) { pmRiseTime = new TQLabel( i18n( "Rise time: 00:00" ), this ); - pmRiseTime->setAlignment( AlignCenter ); + pmRiseTime->tqsetAlignment( AlignCenter ); pmRiseTime->setPalette( pal ); TQFont rsFont = pmRiseTime->font(); rsFont.setPointSize( rsFont.pointSize() - 2 ); pmRiseTime->setFont( rsFont ); pmSetTime = new TQLabel( i18n( "the time at which an object falls below the horizon", "Set time:" ) + " 00:00", this ); - pmSetTime->setAlignment( AlignCenter ); + pmSetTime->tqsetAlignment( AlignCenter ); pmSetTime->setPalette( pal ); pmSetTime->setFont( rsFont ); pmTransitTime = new TQLabel( i18n( "Transit time: 00:00" ), this ); - pmTransitTime->setAlignment( AlignCenter ); + pmTransitTime->tqsetAlignment( AlignCenter ); pmTransitTime->setPalette( pal ); pmTransitTime->setFont( rsFont ); insertSeparator(); @@ -320,7 +320,7 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr } if ( showObsList && obj ) { - if ( ksw->observingList()->contains( obj ) ) + if ( ksw->observingList()->tqcontains( obj ) ) insertItem( i18n("Remove From List"), ksw->observingList(), TQT_SLOT( slotRemoveObject() ) ); else insertItem( i18n("Add to List"), ksw->observingList(), TQT_SLOT( slotAddObject() ) ); @@ -349,7 +349,7 @@ void KSPopupMenu::setRiseSetLabels( SkyObject *obj ) { if ( rtime.isValid() ) { //We can round to the nearest minute by simply adding 30 seconds to the time. - rt = i18n( "Rise time: %1" ).arg( rtime.addSecs(30).toString( "hh:mm" ) ); + rt = i18n( "Rise time: %1" ).tqarg( rtime.addSecs(30).toString( "hh:mm" ) ); } else if ( obj->alt()->Degrees() > 0 ) { rt = i18n( "No rise time: Circumpolar" ); @@ -365,7 +365,7 @@ void KSPopupMenu::setRiseSetLabels( SkyObject *obj ) { if ( stime.isValid() ) { //We can round to the nearest minute by simply adding 30 seconds to the time. - st = i18n( "the time at which an object falls below the horizon", "Set time: %1" ).arg( stime.addSecs(30).toString( "hh:mm" ) ); + st = i18n( "the time at which an object falls below the horizon", "Set time: %1" ).tqarg( stime.addSecs(30).toString( "hh:mm" ) ); } else if ( obj->alt()->Degrees() > 0 ) { st = i18n( "No set time: Circumpolar" ); @@ -379,7 +379,7 @@ void KSPopupMenu::setRiseSetLabels( SkyObject *obj ) { if ( ttime.isValid() ) { //We can round to the nearest minute by simply adding 30 seconds to the time. - tt = i18n( "Transit time: %1" ).arg( ttime.addSecs(30).toString( "hh:mm" ) ); + tt = i18n( "Transit time: %1" ).tqarg( ttime.addSecs(30).toString( "hh:mm" ) ); } else { tt = "--:--"; } diff --git a/kstars/kstars/kspopupmenu.h b/kstars/kstars/kspopupmenu.h index 78f7c1e3..a6ef1a20 100644 --- a/kstars/kstars/kspopupmenu.h +++ b/kstars/kstars/kspopupmenu.h @@ -39,9 +39,10 @@ class TQLabel; class KSPopupMenu : public KPopupMenu { Q_OBJECT + TQ_OBJECT public: /**Default constructor*/ - KSPopupMenu( TQWidget *parent = 0, const char *name = 0 ); + KSPopupMenu( TQWidget *tqparent = 0, const char *name = 0 ); /**Destructor (empty)*/ ~KSPopupMenu(); diff --git a/kstars/kstars/kssun.cpp b/kstars/kstars/kssun.cpp index 5df14c59..fc9b312d 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 apparent geocentric ecliptic coordinates. That is, after + // We obtain the aptqparent geocentric ecliptic coordinates. That is, after // nutation and aberration have been applied. EquatorialToEcliptic( num->obliquity() ); diff --git a/kstars/kstars/kstars.cpp b/kstars/kstars/kstars.cpp index b18f65fe..6cde713d 100644 --- a/kstars/kstars/kstars.cpp +++ b/kstars/kstars/kstars.cpp @@ -103,7 +103,7 @@ KStars::~KStars() Options::setFocusRA( skymap->focus()->ra()->Hours() ); Options::setFocusDec( skymap->focus()->dec()->Degrees() ); - //Store Window geometry in Options object + //Store Window tqgeometry in Options object Options::setWindowWidth( width() ); Options::setWindowHeight( height() ); @@ -184,9 +184,9 @@ void KStars::applyConfig() { //color scheme pd->kstarsData->colorScheme()->loadFromConfig( kapp->config() ); if ( Options::darkAppColors() ) { - TQApplication::setPalette( DarkPalette, true ); + TQApplication::tqsetPalette( DarkPalette, true ); } else { - TQApplication::setPalette( OriginalPalette, true ); + TQApplication::tqsetPalette( OriginalPalette, true ); } //Infoboxes, toolbars, statusbars diff --git a/kstars/kstars/kstars.h b/kstars/kstars/kstars.h index 73c10127..c5f213a2 100644 --- a/kstars/kstars/kstars.h +++ b/kstars/kstars/kstars.h @@ -68,6 +68,7 @@ class KStars : public KMainWindow, virtual public KStarsInterface { Q_OBJECT + TQ_OBJECT public: /** *@short Constructor. @@ -381,7 +382,7 @@ class KStars : public KMainWindow, virtual public KStarsInterface public slots: /** - *Update time-dependent data and (possibly) repaint the sky map. + *Update time-dependent data and (possibly) tqrepaint the sky map. *@p automaticDSTchange change DST status automatically? */ void updateTime( const bool automaticDSTchange = true ); @@ -624,7 +625,7 @@ class KStars : public KMainWindow, virtual public KStarsInterface void initFOV(); /** - *Initialize Status bar. + *Initialize tqStatus bar. */ void initStatusBar(); @@ -668,7 +669,7 @@ class KStars::privatedata { KStarsData *kstarsData; /**Constructor */ - privatedata(KStars *parent) : ks(parent), splash(0), kstarsData(0) {} + privatedata(KStars *tqparent) : ks(tqparent), splash(0), kstarsData(0) {} /**Destructor */ ~privatedata(); diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp index c370d55e..67807992 100644 --- a/kstars/kstars/kstarsactions.cpp +++ b/kstars/kstars/kstarsactions.cpp @@ -93,23 +93,23 @@ void KStars::slotViewToolBar() { - if ( sender()->name() == TQString( "show_stars" ) ) { + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_stars" ) ) { Options::setShowStars( !Options::showStars() ); - } else if ( sender()->name() == TQString( "show_deepsky" ) ) { + } else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_deepsky" ) ) { Options::setShowDeepSky( ! Options::showDeepSky() ); - } else if ( sender()->name() == TQString( "show_planets" ) ) { + } else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_planets" ) ) { Options::setShowPlanets( ! Options::showPlanets() ); - } else if ( sender()->name() == TQString( "show_clines" ) ) { + } else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_clines" ) ) { Options::setShowCLines( !Options::showCLines() ); - } else if ( sender()->name() == TQString( "show_cnames" ) ) { + } else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_cnames" ) ) { Options::setShowCNames( !Options::showCNames() ); - } else if ( sender()->name() == TQString( "show_cbounds" ) ) { + } else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_cbounds" ) ) { Options::setShowCBounds( !Options::showCBounds() ); - } else if ( sender()->name() == TQString( "show_mw" ) ) { + } else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_mw" ) ) { Options::setShowMilkyWay( !Options::showMilkyWay() ); - } else if ( sender()->name() == TQString( "show_grid" ) ) { + } else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_grid" ) ) { Options::setShowGrid( !Options::showGrid() ); - } else if ( sender()->name() == TQString( "show_horizon" ) ) { + } else if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_horizon" ) ) { Options::setShowGround( !Options::showGround() ); } @@ -154,7 +154,7 @@ void KStars::slotWizard() { // Make sure Numbers, Moon, planets, and sky objects are updated immediately data()->setFullTimeUpdate(); - // If the sky is in Horizontal mode and not tracking, reset focus such that + // If the sky is inQt::Horizontal mode and not tracking, reset focus such that // Alt/Az remain constant. if ( data()->useDefaultOptions ) { SkyPoint newPoint; @@ -198,7 +198,7 @@ void KStars::slotWUT() { //FIXME GLOSSARY // void KStars::slotGlossary(){ -// GlossaryDialog *dlg = new GlossaryDialog( true, this, "glossary" ); +// GlossaryDialog *dlg = new GlossaryDialog( true, TQT_TQOBJECT(this), "glossary" ); // TQString glossaryfile =data()->stdDirs->findResource( "data", "kstars/glossary.xml" ); // KURL u = glossaryfile; // Glossary *g = Glossary::readFromXML( u ); @@ -227,7 +227,7 @@ void KStars::slotImageSequence() if (indiseq == NULL) indiseq = new imagesequence(this); - if (indiseq->updateStatus()) + if (indiseq->updatetqStatus()) indiseq->show(); } @@ -248,7 +248,7 @@ void KStars::slotINDIPanel() { if (indimenu == NULL) indimenu = new INDIMenu(this); - indimenu->updateStatus(); + indimenu->updatetqStatus(); } void KStars::slotINDIDriver() { @@ -331,7 +331,7 @@ void KStars::slotGeoLocator() { // Make sure Numbers, Moon, planets, and sky objects are updated immediately data()->setFullTimeUpdate(); - // If the sky is in Horizontal mode and not tracking, reset focus such that + // If the sky is inQt::Horizontal mode and not tracking, reset focus such that // Alt/Az remain constant. if ( ! Options::isTracking() && Options::useAltAz() ) { map()->focus()->HorizontalToEquatorial( LST(), geo()->lat() ); @@ -356,8 +356,8 @@ void KStars::slotViewOps() { KConfigDialog* dialog = new KConfigDialog( this, "settings", Options::self() ); - connect( dialog, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApplySettings() ) ); - connect( dialog, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotApplySettings() ) ); + connect( dialog, TQT_SIGNAL( applyClicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotApplySettings() ) ); + connect( dialog, TQT_SIGNAL( okClicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotApplySettings() ) ); OpsCatalog *opcatalog = new OpsCatalog( this, "catalogs" ); OpsGuides *opguides = new OpsGuides( this, "guides" ); @@ -450,9 +450,9 @@ void KStars::slotExportImage() { //Warn user if file exists! if (TQFile::exists(fileURL.path())) { - int r=KMessageBox::warningContinueCancel(static_cast(parent()), + int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(tqparent()), i18n( "A file named \"%1\" already exists. " - "Overwrite it?" ).arg(fileURL.fileName()), + "Overwrite it?" ).tqarg(fileURL.fileName()), i18n( "Overwrite File?" ), i18n( "&Overwrite" ) ); @@ -501,7 +501,7 @@ void KStars::slotRunScript() { if ( tmpfile.name() == fname ) { //upload to remote location if ( ! KIO::NetAccess::upload( tmpfile.name(), fileURL, this ) ) { - TQString message = i18n( "Could not upload image to remote location: %1" ).arg( fileURL.prettyURL() ); + TQString message = i18n( "Could not upload image to remote location: %1" ).tqarg( fileURL.prettyURL() ); KMessageBox::sorry( 0, message, i18n( "Could not upload file" ) ); } } @@ -528,14 +528,14 @@ void KStars::slotRunScript() { } if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1" ).arg( f.name() ); + TQString message = i18n( "Could not open file %1" ).tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); return; } // Before we run the script, make sure that it's safe. Each line must either begin with "#" // or begin with "dcop $KSTARS". Otherwise, the line must be equal to one of the following: - // "KSTARS=`dcopfind -a 'kstars*'`"; "MAIN=KStarsInterface"; or "CLOCK=clock#1" + // "KSTARS=`dcoptqfind -a 'kstars*'`"; "MAIN=KStarsInterface"; or "CLOCK=clock#1" TQTextStream istream(&f); TQString line; bool fileOK( true ); @@ -543,7 +543,7 @@ void KStars::slotRunScript() { while ( ! istream.eof() ) { line = istream.readLine(); if ( line.left(1) != "#" && line.left(12) != "dcop $KSTARS" - && line.stripWhiteSpace() != "KSTARS=`dcopfind -a 'kstars*'`" + && line.stripWhiteSpace() != "KSTARS=`dcoptqfind -a 'kstars*'`" && line.stripWhiteSpace() != "MAIN=KStarsInterface" && line.stripWhiteSpace() != "CLOCK=clock#1" ) { fileOK = false; @@ -563,13 +563,13 @@ void KStars::slotRunScript() { //FIXME STRINGS FREEZE //Add statusbar message that script is running - //ks->statusBar()->changeItem( i18n( "Running script: %1" ).arg( fileURL.fileName() ), 0 ); + //ks->statusBar()->changeItem( i18n( "Running script: %1" ).tqarg( fileURL.fileName() ), 0 ); KProcess p; p << f.name(); p.start( KProcess::DontCare ); - while ( p.isRunning() ) kapp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes. + while ( p.isRunning() ) kapp->tqprocessEvents( 50 ); //otherwise tempfile may get deleted before script completes. } } @@ -595,7 +595,7 @@ void KStars::slotPrint() { //Set Time to CPU clock void KStars::slotSetTimeToNow() { - data()->changeDateTime( geo()->LTtoUT( KStarsDateTime::currentDateTime() ) ); + data()->changeDateTime( geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ) ); if ( Options::useAltAz() ) { map()->focus()->HorizontalToEquatorial( LST(), geo()->lat() ); @@ -623,7 +623,7 @@ void KStars::slotToggleTimer() { //Focus void KStars::slotPointFocus() { - TQString sentFrom( sender()->name() ); + TQString sentFrom( TQT_TQOBJECT(const_cast(sender()))->name() ); if ( sentFrom == "zenith" ) map()->invokeKey( KKey( "Z" ).keyCodeQt() ); @@ -813,17 +813,17 @@ void KStars::slotCoordSys() { //Settings Menu: void KStars::slotColorScheme() { //use mid(3) to exclude the leading "cs_" prefix from the action name - TQString filename = TQString( sender()->name() ).mid(3) + ".colors"; + TQString filename = TQString( TQT_TQOBJECT(const_cast(sender()))->name() ).mid(3) + ".colors"; loadColorScheme( filename ); } void KStars::slotTargetSymbol() { - TQString symbolName( sender()->name() ); + TQString symbolName( TQT_TQOBJECT(const_cast(sender()))->name() ); FOV f( symbolName ); //read data from fov.dat Options::setFOVName( f.name() ); Options::setFOVSize( f.size() ); - Options::setFOVShape( f.shape() ); + Options::setFOVShape( f.tqshape() ); Options::setFOVColor( f.color() ); data()->fovSymbol.setName( Options::fOVName() ); data()->fovSymbol.setSize( Options::fOVSize() ); @@ -856,7 +856,7 @@ void KStars::slotFOVEdit() { for ( FOV *fov = fovdlg.FOVList.first(); fov; fov = fovdlg.FOVList.next() ) ostream << fov->name() << ":" << fov->size() - << ":" << TQString("%1").arg( fov->shape() ) << ":" << fov->color() << endl; + << ":" << TQString("%1").tqarg( fov->tqshape() ) << ":" << fov->color() << endl; f.close(); } @@ -873,18 +873,18 @@ void KStars::slotFOVEdit() { if ( fields.count() == 4 ) { TQString nm = fields[0].stripWhiteSpace(); - KToggleAction *kta = new KToggleAction( nm, 0, this, TQT_SLOT( slotTargetSymbol() ), + KToggleAction *kta = new KToggleAction( nm, 0, TQT_TQOBJECT(this), TQT_SLOT( slotTargetSymbol() ), actionCollection(), nm.utf8() ); kta->setExclusiveGroup( "fovsymbol" ); fovActionMenu->insert( kta ); } } } else { - kdDebug() << i18n( "Could not open file: %1" ).arg( f.name() ) << endl; + kdDebug() << i18n( "Could not open file: %1" ).tqarg( f.name() ) << endl; } fovActionMenu->popupMenu()->insertSeparator(); - fovActionMenu->insert( new KAction( i18n( "Edit FOV Symbols..." ), 0, this, + fovActionMenu->insert( new KAction( i18n( "Edit FOV Symbols..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); //set FOV to whatever was highlighted in FOV dialog @@ -914,11 +914,11 @@ void KStars::slotTipOfDay() { // Toggle to and from full screen mode void KStars::slotFullScreen() { - if ( topLevelWidget()->isFullScreen() ) { - topLevelWidget()->showNormal(); + if ( tqtopLevelWidget()->isFullScreen() ) { + tqtopLevelWidget()->showNormal(); } else { - topLevelWidget()->showFullScreen(); + tqtopLevelWidget()->showFullScreen(); } } @@ -955,24 +955,24 @@ void KStars::slotClearAllTrails() { //toggle display of GUI Items on/off void KStars::slotShowGUIItem( bool show ) { //Toolbars - if ( sender()->name() == TQString( "show_mainToolBar" ) ) { + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_mainToolBar" ) ) { Options::setShowMainToolBar( show ); if ( show ) toolBar( "mainToolBar" )->show(); else toolBar( "mainToolBar" )->hide(); } - if ( sender()->name() == TQString( "show_viewToolBar" ) ) { + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_viewToolBar" ) ) { Options::setShowViewToolBar( show ); if ( show ) toolBar( "viewToolBar" )->show(); else toolBar( "viewToolBar" )->hide(); } - if ( sender()->name() == TQString( "show_statusBar" ) ) { + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_statusBar" ) ) { Options::setShowStatusBar( show ); if ( show ) statusBar()->show(); else statusBar()->hide(); } - if ( sender()->name() == TQString( "show_sbAzAlt" ) ) { + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_sbAzAlt" ) ) { Options::setShowAltAzField( show ); if ( show ) { //To preserve the order (AzAlt before RADec), we have to remove @@ -994,7 +994,7 @@ void KStars::slotShowGUIItem( bool show ) { } } - if ( sender()->name() == TQString( "show_sbRADec" ) ) { + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_sbRADec" ) ) { Options::setShowRADecField( show ); if ( show ) { TQString s = "000d 00m 00s, +00d 00\' 00\""; //only need this to set the width @@ -1008,24 +1008,24 @@ void KStars::slotShowGUIItem( bool show ) { //InfoBoxes: we only change options here; these are also connected to slots in //InfoBoxes that actually toggle the display. - if ( sender()->name() == TQString( "show_boxes" ) ) + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_boxes" ) ) Options::setShowInfoBoxes( show ); - if ( sender()->name() == TQString( "show_time_box" ) ) + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_time_box" ) ) Options::setShowTimeBox( show ); - if ( sender()->name() == TQString( "show_location_box" ) ) + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_location_box" ) ) Options::setShowGeoBox( show ); - if ( sender()->name() == TQString( "show_focus_box" ) ) + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "show_focus_box" ) ) Options::setShowFocusBox( show ); } void KStars::addColorMenuItem( TQString name, TQString actionName ) { colorActionMenu->insert( new KAction( name, 0, - this, TQT_SLOT( slotColorScheme() ), actionCollection(), actionName.local8Bit() ) ); + TQT_TQOBJECT(this), TQT_SLOT( slotColorScheme() ), actionCollection(), actionName.local8Bit() ) ); } void KStars::removeColorMenuItem( TQString actionName ) { kdDebug() << "removing " << actionName << endl; - colorActionMenu->remove( actionCollection()->action( actionName.local8Bit() ) ); + colorActionMenu->remove( actionCollection()->action( actionName.local8Bit().data() ) ); } void KStars::establishINDI() diff --git a/kstars/kstars/kstarsdata.cpp b/kstars/kstars/kstarsdata.cpp index 4d5ff70a..d12ddca1 100644 --- a/kstars/kstars/kstarsdata.cpp +++ b/kstars/kstars/kstarsdata.cpp @@ -88,7 +88,7 @@ KStarsData::KStarsData() : stdDirs(0), locale(0), //initialize FOV symbol fovSymbol = FOV(); - //set AutoDelete property for QPtrLists. Most are set TRUE, + //set AutoDelete property for TQPtrLists. Most are set TRUE, //but some 'meta-lists' need to be FALSE. starList.setAutoDelete( TRUE ); ADVtreeList.setAutoDelete( TRUE ); @@ -226,17 +226,17 @@ bool KStarsData::readADVTreeData(void) else { - Name = Line.mid(0, Line.find(":")); - Link = Line.mid(Line.find(":") + 1); + Name = Line.mid(0, Line.tqfind(":")); + Link = Line.mid(Line.tqfind(":") + 1); // Link is empty, using Interface instead if (Link.isEmpty()) { Link = Interface; subName = Name; - interfaceIndex = Link.find("KSINTERFACE"); + interfaceIndex = Link.tqfind("KSINTERFACE"); Link.remove(interfaceIndex, 11); - Link = Link.insert(interfaceIndex, subName.replace( TQRegExp(" "), "+")); + Link = Link.insert(interfaceIndex, subName.tqreplace( TQRegExp(" "), "+")); } @@ -433,7 +433,7 @@ bool KStarsData::readCLineData( void ) { } if ( ! starFound ) - kdWarning() << i18n( "No star named %1 found." ).arg(name) << endl; + kdWarning() << i18n( "No star named %1 found." ).tqarg(name) << endl; } } file.close(); @@ -584,7 +584,7 @@ bool KStarsData::readStarData( void ) { if (Options::magLimitDrawStar() > loadUntilMag) loadUntilMag = Options::magLimitDrawStar(); for (unsigned int i=1; ihasMoreLines()) { @@ -664,9 +664,9 @@ void KStarsData::processStar( TQString *line, bool reloadMode ) { //parse name(s) name = line->mid( 72 ).stripWhiteSpace(); //the rest of the line - if (name.contains( ':' )) { //genetive form exists - gname = name.mid( name.find(':')+1 ).stripWhiteSpace(); - name = name.mid( 0, name.find(':') ).stripWhiteSpace(); + if (name.tqcontains( ':' )) { //genetive form exists + gname = name.mid( name.tqfind(':')+1 ).stripWhiteSpace(); + name = name.mid( 0, name.tqfind(':') ).stripWhiteSpace(); } // HEV: look up star name in internationalization filesource @@ -788,7 +788,7 @@ bool KStarsData::readDeepSkyData( void ) { snum = TQString().sprintf( "%02d", i+1 ); fname = "ngcic" + snum + ".dat"; - emit progressText( i18n( "Loading NGC/IC Data (%1%)" ).arg( int(100.*float(i)/float(NNGCFILES)) ) ); + emit progressText( i18n( "Loading NGC/IC Data (%1%)" ).tqarg( int(100.*float(i)/float(NNGCFILES)) ) ); if ( KSUtils::openDataFile( file, fname ) ) { KSFileReader fileReader( file ); // close file is included @@ -939,7 +939,7 @@ bool KStarsData::openURLFile(TQString urlfile, TQFile & file) { file.setName( locateLocal( "appdata", urlfile ) ); if ( file.open( IO_ReadOnly ) ) { //local file found. Now, if global file has newer timestamp, then merge the two files. - //First load local file into QStringList + //First load local file into TQStringList bool newDataFound( false ); TQStringList urlData; TQTextStream lStream( &file ); @@ -964,14 +964,14 @@ bool KStarsData::openURLFile(TQString urlfile, TQFile & file) { TQString line = gStream.readLine(); //If global-file line begins with "XXX:" then this line should be removed from the local file. - if ( line.left( 4 ) == "XXX:" && urlData.contains( line.mid( 4 ) ) ) { - urlData.remove( urlData.find( line.mid( 4 ) ) ); + if ( line.left( 4 ) == "XXX:" && urlData.tqcontains( line.mid( 4 ) ) ) { + urlData.remove( urlData.tqfind( line.mid( 4 ) ) ); } else { //does local file contain the current global file line, up to second ':' ? bool linefound( false ); for ( unsigned int j=0; j< urlData.count(); ++j ) { - if ( urlData[j].contains( line.left( line.find( ':', line.find( ':' ) + 1 ) ) ) ) { + if ( urlData[j].tqcontains( line.left( line.tqfind( ':', line.tqfind( ':' ) + 1 ) ) ) ) { //replace line in urlData with its equivalent in the newer global file. urlData.remove( urlData.at(j) ); urlData.insert( urlData.at(j), line ); @@ -1047,21 +1047,21 @@ bool KStarsData::readUserLog(void) while (!buffer.isEmpty()) { int startIndex, endIndex; - startIndex = buffer.find("[KSLABEL:"); + startIndex = buffer.tqfind("[KSLABEL:"); sub = buffer.mid(startIndex); - endIndex = sub.find("[KSLogEnd]"); + endIndex = sub.tqfind("[KSLogEnd]"); // Read name after KSLABEL identifer - uint uiFirstNewline = sub.find("\n", startIndex + 9); - name = sub.mid(startIndex + 9, sub.findRev( "]", uiFirstNewline ) - (startIndex + 9) ); + uint uiFirstNewline = sub.tqfind("\n", startIndex + 9); + name = sub.mid(startIndex + 9, sub.tqfindRev( "]", uiFirstNewline ) - (startIndex + 9) ); // Read data and skip new line data = sub.mid( uiFirstNewline + 1, endIndex - (uiFirstNewline + 1)); buffer = buffer.mid(endIndex + 11); //Find the sky object named 'name'. - //Note that ObjectNameList::find() looks for the ascii representation + //Note that ObjectNameList::tqfind() looks for the ascii representation //of star genetive names, so stars are identified that way in the user log. - SkyObjectName *sonm = ObjNames.find(name); + SkyObjectName *sonm = ObjNames.tqfind(name); if (sonm == 0) { kdWarning() << k_funcinfo << name << " not found" << endl; } else { @@ -1084,12 +1084,12 @@ bool KStarsData::readURLData( TQString urlfile, int type, bool deepOnly ) { //ignore comment lines if ( line.left(1) != "#" ) { - TQString name = line.mid( 0, line.find(':') ); - TQString sub = line.mid( line.find(':')+1 ); - TQString title = sub.mid( 0, sub.find(':') ); - TQString url = sub.mid( sub.find(':')+1 ); + TQString name = line.mid( 0, line.tqfind(':') ); + TQString sub = line.mid( line.tqfind(':')+1 ); + TQString title = sub.mid( 0, sub.tqfind(':') ); + TQString url = sub.mid( sub.tqfind(':')+1 ); - SkyObjectName *sonm = ObjNames.find(name); + SkyObjectName *sonm = ObjNames.tqfind(name); if (sonm == 0) { kdWarning() << k_funcinfo << name << " not found" << endl; @@ -1142,7 +1142,7 @@ bool KStarsData::addCatalog( TQString filename ) { return true; } else - kdWarning() << k_funcinfo << i18n("Error adding catalog: %1").arg( filename ) << endl; + kdWarning() << k_funcinfo << i18n("Error adding catalog: %1").tqarg( filename ) << endl; return false; } @@ -1196,7 +1196,7 @@ CustomCatalog* KStarsData::createCustomCatalog( TQString filename, bool showerrs //Now, if one of the columns is the "Name" field, the name may contain spaces. //In this case, the name field will need to be surrounded by quotes. //Check for this, and adjust the d list accordingly - int iname = Columns.findIndex( "Nm" ); + int iname = Columns.tqfindIndex( "Nm" ); if ( iname >= 0 && d[iname].left(1) == "\"" ) { //multi-word name in quotes d[iname] = d[iname].mid(1); //remove leading quote //It's possible that the name is one word, but still in quotes @@ -1220,7 +1220,7 @@ CustomCatalog* KStarsData::createCustomCatalog( TQString filename, bool showerrs if ( d.count() == Columns.count() ) { processCustomDataLine( i, d, Columns, CatalogPrefix, objList, showerrs, errs ); } else { - if ( showerrs ) errs.append( i18n( "Line %1 does not contain %2 fields. Skipping it." ).arg( i ).arg( Columns.count() ) ); + if ( showerrs ) errs.append( i18n( "Line %1 does not contain %2 fields. Skipping it." ).tqarg( i ).tqarg( Columns.count() ) ); } } } @@ -1246,10 +1246,10 @@ CustomCatalog* KStarsData::createCustomCatalog( TQString filename, bool showerrs } else { //Error opening catalog file if ( showerrs ) - KMessageBox::sorry( 0, i18n( "Could not open custom data file: %1" ).arg( filename ), + KMessageBox::sorry( 0, i18n( "Could not open custom data file: %1" ).tqarg( filename ), i18n( "Error opening file" ) ); else - kdDebug() << i18n( "Could not open custom data file: %1" ).arg( filename ) << endl; + kdDebug() << i18n( "Could not open custom data file: %1" ).tqarg( filename ) << endl; } //Return the catalog @@ -1280,7 +1280,7 @@ bool KStarsData::processCustomDataLine( int lnum, TQStringList d, TQStringList C if ( ! RA.setFromString( d[i], false ) ) { if ( showerrs ) errs.append( i18n( "Line %1, field %2: Unable to parse RA value: %3" ) - .arg(lnum).arg(i).arg(d[i]) ); + .tqarg(lnum).tqarg(i).tqarg(d[i]) ); return false; } } @@ -1289,7 +1289,7 @@ bool KStarsData::processCustomDataLine( int lnum, TQStringList d, TQStringList C if ( ! Dec.setFromString( d[i], true ) ) { if ( showerrs ) errs.append( i18n( "Line %1, field %2: Unable to parse Dec value: %3" ) - .arg(lnum).arg(i).arg(d[i]) ); + .tqarg(lnum).tqarg(i).tqarg(d[i]) ); return false; } } @@ -1301,14 +1301,14 @@ bool KStarsData::processCustomDataLine( int lnum, TQStringList d, TQStringList C if ( iType == 2 || iType > 8 ) { if ( showerrs ) errs.append( i18n( "Line %1, field %2: Invalid object type: %3" ) - .arg(lnum).arg(i).arg(d[i]) + + .tqarg(lnum).tqarg(i).tqarg(d[i]) + i18n( "Must be one of 0, 1, 3, 4, 5, 6, 7, 8." ) ); return false; } } else { if ( showerrs ) errs.append( i18n( "Line %1, field %2: Unable to parse Object type: %3" ) - .arg(lnum).arg(i).arg(d[i]) ); + .tqarg(lnum).tqarg(i).tqarg(d[i]) ); return false; } } @@ -1319,7 +1319,7 @@ bool KStarsData::processCustomDataLine( int lnum, TQStringList d, TQStringList C if ( ! ok ) { if ( showerrs ) errs.append( i18n( "Line %1, field %2: Unable to parse Magnitude: %3" ) - .arg(lnum).arg(i).arg(d[i]) ); + .tqarg(lnum).tqarg(i).tqarg(d[i]) ); return false; } } @@ -1330,7 +1330,7 @@ bool KStarsData::processCustomDataLine( int lnum, TQStringList d, TQStringList C if ( ! ok ) { if ( showerrs ) errs.append( i18n( "Line %1, field %2: Unable to parse Major Axis: %3" ) - .arg(lnum).arg(i).arg(d[i]) ); + .tqarg(lnum).tqarg(i).tqarg(d[i]) ); return false; } } @@ -1341,7 +1341,7 @@ bool KStarsData::processCustomDataLine( int lnum, TQStringList d, TQStringList C if ( ! ok ) { if ( showerrs ) errs.append( i18n( "Line %1, field %2: Unable to parse Minor Axis: %3" ) - .arg(lnum).arg(i).arg(d[i]) ); + .tqarg(lnum).tqarg(i).tqarg(d[i]) ); return false; } } @@ -1352,7 +1352,7 @@ bool KStarsData::processCustomDataLine( int lnum, TQStringList d, TQStringList C if ( ! ok ) { if ( showerrs ) errs.append( i18n( "Line %1, field %2: Unable to parse Position Angle: %3" ) - .arg(lnum).arg(i).arg(d[i]) ); + .tqarg(lnum).tqarg(i).tqarg(d[i]) ); return false; } } @@ -1388,57 +1388,57 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column TQString d( *it ); //current data line if ( d.left(1) != "#" ) break; //no longer in header! - int iname = d.find( "# Name: " ); - int iprefix = d.find( "# Prefix: " ); - int icolor = d.find( "# Color: " ); - int iepoch = d.find( "# Epoch: " ); + int iname = d.tqfind( "# Name: " ); + int iprefix = d.tqfind( "# Prefix: " ); + int icolor = d.tqfind( "# Color: " ); + int iepoch = d.tqfind( "# Epoch: " ); if ( iname == 0 ) { //line contains catalog name - iname = d.find(":")+2; + iname = d.tqfind(":")+2; if ( CatalogName.isEmpty() ) { CatalogName = d.mid( iname ); } else { //duplicate name in header if ( showerrs ) errs.append( i18n( "Parsing header: " ) + - i18n( "Extra Name field in header: %1. Will be ignored" ).arg( d.mid(iname) ) ); + i18n( "Extra Name field in header: %1. Will be ignored" ).tqarg( d.mid(iname) ) ); } } else if ( iprefix == 0 ) { //line contains catalog prefix - iprefix = d.find(":")+2; + iprefix = d.tqfind(":")+2; if ( CatalogPrefix.isEmpty() ) { CatalogPrefix = d.mid( iprefix ); } else { //duplicate prefix in header if ( showerrs ) errs.append( i18n( "Parsing header: " ) + - i18n( "Extra Prefix field in header: %1. Will be ignored" ).arg( d.mid(iprefix) ) ); + i18n( "Extra Prefix field in header: %1. Will be ignored" ).tqarg( d.mid(iprefix) ) ); } } else if ( icolor == 0 ) { //line contains catalog prefix - icolor = d.find(":")+2; + icolor = d.tqfind(":")+2; if ( CatalogColor.isEmpty() ) { CatalogColor = d.mid( icolor ); } else { //duplicate prefix in header if ( showerrs ) errs.append( i18n( "Parsing header: " ) + - i18n( "Extra Color field in header: %1. Will be ignored" ).arg( d.mid(icolor) ) ); + i18n( "Extra Color field in header: %1. Will be ignored" ).tqarg( d.mid(icolor) ) ); } } else if ( iepoch == 0 ) { //line contains catalog epoch - iepoch = d.find(":")+2; + iepoch = d.tqfind(":")+2; if ( CatalogEpoch == 0. ) { bool ok( false ); CatalogEpoch = d.mid( iepoch ).toFloat( &ok ); if ( !ok ) { if ( showerrs ) errs.append( i18n( "Parsing header: " ) + - i18n( "Could not convert Epoch to float: %1. Using 2000. instead" ).arg( d.mid(iepoch) ) ); + i18n( "Could not convert Epoch to float: %1. Using 2000. instead" ).tqarg( d.mid(iepoch) ) ); CatalogEpoch = 2000.; //adopt default value } } else { //duplicate epoch in header if ( showerrs ) errs.append( i18n( "Parsing header: " ) + - i18n( "Extra Epoch field in header: %1. Will be ignored" ).arg( d.mid(iepoch) ) ); + i18n( "Extra Epoch field in header: %1. Will be ignored" ).tqarg( d.mid(iepoch) ) ); } } else if ( ! foundDataColumns ) { //don't try to parse data column descriptors if we already found them //Chomp off leading "#" character - d = d.replace( TQRegExp( "#" ), "" ); + d = d.tqreplace( TQRegExp( "#" ), "" ); TQStringList fields = TQStringList::split( " ", d ); //split on whitespace @@ -1452,26 +1452,26 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column for ( ; itf != itfEnd; itf++ ) { TQString s( *itf ); - if ( master.contains( s ) ) { + if ( master.tqcontains( s ) ) { //add the data field Columns.append( s ); // remove the field from the master list and inc the // count of "good" columns (unless field is "Ignore") if ( s != "Ig" ) { - master.remove( master.find( s ) ); + master.remove( master.tqfind( s ) ); ncol++; } - } else if ( fields.contains( s ) ) { //duplicate field + } else if ( fields.tqcontains( s ) ) { //duplicate field fields.append( "Ig" ); //skip this column if ( showerrs ) errs.append( i18n( "Parsing header: " ) + - i18n( "Duplicate data field descriptor \"%1\" will be ignored" ).arg( s ) ); + i18n( "Duplicate data field descriptor \"%1\" will be ignored" ).tqarg( s ) ); } else { //Invalid field fields.append( "Ig" ); //skip this column if ( showerrs ) errs.append( i18n( "Parsing header: " ) + - i18n( "Invalid data field descriptor \"%1\" will be ignored" ).arg( s ) ); + i18n( "Invalid data field descriptor \"%1\" will be ignored" ).tqarg( s ) ); } } @@ -1514,7 +1514,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column } //the it iterator now points to the first line past the header - iStart = lines.findIndex( TQString( *it ) ); + iStart = lines.tqfindIndex( TQString( *it ) ); return true; } } @@ -1646,10 +1646,10 @@ bool KStarsData::readTimeZoneRulebook( void ) { if ( line.left(1) != "#" && line.length() ) { //ignore commented and blank lines TQStringList fields = TQStringList::split( " ", line ); id = fields[0]; - TQTime stime = TQTime( fields[3].left( fields[3].find(':')).toInt() , - fields[3].mid( fields[3].find(':')+1, fields[3].length()).toInt() ); - TQTime rtime = TQTime( fields[6].left( fields[6].find(':')).toInt(), - fields[6].mid( fields[6].find(':')+1, fields[6].length()).toInt() ); + TQTime stime = TQTime( fields[3].left( fields[3].tqfind(':')).toInt() , + fields[3].mid( fields[3].tqfind(':')+1, fields[3].length()).toInt() ); + TQTime rtime = TQTime( fields[6].left( fields[6].tqfind(':')).toInt(), + fields[6].mid( fields[6].tqfind(':')+1, fields[6].length()).toInt() ); Rulebook[ id ] = TimeZoneRule( fields[1], fields[2], stime, fields[4], fields[5], rtime ); } @@ -1774,20 +1774,20 @@ void KStarsData::initError(TQString s, bool required = false) { message = i18n( "The file %1 could not be found. " "KStars cannot run properly without this file. " "To continue loading, place the file in one of the " - "following locations, then press Retry:\n\n" ).arg( s ) - + TQString( "\t$(KDEDIR)/share/apps/kstars/%1\n" ).arg( s ) - + TQString( "\t~/.kde/share/apps/kstars/%1\n\n" ).arg( s ) + "following locations, then press Retry:\n\n" ).tqarg( s ) + + TQString( "\t$(KDEDIR)/share/apps/kstars/%1\n" ).tqarg( s ) + + TQString( "\t~/.kde/share/apps/kstars/%1\n\n" ).tqarg( s ) + i18n( "Otherwise, press Cancel to shutdown." ); - caption = i18n( "Critical File Not Found: %1" ).arg( s ); + caption = i18n( "Critical File Not Found: %1" ).tqarg( s ); } else { message = i18n( "The file %1 could not be found. " "KStars can still run without this file. " "However, to avoid seeing this message in the future, you can " - "place the file in one of the following locations, then press Retry:\n\n" ).arg( s ) - + TQString( "\t$(KDEDIR)/share/apps/kstars/%1\n" ).arg( s ) - + TQString( "\t~/.kde/share/apps/kstars/%1\n\n" ).arg( s ) - + i18n( "Otherwise, press Cancel to continue loading without this file." ).arg( s ); - caption = i18n( "Non-Critical File Not Found: %1" ).arg( s ); + "place the file in one of the following locations, then press Retry:\n\n" ).tqarg( s ) + + TQString( "\t$(KDEDIR)/share/apps/kstars/%1\n" ).tqarg( s ) + + TQString( "\t~/.kde/share/apps/kstars/%1\n\n" ).tqarg( s ) + + i18n( "Otherwise, press Cancel to continue loading without this file." ).tqarg( s ); + caption = i18n( "Non-Critical File Not Found: %1" ).tqarg( s ); } if ( KMessageBox::warningContinueCancel( 0, message, caption, i18n( "Retry" ) ) == KMessageBox::Continue ) { @@ -1839,7 +1839,7 @@ void KStarsData::slotInitialize() { case 2: //Load stellar database// - emit progressText(i18n("Loading Star Data (%1%)" ).arg(0) ); + emit progressText(i18n("Loading Star Data (%1%)" ).tqarg(0) ); if ( !readStarData( ) ) initError( "hipNNN.dat", true ); if (!readVARData()) @@ -1850,7 +1850,7 @@ void KStarsData::slotInitialize() { case 3: //Load NGC/IC database and custom catalogs// - emit progressText( i18n("Loading NGC/IC Data (%1%)" ).arg(0) ); + emit progressText( i18n("Loading NGC/IC Data (%1%)" ).tqarg(0) ); if ( !readDeepSkyData( ) ) initError( "ngcicN.dat", true ); @@ -2236,7 +2236,7 @@ void KStarsData::setFullTimeUpdate() { } void KStarsData::setLocationFromOptions() { - TQMap::Iterator it = Rulebook.find( Options::dST() ); + TQMap::Iterator it = Rulebook.tqfind( Options::dST() ); setLocation( GeoLocation ( Options::longitude(), Options::latitude(), Options::cityName(), Options::provinceName(), Options::countryName(), Options::timeZone(), &(it.data()), 4, Options::elevation() ) ); @@ -2345,7 +2345,7 @@ bool KStarsData::executeScript( const TQString &scriptname, SkyMap *map ) { TQFile f( scriptname ); if ( !f.open( IO_ReadOnly) ) { - kdDebug() << i18n( "Could not open file %1" ).arg( f.name() ) << endl; + kdDebug() << i18n( "Could not open file %1" ).tqarg( f.name() ) << endl; return false; } @@ -2445,7 +2445,7 @@ bool KStarsData::executeScript( const TQString &scriptname, SkyMap *map ) { cmdCount++; } else { kdWarning() << i18n( "Could not set time: %1 / %2 / %3 ; %4:%5:%6" ) - .arg(day).arg(mth).arg(yr).arg(hr).arg(min).arg(sec) << endl; + .tqarg(day).tqarg(mth).tqarg(yr).tqarg(hr).tqarg(min).tqarg(sec) << endl; } } else if ( fn[0] == "changeViewOption" && fn.count() == 3 ) { bool bOk(false), nOk(false), dOk(false); @@ -2559,7 +2559,7 @@ bool KStarsData::executeScript( const TQString &scriptname, SkyMap *map ) { } if ( !cityFound ) - kdWarning() << i18n( "Could not set location named %1, %2, %3" ).arg(city).arg(province).arg(country) << endl; + kdWarning() << i18n( "Could not set location named %1, %2, %3" ).tqarg(city).tqarg(province).tqarg(country) << endl; } } } //end while diff --git a/kstars/kstars/kstarsdata.h b/kstars/kstars/kstarsdata.h index 0a358a42..0ba7b40b 100644 --- a/kstars/kstars/kstarsdata.h +++ b/kstars/kstars/kstarsdata.h @@ -86,9 +86,10 @@ class CustomCatalog; *@version 1.0 */ -class KStarsData : public QObject +class KStarsData : public TQObject { Q_OBJECT + TQ_OBJECT public: //Friend classes can see the private data. friend class FindDialog; @@ -134,7 +135,7 @@ public: */ bool readTimeZoneRulebook( void ); - /**Parse one line from a locations database file. The line contains 10 or 11 fields + /**Parse one line from a locations database file. The line tqcontains 10 or 11 fields *separated by colons (":"). The fields are: *@li City Name [string] *@li Province Name (optional) [string] @@ -326,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 parent label + *@li KSLABEL designates a top-level tqparent 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. @@ -351,7 +352,7 @@ public: /**Read in URLs to be attached to a named object's right-click popup menu. At this *point, there is no way to attach URLs to unnamed objects. There are two *kinds of URLs, each with its own data file: image links and webpage links. In addition, - *there may be user-specific versions with custom URLs. Each line contains 3 fields + *there may be user-specific versions with custom URLs. Each line tqcontains 3 fields *separated by colons (":"). Note that the last field is the URL, and as such it will *generally contain a colon itself. Only the first two colons encountered are treated *as field separators. The fields are: @@ -449,7 +450,7 @@ public: KSPlanet *earth() { return PCat->earth(); } /**@short Find object by name. - *@param name Object name to find + *@param name Object name to tqfind *@return pointer to SkyObject matching this name */ SkyObject* objectNamed( const TQString &name ); @@ -576,7 +577,7 @@ public slots: void initialize(); /**@short send a message to the console*/ - void slotConsoleMessage( TQString s ) { std::cout << s.utf8() << std::endl; } + void slotConsoleMessage( TQString s ) { std::cout << s.utf8().data() << std::endl; } /**Update the Simulation Clock. Update positions of Planets. Update *Alt/Az coordinates of objects. Update precession. Update Focus position. diff --git a/kstars/kstars/kstarsdatetime.cpp b/kstars/kstars/kstarsdatetime.cpp index 6b406f44..b99a6173 100644 --- a/kstars/kstars/kstarsdatetime.cpp +++ b/kstars/kstars/kstarsdatetime.cpp @@ -55,10 +55,10 @@ KStarsDateTime::KStarsDateTime( long double _jd ) : ExtDateTime() { setDJD( _jd ); } -KStarsDateTime KStarsDateTime::currentDateTime() { - KStarsDateTime dt( ExtDate::currentDate(), TQTime::currentTime() ); +KStarsDateTime KStarsDateTime::tqcurrentDateTime() { + KStarsDateTime dt( ExtDate::tqcurrentDate(), TQTime::currentTime() ); if ( dt.time().hour()==0 && dt.time().minute()==0 ) // midnight or right after? - dt.setDate( ExtDate::currentDate() ); // fetch date again + dt.setDate( ExtDate::tqcurrentDate() ); // fetch date again return dt; } @@ -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 apparent sidereal time, we have to correct the + // To obtain the aptqparent 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/kstarsdatetime.h b/kstars/kstars/kstarsdatetime.h index a45e2495..f31d0955 100644 --- a/kstars/kstars/kstarsdatetime.h +++ b/kstars/kstars/kstarsdatetime.h @@ -134,7 +134,7 @@ public: *@return the date and time according to the CPU clock (note that this is not *necessarily UT) */ - static KStarsDateTime currentDateTime(); + static KStarsDateTime tqcurrentDateTime(); /** *@return the julian day as a long double, including the time as the fractional portion. diff --git a/kstars/kstars/kstarsdcop.cpp b/kstars/kstars/kstarsdcop.cpp index b4a22ba9..9ff1e72c 100644 --- a/kstars/kstars/kstarsdcop.cpp +++ b/kstars/kstars/kstarsdcop.cpp @@ -157,7 +157,7 @@ void KStars::setGeoLocation( TQString city, TQString province, TQString country //make sure planets, etc. are updated immediately data()->setFullTimeUpdate(); - // If the sky is in Horizontal mode and not tracking, reset focus such that + // If the sky is inQt::Horizontal mode and not tracking, reset focus such that // Alt/Az remain constant. if ( ! Options::isTracking() && Options::useAltAz() ) { map()->focus()->HorizontalToEquatorial( LST(), geo()->lat() ); @@ -191,7 +191,7 @@ void KStars::readConfig() { //Reset date, if one was stored if ( data()->StoredDate.isValid() ) { data()->changeDateTime( geo()->LTtoUT( data()->StoredDate ) ); - data()->StoredDate.setDJD( (long double)INVALID_DAY ); //invalidate StoredDate + data()->StoredDate.setDJD( (long double)INVALID_DAY ); //tqinvalidate StoredDate } map()->forceUpdate(); @@ -212,7 +212,7 @@ TQString KStars::getOption( const TQString &name ) { KConfigSkeletonItem *it = Options::self()->findItem( name ); if ( it ) return it->property().toString(); - else return TQString::null; + else return TQString(); } void KStars::changeViewOption( const TQString op, const TQString val ) { @@ -359,13 +359,13 @@ void KStars::loadColorScheme( const TQString _name ) { if ( ! ok ) { if ( !filename.isEmpty() ) { for( unsigned int i=0; icolorScheme()->load( filename ); } - if ( ! ok ) kdDebug() << i18n( "Unable to load color scheme named %1. Also tried %2." ).arg( name ).arg( filename ); + if ( ! ok ) kdDebug() << i18n( "Unable to load color scheme named %1. Also tried %2." ).tqarg( name ).tqarg( filename ); } if ( ok ) { @@ -376,12 +376,12 @@ void KStars::loadColorScheme( const TQString _name ) { if ( Options::darkAppColors() == false && filename == "night.colors" ) { Options::setDarkAppColors( true ); OriginalPalette = TQApplication::palette(); - TQApplication::setPalette( DarkPalette, true ); + TQApplication::tqsetPalette( DarkPalette, true ); } if ( Options::darkAppColors() && filename != "night.colors" ) { Options::setDarkAppColors( false ); - TQApplication::setPalette( OriginalPalette, true ); + TQApplication::tqsetPalette( OriginalPalette, true ); } map()->forceUpdate(); @@ -392,7 +392,7 @@ void KStars::exportImage( const TQString url, int w, int h ) { //If the filename string contains no "/" separators, assume the //user wanted to place a file in their home directory. KURL fileURL; - if ( ! url.contains( "/" ) ) fileURL = TQDir::homeDirPath() + "/" + url; + if ( ! url.tqcontains( "/" ) ) fileURL = TQDir::homeDirPath() + "/" + url; else fileURL = url; KTempFile tmpfile; @@ -411,17 +411,17 @@ void KStars::exportImage( const TQString url, int w, int h ) { } //Determine desired image format from filename extension - TQString ext = fname.mid( fname.findRev(".")+1 ); + TQString ext = fname.mid( fname.tqfindRev(".")+1 ); const char* format = "PNG"; if ( ext.lower() == "png" ) { format = "PNG"; } else if ( ext.lower() == "jpg" || ext.lower() == "jpeg" ) { format = "JPG"; } else if ( ext.lower() == "gif" ) { format = "GIF"; } else if ( ext.lower() == "pnm" ) { format = "PNM"; } else if ( ext.lower() == "bmp" ) { format = "BMP"; } - else { kdWarning() << i18n( "Could not parse image format of %1; assuming PNG." ).arg( fname ) << endl; } + else { kdWarning() << i18n( "Could not parse image format of %1; assuming PNG." ).tqarg( fname ) << endl; } - map()->exportSkyImage( &skyimage ); - kapp->processEvents(10000); + map()->exportSkyImage( TQT_TQPAINTDEVICE(&skyimage) ); + kapp->tqprocessEvents(10000); //skyImage is the size of the sky map. The requested image size is w x h. //If w x h is smaller than the skymap, then we simply crop the image. @@ -447,12 +447,12 @@ void KStars::exportImage( const TQString url, int w, int h ) { bitBlt( &outimage, dx, dy, &skyimage, sx, sy, sw, sh ); } - if ( ! outimage.save( fname, format ) ) kdDebug() << i18n( "Error: Unable to save image: %1 " ).arg( fname ) << endl; - else kdDebug() << i18n( "Image saved to file: %1" ).arg( fname ) << endl; + if ( ! outimage.save( fname, format ) ) kdDebug() << i18n( "Error: Unable to save image: %1 " ).tqarg( fname ) << endl; + else kdDebug() << i18n( "Image saved to file: %1" ).tqarg( fname ) << endl; if ( tmpfile.name() == fname ) { //attempt to upload image to remote location if ( ! KIO::NetAccess::upload( tmpfile.name(), fileURL, this ) ) { - TQString message = i18n( "Could not upload image to remote location: %1" ).arg( fileURL.prettyURL() ); + TQString message = i18n( "Could not upload image to remote location: %1" ).tqarg( fileURL.prettyURL() ); KMessageBox::sorry( 0, message, i18n( "Could not upload file" ) ); } } @@ -512,7 +512,7 @@ void KStars::startINDI (TQString deviceName, bool useLocal) } TQListViewItem *driverItem = NULL; - driverItem = indidriver->localListView->findItem(deviceName, 0); + driverItem = indidriver->localListView->tqfindItem(deviceName, 0); if (driverItem == NULL) { kdDebug() << "Device " << deviceName << " not found!" << endl; @@ -523,7 +523,7 @@ void KStars::startINDI (TQString deviceName, bool useLocal) if (indidriver->isDeviceRunning(deviceName)) { indidriver->localListView->setSelected(driverItem, true); - indidriver->processDeviceStatus(1); + indidriver->processDevicetqStatus(1); } // Set custome label for device @@ -538,7 +538,7 @@ void KStars::startINDI (TQString deviceName, bool useLocal) indidriver->serverR->setChecked(true); // Run it - indidriver->processDeviceStatus(0); + indidriver->processDevicetqStatus(0); } @@ -551,14 +551,14 @@ void KStars::shutdownINDI (TQString deviceName) } TQListViewItem *driverItem = NULL; - driverItem = indidriver->localListView->findItem(deviceName, 0); + driverItem = indidriver->localListView->tqfindItem(deviceName, 0); if (driverItem == NULL) { kdDebug() << "Device " << deviceName << " not found!" << endl; return; } - indidriver->processDeviceStatus(1); + indidriver->processDevicetqStatus(1); } @@ -654,20 +654,20 @@ void KStars::setINDITargetCoord(TQString deviceName, double RA, double DEC) return; } - prop = dev->findProp("EQUATORIAL_EOD_COORD"); + prop = dev->findProp("ETQUATORIAL_EOD_COORD"); if (!prop) return; el = prop->findElement("RA"); if (!el) return; if (!el->write_w) return; - el->write_w->setText(TQString("%1").arg(RA)); + el->write_w->setText(TQString("%1").tqarg(RA)); el = prop->findElement("DEC"); if (!el) return; if (!el->write_w) return; - el->write_w->setText(TQString("%1").arg(DEC)); + el->write_w->setText(TQString("%1").tqarg(DEC)); prop->newText(); @@ -698,20 +698,20 @@ void KStars::setINDITargetName(TQString deviceName, TQString objectName) return; } - prop = dev->findProp("EQUATORIAL_EOD_COORD"); + prop = dev->findProp("ETQUATORIAL_EOD_COORD"); if (!prop) return; el = prop->findElement("RA"); if (!el) return; if (!el->write_w) return; - el->write_w->setText(TQString("%1").arg(target->ra()->Hours())); + el->write_w->setText(TQString("%1").tqarg(target->ra()->Hours())); el = prop->findElement("DEC"); if (!el) return; if (!el->write_w) return; - el->write_w->setText(TQString("%1").arg(target->dec()->Degrees())); + el->write_w->setText(TQString("%1").tqarg(target->dec()->Degrees())); prop->newText(); @@ -813,7 +813,7 @@ void KStars::setINDIFocusSpeed(TQString deviceName, unsigned int speed) if (!el) return; if (!el->write_w) return; - el->write_w->setText(TQString("%1").arg(speed)); + el->write_w->setText(TQString("%1").tqarg(speed)); prop->newText(); @@ -865,13 +865,13 @@ void KStars::setINDIGeoLocation(TQString deviceName, double longitude, double la if (!el) return; if (!el->write_w) return; - el->write_w->setText(TQString("%1").arg(longitude)); + el->write_w->setText(TQString("%1").tqarg(longitude)); el = prop->findElement("LAT"); if (!el) return; if (!el->write_w) return; - el->write_w->setText(TQString("%1").arg(latitude)); + el->write_w->setText(TQString("%1").tqarg(latitude)); prop->newText(); @@ -907,7 +907,7 @@ void KStars::setINDIFocusTimeout(TQString deviceName, int timeout) if (!el) return; if (el->write_w) - el->write_w->setText(TQString("%1").arg(timeout)); + el->write_w->setText(TQString("%1").tqarg(timeout)); else if (el->spin_w) el->spin_w->setValue(timeout); @@ -944,7 +944,7 @@ void KStars::startINDIExposure(TQString deviceName, int timeout) if (!el) return; if (el->write_w) - el->write_w->setText(TQString("%1").arg(timeout)); + el->write_w->setText(TQString("%1").tqarg(timeout)); else if (el->spin_w) el->spin_w->setValue(timeout); @@ -981,7 +981,7 @@ void KStars::setINDIFilterNum(TQString deviceName, int filter_num) if (!el) return; if (el->write_w) - el->write_w->setText(TQString("%1").arg(filter_num)); + el->write_w->setText(TQString("%1").tqarg(filter_num)); else if (el->spin_w) el->spin_w->setValue(filter_num); @@ -1061,7 +1061,7 @@ void KStars::setINDICCDTemp(TQString deviceName, int temp) if (!el) return; if (el->write_w) - el->write_w->setText(TQString("%1").arg(temp)); + el->write_w->setText(TQString("%1").tqarg(temp)); else if (el->spin_w) el->spin_w->setValue(temp); diff --git a/kstars/kstars/kstarsinit.cpp b/kstars/kstars/kstarsinit.cpp index 276e5c8a..544d9d9d 100644 --- a/kstars/kstars/kstarsinit.cpp +++ b/kstars/kstars/kstarsinit.cpp @@ -49,27 +49,27 @@ void KStars::initActions() { //File Menu: new KAction(i18n("&New Window"), "window_new", KShortcut( "Ctrl+N" ), - this, TQT_SLOT( newWindow() ), actionCollection(), "new_window"); + TQT_TQOBJECT(this), TQT_SLOT( newWindow() ), actionCollection(), "new_window"); new KAction(i18n("&Close Window"), "fileclose", KShortcut( "Ctrl+W" ), - this, TQT_SLOT( closeWindow() ), actionCollection(), "close_window"); + TQT_TQOBJECT(this), TQT_SLOT( closeWindow() ), actionCollection(), "close_window"); new KAction( i18n( "&Download Data..." ), "knewstuff", KShortcut( "Ctrl+D" ), - this, TQT_SLOT( slotDownload() ), actionCollection(), "get_data" ); - new KAction( i18n( "Open FITS..."), "fileopen", KShortcut( "Ctrl+O"), this, TQT_SLOT( slotOpenFITS()), actionCollection(), "open_file"); + TQT_TQOBJECT(this), TQT_SLOT( slotDownload() ), actionCollection(), "get_data" ); + new KAction( i18n( "Open FITS..."), "fileopen", KShortcut( "Ctrl+O"), TQT_TQOBJECT(this), TQT_SLOT( slotOpenFITS()), actionCollection(), "open_file"); new KAction( i18n( "&Save Sky Image..." ), "fileexport", KShortcut( "Ctrl+I" ), - this, TQT_SLOT( slotExportImage() ), actionCollection(), "export_image" ); + TQT_TQOBJECT(this), TQT_SLOT( slotExportImage() ), actionCollection(), "export_image" ); new KAction( i18n( "&Run Script..." ), "launch", KShortcut( "Ctrl+R" ), - this, TQT_SLOT( slotRunScript() ), actionCollection(), "run_script" ); - KStdAction::print(this, TQT_SLOT( slotPrint() ), actionCollection(), "print" ); - KStdAction::quit(this, TQT_SLOT( close() ), actionCollection(), "quit" ); + TQT_TQOBJECT(this), TQT_SLOT( slotRunScript() ), actionCollection(), "run_script" ); + KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), actionCollection(), "print" ); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit" ); //Time Menu: new KAction( i18n( "Set Time to &Now" ), KShortcut( "Ctrl+E" ), - this, TQT_SLOT( slotSetTimeToNow() ), actionCollection(), "time_to_now" ); + TQT_TQOBJECT(this), TQT_SLOT( slotSetTimeToNow() ), actionCollection(), "time_to_now" ); new KAction( i18n( "set Clock to New Time", "&Set Time..." ), "clock", KShortcut( "Ctrl+S" ), - this, TQT_SLOT( slotSetTime() ), actionCollection(), "time_dialog" ); + TQT_TQOBJECT(this), TQT_SLOT( slotSetTime() ), actionCollection(), "time_dialog" ); ToggleAction *actTimeRun = new ToggleAction( i18n( "Stop &Clock" ), BarIcon("player_pause"), i18n("Start &Clock"), BarIcon("1rightarrow"), - 0, this, TQT_SLOT( slotToggleTimer() ), actionCollection(), "timer_control" ); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleTimer() ), actionCollection(), "timer_control" ); actTimeRun->setOffToolTip( i18n( "Start Clock" ) ); actTimeRun->setOnToolTip( i18n( "Stop Clock" ) ); TQObject::connect(data()->clock(), TQT_SIGNAL(clockStarted()), actTimeRun, TQT_SLOT(turnOn()) ); @@ -79,36 +79,36 @@ void KStars::initActions() { //Focus Menu: new KAction(i18n( "&Zenith" ), KShortcut( "Z" ), - this, TQT_SLOT( slotPointFocus() ), actionCollection(), "zenith"); + TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "zenith"); new KAction(i18n( "&North" ), KShortcut( "N" ), - this, TQT_SLOT( slotPointFocus() ), actionCollection(), "north"); + TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "north"); new KAction(i18n( "&East" ), KShortcut( "E" ), - this, TQT_SLOT( slotPointFocus() ), actionCollection(), "east"); + TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "east"); new KAction(i18n( "&South" ), KShortcut( "S" ), - this, TQT_SLOT( slotPointFocus() ), actionCollection(), "south"); + TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "south"); new KAction(i18n( "&West" ), KShortcut( "W" ), - this, TQT_SLOT( slotPointFocus() ), actionCollection(), "west"); - KAction *tmpAction = KStdAction::find( this, TQT_SLOT( slotFind() ), + TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "west"); + KAction *tmpAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotFind() ), actionCollection(), "find_object" ); tmpAction->setText( i18n( "&Find Object..." ) ); tmpAction->setToolTip( i18n( "Find object" ) ); new KAction( i18n( "Engage &Tracking" ), "decrypted", KShortcut( "Ctrl+T" ), - this, TQT_SLOT( slotTrack() ), actionCollection(), "track_object" ); + TQT_TQOBJECT(this), TQT_SLOT( slotTrack() ), actionCollection(), "track_object" ); new KAction( i18n( "Set Focus &Manually..." ), KShortcut( "Ctrl+M" ), - this, TQT_SLOT( slotManualFocus() ), actionCollection(), "manual_focus" ); + TQT_TQOBJECT(this), TQT_SLOT( slotManualFocus() ), actionCollection(), "manual_focus" ); //View Menu: - KStdAction::zoomIn(this, TQT_SLOT( slotZoomIn() ), actionCollection(), "zoom_in" ); - KStdAction::zoomOut(this, TQT_SLOT( slotZoomOut() ), actionCollection(), "zoom_out" ); + KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT( slotZoomIn() ), actionCollection(), "zoom_in" ); + KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT( slotZoomOut() ), actionCollection(), "zoom_out" ); new KAction( i18n( "&Default Zoom" ), "viewmagfit.png", KShortcut( "Ctrl+Z" ), - this, TQT_SLOT( slotDefaultZoom() ), actionCollection(), "zoom_default" ); + TQT_TQOBJECT(this), TQT_SLOT( slotDefaultZoom() ), actionCollection(), "zoom_default" ); new KAction( i18n( "&Zoom to Angular Size..." ), "viewmag.png", KShortcut( "Ctrl+Shift+Z" ), - this, TQT_SLOT( slotSetZoom() ), actionCollection(), "zoom_set" ); + TQT_TQOBJECT(this), TQT_SLOT( slotSetZoom() ), actionCollection(), "zoom_set" ); actCoordSys = new ToggleAction( i18n("Horizontal &Coordinates"), i18n( "Equatorial &Coordinates" ), - Key_Space, this, TQT_SLOT( slotCoordSys() ), actionCollection(), "coordsys" ); - KStdAction::fullScreen( this, TQT_SLOT( slotFullScreen() ), actionCollection(), 0 ); + Key_Space, TQT_TQOBJECT(this), TQT_SLOT( slotCoordSys() ), actionCollection(), "coordsys" ); + KStdAction::fullScreen( TQT_TQOBJECT(this), TQT_SLOT( slotFullScreen() ), actionCollection(), 0 ); //Settings Menu: @@ -178,9 +178,9 @@ void KStars::initActions() { while ( !stream.eof() ) { line = stream.readLine(); - schemeName = line.left( line.find( ':' ) ); + schemeName = line.left( line.tqfind( ':' ) ); //I call it filename here, but it's used as the name of the action! - filename = "cs_" + line.mid( line.find( ':' ) +1, line.find( '.' ) - line.find( ':' ) - 1 ); + filename = "cs_" + line.mid( line.tqfind( ':' ) +1, line.tqfind( '.' ) - line.tqfind( ':' ) - 1 ); addColorMenuItem( i18n( schemeName.local8Bit() ), filename.local8Bit() ); } file.close(); @@ -191,62 +191,62 @@ void KStars::initActions() { initFOV(); new KAction( i18n( "Location on Earth", "&Geographic..." ), - "kstars_geo", KShortcut( "Ctrl+G" ), this, + "kstars_geo", KShortcut( "Ctrl+G" ), TQT_TQOBJECT(this), TQT_SLOT( slotGeoLocator() ), actionCollection(), "geolocation" ); - KStdAction::preferences( this, TQT_SLOT( slotViewOps() ), actionCollection(), "configure" ); + KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotViewOps() ), actionCollection(), "configure" ); new KAction(i18n( "Startup Wizard..." ), "wizard", KShortcut(), - this, TQT_SLOT( slotWizard() ), actionCollection(), "startwizard" ); + TQT_TQOBJECT(this), TQT_SLOT( slotWizard() ), actionCollection(), "startwizard" ); //Tools Menu: new KAction(i18n( "Calculator..."), KShortcut( "Ctrl+C"), - this, TQT_SLOT( slotCalculator() ), actionCollection(), "astrocalculator"); + TQT_TQOBJECT(this), TQT_SLOT( slotCalculator() ), actionCollection(), "astrocalculator"); new KAction(i18n( "Observing List..."), KShortcut( "Ctrl+L"), - this, TQT_SLOT( slotObsList() ), actionCollection(), "obslist"); + TQT_TQOBJECT(this), TQT_SLOT( slotObsList() ), actionCollection(), "obslist"); // enable action only if file was loaded and processed successfully. if (!data()->VariableStarsList.isEmpty()) new KAction(i18n( "AAVSO Light Curves..."), KShortcut( "Ctrl+V"), - this, TQT_SLOT( slotLCGenerator() ), actionCollection(), "lightcurvegenerator"); + TQT_TQOBJECT(this), TQT_SLOT( slotLCGenerator() ), actionCollection(), "lightcurvegenerator"); new KAction(i18n( "Altitude vs. Time..."), KShortcut( "Ctrl+A"), - this, TQT_SLOT( slotAVT() ), actionCollection(), "altitude_vs_time"); + TQT_TQOBJECT(this), TQT_SLOT( slotAVT() ), actionCollection(), "altitude_vs_time"); new KAction(i18n( "What's up Tonight..."), KShortcut("Ctrl+U"), - this, TQT_SLOT(slotWUT()), actionCollection(), "whats_up_tonight"); + TQT_TQOBJECT(this), TQT_SLOT(slotWUT()), actionCollection(), "whats_up_tonight"); //FIXME GLOSSARY // new KAction(i18n( "Glossary..."), KShortcut("Ctrl+K"), // this, TQT_SLOT(slotGlossary()), actionCollection(), "glossary"); new KAction(i18n( "Script Builder..."), KShortcut("Ctrl+B"), - this, TQT_SLOT(slotScriptBuilder()), actionCollection(), "scriptbuilder"); + TQT_TQOBJECT(this), TQT_SLOT(slotScriptBuilder()), actionCollection(), "scriptbuilder"); new KAction(i18n( "Solar System..."), KShortcut("Ctrl+Y"), - this, TQT_SLOT(slotSolarSystem()), actionCollection(), "solarsystem"); + TQT_TQOBJECT(this), TQT_SLOT(slotSolarSystem()), actionCollection(), "solarsystem"); new KAction(i18n( "Jupiter's Moons..."), KShortcut("Ctrl+J"), - this, TQT_SLOT(slotJMoonTool()), actionCollection(), "jmoontool"); + TQT_TQOBJECT(this), TQT_SLOT(slotJMoonTool()), actionCollection(), "jmoontool"); // devices Menu - new KAction(i18n("Telescope Wizard..."), 0, this, TQT_SLOT(slotTelescopeWizard()), actionCollection(), "telescope_wizard"); - new KAction(i18n("Telescope Properties..."), 0, this, TQT_SLOT(slotTelescopeProperties()), actionCollection(), "telescope_properties"); - new KAction(i18n("Device Manager..."), 0, this, TQT_SLOT(slotINDIDriver()), actionCollection(), "device_manager"); + new KAction(i18n("Telescope Wizard..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTelescopeWizard()), actionCollection(), "telescope_wizard"); + new KAction(i18n("Telescope Properties..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTelescopeProperties()), actionCollection(), "telescope_properties"); + new KAction(i18n("Device Manager..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIDriver()), actionCollection(), "device_manager"); - tmpAction = new KAction(i18n("Capture Image Sequence..."), 0, this, TQT_SLOT(slotImageSequence()), actionCollection(), "capture_sequence"); + tmpAction = new KAction(i18n("Capture Image Sequence..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImageSequence()), actionCollection(), "capture_sequence"); tmpAction->setEnabled(false); - tmpAction = new KAction(i18n("INDI Control Panel..."), 0, this, TQT_SLOT(slotINDIPanel()), actionCollection(), "indi_control_panel"); + tmpAction = new KAction(i18n("INDI Control Panel..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIPanel()), actionCollection(), "indi_control_panel"); tmpAction->setEnabled(false); - new KAction(i18n("Configure INDI..."), 0, this, TQT_SLOT(slotINDIConf()), actionCollection(), "configure_indi"); + new KAction(i18n("Configure INDI..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIConf()), actionCollection(), "configure_indi"); //Help Menu: new KAction( i18n( "Tip of the Day" ), "idea", 0, - this, TQT_SLOT( slotTipOfDay() ), actionCollection(), "help_tipofday" ); + TQT_TQOBJECT(this), TQT_SLOT( slotTipOfDay() ), actionCollection(), "help_tipofday" ); //Handbook toolBar item: new KAction( i18n( "&Handbook" ), "contents", KShortcut( "F1" ), - this, TQT_SLOT( appHelpActivated() ), actionCollection(), "handbook" ); + TQT_TQOBJECT(this), TQT_SLOT( appHelpActivated() ), actionCollection(), "handbook" ); // //viewToolBar actions: @@ -254,39 +254,39 @@ void KStars::initActions() { //show_stars: a = new KToggleAction( i18n( "Toggle Stars" ), "kstars_stars", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_stars" ); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_stars" ); //show_deepsky: a = new KToggleAction( i18n( "Toggle Deep Sky Objects" ), "kstars_deepsky", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_deepsky" ); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_deepsky" ); //show_planets: a = new KToggleAction( i18n( "Toggle Solar System" ), "kstars_planets", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_planets" ); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_planets" ); //show_clines: a = new KToggleAction( i18n( "Toggle Constellation Lines" ), "kstars_clines", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_clines" ); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_clines" ); //show_cnames: a = new KToggleAction( i18n( "Toggle Constellation Names" ), "kstars_cnames", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cnames" ); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cnames" ); //show_cbound: a = new KToggleAction( i18n( "Toggle Constellation Boundaries" ), "kstars_cbound", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cbounds" ); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cbounds" ); //show_mw: a = new KToggleAction( i18n( "Toggle Milky Way" ), "kstars_mw", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_mw" ); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_mw" ); //show_grid: a = new KToggleAction( i18n( "Toggle Coordinate Grid" ), "kstars_grid", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_grid" ); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_grid" ); //show_horizon: a = new KToggleAction( i18n( "Toggle Ground" ), "kstars_horizon", - 0, this, TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_horizon" ); + 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_horizon" ); if (Options::fitsSaveDirectory().isEmpty()) Options::setFitsSaveDirectory(TQDir:: homeDirPath()); @@ -327,7 +327,7 @@ void KStars::initFOV() { if ( fields.count() == 4 ) { nm = fields[0].stripWhiteSpace(); - KToggleAction *kta = new KToggleAction( nm, 0, this, TQT_SLOT( slotTargetSymbol() ), + KToggleAction *kta = new KToggleAction( nm, 0, TQT_TQOBJECT(this), TQT_SLOT( slotTargetSymbol() ), actionCollection(), nm.utf8() ); kta->setExclusiveGroup( "fovsymbol" ); if ( nm == Options::fOVName() ) kta->setChecked( true ); @@ -335,11 +335,11 @@ void KStars::initFOV() { } } } else { - kdDebug() << i18n( "Could not open file: %1" ).arg( f.name() ) << endl; + kdDebug() << i18n( "Could not open file: %1" ).tqarg( f.name() ) << endl; } fovActionMenu->popupMenu()->insertSeparator(); - fovActionMenu->insert( new KAction( i18n( "Edit FOV Symbols..." ), 0, this, TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); + fovActionMenu->insert( new KAction( i18n( "Edit FOV Symbols..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); } void KStars::initStatusBar() { @@ -467,7 +467,7 @@ void KStars::privatedata::buildGUI() { ks->initStatusBar(); ks->initActions(); - // create the layout of the central widget + // create the tqlayout of the central widget ks->topLayout = new TQVBoxLayout( ks->centralWidget ); ks->topLayout->addWidget( ks->skymap ); diff --git a/kstars/kstars/kstarssplash.cpp b/kstars/kstars/kstarssplash.cpp index 7e57364b..b0edbed0 100644 --- a/kstars/kstars/kstarssplash.cpp +++ b/kstars/kstars/kstarssplash.cpp @@ -25,9 +25,9 @@ #include "kstarssplash.h" #include "ksutils.h" -KStarsSplash::KStarsSplash( TQWidget *parent, const char* name ) +KStarsSplash::KStarsSplash( TQWidget *tqparent, const char* name ) : KDialogBase( KDialogBase::Plain, i18n( "Loading KStars..." ), - 0 /*no buttons*/, Ok, parent, name, false /*not modal*/ ) { + 0 /*no buttons*/, Ok, tqparent, name, false /*not modal*/ ) { //Set up widgets for splashscreen. TQFrame *page = plainPage(); @@ -59,19 +59,19 @@ KStarsSplash::KStarsSplash( TQWidget *parent, const char* name ) pal.setColor( TQPalette::Normal, TQColorGroup::Foreground, TQColor( "White" ) ); pal.setColor( TQPalette::Inactive, TQColorGroup::Foreground, TQColor( "White" ) ); label->setPalette( pal ); - label->setAlignment( AlignHCenter ); + label->tqsetAlignment( AlignHCenter ); label->setText( i18n( "Welcome to KStars. Please stand by while loading..." ) ); topLayout->addWidget( label ); //initialize the progress message label - textCurrentStatus = new TQLabel( page, "label2" ); - textCurrentStatus->setPalette( pal ); - textCurrentStatus->setAlignment( AlignHCenter ); - topLayout->addWidget( textCurrentStatus ); + textCurrenttqStatus = new TQLabel( page, "label2" ); + textCurrenttqStatus->setPalette( pal ); + textCurrenttqStatus->tqsetAlignment( AlignHCenter ); + topLayout->addWidget( textCurrenttqStatus ); topLayout->activate(); disableResize(); - setMessage(TQString::null); // force repaint of widget with no text + setMessage(TQString()); // force tqrepaint of widget with no text } KStarsSplash::~KStarsSplash() { @@ -80,8 +80,8 @@ KStarsSplash::~KStarsSplash() { void KStarsSplash::paintEvent( TQPaintEvent* ) { bitBlt( Banner, 0, 0, splashImage, 0, 0, -1, -1 ); - label->repaint(); // standard text label - textCurrentStatus->repaint(); // status text label + label->tqrepaint(); // standard text label + textCurrenttqStatus->tqrepaint(); // status text label } void KStarsSplash::closeEvent( TQCloseEvent *e ) { @@ -90,11 +90,11 @@ void KStarsSplash::closeEvent( TQCloseEvent *e ) { } void KStarsSplash::setMessage( TQString s ) { - textCurrentStatus->setText( s ); - repaint(); // repaint splash screen + textCurrenttqStatus->setText( s ); + tqrepaint(); // tqrepaint splash screen /** *Flush all event data. This is needed because events will buffered and - *repaint call will queued in event buffer. With flush all X11 events of + *tqrepaint call will queued in event buffer. With flush all X11 events of *this application will flushed. */ kapp->flush(); diff --git a/kstars/kstars/kstarssplash.h b/kstars/kstars/kstarssplash.h index afe523a2..0becc4a8 100644 --- a/kstars/kstars/kstarssplash.h +++ b/kstars/kstars/kstarssplash.h @@ -33,11 +33,12 @@ class TQLabel; class KStarsSplash : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /**Constructor. Create widgets. Load KStars logo. Start load timer. */ - KStarsSplash( TQWidget *parent, const char* name ); + KStarsSplash( TQWidget *tqparent, const char* name ); /**Destructor */ @@ -50,7 +51,7 @@ class KStarsSplash : public KDialogBase protected: /**Paint event to redraw the widgets. This only gets called when the timer fires. - *It should also repaint if another window was on top of the splash screen, but + *It should also tqrepaint if another window was on top of the splash screen, but *this may be difficult to implement (it may be that the program is too busy loading data *to notice that a redraw is required). */ @@ -65,7 +66,7 @@ class KStarsSplash : public KDialogBase void closeWindow(); private: - TQLabel *textCurrentStatus, *label; + TQLabel *textCurrenttqStatus, *label; TQWidget *Banner; TQPixmap *splashImage; }; diff --git a/kstars/kstars/kswizard.cpp b/kstars/kstars/kswizard.cpp index 85258362..88037007 100644 --- a/kstars/kstars/kswizard.cpp +++ b/kstars/kstars/kswizard.cpp @@ -31,10 +31,10 @@ #include "kswizardui.h" #include "kswizard.h" -KSWizard::KSWizard( TQWidget *parent, const char *name ) - : KSWizardUI( parent, name ) +KSWizard::KSWizard( TQWidget *tqparent, const char *name ) + : KSWizardUI( tqparent, name ) { - ksw = (KStars *)parent; + ksw = (KStars *)tqparent; GeoID.resize(10000); //Removing telescope page for now... diff --git a/kstars/kstars/kswizard.h b/kstars/kstars/kswizard.h index ea570498..27b3010b 100644 --- a/kstars/kstars/kswizard.h +++ b/kstars/kstars/kswizard.h @@ -39,13 +39,14 @@ class GeoLocation; class KSWizard : public KSWizardUI { Q_OBJECT + TQ_OBJECT public: /** *Constructor - *@p parent pointer to the parent widget + *@p tqparent pointer to the tqparent widget *@p name name for the KSWizard object */ - KSWizard( TQWidget *parent=0, const char *name=0 ); + KSWizard( TQWidget *tqparent=0, const char *name=0 ); /**Destructor */ ~KSWizard(); diff --git a/kstars/kstars/kswizardui.ui b/kstars/kstars/kswizardui.ui index 398ac2fa..0a803053 100644 --- a/kstars/kstars/kswizardui.ui +++ b/kstars/kstars/kswizardui.ui @@ -1,10 +1,10 @@ KSWizardUI - + KSWizardUI - + 0 0 @@ -12,7 +12,7 @@ 492 - + WelcomePage @@ -23,7 +23,7 @@ unnamed - + Banner1 @@ -35,7 +35,7 @@ 0 - + 120 360 @@ -45,15 +45,15 @@ - + - layout11 + tqlayout11 unnamed - + textLabel1 @@ -61,9 +61,9 @@ <h3>Welcome to the KStars Setup Wizard</h3> - + - layout10 + tqlayout10 @@ -79,14 +79,14 @@ Fixed - + 20 20 - + textLabel2 @@ -95,7 +95,7 @@ <p>To get started, press the <b>Next</b> button.</p> - + WordBreak|AlignVCenter @@ -111,7 +111,7 @@ Expanding - + 20 189 @@ -122,7 +122,7 @@ - + GeoPage @@ -133,7 +133,7 @@ unnamed - + Banner2 @@ -145,7 +145,7 @@ 0 - + 120 360 @@ -155,15 +155,15 @@ - + - layout17 + tqlayout17 unnamed - + textLabel3 @@ -171,17 +171,17 @@ <h3>Choose Your Home Location</h3> - + - layout16 + tqlayout16 unnamed - + - layout15 + tqlayout15 @@ -197,22 +197,22 @@ Fixed - + 20 20 - + - layout14 + tqlayout14 unnamed - + textLabel4 @@ -225,7 +225,7 @@ country.</p> <p>Once you have selected a City, press <b>Next</b>.</p> - + WordBreak|AlignVCenter @@ -239,22 +239,22 @@ country.</p> Expanding - + 20 40 - + - layout4 + tqlayout4 unnamed - + textLabel5_3 @@ -270,7 +270,7 @@ country.</p> Filter the list by city name - + textLabel5 @@ -278,7 +278,7 @@ country.</p> City: - + textLabel5_2 @@ -314,16 +314,16 @@ country.</p> Expanding - + 20 20 - + - layout12 + tqlayout12 @@ -333,7 +333,7 @@ country.</p> LatBox - + 120 0 @@ -343,7 +343,7 @@ country.</p> Displays the latitude of the selected city - + textLabel7 @@ -351,14 +351,14 @@ country.</p> Longitude: - + textLabel7_2 Latitude: - + AlignVCenter|AlignLeft @@ -366,7 +366,7 @@ country.</p> LongBox - + 120 0 @@ -386,7 +386,7 @@ country.</p> CityListBox - + 180 0 @@ -405,7 +405,7 @@ country.</p> - + TelescopePage @@ -416,7 +416,7 @@ country.</p> unnamed - + Banner3 @@ -428,7 +428,7 @@ country.</p> 0 - + 120 360 @@ -438,15 +438,15 @@ country.</p> - + - layout18 + tqlayout18 unnamed - + textLabel1_2 @@ -454,9 +454,9 @@ country.</p> <h3>Setup Telescopes and Devices</h3> - + - layout17 + tqlayout17 @@ -472,22 +472,22 @@ country.</p> Fixed - + 20 20 - + - layout16 + tqlayout16 unnamed - + textLabel2_2 @@ -507,14 +507,14 @@ can also control telescopes remotely over the Internet. Fixed - + 20 16 - + textLabel3_2 @@ -535,16 +535,16 @@ You can always set up devices later using the <b>Devices</b> menu. Fixed - + 20 20 - + - layout15 + tqlayout15 @@ -560,7 +560,7 @@ You can always set up devices later using the <b>Devices</b> menu. Expanding - + 40 20 @@ -592,7 +592,7 @@ and other astronomical devices such as CCD cameras and focusers. Expanding - + 40 20 @@ -611,7 +611,7 @@ and other astronomical devices such as CCD cameras and focusers. Expanding - + 20 117 @@ -626,7 +626,7 @@ and other astronomical devices such as CCD cameras and focusers. - + DownLoadPage @@ -637,7 +637,7 @@ and other astronomical devices such as CCD cameras and focusers. unnamed - + Banner4 @@ -649,7 +649,7 @@ and other astronomical devices such as CCD cameras and focusers. 0 - + 120 360 @@ -659,15 +659,15 @@ and other astronomical devices such as CCD cameras and focusers. - + - layout19 + tqlayout19 unnamed - + textLabel2_3 @@ -675,9 +675,9 @@ and other astronomical devices such as CCD cameras and focusers. <h3>Download Extra Data Files</h3> - + - layout18 + tqlayout18 @@ -693,22 +693,22 @@ and other astronomical devices such as CCD cameras and focusers. Fixed - + 20 20 - + - layout17 + tqlayout17 unnamed - + textLabel1_3 @@ -721,7 +721,7 @@ button to proceed. </p> <p>You can also use this tool later, by selecting <b>Download data</b> from the <b>File</b> menu.</p> - + WordBreak|AlignTop @@ -735,16 +735,16 @@ button to proceed. </p> Expanding - + 20 30 - + - layout13 + tqlayout13 @@ -760,7 +760,7 @@ button to proceed. </p> Expanding - + 40 20 @@ -785,7 +785,7 @@ button to proceed. </p> Expanding - + 40 20 @@ -804,7 +804,7 @@ button to proceed. </p> Expanding - + 20 90 @@ -843,7 +843,7 @@ button to proceed. </p> 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000041d49444154789c8d95c18b1c4514c67fbb29e5b54ea05b26da1d36b08d09a6c508138cb8c13d647141163de49043bca9f1628eb9294810f24f88c15b728b07617358888785d980427290b4a8d00b19a8821da8228cf42316ac87eed9247ac95c9aeaeef9eaabdffb5ebf85f178ccfcf7f5b79fec07a7280a08a008f25ceb7c29e5da573716e65a0be3f198ef6f5ededff9b9e1b34faf90882092a1ea21428b9220ffbf46054055b19386ba6970ae6665b5e0d2c5eb0b066067bbe1f21757c88f5504eff0c192189081303a5582b16854fccce2fe041f00cdd0a8103b874556405476b62d972ec2c2b90ff3fd8df5cb946549d80b34aea15ccaa94625450e2d0e558b460b7371a734b5e027251a155545678ab62d7eea90b4c504078908c107acb354cb251b1f8f08b1c18631aabbb4d18211404804f22545863561d2f060fb34aa8a18d0086204e72c46a32292e1a796f278c1da7a859d8da9a737506db04d0a24103d8949480b214d3bbee952a05c1d536f9d2684160c744f048311543d459eb1b65ee1754cedae13a64abd5d6127053c9d0281f22d4f75c6a2118a5c09272d7ab740638bf4ef2dd2174032d0d8d04c6fe19c32bedd8bc65e342aa3f785e2784bfd6bc1bd9db24b05505616a4edd67d5a8c1801a03a9962754c504bf34b8986acfb9be91cac7d54315a15541b36b134f74bd2dc53940115a5381e087bc25c6f71be831a8baa234cc1ee3eeb74ed83116beb2b8849d108a3730e8ce27e2bfb82419a7b407ac7c222fd0e6280a8078ce64e47ef54ac9d5be9aaae0162e0de568a44a18d3df90845d919c4f01463406340a44f40efb43a99b371618488e2670d1a2d7ee6f1d3be39342104e937ed85fb86599c33e9ee0be9a004946259d8b858909880d59aa00daa0d3280b5f39e34074c4b3a5434029a76a9e9f5cc0163b5c80024158a1cfc4cb1d3061d5834066cb0a403c008599a70f6bc27b8d03106ea3ae91987278c5b143b015547224ab5e24185cd9b81665273e7b6e7cecd82ddbf8098002de94049737bc09828cf3036f31c3735c8b0e98eb704672f348c7f7c93cd1fb2ae905119ff54e0dff3542b0e9dd983dcea2cc5eea6cf303e74ec687af5c41b6fa38f5e203c7ec8e1238ef85831a214afef21060ea781ec68247b65c6916353cc8b73d1ae79354606af2a930709aa118da1636c274dd7e3774b884a79aa6b5711a538d33cf9c01c1c9b83bc6a1f55c91ccb23b05b1deb43a7decdaffefd2862f61366aa8449c69e33642f012f2bb208fa98eeda1f3346f076c8eeef19475e9be115423364f78f84105a8643d34d90cfbfdcd8cf872589a45dc7f54cf3134a36f4e495c23f9da8db15bccb708d4014f2ca512cb5d4f7c13e84300d5cff6eb39b202bab053bdb9674f0648609427d0f8402ddeac30f4fcd3ced3efc3b422d406c09b340bedc1571e1bfc3d44dc281634c5fe5e758e7395cfbe6d6c130fd17d92372d2cb00c6470000000049454e44ae426082 - + dmsbox.h dmsbox.h diff --git a/kstars/kstars/locationdialog.cpp b/kstars/kstars/locationdialog.cpp index 8bbd34ac..cb8d6baa 100644 --- a/kstars/kstars/locationdialog.cpp +++ b/kstars/kstars/locationdialog.cpp @@ -36,10 +36,10 @@ #include "mapcanvas.h" #include "dmsbox.h" -LocationDialog::LocationDialog( TQWidget* parent ) - : KDialogBase( KDialogBase::Plain, i18n( "Set Geographic Location" ), Ok|Cancel, Ok, parent ) { +LocationDialog::LocationDialog( TQWidget* tqparent ) + : KDialogBase( KDialogBase::Plain, i18n( "Set Geographic Location" ), Ok|Cancel, Ok, tqparent ) { - KStars *p = (KStars *)parent; + KStars *p = (KStars *)tqparent; TQFrame *page = plainPage(); CityBox = new TQGroupBox( page, "CityBox" ); @@ -52,18 +52,18 @@ LocationDialog::LocationDialog( TQWidget* parent ) CityLay = new TQVBoxLayout( CityBox, 6, 4 ); //root mgr for CityBox CityLay->setSpacing( 6 ); CityLay->setMargin( 6 ); - hlay = new TQHBoxLayout( 2 ); //this layout will be added to CityLay - vlay = new TQVBoxLayout( 2 ); //this layout will be added to hlay - glay = new TQGridLayout( 3, 2, 6 ); //this layout will be added to vlay + hlay = new TQHBoxLayout( 2 ); //this tqlayout will be added to CityLay + vlay = new TQVBoxLayout( 2 ); //this tqlayout will be added to hlay + glay = new TQGridLayout( 3, 2, 6 ); //this tqlayout will be added to vlay CoordLay = new TQVBoxLayout( CoordBox, 6, 4 ); //root mgr for coordbox CoordLay->setSpacing( 6 ); CoordLay->setMargin( 6 ); - glay2 = new TQGridLayout( 3, 4, 4 ); //this layout will be added to CoordLay - hlayCoord = new TQHBoxLayout( 2 ); //this layout will be added to glay2 - hlayTZ = new TQHBoxLayout( 2 ); //this layout will be added to glay2 - hlayButtons = new TQHBoxLayout( 2 ); //this layout will be added to glay2 - hlay3 = new TQHBoxLayout( 2 ); //this layout will be added to CoordLay + glay2 = new TQGridLayout( 3, 4, 4 ); //this tqlayout will be added to CoordLay + hlayCoord = new TQHBoxLayout( 2 ); //this tqlayout will be added to glay2 + hlayTZ = new TQHBoxLayout( 2 ); //this tqlayout will be added to glay2 + hlayButtons = new TQHBoxLayout( 2 ); //this tqlayout will be added to glay2 + hlay3 = new TQHBoxLayout( 2 ); //this tqlayout will be added to CoordLay //Create widgets CityFiltLabel = new TQLabel( CityBox ); @@ -122,7 +122,7 @@ LocationDialog::LocationDialog( TQWidget* parent ) AddCityButton = new TQPushButton( i18n ( "Add to List" ), CoordBox, "AddCityButton" ); -//Pack the widgets into the layouts +//Pack the widgets into the tqlayouts RootLay->addWidget( CityBox, 0, 0 ); RootLay->addWidget( CoordBox, 0, 0 ); @@ -217,14 +217,14 @@ LocationDialog::~LocationDialog(){ } void LocationDialog::initCityList( void ) { - KStars *p = (KStars *)parent(); + KStars *p = (KStars *)tqparent(); for (GeoLocation *loc = p->data()->geoList.first(); loc; loc = p->data()->geoList.next()) { GeoBox->insertItem( loc->fullName() ); filteredCityList.append( loc ); //If TZ is not even integer value, add it to listbox - if ( loc->TZ0() - int( loc->TZ0() ) && ! TZBox->listBox()->findItem( KGlobal::locale()->formatNumber( loc->TZ0() ) ) ) { + if ( loc->TZ0() - int( loc->TZ0() ) && ! TZBox->listBox()->tqfindItem( KGlobal::locale()->formatNumber( loc->TZ0() ) ) ) { for ( unsigned int i=0; i<((unsigned int) TZBox->count()); ++i ) { if ( TZBox->text( i ).toDouble() > loc->TZ0() ) { TZBox->insertItem( KGlobal::locale()->formatNumber( loc->TZ0() ), i-1 ); @@ -252,7 +252,7 @@ void LocationDialog::initCityList( void ) { } void LocationDialog::filterCity( void ) { - KStars *p = (KStars *)parent(); + KStars *p = (KStars *)tqparent(); GeoBox->clear(); filteredCityList.clear(); @@ -283,7 +283,7 @@ void LocationDialog::filterCity( void ) { if ( GeoBox->firstItem() ) // set first item in list as selected GeoBox->setCurrentItem( GeoBox->firstItem() ); - MapView->repaint(); + MapView->tqrepaint(); } void LocationDialog::changeCity( void ) { @@ -298,11 +298,11 @@ void LocationDialog::changeCity( void ) { } } - MapView->repaint(); + MapView->tqrepaint(); //Fill the fields at the bottom of the window with the selected city's data. if ( SelectedCity ) { - KStars *p = (KStars *)parent(); + KStars *p = (KStars *)tqparent(); 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 *)parent(); + KStars *p = (KStars *)tqparent(); bCityAdded = false; if ( !nameModified && !dataModified ) { @@ -417,7 +417,7 @@ void LocationDialog::addCity( void ) { } void LocationDialog::findCitiesNear( int lng, int lat ) { - KStars *ks = (KStars *)parent(); + KStars *ks = (KStars *)tqparent(); //find all cities within 3 degrees of (lng, lat); list them in GeoBox GeoBox->clear(); @@ -437,7 +437,7 @@ void LocationDialog::findCitiesNear( int lng, int lat ) { if ( GeoBox->firstItem() ) // set first item in list as selected GeoBox->setCurrentItem( GeoBox->firstItem() ); - repaint(); + tqrepaint(); } bool LocationDialog::checkLongLat( void ) { diff --git a/kstars/kstars/locationdialog.h b/kstars/kstars/locationdialog.h index 23831361..995f7f13 100644 --- a/kstars/kstars/locationdialog.h +++ b/kstars/kstars/locationdialog.h @@ -24,7 +24,7 @@ * *The top section allows the location to be selected from a database *of 2000 cities. It contains a MapCanvas (showing map of the globe - *with cities overlaid, with a handler for mouse clicks), a QListBox + *with cities overlaid, with a handler for mouse clicks), a TQListBox *containing the names of cities in the database, and three KLineEdit *widgets, which allow the user to filter the List by the name of the *City, Province, and Country. In addition, the List @@ -58,13 +58,14 @@ class dmsBox; class LocationDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** - *Constructor. Create all widgets, and pack them into QLayouts. + *Constructor. Create all widgets, and pack them into TQLayouts. *Connect Signals to Slots. Run initCityList(). */ - LocationDialog( TQWidget* parent = 0 ); + LocationDialog( TQWidget* tqparent = 0 ); /** *Destructor (empty) */ @@ -72,7 +73,7 @@ public: /** *Initialize list of cities. Note that the database is not read in here, - *that is done in the KStars constructor. This simply loads the local QListBox + *that is done in the KStars constructor. This simply loads the local TQListBox *with the names of the cities from the kstarsData object. */ void initCityList( void ); @@ -116,7 +117,7 @@ public slots: void filterCity( void ); /** - *When the selected city in the TQListBox changes, repaint the MapCanvas + *When the selected city in the TQListBox changes, tqrepaint the MapCanvas *so that the crosshairs icon appears on the newly selected city. */ void changeCity( void ); diff --git a/kstars/kstars/magnitudespinbox.cpp b/kstars/kstars/magnitudespinbox.cpp index 2f4b1930..09a85def 100644 --- a/kstars/kstars/magnitudespinbox.cpp +++ b/kstars/kstars/magnitudespinbox.cpp @@ -17,13 +17,13 @@ #include "magnitudespinbox.h" -MagnitudeSpinBox::MagnitudeSpinBox( TQWidget * parent , const char * name ) - : KDoubleNumInput( 0.0, 10.0, 0.0, 0.1 /*step*/, 1 /*precision*/, parent, name) +MagnitudeSpinBox::MagnitudeSpinBox( TQWidget * tqparent , const char * name ) + : KDoubleNumInput( 0.0, 10.0, 0.0, 0.1 /*step*/, 1 /*precision*/, tqparent, name) { } MagnitudeSpinBox::MagnitudeSpinBox( double minValue, double maxValue, - TQWidget * parent , const char * name ) - : KDoubleNumInput( minValue, maxValue, minValue, 0.1 /* step */, 1, parent, name) + TQWidget * tqparent , const char * name ) + : KDoubleNumInput( minValue, maxValue, minValue, 0.1 /* step */, 1, tqparent, name) { } diff --git a/kstars/kstars/magnitudespinbox.h b/kstars/kstars/magnitudespinbox.h index c5f120c5..36017176 100644 --- a/kstars/kstars/magnitudespinbox.h +++ b/kstars/kstars/magnitudespinbox.h @@ -20,7 +20,7 @@ /**@class MagnitudeSpinBox *A special spinbox for entering magnitude values. - *This class now inherits KDoubleNumInput instead of QSpinBox + *This class now inherits KDoubleNumInput instead of TQSpinBox *@short a custom spinbox for magnitude (float) values. *@author Heiko Evermann *@version 1.0 @@ -36,11 +36,11 @@ class MagnitudeSpinBox : public KDoubleNumInput /**Default Constructor. */ - MagnitudeSpinBox( TQWidget* parent = 0, const char* name = 0); + MagnitudeSpinBox( TQWidget* tqparent = 0, const char* name = 0); /**Constructor. Set minimum and maximum values for the spinbox. */ - MagnitudeSpinBox( double minValue, double maxValue, TQWidget* parent = 0, const char* name = 0); + MagnitudeSpinBox( double minValue, double maxValue, TQWidget* tqparent = 0, const char* name = 0); }; diff --git a/kstars/kstars/main.cpp b/kstars/kstars/main.cpp index a16acfbc..c79fc0ad 100644 --- a/kstars/kstars/main.cpp +++ b/kstars/kstars/main.cpp @@ -73,13 +73,13 @@ int main(int argc, char *argv[]) //parse filename and image format const char* format = "PNG"; TQString fname = args->getOption( "filename" ); - TQString ext = fname.mid( fname.findRev(".")+1 ); + TQString ext = fname.mid( fname.tqfindRev(".")+1 ); if ( ext.lower() == "png" ) { format = "PNG"; } else if ( ext.lower() == "jpg" || ext.lower() == "jpeg" ) { format = "JPG"; } else if ( ext.lower() == "gif" ) { format = "GIF"; } else if ( ext.lower() == "pnm" ) { format = "PNM"; } else if ( ext.lower() == "bmp" ) { format = "BMP"; } - else { kdWarning() << i18n( "Could not parse image format of %1; assuming PNG." ).arg( fname ) << endl; } + else { kdWarning() << i18n( "Could not parse image format of %1; assuming PNG." ).tqarg( fname ) << endl; } //parse width and height bool ok(false); @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) KStarsData *dat = new KStarsData(); TQObject::connect( dat, TQT_SIGNAL( progressText(TQString) ), dat, TQT_SLOT( slotConsoleMessage(TQString) ) ); dat->initialize(); - while (!dat->startupComplete) { kapp->processEvents(50); } + while (!dat->startupComplete) { kapp->tqprocessEvents(50); } //Set Geographic Location dat->setLocationFromOptions(); @@ -109,8 +109,8 @@ int main(int argc, char *argv[]) TQString datestring = args->getOption( "date" ); KStarsDateTime kdt; if ( ! datestring.isEmpty() ) { - if ( datestring.contains( "-" ) ) { //assume ISODate format - if ( datestring.contains( ":" ) ) { //also includes time + if ( datestring.tqcontains( "-" ) ) { //assume ISODate format + if ( datestring.tqcontains( ":" ) ) { //also includes time kdt = KStarsDateTime::fromString( datestring, Qt::ISODate ); } else { //string probably contains date only kdt.setDate( ExtDate::fromString( datestring, Qt::ISODate ) ); @@ -128,10 +128,10 @@ int main(int argc, char *argv[]) kdWarning() << " 25 Feb 1950 ; 25 Feb 1950 05:30:00" << endl; kdWarning() << i18n( "Using CPU date/time instead." ) << endl; - kdt = dat->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); + kdt = dat->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); } } else { - kdt = dat->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); + kdt = dat->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); } dat->clock()->setUTC( kdt ); @@ -151,7 +151,7 @@ int main(int argc, char *argv[]) TQString scriptfile = args->getOption( "script" ); if ( ! scriptfile.isEmpty() ) { if ( dat->executeScript( scriptfile, map ) ) { - std::cout << i18n( "Script executed." ).utf8() << std::endl; + std::cout << i18n( "Script executed." ).utf8().data() << std::endl; } else { kdWarning() << i18n( "Could not execute script." ) << endl; } @@ -160,13 +160,13 @@ int main(int argc, char *argv[]) dat->setFullTimeUpdate(); dat->updateTime(dat->geo(), map ); - kapp->processEvents(100000); + kapp->tqprocessEvents(100000); map->setMapGeometry(); - map->exportSkyImage( &sky ); - kapp->processEvents(100000); + map->exportSkyImage( TQT_TQPAINTDEVICE(&sky) ); + kapp->tqprocessEvents(100000); - if ( ! sky.save( fname, format ) ) kdWarning() << i18n( "Unable to save image: %1 " ).arg( fname ) << endl; - else kdDebug() << i18n( "Saved to file: %1" ).arg( fname ) << endl; + if ( ! sky.save( fname, format ) ) kdWarning() << i18n( "Unable to save image: %1 " ).tqarg( fname ) << endl; + else kdDebug() << i18n( "Saved to file: %1" ).tqarg( fname ) << endl; delete map; delete dat; @@ -179,7 +179,7 @@ int main(int argc, char *argv[]) TQString datestring = args->getOption( "date" ); if ( ! datestring.isEmpty() && ! KStarsDateTime::fromString( datestring ).isValid() ) { - kdWarning() << i18n("Specified date (%1) is invalid. Will use current CPU date instead." ).arg( datestring ) << endl; + kdWarning() << i18n("Specified date (%1) is invalid. Will use current CPU date instead." ).tqarg( datestring ) << endl; datestring = ""; } diff --git a/kstars/kstars/mapcanvas.cpp b/kstars/kstars/mapcanvas.cpp index 85dbd1ca..bc76ab02 100644 --- a/kstars/kstars/mapcanvas.cpp +++ b/kstars/kstars/mapcanvas.cpp @@ -25,14 +25,14 @@ #include "kstars.h" #include "kstarsdata.h" -MapCanvas::MapCanvas(TQWidget *parent, const char *name ) : TQWidget(parent,name) { +MapCanvas::MapCanvas(TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name) { BGColor = "#33A"; setBackgroundColor( TQColor( BGColor ) ); setBackgroundMode( TQWidget::NoBackground ); Canvas = new TQPixmap(); bgImage = new TQPixmap(); - LocationDialog *ld = (LocationDialog *)topLevelWidget(); - KStars *ks = (KStars *)ld->parent(); + LocationDialog *ld = (LocationDialog *)tqtopLevelWidget(); + KStars *ks = (KStars *)ld->tqparent(); TQString bgFile = ks->data()->stdDirs->findResource( "data", "kstars/geomap.png" ); bgImage->load( bgFile, "PNG" ); } @@ -57,7 +57,7 @@ void MapCanvas::setGeometry( const TQRect &r ) { } void MapCanvas::mousePressEvent( TQMouseEvent *e ) { - LocationDialog *ld = (LocationDialog *)topLevelWidget(); + LocationDialog *ld = (LocationDialog *)tqtopLevelWidget(); //Determine Lat/Long corresponding to event press int lng = ( e->x() - origin.x() ); @@ -68,8 +68,8 @@ void MapCanvas::mousePressEvent( TQMouseEvent *e ) { void MapCanvas::paintEvent( TQPaintEvent * ) { TQPainter pcanvas; - LocationDialog *ld = (LocationDialog *)topLevelWidget(); - KStars *ks = (KStars *)ld->parent(); + LocationDialog *ld = (LocationDialog *)tqtopLevelWidget(); + KStars *ks = (KStars *)ld->tqparent(); //prepare the canvas pcanvas.begin( Canvas ); diff --git a/kstars/kstars/mapcanvas.h b/kstars/kstars/mapcanvas.h index b32098b2..66402408 100644 --- a/kstars/kstars/mapcanvas.h +++ b/kstars/kstars/mapcanvas.h @@ -38,18 +38,19 @@ class TQPixmap; class MapCanvas : public TQWidget { Q_OBJECT + TQ_OBJECT public: /**Default constructor. Initialize the widget: create pixmaps, load the *world map bitmap, set pointers to the main window and the - *LocationDialog parent. + *LocationDialog tqparent. */ - MapCanvas(TQWidget *parent=0, const char *name=0); + MapCanvas(TQWidget *tqparent=0, const char *name=0); /**Destructor (empty) */ ~MapCanvas(); public slots: - /**Set the geometry of the map widget (overloaded from TQWidget). + /**Set the tqgeometry of the map widget (overloaded from TQWidget). *Resizes the size of the map pixmap to match the widget, and resets *the Origin TQPoint so it remains at the center of the widget. *@note this is called automatically by resize events. @@ -60,13 +61,13 @@ public slots: */ virtual void setGeometry( int x, int y, int w, int h ); - /**Set the geometry of the map widget (overloaded from TQWidget). + /**Set the tqgeometry of the map widget (overloaded from TQWidget). *Resizes the size of the map pixmap to match the widget, and resets *the Origin TQPoint so it remains at the center of the widget. *This function behaves just like the above function. It differs *only in the data type of its argument. *@note this is called automatically by resize events. - *@p r TQRect describing geometry + *@p r TQRect describing tqgeometry */ virtual void setGeometry( const TQRect &r ); diff --git a/kstars/kstars/newfovui.ui b/kstars/kstars/newfovui.ui index 4abfc4ad..69cbdaeb 100644 --- a/kstars/kstars/newfovui.ui +++ b/kstars/kstars/newfovui.ui @@ -1,10 +1,10 @@ NewFOVUI - + NewFOVUI - + 0 0 @@ -19,15 +19,15 @@ unnamed - + - layout6 + tqlayout6 unnamed - + textLabel1 @@ -54,14 +54,14 @@ - + tabWidget2 0 - + tab @@ -72,23 +72,23 @@ unnamed - + - layout16 + tqlayout16 unnamed - + - layout11 + tqlayout11 unnamed - + textLabel5 @@ -96,7 +96,7 @@ Telescope focal length: - + textLabel7_2 @@ -104,7 +104,7 @@ Eyepiece focal length: - + textLabel8_2 @@ -114,17 +114,17 @@ - + - layout15 + tqlayout15 unnamed - + - layout12 + tqlayout12 @@ -143,7 +143,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbol which matches the field-of-view of a telescope eyepiece. - + textLabel6_2 @@ -158,9 +158,9 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - + - layout13 + tqlayout13 @@ -179,7 +179,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo This is one of the data fields required for defining a field-of-view (FOV) symbol which matches the field-of-view of a telescope eyepiece. - + textLabel6_2_2 @@ -194,9 +194,9 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - + - layout14 + tqlayout14 @@ -215,7 +215,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo This is one of the data fields required for defining a field-of-view (FOV) symbol which matches the field-of-view of a telescope eyepiece. - + textLabel6_2_2_2 @@ -244,16 +244,16 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo Expanding - + 20 21 - + - layout14 + tqlayout14 @@ -269,7 +269,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo Expanding - + 152 20 @@ -296,7 +296,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" - + tab @@ -333,7 +333,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" Expanding - + 180 20 @@ -350,7 +350,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" Expanding - + 20 22 @@ -367,30 +367,30 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" Expanding - + 20 22 - + - layout26 + tqlayout26 unnamed - + - layout25 + tqlayout25 unnamed - + textLabel5_2 @@ -398,7 +398,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" Telescope focal length: - + textLabel9 @@ -408,17 +408,17 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" - + - layout24 + tqlayout24 unnamed - + - layout15 + tqlayout15 @@ -437,11 +437,11 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" This is one of the data fields required for defining a field-of-view (FOV) symbol which matches the field-of-view of a camera mounted on a telescope. - + textLabel6_2_3 - + 60 0 @@ -458,9 +458,9 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - + - layout16 + tqlayout16 @@ -479,7 +479,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo This is one of the data fields required for defining a field-of-view (FOV) symbol which matches the field-of-view of a camera mounted on a telescope. - + textLabel6_2_3_2 @@ -500,7 +500,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - + TabPage @@ -511,23 +511,23 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo unnamed - + - layout26_3 + tqlayout26_3 unnamed - + - layout25_3 + tqlayout25_3 unnamed - + textLabel5_2_3 @@ -535,7 +535,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo Radiotelescope diameter: - + textLabel9_3 @@ -545,17 +545,17 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - + - layout24_3 + tqlayout24_3 unnamed - + - layout15_4 + tqlayout15_4 @@ -574,11 +574,11 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo This is one of the data fields required for defining a field-of-view (FOV) symbol which matches the field-of-view of a camera mounted on a telescope. - + textLabel6_2_3_4 - + 60 0 @@ -595,9 +595,9 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo - + - layout16_4 + tqlayout16_4 @@ -616,7 +616,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo This is one of the data fields required for defining a field-of-view (FOV) symbol which matches the field-of-view of a camera mounted on a telescope. - + textLabel6_2_3_2_3 @@ -645,16 +645,16 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo Expanding - + 21 51 - + - layout36 + tqlayout36 @@ -670,7 +670,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo Expanding - + 281 21 @@ -701,15 +701,15 @@ The computed HPBW angle (in arcminutes) will be displayed in the "Field of view" - + - layout14 + tqlayout14 unnamed - + fieldoFviewLabel @@ -742,32 +742,32 @@ You can either enter a value directly, or use the "Eyepiece" or "Camera" Tabs to Expanding - + 298 20 - + - layout11 + tqlayout11 unnamed - + - layout3 + tqlayout3 unnamed - + - layout2 + tqlayout2 @@ -794,7 +794,7 @@ You can either enter a value directly, or use the "Eyepiece" or "Camera" Tabs to Select a color for the field-of-view (FOV) symbol. - + textLabel8 @@ -832,15 +832,15 @@ You can either enter a value directly, or use the "Eyepiece" or "Camera" Tabs to ShapeBox - Select a shape for the field-of-view symbol + Select a tqshape for the field-of-view symbol - Select a shape for the field-of-view (FOV) symbol. The possible shapes are: + Select a tqshape for the field-of-view (FOV) symbol. The possible tqshapes are: Circle, Square, Crosshairs, Bullseye. - + textLabel7 @@ -852,15 +852,15 @@ Circle, Square, Crosshairs, Bullseye. - + - layout10 + tqlayout10 unnamed - + ViewBox @@ -872,7 +872,7 @@ Circle, Square, Crosshairs, Bullseye. 0 - + 80 80 @@ -921,7 +921,7 @@ Circle, Square, Crosshairs, Bullseye. ShapeBox ColorButton - + klineedit.h knuminput.h diff --git a/kstars/kstars/objectnamelist.cpp b/kstars/kstars/objectnamelist.cpp index b86fdac8..8a35ea0a 100644 --- a/kstars/kstars/objectnamelist.cpp +++ b/kstars/kstars/objectnamelist.cpp @@ -184,11 +184,11 @@ void ObjectNameList::remove ( const TQString &name ) { int index = getIndex(name); SortedList *l = &(list[language][index]); - SkyObjectName *son = find( name ); + SkyObjectName *son = tqfind( name ); if ( son ) l->remove( son ); } -SkyObjectName* ObjectNameList::find(const TQString &name) { +SkyObjectName* ObjectNameList::tqfind(const TQString &name) { sort(); if (name.isNull()) return 0; // find works only in one list and not in all lists diff --git a/kstars/kstars/objectnamelist.h b/kstars/kstars/objectnamelist.h index 691311ee..ea19f621 100644 --- a/kstars/kstars/objectnamelist.h +++ b/kstars/kstars/objectnamelist.h @@ -71,7 +71,7 @@ class ObjectNameList { *@return pointer to the first object in the selected list. *@param name the name to use in selecting a list. */ - SkyObjectName* first(const TQString &name = TQString::null); + SkyObjectName* first(const TQString &name = TQString()); /**Returns next object in the currently selected list. *@return pointer to the next object in the current list, or NULL if @@ -87,13 +87,13 @@ class ObjectNameList { *@param name name of object to find. *@return pointer to object with the given name */ - SkyObjectName* find(const TQString &name = TQString::null); + SkyObjectName* tqfind(const TQString &name = TQString()); /**@short remove the named object from the list. *@param name the name of the object to be removed. *@note If the object is not found, then nothing happens. */ - void remove( const TQString &name = TQString::null ); + void remove( const TQString &name = TQString() ); /**Define the language which should be used for constellation names */ @@ -118,7 +118,7 @@ class ObjectNameList { private: /**Sorts the lists with objects for faster access. - *It's needed for find(). first() and find() call this function. + *It's needed for tqfind(). first() and tqfind() call this function. */ void sort(); @@ -128,7 +128,7 @@ class ObjectNameList { *of the list itself. *@param name the name of the object whose index is to be found */ - int getIndex( const TQString &name = TQString::null ); + int getIndex( const TQString &name = TQString() ); /**Two modes are available: *allLists = loop through the whole list if next() is called diff --git a/kstars/kstars/opsadvanced.h b/kstars/kstars/opsadvanced.h index 9295e437..7475cc49 100644 --- a/kstars/kstars/opsadvanced.h +++ b/kstars/kstars/opsadvanced.h @@ -36,9 +36,10 @@ class KStars; class OpsAdvanced : public OpsAdvancedUI { Q_OBJECT + TQ_OBJECT public: - OpsAdvanced( TQWidget *parent=0, const char *name=0, WFlags fl = 0 ); + OpsAdvanced( TQWidget *tqparent=0, const char *name=0, WFlags fl = 0 ); ~OpsAdvanced(); private slots: diff --git a/kstars/kstars/opsadvancedui.ui b/kstars/kstars/opsadvancedui.ui index 13022545..bdb07353 100644 --- a/kstars/kstars/opsadvancedui.ui +++ b/kstars/kstars/opsadvancedui.ui @@ -1,10 +1,10 @@ OpsAdvancedUI - + OpsAdvancedUI - + 0 0 @@ -19,7 +19,7 @@ unnamed - + kcfg_UseRefraction @@ -30,10 +30,10 @@ Correct coordinates of objects for the effects of the atmosphere - The atmosphere bends light passing through it, like a lens. If this item is checked, this "atmospheric refraction" will be simulated in the sky map. Note that this correction is only applied when using the Horizontal coordinate system. + The atmosphere bends light passing through it, like a lens. If this item is checked, this "atmospheric refraction" will be simulated in the sky map. Note that this correction is only applied when using theQt::Horizontal coordinate system. - + kcfg_UseAnimatedSlewing @@ -47,7 +47,7 @@ If checked, changing the focus position will result in a visible animated "slew" to the new position. Otherwise, the display will center on the new position instantaneously. - + kcfg_UseAutoLabel @@ -61,7 +61,7 @@ If checked, a name label will be temporarily attached to an object while it is centered in the display. You can attach a more persistent label to any object using the right-click popup menu. - + kcfg_UseHoverLabel @@ -75,7 +75,7 @@ If checked, a name label will be temporarily attached to an object while it is centered in the display. You can attach a more persistent label to any object using the right-click popup menu. - + ObsListOptions @@ -86,7 +86,7 @@ unnamed - + kcfg_ObsListSymbol @@ -97,7 +97,7 @@ true - + kcfg_ObsListText @@ -117,14 +117,14 @@ Fixed - + 20 20 - + kcfg_HideOnSlew @@ -138,15 +138,15 @@ When the map is in motion, smooth animation is compromised if the program has too many objects to draw on the map; check this item to temporarily hide some of the objects while the display is in motion. - + - layout16 + tqlayout16 unnamed - + textLabelHideTimeStep @@ -175,7 +175,7 @@ Expanding - + 40 20 @@ -184,7 +184,7 @@ - + HideBox @@ -198,15 +198,15 @@ unnamed - + - layout20 + tqlayout20 unnamed - + kcfg_HideStars @@ -224,7 +224,7 @@ kcfg_MagLimitHideStar - + 40 0 @@ -240,7 +240,7 @@ Stars fainter than this will not be drawn while the map is moving. - + textLabelMag1 @@ -258,7 +258,7 @@ Expanding - + 240 20 @@ -267,15 +267,15 @@ - + - layout4 + tqlayout4 unnamed - + kcfg_HideIC @@ -289,7 +289,7 @@ If checked, then objects in the IC catalog will be hidden when the map is in motion. - + kcfg_HideMilkyWay @@ -303,7 +303,7 @@ If checked, then the Milky Way contour will be hidden when the map is in motion. - + kcfg_HidePlanets @@ -317,7 +317,7 @@ If checked, then all solar system bodies will be hidden when the map is in motion. - + kcfg_HideCBounds @@ -325,7 +325,7 @@ Constellation boundaries - + kcfg_HideMessier @@ -339,7 +339,7 @@ If checked, then objects in the Messier catalog will be hidden when the map is in motion. - + kcfg_HideGrid @@ -353,7 +353,7 @@ If checked, then the coordinate grid will be hidden when the map is in motion. - + kcfg_HideNGC @@ -367,7 +367,7 @@ If checked, then objects in the NGC catalog will be hidden when the map is in motion. - + kcfg_HideCLines @@ -381,7 +381,7 @@ If checked, then constellation lines will be hidden when the map is in motion. - + kcfg_HideCNames @@ -409,7 +409,7 @@ Expanding - + 20 16 @@ -478,7 +478,7 @@ kcfg_HideCLines kcfg_HideGrid - + timestepbox.h magnitudespinbox.h diff --git a/kstars/kstars/opscatalog.cpp b/kstars/kstars/opscatalog.cpp index 60f45aaa..c3701446 100644 --- a/kstars/kstars/opscatalog.cpp +++ b/kstars/kstars/opscatalog.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include //QCheckListItem +#include //TQCheckListItem #include #include #include @@ -82,7 +82,7 @@ OpsCatalog::~OpsCatalog() {} void OpsCatalog::updateDisplay() { //Modify display according to settings in the CatalogList - if ( sender()->name() == TQString( "CatalogList" ) ) + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "CatalogList" ) ) Options::setShowDeepSky( true ); Options::setShowMessier( showMessier->isOn() ); @@ -90,7 +90,7 @@ void OpsCatalog::updateDisplay() { Options::setShowNGC( showNGC->isOn() ); Options::setShowIC( showIC->isOn() ); for ( unsigned int i=0; idata()->customCatalogs().count(); ++i ) { - TQCheckListItem *item = (TQCheckListItem*)( CatalogList->findItem( ksw->data()->customCatalogs().at(i)->name(), 0 )); + TQCheckListItem *item = (TQCheckListItem*)( CatalogList->tqfindItem( ksw->data()->customCatalogs().at(i)->name(), 0 )); Options::showCatalog()[i] = item->isOn(); } @@ -172,7 +172,7 @@ void OpsCatalog::slotRemoveCatalog() { } } - //Remove entry in the QListView + //Remove entry in the TQListView CatalogList->takeItem( CatalogList->currentItem() ); ksw->map()->forceUpdate(); diff --git a/kstars/kstars/opscatalog.h b/kstars/kstars/opscatalog.h index d57049d5..0e6701e9 100644 --- a/kstars/kstars/opscatalog.h +++ b/kstars/kstars/opscatalog.h @@ -39,9 +39,10 @@ class TQCheckListItem; class OpsCatalog : public OpsCatalogUI { Q_OBJECT + TQ_OBJECT public: - OpsCatalog( TQWidget *parent=0, const char *name=0, WFlags fl = 0 ); + OpsCatalog( TQWidget *tqparent=0, const char *name=0, WFlags fl = 0 ); ~OpsCatalog(); private slots: diff --git a/kstars/kstars/opscatalogui.ui b/kstars/kstars/opscatalogui.ui index 14db7c6a..d1dcbafc 100644 --- a/kstars/kstars/opscatalogui.ui +++ b/kstars/kstars/opscatalogui.ui @@ -1,10 +1,10 @@ OpsCatalogUI - + OpsCatalogUI - + 0 0 @@ -19,7 +19,7 @@ unnamed - + groupBox1 @@ -36,7 +36,7 @@ unnamed - + kcfg_ShowStars @@ -50,9 +50,9 @@ When selected, stars are drawn in the skymap. Use the other options in this box to control how many stars are drawn. - + - layout8 + tqlayout8 @@ -74,7 +74,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the object. Magnitude 6.0 is about as faint as the unaided human eye can see. - + textLabelMag1 @@ -82,7 +82,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj mag - + textLabelMagStarsZoomOut @@ -90,7 +90,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Faint limit zoomed out: - + textLabelMag3 @@ -114,7 +114,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Magnitude is a measure of brightness; the larger the number, the fainter the object. Magnitude 6.0 is about as faint as the unaided human eye can see. - + textLabelMagStars @@ -132,7 +132,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Expanding - + 65 20 @@ -149,7 +149,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Expanding - + 65 20 @@ -168,22 +168,22 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Expanding - + 20 16 - + - layout9 + tqlayout9 unnamed - + textLabelMagStarInfo @@ -205,7 +205,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Sets the faintest <b>magnitude</b> for which name and magnitude labels may be attached to stars. Magnitude is a measure of brightness; the larger the number, the fainter the object. Magnitude 6.0 is about as faint as the unaided human eye can see. - + textLabelMag2 @@ -223,7 +223,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Expanding - + 40 20 @@ -232,9 +232,9 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj - + - layout7 + tqlayout7 @@ -250,14 +250,14 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Fixed - + 20 20 - + kcfg_ShowStarNames @@ -273,9 +273,9 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj - + - layout8 + tqlayout8 @@ -291,14 +291,14 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Fixed - + 20 20 - + kcfg_ShowStarMagnitudes @@ -316,7 +316,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj - + groupBox2 @@ -327,15 +327,15 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj unnamed - + - layout15 + tqlayout15 unnamed - + Show Catalog @@ -360,9 +360,9 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj The list of catalogs available, other than the star catalog. By default, the list includes the Messier, NGC and IC catalogs. You can add your own object catalogs as well. - + - layout14 + tqlayout14 @@ -423,7 +423,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Expanding - + 20 68 @@ -434,9 +434,9 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj - + - layout8_2 + tqlayout8_2 @@ -461,7 +461,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Magnitude is a measure of brightness; the larger the number, the fainter the object. Magnitude 6.0 is about as faint as the unaided human eye can see. - + textLabelMag1_2 @@ -469,7 +469,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj mag - + textLabelMagStarsZoomOut_2 @@ -477,7 +477,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Faint limit zoomed out: - + textLabelMag3_2 @@ -504,7 +504,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Magnitude is a measure of brightness; the larger the number, the fainter the object. Magnitude 6.0 is about as faint as the unaided human eye can see. - + textLabelMagStars_2 @@ -522,7 +522,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Expanding - + 65 20 @@ -539,7 +539,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Expanding - + 65 20 @@ -560,7 +560,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj Expanding - + 20 16 @@ -593,7 +593,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj 789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f - + magnitudespinbox.h magnitudespinbox.h diff --git a/kstars/kstars/opscolors.cpp b/kstars/kstars/opscolors.cpp index 8746dd00..73f6ca59 100644 --- a/kstars/kstars/opscolors.cpp +++ b/kstars/kstars/opscolors.cpp @@ -62,8 +62,8 @@ OpsColors::OpsColors( TQWidget *p, const char *name, WFlags fl ) while ( !stream.eof() ) { line = stream.readLine(); - schemeName = line.left( line.find( ':' ) ); - filename = line.mid( line.find( ':' ) +1, line.length() ); + schemeName = line.left( line.tqfind( ':' ) ); + filename = line.mid( line.tqfind( ':' ) +1, line.length() ); PresetBox->insertItem( schemeName ); PresetFileList.append( filename ); } @@ -123,7 +123,7 @@ void OpsColors::slotPreset( int index ) { TQStringList::Iterator it = PresetFileList.at( index ); bool result = setColors( *it ); if (!result) { - TQString message = i18n( "The specified color scheme file (%1) could not be found, or was corrupt." ).arg( TQString(*it) ); + TQString message = i18n( "The specified color scheme file (%1) could not be found, or was corrupt." ).tqarg( TQString(*it) ); KMessageBox::sorry( 0, message, i18n( "Could Not Set Color Scheme" ) ); } } @@ -161,15 +161,15 @@ void OpsColors::slotAddPreset() { bool okPressed = false; TQString schemename = KInputDialog::getText( i18n( "New Color Scheme" ), i18n( "Enter a name for the new color scheme:" ), - TQString::null, &okPressed, 0 ); + TQString(), &okPressed, 0 ); if ( okPressed && ! schemename.isEmpty() ) { if ( ksw->data()->colorScheme()->save( schemename ) ) { PresetBox->insertItem( schemename ); - PresetBox->setCurrentItem( PresetBox->findItem( schemename ) ); + PresetBox->setCurrentItem( PresetBox->tqfindItem( schemename ) ); TQString fname = ksw->data()->colorScheme()->fileName(); PresetFileList.append( fname ); - ksw->addColorMenuItem( schemename, TQString("cs_" + fname.left(fname.find(".colors"))).utf8() ); + ksw->addColorMenuItem( schemename, TQString("cs_" + fname.left(fname.tqfind(".colors"))).utf8() ); } } } @@ -181,7 +181,7 @@ void OpsColors::slotRemovePreset() { cdatFile.setName( locateLocal( "appdata", "colors.dat" ) ); //determine filename in local user KDE directory tree. //Remove action from color-schemes menu - ksw->removeColorMenuItem( TQString("cs_" + filename.left( filename.find(".colors"))).utf8() ); + ksw->removeColorMenuItem( TQString("cs_" + filename.left( filename.tqfind(".colors"))).utf8() ); if ( !cdatFile.exists() || !cdatFile.open( IO_ReadWrite ) ) { TQString message = i18n( "Local color scheme index file could not be opened.\nScheme cannot be removed." ); @@ -205,7 +205,7 @@ void OpsColors::slotRemovePreset() { while ( !stream.eof() ) { TQString line = stream.readLine(); - if ( line.left( line.find(':') ) != name ) slist.append( line ); + if ( line.left( line.tqfind(':') ) != name ) slist.append( line ); else removed = true; } @@ -213,7 +213,7 @@ void OpsColors::slotRemovePreset() { TQFile colorFile; colorFile.setName( locateLocal( "appdata", filename ) ); //determine filename in local user KDE directory tree. if ( !colorFile.remove() ) { - TQString message = i18n( "Could not delete the file: %1" ).arg( colorFile.name() ); + TQString message = i18n( "Could not delete the file: %1" ).tqarg( colorFile.name() ); KMessageBox::sorry( 0, message, i18n( "Error Deleting File" ) ); } @@ -224,7 +224,7 @@ void OpsColors::slotRemovePreset() { for( unsigned int i=0; i OpsColorsUI - + OpsColorsUI - + 0 0 @@ -19,7 +19,7 @@ unnamed - + groupBox5 @@ -41,15 +41,15 @@ The list of all customizable colors in the program. Next to each item is a square showing the color it is currently set to. Click on any item to change its color. - + - layout4 + tqlayout4 unnamed - + textLabel1_2 @@ -79,15 +79,15 @@ - + - layout10 + tqlayout10 unnamed - + textLabel1 @@ -111,15 +111,15 @@ - + - layout11 + tqlayout11 unnamed - + textLabel2 @@ -145,7 +145,7 @@ - + groupBox6 @@ -167,9 +167,9 @@ List of all known color schemes. Several are provided by default, and you may also define your own. - + - layout9 + tqlayout9 @@ -185,7 +185,7 @@ Expanding - + 40 20 @@ -216,7 +216,7 @@ Expanding - + 40 20 @@ -233,7 +233,7 @@ Expanding - + 40 20 @@ -250,7 +250,7 @@ Expanding - + 40 20 @@ -285,5 +285,5 @@ AddPreset RemovePreset - + diff --git a/kstars/kstars/opsguides.cpp b/kstars/kstars/opsguides.cpp index aae84244..d9bfc7c9 100644 --- a/kstars/kstars/opsguides.cpp +++ b/kstars/kstars/opsguides.cpp @@ -18,8 +18,8 @@ #include #include "opsguides.h" -OpsGuides::OpsGuides( TQWidget* parent, const char* name, WFlags fl ) - : OpsGuidesUI( parent, name, fl ) +OpsGuides::OpsGuides( TQWidget* tqparent, const char* name, WFlags fl ) + : OpsGuidesUI( tqparent, 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 deb2ff50..383f6082 100644 --- a/kstars/kstars/opsguides.h +++ b/kstars/kstars/opsguides.h @@ -22,9 +22,10 @@ class OpsGuides : public OpsGuidesUI { Q_OBJECT + TQ_OBJECT public: - OpsGuides( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + OpsGuides( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~OpsGuides(); private slots: diff --git a/kstars/kstars/opsguidesui.ui b/kstars/kstars/opsguidesui.ui index 1f8c1dca..33a366c4 100644 --- a/kstars/kstars/opsguidesui.ui +++ b/kstars/kstars/opsguidesui.ui @@ -1,10 +1,10 @@ OpsGuidesUI - + OpsGuidesUI - + 0 0 @@ -19,7 +19,7 @@ unnamed - + kcfg_ShowCLines @@ -33,7 +33,7 @@ If checked, constellation lines will be drawn on the sky map. - + kcfg_ShowCBounds @@ -41,7 +41,7 @@ Constellation &boundaries - + kcfg_ShowCNames @@ -55,7 +55,7 @@ If checked, constellation names will be drawn on the sky map. - + ConstellOptions @@ -66,7 +66,7 @@ unnamed - + kcfg_UseLatinConstellNames @@ -80,7 +80,7 @@ Select this to use Latin constellation names on the sky map - + kcfg_UseLocalConstellNames @@ -94,7 +94,7 @@ Select this to use constellation names from your locality (if available) - + kcfg_UseAbbrevConstellNames @@ -120,14 +120,14 @@ Fixed - + 20 16 - + kcfg_ShowMilkyWay @@ -141,7 +141,7 @@ If checked, a contour representing the Milky Way will be drawn on the sky map - + kcfg_FillMilkyWay @@ -165,14 +165,14 @@ Fixed - + 20 16 - + kcfg_ShowGrid @@ -186,7 +186,7 @@ If checked, a grid of lines will be drawn every 2 hours in Right Ascension and every 20 degrees in Declination. - + kcfg_ShowEquator @@ -200,7 +200,7 @@ If checked, the celestial equator will be drawn in the sky map. - + kcfg_ShowEcliptic @@ -214,7 +214,7 @@ If checked, the ecliptic will be drawn on the sky map. The ecliptic is a great circle on the sky that the Sun appears to follow over the course of one year. All other solar system bodies roughly follow the ecliptic as well. - + kcfg_ShowHorizon @@ -228,7 +228,7 @@ If checked, a line representing the local horizon will be drawn on the map. - + kcfg_ShowGround @@ -252,7 +252,7 @@ Expanding - + 20 60 @@ -261,5 +261,5 @@ - + diff --git a/kstars/kstars/opssolarsystem.cpp b/kstars/kstars/opssolarsystem.cpp index 41ee58c0..4ee0a4da 100644 --- a/kstars/kstars/opssolarsystem.cpp +++ b/kstars/kstars/opssolarsystem.cpp @@ -21,10 +21,10 @@ #include "kstars.h" #include "magnitudespinbox.h" -OpsSolarSystem::OpsSolarSystem( TQWidget *parent, const char *name, WFlags fl ) - : OpsSolarSystemUI( parent, name, fl ) +OpsSolarSystem::OpsSolarSystem( TQWidget *tqparent, const char *name, WFlags fl ) + : OpsSolarSystemUI( tqparent, name, fl ) { - ksw = (KStars *)parent; + ksw = (KStars *)tqparent; connect( kcfg_ShowAsteroids, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotAsteroidWidgets(bool) ) ); connect( kcfg_ShowComets, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotCometWidgets(bool) ) ); @@ -58,7 +58,7 @@ void OpsSolarSystem::slotCometWidgets( bool on ) { void OpsSolarSystem::slotSelectPlanets() { bool b=true; - if ( sender()->name() == TQString( "showNonePlanets" ) ) b = false; + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "showNonePlanets" ) ) b = false; kcfg_ShowSun->setChecked( b ); kcfg_ShowMoon->setChecked( b ); diff --git a/kstars/kstars/opssolarsystem.h b/kstars/kstars/opssolarsystem.h index 07ce2c64..cce6d052 100644 --- a/kstars/kstars/opssolarsystem.h +++ b/kstars/kstars/opssolarsystem.h @@ -32,9 +32,10 @@ class KStars; class OpsSolarSystem : public OpsSolarSystemUI { Q_OBJECT + TQ_OBJECT public: - OpsSolarSystem( TQWidget *parent=0, const char *name=0, WFlags fl = 0 ); + OpsSolarSystem( TQWidget *tqparent=0, const char *name=0, WFlags fl = 0 ); ~OpsSolarSystem(); private slots: diff --git a/kstars/kstars/opssolarsystemui.ui b/kstars/kstars/opssolarsystemui.ui index 15b58a47..5742d6d6 100644 --- a/kstars/kstars/opssolarsystemui.ui +++ b/kstars/kstars/opssolarsystemui.ui @@ -1,10 +1,10 @@ OpsSolarSystemUI - + OpsSolarSystemUI - + 0 0 @@ -19,7 +19,7 @@ unnamed - + groupBox2 @@ -30,15 +30,15 @@ unnamed - + - layout20 + tqlayout20 unnamed - + kcfg_ShowSaturn @@ -52,7 +52,7 @@ If checked, Saturn will be drawn on the map. - + kcfg_ShowPlanetImages @@ -66,7 +66,7 @@ If checked, then the planets, the Sun and the Moon will be shown as bitmap images on the map - + kcfg_ShowMars @@ -80,7 +80,7 @@ If checked, Mars will be drawn on the map. - + kcfg_ShowPlanetNames @@ -94,7 +94,7 @@ If checked, name labels will be attached to the planets, the Sun and the Moon - + kcfg_ShowPluto @@ -136,7 +136,7 @@ Press this button to unselect all planets, the Sun and the Moon so that they will not be drawn on the map - + kcfg_ShowVenus @@ -150,7 +150,7 @@ If checked, Venus will be drawn on the map. - + kcfg_ShowSun @@ -164,7 +164,7 @@ If checked, the Sun will be drawn on the map. - + kcfg_ShowJupiter @@ -178,7 +178,7 @@ If checked, Jupiter will be drawn on the map. - + kcfg_ShowMoon @@ -192,7 +192,7 @@ If checked, the Moon will be drawn on the map. - + kcfg_ShowMercury @@ -206,7 +206,7 @@ If checked, Mercury will be drawn on the map. - + kcfg_ShowNeptune @@ -230,14 +230,14 @@ Fixed - + 100 20 - + kcfg_ShowUranus @@ -263,7 +263,7 @@ Expanding - + 20 40 @@ -272,7 +272,7 @@ - + groupBox3 @@ -283,7 +283,7 @@ unnamed - + kcfg_ShowComets @@ -307,14 +307,14 @@ Fixed - + 20 16 - + textLabel3 @@ -322,7 +322,7 @@ Show asteroids brighter than - + textLabel5 @@ -330,7 +330,7 @@ mag - + textLabel4 @@ -338,7 +338,7 @@ AU - + textLabel6 @@ -346,7 +346,7 @@ mag - + kcfg_ShowAsteroids @@ -360,7 +360,7 @@ If checked, asteroids will be drawn on the map - + kcfg_ShowAsteroidNames @@ -391,7 +391,7 @@ Set the maximum distance from the Sun for a comet to have a name label, in Astronomical Units (AU). 1 AU is the distance between the Earth and the Sun, approximately 150 million km - + kcfg_ShowCometNames @@ -435,7 +435,7 @@ - + groupBox4 @@ -446,7 +446,7 @@ unnamed - + kcfg_UseAutoTrail @@ -460,15 +460,15 @@ If checked then any solar system body will have a temporary trail attached while it is centered in the display. - + - layout12 + tqlayout12 unnamed - + kcfg_FadePlanetTrails @@ -492,7 +492,7 @@ Expanding - + 40 20 @@ -569,7 +569,7 @@ kcfg_FadePlanetTrails ClearAllTrails - + knuminput.h magnitudespinbox.h diff --git a/kstars/kstars/planetcatalog.cpp b/kstars/kstars/planetcatalog.cpp index ce4b9351..3367f35c 100644 --- a/kstars/kstars/planetcatalog.cpp +++ b/kstars/kstars/planetcatalog.cpp @@ -35,7 +35,7 @@ PlanetCatalog::PlanetCatalog(KStarsData *dat) : Earth(0), Sun(0), kd(dat) { PlanetCatalog::~PlanetCatalog() { // - // do NOT delete Sun. It is also in the QList + // do NOT delete Sun. It is also in the TQList // and will be deleted automatically. // delete Earth; diff --git a/kstars/kstars/planetcatalog.h b/kstars/kstars/planetcatalog.h index 99a7b65e..0680d0c1 100644 --- a/kstars/kstars/planetcatalog.h +++ b/kstars/kstars/planetcatalog.h @@ -48,6 +48,7 @@ class dms; class PlanetCatalog : public TQObject { Q_OBJECT + TQ_OBJECT public: /**Constructor. */ @@ -77,7 +78,7 @@ class PlanetCatalog : public TQObject { /**@return pointer to the Earth. (must not be const because we call findPosition on it in KSPlanetBase::updateCoords() )*/ KSPlanet *earth() { return Earth; } - /**Compute the present Horizontal coordinates of all planets. + /**Compute the presentQt::Horizontal coordinates of all planets. *@p LST pointer to the current local sidereal time *@p lat pointer to the current geographic latitude */ diff --git a/kstars/kstars/simclock.cpp b/kstars/kstars/simclock.cpp index 0e7c467a..74af0865 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 *parent, const KStarsDateTime &when) : +SimClock::SimClock(TQObject *tqparent, const KStarsDateTime &when) : DCOPObject("clock#" + TQCString().setNum(idgen++)), - TQObject(parent), + TQObject(tqparent), tmr(this) { if (! when.isValid() ) tmr.stop(); @@ -43,7 +43,7 @@ SimClock::SimClock(TQObject *parent, const KStarsDateTime &when) : SimClock::SimClock (const SimClock &old) : DCOPObject("clock#" + TQCString().setNum(idgen++)), - TQObject(old.parent()), + TQObject(old.tqparent()), SimClockInterface(), tmr(this) { @@ -163,7 +163,7 @@ void SimClock::setUTC(const KStarsDateTime &newtime) { } kdDebug() << i18n( "Setting clock: UTC: %1 JD: %2" ) - .arg( UTC.toString() ).arg( KGlobal::locale()->formatNumber( UTC.djd() ) ) << endl; + .tqarg( UTC.toString() ).tqarg( KGlobal::locale()->formatNumber( UTC.djd() ) ) << endl; emit timeChanged(); } else { kdDebug() << i18n( "Cannot set SimClock: Invalid Date/Time." ) << endl; @@ -172,7 +172,7 @@ void SimClock::setUTC(const KStarsDateTime &newtime) { void SimClock::setScale(float s) { if (Scale != s ) { - kdDebug() << i18n( "New clock scale: %1 sec" ).arg( s ) << endl; + kdDebug() << i18n( "New clock scale: %1 sec" ).tqarg( s ) << endl; Scale = s; if (tmr.isActive()) { julianmark = UTC.djd(); diff --git a/kstars/kstars/simclock.h b/kstars/kstars/simclock.h index d4375bdb..6bf9355c 100644 --- a/kstars/kstars/simclock.h +++ b/kstars/kstars/simclock.h @@ -32,14 +32,15 @@ class SimClock : public TQObject, public SimClockInterface { Q_OBJECT + TQ_OBJECT public: /** * Constructor - * @param parent parent object for the clock + * @param tqparent tqparent object for the clock * @param when the date/time to which the SimClock should be initialized in UTC */ - SimClock(TQObject *parent = 0, const KStarsDateTime &when = KStarsDateTime::currentDateTime() ); + SimClock(TQObject *tqparent = 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 13a5ab45..27f72614 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 *parent, const char *name ) - : TQWidget (parent,name), computeSkymap(true), angularDistanceMode(false), +SkyMap::SkyMap(KStarsData *d, TQWidget *tqparent, const char *name ) + : TQWidget (tqparent,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 ( parent ) ksw = (KStars*) parent->parent(); + if ( tqparent ) ksw = (KStars*) tqparent->tqparent(); else ksw = 0; pts = new TQPointArray( 2000 ); // points for milkyway and horizon @@ -72,9 +72,9 @@ SkyMap::SkyMap(KStarsData *d, TQWidget *parent, const char *name ) setBackgroundColor( TQColor( data->colorScheme()->colorNamed( "SkyColor" ) ) ); setBackgroundMode( TQWidget::NoBackground ); - setFocusPolicy( TQWidget::StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); setMinimumSize( 380, 250 ); - setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); setMouseTracking (true); //Generate MouseMove events! midMouseButtonDown = false; @@ -121,7 +121,7 @@ SkyMap::SkyMap(KStarsData *d, TQWidget *parent, const char *name ) connect( this, TQT_SIGNAL( destinationChanged() ), this, TQT_SLOT( slewFocus() ) ); //Initialize Refraction correction lookup table arrays. RefractCorr1 is for calculating - //the apparent altitude from the true altitude, and RefractCorr2 is for the reverse. + //the aptqparent 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. @@ -925,7 +925,7 @@ void SkyMap::slewFocus( void ) { fadeTransientLabel(); forceUpdate(); - kapp->processEvents(10); //keep up with other stuff + kapp->tqprocessEvents(10); //keep up with other stuff if ( Options::useAltAz() ) { dX = destination()->az()->Degrees() - focus()->az()->Degrees(); @@ -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 apparent altitude + if ( doRefract ) alt.setD( refract( &alt, false ).Degrees() ); //find true altitude from aptqparent 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 findApparent ) { +dms SkyMap::refract( const dms *alt, bool findAptqparent ) { 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 findApparent ) { return dms( alt->Degrees() ); } - if ( findApparent ) { + if ( findAptqparent ) { result.setD( alt->Degrees() + RefractCorr1[index] ); } else { result.setD( alt->Degrees() + RefractCorr2[index] ); @@ -1179,7 +1179,7 @@ void SkyMap::forceUpdate( bool now ) } computeSkymap = true; - if ( now ) repaint(); + if ( now ) tqrepaint(); else update(); } @@ -1195,7 +1195,7 @@ bool SkyMap::checkVisibility( SkyPoint *p, float FOV, double XMax ) { bool useAltAz = Options::useAltAz(); //Skip objects below the horizon if: - // + using Horizontal coords, + // + usingQt::Horizontal coords, // + the ground is drawn, // + and either of the following is true: // - focus is above the horizon @@ -1252,18 +1252,18 @@ void SkyMap::setZoomMouseCursor() p.drawLine( mx + 5, my + 5, mx + 11, my + 11 ); p.end(); -// create a mask to make parts of the pixmap invisible - TQBitmap mask (32, 32); - mask.fill (color0); // all is invisible +// create a tqmask to make parts of the pixmap invisible + TQBitmap tqmask (32, 32); + tqmask.fill (color0); // all is invisible - p.begin (&mask); + p.begin (&tqmask); // 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 (mask); // set the mask + cursorPix.setMask (tqmask); // set the tqmask 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 mask to make parts of the pixmap invisible - TQBitmap mask (32, 32); - mask.fill (color0); // all is invisible +// create a tqmask to make parts of the pixmap invisible + TQBitmap tqmask (32, 32); + tqmask.fill (color0); // all is invisible - p.begin (&mask); + p.begin (&tqmask); // 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 (mask); // set the mask + cursorPix.setMask (tqmask); // set the tqmask TQCursor cursor (cursorPix); setCursor (cursor); } @@ -1313,7 +1313,7 @@ void SkyMap::setMouseMoveCursor() { if (mouseButtonDown) { - setCursor (9); // cursor shape defined in qt + setCursor (9); // cursor tqshape defined in qt mouseMoveCursor = true; } } diff --git a/kstars/kstars/skymap.h b/kstars/kstars/skymap.h index b6badd3b..1a6acf0d 100644 --- a/kstars/kstars/skymap.h +++ b/kstars/kstars/skymap.h @@ -58,12 +58,13 @@ class DeepSkyObject; class SkyMap : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** *Constructor. Read stored settings from KConfig object (focus position, *zoom factor, sky color, etc.). Run initPopupMenus(). */ - SkyMap( KStarsData *d, TQWidget *parent=0, const char *name=0); + SkyMap( KStarsData *d, TQWidget *tqparent=0, const char *name=0); /** *Destructor (empty) @@ -163,7 +164,7 @@ public: *@note setDestination() emits the destinationChanged() SIGNAL, *which triggers the TQT_SLOT function SkyMap::slewFocus(). This *function iteratively steps the Focus point toward Destination, - *repainting the sky at each step (if Options::useAnimatedSlewing()==true). + *tqrepainting the sky at each step (if Options::useAnimatedSlewing()==true). *@param f a pointer to the SkyPoint the map should slew to */ void setDestination( SkyPoint *f ); @@ -368,7 +369,7 @@ public: */ bool isAngleMode() const {return angularDistanceMode;} -/**@short update the geometry of the angle ruler +/**@short update the tqgeometry of the angle ruler */ void updateAngleRuler(); @@ -388,7 +389,7 @@ public: /**@short Draw the current Sky map to a pixmap which is to be printed or exported to a file. * *Each of the draw functions is called, with a value for the Scale parameter computed to fit the - *geometry of the TQPaintDevice. + *tqgeometry of the TQPaintDevice. *@param pd pointer to the TQPaintDevice on which to draw. *@see KStars::slotExportImage() *@see KStars::slotPrint() @@ -406,7 +407,7 @@ public slots: */ virtual void setGeometry( const TQRect &r ); -/**Recalculates the positions of objects in the sky, and then repaints the sky map. +/**Recalculates the positions of objects in the sky, and then tqrepaints the sky map. *If the positions don't need to be recalculated, use update() instead of forceUpdate(). *This saves a lot of CPU time. *@param now if true, paintEvent() is run immediately. Otherwise, it is added to the event queue @@ -427,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 apparent altitude is needed; - *or the apparent altitude is known and the true altitude is needed. + *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. *@param alt The input altitude - *@param findApparent if TRUE, then alt is the true altitude, and we'll find the apparent alt. + *@param findAptqparent if TRUE, then alt is the true altitude, and we'll find the aptqparent alt. *@return the corrected altitude, as a dms object. */ - dms refract( const dms *alt, bool findApparent ); + dms refract( const dms *alt, bool findAptqparent ); /**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. @@ -554,7 +555,7 @@ protected: *@li +/- keys Zoom in and out *@li N/E/S/W keys Go to the cardinal points on the Horizon *@li Z Go to the Zenith - *@li Space Toggle between Horizontal and Equatorial coordinate systems + *@li Space Toggle betweenQt::Horizontal and Equatorial coordinate systems *@li 0-9 Go to a major Solar System body (0=Sun; 1-9 are the major planets, except 3=Moon) *@li [ Place starting point for measuring an angular distance *@li ] End point for Angular Distance; display measurement. @@ -622,7 +623,7 @@ private slots: */ void slotTransientLabel(); -/**Set the shape of mouse cursor to a cross with 4 arrows. */ +/**Set the tqshape of mouse cursor to a cross with 4 arrows. */ void setMouseMoveCursor(); private: @@ -776,7 +777,7 @@ private: void drawBoxes( TQPainter &p ); /**Draw symbols at the position of each Telescope currently being controlled by KStars. - *@note The shape of the Telescope symbol is currently a hard-coded bullseye. + *@note The tqshape of the Telescope symbol is currently a hard-coded bullseye. *@note there is no scale factor because this is only used for drawing onto the screen, not printing. *@param psky reference to the TQPainter on which to draw (this should be the Sky pixmap). */ @@ -824,7 +825,7 @@ private: *screen pixel coordinate offsets from the center of the Sky pixmap. *@param dx horizontal pixel offset from center of SkyMap. *@param dy vertical pixel offset from center of SkyMap. - *@param Horiz if TRUE, the SkyMap is displayed using the Horizontal coordinate system + *@param Horiz if TRUE, the SkyMap is displayed using theQt::Horizontal coordinate system *@param LSTh pointer to the local sidereal time, as a dms object. *@param lat pointer to the current geographic laitude, as a dms object *@param doRefraction if TRUE, correct for atmospheric refraction @@ -853,7 +854,7 @@ private: *exclude a large number of objects. * *Next, it determines if one of the poles of the current Coordinate System - *(Equatorial or Horizontal) is currently inside the sky map window. This is + *(Equatorial orQt::Horizontal) is currently inside the sky map window. This is *stored in the member variable 'bool SkyMap::isPoleVisible, and is set by the *function SkyMap::setMapGeometry(), which is called by SkyMap::paintEvent(). *If a Pole is visible, then it will return TRUE immediately. The idea is that @@ -900,11 +901,11 @@ private: */ double findPA( SkyObject *o, int x, int y, double scale=1.0 ); -/**@short Sets the shape of the default mouse cursor to a cross. +/**@short Sets the tqshape of the default mouse cursor to a cross. */ void setDefaultMouseCursor(); -/**@short Sets the shape of the mouse cursor to a magnifying glass. +/**@short Sets the tqshape of the mouse cursor to a magnifying glass. */ void setZoomMouseCursor(); @@ -919,7 +920,7 @@ private: bool mouseButtonDown, midMouseButtonDown; bool mouseMoveCursor; // true if mouseMoveEvent; needed by setMouseMoveCursor bool slewing, clockSlewing; - bool computeSkymap; //if false only old pixmap will repainted with bitBlt(), this saves a lot of cpu usage + bool computeSkymap; //if false only old pixmap will tqrepainted with bitBlt(), this saves a lot of cpu usage bool angularDistanceMode; int idSolInfo, idMessHST, idMoonInfo, idMoonImages, idMessInfo, idNGCHST; int scrollCount; diff --git a/kstars/kstars/skymapdraw.cpp b/kstars/kstars/skymapdraw.cpp index 8b15c57a..81c575b4 100644 --- a/kstars/kstars/skymapdraw.cpp +++ b/kstars/kstars/skymapdraw.cpp @@ -166,11 +166,11 @@ void SkyMap::drawTelescopeSymbols(TQPainter &psky) { if (portConnect->state == PS_BUSY) return; - eqNum = devMenu->mgr.at(i)->indi_dev.at(j)->findProp("EQUATORIAL_EOD_COORD"); + eqNum = devMenu->mgr.at(i)->indi_dev.at(j)->findProp("ETQUATORIAL_EOD_COORD"); if (eqNum == NULL) { - eqNum = devMenu->mgr.at(i)->indi_dev.at(j)->findProp("EQUATORIAL_COORD"); + eqNum = devMenu->mgr.at(i)->indi_dev.at(j)->findProp("ETQUATORIAL_COORD"); if (eqNum == NULL) { eqNum = devMenu->mgr.at(i)->indi_dev.at(j)->findProp("HORIZONTAL_COORD"); @@ -232,7 +232,7 @@ void SkyMap::drawTelescopeSymbols(TQPainter &psky) { { indi_sp.setRA0(raDMS); indi_sp.setDec0(decDMS); - indi_sp.apparentCoord( (double) J2000, ksw->data()->ut().djd()); + indi_sp.aptqparentCoord( (double) J2000, ksw->data()->ut().djd()); } if ( Options::useAltAz() ) indi_sp.EquatorialToHorizontal( ksw->LST(), ksw->geo()->lat() ); @@ -299,7 +299,7 @@ void SkyMap::drawMilkyWay( TQPainter& psky, double scale ) } if ( ptsCount && partVisible ) { - psky.drawPolygon( ( const TQPointArray ) *pts, false, 0, ptsCount ); + psky.tqdrawPolygon( ( const TQPointArray ) *pts, false, 0, ptsCount ); } } else { TQPoint o = getXY( data->MilkyWay[j].at(0), Options::useAltAz(), Options::useRefraction(), scale ); @@ -871,7 +871,7 @@ void SkyMap::drawHorizon( TQPainter& psky, double scale ) double dx = 0.5*double(Width)/Options::zoomFactor(); double r0 = 2.0*sin(0.25*dms::PI); -// //Second QPointsArray for blocking the region outside the sky circle +// //Second TQPointsArray for blocking the region outside the sky circle // TQPointArray bpts( 100 ); //need 90 points along sky circle, plus 4 to complete polygon // uint bpCount(0); @@ -905,7 +905,7 @@ void SkyMap::drawHorizon( TQPainter& psky, double scale ) } //Draw the Horizon polygon - psky.drawPolygon( ( const TQPointArray ) *pts, false, 0, ptsCount ); + psky.tqdrawPolygon( ( const TQPointArray ) *pts, false, 0, ptsCount ); //remove all items in points list for ( register unsigned int i=0; i= -1000 && o.x() <= Width+1000 && o.y() >=-1000 && o.y() <= Height+1000 ) ) { //Want to disable line-drawing if this point and the last are both outside bounds of display. - if ( ! rect().contains( o ) && ! rect().contains( cur ) ) doDrawLine = false; + if ( ! TQT_TQRECT_OBJECT(rect()).tqcontains( o ) && ! TQT_TQRECT_OBJECT(rect()).tqcontains( cur ) ) doDrawLine = false; cur = o; if ( doDrawLine ) { @@ -1859,7 +1859,7 @@ void SkyMap::exportSkyImage( const TQPaintDevice *pd ) { bool drawCBounds( Options::showCBounds() ); bool drawGrid( Options::showGrid() ); - p.begin( pd ); + p.tqbegin( const_cast(pd) ); TQPaintDeviceMetrics pdm( p.device() ); //scale image such that it fills 90% of the x or y dimension on the paint device @@ -1876,7 +1876,7 @@ void SkyMap::exportSkyImage( const TQPaintDevice *pd ) { p.setClipping( true ); //Fill background with sky color - p.fillRect( x1, y1, pdWidth, pdHeight, TQBrush( data->colorScheme()->colorNamed( "SkyColor" ) ) ); + p.fillRect( x1, y1, pdWidth, pdHeight, TQBrush( TQColor(data->colorScheme()->colorNamed( "SkyColor" ) )) ); if ( x1 || y1 ) p.translate( x1, y1 ); diff --git a/kstars/kstars/skymapevents.cpp b/kstars/kstars/skymapevents.cpp index 26b04a5f..60e90a14 100644 --- a/kstars/kstars/skymapevents.cpp +++ b/kstars/kstars/skymapevents.cpp @@ -453,7 +453,7 @@ void SkyMap::mouseMoveEvent( TQMouseEvent *e ) { if ( ZoomRect.center().x() > 0 && ZoomRect.center().y() > 0 ) { //cancel operation if the user let go of CTRL if ( !( e->state() & ControlButton ) ) { - ZoomRect = TQRect(); //invalidate ZoomRect + ZoomRect = TQRect(); //tqinvalidate ZoomRect update(); } else { //Resize the rectangle so that it passes through the cursor position @@ -600,7 +600,7 @@ void SkyMap::mouseReleaseEvent( TQMouseEvent * ) { ksw->zoom( Options::zoomFactor() * factor ); setDefaultMouseCursor(); - ZoomRect = TQRect(); //invalidate ZoomRect + ZoomRect = TQRect(); //tqinvalidate ZoomRect forceUpdate(); } else { setDefaultMouseCursor(); @@ -629,12 +629,12 @@ void SkyMap::mouseReleaseEvent( TQMouseEvent * ) { void SkyMap::mousePressEvent( TQMouseEvent *e ) { //did we Grab an infoBox? - if ( e->button() == LeftButton && infoBoxes()->grabBox( e ) ) { + if ( e->button() == Qt::LeftButton && infoBoxes()->grabBox( e ) ) { update(); //refresh without redrawing skymap return; } - if ( (e->state() & ControlButton) && (e->button() == LeftButton) ) { + if ( (e->state() & ControlButton) && (e->button() == Qt::LeftButton) ) { ZoomRect.moveCenter( e->pos() ); setZoomMouseCursor(); update(); //refresh without redrawing skymap @@ -649,13 +649,13 @@ void SkyMap::mousePressEvent( TQMouseEvent *e ) { double dy = ( 0.5*height() - e->y() )/Options::zoomFactor(); if (unusablePoint (dx, dy)) return; // break if point is unusable - if ( !midMouseButtonDown && e->button() == MidButton ) { + if ( !midMouseButtonDown && e->button() == Qt::MidButton ) { y0 = 0.5*height() - e->y(); //record y pixel coordinate for middle-button zooming midMouseButtonDown = true; } if ( !mouseButtonDown ) { - if ( e->button()==LeftButton ) { + if ( e->button()==Qt::LeftButton ) { mouseButtonDown = true; scrollCount = 0; } @@ -671,11 +671,11 @@ void SkyMap::mousePressEvent( TQMouseEvent *e ) { if ( clickedObject() ) { setClickedPoint( clickedObject() ); - if ( e->button() == RightButton ) { + if ( e->button() == Qt::RightButton ) { clickedObject()->showPopupMenu( pmenu, TQCursor::pos() ); } - if ( ksw && e->button() == LeftButton ) { + if ( ksw && e->button() == Qt::LeftButton ) { ksw->statusBar()->changeItem( clickedObject()->translatedLongName(), 0 ); } } else { @@ -684,10 +684,10 @@ void SkyMap::mousePressEvent( TQMouseEvent *e ) { setClickedObject( NULL ); switch (e->button()) { - case LeftButton: + case Qt::LeftButton: if ( ksw ) ksw->statusBar()->changeItem( i18n( "Empty sky" ), 0 ); break; - case RightButton: + case Qt::RightButton: { SkyObject *nullObj = new SkyObject( SkyObject::TYPE_UNKNOWN, clickedPoint()->ra()->Hours(), clickedPoint()->dec()->Degrees() ); pmenu->createEmptyMenu( nullObj ); @@ -706,7 +706,7 @@ void SkyMap::mousePressEvent( TQMouseEvent *e ) { void SkyMap::mouseDoubleClickEvent( TQMouseEvent *e ) { //Was the event inside an infoBox? If so, shade the box. - if ( e->button() == LeftButton ) { + if ( e->button() == Qt::LeftButton ) { if ( infoBoxes()->shadeBox( e ) ) { update(); return; @@ -733,7 +733,7 @@ void SkyMap::paintEvent( TQPaintEvent * ) *sky2 = *sky; drawOverlays( sky2 ); bitBlt( this, 0, 0, sky2 ); - return ; // exit because the pixmap is repainted and that's all what we want + return ; // exit because the pixmap is tqrepainted and that's all what we want } TQPainter psky; @@ -754,7 +754,7 @@ void SkyMap::paintEvent( TQPaintEvent * ) bool drawGrid( Options::showGrid() && !(checkSlewing && Options::hideGrid() ) ); psky.begin( sky ); - psky.fillRect( 0, 0, width(), height(), TQBrush( data->colorScheme()->colorNamed( "SkyColor" ) ) ); + psky.fillRect( 0, 0, width(), height(), TQBrush( TQColor(data->colorScheme()->colorNamed( "SkyColor" ) )) ); if ( drawMW ) drawMilkyWay( psky ); if ( drawGrid ) drawCoordinateGrid( psky ); diff --git a/kstars/kstars/skyobject.cpp b/kstars/kstars/skyobject.cpp index 5ea5036d..18decc7c 100644 --- a/kstars/kstars/skyobject.cpp +++ b/kstars/kstars/skyobject.cpp @@ -205,7 +205,7 @@ TQTime SkyObject::transitTimeUT( const KStarsDateTime &dt, const GeoLocation *ge //dt0 is the first guess at the transit time. KStarsDateTime dt0 = dt.addSecs( dSec ); - //recompute object's position at UT0 and then find + //recompute object's position at UT0 and then tqfind //transit time of this refined position SkyPoint sp = recomputeCoords( dt0, geo ); const dms *ram = sp.ra0(); @@ -342,32 +342,32 @@ TQString SkyObject::messageFromTitle( const TQString &imageTitle ) { TQString message = imageTitle; //HST Image - if ( imageTitle == i18n( "Show HST Image" ) || imageTitle.contains("HST") ) { - message = i18n( "%1: Hubble Space Telescope, operated by STScI for NASA [public domain]" ).arg( longname() ); + if ( imageTitle == i18n( "Show HST Image" ) || imageTitle.tqcontains("HST") ) { + message = i18n( "%1: Hubble Space Telescope, operated by STScI for NASA [public domain]" ).tqarg( longname() ); //Spitzer Image - } else if ( imageTitle.contains( i18n( "Show Spitzer Image" ) ) ) { - message = i18n( "%1: Spitzer Space Telescope, courtesy NASA/JPL-Caltech [public domain]" ).arg( longname() ); + } else if ( imageTitle.tqcontains( i18n( "Show Spitzer Image" ) ) ) { + message = i18n( "%1: Spitzer Space Telescope, courtesy NASA/JPL-Caltech [public domain]" ).tqarg( longname() ); //SEDS Image } else if ( imageTitle == i18n( "Show SEDS Image" ) ) { - message = i18n( "%1: SEDS, http://www.seds.org [free for non-commercial use]" ).arg( longname() ); + message = i18n( "%1: SEDS, http://www.seds.org [free for non-commercial use]" ).tqarg( longname() ); //Kitt Peak AOP Image } else if ( imageTitle == i18n( "Show KPNO AOP Image" ) ) { - message = i18n( "%1: Advanced Observing Program at Kitt Peak National Observatory [free for non-commercial use; no physical reproductions]" ).arg( longname() ); + message = i18n( "%1: Advanced Observing Program at Kitt Peak National Observatory [free for non-commercial use; no physical reproductions]" ).tqarg( longname() ); //NOAO Image - } else if ( imageTitle.contains( i18n( "Show NOAO Image" ) ) ) { - message = i18n( "%1: National Optical Astronomy Observatories and AURA [free for non-commercial use]" ).arg( longname() ); + } else if ( imageTitle.tqcontains( i18n( "Show NOAO Image" ) ) ) { + message = i18n( "%1: National Optical Astronomy Observatories and AURA [free for non-commercial use]" ).tqarg( longname() ); //VLT Image - } else if ( imageTitle.contains( "VLT" ) ) { - message = i18n( "%1: Very Large Telescope, operated by the European Southern Observatory [free for non-commercial use; no reproductions]" ).arg( longname() ); + } else if ( imageTitle.tqcontains( "VLT" ) ) { + message = i18n( "%1: Very Large Telescope, operated by the European Southern Observatory [free for non-commercial use; no reproductions]" ).tqarg( longname() ); //All others } else if ( imageTitle.startsWith( i18n( "Show" ) ) ) { - message = imageTitle.mid( imageTitle.find( " " ) + 1 ); //eat first word, "Show" + message = imageTitle.mid( imageTitle.tqfind( " " ) + 1 ); //eat first word, "Show" message = longname() + ": " + message; } @@ -383,7 +383,7 @@ void SkyObject::saveUserLog( const TQString &newLog ) { //Do nothing if new log is the "default" message //(keep going if new log is empty; we'll want to delete its current entry) - if ( newLog == (i18n("Record here observation logs and/or data on %1.").arg(name())) || newLog.isEmpty() ) + if ( newLog == (i18n("Record here observation logs and/or data on %1.").tqarg(name())) || newLog.isEmpty() ) return; // header label @@ -408,9 +408,9 @@ void SkyObject::saveUserLog( const TQString &newLog ) { int startIndex, endIndex; TQString sub; - startIndex = logs.find(KSLabel); + startIndex = logs.tqfind(KSLabel); sub = logs.mid (startIndex); - endIndex = sub.find("[KSLogEnd]"); + endIndex = sub.tqfind("[KSLogEnd]"); logs.remove(startIndex, endIndex + 11); } diff --git a/kstars/kstars/skyobject.h b/kstars/kstars/skyobject.h index 442c8c43..2ad09ab6 100644 --- a/kstars/kstars/skyobject.h +++ b/kstars/kstars/skyobject.h @@ -29,7 +29,7 @@ /**@class SkyObject *Provides all necessary information about an object in the sky: - *its coordinates, name(s), type, magnitude, and QStringLists of + *its coordinates, name(s), type, magnitude, and TQStringLists of *URLs for images and webpages regarding the object. *@short Information about an object in the sky. *@author Jason Harris diff --git a/kstars/kstars/skyobjectname.cpp b/kstars/kstars/skyobjectname.cpp index 696803b5..c4ba6937 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 *parent, SkyObjectName *obj ) - : TQListBoxText ( parent ), object ( obj ) +SkyObjectNameListItem::SkyObjectNameListItem ( TQListBox *tqparent, SkyObjectName *obj ) + : TQListBoxText ( tqparent ), object ( obj ) { setText( obj->text() ); } diff --git a/kstars/kstars/skyobjectname.h b/kstars/kstars/skyobjectname.h index 580671c7..7e3ca979 100644 --- a/kstars/kstars/skyobjectname.h +++ b/kstars/kstars/skyobjectname.h @@ -37,7 +37,7 @@ class SkyObjectName { public: /**Constructor*/ - SkyObjectName (const TQString &str = TQString::null, SkyObject *obj = 0); + SkyObjectName (const TQString &str = TQString(), SkyObject *obj = 0); /**Destructor (empty)*/ ~SkyObjectName() {} @@ -79,7 +79,7 @@ class SkyObjectNameListItem : public TQListBoxText { public: /**Constructor */ - SkyObjectNameListItem (TQListBox *parent, SkyObjectName *name ); + SkyObjectNameListItem (TQListBox *tqparent, SkyObjectName *name ); /**Destructor (empty)*/ ~SkyObjectNameListItem() {} diff --git a/kstars/kstars/skypoint.cpp b/kstars/kstars/skypoint.cpp index c5ea55a8..2272d978 100644 --- a/kstars/kstars/skypoint.cpp +++ b/kstars/kstars/skypoint.cpp @@ -329,7 +329,7 @@ void SkyPoint::precessFromAnyEpoch(long double jd0, long double jdf){ } /** No descriptions */ -void SkyPoint::apparentCoord(long double jd0, long double jdf){ +void SkyPoint::aptqparentCoord(long double jd0, long double jdf){ precessFromAnyEpoch(jd0,jdf); @@ -589,7 +589,7 @@ TQString SkyPoint::constellation( TQPtrList &csegmentList, TQPtrListtoHMSString()).arg(dec()->toDMSString()) << endl; + kdWarning() << "A: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl; return i18n("Unknown"); } @@ -630,7 +630,7 @@ TQString SkyPoint::constellation( TQPtrList &csegmentList, TQPtrListtoHMSString()).arg(dec()->toDMSString()) << endl; + kdWarning() << "B: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl; return i18n("Unknown"); } @@ -643,7 +643,7 @@ TQString SkyPoint::constellation( TQPtrList &csegmentList, TQPtrListtoHMSString()).arg(dec()->toDMSString()) << endl; + kdWarning() << "C: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl; return i18n("Unknown"); } @@ -663,7 +663,7 @@ TQString SkyPoint::constellation( TQPtrList &csegmentList, TQPtrListtoHMSString()).arg(dec()->toDMSString()) << endl; + kdWarning() << "D: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl; return i18n("Unknown"); } @@ -676,7 +676,7 @@ TQString SkyPoint::constellation( TQPtrList &csegmentList, TQPtrListtoHMSString()).arg(dec()->toDMSString()) << endl; + kdWarning() << "E: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl; return i18n("Unknown"); } } @@ -713,7 +713,7 @@ TQString SkyPoint::constellation( TQPtrList &csegmentList, TQPtrListtoHMSString()).arg(dec()->toDMSString()) << endl; + kdWarning() << "F: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl; return i18n("Unknown"); } } else { //pdc > 0.0, so search down @@ -732,7 +732,7 @@ TQString SkyPoint::constellation( TQPtrList &csegmentList, TQPtrListtoHMSString()).arg(dec()->toDMSString()) << endl; + kdWarning() << "G: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl; return i18n("Unknown"); } @@ -745,7 +745,7 @@ TQString SkyPoint::constellation( TQPtrList &csegmentList, TQPtrListtoHMSString()).arg(dec()->toDMSString()) << endl; + kdWarning() << "H: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl; return i18n("Unknown"); } } @@ -761,7 +761,7 @@ TQString SkyPoint::constellation( TQPtrList &csegmentList, TQPtrListtoHMSString()).arg(dec()->toDMSString()) << endl; + kdWarning() << "I: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl; return i18n("Unknown"); } @@ -770,7 +770,7 @@ TQString SkyPoint::constellation( TQPtrList &csegmentList, TQPtrListname2().lower() ) { TQString r = i18n( "Constellation name (optional)", o->name().local8Bit().data() ); r = r.left(1) + r.mid(1).lower(); //lowercase letters (except first letter) - int i = r.find(" "); + int i = r.tqfind(" "); i++; if ( i>0 ) r = r.left(i) + r.mid(i,1).upper() + r.mid(i+1); //capitalize 2nd word return r; diff --git a/kstars/kstars/skypoint.h b/kstars/kstars/skypoint.h index 11ad9b26..44fa551f 100644 --- a/kstars/kstars/skypoint.h +++ b/kstars/kstars/skypoint.h @@ -29,7 +29,7 @@ * *The sky coordinates of a point in the sky. The *coordinates are stored in both Equatorial (Right Ascension, - *Declination) and Horizontal (Azimuth, Altitude) coordinate systems. + *Declination) andQt::Horizontal (Azimuth, Altitude) coordinate systems. *Provides set/get functions for each coordinate angle, and functions *to convert between the Equatorial and Horizon coordinate systems. * @@ -292,14 +292,14 @@ public: */ virtual void updateCoords( KSNumbers *num, bool includePlanets=true, const dms *lat=0, const dms *LST=0 ); -/**Computes the apparent coordinates for this SkyPoint for any epoch, +/**Computes the aptqparent 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. *@param jd0 Julian Day which identifies the original epoch *@param jdf Julian Day which identifies the final epoch */ - void apparentCoord(long double jd0, long double jdf); + void aptqparentCoord(long double jd0, long double jdf); /**Determine the effects of nutation for this SkyPoint. *@param num pointer to KSNumbers object containing current values of diff --git a/kstars/kstars/stardatasink.cpp b/kstars/kstars/stardatasink.cpp index e77b3820..e0f9f09f 100644 --- a/kstars/kstars/stardatasink.cpp +++ b/kstars/kstars/stardatasink.cpp @@ -20,8 +20,8 @@ #include "dms.h" #include "kstarsdata.h" -StarDataSink::StarDataSink(KStarsData *parent, const char *name) : TQObject(parent, name) { - ksData = parent; +StarDataSink::StarDataSink(KStarsData *tqparent, const char *name) : TQObject(tqparent, name) { + ksData = tqparent; receivedBlocks = 0; nameListCount = ksData->ObjNames.count(); } diff --git a/kstars/kstars/stardatasink.h b/kstars/kstars/stardatasink.h index 81b55d5e..57bda9e5 100644 --- a/kstars/kstars/stardatasink.h +++ b/kstars/kstars/stardatasink.h @@ -21,7 +21,7 @@ /**@class StarDataSink *StarDataSink receives data from an FileSource object and appends these data - *to a QList of star data. It's an asynchronous io class. + *to a TQList of star data. It's an asynchronous io class. *@author Thomas Kabelmann *@version 1.0 */ @@ -38,10 +38,11 @@ class StarDataSink : public TQObject, public TQDataSink { *class needs signals */ Q_OBJECT + TQ_OBJECT public: /** constructor */ - StarDataSink( KStarsData *parent, const char *name=0 ); + StarDataSink( KStarsData *tqparent, const char *name=0 ); /** destructor */ ~StarDataSink(); diff --git a/kstars/kstars/starobject.cpp b/kstars/kstars/starobject.cpp index 8e46b0db..12fb5652 100644 --- a/kstars/kstars/starobject.cpp +++ b/kstars/kstars/starobject.cpp @@ -112,7 +112,7 @@ TQString StarObject::greekLetter( bool gchar ) const { if ( code == "omi" ) gchar ? letter = TQString( TQChar(alpha +14) ) : letter = i18n("omicron"); if ( code == "pi " ) gchar ? letter = TQString( TQChar(alpha +15) ) : letter = i18n("pi"); if ( code == "rho" ) gchar ? letter = TQString( TQChar(alpha +16) ) : letter = i18n("rho"); - //there are two unicode symbols for sigma; + //there are two tqunicode symbols for sigma; //skip the first one, the second is more widely used if ( code == "sig" ) gchar ? letter = TQString( TQChar(alpha +18) ) : letter = i18n("sigma"); if ( code == "tau" ) gchar ? letter = TQString( TQChar(alpha +19) ) : letter = i18n("tau"); diff --git a/kstars/kstars/starobject.h b/kstars/kstars/starobject.h index d92fae87..db19b48c 100644 --- a/kstars/kstars/starobject.h +++ b/kstars/kstars/starobject.h @@ -206,7 +206,7 @@ class StarObject : public SkyObject { /**Show star object popup menu. Overloaded from virtual *SkyObject::showPopupMenu() *@param pmenu pointer to the KSPopupMenu object - *@param pos QPojnt holding the x,y coordinates for the menu + *@param pos TQPojnt holding the x,y coordinates for the menu */ virtual void showPopupMenu( KSPopupMenu *pmenu, TQPoint pos ) { pmenu->createStarMenu( this ); pmenu->popup( pos ); } diff --git a/kstars/kstars/starpixmap.cpp b/kstars/kstars/starpixmap.cpp index 59e21fe5..fe04bc1d 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 mask (STARSIZE, STARSIZE); + TQBitmap tqmask (STARSIZE, STARSIZE); TQImage image; TQPainter p; TQMemArray starColor; @@ -87,11 +87,11 @@ void StarPixmap::loadPixmaps (int newColorMode, int newColorIntensity) { // background of the star if ( colorMode==1 ) // night colors (fill red, no temperature colors) - pix.fill (Qt::red); + pix.fill (TQt::red); else if ( colorMode==2 ) //star chart colors (fill black, no temperature colors) - pix.fill (Qt::black); + pix.fill (TQt::black); else - pix.fill (Qt::white); // default (white) + pix.fill (TQt::white); // default (white) for (int color = 0; color < 10; color ++) { int ic = color; @@ -104,11 +104,11 @@ void StarPixmap::loadPixmaps (int newColorMode, int newColorIntensity) { p.end(); } - mask.fill (Qt::color0); + tqmask.fill (TQt::color0); - p.begin (&mask); - p.setPen (TQPen ( Qt::color1, 1)); - p.setBrush( TQBrush( Qt::color1 ) ); + p.begin (&tqmask); + p.setPen (TQPen ( TQt::color1, 1)); + p.setBrush( TQBrush( TQt::color1 ) ); p.drawEllipse(0, 0, STARSIZE, STARSIZE); p.end(); @@ -117,7 +117,7 @@ void StarPixmap::loadPixmaps (int newColorMode, int newColorIntensity) { TQImage tmp = pix.convertToImage(); pix.convertFromImage( KImageEffect::blur( tmp, 100.0 ) ); - pix.setMask (mask); // set the mask + pix.setMask (tqmask); // set the tqmask image = pix.convertToImage(); // create the image for smoothScale() for (int i = 0; i < 26; i++) diff --git a/kstars/kstars/statform.ui b/kstars/kstars/statform.ui index 8287a805..23605ac5 100644 --- a/kstars/kstars/statform.ui +++ b/kstars/kstars/statform.ui @@ -1,10 +1,10 @@ statForm - + statForm - + 0 0 @@ -19,7 +19,7 @@ unnamed - + stdDevLabel @@ -35,7 +35,7 @@ true - + maxLabel @@ -51,7 +51,7 @@ true - + atMinLabel @@ -59,7 +59,7 @@ @ - + bitPixLabel @@ -75,7 +75,7 @@ true - + heightLabel @@ -91,7 +91,7 @@ true - + meanLabel @@ -107,7 +107,7 @@ true - + atMaxLabel @@ -115,7 +115,7 @@ @ - + widthLabel @@ -147,7 +147,7 @@ true - + minLabel @@ -176,5 +176,5 @@ meanOUT stddevOUT - + diff --git a/kstars/kstars/streamformui.ui b/kstars/kstars/streamformui.ui index 90d4c1b8..3c4fbcc0 100644 --- a/kstars/kstars/streamformui.ui +++ b/kstars/kstars/streamformui.ui @@ -1,10 +1,10 @@ streamForm - + streamForm - + 0 0 @@ -19,9 +19,9 @@ unnamed - + - layout2 + tqlayout2 @@ -31,13 +31,13 @@ playB - + 32 32 - + 32 32 @@ -57,13 +57,13 @@ captureB - + 32 32 - + 32 32 @@ -97,7 +97,7 @@ Expanding - + 300 21 @@ -106,7 +106,7 @@ - + videoFrame @@ -119,7 +119,7 @@ - + kpushbutton.h kpushbutton.h diff --git a/kstars/kstars/streamwg.cpp b/kstars/kstars/streamwg.cpp index 80998c07..36e991c5 100644 --- a/kstars/kstars/streamwg.cpp +++ b/kstars/kstars/streamwg.cpp @@ -40,7 +40,7 @@ FILE *wfp; - StreamWG::StreamWG(INDIStdDevice *inStdDev, TQWidget * parent, const char * name) : streamForm(parent, name) + StreamWG::StreamWG(INDIStdDevice *inStdDev, TQWidget * tqparent, const char * name) : streamForm(tqparent, name) { stdDev = inStdDev; @@ -90,7 +90,7 @@ void StreamWG::setColorFrame(bool color) TQString errMsg; struct sockaddr_in pin; struct hostent *serverHostName = gethostbyname(host.ascii()); - errMsg = TQString("Connection to INDI host at %1 on port %2 failed.").arg(host).arg(port); + errMsg = TQString("Connection to INDI host at %1 on port %2 failed.").tqarg(host).tqarg(port); memset(&pin, 0, sizeof(pin)); pin.sin_family = AF_INET; @@ -138,14 +138,14 @@ void StreamWG::setSize(int wd, int ht) streamFrame->totalBaseCount = wd * ht; - resize(wd + layout()->margin() * 2 , ht + playB->height() + layout()->margin() * 2 + layout()->spacing()); + resize(wd + tqlayout()->margin() * 2 , ht + playB->height() + tqlayout()->margin() * 2 + tqlayout()->spacing()); streamFrame->resize(wd, ht); } void StreamWG::resizeEvent(TQResizeEvent *ev) { - streamFrame->resize(ev->size().width() - layout()->margin() * 2, ev->size().height() - playB->height() - layout()->margin() * 2 - layout()->spacing()); + streamFrame->resize(ev->size().width() - tqlayout()->margin() * 2, ev->size().height() - playB->height() - tqlayout()->margin() * 2 - tqlayout()->spacing()); } /* @@ -254,26 +254,26 @@ void StreamWG::captureImage() if ( ! KIO::NetAccess::upload( tmpfile.name(), currentFileURL, (TQWidget*) 0 ) ) { - TQString message = i18n( "Could not upload image to remote location: %1" ).arg( currentFileURL.prettyURL() ); + TQString message = i18n( "Could not upload image to remote location: %1" ).tqarg( currentFileURL.prettyURL() ); KMessageBox::sorry( 0, message, i18n( "Could not upload file" ) ); } } } else { - TQString message = i18n( "Invalid URL: %1" ).arg( currentFileURL.url() ); + TQString message = i18n( "Invalid URL: %1" ).tqarg( currentFileURL.url() ); KMessageBox::sorry( 0, message, i18n( "Invalid URL" ) ); } } -VideoWG::VideoWG(TQWidget * parent, const char * name) : TQFrame(parent, name, Qt::WNoAutoErase) +VideoWG::VideoWG(TQWidget * tqparent, const char * name) : TQFrame(tqparent, name, TQt::WNoAutoErase) { streamImage = NULL; - grayTable=new QRgb[256]; + grayTable=new TQRgb[256]; for (int i=0;i<256;i++) - grayTable[i]=qRgb(i,i,i); + grayTable[i]=tqRgb(i,i,i); } VideoWG::~VideoWG() diff --git a/kstars/kstars/streamwg.h b/kstars/kstars/streamwg.h index 754853e5..a4aeb907 100644 --- a/kstars/kstars/streamwg.h +++ b/kstars/kstars/streamwg.h @@ -29,9 +29,10 @@ class StreamWG : public streamForm { Q_OBJECT + TQ_OBJECT public: - StreamWG(INDIStdDevice *inStdDev, TQWidget * parent =0, const char * name =0); + StreamWG(INDIStdDevice *inStdDev, TQWidget * tqparent =0, const char * name =0); ~StreamWG(); friend class VideoWG; @@ -63,12 +64,13 @@ }; - class VideoWG : public QFrame + class VideoWG : public TQFrame { Q_OBJECT + TQ_OBJECT public: - VideoWG(TQWidget * parent =0, const char * name =0); + VideoWG(TQWidget * tqparent =0, const char * name =0); ~VideoWG(); friend class StreamWG; @@ -77,9 +79,9 @@ private: int totalBaseCount; - QRgb *grayTable; - QImage *streamImage; - QPixmap qPix; + TQRgb *grayTable; + TQImage *streamImage; + TQPixmap qPix; KPixmapIO kPixIO; protected: diff --git a/kstars/kstars/telescopeprop.cpp b/kstars/kstars/telescopeprop.cpp index b2f17009..b391d213 100644 --- a/kstars/kstars/telescopeprop.cpp +++ b/kstars/kstars/telescopeprop.cpp @@ -29,11 +29,11 @@ #include "indimenu.h" #include "indidriver.h" -telescopeProp::telescopeProp(TQWidget* parent, const char* name, bool modal, WFlags fl) -: scopeProp(parent,name, modal,fl) +telescopeProp::telescopeProp(TQWidget* tqparent, const char* name, bool modal, WFlags fl) +: scopeProp(tqparent,name, modal,fl) { - ksw = (KStars *) parent; + ksw = (KStars *) tqparent; ksw->establishINDI(); indi_driver = ksw->getINDIDriver(); @@ -213,10 +213,10 @@ void telescopeProp::updateScopeDetails(int index) versionEdit->setText(indi_driver->devices[finalIndex]->version); if (indi_driver->devices[finalIndex]->focal_length != -1) - focalEdit->setText(TQString("%1").arg(indi_driver->devices[finalIndex]->focal_length)); + focalEdit->setText(TQString("%1").tqarg(indi_driver->devices[finalIndex]->focal_length)); if (indi_driver->devices[finalIndex]->aperture != -1) - apertureEdit->setText(TQString("%1").arg(indi_driver->devices[finalIndex]->aperture)); + apertureEdit->setText(TQString("%1").tqarg(indi_driver->devices[finalIndex]->aperture)); } @@ -228,7 +228,7 @@ void telescopeProp::removeScope() index = telescopeListBox->currentItem(); finalIndex = findDeviceIndex(index); - if (KMessageBox::warningContinueCancel( 0, i18n("Are you sure you want to remove %1?").arg(indi_driver->devices[finalIndex]->label), i18n("Delete Confirmation"),KStdGuiItem::del())!=KMessageBox::Continue) + if (KMessageBox::warningContinueCancel( 0, i18n("Are you sure you want to remove %1?").tqarg(indi_driver->devices[finalIndex]->label), i18n("Delete Confirmation"),KStdGuiItem::del())!=KMessageBox::Continue) return; telescopeListBox->removeItem(index); diff --git a/kstars/kstars/telescopeprop.h b/kstars/kstars/telescopeprop.h index 3c036bdc..3bd3de66 100644 --- a/kstars/kstars/telescopeprop.h +++ b/kstars/kstars/telescopeprop.h @@ -26,9 +26,10 @@ class INDIDriver; class telescopeProp : public scopeProp { Q_OBJECT + TQ_OBJECT public: - telescopeProp(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + telescopeProp(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~telescopeProp(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/kstars/kstars/telescopepropui.ui b/kstars/kstars/telescopepropui.ui index cea9e20d..7212fffd 100644 --- a/kstars/kstars/telescopepropui.ui +++ b/kstars/kstars/telescopepropui.ui @@ -1,10 +1,10 @@ scopeProp - + scopeProp - + 0 0 @@ -22,7 +22,7 @@ unnamed - + textLabel1 @@ -30,9 +30,9 @@ Telescopes: - + - layout12 + tqlayout12 @@ -72,7 +72,7 @@ Expanding - + 236 20 @@ -101,22 +101,22 @@ 0 - + 130 0 - + - layout8 + tqlayout8 unnamed - + textLabel2 @@ -124,7 +124,7 @@ Driver: - + textLabel2_2_6 @@ -132,7 +132,7 @@ Version: - + textLabel2_2 @@ -140,7 +140,7 @@ Label: - + textLabel2_2_2 @@ -148,7 +148,7 @@ Focal length: - + textLabel2_2_3 @@ -158,9 +158,9 @@ - + - layout9 + tqlayout9 @@ -184,9 +184,9 @@ labelEdit - + - layout5 + tqlayout5 @@ -197,7 +197,7 @@ focalEdit - + textLabel2_2_4 @@ -207,9 +207,9 @@ - + - layout6 + tqlayout6 @@ -220,7 +220,7 @@ apertureEdit - + textLabel2_2_5 @@ -242,7 +242,7 @@ Expanding - + 21 190 @@ -251,7 +251,7 @@ - + kpushbutton.h kpushbutton.h diff --git a/kstars/kstars/telescopewizard.ui b/kstars/kstars/telescopewizard.ui index 8f055960..91ad458f 100644 --- a/kstars/kstars/telescopewizard.ui +++ b/kstars/kstars/telescopewizard.ui @@ -1,10 +1,10 @@ telescopeWizard - + telescopeWizard - + 0 1 @@ -20,13 +20,13 @@ 0 - + 500 300 - + 800 300 @@ -42,9 +42,9 @@ unnamed - + - layout12 + tqlayout12 @@ -53,7 +53,7 @@ 10 - + helpB @@ -74,14 +74,14 @@ Expanding - + 56 11 - + backB @@ -89,7 +89,7 @@ &Back - + nextB @@ -105,11 +105,11 @@ - + wizardContainer - + introPage @@ -120,7 +120,7 @@ unnamed - + intoPageLabel @@ -141,13 +141,13 @@ This Wizard will help you to connect to your telescope and control it from KStar <br><br> Please click next to continue. - + WordBreak|AlignVCenter - + modelPage @@ -158,7 +158,7 @@ Please click next to continue. unnamed - + modelPageLabel @@ -167,7 +167,7 @@ Please click next to continue. Please select your telescope model from the list below. Click next after selecting a model. - + WordBreak|AlignTop @@ -181,22 +181,22 @@ Please select your telescope model from the list below. Click next after selecti Expanding - + 20 25 - + - layout10 + tqlayout10 unnamed - + telescopeCombo @@ -211,7 +211,7 @@ Please select your telescope model from the list below. Click next after selecti Minimum - + 196 16 @@ -230,14 +230,14 @@ Please select your telescope model from the list below. Click next after selecti Expanding - + 20 25 - + textLabel1 @@ -248,7 +248,7 @@ Please select your telescope model from the list below. Click next after selecti - + telescopePage @@ -259,7 +259,7 @@ Please select your telescope model from the list below. Click next after selecti unnamed - + telescopePageInfo @@ -274,18 +274,18 @@ Please select your telescope model from the list below. Click next after selecti <h3>2. Align Your Telescope</h3> -You need to align your telescope before you can control it properly from KStars. Please refer to your telescope manual for alignment instructions. +You need to align your telescope before you can control it properly from KStars. Please refer to your telescope manual for tqalignment instructions. <br><br> -After a successful alignment, connect your telescope's RS232 interface to your computer's serial or USB port. +After a successful tqalignment, connect your telescope's RS232 interface to your computer's serial or USB port. <br><br><br>Click next to continue. - + WordBreak|AlignTop - + localPage @@ -296,7 +296,7 @@ After a successful alignment, connect your telescope's RS232 interface to your c unnamed - + localPageLabel @@ -306,7 +306,7 @@ After a successful alignment, connect your telescope's RS232 interface to your c Verify if the following time, date, and location settings are correct. If any of the settings are incorrect, you can correct them via the <tt>Set time</tt> and <tt>Set Location</tt> buttons. - + WordBreak|AlignTop @@ -320,46 +320,46 @@ Verify if the following time, date, and location settings are correct. If any of Expanding - + 20 20 - + - layout14 + tqlayout14 unnamed - + - layout13 + tqlayout13 unnamed - + - layout6 + tqlayout6 unnamed - + - layout2 + tqlayout2 unnamed - + timeLabel @@ -367,7 +367,7 @@ Verify if the following time, date, and location settings are correct. If any of <b>Time</b> - + timeOut @@ -382,15 +382,15 @@ Verify if the following time, date, and location settings are correct. If any of - + - layout3 + tqlayout3 unnamed - + dateLabel @@ -398,7 +398,7 @@ Verify if the following time, date, and location settings are correct. If any of <b>Date</b> - + dateOut @@ -415,15 +415,15 @@ Verify if the following time, date, and location settings are correct. If any of - + - layout4 + tqlayout4 unnamed - + locationLabel @@ -431,7 +431,7 @@ Verify if the following time, date, and location settings are correct. If any of <b>Location</b> - + locationOut @@ -448,15 +448,15 @@ Verify if the following time, date, and location settings are correct. If any of - + - layout11 + tqlayout11 unnamed - + setTimeB @@ -464,7 +464,7 @@ Verify if the following time, date, and location settings are correct. If any of Set Time... - + setLocationB @@ -486,7 +486,7 @@ Verify if the following time, date, and location settings are correct. If any of Expanding - + 20 40 @@ -495,7 +495,7 @@ Verify if the following time, date, and location settings are correct. If any of - + portPage @@ -506,7 +506,7 @@ Verify if the following time, date, and location settings are correct. If any of unnamed - + portPageLabel @@ -524,7 +524,7 @@ Verify if the following time, date, and location settings are correct. If any of Enter the port number your telescope is connected to. If you only have one serial port in your computer, the port is usually <tt>/dev/ttyS0</tt> <br><br>If you are unsure about the port number, you can leave the field empty and KStars will try to scan the ports for attached telescopes. Beware that the autoscan process might take a few minutes to complete. - + WordBreak|AlignTop @@ -538,22 +538,22 @@ Enter the port number your telescope is connected to. If you only have one seria Expanding - + 20 25 - + - layout17 + tqlayout17 unnamed - + portLabel @@ -576,7 +576,7 @@ Enter the port number your telescope is connected to. If you only have one seria Expanding - + 141 16 @@ -595,7 +595,7 @@ Enter the port number your telescope is connected to. If you only have one seria Expanding - + 20 25 @@ -605,7 +605,7 @@ Enter the port number your telescope is connected to. If you only have one seria - + wizardPix @@ -617,7 +617,7 @@ Enter the port number your telescope is connected to. If you only have one seria - + klineedit.h diff --git a/kstars/kstars/telescopewizardprocess.cpp b/kstars/kstars/telescopewizardprocess.cpp index 664a4749..4538ba14 100644 --- a/kstars/kstars/telescopewizardprocess.cpp +++ b/kstars/kstars/telescopewizardprocess.cpp @@ -40,7 +40,7 @@ #define TIMEOUT_THRESHHOLD 20 -telescopeWizardProcess::telescopeWizardProcess( TQWidget* parent, const char* name ) : telescopeWizard(parent, name) +telescopeWizardProcess::telescopeWizardProcess( TQWidget* tqparent, const char* name ) : telescopeWizard(tqparent, name) { currentPort = -1; timeOutCount = 0; @@ -57,7 +57,7 @@ telescopeWizardProcess::telescopeWizardProcess( TQWidget* parent, const char* na backB->hide(); currentPage = INTRO_P; - ksw = (KStars *) parent; + ksw = (KStars *) tqparent; ksw->establishINDI(); @@ -74,11 +74,11 @@ telescopeWizardProcess::telescopeWizardProcess( TQWidget* parent, const char* na dateOut->setText( TQString().sprintf("%d-%02d-%02d", newDate.year(), newDate.month(), newDate.day())); if (ksw->geo()->translatedProvince().isEmpty()) - locationOut->setText( TQString("%1, %2").arg(ksw->geo()->translatedName()).arg(ksw->geo()->translatedCountry())); + locationOut->setText( TQString("%1, %2").tqarg(ksw->geo()->translatedName()).tqarg(ksw->geo()->translatedCountry())); else - locationOut->setText( TQString("%1, %2, %3").arg(ksw->geo()->translatedName()) - .arg(ksw->geo()->translatedProvince()) - .arg(ksw->geo()->translatedCountry())); + locationOut->setText( TQString("%1, %2, %3").tqarg(ksw->geo()->translatedName()) + .tqarg(ksw->geo()->translatedProvince()) + .tqarg(ksw->geo()->translatedCountry())); for (unsigned int i=0; i < indidriver->devices.size(); i++) @@ -91,7 +91,7 @@ telescopeWizardProcess::telescopeWizardProcess( TQWidget* parent, const char* na 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()), parent, TQT_SLOT(appHelpActivated())); + connect(helpB, TQT_SIGNAL(clicked()), tqparent, 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())); @@ -106,7 +106,7 @@ telescopeWizardProcess::~telescopeWizardProcess() { if (progressScan) if (progressScan->wasCancelled()) - indidriver->processDeviceStatus(1); + indidriver->processDevicetqStatus(1); Options::setIndiMessages( INDIMessageBar ); @@ -211,9 +211,9 @@ void telescopeWizardProcess::newLocation() ksw->slotGeoLocator(); - locationOut->setText( TQString("%1, %2, %3").arg(ksw->geo()->translatedName()) - .arg(ksw->geo()->translatedProvince()) - .arg(ksw->geo()->translatedCountry())); + locationOut->setText( TQString("%1, %2, %3").tqarg(ksw->geo()->translatedName()) + .tqarg(ksw->geo()->translatedProvince()) + .tqarg(ksw->geo()->translatedCountry())); timeOut->setText( TQString().sprintf("%02d:%02d:%02d", ksw->data()->lt().time().hour(), ksw->data()->lt().time().minute(), ksw->data()->lt().time().second())); dateOut->setText( TQString().sprintf("%d-%02d-%02d", ksw->data()->lt().date().year(), @@ -230,14 +230,14 @@ int telescopeWizardProcess::establishLink() return (0); TQListViewItem *driverItem = NULL; - driverItem = indidriver->localListView->findItem(telescopeCombo->currentText(), 0); + driverItem = indidriver->localListView->tqfindItem(telescopeCombo->currentText(), 0); if (driverItem == NULL) return -1; // If device is already running, we need to shut it down first if (indidriver->isDeviceRunning(telescopeCombo->currentText())) { indidriver->localListView->setSelected(driverItem, true); - indidriver->processDeviceStatus(1); + indidriver->processDevicetqStatus(1); } // Set custome label for device @@ -248,7 +248,7 @@ int telescopeWizardProcess::establishLink() // Make sure we start is locally indidriver->localR->setChecked(true); // Run it - indidriver->processDeviceStatus(0); + indidriver->processDevicetqStatus(0); if (!indidriver->isDeviceRunning(telescopeCombo->currentText())) return (3); @@ -274,7 +274,7 @@ void telescopeWizardProcess::processPort() if (timeOutCount >= TIMEOUT_THRESHHOLD) { - indidriver->processDeviceStatus(1); + indidriver->processDevicetqStatus(1); Reset(); KMessageBox::error(0, i18n("Error: connection timeout. Unable to communicate with an INDI server")); close(); @@ -335,7 +335,7 @@ void telescopeWizardProcess::scanPorts() { KMessageBox::sorry(0, i18n("Sorry. KStars failed to detect any attached telescopes, please check your settings and try again.")); linkRejected = true; - indidriver->processDeviceStatus(1); + indidriver->processDevicetqStatus(1); Reset(); return; } diff --git a/kstars/kstars/telescopewizardprocess.h b/kstars/kstars/telescopewizardprocess.h index 3e55ccfe..cd76ebb2 100644 --- a/kstars/kstars/telescopewizardprocess.h +++ b/kstars/kstars/telescopewizardprocess.h @@ -26,9 +26,10 @@ class telescopeWizardProcess : public telescopeWizard { Q_OBJECT + TQ_OBJECT public: - telescopeWizardProcess( TQWidget* parent = 0, const char* name = 0); + telescopeWizardProcess( TQWidget* tqparent = 0, const char* name = 0); ~telescopeWizardProcess(); unsigned int currentPage; diff --git a/kstars/kstars/thumbnaileditor.cpp b/kstars/kstars/thumbnaileditor.cpp index 5e2301eb..a8822439 100644 --- a/kstars/kstars/thumbnaileditor.cpp +++ b/kstars/kstars/thumbnaileditor.cpp @@ -29,10 +29,10 @@ #include "thumbnaileditorui.h" #include "thumbnailpicker.h" -ThumbnailEditor::ThumbnailEditor( TQWidget *parent, const char *name ) - : KDialogBase( KDialogBase::Plain, i18n( "Edit Thumbnail Image" ), Ok|Cancel, Ok, parent, name ) +ThumbnailEditor::ThumbnailEditor( TQWidget *tqparent, const char *name ) + : KDialogBase( KDialogBase::Plain, i18n( "Edit Thumbnail Image" ), Ok|Cancel, Ok, tqparent, name ) { - tp = (ThumbnailPicker*)parent; + tp = (ThumbnailPicker*)tqparent; TQFrame *page = plainPage(); TQHBoxLayout *hlay = new TQHBoxLayout( page, 0, 0 ); @@ -63,7 +63,7 @@ TQPixmap ThumbnailEditor::thumbnail() { void ThumbnailEditor::slotUpdateCropLabel() { TQRect *r = ui->ImageCanvas->cropRect(); ui->CropLabel->setText( i18n( "Crop region: [%1,%2 %3x%4]" ) - .arg( r->left() ).arg( r->top() ).arg( r->width() ).arg( r->height() ) ); + .tqarg( r->left() ).tqarg( r->top() ).tqarg( r->width() ).tqarg( r->height() ) ); } TQPixmap ThumbImage::croppedImage() { @@ -75,7 +75,7 @@ TQPixmap ThumbImage::croppedImage() { return result; } -ThumbImage::ThumbImage( TQWidget *parent, const char *name ) : TQLabel( parent, name ) +ThumbImage::ThumbImage( TQWidget *tqparent, const char *name ) : TQLabel( tqparent, name ) { setBackgroundMode( TQWidget::NoBackground ); bMouseButtonDown = false; @@ -130,7 +130,7 @@ void ThumbImage::paintEvent( TQPaintEvent* ) { } void ThumbImage::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == LeftButton && CropRect->contains( e->pos() ) ) { + if ( e->button() == Qt::LeftButton && CropRect->tqcontains( e->pos() ) ) { bMouseButtonDown = true; //The Anchor tells how far from the CropRect corner we clicked diff --git a/kstars/kstars/thumbnaileditor.h b/kstars/kstars/thumbnaileditor.h index 78d5134b..74300aae 100644 --- a/kstars/kstars/thumbnaileditor.h +++ b/kstars/kstars/thumbnaileditor.h @@ -25,11 +25,12 @@ class ThumbnailEditorUI; class ThumbnailPicker; class TQPoint; -class ThumbImage : public QLabel +class ThumbImage : public TQLabel { Q_OBJECT + TQ_OBJECT public: - ThumbImage( TQWidget *parent, const char *name = 0 ); + ThumbImage( TQWidget *tqparent, const char *name = 0 ); ~ThumbImage(); void setImage( TQPixmap *pm ) { Image = pm; setFixedSize( Image->width(), Image->height() ); } @@ -62,8 +63,9 @@ private: class ThumbnailEditor : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ThumbnailEditor( TQWidget *parent, const char *name=0 ); + ThumbnailEditor( TQWidget *tqparent, const char *name=0 ); ~ThumbnailEditor(); TQPixmap thumbnail(); diff --git a/kstars/kstars/thumbnaileditorui.ui b/kstars/kstars/thumbnaileditorui.ui index 81675a98..532b4fa3 100644 --- a/kstars/kstars/thumbnaileditorui.ui +++ b/kstars/kstars/thumbnaileditorui.ui @@ -1,10 +1,10 @@ ThumbnailEditorUI - + ThumbnailEditorUI - + 0 0 @@ -35,7 +35,7 @@ - + CropLabel @@ -48,11 +48,11 @@ Crop region: [0,0 200 x 200] - + AlignCenter - + MessageLabel @@ -65,7 +65,7 @@ (crop region will be scaled to 200x200) - + AlignCenter @@ -94,5 +94,5 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082 - + diff --git a/kstars/kstars/thumbnailpicker.cpp b/kstars/kstars/thumbnailpicker.cpp index c9460480..e8544b6b 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 *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 ) +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 ) { Image = new TQPixmap( current ); ImageRect = new TQRect( 0, 0, 200, 200 ); @@ -85,9 +85,9 @@ void ThumbnailPicker::slotFillList() { //Query Google Image Search: KURL gURL( "http://images.google.com/images" ); //Search for the primary name, or longname and primary name - TQString sName = TQString("\"%1\"").arg( Object->name() ); + TQString sName = TQString("\"%1\"").tqarg( Object->name() ); if ( Object->longname() != Object->name() ) { - sName = TQString("\"%1\" ").arg( Object->longname() ) + sName; + sName = TQString("\"%1\" ").tqarg( Object->longname() ) + sName; } gURL.addQueryItem( "q", sName ); //add the Google-image query string @@ -141,14 +141,14 @@ void ThumbnailPicker::parseGooglePage( TQStringList &ImList, TQString URL ) { return; } - int index = PageHTML.find( "?imgurl=", 0 ); + int index = PageHTML.tqfind( "?imgurl=", 0 ); while ( index >= 0 ) { index += 8; //move to end of "?imgurl=" marker //Image URL is everything from index to next occurence of "&" - ImList.append( PageHTML.mid( index, PageHTML.find( "&", index ) - index ) ); + ImList.append( PageHTML.mid( index, PageHTML.tqfind( "&", index ) - index ) ); - index = PageHTML.find( "?imgurl=", index ); + index = PageHTML.tqfind( "?imgurl=", index ); } } @@ -176,7 +176,7 @@ void ThumbnailPicker::downloadReady(KIO::Job *job) { //Add image to list //If image is taller than desktop, rescale it. - //I tried to use kapp->style().pixelMetric( TQStyle::PM_TitleBarHeight ) + //I tried to use kapp->style().tqpixelMetric( TQStyle::PM_TitleBarHeight ) //for the titlebar height, but this returned zero. //Hard-coding 25 instead :( if ( tmp.exists() ) { @@ -195,7 +195,7 @@ void ThumbnailPicker::downloadReady(KIO::Job *job) { // this returns zero... // //DEBUG -// kdDebug() << "Title bar height: " << kapp->style().pixelMetric( TQStyle::PM_TitleBarHeight ) << endl; +// kdDebug() << "Title bar height: " << kapp->style().tqpixelMetric( TQStyle::PM_TitleBarHeight ) << endl; if ( h > hDesk ) im = im.smoothScale( w*hDesk/h, hDesk ); @@ -313,7 +313,7 @@ void ThumbnailPicker::slotSetFromURL() { if ( im.isNull() ) { KMessageBox::sorry( 0, - i18n("Failed to load image at %1").arg( localFile.name() ), + i18n("Failed to load image at %1").tqarg( localFile.name() ), i18n("Failed to Load Image") ); return; } diff --git a/kstars/kstars/thumbnailpicker.h b/kstars/kstars/thumbnailpicker.h index 8cd52b99..26e82bda 100644 --- a/kstars/kstars/thumbnailpicker.h +++ b/kstars/kstars/thumbnailpicker.h @@ -37,8 +37,9 @@ class SkyObject; class ThumbnailPicker : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ThumbnailPicker( SkyObject *o, const TQPixmap ¤t, TQWidget *parent=0, const char *name=0 ); + ThumbnailPicker( SkyObject *o, const TQPixmap ¤t, TQWidget *tqparent=0, const char *name=0 ); ~ThumbnailPicker(); TQPixmap* image() { return Image; } diff --git a/kstars/kstars/thumbnailpickerui.ui b/kstars/kstars/thumbnailpickerui.ui index b5ffd200..fb534086 100644 --- a/kstars/kstars/thumbnailpickerui.ui +++ b/kstars/kstars/thumbnailpickerui.ui @@ -1,10 +1,10 @@ ThumbnailPickerUI - + ThumbnailPickerUI - + 0 0 @@ -22,23 +22,23 @@ 4 - + - layout9 + tqlayout9 unnamed - + - layout8 + tqlayout8 unnamed - + SearchLabel @@ -56,7 +56,7 @@ Expanding - + 40 20 @@ -80,14 +80,14 @@ ImageList - + 300 0 - + textLabel3 @@ -108,17 +108,17 @@ - + - layout10 + tqlayout10 unnamed - + - layout9 + tqlayout9 @@ -134,22 +134,22 @@ Expanding - + 53 20 - + - layout8 + tqlayout8 unnamed - + textLabel1 @@ -157,7 +157,7 @@ Current thumbnail: - + CurrentImage @@ -169,13 +169,13 @@ 0 - + 200 200 - + 200 200 @@ -200,7 +200,7 @@ Expanding - + 53 20 @@ -209,9 +209,9 @@ - + - layout3 + tqlayout3 @@ -227,16 +227,16 @@ Expanding - + 40 20 - + - layout2 + tqlayout2 @@ -270,7 +270,7 @@ Expanding - + 40 20 @@ -289,7 +289,7 @@ Expanding - + 20 233 @@ -302,7 +302,7 @@ - + kprogress.h klistbox.h diff --git a/kstars/kstars/timebox.cpp b/kstars/kstars/timebox.cpp index 5040cf1f..5f6040f0 100644 --- a/kstars/kstars/timebox.cpp +++ b/kstars/kstars/timebox.cpp @@ -17,14 +17,14 @@ #include "timebox.h" #include "libkdeedu/extdate/extdatetime.h" -#include //needed for QTime +#include //needed for TQTime #include #include #include #include #include -timeBox::timeBox(TQWidget *parent, const char *name, bool tt) : TQLineEdit(parent,name) +timeBox::timeBox(TQWidget *tqparent, const char *name, bool tt) : TQLineEdit(tqparent,name) { if (tt) { @@ -91,7 +91,7 @@ TQTime timeBox::createTime ( bool *ok ) TQStringList fields; //check for colon-delimiters or space-delimiters - if ( entry.contains(':') ) + if ( entry.tqcontains(':') ) fields = TQStringList::split( ':', entry ); else fields = TQStringList::split( " ", entry ); @@ -102,8 +102,8 @@ TQTime timeBox::createTime ( bool *ok ) if ( fields.count() == 2 ) { double mx = fields[1].toDouble( &checkValue ); if ( checkValue ) { - fields[1] = TQString("%1").arg( int(mx) ); - fields.append( TQString("%1").arg( int( 60.0*(mx - int(mx)) ) ) ); + fields[1] = TQString("%1").tqarg( int(mx) ); + fields.append( TQString("%1").tqarg( int( 60.0*(mx - int(mx)) ) ) ); } else { fields.append( TQString( "0" ) ); } @@ -113,9 +113,9 @@ TQTime timeBox::createTime ( bool *ok ) // ignore all after 3rd field if ( fields.count() >= 3 ) { - fields[0].replace( TQRegExp("h"), "" ); - fields[1].replace( TQRegExp("m"), "" ); - fields[2].replace( TQRegExp("s"), "" ); + fields[0].tqreplace( TQRegExp("h"), "" ); + fields[1].tqreplace( TQRegExp("m"), "" ); + fields[2].tqreplace( TQRegExp("s"), "" ); } //See if first two fields parse as integers. // @@ -141,7 +141,7 @@ TQTime timeBox::createTime ( bool *ok ) } // if ( !valueFound ) -// KMessageBox::sorry( 0, errMsg.arg( "Angle" ), i18n( "Could Not Set Value" ) ); +// KMessageBox::sorry( 0, errMsg.tqarg( "Angle" ), i18n( "Could Not Set Value" ) ); return qt; @@ -159,9 +159,9 @@ ExtDate timeBox::createDate (bool */*ok*/) if ( !date.isValid() ) { kdDebug() << k_funcinfo << "Invalid date" << endl; - showDate(ExtDate::currentDate()); + showDate(ExtDate::tqcurrentDate()); entry = text().stripWhiteSpace(); - return ExtDate::currentDate(); + return ExtDate::tqcurrentDate(); } else { return date; } diff --git a/kstars/kstars/timebox.h b/kstars/kstars/timebox.h index 1f3f8b6d..297b89aa 100644 --- a/kstars/kstars/timebox.h +++ b/kstars/kstars/timebox.h @@ -29,7 +29,7 @@ class ExtDate; * This class creates a TQHBox with 3 TQLineEdit Fields which will contain * either Time (Hour, Minute, Second) or Date (Day, Month, Year). * - * Inherits QHBox + * Inherits TQHBox *@author Pablo de Vicente *@version 1.0 */ @@ -38,12 +38,12 @@ class timeBox : public TQLineEdit { public: /** * Constructor for the timeBox object. - * @param parent is the parent QWidget + * @param tqparent is the tqparent 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 *parent, const char *n, bool tt=TRUE); + timeBox(TQWidget *tqparent, const char *n, bool tt=TRUE); ~timeBox(); diff --git a/kstars/kstars/timedialog.cpp b/kstars/kstars/timedialog.cpp index f4d1449f..7a64b5b2 100644 --- a/kstars/kstars/timedialog.cpp +++ b/kstars/kstars/timedialog.cpp @@ -29,14 +29,14 @@ #include "simclock.h" #include "libkdeedu/extdate/extdatepicker.h" -TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* parent ) - : KDialogBase( KDialogBase::Plain, i18n( "set clock to a new time", "Set Time" ), Ok|Cancel, Ok, parent ) +TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* tqparent ) + : KDialogBase( KDialogBase::Plain, i18n( "set clock to a new time", "Set Time" ), Ok|Cancel, Ok, tqparent ) { - ksw = (KStars*) parent; + ksw = (KStars*) tqparent; TQFrame *page = plainPage(); vlay = new TQVBoxLayout( page, 2, 2 ); - hlay = new TQHBoxLayout( 2 ); //this layout will be added to the VLayout + hlay = new TQHBoxLayout( 2 ); //this tqlayout will be added to the VLayout dPicker = new ExtDatePicker( page ); dPicker->setDate( now.date() ); @@ -112,7 +112,7 @@ void TimeDialog::keyReleaseEvent( TQKeyEvent *kev ) { void TimeDialog::setNow( void ) { - KStarsDateTime dt( KStarsDateTime::currentDateTime() ); + KStarsDateTime dt( KStarsDateTime::tqcurrentDateTime() ); dPicker->setDate( dt.date() ); TQTime t = dt.time(); diff --git a/kstars/kstars/timedialog.h b/kstars/kstars/timedialog.h index e0f1a30e..f18e4d3b 100644 --- a/kstars/kstars/timedialog.h +++ b/kstars/kstars/timedialog.h @@ -33,8 +33,8 @@ class KStars; /**@class TimeDialog *A class for adjusting the Time and Date. Contains a ExtDatePicker widget - *for selecting the date, and three QSpinBoxes for selecting the Hour, - *Minute and Second. There is also a "Now" QPushbutton for selecting the + *for selecting the date, and three TQSpinBoxes for selecting the Hour, + *Minute and Second. There is also a "Now" TQPushbutton for selecting the *Time and Date from the system clock. *@short Dialog for adjusting the Time and Date. *@author Jason Harris @@ -43,12 +43,13 @@ class KStars; class TimeDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** - *Constructor. Creates widgets and packs them into QLayouts. + *Constructor. Creates widgets and packs them into TQLayouts. *Connects Signals and Slots. */ - TimeDialog( const KStarsDateTime &now, TQWidget* parent = 0 ); + TimeDialog( const KStarsDateTime &now, TQWidget* tqparent = 0 ); /** *Destructor (empty) diff --git a/kstars/kstars/timespinbox.cpp b/kstars/kstars/timespinbox.cpp index 72549f9b..828e0330 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 *parent, const char *name, bool _daysonly ) - : TQSpinBox ( -41, 41, 1 /* step */, parent, name ) +TimeSpinBox::TimeSpinBox( TQWidget *tqparent, const char *name, bool _daysonly ) + : TQSpinBox ( -41, 41, 1 /* step */, tqparent, name ) { setValidator( 0 ); setButtonSymbols( TQSpinBox::PlusMinus ); diff --git a/kstars/kstars/timespinbox.h b/kstars/kstars/timespinbox.h index 16c23fb5..46d82a1a 100644 --- a/kstars/kstars/timespinbox.h +++ b/kstars/kstars/timespinbox.h @@ -30,21 +30,22 @@ class TimeSpinBox : public TQSpinBox { Q_OBJECT + TQ_OBJECT public: /**Constructor */ - TimeSpinBox( TQWidget *parent, const char* name=0, bool daysOnly = false ); + TimeSpinBox( TQWidget *tqparent, const char* name=0, bool daysOnly = false ); /**Destructor (empty)*/ ~TimeSpinBox() {} /**Convert the internal value to a display string. - *@note reimplemented from QSpinBox + *@note reimplemented from TQSpinBox *@p value the internal value to convert to a display string *@return the display string */ virtual TQString mapValueToText( int value ); /**Convert the displayed string to an internal value. - *@note reimplemented from QSpinBox + *@note reimplemented from TQSpinBox *@p ok bool pointer set to TRUE if conversion was successful *@return internal value converted from displayed text */ diff --git a/kstars/kstars/timestepbox.cpp b/kstars/kstars/timestepbox.cpp index 6b661592..ff956136 100644 --- a/kstars/kstars/timestepbox.cpp +++ b/kstars/kstars/timestepbox.cpp @@ -23,8 +23,8 @@ #include "timestepbox.h" -TimeStepBox::TimeStepBox( TQWidget *parent, const char* name, bool daysonly ) - : TQFrame( parent, name ) { +TimeStepBox::TimeStepBox( TQWidget *tqparent, const char* name, bool daysonly ) + : TQFrame( tqparent, 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 c1bc8fc2..b335ee0d 100644 --- a/kstars/kstars/timestepbox.h +++ b/kstars/kstars/timestepbox.h @@ -35,9 +35,10 @@ class TimeStepBox : public TQFrame { Q_OBJECT + TQ_OBJECT public: /**Constructor. */ - TimeStepBox( TQWidget *parent=0, const char* name=0, bool daysonly=false ); + TimeStepBox( TQWidget *tqparent=0, const char* name=0, bool daysonly=false ); /**Destructor. (empty)*/ ~TimeStepBox() {} diff --git a/kstars/kstars/timeunitbox.cpp b/kstars/kstars/timeunitbox.cpp index 0b89f057..49cb9eac 100644 --- a/kstars/kstars/timeunitbox.cpp +++ b/kstars/kstars/timeunitbox.cpp @@ -22,8 +22,8 @@ #include -TimeUnitBox::TimeUnitBox(TQWidget *parent, const char *name, bool daysonly ) - : TQVBox( parent, name ) { +TimeUnitBox::TimeUnitBox(TQWidget *tqparent, const char *name, bool daysonly ) + : TQVBox( tqparent, name ) { UpButton = new TQPushButton( "+", this ); UpButton->setMaximumWidth( 22 ); diff --git a/kstars/kstars/timeunitbox.h b/kstars/kstars/timeunitbox.h index 9e190b7b..9926338f 100644 --- a/kstars/kstars/timeunitbox.h +++ b/kstars/kstars/timeunitbox.h @@ -45,9 +45,10 @@ class TQPushButton; class TimeUnitBox : public TQVBox { Q_OBJECT + TQ_OBJECT public: /**Constructor*/ - TimeUnitBox(TQWidget *parent=0, const char *name=0, bool daysonly = false); + TimeUnitBox(TQWidget *tqparent=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/timezonerule.cpp b/kstars/kstars/timezonerule.cpp index 0a711f57..1d66d32c 100644 --- a/kstars/kstars/timezonerule.cpp +++ b/kstars/kstars/timezonerule.cpp @@ -168,7 +168,7 @@ int TimeZoneRule::findStartDay( const KStarsDateTime &d ) { return test.day(); } -int TimeZoneRule::findRevertDay( const KStarsDateTime &d ) { +int TimeZoneRule::tqfindRevertDay( const KStarsDateTime &d ) { // Determine the calendar date of RevertDay for the month and year of the given date. ExtDate test; @@ -215,7 +215,7 @@ bool TimeZoneRule::isDSTActive( const KStarsDateTime &date ) { if ( day < sday ) return false; if ( day==sday && date.time() < StartTime ) return false; } else if ( month == RevertMonth ) { - int rday = findRevertDay( date ); + int rday = tqfindRevertDay( date ); if ( day > rday ) return false; if ( day==rday && date.time() > RevertTime ) return false; } @@ -239,7 +239,7 @@ void TimeZoneRule::nextDSTChange_LTime( const KStarsDateTime &date ) { if ( RevertMonth < date.date().month() ) ++y; result = KStarsDateTime( ExtDate( y, RevertMonth, 1 ), RevertTime ); - result = KStarsDateTime( ExtDate( y, RevertMonth, findRevertDay( result ) ), RevertTime ); + result = KStarsDateTime( ExtDate( y, RevertMonth, tqfindRevertDay( result ) ), RevertTime ); } else { // Next change is starting DST. @@ -284,7 +284,7 @@ void TimeZoneRule::previousDSTChange_LTime( const KStarsDateTime &date ) { if ( RevertMonth > date.date().month() ) --y; result = KStarsDateTime( ExtDate( y, RevertMonth, 1 ), RevertTime ); - result = KStarsDateTime( ExtDate( y, RevertMonth, findRevertDay( result ) ), RevertTime ); + result = KStarsDateTime( ExtDate( y, RevertMonth, tqfindRevertDay( result ) ), RevertTime ); } kdDebug() << i18n( "Previous Daylight Savings Time change (Local Time): " ) << result.toString() << endl; diff --git a/kstars/kstars/timezonerule.h b/kstars/kstars/timezonerule.h index 75ae5d2d..53ade37e 100644 --- a/kstars/kstars/timezonerule.h +++ b/kstars/kstars/timezonerule.h @@ -28,7 +28,7 @@ *The rules themselves are stored in the TZrulebook.dat file, which is read *on startup; each line in the file creates a TimeZoneRule object. * - *TimeZoneRule consists of QStrings identifying the months and days on which + *TimeZoneRule consists of TQStrings identifying the months and days on which *DST starts and ends, TQTime objects identifying the time at which the *changes occur, and a double indicating the size of the offset in hours *(probably always 1.00). @@ -158,7 +158,7 @@ private: *of the given KStarsDateTime. *@p d the date containing the year to be tested *@return the calendar date, an integer between 1 and 31. */ - int findRevertDay( const KStarsDateTime &d ); + int tqfindRevertDay( const KStarsDateTime &d ); int StartDay, RevertDay; int StartWeek, RevertWeek; diff --git a/kstars/kstars/toggleaction.cpp b/kstars/kstars/toggleaction.cpp index a0b59a64..5242f896 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* parent, const char* name ) : - KAction(ontext, onpix, accel, receiver, slot, parent, name), + int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) : + KAction(ontext, onpix, accel, receiver, slot, tqparent, 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* parent, const char* name ) : - KAction(ontext, accel, receiver, slot, parent, name), + int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name ) : + KAction(ontext, accel, receiver, slot, tqparent, name), officon(), onicon(), offcap(offtext), diff --git a/kstars/kstars/toggleaction.h b/kstars/kstars/toggleaction.h index 5eef8d04..a2f05a98 100644 --- a/kstars/kstars/toggleaction.h +++ b/kstars/kstars/toggleaction.h @@ -31,12 +31,13 @@ class ToggleAction : public KAction { Q_OBJECT + TQ_OBJECT public: /**Constructor. */ - 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 ) ; + 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 ) ; /**Constructor. Same as above, but without icons. */ - ToggleAction(const TQString& ontext, const TQString& offtext, int accel, const TQObject* receiver, const char* slot, TQObject* parent = 0, const char* name = 0 ) ; + ToggleAction(const TQString& ontext, const TQString& offtext, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent = 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 458b467f..4c51a6a4 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* parent) : - KDialogBase( KDialogBase::Plain, i18n( "Altitude vs. Time" ), Close, Close, parent ) +AltVsTime::AltVsTime( TQWidget* tqparent) : + KDialogBase( KDialogBase::Plain, i18n( "Altitude vs. Time" ), Close, Close, tqparent ) { - ks = (KStars*) parent; + ks = (KStars*) tqparent; TQFrame *page = plainPage(); @@ -53,7 +53,7 @@ AltVsTime::AltVsTime( TQWidget* parent) : View = new AVTPlotWidget( -12.0, 12.0, -90.0, 90.0, page ); View->setMinimumSize( 400, 400 ); - View->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); + View->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); View->setXAxisType( KStarsPlotWidget::TIME ); View->setYAxisType( KStarsPlotWidget::ANGLE ); View->setShowGrid( false ); @@ -113,7 +113,7 @@ AltVsTime::AltVsTime( TQWidget* parent) : AltVsTime::~AltVsTime() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } void AltVsTime::slotAddSource(void) { @@ -190,7 +190,7 @@ void AltVsTime::slotAddSource(void) { avtUI->decBox->TQWidget::setFocus(); } - View->repaint(false); + View->tqrepaint(false); } //Use find dialog to choose an object @@ -201,7 +201,7 @@ void AltVsTime::slotBrowseObject(void) { processObject( o ); } - View->repaint(); + View->tqrepaint(); } void AltVsTime::processObject( SkyObject *o, bool forceAdd ) { @@ -307,11 +307,11 @@ void AltVsTime::slotHighlight(void) { //move input focus to the next logical widget void AltVsTime::slotAdvanceFocus(void) { - if ( sender()->name() == TQString( "nameBox" ) ) avtUI->addButton->setFocus(); - if ( sender()->name() == TQString( "raBox" ) ) avtUI->decBox->setFocus(); - if ( sender()->name() == TQString( "decbox" ) ) avtUI->addButton->setFocus(); - if ( sender()->name() == TQString( "longBox" ) ) avtUI->latBox->setFocus(); - if ( sender()->name() == TQString( "latBox" ) ) avtUI->updateButton->setFocus(); + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "nameBox" ) ) avtUI->addButton->setFocus(); + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "raBox" ) ) avtUI->decBox->setFocus(); + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "decbox" ) ) avtUI->addButton->setFocus(); + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "longBox" ) ) avtUI->latBox->setFocus(); + if ( TQT_TQOBJECT(const_cast(sender()))->name() == TQString( "latBox" ) ) avtUI->updateButton->setFocus(); } void AltVsTime::slotClear(void) { @@ -323,7 +323,7 @@ void AltVsTime::slotClear(void) { avtUI->decBox->clear(); avtUI->epochName->clear(); View->clearObjectList(); - View->repaint(); + View->tqrepaint(); } void AltVsTime::slotClearBoxes(void) { @@ -400,7 +400,7 @@ void AltVsTime::slotUpdateDateLoc(void) { o->updateCoords( num ); //update pList entry - pList.replace( i, (SkyPoint*)o ); + pList.tqreplace( i, (SkyPoint*)o ); KPlotObject *po = new KPlotObject( "", "white", KPlotObject::CURVE, 1, KPlotObject::SOLID ); for ( double h=-12.0; h<=12.0; h+=0.5 ) { @@ -437,7 +437,7 @@ void AltVsTime::slotUpdateDateLoc(void) { setLSTLimits(); slotHighlight(); - View->repaint(); + View->tqrepaint(); delete num; } @@ -468,7 +468,7 @@ void AltVsTime::setLSTLimits(void) { void AltVsTime::showCurrentDate (void) { - KStarsDateTime dt = KStarsDateTime::currentDateTime(); + KStarsDateTime dt = KStarsDateTime::tqcurrentDateTime(); if ( dt.time() > TQTime( 12, 0, 0 ) ) dt = dt.addDays( 1 ); avtUI->dateBox->setDate( dt.date() ); } @@ -495,8 +495,8 @@ double AltVsTime::getEpoch (TQString eName) return epoch; } -AVTPlotWidget::AVTPlotWidget( double x1, double x2, double y1, double y2, TQWidget *parent, const char* name ) - : KStarsPlotWidget( x1, x2, y1, y2, parent, name ) +AVTPlotWidget::AVTPlotWidget( double x1, double x2, double y1, double y2, TQWidget *tqparent, const char* name ) + : KStarsPlotWidget( x1, x2, y1, y2, tqparent, name ) { //Default SunRise/SunSet values SunRise = 0.25; @@ -512,7 +512,7 @@ void AVTPlotWidget::mouseMoveEvent( TQMouseEvent *e ) { int Xcursor = e->x(); int Ycursor = e->y(); - if ( ! checkRect.contains( e->x(), e->y() ) ) { + if ( ! checkRect.tqcontains( e->x(), e->y() ) ) { if ( e->x() < checkRect.left() ) Xcursor = checkRect.left(); if ( e->x() > checkRect.right() ) Xcursor = checkRect.right(); if ( e->y() < checkRect.top() ) Ycursor = checkRect.top(); diff --git a/kstars/kstars/tools/altvstime.h b/kstars/kstars/tools/altvstime.h index fc11e55b..04b6448b 100644 --- a/kstars/kstars/tools/altvstime.h +++ b/kstars/kstars/tools/altvstime.h @@ -48,10 +48,11 @@ class AltVsTimeUI; class AVTPlotWidget : public KStarsPlotWidget { Q_OBJECT + TQ_OBJECT public: /**Constructor */ - AVTPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, TQWidget *parent=0, const char* name=0 ); + AVTPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, TQWidget *tqparent=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. @@ -93,11 +94,12 @@ private: class AltVsTime : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /**Constructor */ - AltVsTime( TQWidget* parent = 0); + AltVsTime( TQWidget* tqparent = 0); /**Destructor */ diff --git a/kstars/kstars/tools/altvstimeui.ui b/kstars/kstars/tools/altvstimeui.ui index a4d1bb29..73ff7033 100644 --- a/kstars/kstars/tools/altvstimeui.ui +++ b/kstars/kstars/tools/altvstimeui.ui @@ -1,10 +1,10 @@ AltVsTimeUI - + AltVsTimeUI - + 0 0 @@ -19,7 +19,7 @@ unnamed - + tabWidget2 @@ -31,7 +31,7 @@ 0 - + tab @@ -42,9 +42,9 @@ unnamed - + - layout30 + tqlayout30 @@ -53,7 +53,7 @@ 0 - + textLabel3 @@ -77,7 +77,7 @@ StrongFocus - + textLabel4 @@ -93,7 +93,7 @@ Dec: - + textLabel2 @@ -108,7 +108,7 @@ RA: - + AlignVCenter @@ -150,20 +150,20 @@ epochName - + 80 0 - + 80 32767 - + textLabel1 @@ -173,9 +173,9 @@ - + - layout6 + tqlayout6 @@ -228,7 +228,7 @@ 0 - + 100 0 @@ -260,7 +260,7 @@ PlotList - + 100 0 @@ -272,7 +272,7 @@ - + tab @@ -283,15 +283,15 @@ unnamed - + - layout57 + tqlayout57 unnamed - + textLabel5 @@ -303,7 +303,7 @@ dateBox - + 90 0 @@ -320,7 +320,7 @@ Expanding - + 257 20 @@ -329,9 +329,9 @@ - + - layout25 + tqlayout25 @@ -345,7 +345,7 @@ Choose City... - + textLabel7 @@ -377,7 +377,7 @@ StrongFocus - + textLabel6 @@ -421,16 +421,16 @@ Expanding - + 20 16 - + - layout26 + tqlayout26 @@ -446,7 +446,7 @@ Expanding - + 40 20 @@ -526,7 +526,7 @@ latBox updateButton - + dmsbox.h diff --git a/kstars/kstars/tools/argchangeviewoption.ui b/kstars/kstars/tools/argchangeviewoption.ui index 2445322a..701dbc0e 100644 --- a/kstars/kstars/tools/argchangeviewoption.ui +++ b/kstars/kstars/tools/argchangeviewoption.ui @@ -1,10 +1,10 @@ ArgChangeViewOption - + ArgChangeViewOption - + 0 0 @@ -16,9 +16,9 @@ unnamed - + - layout2 + tqlayout2 @@ -45,14 +45,14 @@ Expanding - + 50 20 - + textLabel1_2 @@ -95,14 +95,14 @@ Expanding - + 160 20 - + textLabel1 @@ -122,7 +122,7 @@ Expanding - + 20 16 @@ -133,7 +133,7 @@ - + kpushbutton.h klineedit.h diff --git a/kstars/kstars/tools/argexportimage.ui b/kstars/kstars/tools/argexportimage.ui index f5e0d0fb..c5a5eb65 100644 --- a/kstars/kstars/tools/argexportimage.ui +++ b/kstars/kstars/tools/argexportimage.ui @@ -1,10 +1,10 @@ ArgExportImage - + ArgExportImage - + 0 0 @@ -16,15 +16,15 @@ unnamed - + - layout7 + tqlayout7 unnamed - + textLabel1 @@ -36,7 +36,7 @@ ExportFileName - + 160 0 @@ -45,9 +45,9 @@ - + - layout6 + tqlayout6 @@ -63,16 +63,16 @@ Expanding - + 40 20 - + - layout5 + tqlayout5 @@ -106,7 +106,7 @@ 5000 - + textLabel2 @@ -114,7 +114,7 @@ Image width: - + textLabel2_2 @@ -136,7 +136,7 @@ Expanding - + 20 40 @@ -179,14 +179,14 @@ update() update(int,int,int,int) update(const QRect&) - repaint() - repaint(bool) - repaint(int,int,int,int) - repaint(int,int,int,int,bool) - repaint(const QRect&) - repaint(const QRect&,bool) - repaint(const QRegion&) - repaint(const QRegion&,bool) + tqrepaint() + tqrepaint(bool) + tqrepaint(int,int,int,int) + tqrepaint(int,int,int,int,bool) + tqrepaint(const QRect&) + tqrepaint(const QRect&,bool) + tqrepaint(const QRegion&) + tqrepaint(const QRegion&,bool) show() hide() setShown(bool) @@ -221,10 +221,10 @@ slotEmitRelativeValueChanged(int) name enabled - geometry + tqgeometry sizePolicy - minimumSize - maximumSize + tqminimumSize + tqmaximumSize sizeIncrement baseSize paletteForegroundColor @@ -255,7 +255,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154789cb5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c203e47720000000049454e44ae426082 - + knuminput.h diff --git a/kstars/kstars/tools/argloadcolorscheme.ui b/kstars/kstars/tools/argloadcolorscheme.ui index addc92eb..a95d895c 100644 --- a/kstars/kstars/tools/argloadcolorscheme.ui +++ b/kstars/kstars/tools/argloadcolorscheme.ui @@ -1,10 +1,10 @@ ArgLoadColorScheme - + ArgLoadColorScheme - + 0 0 @@ -23,5 +23,5 @@ - + diff --git a/kstars/kstars/tools/arglooktoward.ui b/kstars/kstars/tools/arglooktoward.ui index 5d28243b..fe969021 100644 --- a/kstars/kstars/tools/arglooktoward.ui +++ b/kstars/kstars/tools/arglooktoward.ui @@ -1,10 +1,10 @@ ArgLookToward - + ArgLookToward - + 0 0 @@ -16,15 +16,15 @@ unnamed - + - layout12 + tqlayout12 unnamed - + textLabel1 @@ -32,7 +32,7 @@ Dir: - + @@ -125,7 +125,7 @@ Expanding - + 40 20 @@ -144,7 +144,7 @@ Expanding - + 20 40 @@ -155,7 +155,7 @@ - + kpushbutton.h diff --git a/kstars/kstars/tools/argprintimage.ui b/kstars/kstars/tools/argprintimage.ui index a8bc4a24..56e7e215 100644 --- a/kstars/kstars/tools/argprintimage.ui +++ b/kstars/kstars/tools/argprintimage.ui @@ -1,10 +1,10 @@ ArgPrintImage - + ArgPrintImage - + 0 0 @@ -16,7 +16,7 @@ unnamed - + UsePrintDialog @@ -24,7 +24,7 @@ Show print dialog - + UseChartColors @@ -45,7 +45,7 @@ Expanding - + 20 70 @@ -54,5 +54,5 @@ - + diff --git a/kstars/kstars/tools/argsetactionindi.ui b/kstars/kstars/tools/argsetactionindi.ui index 8446c010..52852ab6 100644 --- a/kstars/kstars/tools/argsetactionindi.ui +++ b/kstars/kstars/tools/argsetactionindi.ui @@ -1,10 +1,10 @@ ArgSetActionINDI - + ArgSetActionINDI - + 0 0 @@ -19,23 +19,23 @@ unnamed - + - layout50 + tqlayout50 unnamed - + - layout47 + tqlayout47 unnamed - + textLabel1 @@ -43,7 +43,7 @@ Device: - + textLabel1_2 @@ -53,9 +53,9 @@ - + - layout48 + tqlayout48 @@ -83,7 +83,7 @@ Expanding - + 61 21 @@ -102,7 +102,7 @@ Expanding - + 20 9 @@ -113,7 +113,7 @@ - + klineedit.h klineedit.h diff --git a/kstars/kstars/tools/argsetaltaz.ui b/kstars/kstars/tools/argsetaltaz.ui index 5c40d16a..f0ce32ac 100644 --- a/kstars/kstars/tools/argsetaltaz.ui +++ b/kstars/kstars/tools/argsetaltaz.ui @@ -1,10 +1,10 @@ ArgSetAltAz - + ArgSetAltAz - + 0 0 @@ -16,9 +16,9 @@ unnamed - + - layout13 + tqlayout13 @@ -45,10 +45,10 @@ Set the Altitude coordinate to be focused on in the sky map, in degrees. You can express the angle as a simple integer ("45") or floating-point ("45.333") value, or as space- or colon-delimited values specifying degrees, arcminutes and arcseconds ("45:20", "45:20:00", "45:20", "45 20.0", etc.). -The Altitude is one of the coordinates in the Horizontal coordinate system. It is defined as the angle of an object above or below the horizon. For example, the Zenith has an Altitude of 90 degrees. Altitude is also known as Elevation. +The Altitude is one of the coordinates in theQt::Horizontal coordinate system. It is defined as the angle of an object above or below the horizon. For example, the Zenith has an Altitude of 90 degrees. Altitude is also known as Elevation. - + textLabel1 @@ -80,7 +80,7 @@ The Altitude is one of the coordinates in the Horizontal coordinate system. It The azimuth is one of the coordinates in the horizontal coordinate system. It is defined as the angle measured along the horizon, between the North point and the point on the horizon directly below the object. Azimuth increases clockwise around the horizon - + textLabel1_2 @@ -100,7 +100,7 @@ The azimuth is one of the coordinates in the horizontal coordinate system. It i Expanding - + 20 40 @@ -136,7 +136,7 @@ The azimuth is one of the coordinates in the horizontal coordinate system. It i AzBox AltBox - + dmsbox.h dmsbox.h diff --git a/kstars/kstars/tools/argsetccdtempindi.ui b/kstars/kstars/tools/argsetccdtempindi.ui index 28822d8a..4fc68a90 100644 --- a/kstars/kstars/tools/argsetccdtempindi.ui +++ b/kstars/kstars/tools/argsetccdtempindi.ui @@ -1,10 +1,10 @@ ArgSetCCDTempINDI - + ArgSetCCDTempINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout64 + tqlayout64 unnamed - + - layout63 + tqlayout63 unnamed - + textLabel1 @@ -40,7 +40,7 @@ Device: - + textLabel1_2 @@ -50,9 +50,9 @@ - + - layout62 + tqlayout62 @@ -86,7 +86,7 @@ Expanding - + 27 21 @@ -105,7 +105,7 @@ Expanding - + 20 9 @@ -114,7 +114,7 @@ - + klineedit.h knuminput.h diff --git a/kstars/kstars/tools/argsetcolor.ui b/kstars/kstars/tools/argsetcolor.ui index 662b1ebe..4991d65c 100644 --- a/kstars/kstars/tools/argsetcolor.ui +++ b/kstars/kstars/tools/argsetcolor.ui @@ -1,10 +1,10 @@ ArgSetColor - + ArgSetColor - + 0 0 @@ -16,15 +16,15 @@ unnamed - + - layout11 + tqlayout11 unnamed - + textLabel1 @@ -32,7 +32,7 @@ Color name: - + textLabel2 @@ -40,9 +40,9 @@ Color value: - + - layout10 + tqlayout10 @@ -66,7 +66,7 @@ Expanding - + 40 20 @@ -92,7 +92,7 @@ Expanding - + 20 40 @@ -139,14 +139,14 @@ update() update(int,int,int,int) update(const QRect&) - repaint() - repaint(bool) - repaint(int,int,int,int) - repaint(int,int,int,int,bool) - repaint(const QRect&) - repaint(const QRect&,bool) - repaint(const QRegion&) - repaint(const QRegion&,bool) + tqrepaint() + tqrepaint(bool) + tqrepaint(int,int,int,int) + tqrepaint(int,int,int,int,bool) + tqrepaint(const QRect&) + tqrepaint(const QRect&,bool) + tqrepaint(const QRegion&) + tqrepaint(const QRegion&,bool) show() hide() setShown(bool) @@ -180,10 +180,10 @@ chooseColor() name enabled - geometry + tqgeometry sizePolicy - minimumSize - maximumSize + tqminimumSize + tqmaximumSize sizeIncrement baseSize paletteForegroundColor @@ -218,7 +218,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154789cb5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c203e47720000000049454e44ae426082 - + kcolorbutton.h diff --git a/kstars/kstars/tools/argsetfilternumindi.ui b/kstars/kstars/tools/argsetfilternumindi.ui index 17e58302..f04ff3ec 100644 --- a/kstars/kstars/tools/argsetfilternumindi.ui +++ b/kstars/kstars/tools/argsetfilternumindi.ui @@ -1,10 +1,10 @@ ArgSetFilterNumINDI - + ArgSetFilterNumINDI - + 0 0 @@ -19,23 +19,23 @@ unnamed - + - layout64 + tqlayout64 unnamed - + - layout63 + tqlayout63 unnamed - + textLabel1 @@ -43,7 +43,7 @@ Device: - + textLabel1_2 @@ -53,9 +53,9 @@ - + - layout62 + tqlayout62 @@ -89,7 +89,7 @@ Expanding - + 27 21 @@ -108,7 +108,7 @@ Expanding - + 20 9 @@ -117,7 +117,7 @@ - + klineedit.h knuminput.h diff --git a/kstars/kstars/tools/argsetfocusspeedindi.ui b/kstars/kstars/tools/argsetfocusspeedindi.ui index 73023c28..2f723c4c 100644 --- a/kstars/kstars/tools/argsetfocusspeedindi.ui +++ b/kstars/kstars/tools/argsetfocusspeedindi.ui @@ -1,10 +1,10 @@ ArgSetFocusSpeedINDI - + ArgSetFocusSpeedINDI - + 0 0 @@ -26,7 +26,7 @@ Expanding - + 20 9 @@ -43,7 +43,7 @@ Expanding - + 45 21 @@ -55,7 +55,7 @@ deviceName - + textLabel1 @@ -63,7 +63,7 @@ Device: - + textLabel1_2 @@ -84,7 +84,7 @@ - + klineedit.h knuminput.h diff --git a/kstars/kstars/tools/argsetfocustimeoutindi.ui b/kstars/kstars/tools/argsetfocustimeoutindi.ui index fd7a827c..67687cca 100644 --- a/kstars/kstars/tools/argsetfocustimeoutindi.ui +++ b/kstars/kstars/tools/argsetfocustimeoutindi.ui @@ -1,10 +1,10 @@ ArgSetFocusTimeoutINDI - + ArgSetFocusTimeoutINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout64 + tqlayout64 unnamed - + - layout63 + tqlayout63 unnamed - + textLabel1 @@ -40,7 +40,7 @@ Device: - + textLabel1_2 @@ -50,9 +50,9 @@ - + - layout62 + tqlayout62 @@ -86,7 +86,7 @@ Expanding - + 27 21 @@ -105,7 +105,7 @@ Expanding - + 20 9 @@ -114,7 +114,7 @@ - + klineedit.h knuminput.h diff --git a/kstars/kstars/tools/argsetframetypeindi.ui b/kstars/kstars/tools/argsetframetypeindi.ui index 4400fe06..16429e9d 100644 --- a/kstars/kstars/tools/argsetframetypeindi.ui +++ b/kstars/kstars/tools/argsetframetypeindi.ui @@ -1,10 +1,10 @@ ArgSetFrameTypeINDI - + ArgSetFrameTypeINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout55 + tqlayout55 unnamed - + - layout47 + tqlayout47 unnamed - + textLabel1 @@ -40,7 +40,7 @@ Device: - + textLabel1_2 @@ -50,9 +50,9 @@ - + - layout54 + tqlayout54 @@ -63,7 +63,7 @@ deviceName - + typeCombo @@ -80,7 +80,7 @@ Expanding - + 56 21 @@ -99,7 +99,7 @@ Expanding - + 20 9 @@ -108,7 +108,7 @@ - + klineedit.h diff --git a/kstars/kstars/tools/argsetgeolocation.ui b/kstars/kstars/tools/argsetgeolocation.ui index 00e0f7b0..5b5ecf93 100644 --- a/kstars/kstars/tools/argsetgeolocation.ui +++ b/kstars/kstars/tools/argsetgeolocation.ui @@ -1,10 +1,10 @@ ArgSetGeoLocation - + ArgSetGeoLocation - + 0 0 @@ -16,31 +16,31 @@ unnamed - + - layout36 + tqlayout36 unnamed - + - layout35 + tqlayout35 unnamed - + - layout34 + tqlayout34 unnamed - + textLabel1_2 @@ -59,7 +59,7 @@ Enter the Country name for the desired location. It might be easier to use the "Find City" location to choose your location from the list of predefined cities. - + textLabel1 @@ -67,7 +67,7 @@ City: - + textLabel1_2_3 @@ -99,9 +99,9 @@ - + - layout33 + tqlayout33 @@ -117,7 +117,7 @@ Expanding - + 49 20 @@ -152,7 +152,7 @@ Expanding - + 49 20 @@ -171,7 +171,7 @@ Expanding - + 20 40 @@ -188,10 +188,10 @@ CountryName FindCityButton - + slotFindCity() - - + + klineedit.h klineedit.h diff --git a/kstars/kstars/tools/argsetgeolocationindi.ui b/kstars/kstars/tools/argsetgeolocationindi.ui index 6dd5fbf8..2dfdf5db 100644 --- a/kstars/kstars/tools/argsetgeolocationindi.ui +++ b/kstars/kstars/tools/argsetgeolocationindi.ui @@ -1,10 +1,10 @@ ArgSetGeoLocationINDI - + ArgSetGeoLocationINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout34 + tqlayout34 unnamed - + - layout32 + tqlayout32 unnamed - + textLabel1_3 @@ -40,7 +40,7 @@ Device: - + textLabel1 @@ -48,7 +48,7 @@ Long: - + textLabel1_2 @@ -58,9 +58,9 @@ - + - layout33 + tqlayout33 @@ -129,7 +129,7 @@ Expanding - + 20 23 @@ -161,7 +161,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042149444154789c8d95c18b1c4514c67fbb29e5b54ea05b26da1d36b08d096e8b11261871837bc8e282ac7ac82187e049a317e32d37110992bf42123c694eea414c0e0bf1b0ec6c402139485a54e8810c54c10e741146fa110bd643f74c12bd642e4d75f77cf5d5ef7dafdfc2ce7087d9eff32fdfdff74e5114104011e489d6e952cce5cfbe5998692dec0c77b87aedd3fddd9f2b3efce02291082209aa3504685022e4ffd7a000a82a765c515615ce95acae659c3f7765c100ec6e575cf8f822e991025f3b6a6f890c484f181ccfc1583428f5d4e2fe84da039aa04121b40eb32483a0ec6e5bce9f8385d36fa7fb9b1b17c8f31cbfe7a95c45be94520c72b2141a1caa160d1666e24ea94aa11ee7685054159d2ada34d41387c40dc63b8844f0b5c73a4bb19cb3f9de001f2aac1fa23aa209168c004224902e29d22ff1e38abbdb275055c4800610233867311a1491847a62c98f66ac6f14d8e99072f22daa15b68a8108424d6422e24c88e3966fbce4c9d786945b27f0be0103ed13c16004d59a2c4d58df28a87548e9aee2274ab95d60c7193c9a0281fc959ae2a4450364a9e2572c7a2b43438374ef2dd2154012d050514dbec7396578a3130d9d6850066f0ad9d186f2d78cdbbb799b0a202f2c48d3aebbb418310240b112637588574bf54b8efaa4fd9b691dacbf5b305813542bae63a9eee4c4694d967b5494eca8c7ef0933bdc5d90e6a2caa0e3f013b7adce9fa5b03d637561113a30106a71d18c5fd9677058338ad01e91c0b8b743b880182ce19cd9c0e5e2b583fbdda565d3d04cfedad180942133af201b2bc3588e111c680068f489780ce69b192b279768088524f2b3458ea694d3de99a4323bc976ed34eb86b98c51993f6be10f77240c99685cd731991f1582df15aa15a213d583f5313a7806988fb8a0640e336359d9e9933568bf44062214ba19e2a7652a13d8b068ff596b807182189234e9da9f1ceb78c81b28c3ac6fe21e306c58e41d5118952acd6a0c2f56b9e6a5c72f346cdcd6b19a3bf8010010d714f89533b674c90c7189b598eab12a45fb5c75b8253672b863fbcccf5af93b6904119fe9851bf5153ac3a746ae7b9d5698c1dc58f313e70e4707ce9d84bafa2f79fc23fb8c7c1438ef04031a2642fee21060ec69ee47020796ecaa12313ccd333d1b67935047acf2be3bb11aa010dbe656cc755dbe3b772084a7ebc6d5711253b593dfcc0cc8fcd3cafda455512c7f200ec56cbfac0f1d7d34b7fdf0f98fd88a92a7e9cb0e70cc933c0b38a2c823ea0bd76c70c016adb67f47bc2a117a6d40abeea33fa23c2fb867edfb413e4a34fded94ffb3991c46dc7754cd3634ad2af490b857f5a5137126a97e02a8120a485235b6a28ef80bd077ee2b9f2d54fed04595dcbd8ddb6c4bd87334c10cadb2064e856177e7864e669fbe1df154a0142839f7ad2e5b6880bff1da66eece78e315d959f609da670f98befe6c3f45fb42672c9acff7f660000000049454e44ae426082 - + klineedit.h dmsbox.h diff --git a/kstars/kstars/tools/argsetlocaltime.ui b/kstars/kstars/tools/argsetlocaltime.ui index 03247473..9f1e8c9b 100644 --- a/kstars/kstars/tools/argsetlocaltime.ui +++ b/kstars/kstars/tools/argsetlocaltime.ui @@ -1,10 +1,10 @@ ArgSetLocalTime - + ArgSetLocalTime - + 0 0 @@ -21,9 +21,9 @@ DateBox - + - layout43 + tqlayout43 @@ -39,14 +39,14 @@ Expanding - + 70 20 - + TimeBox @@ -69,7 +69,7 @@ Expanding - + 20 20 @@ -101,5 +101,5 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154789cb5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c203e47720000000049454e44ae426082 - + diff --git a/kstars/kstars/tools/argsetportindi.ui b/kstars/kstars/tools/argsetportindi.ui index 2ca20aa4..fad42e04 100644 --- a/kstars/kstars/tools/argsetportindi.ui +++ b/kstars/kstars/tools/argsetportindi.ui @@ -1,10 +1,10 @@ ArgSetPortINDI - + ArgSetPortINDI - + 0 0 @@ -16,15 +16,15 @@ unnamed - + - layout23 + tqlayout23 unnamed - + textLabel1 @@ -32,7 +32,7 @@ Device: - + textLabel1_2 @@ -62,7 +62,7 @@ Expanding - + 20 9 @@ -71,7 +71,7 @@ - + klineedit.h klineedit.h diff --git a/kstars/kstars/tools/argsetradec.ui b/kstars/kstars/tools/argsetradec.ui index b78ac04a..28ce300d 100644 --- a/kstars/kstars/tools/argsetradec.ui +++ b/kstars/kstars/tools/argsetradec.ui @@ -1,10 +1,10 @@ ArgSetRaDec - + ArgSetRaDec - + 0 0 @@ -16,9 +16,9 @@ unnamed - + - layout13 + tqlayout13 @@ -48,7 +48,7 @@ Declination is one of the coordinates in the Equatorial coordinate system; it measures the angle of an object North or South of the Celestial Equator. The star Polaris, which is near the celestial north pole, has a Declination of nearly 90 degrees. - + textLabel1 @@ -80,7 +80,7 @@ Declination is one of the coordinates in the Equatorial coordinate system; it me Right Ascension is one of the coordinates in the Equatorial coordinate system. It measures the angle around the celestial equator from the Vernal equinox, increasing to the East. Right Ascension (RA) is almost always expressed in Hours instead of Degrees; the Celestial Equator is divided into 24 Hours, so 1 Hour of RA is equal to 360/24=15 Degrees. See the AstroInfo article for more details, - + textLabel1_2 @@ -100,7 +100,7 @@ Right Ascension is one of the coordinates in the Equatorial coordinate system. Expanding - + 20 40 @@ -136,7 +136,7 @@ Right Ascension is one of the coordinates in the Equatorial coordinate system. RaBox DecBox - + dmsbox.h dmsbox.h diff --git a/kstars/kstars/tools/argsetscopeactionindi.ui b/kstars/kstars/tools/argsetscopeactionindi.ui index 528e783e..dc877bdf 100644 --- a/kstars/kstars/tools/argsetscopeactionindi.ui +++ b/kstars/kstars/tools/argsetscopeactionindi.ui @@ -1,10 +1,10 @@ ArgSetScopeActionINDI - + ArgSetScopeActionINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout55 + tqlayout55 unnamed - + - layout47 + tqlayout47 unnamed - + textLabel1 @@ -40,7 +40,7 @@ Device: - + textLabel1_2 @@ -50,9 +50,9 @@ - + - layout54 + tqlayout54 @@ -63,7 +63,7 @@ deviceName - + actionCombo @@ -80,7 +80,7 @@ Expanding - + 56 21 @@ -99,7 +99,7 @@ Expanding - + 20 9 @@ -108,7 +108,7 @@ - + klineedit.h diff --git a/kstars/kstars/tools/argsettargetcoordindi.ui b/kstars/kstars/tools/argsettargetcoordindi.ui index 8973b24b..fb4aa1e4 100644 --- a/kstars/kstars/tools/argsettargetcoordindi.ui +++ b/kstars/kstars/tools/argsettargetcoordindi.ui @@ -1,10 +1,10 @@ ArgSetTargetCoordINDI - + ArgSetTargetCoordINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout34 + tqlayout34 unnamed - + - layout32 + tqlayout32 unnamed - + textLabel1_3 @@ -40,7 +40,7 @@ Device: - + textLabel1 @@ -48,7 +48,7 @@ RA: - + textLabel1_2 @@ -58,9 +58,9 @@ - + - layout33 + tqlayout33 @@ -129,7 +129,7 @@ Expanding - + 20 24 @@ -161,7 +161,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042149444154789c8d95c18b1c4514c67fbb29e5b54ea05b26da1d36b08d096e8b11261871837bc8e282ac7ac82187e049a317e32d37110992bf42123c694eea414c0e0bf1b0ec6c402139485a54e8810c54c10e741146fa110bd643f74c12bd642e4d75f77cf5d5ef7dafdfc2ce7087d9eff32fdfdff74e5114104011e489d6e952cce5cfbe5998692dec0c77b87aedd3fddd9f2b3efce02291082209aa3504685022e4ffd7a000a82a765c515615ce95acae659c3f7765c100ec6e575cf8f822e991025f3b6a6f890c484f181ccfc1583428f5d4e2fe84da039aa04121b40eb32483a0ec6e5bce9f8385d36fa7fb9b1b17c8f31cbfe7a95c45be94520c72b2141a1caa160d1666e24ea94aa11ee7685054159d2ada34d41387c40dc63b8844f0b5c73a4bb19cb3f9de001f2aac1fa23aa209168c004224902e29d22ff1e38abbdb275055c4800610233867311a1491847a62c98f66ac6f14d8e99072f22daa15b68a8108424d6422e24c88e3966fbce4c9d786945b27f0be0103ed13c16004d59a2c4d58df28a87548e9aee2274ab95d60c7193c9a0281fc959ae2a4450364a9e2572c7a2b43438374ef2dd2154012d050514dbec7396578a3130d9d6850066f0ad9d186f2d78cdbbb799b0a202f2c48d3aebbb418310240b112637588574bf54b8efaa4fd9b691dacbf5b305813542bae63a9eee4c4694d967b5494eca8c7ef0933bdc5d90e6a2caa0e3f013b7adce9fa5b03d637561113a30106a71d18c5fd9677058338ad01e91c0b8b743b880182ce19cd9c0e5e2b583fbdda565d3d04cfedad180942133af201b2bc3588e111c680068f489780ce69b192b279768088524f2b3458ea694d3de99a4323bc976ed34eb86b98c51993f6be10f77240c99685cd731991f1582df15aa15a213d583f5313a7806988fb8a0640e336359d9e9933568bf44062214ba19e2a7652a13d8b068ff596b807182189234e9da9f1ceb78c81b28c3ac6fe21e306c58e41d5118952acd6a0c2f56b9e6a5c72f346cdcd6b19a3bf8010010d714f89533b674c90c7189b598eab12a45fb5c75b8253672b863fbcccf5af93b6904119fe9851bf5153ac3a746ae7b9d5698c1dc58f313e70e4707ce9d84bafa2f79fc23fb8c7c1438ef04031a2642fee21060ec69ee47020796ecaa12313ccd333d1b67935047acf2be3bb11aa010dbe656cc755dbe3b772084a7ebc6d5711253b593dfcc0cc8fcd3cafda455512c7f200ec56cbfac0f1d7d34b7fdf0f98fd88a92a7e9cb0e70cc933c0b38a2c823ea0bd76c70c016adb67f47bc2a117a6d40abeea33fa23c2fb867edfb413e4a34fded94ffb3991c46dc7754cd3634ad2af490b857f5a5137126a97e02a8120a485235b6a28ef80bd077ee2b9f2d54fed04595dcbd8ddb6c4bd87334c10cadb2064e856177e7864e669fbe1df154a0142839f7ad2e5b6880bff1da66eece78e315d959f609da670f98befe6c3f45fb42672c9acff7f660000000049454e44ae426082 - + klineedit.h dmsbox.h diff --git a/kstars/kstars/tools/argsettargetnameindi.ui b/kstars/kstars/tools/argsettargetnameindi.ui index 0f4b17f9..5ed3aea9 100644 --- a/kstars/kstars/tools/argsettargetnameindi.ui +++ b/kstars/kstars/tools/argsettargetnameindi.ui @@ -1,10 +1,10 @@ ArgSetTargetNameINDI - + ArgSetTargetNameINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout44 + tqlayout44 unnamed - + - layout40 + tqlayout40 unnamed - + textLabel1_2 @@ -40,7 +40,7 @@ Device: - + textLabel1 @@ -50,9 +50,9 @@ - + - layout41 + tqlayout41 @@ -70,9 +70,9 @@ - + - layout42 + tqlayout42 @@ -88,7 +88,7 @@ Expanding - + 52 20 @@ -128,7 +128,7 @@ Expanding - + 20 8 @@ -139,7 +139,7 @@ - + klineedit.h klineedit.h diff --git a/kstars/kstars/tools/argsettrack.ui b/kstars/kstars/tools/argsettrack.ui index bacb0597..edf2d0bf 100644 --- a/kstars/kstars/tools/argsettrack.ui +++ b/kstars/kstars/tools/argsettrack.ui @@ -1,10 +1,10 @@ ArgSetTrack - + ArgSetTrack - + 0 0 @@ -16,15 +16,15 @@ unnamed - + - layout24 + tqlayout24 unnamed - + CheckTrack @@ -50,7 +50,7 @@ If unchecked, then Tracking will be forced off, even if an object has been cente Expanding - + 40 20 @@ -69,7 +69,7 @@ If unchecked, then Tracking will be forced off, even if an object has been cente Expanding - + 20 40 @@ -78,5 +78,5 @@ If unchecked, then Tracking will be forced off, even if an object has been cente - + diff --git a/kstars/kstars/tools/argsetutcindi.ui b/kstars/kstars/tools/argsetutcindi.ui index 9c0f1302..cbc96c51 100644 --- a/kstars/kstars/tools/argsetutcindi.ui +++ b/kstars/kstars/tools/argsetutcindi.ui @@ -1,10 +1,10 @@ ArgSetUTCINDI - + ArgSetUTCINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout88 + tqlayout88 unnamed - + - layout86 + tqlayout86 unnamed - + textLabel1 @@ -40,7 +40,7 @@ Device: - + textLabel1_2 @@ -50,9 +50,9 @@ - + - layout87 + tqlayout87 @@ -80,7 +80,7 @@ Expanding - + 51 20 @@ -99,7 +99,7 @@ Expanding - + 20 9 @@ -110,7 +110,7 @@ - + klineedit.h klineedit.h diff --git a/kstars/kstars/tools/argshutdownindi.ui b/kstars/kstars/tools/argshutdownindi.ui index ce7be2f4..654265de 100644 --- a/kstars/kstars/tools/argshutdownindi.ui +++ b/kstars/kstars/tools/argshutdownindi.ui @@ -1,10 +1,10 @@ ArgShutdownINDI - + ArgShutdownINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout5 + tqlayout5 unnamed - + - layout4 + tqlayout4 unnamed - + textLabel1 @@ -59,7 +59,7 @@ Expanding - + 20 33 @@ -68,7 +68,7 @@ - + klineedit.h diff --git a/kstars/kstars/tools/argstartexposureindi.ui b/kstars/kstars/tools/argstartexposureindi.ui index 47a631e6..b9fb3b0d 100644 --- a/kstars/kstars/tools/argstartexposureindi.ui +++ b/kstars/kstars/tools/argstartexposureindi.ui @@ -1,10 +1,10 @@ ArgStartExposureINDI - + ArgStartExposureINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout64 + tqlayout64 unnamed - + - layout63 + tqlayout63 unnamed - + textLabel1 @@ -40,7 +40,7 @@ Device: - + duration @@ -50,9 +50,9 @@ - + - layout62 + tqlayout62 @@ -86,7 +86,7 @@ Expanding - + 27 21 @@ -105,7 +105,7 @@ Expanding - + 20 9 @@ -116,7 +116,7 @@ - + klineedit.h knuminput.h diff --git a/kstars/kstars/tools/argstartfocusindi.ui b/kstars/kstars/tools/argstartfocusindi.ui index 3bd5503c..cccf697e 100644 --- a/kstars/kstars/tools/argstartfocusindi.ui +++ b/kstars/kstars/tools/argstartfocusindi.ui @@ -1,10 +1,10 @@ ArgStartFocusINDI - + ArgStartFocusINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout55 + tqlayout55 unnamed - + - layout47 + tqlayout47 unnamed - + textLabel1 @@ -40,7 +40,7 @@ Device: - + textLabel1_2 @@ -50,9 +50,9 @@ - + - layout54 + tqlayout54 @@ -63,7 +63,7 @@ deviceName - + directionCombo @@ -80,7 +80,7 @@ Expanding - + 56 21 @@ -99,7 +99,7 @@ Expanding - + 20 9 @@ -110,7 +110,7 @@ - + klineedit.h diff --git a/kstars/kstars/tools/argstartindi.ui b/kstars/kstars/tools/argstartindi.ui index 554ea363..3f3b5767 100644 --- a/kstars/kstars/tools/argstartindi.ui +++ b/kstars/kstars/tools/argstartindi.ui @@ -1,10 +1,10 @@ ArgStartINDI - + ArgStartINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout5 + tqlayout5 unnamed - + - layout4 + tqlayout4 unnamed - + textLabel1 @@ -57,14 +57,14 @@ Expanding - + 61 20 - + INDIMode @@ -75,7 +75,7 @@ unnamed - + LocalButton @@ -86,7 +86,7 @@ true - + ServerButton @@ -108,7 +108,7 @@ Expanding - + 20 40 @@ -117,7 +117,7 @@ - + klineedit.h diff --git a/kstars/kstars/tools/argswitchindi.ui b/kstars/kstars/tools/argswitchindi.ui index f4c85a1c..88db343f 100644 --- a/kstars/kstars/tools/argswitchindi.ui +++ b/kstars/kstars/tools/argswitchindi.ui @@ -1,10 +1,10 @@ ArgSwitchINDI - + ArgSwitchINDI - + 0 0 @@ -16,23 +16,23 @@ unnamed - + - layout5 + tqlayout5 unnamed - + - layout4 + tqlayout4 unnamed - + textLabel1 @@ -57,14 +57,14 @@ Expanding - + 61 20 - + INDIConnection @@ -78,7 +78,7 @@ unnamed - + OnButton @@ -89,7 +89,7 @@ true - + OffButton @@ -111,7 +111,7 @@ Expanding - + 20 33 @@ -122,7 +122,7 @@ - + klineedit.h diff --git a/kstars/kstars/tools/argtimescale.ui b/kstars/kstars/tools/argtimescale.ui index f2b0eab3..febb793c 100644 --- a/kstars/kstars/tools/argtimescale.ui +++ b/kstars/kstars/tools/argtimescale.ui @@ -1,10 +1,10 @@ ArgTimeScale - + ArgTimeScale - + 0 0 @@ -16,9 +16,9 @@ unnamed - + - layout4 + tqlayout4 @@ -39,7 +39,7 @@ Expanding - + 150 20 @@ -58,7 +58,7 @@ Expanding - + 20 40 @@ -90,7 +90,7 @@ 789c9d95594f32591086effd15c4ba3393fae895ee4ce6824540141011b7c95cf406a202caa6f065fefb549faaea0b24996fc623cb937aeb3d55754e871f67a587eb6ee9ecc7c96a1dada74929798e96a5b374339bedfefceb8f9f27a7b65da27fcb724bf6e96f27a783752929f516f32c070402289b3fc39d8203c3136157e276c1260eac0f0ade0907927f2d9c58261f929cad72be0cef8535ff5959e277c201ef0fa02cf1ae7022f9efca12ff301ca81e87c21a5f32db5acf95b0eebfcdd92e2be3a5b0fa7986435bfd6e981d99278c0ae6795c288b3e2b98e3036157d8f839961308af985df51b1b0e9dc0098ddf5a3811fd7dceaee52a370d475e28f9b7ca1c07539f67173c144e65be2fcae2d763f62d89df2acb7cc282393e57b6b9ff58d893fca632c7d1ccc78bbcd48b4c7cc2ec4bfdf0aa2cfbf50be6fa2c65d9af2aacfd2c94e53cccf9fa7645eb7794a59ebdb027fe5565895f09cb7e981a267f9febaf3117fab6702af599e7a5e2049e6dce1377c25affa6608e4786e34a58894dfc8b59f5f890731087e28f2de648fbdb16ccfd6c9465bf7365c732f12f61ed3f5016fd4a59f4e6790fddd00a5d137f638eb4bfa532df5ffc148ea4be5ac17c5ea9b2ecd72b98efff403893fa1accb12d5c5696fd4d7f6152c41f95c53f2a98f56b6597fbf3857da9b75e30fb5584b59fa78239de5596fd3e0be6fdccf311b99115f1fcdaccb12fe77927ac7e2365f1c382793e63e14cfccdf3132571e69b1f07e83327d23fbac2bee4d785d57f2a9c89de9c6fecaa1fce98135bf845b9e2189e2a07e6fee287b0cfcf3bce9525ff5d38927a1bcca9cc1b66ca528ff93d89d338e3f9e182b9c86f31a752ff609d2f847f5f83b5ea31c218137a4f8fac0cc738e10cd6d3b7189f718a2ff88a6f38c339ad05adfcf31d3f7089ab037d42ea356e708b9ff8853bdc6395de6b58c706ad736c1ee823f2de608b146dbcc08e8976f012afb04b3975ec1de853aa2457f749d5c16b1ce00d0ecdf75b1ce1dd11fd1b55d236cef7f8808ff88465b4d02676d03da29f51dd9e513fa28f150c3004246d07002288bfe9e7d45f0712f22635a490d15ef730361e3b389c67aedf2390ea3157e73dc333e9a6f042d13ebc7ed32f6882405d3ee1c678030ee10d6630a76f162c8ee8f37adeb14c0aaa0b3e68b725ac80a2b039a29f630db6e46bc127d5fd45de4b5226b0833d8ea07a445f871ae96dacc218ead08073c835136842eba8be016db830e77a419f21aca143f76c025b9ae7e5813ea35bd5a0731fd1c4877a7f614fde57d085deb7f31ad31dccf54fd087883ab7a88f6baabb45fdf760003707fa09ddd826f66048af1826f00a0bb3aa7009b73082bb03fd2faeffa7fff58cfffcbcfffdfbc93f7f7d62d7 - + timestepbox.h diff --git a/kstars/kstars/tools/argwaitfor.ui b/kstars/kstars/tools/argwaitfor.ui index 21478f29..c09fc538 100644 --- a/kstars/kstars/tools/argwaitfor.ui +++ b/kstars/kstars/tools/argwaitfor.ui @@ -1,10 +1,10 @@ ArgWaitFor - + ArgWaitFor - + 0 0 @@ -16,15 +16,15 @@ unnamed - + - layout17 + tqlayout17 unnamed - + textLabel1 @@ -32,7 +32,7 @@ <font color="#00007f">Sec:</font> - + DelayBox @@ -53,7 +53,7 @@ Expanding - + 40 20 @@ -72,7 +72,7 @@ Expanding - + 20 40 @@ -81,5 +81,5 @@ - + diff --git a/kstars/kstars/tools/argwaitforkey.ui b/kstars/kstars/tools/argwaitforkey.ui index cb3f8610..9034751d 100644 --- a/kstars/kstars/tools/argwaitforkey.ui +++ b/kstars/kstars/tools/argwaitforkey.ui @@ -1,10 +1,10 @@ ArgWaitForKey - + ArgWaitForKey - + 0 0 @@ -16,15 +16,15 @@ unnamed - + - layout18 + tqlayout18 unnamed - + textLabel1 @@ -55,7 +55,7 @@ Only simple keys can currently be used; you cannot use modifier keys such as Ctr Expanding - + 40 20 @@ -74,7 +74,7 @@ Only simple keys can currently be used; you cannot use modifier keys such as Ctr Expanding - + 20 40 @@ -85,7 +85,7 @@ Only simple keys can currently be used; you cannot use modifier keys such as Ctr - + klineedit.h diff --git a/kstars/kstars/tools/argzoom.ui b/kstars/kstars/tools/argzoom.ui index 8b93e300..d4ccaee4 100644 --- a/kstars/kstars/tools/argzoom.ui +++ b/kstars/kstars/tools/argzoom.ui @@ -1,10 +1,10 @@ ArgZoom - + ArgZoom - + 0 0 @@ -16,15 +16,15 @@ unnamed - + - layout2 + tqlayout2 unnamed - + textLabel1 @@ -56,7 +56,7 @@ The Zoom level specifies the number of pixels which span one radian of arc. Rea Expanding - + 30 20 @@ -75,7 +75,7 @@ The Zoom level specifies the number of pixels which span one radian of arc. Rea Expanding - + 20 40 @@ -86,7 +86,7 @@ The Zoom level specifies the number of pixels which span one radian of arc. Rea - + klineedit.h diff --git a/kstars/kstars/tools/astrocalc.cpp b/kstars/kstars/tools/astrocalc.cpp index 3b87826b..98e9087b 100644 --- a/kstars/kstars/tools/astrocalc.cpp +++ b/kstars/kstars/tools/astrocalc.cpp @@ -38,8 +38,8 @@ #include -AstroCalc::AstroCalc( TQWidget* parent ) : - KDialogBase( parent, "starscalculator", true, i18n("Calculator"), Close ), +AstroCalc::AstroCalc( TQWidget* tqparent ) : + KDialogBase( tqparent, "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) @@ -58,11 +58,11 @@ AstroCalc::AstroCalc( TQWidget* parent ) : navigationPanel->addColumn("Section"); navigationPanel->setRootIsDecorated(1); - TQPixmap jdIcon = TQPixmap ("jd.png"); - TQPixmap geodIcon = TQPixmap ("geodetic.png"); - TQPixmap solarIcon = TQPixmap ("geodetic.png"); - TQPixmap sunsetIcon = TQPixmap ("sunset.png"); - TQPixmap timeIcon = TQPixmap ("sunclock.png"); + TQPixmap jdIcon = TQPixmap (TQString("jd.png")); + TQPixmap geodIcon = TQPixmap (TQString("geodetic.png")); + TQPixmap solarIcon = TQPixmap (TQString("geodetic.png")); + TQPixmap sunsetIcon = TQPixmap (TQString("sunset.png")); + TQPixmap timeIcon = TQPixmap (TQString("sunclock.png")); TQListViewItem * timeItem = new TQListViewItem(navigationPanel,i18n("Time Calculators")); timeItem->setPixmap(0,timeIcon); @@ -78,7 +78,7 @@ AstroCalc::AstroCalc( TQWidget* parent ) : TQListViewItem * coordItem = new TQListViewItem(navigationPanel,i18n("Celestial Coordinates")); new TQListViewItem(coordItem,i18n("Galactic Coordinates")); new TQListViewItem(coordItem,i18n("Precession")); - new TQListViewItem(coordItem,i18n("Apparent Coordinates")); + new TQListViewItem(coordItem,i18n("Aptqparent 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("Apparent Coordinates")))) + if(!(election.compare(i18n("Aptqparent Coordinates")))) genAppFrame(); if(!(election.compare(i18n("Horizontal Coordinates")))) genAzelFrame(); @@ -190,7 +190,7 @@ void AstroCalc::genCoordText(void) "
  • " "Galactic: Galactic/Equatorial coordinates conversion" "
  • " - "Apparent: Computation of current equatorial coordinates" + "Aptqparent: 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 == Apparent) + else if (rightPanel == Aptqparent) 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,"Apparent"); - rightPanel = Apparent; + AppFrame = new modCalcApCoord(split,"Aptqparent"); + rightPanel = Aptqparent; } void AstroCalc::genAzelFrame(void) @@ -374,7 +374,7 @@ void AstroCalc::genVlsrFrame(void) rightPanel = Vlsr; } -TQSize AstroCalc::sizeHint() const +TQSize AstroCalc::tqsizeHint() const { return TQSize(640,430); } diff --git a/kstars/kstars/tools/astrocalc.h b/kstars/kstars/tools/astrocalc.h index bbabcb24..c88bd104 100644 --- a/kstars/kstars/tools/astrocalc.h +++ b/kstars/kstars/tools/astrocalc.h @@ -56,11 +56,11 @@ class modCalcVlsr; class AstroCalc : public KDialogBase { - -Q_OBJECT +Q_OBJECT +TQ_OBJECT public: /** construtor */ - AstroCalc(TQWidget *parent = 0); + AstroCalc(TQWidget *tqparent = 0); /** destructor */ ~AstroCalc(); @@ -101,7 +101,7 @@ Q_OBJECT /**Generate frame for Precession frame. */ void genPrecFrame(void); - /**Generate frame for apparent coordinates frame. */ + /**Generate frame for aptqparent coordinates frame. */ void genAppFrame(void); /**Generate frame for horizontal coordinates frame. */ @@ -120,7 +120,7 @@ Q_OBJECT void delRightPanel(void); /**@returns suggested size of calculator window. */ - TQSize sizeHint() const; + TQSize tqsizeHint() const; public slots: /**Determine which item is selected in the function menu TQListBox. @@ -137,7 +137,7 @@ Q_OBJECT TQVBox *vbox, *rightBox; TQString previousElection; - enum typeOfPanel {GenText, TimeText, GeoText, SolarText, CoordText, JD, SidTime, DayLength, Equinox, GeoCoord, Galactic, Precessor, Apparent, Azel, Planets, Ecliptic, AngDist, Vlsr}; + enum typeOfPanel {GenText, TimeText, GeoText, SolarText, CoordText, JD, SidTime, DayLength, Equinox, GeoCoord, Galactic, Precessor, Aptqparent, Azel, Planets, Ecliptic, AngDist, Vlsr}; typeOfPanel rightPanel; modCalcJD *JDFrame; diff --git a/kstars/kstars/tools/jmoontool.cpp b/kstars/kstars/tools/jmoontool.cpp index 7d7add93..f4d63cf3 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 *parent, const char *name) - : KDialogBase( KDialogBase::Plain, i18n("Jupiter Moons Tool"), Close, Close, parent, name ) +JMoonTool::JMoonTool(TQWidget *tqparent, const char *name) + : KDialogBase( KDialogBase::Plain, i18n("Jupiter Moons Tool"), Close, Close, tqparent, name ) { - ksw = (KStars*)parent; + ksw = (KStars*)tqparent; TQFrame *page = plainPage(); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 ); @@ -49,14 +49,14 @@ JMoonTool::JMoonTool(TQWidget *parent, const char *name) TQLabel *labGn = new TQLabel( "Ganymede", page ); TQLabel *labCa = new TQLabel( "Callisto", page ); - labIo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - labEu->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - labGn->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - labCa->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - labIo->setAlignment( AlignHCenter ); - labEu->setAlignment( AlignHCenter ); - labGn->setAlignment( AlignHCenter ); - labCa->setAlignment( AlignHCenter ); + labIo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + labEu->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + labGn->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + labCa->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + labIo->tqsetAlignment( AlignHCenter ); + labEu->tqsetAlignment( AlignHCenter ); + labGn->tqsetAlignment( AlignHCenter ); + labCa->tqsetAlignment( AlignHCenter ); labIo->setPaletteForegroundColor( colIo ); labEu->setPaletteForegroundColor( colEu ); diff --git a/kstars/kstars/tools/jmoontool.h b/kstars/kstars/tools/jmoontool.h index 70c33e79..7c0abee4 100644 --- a/kstars/kstars/tools/jmoontool.h +++ b/kstars/kstars/tools/jmoontool.h @@ -30,8 +30,9 @@ class KStars; class JMoonTool : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - JMoonTool(TQWidget *parent = 0, const char *name = 0); + JMoonTool(TQWidget *tqparent = 0, const char *name = 0); ~JMoonTool(); protected: diff --git a/kstars/kstars/tools/kstarsplotwidget.cpp b/kstars/kstars/tools/kstarsplotwidget.cpp index dcbe36b7..d07c3e36 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 *parent, const char* name ) - : KPlotWidget( x1, x2, y1, y2, parent, name ), +KStarsPlotWidget::KStarsPlotWidget( double x1, double x2, double y1, double y2, TQWidget *tqparent, const char* name ) + : KPlotWidget( x1, x2, y1, y2, tqparent, 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 mask out-of-bounds plot data + //First, fill in padding region with bgColor() to tqmask out-of-bounds plot data p->setPen( bgColor() ); p->setBrush( bgColor() ); @@ -319,7 +319,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { } p->setPen( fgColor() ); - p->setBrush( Qt::NoBrush ); + p->setBrush( TQt::NoBrush ); if ( LeftAxis.isVisible() || BottomAxis.isVisible() ) p->drawRect( PixRect ); //box outline @@ -358,14 +358,14 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { switch ( xAxisType() ) { case DOUBLE : { - TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); - int idot = str.find( '.' ); + TQString str = TQString( "%1" ).tqarg( lab, 0, 'g', 2 ); + int idot = str.tqfind( '.' ); if ( idot >= 0 ) - str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() ); if ( px > 0 && px < pW ) { TQRect r( px - BIGTICKSIZE, pH+BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -379,7 +379,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString().sprintf( "%02d:%02d", h, m ); if ( px > 0 && px < pW ) { TQRect r( px - BIGTICKSIZE, pH+BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -388,7 +388,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString().sprintf( "%d%c", int(lab), 176 ); if ( px > 0 && px < pW ) { TQRect r( px - BIGTICKSIZE, pH+BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -426,14 +426,14 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { switch ( yAxisType() ) { case DOUBLE : { - TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); - int idot = str.find( '.' ); + TQString str = TQString( "%1" ).tqarg( lab, 0, 'g', 2 ); + int idot = str.tqfind( '.' ); if ( idot >= 0 ) - str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() ); if ( py > 0 && py < pH ) { TQRect r( -2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -447,7 +447,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString().sprintf( "%02d:%02d", h, m ); if ( py > 0 && py < pH ) { TQRect r( -3*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -456,7 +456,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString().sprintf( "%d%c", int(lab), 176 ); if ( py > 0 && py < pH ) { TQRect r( -3*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -492,14 +492,14 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { switch ( xAxisType() ) { case DOUBLE : { - TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); - int idot = str.find( '.' ); + TQString str = TQString( "%1" ).tqarg( lab, 0, 'g', 2 ); + int idot = str.tqfind( '.' ); if ( idot >= 0 ) - str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() ); if ( px > 0 && px < pW ) { TQRect r( px - BIGTICKSIZE, -2*BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -513,7 +513,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString().sprintf( "%02d:%02d", h, m ); if ( px > 0 && px < pW ) { TQRect r( px - BIGTICKSIZE, -2*BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -522,7 +522,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString().sprintf( "%d%c", int(lab), 176 ); if ( px > 0 && px < pW ) { TQRect r( px - BIGTICKSIZE, -2*BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -556,14 +556,14 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { switch ( yAxisType() ) { case DOUBLE : { - TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); - int idot = str.find( '.' ); + TQString str = TQString( "%1" ).tqarg( lab, 0, 'g', 2 ); + int idot = str.tqfind( '.' ); if ( idot >= 0 ) - str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() ); if ( py > 0 && py < pH ) { TQRect r( pW + 2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -577,7 +577,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString().sprintf( "%02d:%02d", h, m ); if ( py > 0 && py < pH ) { TQRect r( pW + 2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -586,7 +586,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString().sprintf( "%d%c", int(lab), 176 ); if ( py > 0 && py < pH ) { TQRect r( pW + 3*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, str ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, str ); } break; } @@ -611,11 +611,11 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { //Draw X Axis Label(s) if ( ! BottomAxis.label().isEmpty() ) { TQRect r( 0, PixRect.height() + 2*YPADDING, PixRect.width(), YPADDING ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, BottomAxis.label() ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, BottomAxis.label() ); } if ( ! XAxisLabel2.isEmpty() ) { TQRect r( 0, -3*YPADDING, PixRect.width(), YPADDING ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, XAxisLabel2 ); + p->drawText( r, TQt::AlignCenter | TQt::DontClip, XAxisLabel2 ); } //Draw Y Axis Label(s). We need to draw the text sideways. @@ -628,7 +628,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { p->rotate( -90.0 ); TQRect r( 0, 0, PixRect.height(), XPADDING ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, LeftAxis.label() ); //draw the label, now that we are sideways + p->drawText( r, TQt::AlignCenter | TQt::DontClip, LeftAxis.label() ); //draw the label, now that we are sideways p->restore(); //restore translation/rotation state } @@ -641,7 +641,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { p->rotate( -90.0 ); TQRect r( 0, 0, PixRect.height(), XPADDING ); - p->drawText( r, Qt::AlignCenter | Qt::DontClip, YAxisLabel2 ); //draw the label, now that we are sideways + p->drawText( r, TQt::AlignCenter | TQt::DontClip, YAxisLabel2 ); //draw the label, now that we are sideways p->restore(); //restore translation/rotation state } diff --git a/kstars/kstars/tools/kstarsplotwidget.h b/kstars/kstars/tools/kstarsplotwidget.h index a3c00d88..be672454 100644 --- a/kstars/kstars/tools/kstarsplotwidget.h +++ b/kstars/kstars/tools/kstarsplotwidget.h @@ -38,10 +38,11 @@ class TQPixmap; class KStarsPlotWidget : public KPlotWidget { Q_OBJECT + TQ_OBJECT public: /**Constructor */ - KStarsPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, TQWidget *parent=0, const char* name=0 ); + KStarsPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, TQWidget *tqparent=0, const char* name=0 ); /**Destructor (empty) */ diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp index bc682bbb..1cc0b8e1 100644 --- a/kstars/kstars/tools/lcgenerator.cpp +++ b/kstars/kstars/tools/lcgenerator.cpp @@ -39,11 +39,11 @@ #include -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) +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) { - ksw = (KStars*) parent; + ksw = (KStars*) tqparent; createGUI(); downloadJob = 0; @@ -69,10 +69,10 @@ void LCGenerator::createGUI() StarInfoBox = new TQGroupBox( page, "StarInfoBox" ); StarInfoBox->setColumnLayout(0, Qt::Vertical ); - StarInfoBox->layout()->setSpacing( 6 ); - StarInfoBox->layout()->setMargin( 11 ); - StarInfoBoxLayout = new TQVBoxLayout( StarInfoBox->layout() ); - StarInfoBoxLayout->setAlignment( Qt::AlignTop ); + StarInfoBox->tqlayout()->setSpacing( 6 ); + StarInfoBox->tqlayout()->setMargin( 11 ); + StarInfoBoxLayout = new TQVBoxLayout( StarInfoBox->tqlayout() ); + StarInfoBoxLayout->tqsetAlignment( TQt::AlignTop ); DesignHLayout = new TQHBoxLayout( 0, 0, 6, "DesignHLayout"); @@ -125,10 +125,10 @@ void LCGenerator::createGUI() DataSelectBox = new TQGroupBox( page, "DataSelectBox" ); DataSelectBox->setColumnLayout(0, Qt::Vertical ); - DataSelectBox->layout()->setSpacing( 6 ); - DataSelectBox->layout()->setMargin( 11 ); - DataSelectBoxLayout = new TQVBoxLayout( DataSelectBox->layout() ); - DataSelectBoxLayout->setAlignment( Qt::AlignTop ); + DataSelectBox->tqlayout()->setSpacing( 6 ); + DataSelectBox->tqlayout()->setMargin( 11 ); + DataSelectBoxLayout = new TQVBoxLayout( DataSelectBox->tqlayout() ); + DataSelectBoxLayout->tqsetAlignment( TQt::AlignTop ); VisualCheck = new TQCheckBox( DataSelectBox, "VisualCheck" ); VisualCheck->setChecked( TRUE ); @@ -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" ); - // parent of imageview is KStars + // tqparent 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(); // parent-widgets should not get this event, so it will be filtered + ev->accept(); // tqparent-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 4e8e055c..6d570060 100644 --- a/kstars/kstars/tools/lcgenerator.h +++ b/kstars/kstars/tools/lcgenerator.h @@ -54,12 +54,13 @@ struct VariableStarInfo class LCGenerator : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /**Constructor - *@p parent pointer to the parent widget + *@p tqparent pointer to the tqparent widget */ - LCGenerator( TQWidget* parent = 0); + LCGenerator( TQWidget* tqparent = 0); /**Destructor */ ~LCGenerator(); diff --git a/kstars/kstars/tools/modcalcangdist.cpp b/kstars/kstars/tools/modcalcangdist.cpp index 750ae6d6..96cdbd02 100644 --- a/kstars/kstars/tools/modcalcangdist.cpp +++ b/kstars/kstars/tools/modcalcangdist.cpp @@ -30,7 +30,7 @@ //#include ..already included in modcalcapcoord.h -modCalcAngDist::modCalcAngDist(TQWidget *parentSplit, const char *name) : modCalcAngDistDlg(parentSplit,name) { +modCalcAngDist::modCalcAngDist(TQWidget *tqparentSplit, const char *name) : modCalcAngDistDlg(tqparentSplit,name) { ra0Box->setDegType(FALSE); ra1Box->setDegType(FALSE); @@ -98,7 +98,7 @@ void modCalcAngDist::slotRunBatch() { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -110,7 +110,7 @@ void modCalcAngDist::slotRunBatch() { // readFile( istream ); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); diff --git a/kstars/kstars/tools/modcalcangdist.h b/kstars/kstars/tools/modcalcangdist.h index c5706938..bb689596 100644 --- a/kstars/kstars/tools/modcalcangdist.h +++ b/kstars/kstars/tools/modcalcangdist.h @@ -34,6 +34,7 @@ class TQTextStream; class modCalcAngDist : public modCalcAngDistDlg { Q_OBJECT + TQ_OBJECT public: /**Constructor. */ modCalcAngDist(TQWidget *p, const char *n); diff --git a/kstars/kstars/tools/modcalcangdistdlg.ui b/kstars/kstars/tools/modcalcangdistdlg.ui index 72290976..c6d65b7c 100644 --- a/kstars/kstars/tools/modcalcangdistdlg.ui +++ b/kstars/kstars/tools/modcalcangdistdlg.ui @@ -1,10 +1,10 @@ modCalcAngDistDlg - + modCalcAngDistDlg - + 0 0 @@ -19,11 +19,11 @@ unnamed - + tabWidget3 - + tab @@ -34,15 +34,15 @@ unnamed - + - layout8 + tqlayout8 unnamed - + origCoordBox @@ -57,7 +57,7 @@ ra0Box - + 100 0 @@ -71,7 +71,7 @@ dec0Box - + 100 0 @@ -81,7 +81,7 @@ StrongFocus - + dec0Label @@ -89,7 +89,7 @@ Declination: - + ra0Label @@ -99,7 +99,7 @@ - + origCoordBox_2 @@ -114,7 +114,7 @@ ra1Box - + 100 0 @@ -128,7 +128,7 @@ dec1Box - + 100 0 @@ -138,7 +138,7 @@ StrongFocus - + dec0Label_2 @@ -146,7 +146,7 @@ Declination: - + ra0Label_2 @@ -158,9 +158,9 @@ - + - layout7 + tqlayout7 @@ -176,7 +176,7 @@ Expanding - + 145 20 @@ -201,7 +201,7 @@ Expanding - + 146 20 @@ -226,7 +226,7 @@ Expanding - + 145 20 @@ -235,7 +235,7 @@ - + outputBox @@ -256,14 +256,14 @@ Expanding - + 102 20 - + rafLabel @@ -275,7 +275,7 @@ distBox - + 100 0 @@ -295,7 +295,7 @@ Expanding - + 70 20 @@ -314,7 +314,7 @@ Expanding - + 21 171 @@ -323,7 +323,7 @@ - + tab @@ -334,7 +334,7 @@ unnamed - + InputBox_2_2 @@ -400,7 +400,7 @@ StrongFocus - + ra1CheckBatch @@ -411,7 +411,7 @@ true - + dec1CheckBatch @@ -422,7 +422,7 @@ true - + dec0CheckBatch @@ -433,7 +433,7 @@ true - + ra0CheckBatch @@ -446,7 +446,7 @@ - + buttonGroup4 @@ -457,7 +457,7 @@ unnamed - + allRadioBatch @@ -465,7 +465,7 @@ All parameters - + inputRadioBatch @@ -478,7 +478,7 @@ - + groupBox4_2 @@ -489,7 +489,7 @@ unnamed - + InputButtonBatch @@ -500,17 +500,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -523,9 +523,9 @@ - + - layout14 + tqlayout14 @@ -541,7 +541,7 @@ Expanding - + 151 21 @@ -574,7 +574,7 @@ Expanding - + 131 21 @@ -593,7 +593,7 @@ Expanding - + 20 21 @@ -660,14 +660,14 @@ slotOutputFile() - + slotComputeDist() slotClearCoords() slotInputFile() slotOutputFile() slotRunBatch() - - + + dmsbox.h dmsbox.h diff --git a/kstars/kstars/tools/modcalcapcoord.cpp b/kstars/kstars/tools/modcalcapcoord.cpp index 27f4bc0c..53f15753 100644 --- a/kstars/kstars/tools/modcalcapcoord.cpp +++ b/kstars/kstars/tools/modcalcapcoord.cpp @@ -28,7 +28,7 @@ #include #include -#include //needed for QTimeEdit +#include //needed for TQTimeEdit #include #include #include @@ -37,7 +37,7 @@ //#include ..already included in modcalcapcoord.h -modCalcApCoord::modCalcApCoord(TQWidget *parentSplit, const char *name) : modCalcApCoordDlg(parentSplit,name) { +modCalcApCoord::modCalcApCoord(TQWidget *tqparentSplit, const char *name) : modCalcApCoordDlg(tqparentSplit,name) { showCurrentTime(); ra0Box->setDegType(FALSE); @@ -62,9 +62,9 @@ SkyPoint modCalcApCoord::getEquCoords (void) { void modCalcApCoord::showCurrentTime (void) { - KStars *ks = (KStars*) parent()->parent()->parent(); + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); - KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); datBox->setDate( dt.date() ); timBox->setTime( dt.time() ); } @@ -98,7 +98,7 @@ void modCalcApCoord::slotClearCoords(){ rafBox->clearFields(); decfBox->clearFields(); epoch0Name->setText(""); - datBox->setDate(ExtDate::currentDate()); + datBox->setDate(ExtDate::tqcurrentDate()); timBox->setTime(TQTime(0,0,0)); } @@ -111,7 +111,7 @@ void modCalcApCoord::slotComputeCoords(){ SkyPoint sp; sp = getEquCoords(); - sp.apparentCoord(jd0, jd); + sp.aptqparentCoord(jd0, jd); showEquCoords( sp ); } @@ -182,7 +182,7 @@ void modCalcApCoord::slotRunBatch() { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -194,7 +194,7 @@ void modCalcApCoord::slotRunBatch() { // readFile( istream ); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); @@ -309,7 +309,7 @@ void modCalcApCoord::processLines( TQTextStream &istream ) { jd = KStarsDateTime(dtB,utB).djd(); jd0 = dt.djd(); sp = SkyPoint (raB, decB); - sp.apparentCoord(jd0, jd); + sp.aptqparentCoord(jd0, jd); ostream << sp.ra()->toHMSString() << sp.dec()->toDMSString() << endl; } diff --git a/kstars/kstars/tools/modcalcapcoord.h b/kstars/kstars/tools/modcalcapcoord.h index bb9452db..e258e585 100644 --- a/kstars/kstars/tools/modcalcapcoord.h +++ b/kstars/kstars/tools/modcalcapcoord.h @@ -36,6 +36,7 @@ class TQTextStream; class modCalcApCoord : public modCalcApCoordDlg { Q_OBJECT + TQ_OBJECT public: /**Constructor. */ modCalcApCoord(TQWidget *p, const char *n); @@ -46,7 +47,7 @@ public: SkyPoint precess (dms ra0, dms dec0, long double j0, long double jf); /**Apply precession, nutation and aberration corrections to coordinates. */ - SkyPoint apparentCoordinates (dms r0, dms d0, long double j0, long double jf); + SkyPoint aptqparentCoordinates (dms r0, dms d0, long double j0, long double jf); /** Process Lines **/ // void processLines( const TQFile * f ); diff --git a/kstars/kstars/tools/modcalcapcoorddlg.ui b/kstars/kstars/tools/modcalcapcoorddlg.ui index 5ddec248..b168c36e 100644 --- a/kstars/kstars/tools/modcalcapcoorddlg.ui +++ b/kstars/kstars/tools/modcalcapcoorddlg.ui @@ -1,10 +1,10 @@ modCalcApCoordDlg - + modCalcApCoordDlg - + 0 0 @@ -13,7 +13,7 @@ - Apparent Coordinates + Aptqparent Coordinates StrongFocus @@ -22,11 +22,11 @@ unnamed - + InteractiveTab - + tab @@ -37,15 +37,15 @@ unnamed - + - layout11 + tqlayout11 unnamed - + InputBox @@ -56,7 +56,7 @@ unnamed - + dateLabel @@ -64,7 +64,7 @@ Date: - + timeLabel @@ -82,14 +82,14 @@ Fixed - + 40 20 - + timBox @@ -98,7 +98,7 @@ datBox - + 100 0 @@ -110,7 +110,7 @@ - + origCoordBox @@ -125,7 +125,7 @@ ra0Box - + 100 0 @@ -139,7 +139,7 @@ dec0Box - + 100 0 @@ -149,7 +149,7 @@ StrongFocus - + dec0Label @@ -157,7 +157,7 @@ Declination: - + ra0Label @@ -178,7 +178,7 @@ - + epoch0Label @@ -190,9 +190,9 @@ - + - layout3 + tqlayout3 @@ -208,7 +208,7 @@ Expanding - + 81 20 @@ -233,7 +233,7 @@ Expanding - + 70 20 @@ -258,7 +258,7 @@ Expanding - + 91 20 @@ -267,12 +267,12 @@ - + outputBox - Apparent Coordinates + Aptqparent Coordinates @@ -288,22 +288,22 @@ Expanding - + 102 20 - + - layout12 + tqlayout12 unnamed - + rafLabel @@ -311,7 +311,7 @@ Right ascension: - + decfLabel @@ -323,7 +323,7 @@ rafBox - + 100 0 @@ -337,7 +337,7 @@ decfBox - + 100 0 @@ -359,7 +359,7 @@ Expanding - + 70 20 @@ -378,7 +378,7 @@ Expanding - + 20 70 @@ -387,7 +387,7 @@ - + tab @@ -398,7 +398,7 @@ unnamed - + InputBox_2_2 @@ -440,7 +440,7 @@ false - + 100 0 @@ -457,7 +457,7 @@ false - + 100 0 @@ -467,7 +467,7 @@ StrongFocus - + utCheckBatch @@ -481,7 +481,7 @@ true - + utBoxBatch @@ -489,7 +489,7 @@ false - + dateCheckBatch @@ -500,7 +500,7 @@ true - + decCheckBatch @@ -511,7 +511,7 @@ true - + epochCheckBatch @@ -526,14 +526,14 @@ false - + 100 0 - + raCheckBatch @@ -546,7 +546,7 @@ - + buttonGroup4 @@ -557,7 +557,7 @@ unnamed - + allRadioBatch @@ -565,7 +565,7 @@ All parameters - + inputRadioBatch @@ -578,7 +578,7 @@ - + groupBox4_2 @@ -589,7 +589,7 @@ unnamed - + InputButtonBatch @@ -600,17 +600,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -623,9 +623,9 @@ - + - layout14 + tqlayout14 @@ -641,7 +641,7 @@ Expanding - + 151 21 @@ -674,7 +674,7 @@ Expanding - + 131 21 @@ -693,7 +693,7 @@ Expanding - + 20 31 @@ -842,7 +842,7 @@ OutputLineEditBatch runButtonBatch - + slotComputeCoords() slotRadioBatch() slotUtCheckedBatch() @@ -854,8 +854,8 @@ slotRunBatch() slotInputFile() slotOutputFile() - - + + dmsbox.h diff --git a/kstars/kstars/tools/modcalcazel.cpp b/kstars/kstars/tools/modcalcazel.cpp index a2dee393..0175edc7 100644 --- a/kstars/kstars/tools/modcalcazel.cpp +++ b/kstars/kstars/tools/modcalcazel.cpp @@ -27,7 +27,7 @@ #include "kstarsdatetime.h" #include "libkdeedu/extdate/extdatetimeedit.h" -#include //need for QTimeEdit +#include //need for TQTimeEdit #include #include #include @@ -36,7 +36,7 @@ #include -modCalcAzel::modCalcAzel(TQWidget *parentSplit, const char *name) : modCalcAzelDlg (parentSplit,name) { +modCalcAzel::modCalcAzel(TQWidget *tqparentSplit, const char *name) : modCalcAzelDlg (tqparentSplit,name) { showCurrentDateTime(); initGeo(); @@ -79,9 +79,9 @@ SkyPoint modCalcAzel::getHorCoords (void) void modCalcAzel::showCurrentDateTime (void) { - KStars *ks = (KStars*) parent()->parent()->parent(); + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); - KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); datBox->setDate( dt.date() ); timBox->setTime( dt.time() ); @@ -130,7 +130,7 @@ void modCalcAzel::getGeoLocation (void) void modCalcAzel::initGeo(void) { - KStars *ks = (KStars*) parent()->parent()->parent(); // QSplitter->AstroCalc->KStars + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars geoPlace = new GeoLocation( ks->geo() ); } @@ -139,7 +139,7 @@ void modCalcAzel::initGeo(void) void modCalcAzel::showLongLat(void) { - KStars *ks = (KStars*) parent()->parent()->parent(); // QSplitter->AstroCalc->KStars + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars longBox->show( ks->geo()->lng() ); latBox->show( ks->geo()->lat() ); longBoxBatch->show( ks->geo()->lng() ); @@ -179,7 +179,7 @@ void modCalcAzel::slotClearCoords() elBox->clearFields(); epochName->setText(""); - datBox->setDate(ExtDate::currentDate()); + datBox->setDate(ExtDate::tqcurrentDate()); timBox->setTime(TQTime(0,0,0)); } @@ -197,7 +197,7 @@ void modCalcAzel::slotComputeCoords() if(radioApCoords->isChecked()) { sp = getEquCoords(); - sp.apparentCoord(jd0, jd); + sp.aptqparentCoord(jd0, jd); dms lat(getLatitude()); sp.EquatorialToHorizontal( &LST, &lat ); showHorCoords( sp ); @@ -328,7 +328,7 @@ void modCalcAzel::slotRunBatch() { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -340,7 +340,7 @@ void modCalcAzel::slotRunBatch() { // readFile( istream ); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); @@ -488,7 +488,7 @@ void modCalcAzel::processLines( TQTextStream &istream ) { ostream << decB.toDMSString() << space; sp = SkyPoint (raB, decB); - sp.apparentCoord(jd0, jdf); + sp.aptqparentCoord(jd0, jdf); sp.EquatorialToHorizontal( &LST, &latB ); ostream << sp.az()->toDMSString() << space << sp.alt()->toDMSString() << endl; diff --git a/kstars/kstars/tools/modcalcazel.h b/kstars/kstars/tools/modcalcazel.h index d7dae29a..ca487e47 100644 --- a/kstars/kstars/tools/modcalcazel.h +++ b/kstars/kstars/tools/modcalcazel.h @@ -35,6 +35,7 @@ class dms; class modCalcAzel : public modCalcAzelDlg { Q_OBJECT + TQ_OBJECT public: modCalcAzel(TQWidget *p, const char *n); diff --git a/kstars/kstars/tools/modcalcazeldlg.ui b/kstars/kstars/tools/modcalcazeldlg.ui index 0e1bb9fc..f3c505ed 100644 --- a/kstars/kstars/tools/modcalcazeldlg.ui +++ b/kstars/kstars/tools/modcalcazeldlg.ui @@ -1,13 +1,13 @@ modCalcAzelDlg - + modCalcAzelDlg true - + 0 0 @@ -22,11 +22,11 @@ unnamed - + tabWidget3 - + tab @@ -37,7 +37,7 @@ unnamed - + inputGroupBox @@ -48,9 +48,9 @@ unnamed - + - layout20 + tqlayout20 @@ -64,7 +64,7 @@ StrongFocus - + timBox @@ -77,7 +77,7 @@ - + timLabel @@ -85,7 +85,7 @@ Universal time: - + dateLabel @@ -105,22 +105,22 @@ Fixed - + 20 20 - + - layout11 + tqlayout11 unnamed - + longLabel @@ -132,7 +132,7 @@ longBox - + 100 0 @@ -142,7 +142,7 @@ StrongFocus - + latLabel @@ -154,7 +154,7 @@ latBox - + 100 0 @@ -168,7 +168,7 @@ - + buttonGroup4_2 @@ -179,18 +179,18 @@ unnamed - + radioApCoords - Apparent coordinates + Aptqparent coordinates true - + radioHorCoords @@ -200,7 +200,7 @@ - + Layout10 @@ -214,17 +214,17 @@ 6 - + Compute - + 0 25 - + 120 32767 @@ -234,17 +234,17 @@ Convert - + Clear - + 0 25 - + 120 32767 @@ -256,15 +256,15 @@ - + - layout21 + tqlayout21 unnamed - + GroupBox2 @@ -275,7 +275,7 @@ unnamed - + raLabel @@ -290,7 +290,7 @@ true - + 100 0 @@ -300,7 +300,7 @@ StrongFocus - + decLabel @@ -312,7 +312,7 @@ decBox - + 100 0 @@ -322,7 +322,7 @@ StrongFocus - + epochName @@ -334,14 +334,14 @@ 0 - + 32767 32767 - + epochLabel @@ -361,14 +361,14 @@ Fixed - + 16 20 - + GroupBox3 @@ -383,7 +383,7 @@ azBox - + 100 0 @@ -393,7 +393,7 @@ StrongFocus - + azLabel @@ -401,7 +401,7 @@ Azimuth: - + elLabel @@ -413,7 +413,7 @@ elBox - + 100 0 @@ -437,7 +437,7 @@ Expanding - + 20 77 @@ -446,7 +446,7 @@ - + tab @@ -457,7 +457,7 @@ unnamed - + InputBox_2_2 @@ -479,7 +479,7 @@ unnamed - + utCheckBatch @@ -493,7 +493,7 @@ false - + dateCheckBatch @@ -504,7 +504,7 @@ false - + raCheckBatch @@ -515,7 +515,7 @@ true - + decCheckBatch @@ -526,7 +526,7 @@ true - + epochCheckBatch @@ -534,7 +534,7 @@ Epoch: - + utBoxBatch @@ -557,7 +557,7 @@ false - + 100 0 @@ -574,7 +574,7 @@ false - + 100 0 @@ -597,7 +597,7 @@ - + azCheckBatch @@ -615,7 +615,7 @@ true - + 100 0 @@ -632,7 +632,7 @@ false - + 100 0 @@ -649,7 +649,7 @@ false - + 100 0 @@ -659,7 +659,7 @@ StrongFocus - + latCheckBatch @@ -677,7 +677,7 @@ true - + 100 0 @@ -687,7 +687,7 @@ StrongFocus - + longCheckBatch @@ -698,7 +698,7 @@ false - + elCheckBatch @@ -713,7 +713,7 @@ dateBoxBatch - + 100 0 @@ -722,7 +722,7 @@ - + buttonGroup4 @@ -733,7 +733,7 @@ unnamed - + allRadioBatch @@ -741,7 +741,7 @@ All parameters - + inputRadioBatch @@ -754,7 +754,7 @@ - + groupBox4_2 @@ -765,7 +765,7 @@ unnamed - + InputButtonBatch @@ -776,17 +776,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -799,9 +799,9 @@ - + - layout14 + tqlayout14 @@ -817,7 +817,7 @@ Expanding - + 151 21 @@ -850,7 +850,7 @@ Expanding - + 131 21 @@ -869,7 +869,7 @@ Expanding - + 20 31 @@ -1041,7 +1041,7 @@ OutButtonBatch runButtonBatch - + slotClearCoords() slotComputeCoords() slotInputFile() @@ -1057,8 +1057,8 @@ slotAzChecked() slotElChecked() newSlot() - - + + dmsbox.h diff --git a/kstars/kstars/tools/modcalcdaylength.cpp b/kstars/kstars/tools/modcalcdaylength.cpp index dcfba7bd..66a41bef 100644 --- a/kstars/kstars/tools/modcalcdaylength.cpp +++ b/kstars/kstars/tools/modcalcdaylength.cpp @@ -30,7 +30,7 @@ #include -modCalcDayLength::modCalcDayLength(TQWidget *parentSplit, const char *name) : modCalcDayLengthDlg(parentSplit,name) { +modCalcDayLength::modCalcDayLength(TQWidget *tqparentSplit, const char *name) : modCalcDayLengthDlg(tqparentSplit,name) { showCurrentDate(); initGeo(); show(); @@ -40,13 +40,13 @@ modCalcDayLength::~modCalcDayLength() {} void modCalcDayLength::showCurrentDate (void) { - KStarsDateTime dt( KStarsDateTime::currentDateTime() ); + KStarsDateTime dt( KStarsDateTime::tqcurrentDateTime() ); datBox->setDate( dt.date() ); } void modCalcDayLength::initGeo(void) { - KStars *ks = (KStars*) parent()->parent()->parent(); // QSplitter->AstroCalc->KStars + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars geoPlace = ks->geo(); longBox->show( geoPlace->lng() ); latBox->show( geoPlace->lat() ); @@ -71,7 +71,7 @@ void modCalcDayLength::slotClearCoords(){ elTransitBox->clearFields(); // reset to current date - datBox->setDate(ExtDate::currentDate()); + datBox->setDate(ExtDate::tqcurrentDate()); // reset times to 00:00:00 setTimeBox->clearFields(); @@ -82,9 +82,9 @@ void modCalcDayLength::slotClearCoords(){ dayLBox->clearFields(); } -TQTime modCalcDayLength::lengthOfDay(TQTime setQTime, TQTime riseQTime){ +TQTime modCalcDayLength::lengthOfDay(TQTime setTQTime, TQTime riseTQTime){ TQTime dL(0,0,0); - int dds = riseQTime.secsTo(setQTime); + int dds = riseTQTime.secsTo(setTQTime); TQTime dLength = dL.addSecs( dds ); return dLength; @@ -96,37 +96,37 @@ void modCalcDayLength::slotComputePosTime() getGeoLocation(); KSNumbers * num = new KSNumbers(jd0); - KSSun *Sun = new KSSun(((KStars*) parent()->parent()->parent())->data()); + KSSun *Sun = new KSSun(((KStars*) tqparent()->tqparent()->tqparent())->data()); Sun->findPosition(num); - TQTime setQtime = Sun->riseSetTime( jd0 , geoPlace, false ); - TQTime riseQtime = Sun->riseSetTime( jd0 , geoPlace, true ); - TQTime transitQtime = Sun->transitTime(jd0 , geoPlace); + TQTime setTQtime = Sun->riseSetTime( jd0 , geoPlace, false ); + TQTime riseTQtime = Sun->riseSetTime( jd0 , geoPlace, true ); + TQTime transitTQtime = Sun->transitTime(jd0 , geoPlace); dms setAz = Sun->riseSetTimeAz(jd0, geoPlace, false); dms riseAz = Sun->riseSetTimeAz(jd0, geoPlace, true); dms transAlt = Sun->transitAltitude(jd0, geoPlace); - if (setQtime.isValid() ) { + if (setTQtime.isValid() ) { azSetBox->show( setAz ); elTransitBox->show( transAlt ); azRiseBox->show( riseAz ); - setTimeBox->showTime( setQtime ); - riseTimeBox->showTime( riseQtime ); - transitTimeBox->showTime( transitQtime ); + setTimeBox->showTime( setTQtime ); + riseTimeBox->showTime( riseTQtime ); + transitTimeBox->showTime( transitTQtime ); - TQTime dayLQtime = lengthOfDay (setQtime,riseQtime); + TQTime dayLTQtime = lengthOfDay (setTQtime,riseTQtime); - dayLBox->showTime( dayLQtime ); + dayLBox->showTime( dayLTQtime ); } else if (transAlt.Degrees() > 0. ) { azSetBox->setDMS(i18n("Circumpolar")); elTransitBox->show( transAlt ); azRiseBox->setDMS(i18n("Circumpolar")); - setTimeBox->showTime( setQtime ); - riseTimeBox->showTime( riseQtime ); - transitTimeBox->showTime( transitQtime ); + setTimeBox->showTime( setTQtime ); + riseTimeBox->showTime( riseTQtime ); + transitTimeBox->showTime( transitTQtime ); dayLBox->setEntry("24:00:00"); diff --git a/kstars/kstars/tools/modcalcdaylength.h b/kstars/kstars/tools/modcalcdaylength.h index 4ad88142..9565a5c4 100644 --- a/kstars/kstars/tools/modcalcdaylength.h +++ b/kstars/kstars/tools/modcalcdaylength.h @@ -30,6 +30,7 @@ class GeoLocation; class modCalcDayLength : public modCalcDayLengthDlg { Q_OBJECT + TQ_OBJECT public: /**Constructor. */ modCalcDayLength(TQWidget *p, const char *n); @@ -44,7 +45,7 @@ public slots: private: /**@returns a SkyPoint constructed from the coordinates in the RA and Dec dmsBoxes. */ - TQTime lengthOfDay(TQTime setQTime, TQTime riseQTime); + TQTime lengthOfDay(TQTime setTQTime, TQTime riseTQTime); /**Fills the Date fields with the current values from the current date. */ void showCurrentDate(void); diff --git a/kstars/kstars/tools/modcalcdaylengthdlg.ui b/kstars/kstars/tools/modcalcdaylengthdlg.ui index d5d5c1f8..9059583a 100644 --- a/kstars/kstars/tools/modcalcdaylengthdlg.ui +++ b/kstars/kstars/tools/modcalcdaylengthdlg.ui @@ -1,10 +1,10 @@ modCalcDayLengthDlg - + modCalcDayLengthDlg - + 0 0 @@ -25,7 +25,7 @@ 6 - + InputBox @@ -36,15 +36,15 @@ unnamed - + - layout37 + tqlayout37 unnamed - + latLabel @@ -56,7 +56,7 @@ latBox - + 100 16 @@ -66,7 +66,7 @@ StrongFocus - + longLabel @@ -78,7 +78,7 @@ longBox - + 100 16 @@ -100,14 +100,14 @@ Expanding - + 60 20 - + datLabel @@ -127,7 +127,7 @@ 0 - + 120 0 @@ -147,7 +147,7 @@ Expanding - + 40 20 @@ -156,9 +156,9 @@ - + - layout3 + tqlayout3 @@ -174,7 +174,7 @@ Expanding - + 71 21 @@ -199,7 +199,7 @@ Expanding - + 51 20 @@ -224,7 +224,7 @@ Expanding - + 81 20 @@ -233,7 +233,7 @@ - + resultsBox @@ -244,9 +244,9 @@ unnamed - + - layout10 + tqlayout10 @@ -264,7 +264,7 @@ 0 - + 90 20 @@ -274,7 +274,7 @@ NoFocus - + riseTimeLabel @@ -294,7 +294,7 @@ 0 - + 90 20 @@ -304,7 +304,7 @@ NoFocus - + transitTimeLabel @@ -312,7 +312,7 @@ Noon: - + dayLLabel @@ -332,7 +332,7 @@ 0 - + 90 20 @@ -354,7 +354,7 @@ 0 - + 90 20 @@ -364,7 +364,7 @@ NoFocus - + setTimeLabel @@ -384,22 +384,22 @@ Expanding - + 20 20 - + - layout20 + tqlayout20 unnamed - + azRiseLabel @@ -407,7 +407,7 @@ Sunrise azimuth: - + azSetLabel @@ -427,7 +427,7 @@ 0 - + 100 0 @@ -437,7 +437,7 @@ NoFocus - + elTransitLabel @@ -457,7 +457,7 @@ 0 - + 100 0 @@ -479,7 +479,7 @@ 0 - + 100 0 @@ -499,7 +499,7 @@ Expanding - + 40 20 @@ -518,7 +518,7 @@ Expanding - + 30 20 @@ -537,7 +537,7 @@ Expanding - + 20 110 @@ -635,11 +635,11 @@ azSetBox azRiseBox - + slotComputePosTime() slotClearCoords() - - + + dmsbox.h dmsbox.h diff --git a/kstars/kstars/tools/modcalceclipticcoords.cpp b/kstars/kstars/tools/modcalceclipticcoords.cpp index c2873aa1..2f009378 100644 --- a/kstars/kstars/tools/modcalceclipticcoords.cpp +++ b/kstars/kstars/tools/modcalceclipticcoords.cpp @@ -35,7 +35,7 @@ #include -modCalcEclCoords::modCalcEclCoords(TQWidget *parentSplit, const char *name) : modCalcEclCoordsDlg(parentSplit,name) { +modCalcEclCoords::modCalcEclCoords(TQWidget *tqparentSplit, const char *name) : modCalcEclCoordsDlg(tqparentSplit,name) { equRadio->setChecked(TRUE); raBox->setDegType(FALSE); @@ -223,7 +223,7 @@ void modCalcEclCoords::slotRunBatch() { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -235,7 +235,7 @@ void modCalcEclCoords::slotRunBatch() { // readFile( istream ); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); diff --git a/kstars/kstars/tools/modcalceclipticcoords.h b/kstars/kstars/tools/modcalceclipticcoords.h index 4a421214..49f85888 100644 --- a/kstars/kstars/tools/modcalceclipticcoords.h +++ b/kstars/kstars/tools/modcalceclipticcoords.h @@ -27,13 +27,14 @@ class TQString; * Class which implements the KStars calculator module to compute * geocentric ecliptic coordinates to/from geocentric equatorial coordinates. * - * Inherits QWidget + * Inherits TQWidget *@author Pablo de Vicente */ class modCalcEclCoords : public modCalcEclCoordsDlg { Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui index 1a164a9b..785398d0 100644 --- a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui +++ b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui @@ -1,10 +1,10 @@ modCalcEclCoordsDlg - + modCalcEclCoordsDlg - + 0 0 @@ -19,14 +19,14 @@ unnamed - + tabWidget8 StrongFocus - + tab @@ -37,7 +37,7 @@ unnamed - + ButtonGroup1 @@ -58,14 +58,14 @@ Expanding - + 97 21 - + equRadio @@ -86,14 +86,14 @@ Expanding - + 96 21 - + eclRadio @@ -114,7 +114,7 @@ Expanding - + 97 21 @@ -123,9 +123,9 @@ - + - layout2 + tqlayout2 @@ -141,7 +141,7 @@ Expanding - + 51 21 @@ -166,7 +166,7 @@ Expanding - + 51 21 @@ -191,7 +191,7 @@ Expanding - + 71 21 @@ -200,15 +200,15 @@ - + - layout9 + tqlayout9 unnamed - + equBox @@ -231,7 +231,7 @@ 0 - + 100 0 @@ -241,7 +241,7 @@ StrongFocus - + raLabel @@ -261,7 +261,7 @@ 0 - + 100 0 @@ -271,7 +271,7 @@ StrongFocus - + decLabel @@ -279,7 +279,7 @@ Declination: - + epochLabel @@ -318,14 +318,14 @@ Fixed - + 16 20 - + groupBox7 @@ -336,15 +336,15 @@ unnamed - + - layout5 + tqlayout5 unnamed - + bgLabel @@ -352,7 +352,7 @@ Latitude: - + lgLabel @@ -372,7 +372,7 @@ 0 - + 100 0 @@ -394,7 +394,7 @@ 0 - + 100 0 @@ -416,7 +416,7 @@ Expanding - + 230 20 @@ -437,7 +437,7 @@ Expanding - + 20 110 @@ -446,7 +446,7 @@ - + tab @@ -457,7 +457,7 @@ unnamed - + InputBox_2_2_2 @@ -486,7 +486,7 @@ false - + 100 0 @@ -503,7 +503,7 @@ false - + 100 0 @@ -513,7 +513,7 @@ StrongFocus - + raCheckBatch @@ -527,7 +527,7 @@ If checked, value will be read from input file. If not, value will be read from adjacent box - + decCheckBatch @@ -548,7 +548,7 @@ false - + 100 0 @@ -565,7 +565,7 @@ false - + 100 0 @@ -594,7 +594,7 @@ 1950.0 - + epochCheckBatch @@ -611,7 +611,7 @@ If checked, value will be read from input file. If not, value will be read from adjacent box - + eclLongCheckBatch @@ -628,7 +628,7 @@ If checked, value will be read from input file. If not, value will be read from adjacent box - + eclLatCheckBatch @@ -647,7 +647,7 @@ - + buttonFieldsGroup @@ -658,7 +658,7 @@ unnamed - + allRadioBatch @@ -666,7 +666,7 @@ All parameters - + inputRadioBatch @@ -679,7 +679,7 @@ - + groupFilesBox @@ -690,7 +690,7 @@ unnamed - + InputButtonBatch @@ -701,17 +701,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -724,9 +724,9 @@ - + - layout22_3 + tqlayout22_3 @@ -742,7 +742,7 @@ Expanding - + 151 21 @@ -775,7 +775,7 @@ Expanding - + 131 21 @@ -794,7 +794,7 @@ Expanding - + 31 16 @@ -891,7 +891,7 @@ slotOutputFile() - + slotComputeCoords() slotClearCoords() slotEclLatCheckedBatch() @@ -902,8 +902,8 @@ slotInputFile() slotOutputFile() slotRunBatch() - - + + dmsbox.h dmsbox.h diff --git a/kstars/kstars/tools/modcalcequinox.cpp b/kstars/kstars/tools/modcalcequinox.cpp index ba749698..3abbc019 100644 --- a/kstars/kstars/tools/modcalcequinox.cpp +++ b/kstars/kstars/tools/modcalcequinox.cpp @@ -33,8 +33,8 @@ #include #include -modCalcEquinox::modCalcEquinox(TQWidget *parentSplit, const char *name) - : modCalcEquinoxDlg (parentSplit,name) { +modCalcEquinox::modCalcEquinox(TQWidget *tqparentSplit, const char *name) + : modCalcEquinoxDlg (tqparentSplit,name) { showCurrentYear(); show(); } @@ -56,15 +56,15 @@ int modCalcEquinox::getYear (TQString eName) void modCalcEquinox::showCurrentYear (void) { - KStarsDateTime dt( KStarsDateTime::currentDateTime() ); - yearEdit->setText( TQString( "%1").arg( dt.date().year() ) ); + KStarsDateTime dt( KStarsDateTime::tqcurrentDateTime() ); + yearEdit->setText( TQString( "%1").tqarg( dt.date().year() ) ); } void modCalcEquinox::slotComputeEquinoxesAndSolstices (void) { long double julianDay = 0., jdf = 0.; float deltaJd; - KStarsData *kd = (KStarsData*) parent()->parent()->parent(); + KStarsData *kd = (KStarsData*) tqparent()->tqparent()->tqparent(); KSSun *Sun = new KSSun(kd); int year0 = getYear( yearEdit->text() ); @@ -104,7 +104,7 @@ void modCalcEquinox::showStartDateTime(long double jd) void modCalcEquinox::showSeasonDuration(float deltaJd) { - seasonDuration->setText( TQString( "%1").arg( deltaJd ) ); + seasonDuration->setText( TQString( "%1").tqarg( deltaJd ) ); } void modCalcEquinox::slotYearCheckedBatch(){ @@ -138,7 +138,7 @@ void modCalcEquinox::slotRunBatch() { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -150,7 +150,7 @@ void modCalcEquinox::slotRunBatch() { // readFile( istream ); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); @@ -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*) parent()->parent()->parent(); + KStarsData *kd = (KStarsData*) tqparent()->tqparent()->tqparent(); KSSun *Sun = new KSSun(kd); while ( ! istream.eof() ) { diff --git a/kstars/kstars/tools/modcalcequinox.h b/kstars/kstars/tools/modcalcequinox.h index 71a42818..2480f9cd 100644 --- a/kstars/kstars/tools/modcalcequinox.h +++ b/kstars/kstars/tools/modcalcequinox.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef MODCALCEQUINOX_H -#define MODCALCEQUINOX_H +#ifndef MODCALCETQUINOX_H +#define MODCALCETQUINOX_H #include #include @@ -32,6 +32,7 @@ class TQTextStream; class modCalcEquinox : public modCalcEquinoxDlg { Q_OBJECT + TQ_OBJECT public: modCalcEquinox(TQWidget *p, const char *n); diff --git a/kstars/kstars/tools/modcalcequinoxdlg.ui b/kstars/kstars/tools/modcalcequinoxdlg.ui index 025802ba..3866c300 100644 --- a/kstars/kstars/tools/modcalcequinoxdlg.ui +++ b/kstars/kstars/tools/modcalcequinoxdlg.ui @@ -1,10 +1,10 @@ modCalcEquinoxDlg - + modCalcEquinoxDlg - + 0 0 @@ -19,11 +19,11 @@ unnamed - + tabWidget3 - + tab @@ -34,7 +34,7 @@ unnamed - + groupBox6 @@ -61,14 +61,14 @@ Expanding - + 70 21 - + Spring Equinox @@ -103,14 +103,14 @@ Expanding - + 20 21 - + textLabel1 @@ -133,7 +133,7 @@ Expanding - + 30 31 @@ -142,9 +142,9 @@ - + - layout2 + tqlayout2 @@ -160,7 +160,7 @@ Expanding - + 81 20 @@ -185,7 +185,7 @@ Expanding - + 51 20 @@ -210,7 +210,7 @@ Expanding - + 91 21 @@ -219,7 +219,7 @@ - + groupBox7 @@ -238,7 +238,7 @@ NoFocus - + textLabel3 @@ -246,7 +246,7 @@ Duration of the season: - + textLabel2 @@ -271,7 +271,7 @@ Expanding - + 41 237 @@ -280,7 +280,7 @@ - + tab @@ -291,7 +291,7 @@ unnamed - + InputBox_2_2 @@ -313,7 +313,7 @@ unnamed - + yearCheckBatch @@ -334,7 +334,7 @@ Expanding - + 111 21 @@ -351,7 +351,7 @@ - + buttonFieldsGroup @@ -362,7 +362,7 @@ unnamed - + allRadioBatch @@ -370,7 +370,7 @@ All parameters - + inputRadioBatch @@ -383,7 +383,7 @@ - + groupFilesBox @@ -394,7 +394,7 @@ unnamed - + InputButtonBatch @@ -405,17 +405,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -428,9 +428,9 @@ - + - layout22 + tqlayout22 @@ -446,7 +446,7 @@ Expanding - + 151 21 @@ -479,7 +479,7 @@ Expanding - + 131 21 @@ -498,7 +498,7 @@ Expanding - + 41 71 @@ -559,13 +559,13 @@ slotRunBatch() - + slotComputeEquinoxesAndSolstices() slotInputFile() slotOutputFile() slotRunBatch() - - + + klineedit.h klineedit.h diff --git a/kstars/kstars/tools/modcalcgalcoord.cpp b/kstars/kstars/tools/modcalcgalcoord.cpp index 18638a6c..1f371d42 100644 --- a/kstars/kstars/tools/modcalcgalcoord.cpp +++ b/kstars/kstars/tools/modcalcgalcoord.cpp @@ -34,7 +34,7 @@ #include -modCalcGalCoord::modCalcGalCoord(TQWidget *parentSplit, const char *name) : modCalcGalCoordDlg(parentSplit,name) { +modCalcGalCoord::modCalcGalCoord(TQWidget *tqparentSplit, const char *name) : modCalcGalCoordDlg(tqparentSplit,name) { equRadio->setChecked(TRUE); raBox->setDegType(FALSE); @@ -225,7 +225,7 @@ void modCalcGalCoord::slotRunBatch() { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -237,7 +237,7 @@ void modCalcGalCoord::slotRunBatch() { // readFile( istream ); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); diff --git a/kstars/kstars/tools/modcalcgalcoord.h b/kstars/kstars/tools/modcalcgalcoord.h index b8b918b5..21fbb289 100644 --- a/kstars/kstars/tools/modcalcgalcoord.h +++ b/kstars/kstars/tools/modcalcgalcoord.h @@ -25,7 +25,7 @@ * Class which implements the KStars calculator module to compute * Galactic coordinates to/from Equatorial coordinates. * - * Inherits QWidget + * Inherits TQWidget *@author Pablo de Vicente *@version 0.9 */ @@ -33,6 +33,7 @@ class modCalcGalCoord : public modCalcGalCoordDlg { Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalcgalcoorddlg.ui b/kstars/kstars/tools/modcalcgalcoorddlg.ui index dfb59183..08d1bde5 100644 --- a/kstars/kstars/tools/modcalcgalcoorddlg.ui +++ b/kstars/kstars/tools/modcalcgalcoorddlg.ui @@ -1,10 +1,10 @@ modCalcGalCoordDlg - + modCalcGalCoordDlg - + 0 0 @@ -19,14 +19,14 @@ unnamed - + tabWidget8 StrongFocus - + tab @@ -37,7 +37,7 @@ unnamed - + ButtonGroup1 @@ -58,14 +58,14 @@ Expanding - + 97 21 - + equRadio @@ -86,14 +86,14 @@ Expanding - + 96 21 - + galRadio @@ -114,7 +114,7 @@ Expanding - + 97 21 @@ -123,9 +123,9 @@ - + - layout2 + tqlayout2 @@ -141,7 +141,7 @@ Expanding - + 51 21 @@ -166,7 +166,7 @@ Expanding - + 51 21 @@ -191,7 +191,7 @@ Expanding - + 71 21 @@ -200,15 +200,15 @@ - + - layout22 + tqlayout22 unnamed - + equBox @@ -231,7 +231,7 @@ 0 - + 100 0 @@ -241,7 +241,7 @@ StrongFocus - + raLabel @@ -261,7 +261,7 @@ 0 - + 100 0 @@ -271,7 +271,7 @@ StrongFocus - + epochLabel @@ -279,7 +279,7 @@ Epoch: - + decLabel @@ -318,14 +318,14 @@ Fixed - + 15 20 - + groupBox7 @@ -336,15 +336,15 @@ unnamed - + - layout5 + tqlayout5 unnamed - + bgLabel @@ -352,7 +352,7 @@ Latitude: - + lgLabel @@ -372,7 +372,7 @@ 0 - + 100 0 @@ -394,7 +394,7 @@ 0 - + 100 0 @@ -420,7 +420,7 @@ Expanding - + 20 160 @@ -429,7 +429,7 @@ - + tab @@ -440,7 +440,7 @@ unnamed - + InputBox_2_2_2 @@ -469,7 +469,7 @@ false - + 100 0 @@ -486,7 +486,7 @@ false - + 100 0 @@ -515,7 +515,7 @@ 1950.0 - + raCheckBatch @@ -529,7 +529,7 @@ If checked, value will be read from input file. If not, value will be read from adjacent box - + decCheckBatch @@ -543,7 +543,7 @@ If checked, value will be read from input file. If not, value will be read from adjacent box - + epochCheckBatch @@ -560,7 +560,7 @@ If checked, value will be read from input file. If not, value will be read from adjacent box - + galLongCheckBatch @@ -577,7 +577,7 @@ If checked, value will be read from input file. If not, value will be read from adjacent box - + galLatCheckBatch @@ -601,7 +601,7 @@ false - + 100 0 @@ -618,7 +618,7 @@ false - + 100 0 @@ -630,7 +630,7 @@ - + buttonFieldsGroup @@ -641,7 +641,7 @@ unnamed - + allRadioBatch @@ -649,7 +649,7 @@ All parameters - + inputRadioBatch @@ -662,7 +662,7 @@ - + groupFilesBox @@ -673,7 +673,7 @@ unnamed - + InputButtonBatch @@ -684,17 +684,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -707,9 +707,9 @@ - + - layout22_3 + tqlayout22_3 @@ -725,7 +725,7 @@ Expanding - + 151 21 @@ -758,7 +758,7 @@ Expanding - + 131 21 @@ -777,7 +777,7 @@ Expanding - + 31 71 @@ -902,7 +902,7 @@ OutButtonBatch runButtonBatch - + slotComputeCoords() slotClearCoords() slotInputFile() @@ -913,8 +913,8 @@ slotGalLatCheckedBatch() slotGalLongCheckedBatch() slotRunBatch() - - + + dmsbox.h dmsbox.h diff --git a/kstars/kstars/tools/modcalcgeodcoord.cpp b/kstars/kstars/tools/modcalcgeodcoord.cpp index dd03ccd2..1cda2504 100644 --- a/kstars/kstars/tools/modcalcgeodcoord.cpp +++ b/kstars/kstars/tools/modcalcgeodcoord.cpp @@ -37,7 +37,7 @@ #include -modCalcGeodCoord::modCalcGeodCoord(TQWidget *parentSplit, const char *name) : modCalcGeodCoordDlg(parentSplit,name) { +modCalcGeodCoord::modCalcGeodCoord(TQWidget *tqparentSplit, const char *name) : modCalcGeodCoordDlg(tqparentSplit,name) { static const char *ellipsoidList[] = { "IAU76", "GRS80", "MERIT83", "WGS84", "IERS89"}; @@ -58,7 +58,7 @@ modCalcGeodCoord::~modCalcGeodCoord(){ void modCalcGeodCoord::showLongLat(void) { - KStars *ks = (KStars*) parent()->parent()->parent(); // QSplitter->AstroCalc->KStars + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars lonGeoBox->show( ks->geo()->lng() ); latGeoBox->show( ks->geo()->lat() ); altGeoBox->setText( TQString("0.0") ); @@ -236,7 +236,7 @@ void modCalcGeodCoord::slotRunBatch(void) { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -248,7 +248,7 @@ void modCalcGeodCoord::slotRunBatch(void) { // readFile( istream ); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); diff --git a/kstars/kstars/tools/modcalcgeodcoord.h b/kstars/kstars/tools/modcalcgeodcoord.h index 2d8fd186..d9c3015d 100644 --- a/kstars/kstars/tools/modcalcgeodcoord.h +++ b/kstars/kstars/tools/modcalcgeodcoord.h @@ -24,7 +24,7 @@ * Class which implements the KStars calculator module to compute * Geodetic coordinates to/from Cartesian coordinates. * - * Inherits QVBox + * Inherits TQVBox *@author Pablo de Vicente *@version 0.9 */ @@ -38,6 +38,7 @@ class GeoLocation; class modCalcGeodCoord : public modCalcGeodCoordDlg { Q_OBJECT + TQ_OBJECT public: modCalcGeodCoord(TQWidget *p, const char *n); diff --git a/kstars/kstars/tools/modcalcgeoddlg.ui b/kstars/kstars/tools/modcalcgeoddlg.ui index 890eb4c0..85896689 100644 --- a/kstars/kstars/tools/modcalcgeoddlg.ui +++ b/kstars/kstars/tools/modcalcgeoddlg.ui @@ -1,10 +1,10 @@ modCalcGeodCoordDlg - + modCalcGeodCoordDlg - + 0 0 @@ -19,14 +19,14 @@ unnamed - + tabWidget StrongFocus - + tab @@ -37,15 +37,15 @@ unnamed - + - layout31 + tqlayout31 unnamed - + InputBox @@ -56,15 +56,15 @@ unnamed - + - layout1 + tqlayout1 unnamed - + cartRadio @@ -72,7 +72,7 @@ Cartesian - + spheRadio @@ -90,7 +90,7 @@ - + groupBox11 @@ -110,9 +110,9 @@ - + - layout2 + tqlayout2 @@ -128,7 +128,7 @@ Expanding - + 81 20 @@ -153,7 +153,7 @@ Expanding - + 51 20 @@ -178,7 +178,7 @@ Expanding - + 91 21 @@ -187,15 +187,15 @@ - + - layout32 + tqlayout32 unnamed - + cartBox @@ -206,7 +206,7 @@ unnamed - + yLabel @@ -214,7 +214,7 @@ Y (km): - + zLabel @@ -222,7 +222,7 @@ Z (km): - + xLabel @@ -247,7 +247,7 @@ - + spheBox @@ -262,7 +262,7 @@ lonGeoBox - + 70 0 @@ -276,7 +276,7 @@ latGeoBox - + 70 0 @@ -286,7 +286,7 @@ StrongFocus - + latLabel @@ -294,7 +294,7 @@ Latitude: - + longLabel @@ -302,7 +302,7 @@ Longitude: - + TextLabel3_2 @@ -332,7 +332,7 @@ Expanding - + 20 120 @@ -341,7 +341,7 @@ - + tab @@ -352,7 +352,7 @@ unnamed - + InputBox_2_2 @@ -428,7 +428,7 @@ false - + longCheckBatch @@ -439,7 +439,7 @@ true - + latCheckBatch @@ -450,7 +450,7 @@ true - + elevCheckBatch @@ -461,7 +461,7 @@ true - + xCheckBatch @@ -475,7 +475,7 @@ false - + yCheckBatch @@ -489,7 +489,7 @@ false - + zCheckBatch @@ -505,7 +505,7 @@ - + buttonFieldsGroup @@ -516,7 +516,7 @@ unnamed - + allRadioBatch @@ -524,7 +524,7 @@ All parameters - + inputRadioBatch @@ -537,7 +537,7 @@ - + groupFilesBox @@ -548,7 +548,7 @@ unnamed - + InputButtonBatch @@ -559,17 +559,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -582,9 +582,9 @@ - + - layout22 + tqlayout22 @@ -600,7 +600,7 @@ Expanding - + 151 21 @@ -633,7 +633,7 @@ Expanding - + 131 21 @@ -652,7 +652,7 @@ Expanding - + 20 41 @@ -787,7 +787,7 @@ OutputLineEditBatch runButtonBatch - + slotComputeGeoCoords() slotClearGeoCoords() slotInputFile() @@ -799,8 +799,8 @@ slotXCheckedBatch() slotYCheckedBatch() slotZCheckedBatch() - - + + kcombobox.h klineedit.h diff --git a/kstars/kstars/tools/modcalcjd.cpp b/kstars/kstars/tools/modcalcjd.cpp index 99271d34..4bacb940 100644 --- a/kstars/kstars/tools/modcalcjd.cpp +++ b/kstars/kstars/tools/modcalcjd.cpp @@ -22,7 +22,7 @@ #include "geolocation.h" #include "libkdeedu/extdate/extdatetimeedit.h" -#include //need for QTimeEdit +#include //need for TQTimeEdit #include #include #include @@ -32,7 +32,7 @@ #define MJD0 2400000.5 -modCalcJD::modCalcJD(TQWidget *parentSplit, const char *name) : modCalcJdDlg(parentSplit,name) { +modCalcJD::modCalcJD(TQWidget *tqparentSplit, const char *name) : modCalcJdDlg(tqparentSplit,name) { showCurrentTime(); show(); @@ -95,15 +95,15 @@ void modCalcJD::slotClearTime (void) { JdName->setText (""); MjdName->setText (""); - datBox->setDate( ExtDate::currentDate() ); + datBox->setDate( ExtDate::tqcurrentDate() ); timBox->setTime(TQTime(0,0,0)); } void modCalcJD::showCurrentTime (void) { - KStars *ks = (KStars*) parent()->parent()->parent(); + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); - KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); datBox->setDate( dt.date() ); timBox->setTime( dt.time() ); computeFromCalendar(); diff --git a/kstars/kstars/tools/modcalcjd.h b/kstars/kstars/tools/modcalcjd.h index c7505b7a..bbd08e69 100644 --- a/kstars/kstars/tools/modcalcjd.h +++ b/kstars/kstars/tools/modcalcjd.h @@ -27,7 +27,7 @@ * Class for KStars module which computes JD, MJD and Date/Time from the * any of the other entries. * - * Inherits QVBox + * Inherits TQVBox *@author Pablo de Vicente *@version 0.9 */ @@ -39,6 +39,7 @@ class KStarsDateTime; class modCalcJD : public modCalcJdDlg { Q_OBJECT + TQ_OBJECT public: modCalcJD(TQWidget *p, const char *n); ~modCalcJD(); diff --git a/kstars/kstars/tools/modcalcjddlg.ui b/kstars/kstars/tools/modcalcjddlg.ui index 6550c546..d289bb83 100644 --- a/kstars/kstars/tools/modcalcjddlg.ui +++ b/kstars/kstars/tools/modcalcjddlg.ui @@ -1,10 +1,10 @@ modCalcJdDlg - + modCalcJdDlg - + 0 0 @@ -19,7 +19,7 @@ unnamed - + InputBox @@ -38,15 +38,15 @@ unnamed - + - layout9 + tqlayout9 unnamed - + JdRadio @@ -62,7 +62,7 @@ Julian day - + MjdRadio @@ -78,7 +78,7 @@ Modified Julian day - + DateRadio @@ -98,15 +98,15 @@ - + - layout37 + tqlayout37 unnamed - + JdBox @@ -117,7 +117,7 @@ unnamed - + JdLabel @@ -129,7 +129,7 @@ JdName - + 130 0 @@ -138,7 +138,7 @@ - + MjdBox @@ -149,7 +149,7 @@ unnamed - + MjdLabel @@ -161,7 +161,7 @@ MjdName - + 130 0 @@ -172,7 +172,7 @@ - + Datebox @@ -193,14 +193,14 @@ Expanding - + 16 20 - + timeLabel @@ -208,11 +208,11 @@ UT: - + timBox - + 100 0 @@ -229,14 +229,14 @@ Expanding - + 16 20 - + dateLabel @@ -256,7 +256,7 @@ 0 - + 110 0 @@ -273,7 +273,7 @@ Expanding - + 16 20 @@ -282,9 +282,9 @@ - + - layout7 + tqlayout7 @@ -300,7 +300,7 @@ Expanding - + 23 20 @@ -333,7 +333,7 @@ Expanding - + 39 21 @@ -352,13 +352,13 @@ 0 - + 0 25 - + 32767 30 @@ -378,7 +378,7 @@ Expanding - + 37 20 @@ -397,13 +397,13 @@ 0 - + 0 25 - + 32767 30 @@ -423,7 +423,7 @@ Expanding - + 38 20 @@ -442,7 +442,7 @@ Expanding - + 20 30 @@ -494,12 +494,12 @@ slotComputeTime() - + slotClearTime() slotComputeTime() showCurrentTime() - - + + klineedit.h klineedit.h diff --git a/kstars/kstars/tools/modcalcplanets.cpp b/kstars/kstars/tools/modcalcplanets.cpp index e9053bd5..7324fbb2 100644 --- a/kstars/kstars/tools/modcalcplanets.cpp +++ b/kstars/kstars/tools/modcalcplanets.cpp @@ -38,7 +38,7 @@ #include -modCalcPlanets::modCalcPlanets(TQWidget *parentSplit, const char *name) : modCalcPlanetsDlg (parentSplit,name) { +modCalcPlanets::modCalcPlanets(TQWidget *tqparentSplit, const char *name) : modCalcPlanetsDlg (tqparentSplit,name) { showCurrentDateTime(); showLongLat(); raBox->setDegType(FALSE); @@ -50,8 +50,8 @@ modCalcPlanets::~modCalcPlanets(){ void modCalcPlanets::showCurrentDateTime (void) { - KStars *ks = (KStars*) parent()->parent()->parent(); // QSplitter->AstroCalc->KStars - KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); dateBox->setDate( dt.date() ); timeBox->setTime( dt.time() ); @@ -68,7 +68,7 @@ KStarsDateTime modCalcPlanets::getDateTime (void) void modCalcPlanets::showLongLat(void) { - KStars *ks = (KStars*) parent()->parent()->parent(); // QSplitter->AstroCalc->KStars + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // 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*) parent()->parent()->parent(); + KStarsData *kd = (KStarsData*) tqparent()->tqparent()->tqparent(); KStarsDateTime dt = getDateTime(); long double julianDay = dt.djd(); GeoLocation position( getObserverPosition() ); @@ -310,7 +310,7 @@ void modCalcPlanets::slotRunBatch() { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -320,7 +320,7 @@ void modCalcPlanets::slotRunBatch() { processLines(istream); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); @@ -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*) parent()->parent()->parent(); // QSplitter->AstroCalc->KStars + KStarsData *kd = (KStarsData*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars PlanetCatalog PCat( kd ); PCat.initialize(); @@ -397,9 +397,9 @@ void modCalcPlanets::processLines( TQTextStream &istream ) { if (fields.count() != numberOfRequiredFields ) { lineIsValid = false; - kdWarning() << i18n( "Incorrect number of fields in line %1: " ).arg(nline) - << i18n( "Present fields %1. " ).arg(fields.count()) - << i18n( "Required fields %1. " ).arg(numberOfRequiredFields) << endl; + kdWarning() << i18n( "Incorrect number of fields in line %1: " ).tqarg(nline) + << i18n( "Present fields %1. " ).tqarg(fields.count()) + << i18n( "Required fields %1. " ).tqarg(numberOfRequiredFields) << endl; nline++; continue; } @@ -419,7 +419,7 @@ void modCalcPlanets::processLines( TQTextStream &istream ) { if (j == 11) { kdWarning() << i18n("Unknown planet ") << fields[i] - << i18n(" in line %1: ").arg(nline) << endl; + << i18n(" in line %1: ").tqarg(nline) << endl; continue; } i++; @@ -441,7 +441,7 @@ void modCalcPlanets::processLines( TQTextStream &istream ) { if(utCheckBatch->isChecked() ) { utB = TQTime::fromString( fields[i] ); if ( !utB.isValid() ) { - kdWarning() << i18n( "Line %1 contains an invalid time" ).arg(nline) << endl; + kdWarning() << i18n( "Line %1 contains an invalid time" ).tqarg(nline) << endl; lineIsValid=false; nline++; continue; @@ -461,7 +461,7 @@ void modCalcPlanets::processLines( TQTextStream &istream ) { if(dateCheckBatch->isChecked() ) { dtB = ExtDate::fromString( fields[i], Qt::ISODate ); if ( !dtB.isValid() ) { - kdWarning() << i18n( "Line %1 contains an invalid date: " ).arg(nline) << + kdWarning() << i18n( "Line %1 contains an invalid date: " ).tqarg(nline) << fields[i] << endl ; lineIsValid=false; nline++; diff --git a/kstars/kstars/tools/modcalcplanets.h b/kstars/kstars/tools/modcalcplanets.h index 359a7074..50c64d8b 100644 --- a/kstars/kstars/tools/modcalcplanets.h +++ b/kstars/kstars/tools/modcalcplanets.h @@ -38,6 +38,7 @@ class KSPluto; class modCalcPlanets : public modCalcPlanetsDlg { Q_OBJECT + TQ_OBJECT public: modCalcPlanets(TQWidget *p, const char *n); diff --git a/kstars/kstars/tools/modcalcplanetsdlg.ui b/kstars/kstars/tools/modcalcplanetsdlg.ui index 3788816f..061c035a 100644 --- a/kstars/kstars/tools/modcalcplanetsdlg.ui +++ b/kstars/kstars/tools/modcalcplanetsdlg.ui @@ -1,10 +1,10 @@ modCalcPlanetsDlg - + modCalcPlanetsDlg - + 0 0 @@ -19,11 +19,11 @@ unnamed - + Interactive_Mode - + tab @@ -34,7 +34,7 @@ unnamed - + groupBox1 @@ -45,9 +45,9 @@ unnamed - + - layout13 + tqlayout13 @@ -63,14 +63,14 @@ Expanding - + 101 21 - + textLabel1 @@ -78,7 +78,7 @@ Solar system body: - + Mercury @@ -148,7 +148,7 @@ Expanding - + 151 21 @@ -157,17 +157,17 @@ - + - layout14 + tqlayout14 unnamed - + - layout20 + tqlayout20 @@ -177,7 +177,7 @@ dateBox - + 120 0 @@ -187,7 +187,7 @@ StrongFocus - + timeBox @@ -199,14 +199,14 @@ 0 - + 100 0 - + timLabel @@ -214,7 +214,7 @@ Universal time: - + dateLabel @@ -234,22 +234,22 @@ Expanding - + 50 20 - + - layout11 + tqlayout11 unnamed - + longLabel @@ -261,7 +261,7 @@ longBox - + 100 0 @@ -271,7 +271,7 @@ StrongFocus - + latLabel @@ -283,7 +283,7 @@ latBox - + 100 0 @@ -305,7 +305,7 @@ Expanding - + 40 20 @@ -316,15 +316,15 @@ - + - layout13 + tqlayout13 unnamed - + groupBox3 @@ -335,9 +335,9 @@ unnamed - + - layout11 + tqlayout11 @@ -347,14 +347,14 @@ raBox - + 100 0 - + textLabel9 @@ -362,7 +362,7 @@ Right ascension: - + textLabel10 @@ -374,7 +374,7 @@ decBox - + 100 0 @@ -393,7 +393,7 @@ Expanding - + 20 20 @@ -402,7 +402,7 @@ - + groupBox4 @@ -413,15 +413,15 @@ unnamed - + - layout12 + tqlayout12 unnamed - + textLabel11 @@ -433,14 +433,14 @@ altBox - + 100 0 - + textLabel12 @@ -452,7 +452,7 @@ azBox - + 100 0 @@ -471,7 +471,7 @@ Expanding - + 40 20 @@ -482,7 +482,7 @@ - + groupBox2 @@ -493,9 +493,9 @@ unnamed - + - layout8 + tqlayout8 @@ -513,7 +513,7 @@ 0 - + 100 0 @@ -523,7 +523,7 @@ NoFocus - + textLabel8 @@ -535,14 +535,14 @@ helLongBox - + 100 0 - + textLabel4 @@ -554,14 +554,14 @@ helLatBox - + 100 0 - + textLabel5 @@ -581,22 +581,22 @@ Expanding - + 40 20 - + - layout9 + tqlayout9 unnamed - + textLabel8_2 @@ -616,7 +616,7 @@ 0 - + 100 0 @@ -626,7 +626,7 @@ NoFocus - + textLabel6 @@ -638,7 +638,7 @@ geoLongBox - + 100 0 @@ -649,14 +649,14 @@ geoLatBox - + 100 0 - + textLabel7 @@ -676,7 +676,7 @@ Expanding - + 40 20 @@ -685,9 +685,9 @@ - + - layout1 + tqlayout1 @@ -703,14 +703,14 @@ Expanding - + 111 20 - + computeButton @@ -728,14 +728,14 @@ Expanding - + 61 21 - + clearButton @@ -753,7 +753,7 @@ Expanding - + 91 20 @@ -772,7 +772,7 @@ Expanding - + 21 60 @@ -781,7 +781,7 @@ - + tab @@ -792,7 +792,7 @@ unnamed - + InputBox_2_2 @@ -814,7 +814,7 @@ unnamed - + utBoxBatch @@ -829,7 +829,7 @@ true - + 100 0 @@ -839,7 +839,7 @@ StrongFocus - + dateCheckBatch @@ -857,14 +857,14 @@ true - + 100 0 - + latCheckBatch @@ -882,7 +882,7 @@ true - + 100 0 @@ -892,7 +892,7 @@ StrongFocus - + longCheckBatch @@ -903,7 +903,7 @@ false - + utCheckBatch @@ -917,7 +917,7 @@ false - + planetCheckBatch @@ -931,7 +931,7 @@ false - + Mercury @@ -993,7 +993,7 @@ - + InputBox_2_2_2 @@ -1015,7 +1015,7 @@ unnamed - + helEclCheckBatch @@ -1029,7 +1029,7 @@ false - + equGeoCheckBatch @@ -1040,7 +1040,7 @@ true - + topoCheckBatch @@ -1051,7 +1051,7 @@ false - + geoEclCheckBatch @@ -1064,7 +1064,7 @@ - + buttonGroup4_2 @@ -1075,7 +1075,7 @@ unnamed - + allRadioBatch @@ -1083,7 +1083,7 @@ All parameters - + inputRadioBatch @@ -1096,7 +1096,7 @@ - + groupBox4_2 @@ -1107,7 +1107,7 @@ unnamed - + InputButtonBatch @@ -1118,17 +1118,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -1141,9 +1141,9 @@ - + - layout14_2 + tqlayout14_2 @@ -1159,7 +1159,7 @@ Expanding - + 151 21 @@ -1192,7 +1192,7 @@ Expanding - + 131 21 @@ -1211,7 +1211,7 @@ Expanding - + 20 21 @@ -1358,7 +1358,7 @@ OutButtonBatch runButtonBatch - + slotComputePosition() slotClear() slotInputFile() @@ -1369,8 +1369,8 @@ slotLatCheckedBatch() slotRunBatch() slotPlanetsCheckedBatch() - - + + dmsbox.h diff --git a/kstars/kstars/tools/modcalcprec.cpp b/kstars/kstars/tools/modcalcprec.cpp index ddf71e2e..df2d1424 100644 --- a/kstars/kstars/tools/modcalcprec.cpp +++ b/kstars/kstars/tools/modcalcprec.cpp @@ -31,7 +31,7 @@ #include #include -modCalcPrec::modCalcPrec(TQWidget *parentSplit, const char *name) : modCalcPrecDlg(parentSplit,name) { +modCalcPrec::modCalcPrec(TQWidget *tqparentSplit, const char *name) : modCalcPrecDlg(tqparentSplit,name) { ra0Box->setDegType(FALSE); rafBox->setDegType(FALSE); @@ -57,13 +57,13 @@ SkyPoint modCalcPrec::getEquCoords (void) { TQString modCalcPrec:: showCurrentEpoch () { double epoch = setCurrentEpoch(); - TQString eName = TQString("%1").arg(epoch,7,'f',2); + TQString eName = TQString("%1").tqarg(epoch,7,'f',2); return eName; } double modCalcPrec::setCurrentEpoch () { - return KStarsDateTime::currentDateTime().epoch(); + return KStarsDateTime::tqcurrentDateTime().epoch(); } double modCalcPrec::getEpoch (TQString eName) { @@ -176,7 +176,7 @@ void modCalcPrec::slotRunBatch() { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -188,7 +188,7 @@ void modCalcPrec::slotRunBatch() { // readFile( istream ); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); diff --git a/kstars/kstars/tools/modcalcprec.h b/kstars/kstars/tools/modcalcprec.h index bf01d8bd..2ef5e394 100644 --- a/kstars/kstars/tools/modcalcprec.h +++ b/kstars/kstars/tools/modcalcprec.h @@ -38,6 +38,7 @@ class SkyPoint; class modCalcPrec : public modCalcPrecDlg { Q_OBJECT + TQ_OBJECT public: modCalcPrec(TQWidget *p, const char *n); ~modCalcPrec(); diff --git a/kstars/kstars/tools/modcalcprecdlg.ui b/kstars/kstars/tools/modcalcprecdlg.ui index ae895f9d..f2c126ce 100644 --- a/kstars/kstars/tools/modcalcprecdlg.ui +++ b/kstars/kstars/tools/modcalcprecdlg.ui @@ -1,10 +1,10 @@ modCalcPrecDlg - + modCalcPrecDlg - + 0 0 @@ -19,11 +19,11 @@ unnamed - + tabWidget3 - + tab @@ -34,7 +34,7 @@ unnamed - + InputBox @@ -55,22 +55,22 @@ Expanding - + 98 20 - + - layout25 + tqlayout25 unnamed - + epoch0Label @@ -94,7 +94,7 @@ StrongFocus - + ra0Label @@ -112,7 +112,7 @@ epoch0Name - + dec0Label @@ -120,7 +120,7 @@ Declination: - + epochfLabel @@ -140,7 +140,7 @@ Expanding - + 98 20 @@ -149,9 +149,9 @@ - + - layout2 + tqlayout2 @@ -167,7 +167,7 @@ Expanding - + 91 20 @@ -192,7 +192,7 @@ Expanding - + 51 20 @@ -217,7 +217,7 @@ Expanding - + 91 21 @@ -236,14 +236,14 @@ Fixed - + 20 20 - + outputBox @@ -264,22 +264,22 @@ Expanding - + 90 20 - + - layout26 + tqlayout26 unnamed - + rafLabel @@ -287,7 +287,7 @@ Right ascension: - + decfLabel @@ -323,7 +323,7 @@ Expanding - + 90 20 @@ -342,7 +342,7 @@ Expanding - + 20 70 @@ -351,7 +351,7 @@ - + tab @@ -362,7 +362,7 @@ unnamed - + InputBox_2_2 @@ -406,7 +406,7 @@ StrongFocus - + decCheckBatch @@ -417,7 +417,7 @@ true - + epochCheckBatch @@ -425,7 +425,7 @@ Input epoch: - + targetEpochCheckBatch @@ -459,7 +459,7 @@ - + raCheckBatch @@ -472,7 +472,7 @@ - + buttonGroup4_2 @@ -483,7 +483,7 @@ unnamed - + allRadioBatch @@ -491,7 +491,7 @@ All parameters - + inputRadioBatch @@ -504,7 +504,7 @@ - + groupBox4_2 @@ -515,7 +515,7 @@ unnamed - + InputButtonBatch @@ -526,17 +526,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -549,9 +549,9 @@ - + - layout14_2 + tqlayout14_2 @@ -567,7 +567,7 @@ Expanding - + 151 21 @@ -600,7 +600,7 @@ Expanding - + 131 21 @@ -619,7 +619,7 @@ Expanding - + 21 30 @@ -729,7 +729,7 @@ OutputLineEditBatch runButtonBatch_2 - + slotComputeCoords() slotClearCoords() slotRaCheckedBatch() @@ -741,8 +741,8 @@ slotInputFile() slotOutputFile() slotRunBatch() - - + + dmsbox.h dmsbox.h diff --git a/kstars/kstars/tools/modcalcsidtime.cpp b/kstars/kstars/tools/modcalcsidtime.cpp index 33cc03c9..e925b2b5 100644 --- a/kstars/kstars/tools/modcalcsidtime.cpp +++ b/kstars/kstars/tools/modcalcsidtime.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include //need for QTimeEdit +#include //need for TQTimeEdit #include #include #include @@ -32,7 +32,7 @@ #include "simclock.h" #include "libkdeedu/extdate/extdatetimeedit.h" -modCalcSidTime::modCalcSidTime(TQWidget *parentSplit, const char *name) : modCalcSidTimeDlg (parentSplit,name) { +modCalcSidTime::modCalcSidTime(TQWidget *tqparentSplit, const char *name) : modCalcSidTimeDlg (tqparentSplit,name) { showCurrentTimeAndLong(); show(); @@ -44,8 +44,8 @@ modCalcSidTime::~modCalcSidTime(void) { void modCalcSidTime::showCurrentTimeAndLong (void) { - KStars *ks = (KStars*) parent()->parent()->parent(); - // modCalcSidTimeDlg -> QSplitter->AstroCalc->KStars + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); + // modCalcSidTimeDlg -> TQSplitter->AstroCalc->KStars showUT( ks->data()->ut().time() ); datBox->setDate( ks->data()->ut().date() ); @@ -99,7 +99,7 @@ dms modCalcSidTime::getLongitude( void ) } void modCalcSidTime::slotClearFields(){ - datBox->setDate(ExtDate::currentDate()); + datBox->setDate(ExtDate::tqcurrentDate()); TQTime time(0,0,0); UtBox->setTime(time); StBox->setTime(time); @@ -192,7 +192,7 @@ void modCalcSidTime::slotRunBatch() { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -204,7 +204,7 @@ void modCalcSidTime::slotRunBatch() { // readFile( istream ); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); diff --git a/kstars/kstars/tools/modcalcsidtime.h b/kstars/kstars/tools/modcalcsidtime.h index 08e5497c..ef146c53 100644 --- a/kstars/kstars/tools/modcalcsidtime.h +++ b/kstars/kstars/tools/modcalcsidtime.h @@ -37,6 +37,7 @@ class ExtDate; class modCalcSidTime : public modCalcSidTimeDlg { Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalcsidtimedlg.ui b/kstars/kstars/tools/modcalcsidtimedlg.ui index eea8681c..ebc55464 100644 --- a/kstars/kstars/tools/modcalcsidtimedlg.ui +++ b/kstars/kstars/tools/modcalcsidtimedlg.ui @@ -1,10 +1,10 @@ modCalcSidTimeDlg - + modCalcSidTimeDlg - + 0 0 @@ -22,11 +22,11 @@ unnamed - + tabWidget2 - + tab @@ -37,15 +37,15 @@ unnamed - + - layout47 + tqlayout47 unnamed - + InputBox @@ -56,7 +56,7 @@ unnamed - + UtRadio @@ -67,7 +67,7 @@ true - + StRadio @@ -80,7 +80,7 @@ - + longdataBox @@ -91,7 +91,7 @@ unnamed - + dateBox @@ -99,7 +99,7 @@ Date: - + longLabel @@ -111,7 +111,7 @@ longBox - + 100 0 @@ -125,7 +125,7 @@ datBox - + 100 0 @@ -139,9 +139,9 @@ - + - layout3 + tqlayout3 @@ -157,7 +157,7 @@ Expanding - + 41 21 @@ -182,7 +182,7 @@ Expanding - + 101 21 @@ -207,7 +207,7 @@ Expanding - + 41 20 @@ -216,15 +216,15 @@ - + - layout47 + tqlayout47 unnamed - + UtimeBox @@ -245,14 +245,14 @@ Expanding - + 40 20 - + UtLabel @@ -260,7 +260,7 @@ UT: - + UtBox @@ -275,7 +275,7 @@ Expanding - + 30 20 @@ -284,7 +284,7 @@ - + St0Box @@ -305,14 +305,14 @@ Expanding - + 40 20 - + StLabel @@ -320,7 +320,7 @@ ST: - + StBox @@ -335,7 +335,7 @@ Expanding - + 30 20 @@ -356,7 +356,7 @@ Expanding - + 20 204 @@ -365,7 +365,7 @@ - + tab @@ -376,7 +376,7 @@ unnamed - + InputBox_2_2_2 @@ -391,7 +391,7 @@ 0 - + 90 0 @@ -404,15 +404,15 @@ unnamed - + - layout30 + tqlayout30 unnamed - + longCheckBatch @@ -426,7 +426,7 @@ If checked, value will be read from input file. If not, value will be read from adjacent box - + utCheckBatch @@ -440,7 +440,7 @@ If checked, value will be read from input file. If not, value will be read from adjacent box - + utBoxBatch @@ -452,7 +452,7 @@ false - + 100 0 @@ -474,16 +474,16 @@ Expanding - + 16 20 - + - layout32 + tqlayout32 @@ -501,19 +501,19 @@ 0 - + 100 0 - + stBoxBatch - + stCheckBatch @@ -530,7 +530,7 @@ If checked, value will be read from input file. If not, value will be read from adjacent box - + dateCheckBatch @@ -559,7 +559,7 @@ Expanding - + 40 20 @@ -568,7 +568,7 @@ - + buttonFieldsGroup @@ -579,7 +579,7 @@ unnamed - + allRadioBatch @@ -587,7 +587,7 @@ All parameters - + inputRadioBatch @@ -600,7 +600,7 @@ - + groupFilesBox @@ -611,7 +611,7 @@ unnamed - + InputButtonBatch @@ -622,17 +622,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -645,9 +645,9 @@ - + - layout22_3 + tqlayout22_3 @@ -663,7 +663,7 @@ Expanding - + 151 21 @@ -696,7 +696,7 @@ Expanding - + 131 21 @@ -715,7 +715,7 @@ Expanding - + 31 16 @@ -849,7 +849,7 @@ OutButtonBatch runButtonBatch - + slotComputeTime() slotClearFields() slotLongChecked() @@ -859,8 +859,8 @@ slotRunBatch() slotInputFile() slotOutputFile() - - + + dmsbox.h diff --git a/kstars/kstars/tools/modcalcvlsr.cpp b/kstars/kstars/tools/modcalcvlsr.cpp index 412e1d72..9b352d58 100644 --- a/kstars/kstars/tools/modcalcvlsr.cpp +++ b/kstars/kstars/tools/modcalcvlsr.cpp @@ -28,7 +28,7 @@ #include "kstarsdatetime.h" #include "libkdeedu/extdate/extdatetimeedit.h" -#include //need for QTimeEdit +#include //need for TQTimeEdit #include #include #include @@ -37,7 +37,7 @@ #include -modCalcVlsr::modCalcVlsr(TQWidget *parentSplit, const char *name) : modCalcVlsrDlg (parentSplit,name) { +modCalcVlsr::modCalcVlsr(TQWidget *tqparentSplit, const char *name) : modCalcVlsrDlg (tqparentSplit,name) { showCurrentDateTime(); initGeo(); @@ -141,9 +141,9 @@ void modCalcVlsr::getGeoLocation (void) void modCalcVlsr::showCurrentDateTime (void) { - KStars *ks = (KStars*) parent()->parent()->parent(); + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); - KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); datBox->setDate( dt.date() ); timBox->setTime( dt.time() ); @@ -154,7 +154,7 @@ void modCalcVlsr::showCurrentDateTime (void) // SIRVE para algo? void modCalcVlsr::initGeo(void) { - KStars *ks = (KStars*) parent()->parent()->parent(); // QSplitter->AstroCalc->KStars + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars geoPlace = new GeoLocation( ks->geo() ); } @@ -163,7 +163,7 @@ void modCalcVlsr::initGeo(void) void modCalcVlsr::showLongLat(void) { - KStars *ks = (KStars*) parent()->parent()->parent(); // QSplitter->AstroCalc->KStars + KStars *ks = (KStars*) tqparent()->tqparent()->tqparent(); // TQSplitter->AstroCalc->KStars longBox->show( ks->geo()->lng() ); latBox->show( ks->geo()->lat() ); longBoxBatch->show( ks->geo()->lng() ); @@ -212,7 +212,7 @@ void modCalcVlsr::slotClearCoords() vGeoBox->setText(""); vTopoBox->setText(""); - datBox->setDate(ExtDate::currentDate()); + datBox->setDate(ExtDate::tqcurrentDate()); timBox->setTime(TQTime(0,0,0)); } @@ -373,7 +373,7 @@ void modCalcVlsr::slotRunBatch() { if ( TQFile::exists(inputFileName) ) { TQFile f( inputFileName ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1.").arg( f.name() ); + TQString message = i18n( "Could not open file %1.").tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); inputFileName = ""; return; @@ -385,7 +385,7 @@ void modCalcVlsr::slotRunBatch() { // readFile( istream ); f.close(); } else { - TQString message = i18n( "Invalid file: %1" ).arg( inputFileName ); + TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName ); KMessageBox::sorry( 0, message, i18n( "Invalid file" ) ); inputFileName = ""; InputLineEditBatch->setText( inputFileName ); diff --git a/kstars/kstars/tools/modcalcvlsr.h b/kstars/kstars/tools/modcalcvlsr.h index 614e321a..0f046005 100644 --- a/kstars/kstars/tools/modcalcvlsr.h +++ b/kstars/kstars/tools/modcalcvlsr.h @@ -38,6 +38,7 @@ class dms; class modCalcVlsr : public modCalcVlsrDlg { Q_OBJECT + TQ_OBJECT public: modCalcVlsr(TQWidget *p, const char *n); diff --git a/kstars/kstars/tools/modcalcvlsrdlg.ui b/kstars/kstars/tools/modcalcvlsrdlg.ui index 80311fb8..e4d5c042 100644 --- a/kstars/kstars/tools/modcalcvlsrdlg.ui +++ b/kstars/kstars/tools/modcalcvlsrdlg.ui @@ -1,10 +1,10 @@ modCalcVlsrDlg - + modCalcVlsrDlg - + 0 0 @@ -19,11 +19,11 @@ unnamed - + tabWidget3 - + tab @@ -34,7 +34,7 @@ unnamed - + inputGroupBox @@ -45,9 +45,9 @@ unnamed - + - layout7 + tqlayout7 @@ -63,14 +63,14 @@ Expanding - + 20 21 - + timBox @@ -93,7 +93,7 @@ Expanding - + 20 21 @@ -108,7 +108,7 @@ StrongFocus - + dateLabel @@ -116,7 +116,7 @@ Date: - + timLabel @@ -136,16 +136,16 @@ Fixed - + 20 20 - + - layout8 + tqlayout8 @@ -155,7 +155,7 @@ heightBox - + 1000 32767 @@ -169,7 +169,7 @@ longBox - + 100 0 @@ -179,7 +179,7 @@ StrongFocus - + latLabel @@ -187,7 +187,7 @@ Latitude: - + longLabel @@ -195,7 +195,7 @@ Longitude: - + textLabel1_2 @@ -207,7 +207,7 @@ latBox - + 100 0 @@ -221,9 +221,9 @@ - + - layout14 + tqlayout14 @@ -239,14 +239,14 @@ Expanding - + 120 31 - + GroupBox2 @@ -257,7 +257,7 @@ unnamed - + raLabel @@ -272,7 +272,7 @@ true - + 100 0 @@ -282,7 +282,7 @@ StrongFocus - + decLabel @@ -294,7 +294,7 @@ decBox - + 100 0 @@ -304,7 +304,7 @@ StrongFocus - + epochName @@ -316,14 +316,14 @@ 0 - + 32767 32767 - + epochLabel @@ -343,7 +343,7 @@ Fixed - + 100 20 @@ -352,15 +352,15 @@ - + - layout15 + tqlayout15 unnamed - + groupBox8 @@ -376,7 +376,7 @@ vlsrBox - + azLabel @@ -389,7 +389,7 @@ vHelioBox - + textLabel1 @@ -402,7 +402,7 @@ vGeoBox - + textLabel2 @@ -410,7 +410,7 @@ Geocentric velocity: - + textLabel3 @@ -435,14 +435,14 @@ Expanding - + 30 21 - + buttonGroup6 @@ -453,7 +453,7 @@ unnamed - + radioVlsr @@ -464,7 +464,7 @@ true - + radioVhelio @@ -472,7 +472,7 @@ Heliocentric - + radioVgeo @@ -480,7 +480,7 @@ Geocentric - + radioVtopo @@ -492,7 +492,7 @@ - + Layout10 @@ -506,17 +506,17 @@ 6 - + Compute - + 0 25 - + 120 32767 @@ -526,17 +526,17 @@ Convert - + Clear - + 0 25 - + 120 32767 @@ -558,7 +558,7 @@ Expanding - + 21 20 @@ -567,7 +567,7 @@ - + tab @@ -578,7 +578,7 @@ unnamed - + InputBox_2_2 @@ -600,7 +600,7 @@ unnamed - + decCheckBatch @@ -611,7 +611,7 @@ true - + epochCheckBatch @@ -619,7 +619,7 @@ Epoch: - + dateCheckBatch @@ -630,7 +630,7 @@ false - + utCheckBatch @@ -644,7 +644,7 @@ false - + raCheckBatch @@ -655,7 +655,7 @@ true - + utBoxBatch @@ -675,7 +675,7 @@ dateBoxBatch - + 100 0 @@ -689,7 +689,7 @@ false - + 100 0 @@ -706,7 +706,7 @@ false - + 100 0 @@ -736,7 +736,7 @@ true - + 100 0 @@ -746,7 +746,7 @@ StrongFocus - + longCheckBatch @@ -764,7 +764,7 @@ true - + 100 0 @@ -774,7 +774,7 @@ StrongFocus - + latCheckBatch @@ -785,7 +785,7 @@ false - + heightCheckBatch @@ -796,7 +796,7 @@ false - + vlsrCheckBatch @@ -807,7 +807,7 @@ false - + helioVCheckBatch @@ -815,7 +815,7 @@ Heliocentric v.: - + geoVCheckBatch @@ -823,7 +823,7 @@ Geocentric v.: - + topoVCheckBatch @@ -841,24 +841,24 @@ heightBoxBatch - + vhelioBoxBatch - + vgeoBoxBatch - + vtopoBoxBatch - + buttonGroup4 @@ -869,7 +869,7 @@ unnamed - + allRadioBatch @@ -877,7 +877,7 @@ All parameters - + inputRadioBatch @@ -890,7 +890,7 @@ - + groupBox4_2 @@ -901,7 +901,7 @@ unnamed - + InputButtonBatch @@ -912,17 +912,17 @@ File with the input data - + InputLineEditBatch - + OutputLineEditBatch - + OutButtonBatch @@ -935,9 +935,9 @@ - + - layout14 + tqlayout14 @@ -953,7 +953,7 @@ Expanding - + 151 21 @@ -986,7 +986,7 @@ Expanding - + 131 21 @@ -1005,7 +1005,7 @@ Expanding - + 20 50 @@ -1014,7 +1014,7 @@ - + TabPage @@ -1171,7 +1171,7 @@ runButtonBatch kTextBrowser1 - + slotComputeVelocities() slotClearCoords() slotUtChecked() @@ -1186,8 +1186,8 @@ slotInputFile() slotOutputFile() slotRunBatch() - - + + klineedit.h diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp index fbd1702c..163040b9 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* parent ) +ObservingList::ObservingList( KStars *_ks, TQWidget* tqparent ) : KDialogBase( KDialogBase::Plain, i18n( "Observing List" ), - Close, Close, parent, "observinglist", false ), ks( _ks ), LogObject(0), oCurrent(0), + Close, Close, tqparent, "observinglist", false ), ks( _ks ), LogObject(0), oCurrent(0), noNameStars(0), isModified(false), bIsLarge(true) { TQFrame *page = plainPage(); @@ -121,7 +121,7 @@ ObservingList::ObservingList( KStars *_ks, TQWidget* parent ) ui->NotesEdit->setEnabled( false ); } -bool ObservingList::contains( const SkyObject *q ) { +bool ObservingList::tqcontains( const SkyObject *q ) { for ( SkyObject* o = obsList.first(); o; o = obsList.next() ) { if ( o == q ) return true; } @@ -144,7 +144,7 @@ void ObservingList::slotAddObject( SkyObject *obj ) { for ( SkyObject *o = obsList.first(); o; o = obsList.next() ) { if ( obj == o ) { //FIXME STRINGS FREEZE - //ks->statusBar()->changeItem( i18n( "%1 is already in the observing list." ).arg( obj->name() ), 0 ); + //ks->statusBar()->changeItem( i18n( "%1 is already in the observing list." ).tqarg( obj->name() ), 0 ); return; } } @@ -164,7 +164,7 @@ void ObservingList::slotAddObject( SkyObject *obj ) { ui->TinyTable->insertItem( obj->translatedName() ); //Note addition in statusbar - ks->statusBar()->changeItem( i18n( "Added %1 to observing list." ).arg( obj->name() ), 0 ); + ks->statusBar()->changeItem( i18n( "Added %1 to observing list." ).tqarg( obj->name() ), 0 ); } void ObservingList::slotRemoveObject( SkyObject *o ) { @@ -200,7 +200,7 @@ void ObservingList::slotRemoveObject( SkyObject *o ) { } if ( ! objectFound ) { - kdDebug() << i18n( "Cannot remove Object %1; not found in table." ).arg(o->translatedName()) << endl; + kdDebug() << i18n( "Cannot remove Object %1; not found in table." ).tqarg(o->translatedName()) << endl; } else { //Remove object from TinyTable for ( uint i=0; i < ui->TinyTable->count(); i++ ) { @@ -268,7 +268,7 @@ void ObservingList::slotNewSelection() { } if ( ! found ) { - kdDebug() << i18n( "Object %1 not found in obsList." ).arg( newName ) << endl; + kdDebug() << i18n( "Object %1 not found in obsList." ).tqarg( newName ) << endl; } else if ( newName != i18n( "star" ) ) { //Display the object's current user notes in the NotesEdit //First, save the last object's user log to disk, if necessary @@ -280,9 +280,9 @@ void ObservingList::slotNewSelection() { ui->NotesLabel->setEnabled( true ); ui->NotesEdit->setEnabled( true ); - ui->NotesLabel->setText( i18n( "observing notes for %1:" ).arg( LogObject->translatedName() ) ); + ui->NotesLabel->setText( i18n( "observing notes for %1:" ).tqarg( LogObject->translatedName() ) ); if ( LogObject->userLog.isEmpty() ) { - ui->NotesEdit->setText( i18n("Record here observation logs and/or data on %1.").arg( LogObject->translatedName() ) ); + ui->NotesEdit->setText( i18n("Record here observation logs and/or data on %1.").tqarg( LogObject->translatedName() ) ); } else { ui->NotesEdit->setText( LogObject->userLog ); } @@ -345,8 +345,8 @@ void ObservingList::slotSlewToObject() int selectedCoord(0); SkyPoint sp; - // Find the first device with EQUATORIAL_EOD_COORD or EQUATORIAL_COORD and with SLEW element - // i.e. the first telescope we find! + // Find the first device with ETQUATORIAL_EOD_COORD or ETQUATORIAL_COORD and with SLEW element + // i.e. the first telescope we tqfind! INDIMenu *imenu = ks->getINDIMenu(); @@ -357,10 +357,10 @@ void ObservingList::slotSlewToObject() { indidev = imenu->mgr.at(i)->indi_dev.at(j); indidev->stdDev->currentObject = NULL; - prop = indidev->findProp("EQUATORIAL_EOD_COORD"); + prop = indidev->findProp("ETQUATORIAL_EOD_COORD"); if (prop == NULL) { - prop = indidev->findProp("EQUATORIAL_COORD"); + prop = indidev->findProp("ETQUATORIAL_COORD"); if (prop == NULL) { prop = indidev->findProp("HORIZONTAL_COORD"); @@ -378,7 +378,7 @@ void ObservingList::slotSlewToObject() if (ConnectEle->state == PS_OFF) { - KMessageBox::error(0, i18n("Telescope %1 is offline. Please connect and retry again.").arg(indidev->label)); + KMessageBox::error(0, i18n("Telescope %1 is offline. Please connect and retry again.").tqarg(indidev->label)); return; } @@ -393,7 +393,7 @@ void ObservingList::slotSlewToObject() if (!DecEle) continue; break; - // Horizontal + //Qt::Horizontal case 1: if (prop->perm == PP_RO) continue; AzEle = prop->findElement("AZ"); @@ -430,10 +430,10 @@ void ObservingList::slotSlewToObject() sp.set (ks->map()->clickedPoint()->ra(), ks->map()->clickedPoint()->dec()); if (useJ2000) - sp.apparentCoord(ks->data()->ut().djd(), (long double) J2000); + sp.aptqparentCoord(ks->data()->ut().djd(), (long double) J2000); - RAEle->write_w->setText(TQString("%1:%2:%3").arg(sp.ra()->hour()).arg(sp.ra()->minute()).arg(sp.ra()->second())); - DecEle->write_w->setText(TQString("%1:%2:%3").arg(sp.dec()->degree()).arg(sp.dec()->arcmin()).arg(sp.dec()->arcsec())); + RAEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.ra()->hour()).tqarg(sp.ra()->minute()).tqarg(sp.ra()->second())); + DecEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.dec()->degree()).tqarg(sp.dec()->arcmin()).tqarg(sp.dec()->arcsec())); break; @@ -449,8 +449,8 @@ void ObservingList::slotSlewToObject() sp.setAlt(*ks->map()->clickedPoint()->alt()); } - AzEle->write_w->setText(TQString("%1:%2:%3").arg(sp.az()->degree()).arg(sp.az()->arcmin()).arg(sp.az()->arcsec())); - AltEle->write_w->setText(TQString("%1:%2:%3").arg(sp.alt()->degree()).arg(sp.alt()->arcmin()).arg(sp.alt()->arcsec())); + AzEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.az()->degree()).tqarg(sp.az()->arcmin()).tqarg(sp.az()->arcsec())); + AltEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.alt()->degree()).tqarg(sp.alt()->arcmin()).tqarg(sp.alt()->arcsec())); break; } @@ -490,7 +490,7 @@ void ObservingList::slotAVT() { void ObservingList::slotClose() { //Save the current User log text if ( oCurrent && ! ui->NotesEdit->text().isEmpty() && ui->NotesEdit->text() - != i18n("Record here observation logs and/or data on %1.").arg( oCurrent->name()) ) { + != i18n("Record here observation logs and/or data on %1.").tqarg( oCurrent->name()) ) { oCurrent->saveUserLog( ui->NotesEdit->text() ); } @@ -500,7 +500,7 @@ void ObservingList::slotClose() { void ObservingList::saveCurrentUserLog() { if ( ! ui->NotesEdit->text().isEmpty() && ui->NotesEdit->text() != - i18n("Record here observation logs and/or data on %1.").arg( LogObject->translatedName() ) ) { + i18n("Record here observation logs and/or data on %1.").tqarg( LogObject->translatedName() ) ) { LogObject->saveUserLog( ui->NotesEdit->text() ); ui->NotesEdit->clear(); @@ -528,7 +528,7 @@ void ObservingList::slotOpenList() { } if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1" ).arg( f.name() ); + TQString message = i18n( "Could not open file %1" ).tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); return; } @@ -627,7 +627,7 @@ void ObservingList::slotSaveList() { TQFile f( FileName ); if ( !f.open( IO_WriteOnly) ) { - TQString message = i18n( "Could not open file %1. Try a different filename?" ).arg( f.name() ); + TQString message = i18n( "Could not open file %1. Try a different filename?" ).tqarg( f.name() ); if ( KMessageBox::warningYesNo( 0, message, i18n( "Could Not Open File" ), i18n("Try Different"), i18n("Do Not Try") ) == KMessageBox::Yes ) { FileName == ""; diff --git a/kstars/kstars/tools/observinglist.h b/kstars/kstars/tools/observinglist.h index e2beaba6..a1602f1f 100644 --- a/kstars/kstars/tools/observinglist.h +++ b/kstars/kstars/tools/observinglist.h @@ -58,11 +58,12 @@ class TQStringList; class ObservingList : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /**@short Cunstructor */ - ObservingList( KStars *_ks, TQWidget* parent = 0 ); + ObservingList( KStars *_ks, TQWidget* tqparent = 0 ); /**@short Destuctor (empty) */ ~ObservingList() {} @@ -70,7 +71,7 @@ public: /**@return true if the object is in the observing list *@p o pointer to the object to test. */ - bool contains( const SkyObject *o ); + bool tqcontains( const SkyObject *o ); SkyObject* first() { return obsList.first(); } SkyObject* next() { return obsList.next(); } diff --git a/kstars/kstars/tools/observinglistui.ui b/kstars/kstars/tools/observinglistui.ui index 040f6970..909cc564 100644 --- a/kstars/kstars/tools/observinglistui.ui +++ b/kstars/kstars/tools/observinglistui.ui @@ -1,10 +1,10 @@ ObservingListUI - + ObservingListUI - + 0 0 @@ -19,9 +19,9 @@ unnamed - + - layout68 + tqlayout68 @@ -39,13 +39,13 @@ 0 - + 32 32 - + 32 32 @@ -73,13 +73,13 @@ 0 - + 32 32 - + 32 32 @@ -107,13 +107,13 @@ 0 - + 32 32 - + 32 32 @@ -141,13 +141,13 @@ 0 - + 32 32 - + 32 32 @@ -173,7 +173,7 @@ Expanding - + 350 20 @@ -192,13 +192,13 @@ 0 - + 32 32 - + 32 32 @@ -216,9 +216,9 @@ - + - layout4 + tqlayout4 @@ -350,7 +350,7 @@ Expanding - + 40 20 @@ -359,7 +359,7 @@ - + TableStack @@ -371,7 +371,7 @@ 1 - + WStackPage @@ -462,7 +462,7 @@ - + WStackPage @@ -488,7 +488,7 @@ 4 - + 0 100 @@ -498,7 +498,7 @@ - + NotesLabel @@ -518,7 +518,7 @@ observing notes for object: - + AlignVCenter @@ -534,13 +534,13 @@ 1 - + 0 100 - + 32767 160 @@ -554,7 +554,7 @@ - + kpushbutton.h kpushbutton.h diff --git a/kstars/kstars/tools/obslistwizard.cpp b/kstars/kstars/tools/obslistwizard.cpp index 7dbbbc3d..9a3c57d8 100644 --- a/kstars/kstars/tools/obslistwizard.cpp +++ b/kstars/kstars/tools/obslistwizard.cpp @@ -34,10 +34,10 @@ #include "obslistwizard.h" -ObsListWizard::ObsListWizard( TQWidget *parent, const char *name ) - : KDialogBase( KDialogBase::Plain, i18n("Observing List Wizard"), Ok|Cancel, Ok, parent, name ) +ObsListWizard::ObsListWizard( TQWidget *tqparent, const char *name ) + : KDialogBase( KDialogBase::Plain, i18n("Observing List Wizard"), Ok|Cancel, Ok, tqparent, name ) { - ksw = (KStars*)parent; + ksw = (KStars*)tqparent; TQFrame *page = plainPage(); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 ); @@ -195,32 +195,32 @@ void ObsListWizard::slotShowStackWidget( TQListViewItem *i ) if ( i ) { TQString t = i->text(0); - if ( t.contains( i18n( "Object type(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ObjTypePage ); - if ( t.contains( i18n( "Region" ) ) ) olw->FilterStack->raiseWidget( olw->RegionPage ); - if ( t.contains( i18n( "In constellation(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ConstellationPage ); - if ( t.contains( i18n( "Circular" ) ) ) olw->FilterStack->raiseWidget( olw->CircRegionPage ); - if ( t.contains( i18n( "Rectangular" ) ) ) olw->FilterStack->raiseWidget( olw->RectRegionPage ); -// if ( t.contains( i18n( "Observable on date" ) ) ) olw->FilterStack->raiseWidget( olw->ObsDatePage ); - if ( t.contains( i18n( "Magnitude limit" ) ) ) olw->FilterStack->raiseWidget( olw->MagLimitPage ); + if ( t.tqcontains( i18n( "Object type(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ObjTypePage ); + if ( t.tqcontains( i18n( "Region" ) ) ) olw->FilterStack->raiseWidget( olw->RegionPage ); + if ( t.tqcontains( i18n( "In constellation(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ConstellationPage ); + if ( t.tqcontains( i18n( "Circular" ) ) ) olw->FilterStack->raiseWidget( olw->CircRegionPage ); + if ( t.tqcontains( i18n( "Rectangular" ) ) ) olw->FilterStack->raiseWidget( olw->RectRegionPage ); +// if ( t.tqcontains( i18n( "Observable on date" ) ) ) olw->FilterStack->raiseWidget( olw->ObsDatePage ); + if ( t.tqcontains( i18n( "Magnitude limit" ) ) ) olw->FilterStack->raiseWidget( olw->MagLimitPage ); } } void ObsListWizard::slotDeepSkyButton() { olw->TypeList->selectAll( false ); - olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Open Clusters" ) ), true ); - olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Globular Clusters" ) ), true ); - olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Gaseous Nebulae" ) ), true ); - olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Planetary Nebulae" ) ), true ); - olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Galaxies" ) ), true ); + olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Open Clusters" ) ), true ); + olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Globular Clusters" ) ), true ); + olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Gaseous Nebulae" ) ), true ); + olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Planetary Nebulae" ) ), true ); + olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Galaxies" ) ), true ); } void ObsListWizard::slotSolarSystemButton() { olw->TypeList->selectAll( false ); - olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Sun, Moon, Planets" ) ), true ); - olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Comets" ) ), true ); - olw->TypeList->setSelected( olw->TypeList->findItem( i18n( "Asteroids" ) ), true ); + olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Sun, Moon, Planets" ) ), true ); + olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Comets" ) ), true ); + olw->TypeList->setSelected( olw->TypeList->tqfindItem( i18n( "Asteroids" ) ), true ); } void ObsListWizard::slotChangeLocation() @@ -235,23 +235,23 @@ void ObsListWizard::slotChangeLocation() void ObsListWizard::slotUpdateObjectCount() { ObjectCount = 0; - if ( olw->TypeList->findItem( i18n( "Stars" ) )->isSelected() ) + if ( olw->TypeList->tqfindItem( i18n( "Stars" ) )->isSelected() ) ObjectCount += StarCount; - if ( olw->TypeList->findItem( i18n( "Sun, Moon, Planets" ) )->isSelected() ) + if ( olw->TypeList->tqfindItem( i18n( "Sun, Moon, Planets" ) )->isSelected() ) ObjectCount += PlanetCount; - if ( olw->TypeList->findItem( i18n( "Comets" ) )->isSelected() ) + if ( olw->TypeList->tqfindItem( i18n( "Comets" ) )->isSelected() ) ObjectCount += CometCount; - if ( olw->TypeList->findItem( i18n( "Asteroids" ) )->isSelected() ) + if ( olw->TypeList->tqfindItem( i18n( "Asteroids" ) )->isSelected() ) ObjectCount += AsteroidCount; - if ( olw->TypeList->findItem( i18n( "Galaxies" ) )->isSelected() ) + if ( olw->TypeList->tqfindItem( i18n( "Galaxies" ) )->isSelected() ) ObjectCount += GalaxyCount; - if ( olw->TypeList->findItem( i18n( "Open Clusters" ) )->isSelected() ) + if ( olw->TypeList->tqfindItem( i18n( "Open Clusters" ) )->isSelected() ) ObjectCount += OpenClusterCount; - if ( olw->TypeList->findItem( i18n( "Globular Clusters" ) )->isSelected() ) + if ( olw->TypeList->tqfindItem( i18n( "Globular Clusters" ) )->isSelected() ) ObjectCount += GlobClusterCount; - if ( olw->TypeList->findItem( i18n( "Gaseous Nebulae" ) )->isSelected() ) + if ( olw->TypeList->tqfindItem( i18n( "Gaseous Nebulae" ) )->isSelected() ) ObjectCount += GasNebCount; - if ( olw->TypeList->findItem( i18n( "Planetary Nebulae" ) )->isSelected() ) + if ( olw->TypeList->tqfindItem( i18n( "Planetary Nebulae" ) )->isSelected() ) ObjectCount += PlanNebCount; applyFilters( false ); //false = only adjust counts, do not build list @@ -307,7 +307,7 @@ void ObsListWizard::applyFilters( bool doBuildList ) //Stars int starIndex(ksw->data()->starList.count()); - if ( olw->TypeList->findItem( i18n( "Stars" ) )->isSelected() ) { + if ( olw->TypeList->tqfindItem( i18n( "Stars" ) )->isSelected() ) { if ( maglimit < 100. ) { //Stars are sorted by mag, so use binary search algo to find index of faintest mag int low(0), high(ksw->data()->starList.count()-1), middle; @@ -338,7 +338,7 @@ void ObsListWizard::applyFilters( bool doBuildList ) } //Sun, Moon, Planets - if ( olw->TypeList->findItem( i18n( "Sun, Moon, Planets" ) )->isSelected() ) { + if ( olw->TypeList->tqfindItem( i18n( "Sun, Moon, Planets" ) )->isSelected() ) { applyRegionFilter( (SkyObject*)ksw->data()->PCat->planetSun(), doBuildList ); applyRegionFilter( (SkyObject*)ksw->data()->Moon, doBuildList ); applyRegionFilter( (SkyObject*)ksw->data()->PCat->findByName("Mercury"), doBuildList ); @@ -354,12 +354,12 @@ void ObsListWizard::applyFilters( bool doBuildList ) //Deep sky objects for ( SkyObject *o = (SkyObject*)(ksw->data()->deepSkyList.first()); o; o = (SkyObject*)(ksw->data()->deepSkyList.next()) ) { //Skip unselected object types - if ( (o->type() == SkyObject::STAR || o->type() == SkyObject::CATALOG_STAR) && ! olw->TypeList->findItem( i18n( "Stars" ) )->isSelected() ) continue; - if ( o->type() == SkyObject::OPEN_CLUSTER && ! olw->TypeList->findItem( i18n( "Open Clusters" ) )->isSelected() ) continue; - if ( o->type() == SkyObject::GLOBULAR_CLUSTER && ! olw->TypeList->findItem( i18n( "Globular Clusters" ) )->isSelected() ) continue; - if ( (o->type() == SkyObject::GASEOUS_NEBULA || o->type() == SkyObject::SUPERNOVA_REMNANT) && ! olw->TypeList->findItem( i18n( "Gaseous Nebulae" ) )->isSelected() ) continue; - if ( o->type() == SkyObject::PLANETARY_NEBULA && ! olw->TypeList->findItem( i18n( "Planetary Nebulae" ) )->isSelected() ) continue; - if ( o->type() == SkyObject::GALAXY && ! olw->TypeList->findItem( i18n( "Galaxies" ) )->isSelected() ) continue; + if ( (o->type() == SkyObject::STAR || o->type() == SkyObject::CATALOG_STAR) && ! olw->TypeList->tqfindItem( i18n( "Stars" ) )->isSelected() ) continue; + if ( o->type() == SkyObject::OPEN_CLUSTER && ! olw->TypeList->tqfindItem( i18n( "Open Clusters" ) )->isSelected() ) continue; + if ( o->type() == SkyObject::GLOBULAR_CLUSTER && ! olw->TypeList->tqfindItem( i18n( "Globular Clusters" ) )->isSelected() ) continue; + if ( (o->type() == SkyObject::GASEOUS_NEBULA || o->type() == SkyObject::SUPERNOVA_REMNANT) && ! olw->TypeList->tqfindItem( i18n( "Gaseous Nebulae" ) )->isSelected() ) continue; + if ( o->type() == SkyObject::PLANETARY_NEBULA && ! olw->TypeList->tqfindItem( i18n( "Planetary Nebulae" ) )->isSelected() ) continue; + if ( o->type() == SkyObject::GALAXY && ! olw->TypeList->tqfindItem( i18n( "Galaxies" ) )->isSelected() ) continue; if ( o->type() == SkyObject::TYPE_UNKNOWN ) continue; if ( olw->SelectByMag->isChecked() ) { @@ -380,7 +380,7 @@ void ObsListWizard::applyFilters( bool doBuildList ) } //Comets - if ( olw->TypeList->findItem( i18n( "Comets" ) )->isSelected() ) { + if ( olw->TypeList->tqfindItem( i18n( "Comets" ) )->isSelected() ) { for ( SkyObject *o = (SkyObject*)(ksw->data()->cometList.first()); o; o = (SkyObject*)(ksw->data()->cometList.next()) ) { //comets don't have magnitudes at this point, so skip mag check applyRegionFilter( o, doBuildList ); @@ -388,7 +388,7 @@ void ObsListWizard::applyFilters( bool doBuildList ) } //Asteroids - if ( olw->TypeList->findItem( i18n( "Asteroids" ) )->isSelected() ) { + if ( olw->TypeList->tqfindItem( i18n( "Asteroids" ) )->isSelected() ) { for ( SkyObject *o = (SkyObject*)(ksw->data()->asteroidList.first()); o; o = (SkyObject*)(ksw->data()->asteroidList.next()) ) { if ( olw->SelectByMag->isChecked() ) { @@ -411,14 +411,14 @@ void ObsListWizard::applyFilters( bool doBuildList ) //Update the object count label if ( doBuildList ) ObjectCount = obsList().count(); - olw->CountLabel->setText( i18n("Current selection: %1 objects").arg( ObjectCount ) ); + olw->CountLabel->setText( i18n("Current selection: %1 objects").tqarg( ObjectCount ) ); } void ObsListWizard::applyRegionFilter( SkyObject *o, bool doBuildList, bool doAdjustCount ) { //select by constellation if ( olw->SelectByConstellation->isChecked() ) { TQString c( o->constellation( ksw->data()->csegmentList, ksw->data()->cnameList ) ); - TQListBoxItem *it = olw->ConstellationList->findItem( c ); + TQListBoxItem *it = olw->ConstellationList->tqfindItem( c ); if ( it && it->isSelected() ) { if ( doBuildList ) obsList().append ( o ); diff --git a/kstars/kstars/tools/obslistwizard.h b/kstars/kstars/tools/obslistwizard.h index bbf7bbd7..0551ebfa 100644 --- a/kstars/kstars/tools/obslistwizard.h +++ b/kstars/kstars/tools/obslistwizard.h @@ -31,10 +31,11 @@ class TQListViewItem; class ObsListWizard : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /**@short Constructor */ - ObsListWizard( TQWidget *parent = 0, const char *name = 0 ); + ObsListWizard( TQWidget *tqparent = 0, const char *name = 0 ); /**@short Destructor */ ~ObsListWizard(); diff --git a/kstars/kstars/tools/obslistwizardui.ui b/kstars/kstars/tools/obslistwizardui.ui index a501e152..6349a985 100644 --- a/kstars/kstars/tools/obslistwizardui.ui +++ b/kstars/kstars/tools/obslistwizardui.ui @@ -1,10 +1,10 @@ ObsListWizardUI - + ObsListWizardUI - + 0 0 @@ -19,23 +19,23 @@ unnamed - + - layout79 + tqlayout79 unnamed - + - layout55 + tqlayout55 unnamed - + textLabel1 @@ -115,15 +115,15 @@ - + - layout12 + tqlayout12 unnamed - + textLabel1_2 @@ -139,11 +139,11 @@ Filter arguments: - + FilterStack - + ObjTypePage @@ -154,7 +154,7 @@ unnamed - + textLabel2 @@ -162,9 +162,9 @@ Select object types: - + - layout13 + tqlayout13 @@ -223,9 +223,9 @@ Multi - + - layout12 + tqlayout12 @@ -273,7 +273,7 @@ Expanding - + 20 90 @@ -286,7 +286,7 @@ - + ConstellationPage @@ -297,7 +297,7 @@ unnamed - + SelectByConstellation @@ -318,7 +318,7 @@ - + RectRegionPage @@ -329,7 +329,7 @@ unnamed - + SelectByRect @@ -340,15 +340,15 @@ - + - layout48 + tqlayout48 unnamed - + textLabel4_2_2 @@ -371,7 +371,7 @@ 0 - + 0 20 @@ -393,14 +393,14 @@ 0 - + 0 20 - + textLabel4 @@ -416,7 +416,7 @@ RA: - + textLabel4_3 @@ -432,7 +432,7 @@ Dec: - + textLabel4_2 @@ -455,7 +455,7 @@ 0 - + 0 20 @@ -477,7 +477,7 @@ 0 - + 0 20 @@ -496,7 +496,7 @@ Expanding - + 20 215 @@ -505,7 +505,7 @@ - + CircRegionPage @@ -516,7 +516,7 @@ unnamed - + SelectByCirc @@ -527,15 +527,15 @@ - + - layout9 + tqlayout9 unnamed - + textLabel1_4 @@ -543,7 +543,7 @@ Center RA: - + textLabel2_3 @@ -551,7 +551,7 @@ Center Dec: - + textLabel3_3 @@ -574,7 +574,7 @@ 0 - + 0 20 @@ -596,7 +596,7 @@ 0 - + 0 20 @@ -629,7 +629,7 @@ Expanding - + 20 170 @@ -638,7 +638,7 @@ - + ObsDatePage @@ -649,7 +649,7 @@ unnamed - + SelectByDate @@ -657,9 +657,9 @@ Select objects observ&able on: - + - layout6 + tqlayout6 @@ -669,7 +669,7 @@ Date - + 160 0 @@ -686,7 +686,7 @@ Expanding - + 40 20 @@ -695,15 +695,15 @@ - + - layout4 + tqlayout4 unnamed - + textLabel2_2 @@ -719,7 +719,7 @@ from - + LocationLabel @@ -734,9 +734,9 @@ - + - layout5_2 + tqlayout5_2 @@ -752,7 +752,7 @@ Expanding - + 40 20 @@ -780,7 +780,7 @@ Expanding - + 40 20 @@ -799,7 +799,7 @@ Expanding - + 20 176 @@ -808,7 +808,7 @@ - + MagLimitPage @@ -819,7 +819,7 @@ unnamed - + SelectByMag @@ -827,9 +827,9 @@ Select objects &brighter than: - + - layout36 + tqlayout36 @@ -843,7 +843,7 @@ false - + textLabel4_4 @@ -861,7 +861,7 @@ Expanding - + 295 20 @@ -870,7 +870,7 @@ - + ExcludeNoMag @@ -895,7 +895,7 @@ have &no magnitude Expanding - + 20 179 @@ -904,7 +904,7 @@ have &no magnitude - + RegionPage @@ -915,7 +915,7 @@ have &no magnitude unnamed - + textLabel3 @@ -930,7 +930,7 @@ c. select objects in a circular region Choose one of these sub-items to select from a region on the sky. - + AlignTop @@ -941,7 +941,7 @@ select from a region on the sky. - + CountLabel @@ -1012,7 +1012,7 @@ select from a region on the sky. 789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f - + klistview.h klistbox.h diff --git a/kstars/kstars/tools/optionstreeview.ui b/kstars/kstars/tools/optionstreeview.ui index acae2c0d..0a5ff0fb 100644 --- a/kstars/kstars/tools/optionstreeview.ui +++ b/kstars/kstars/tools/optionstreeview.ui @@ -1,10 +1,10 @@ OptionsTreeView - + OptionsTreeView - + 0 0 @@ -60,9 +60,9 @@ OptionsList - + - layout3 + tqlayout3 @@ -78,14 +78,14 @@ Expanding - + 80 20 - + buttonOk @@ -96,7 +96,7 @@ true - + buttonCancel @@ -130,7 +130,7 @@ accept() - + klistview.h diff --git a/kstars/kstars/tools/planetviewer.cpp b/kstars/kstars/tools/planetviewer.cpp index cd0aba3d..706ab7df 100644 --- a/kstars/kstars/tools/planetviewer.cpp +++ b/kstars/kstars/tools/planetviewer.cpp @@ -35,8 +35,8 @@ #define AUMAX 48 -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) +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) { TQFrame *page = plainPage(); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, spacingHint() ); @@ -49,7 +49,7 @@ PlanetViewer::PlanetViewer(TQWidget *parent, 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*)parent)->data()->lt().date() ); + pw->dateBox->setDate( ((KStars*)tqparent)->data()->lt().date() ); vlay->addWidget( pw ); resize( 500, 500 ); @@ -68,7 +68,7 @@ PlanetViewer::PlanetViewer(TQWidget *parent, const char *name) setCenterPlanet(""); PCat.initialize(); - ut = ((KStars*)parent)->data()->ut(); + ut = ((KStars*)tqparent)->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*)parent(); + KStars *ks = (KStars*)tqparent(); pw->dateBox->setDate( ks->data()->lt().date() ); } @@ -231,17 +231,17 @@ void PlanetViewer::keyPressEvent( TQKeyEvent *e ) { PVPlotWidget::PVPlotWidget( double x1, double x2, double y1, double y2, TQWidget *par, const char *name ) : KStarsPlotWidget( x1, x2, y1, y2, par, name ), mouseButtonDown(false), oldx(0), oldy(0) { - setFocusPolicy( TQWidget::StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); setMouseTracking (true); - pv = (PlanetViewer*)topLevelWidget(); + pv = (PlanetViewer*)tqtopLevelWidget(); } -PVPlotWidget::PVPlotWidget( TQWidget *parent, const char *name ) : - KStarsPlotWidget( 0.0, 1.0, 0.0, 1.0, parent, name ), +PVPlotWidget::PVPlotWidget( TQWidget *tqparent, const char *name ) : + KStarsPlotWidget( 0.0, 1.0, 0.0, 1.0, tqparent, name ), mouseButtonDown(false), oldx(0), oldy(0) { - setFocusPolicy( TQWidget::StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); setMouseTracking (true); - pv = (PlanetViewer*)topLevelWidget(); + pv = (PlanetViewer*)tqtopLevelWidget(); } PVPlotWidget::~ PVPlotWidget() {} @@ -416,7 +416,7 @@ void PVPlotWidget::mouseMoveEvent( TQMouseEvent *e ) { setLimits( xc - 0.5*dataWidth(), xc + 0.5*dataWidth(), yc - 0.5*dataHeight(), yc + 0.5*dataHeight() ); update(); - kapp->processEvents(20); + kapp->tqprocessEvents(20); } oldx = e->x(); diff --git a/kstars/kstars/tools/planetviewer.h b/kstars/kstars/tools/planetviewer.h index b212a630..9bffc9ba 100644 --- a/kstars/kstars/tools/planetviewer.h +++ b/kstars/kstars/tools/planetviewer.h @@ -34,8 +34,9 @@ class PlanetViewer : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - PlanetViewer(TQWidget *parent = 0, const char *name = 0); + PlanetViewer(TQWidget *tqparent = 0, const char *name = 0); ~PlanetViewer(); TQString centerPlanet() const { return CenterPlanet; } @@ -77,10 +78,11 @@ private: class PVPlotWidget : public KStarsPlotWidget { Q_OBJECT + TQ_OBJECT public: PVPlotWidget( double x1, double x2, double y1, double y2, - TQWidget *parent=0, const char *name=0 ); - PVPlotWidget( TQWidget *parent=0, const char *name=0 ); + TQWidget *tqparent=0, const char *name=0 ); + PVPlotWidget( TQWidget *tqparent=0, const char *name=0 ); ~PVPlotWidget(); public slots: diff --git a/kstars/kstars/tools/planetviewerui.ui b/kstars/kstars/tools/planetviewerui.ui index 77f3e085..0174ca8e 100644 --- a/kstars/kstars/tools/planetviewerui.ui +++ b/kstars/kstars/tools/planetviewerui.ui @@ -1,10 +1,10 @@ PlanetViewerUI - + PlanetViewerUI - + 0 0 @@ -24,9 +24,9 @@ map - + - layout2 + tqlayout2 @@ -44,7 +44,7 @@ 0 - + 34 34 @@ -69,7 +69,7 @@ Expanding - + 120 20 @@ -151,7 +151,7 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082 - + kpushbutton.h timestepbox.h diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp index b7538432..31667d00 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 *parent, const char *name ) - : KDialogBase( KDialogBase::Plain, i18n( "Script Builder" ), Close, Close, parent, name ), +ScriptBuilder::ScriptBuilder( TQWidget *tqparent, const char *name ) + : KDialogBase( KDialogBase::Plain, i18n( "Script Builder" ), Close, Close, tqparent, name ), UnsavedChanges(false), currentFileURL(), currentDir( TQDir::homeDirPath() ), currentScriptName(), currentAuthor() { TQFrame *page = plainPage(); - ks = (KStars*)parent; + ks = (KStars*)tqparent; TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 ); sb = new ScriptBuilderUI( page ); vlay->addWidget( sb ); @@ -118,7 +118,7 @@ ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name ) //Initialize function templates and descriptions KStarsFunctionList.append( new ScriptFunction( "lookTowards", i18n( "Point the display at the specified location. %1 can be the name of an object, a cardinal point on the compass, or 'zenith'." ), - false, "TQString", "dir" ) ); + false, TQSTRING_OBJECT_NAME_STRING, "dir" ) ); KStarsFunctionList.append( new ScriptFunction( "setRaDec", i18n( "Point the display at the specified RA/Dec coordinates. %1 is expressed in Hours; %2 is expressed in Degrees." ), false, "double", "ra", "double", "dec" ) ); KStarsFunctionList.append( new ScriptFunction( "setAltAz", i18n( "Point the display at the specified Alt/Az coordinates. %1 and %2 are expressed in Degrees." ), @@ -131,14 +131,14 @@ ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name ) false, "int", "year", "int", "month", "int", "day", "int", "hour", "int", "minute", "int", "second" ) ); KStarsFunctionList.append( new ScriptFunction( "waitFor", i18n( "Pause script execution for %1 seconds." ), false, "double", "sec" ) ); KStarsFunctionList.append( new ScriptFunction( "waitForKey", i18n( "Halt script execution until the key %1 is pressed. Only single-key strokes are possible; use 'space' for the spacebar." ), - false, "TQString", "key" ) ); + false, TQSTRING_OBJECT_NAME_STRING, "key" ) ); KStarsFunctionList.append( new ScriptFunction( "setTracking", i18n( "Set whether the display is tracking the current location." ), false, "bool", "track" ) ); - KStarsFunctionList.append( new ScriptFunction( "changeViewOption", i18n( "Change view option named %1 to value %2." ), false, "TQString", "opName", "TQString", "opValue" ) ); + KStarsFunctionList.append( new ScriptFunction( "changeViewOption", i18n( "Change view option named %1 to value %2." ), false, TQSTRING_OBJECT_NAME_STRING, "opName", TQSTRING_OBJECT_NAME_STRING, "opValue" ) ); KStarsFunctionList.append( new ScriptFunction( "setGeoLocation", i18n( "Set the geographic location to the city specified by %1, %2 and %3." ), - false, "TQString", "cityName", "TQString", "provinceName", "TQString", "countryName" ) ); - KStarsFunctionList.append( new ScriptFunction( "setColor", i18n( "Set the color named %1 to the value %2." ), false, "TQString", "colorName", "TQString", "value" ) ); - KStarsFunctionList.append( new ScriptFunction( "loadColorScheme", i18n( "Load the color scheme named %1." ), false, "TQString", "name" ) ); - KStarsFunctionList.append( new ScriptFunction( "exportImage", i18n( "Export the sky image to the file %1, with width %2 and height %3." ), false, "TQString", "fileName", "int", "width", "int", "height" ) ); + false, TQSTRING_OBJECT_NAME_STRING, "cityName", TQSTRING_OBJECT_NAME_STRING, "provinceName", TQSTRING_OBJECT_NAME_STRING, "countryName" ) ); + KStarsFunctionList.append( new ScriptFunction( "setColor", i18n( "Set the color named %1 to the value %2." ), false, TQSTRING_OBJECT_NAME_STRING, "colorName", TQSTRING_OBJECT_NAME_STRING, "value" ) ); + KStarsFunctionList.append( new ScriptFunction( "loadColorScheme", i18n( "Load the color scheme named %1." ), false, TQSTRING_OBJECT_NAME_STRING, "name" ) ); + KStarsFunctionList.append( new ScriptFunction( "exportImage", i18n( "Export the sky image to the file %1, with width %2 and height %3." ), false, TQSTRING_OBJECT_NAME_STRING, "fileName", "int", "width", "int", "height" ) ); KStarsFunctionList.append( new ScriptFunction( "printImage", i18n( "Print the sky image to a printer or file. If %1 is true, it will show the print dialog. If %2 is true, it will use the Star Chart color scheme for printing." ), false, "bool", "usePrintDialog", "bool", "useChartColors" ) ); KStarsFunctionList.append( new ScriptFunction( "stop", i18n( "Halt the simulation clock." ), true ) ); KStarsFunctionList.append( new ScriptFunction( "start", i18n( "Start the simulation clock." ), true ) ); @@ -147,71 +147,71 @@ ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name ) // INDI fuctions ScriptFunction *startINDIFunc(NULL), *shutdownINDIFunc(NULL), *switchINDIFunc(NULL), *setINDIPortFunc(NULL), *setINDIScopeActionFunc(NULL), *setINDITargetCoordFunc(NULL), *setINDITargetNameFunc(NULL), *setINDIGeoLocationFunc(NULL), *setINDIUTCFunc(NULL), *setINDIActionFunc(NULL), *waitForINDIActionFunc(NULL), *setINDIFocusSpeedFunc(NULL), *startINDIFocusFunc(NULL), *setINDIFocusTimeoutFunc(NULL), *setINDICCDTempFunc(NULL), *setINDIFilterNumFunc(NULL), *setINDIFrameTypeFunc(NULL), *startINDIExposureFunc(NULL); - startINDIFunc = new ScriptFunction( "startINDI", i18n("Establish an INDI device either in local mode or server mode."), false, "TQString", "deviceName", "bool", "useLocal"); + startINDIFunc = new ScriptFunction( "startINDI", i18n("Establish an INDI device either in local mode or server mode."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "bool", "useLocal"); INDIFunctionList.append ( startINDIFunc ); - shutdownINDIFunc = new ScriptFunction( "shutdownINDI", i18n("Shutdown an INDI device."), false, "TQString", "deviceName"); + shutdownINDIFunc = new ScriptFunction( "shutdownINDI", i18n("Shutdown an INDI device."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName"); INDIFunctionList.append ( shutdownINDIFunc); - switchINDIFunc = new ScriptFunction( "switchINDI", i18n("Connect or Disconnect an INDI device."), false, "TQString", "deviceName", "bool", "turnOn"); + switchINDIFunc = new ScriptFunction( "switchINDI", i18n("Connect or Disconnect an INDI device."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "bool", "turnOn"); switchINDIFunc->setINDIProperty("CONNECTION"); INDIFunctionList.append ( switchINDIFunc); - setINDIPortFunc = new ScriptFunction( "setINDIPort", i18n("Set INDI's device connection port."), false, "TQString", "deviceName", "TQString", "port"); + setINDIPortFunc = new ScriptFunction( "setINDIPort", i18n("Set INDI's device connection port."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "port"); setINDIPortFunc->setINDIProperty("DEVICE_PORT"); INDIFunctionList.append ( setINDIPortFunc); - setINDIScopeActionFunc = new ScriptFunction( "setINDIScopeAction", i18n("Set the telescope action. Available actions are SLEW, TRACK, SYNC, PARK, and ABORT."), false, "TQString", "deviceName", "TQString", "action"); + setINDIScopeActionFunc = new ScriptFunction( "setINDIScopeAction", i18n("Set the telescope action. Available actions are SLEW, TRACK, SYNC, PARK, and ABORT."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "action"); setINDIScopeActionFunc->setINDIProperty("CHECK"); INDIFunctionList.append( setINDIScopeActionFunc); - setINDITargetCoordFunc = new ScriptFunction ( "setINDITargetCoord", i18n( "Set the telescope target coordinates to the RA/Dec coordinates. RA is expressed in Hours; DEC is expressed in Degrees." ), false, "TQString", "deviceName", "double", "RA", "double", "DEC" ); - setINDITargetCoordFunc->setINDIProperty("EQUATORIAL_EOD_COORD"); + setINDITargetCoordFunc = new ScriptFunction ( "setINDITargetCoord", i18n( "Set the telescope target coordinates to the RA/Dec coordinates. RA is expressed in Hours; DEC is expressed in Degrees." ), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "double", "RA", "double", "DEC" ); + setINDITargetCoordFunc->setINDIProperty("ETQUATORIAL_EOD_COORD"); INDIFunctionList.append ( setINDITargetCoordFunc ); - setINDITargetNameFunc = new ScriptFunction( "setINDITargetName", i18n("Set the telescope target coorinates to the RA/Dec coordinates of the selected object."), false, "TQString", "deviceName", "TQString", "objectName"); - setINDITargetNameFunc->setINDIProperty("EQUATORIAL_EOD_COORD"); + setINDITargetNameFunc = new ScriptFunction( "setINDITargetName", i18n("Set the telescope target coorinates to the RA/Dec coordinates of the selected object."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "objectName"); + setINDITargetNameFunc->setINDIProperty("ETQUATORIAL_EOD_COORD"); INDIFunctionList.append( setINDITargetNameFunc); - setINDIGeoLocationFunc = new ScriptFunction ( "setINDIGeoLocation", i18n("Set the telescope longitude and latitude. The longitude is E of N."), false, "TQString", "deviceName", "double", "long", "double", "lat"); + setINDIGeoLocationFunc = new ScriptFunction ( "setINDIGeoLocation", i18n("Set the telescope longitude and latitude. The longitude is E of N."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "double", "long", "double", "lat"); setINDIGeoLocationFunc->setINDIProperty("GEOGRAPHIC_COORD"); INDIFunctionList.append( setINDIGeoLocationFunc); - setINDIUTCFunc = new ScriptFunction ( "setINDIUTC", i18n("Set the device UTC time in ISO 8601 format YYYY/MM/DDTHH:MM:SS."), false, "TQString", "deviceName", "TQString", "UTCDateTime"); + setINDIUTCFunc = new ScriptFunction ( "setINDIUTC", i18n("Set the device UTC time in ISO 8601 format YYYY/MM/DDTHH:MM:SS."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "UTCDateTime"); setINDIUTCFunc->setINDIProperty("TIME"); INDIFunctionList.append( setINDIUTCFunc); - setINDIActionFunc = new ScriptFunction( "setINDIAction", i18n("Activate an INDI action. The action is the name of any INDI switch property element supported by the device."), false, "TQString", "deviceName", "TQString", "actionName"); + setINDIActionFunc = new ScriptFunction( "setINDIAction", i18n("Activate an INDI action. The action is the name of any INDI switch property element supported by the device."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "actionName"); INDIFunctionList.append( setINDIActionFunc); - waitForINDIActionFunc = new ScriptFunction ("waitForINDIAction", i18n("Pause script execution until action returns with OK status. The action can be the name of any INDI property supported by the device."), false, "TQString", "deviceName", "TQString", "actionName"); + waitForINDIActionFunc = new ScriptFunction ("waitForINDIAction", i18n("Pause script execution until action returns with OK status. The action can be the name of any INDI property supported by the device."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "actionName"); INDIFunctionList.append( waitForINDIActionFunc ); - setINDIFocusSpeedFunc = new ScriptFunction ("setINDIFocusSpeed", i18n("Set the telescope focuser speed. Set speed to 0 to halt the focuser. 1-3 correspond to slow, medium, and fast speeds respectively."), false, "TQString", "deviceName", "unsigned int", "speed"); + setINDIFocusSpeedFunc = new ScriptFunction ("setINDIFocusSpeed", i18n("Set the telescope focuser speed. Set speed to 0 to halt the focuser. 1-3 correspond to slow, medium, and fast speeds respectively."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "unsigned int", "speed"); setINDIFocusSpeedFunc->setINDIProperty("FOCUS_SPEED"); INDIFunctionList.append( setINDIFocusSpeedFunc ); - startINDIFocusFunc = new ScriptFunction ("startINDIFocus", i18n("Start moving the focuser in the direction Dir, and for the duration specified by setINDIFocusTimeout."), false, "TQString", "deviceName", "TQString", "Dir"); + startINDIFocusFunc = new ScriptFunction ("startINDIFocus", i18n("Start moving the focuser in the direction Dir, and for the duration specified by setINDIFocusTimeout."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "Dir"); startINDIFocusFunc->setINDIProperty("FOCUS_MOTION"); INDIFunctionList.append( startINDIFocusFunc); - setINDIFocusTimeoutFunc = new ScriptFunction ( "setINDIFocusTimeout", i18n("Set the telescope focuser timer in seconds. This is the duration of any focusing procedure performed by calling startINDIFocus."), false, "TQString", "deviceName", "int", "timeout"); + setINDIFocusTimeoutFunc = new ScriptFunction ( "setINDIFocusTimeout", i18n("Set the telescope focuser timer in seconds. This is the duration of any focusing procedure performed by calling startINDIFocus."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "int", "timeout"); setINDIFocusTimeoutFunc->setINDIProperty("FOCUS_TIMER"); INDIFunctionList.append( setINDIFocusTimeoutFunc); - setINDICCDTempFunc = new ScriptFunction( "setINDICCDTemp", i18n("Set the target CCD chip temperature."), false, "TQString", "deviceName", "int", "temp"); + setINDICCDTempFunc = new ScriptFunction( "setINDICCDTemp", i18n("Set the target CCD chip temperature."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "int", "temp"); setINDICCDTempFunc->setINDIProperty("CCD_TEMPERATURE"); INDIFunctionList.append( setINDICCDTempFunc); - setINDIFilterNumFunc = new ScriptFunction( "setINDIFilterNum", i18n("Set the target filter position."), false, "TQString", "deviceName", "int", "filter_num"); + setINDIFilterNumFunc = new ScriptFunction( "setINDIFilterNum", i18n("Set the target filter position."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "int", "filter_num"); setINDIFilterNumFunc->setINDIProperty("FILTER_SLOT"); INDIFunctionList.append ( setINDIFilterNumFunc); - setINDIFrameTypeFunc = new ScriptFunction( "setINDIFrameType", i18n("Set the CCD camera frame type. Available options are FRAME_LIGHT, FRAME_BIAS, FRAME_DARK, and FRAME_FLAT."), false, "TQString", "deviceName", "TQString", "type"); + setINDIFrameTypeFunc = new ScriptFunction( "setINDIFrameType", i18n("Set the CCD camera frame type. Available options are FRAME_LIGHT, FRAME_BIAS, FRAME_DARK, and FRAME_FLAT."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "type"); setINDIFrameTypeFunc->setINDIProperty("FRAME_TYPE"); INDIFunctionList.append( setINDIFrameTypeFunc); - startINDIExposureFunc = new ScriptFunction ( "startINDIExposure", i18n("Start Camera/CCD exposure. The duration is in seconds."), false, "TQString", "deviceName", "int", "timeout"); + startINDIExposureFunc = new ScriptFunction ( "startINDIExposure", i18n("Start Camera/CCD exposure. The duration is in seconds."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "int", "timeout"); startINDIExposureFunc->setINDIProperty("CCD_EXPOSE_DURATION"); INDIFunctionList.append( startINDIExposureFunc); @@ -646,10 +646,10 @@ void ScriptBuilder::initViewOptions() { argChangeViewOption->OptionName->insertItem( "HideGrid" ); opsSkymap = new TQListViewItem( otv->OptionsList, i18n( "Skymap Options" ) ); - new TQListViewItem( opsSkymap, "UseAltAz", i18n( "Use Horizontal coordinates? (otherwise, use Equatorial)" ), i18n( "bool" ) ); + new TQListViewItem( opsSkymap, "UseAltAz", i18n( "UseQt::Horizontal coordinates? (otherwise, use Equatorial)" ), i18n( "bool" ) ); new TQListViewItem( opsSkymap, "ZoomFactor", i18n( "Set the Zoom Factor" ), i18n( "double" ) ); new TQListViewItem( opsSkymap, "FOV Size", i18n( "Select angular size for the FOV symbol (in arcmin)" ), i18n( "double" ) ); - new TQListViewItem( opsSkymap, "FOV Shape", i18n( "Select shape for the FOV symbol (0=Square, 1=Circle, 2=Crosshairs, 4=Bullseye)" ), i18n( "int" ) ); + new TQListViewItem( opsSkymap, "FOV Shape", i18n( "Select tqshape for the FOV symbol (0=Square, 1=Circle, 2=Crosshairs, 4=Bullseye)" ), i18n( "int" ) ); new TQListViewItem( opsSkymap, "FOV Color", i18n( "Select color for the FOV symbol" ), i18n( "string" ) ); new TQListViewItem( opsSkymap, "AnimateSlewing", i18n( "Use animated slewing? (otherwise, \"snap\" to new focus)" ), i18n( "bool" ) ); new TQListViewItem( opsSkymap, "UseRefraction", i18n( "Correct for atmospheric refraction?" ), i18n( "bool" ) ); @@ -709,7 +709,7 @@ void ScriptBuilder::initViewOptions() { while ( !stream.eof() ) { line = stream.readLine(); - argLoadColorScheme->SchemeList->insertItem( line.left( line.find( ':' ) ) ); + argLoadColorScheme->SchemeList->insertItem( line.left( line.tqfind( ':' ) ) ); } file.close(); } @@ -759,7 +759,7 @@ void ScriptBuilder::slotOpen() { TQFile f( fname ); if ( !f.open( IO_ReadOnly) ) { - TQString message = i18n( "Could not open file %1." ).arg( f.name() ); + TQString message = i18n( "Could not open file %1." ).tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); currentFileURL = ""; return; @@ -770,7 +770,7 @@ void ScriptBuilder::slotOpen() { f.close(); } else if ( ! currentFileURL.url().isEmpty() ) { - TQString message = i18n( "Invalid URL: %1" ).arg( currentFileURL.url() ); + TQString message = i18n( "Invalid URL: %1" ).tqarg( currentFileURL.url() ); KMessageBox::sorry( 0, message, i18n( "Invalid URL" ) ); currentFileURL = ""; } @@ -803,9 +803,9 @@ void ScriptBuilder::slotSave() { //Warn user if file exists if (TQFile::exists(currentFileURL.path())) { - int r=KMessageBox::warningContinueCancel(static_cast(parent()), + int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(tqparent()), i18n( "A file named \"%1\" already exists. " - "Overwrite it?" ).arg(currentFileURL.fileName()), + "Overwrite it?" ).tqarg(currentFileURL.fileName()), i18n( "Overwrite File?" ), i18n( "&Overwrite" ) ); @@ -819,7 +819,7 @@ void ScriptBuilder::slotSave() { TQFile f( fname ); if ( !f.open( IO_WriteOnly) ) { - TQString message = i18n( "Could not open file %1." ).arg( f.name() ); + TQString message = i18n( "Could not open file %1." ).tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); currentFileURL = ""; return; @@ -834,7 +834,7 @@ void ScriptBuilder::slotSave() { if ( tmpfile.name() == fname ) { //need to upload to remote location if ( ! KIO::NetAccess::upload( tmpfile.name(), currentFileURL, (TQWidget*) 0 ) ) { - TQString message = i18n( "Could not upload image to remote location: %1" ).arg( currentFileURL.prettyURL() ); + TQString message = i18n( "Could not upload image to remote location: %1" ).tqarg( currentFileURL.prettyURL() ); KMessageBox::sorry( 0, message, i18n( "Could not upload file" ) ); } } @@ -842,7 +842,7 @@ void ScriptBuilder::slotSave() { setUnsavedChanges( false ); } else { - TQString message = i18n( "Invalid URL: %1" ).arg( currentFileURL.url() ); + TQString message = i18n( "Invalid URL: %1" ).tqarg( currentFileURL.url() ); KMessageBox::sorry( 0, message, i18n( "Invalid URL" ) ); currentFileURL = ""; } @@ -885,7 +885,7 @@ void ScriptBuilder::slotRunScript() { TQFile f( fname ); if ( f.exists() ) f.remove(); if ( !f.open( IO_WriteOnly) ) { - TQString message = i18n( "Could not open file %1." ).arg( f.name() ); + TQString message = i18n( "Could not open file %1." ).tqarg( f.name() ); KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) ); currentFileURL = ""; return; @@ -903,7 +903,7 @@ void ScriptBuilder::slotRunScript() { if ( ! p.start( KProcess::DontCare ) ) kdDebug() << "Process did not start." << endl; - while ( p.isRunning() ) kapp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes. + while ( p.isRunning() ) kapp->tqprocessEvents( 50 ); //otherwise tempfile may get deleted before script completes. //delete temp file if ( f.exists() ) f.remove(); @@ -920,9 +920,9 @@ void ScriptBuilder::writeScript( TQTextStream &ostream ) { ostream << "#!/bin/bash" << endl; ostream << "#KStars DCOP script: " << currentScriptName << endl; ostream << "#by " << currentAuthor << endl; - ostream << "#last modified: " << KStarsDateTime::currentDateTime().toString() << endl; + ostream << "#last modified: " << KStarsDateTime::tqcurrentDateTime().toString() << endl; ostream << "#" << endl; - ostream << "KSTARS=`dcopfind -a 'kstars*'`" << endl; + ostream << "KSTARS=`dcoptqfind -a 'kstars*'`" << endl; ostream << "MAIN=KStarsInterface" << endl; ostream << "CLOCK=clock#1" << endl; @@ -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 parent property + // Special case for telescope action, we need to know the tqparent property if (sf->INDIProperty() == "CHECK") { if (sf->argVal(1) == "SLEW" || sf->argVal(1) == "TRACK" || sf->argVal(1) == "SYNC") @@ -946,7 +946,7 @@ void ScriptBuilder::writeScript( TQTextStream &ostream ) { sf->setINDIProperty("PARK"); } - if ( sf->argVal(0).contains(" ")) + if ( sf->argVal(0).tqcontains(" ")) ostream << mainpre << "waitForINDIAction " << "\"" << sf->argVal(0) << "\" " << sf->INDIProperty() << endl; else ostream << mainpre << "waitForINDIAction " << sf->argVal(0) << " " << sf->INDIProperty() << endl; @@ -965,11 +965,11 @@ void ScriptBuilder::readScript( TQTextStream &istream ) { line = istream.readLine(); //look for name of script - if ( line.contains( "#KStars DCOP script: " ) ) + if ( line.tqcontains( "#KStars DCOP script: " ) ) currentScriptName = line.mid( 21 ).stripWhiteSpace(); //look for author of scriptbuilder - if ( line.contains( "#by " ) ) + if ( line.tqcontains( "#by " ) ) currentAuthor = line.mid( 4 ).stripWhiteSpace(); //Actual script functions @@ -977,7 +977,7 @@ void ScriptBuilder::readScript( TQTextStream &istream ) { //is ClockFunction? bool clockfcn( false ); - if ( line.contains( "$CLOCK" ) ) clockfcn = true; + if ( line.tqcontains( "$CLOCK" ) ) clockfcn = true; //remove leading dcop prefix line = line.mid( 20 ); @@ -990,7 +990,7 @@ void ScriptBuilder::readScript( TQTextStream &istream ) { // Initially, any read script is valid! ScriptList.current()->setValid(true); } - else kdWarning() << i18n( "Could not parse script. Line was: %1" ).arg( line ) << endl; + else kdWarning() << i18n( "Could not parse script. Line was: %1" ).tqarg( line ) << endl; } // end if left(4) == "dcop" } // end while !eof() @@ -1322,7 +1322,7 @@ void ScriptBuilder::slotArgWidget() { if (ok) month = sf->argVal(1).toInt(&ok); if (ok) day = sf->argVal(2).toInt(&ok); if (ok) argSetLocalTime->DateBox->setDate( ExtDate( year, month, day ) ); - else argSetLocalTime->DateBox->setDate( ExtDate::currentDate() ); + else argSetLocalTime->DateBox->setDate( ExtDate::tqcurrentDate() ); hour = sf->argVal(3).toInt(&ok); if ( sf->argVal(3).isEmpty() ) ok = false; @@ -1369,7 +1369,7 @@ void ScriptBuilder::slotArgWidget() { } else if ( sf->name() == "loadColorScheme" ) { sb->ArgStack->raiseWidget( argLoadColorScheme ); - argLoadColorScheme->SchemeList->setCurrentItem( argLoadColorScheme->SchemeList->findItem( sf->argVal(0).remove('\"'), 0 ) ); + argLoadColorScheme->SchemeList->setCurrentItem( argLoadColorScheme->SchemeList->tqfindItem( sf->argVal(0).remove('\"'), 0 ) ); } else if ( sf->name() == "stop" ) { sb->ArgStack->raiseWidget( argBlank ); @@ -1820,7 +1820,7 @@ void ScriptBuilder::slotFindCity() { sf->setArg( 1, ld.selectedProvinceName() ); sf->setArg( 2, ld.selectedCountryName() ); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setGeoLocation" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setGeoLocation" ) << endl; } } } @@ -1869,7 +1869,7 @@ void ScriptBuilder::slotLookToward() { sf->setArg( 0, argLookToward->FocusEdit->currentText() ); sf->setValid(true); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "lookTowards" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "lookTowards" ) << endl; } } @@ -1885,7 +1885,7 @@ void ScriptBuilder::slotRa() { if ( ok ) { setUnsavedChanges( true ); - sf->setArg( 0, TQString( "%1" ).arg( ra.Hours() ) ); + sf->setArg( 0, TQString( "%1" ).tqarg( ra.Hours() ) ); if ( ! sf->argVal(1).isEmpty() ) sf->setValid( true ); } else { @@ -1893,7 +1893,7 @@ void ScriptBuilder::slotRa() { sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setRaDec" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setRaDec" ) << endl; } } @@ -1909,7 +1909,7 @@ void ScriptBuilder::slotDec() { if ( ok ) { setUnsavedChanges( true ); - sf->setArg( 1, TQString( "%1" ).arg( dec.Degrees() ) ); + sf->setArg( 1, TQString( "%1" ).tqarg( dec.Degrees() ) ); if ( ! sf->argVal(0).isEmpty() ) sf->setValid( true ); } else { @@ -1917,7 +1917,7 @@ void ScriptBuilder::slotDec() { sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setRaDec" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setRaDec" ) << endl; } } @@ -1932,14 +1932,14 @@ void ScriptBuilder::slotAz() { dms az = argSetAltAz->AzBox->createDms(true, &ok); if ( ok ) { setUnsavedChanges( true ); - sf->setArg( 1, TQString( "%1" ).arg( az.Degrees() ) ); + sf->setArg( 1, TQString( "%1" ).tqarg( az.Degrees() ) ); if ( ! sf->argVal(0).isEmpty() ) sf->setValid( true ); } else { sf->setArg( 1, "" ); sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setAltAz" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setAltAz" ) << endl; } } @@ -1955,14 +1955,14 @@ void ScriptBuilder::slotAlt() { if ( ok ) { setUnsavedChanges( true ); - sf->setArg( 0, TQString( "%1" ).arg( alt.Degrees() ) ); + sf->setArg( 0, TQString( "%1" ).tqarg( alt.Degrees() ) ); if ( ! sf->argVal(1).isEmpty() ) sf->setValid( true ); } else { sf->setArg( 0, "" ); sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setAltAz" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setAltAz" ) << endl; } } @@ -1974,12 +1974,12 @@ void ScriptBuilder::slotChangeDate() { ExtDate date = argSetLocalTime->DateBox->date(); - sf->setArg( 0, TQString( "%1" ).arg( date.year() ) ); - sf->setArg( 1, TQString( "%1" ).arg( date.month() ) ); - sf->setArg( 2, TQString( "%1" ).arg( date.day() ) ); + sf->setArg( 0, TQString( "%1" ).tqarg( date.year() ) ); + sf->setArg( 1, TQString( "%1" ).tqarg( date.month() ) ); + sf->setArg( 2, TQString( "%1" ).tqarg( date.day() ) ); if ( ! sf->argVal(3).isEmpty() ) sf->setValid( true ); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setLocalTime" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setLocalTime" ) << endl; } } @@ -1991,12 +1991,12 @@ void ScriptBuilder::slotChangeTime() { TQTime time = argSetLocalTime->TimeBox->time(); - sf->setArg( 3, TQString( "%1" ).arg( time.hour() ) ); - sf->setArg( 4, TQString( "%1" ).arg( time.minute() ) ); - sf->setArg( 5, TQString( "%1" ).arg( time.second() ) ); + sf->setArg( 3, TQString( "%1" ).tqarg( time.hour() ) ); + sf->setArg( 4, TQString( "%1" ).tqarg( time.minute() ) ); + sf->setArg( 5, TQString( "%1" ).tqarg( time.second() ) ); if ( ! sf->argVal(0).isEmpty() ) sf->setValid( true ); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setLocalTime" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setLocalTime" ) << endl; } } @@ -2010,13 +2010,13 @@ void ScriptBuilder::slotWaitFor() { if ( ok ) { setUnsavedChanges( true ); - sf->setArg( 0, TQString( "%1" ).arg( delay ) ); + sf->setArg( 0, TQString( "%1" ).tqarg( delay ) ); sf->setValid( true ); } else { sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "waitFor" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "waitFor" ) << endl; } } @@ -2037,7 +2037,7 @@ void ScriptBuilder::slotWaitForKey() { sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "waitForKey" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "waitForKey" ) << endl; } } @@ -2050,7 +2050,7 @@ void ScriptBuilder::slotTracking() { sf->setArg( 0, ( argSetTracking->CheckTrack->isChecked() ? i18n( "true" ) : i18n( "false" ) ) ); sf->setValid( true ); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setTracking" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setTracking" ) << endl; } } @@ -2069,7 +2069,7 @@ void ScriptBuilder::slotViewOption() { sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "changeViewOption" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "changeViewOption" ) << endl; } } @@ -2089,7 +2089,7 @@ void ScriptBuilder::slotChangeCity() { sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setGeoLocation" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setGeoLocation" ) << endl; } } @@ -2109,7 +2109,7 @@ void ScriptBuilder::slotChangeProvince() { //might not be invalid } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setGeoLocation" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setGeoLocation" ) << endl; } } @@ -2129,7 +2129,7 @@ void ScriptBuilder::slotChangeCountry() { sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setGeoLocation" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setGeoLocation" ) << endl; } } @@ -2139,10 +2139,10 @@ void ScriptBuilder::slotTimeScale() { if ( sf->name() == "setClockScale" ) { setUnsavedChanges( true ); - sf->setArg( 0, TQString( "%1" ).arg( argTimeScale->TimeScale->tsbox()->timeScale() ) ); + sf->setArg( 0, TQString( "%1" ).tqarg( argTimeScale->TimeScale->tsbox()->timeScale() ) ); sf->setValid( true ); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setClockScale" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setClockScale" ) << endl; } } @@ -2159,7 +2159,7 @@ void ScriptBuilder::slotZoom() { sf->setValid( true ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "zoom" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "zoom" ) << endl; } } @@ -2170,11 +2170,11 @@ void ScriptBuilder::slotExportImage() { setUnsavedChanges( true ); sf->setArg( 0, argExportImage->ExportFileName->url() ); - sf->setArg( 1, TQString("%1").arg( argExportImage->ExportWidth->value() ) ); - sf->setArg( 2, TQString("%1").arg( argExportImage->ExportHeight->value() ) ); + sf->setArg( 1, TQString("%1").tqarg( argExportImage->ExportWidth->value() ) ); + sf->setArg( 2, TQString("%1").tqarg( argExportImage->ExportHeight->value() ) ); sf->setValid( true ); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "exportImage" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "exportImage" ) << endl; } } @@ -2188,7 +2188,7 @@ void ScriptBuilder::slotPrintImage() { sf->setArg( 1, ( argPrintImage->UseChartColors->isChecked() ? i18n( "true" ) : i18n( "false" ) ) ); sf->setValid( true ); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "exportImage" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "exportImage" ) << endl; } } @@ -2205,7 +2205,7 @@ void ScriptBuilder::slotChangeColorName() { sf->setArg( 1, cname ); sf->setValid( true ); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setColor" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setColor" ) << endl; } } @@ -2221,7 +2221,7 @@ void ScriptBuilder::slotChangeColor() { sf->setArg( 1, cname ); sf->setValid( true ); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setColor" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setColor" ) << endl; } } @@ -2234,7 +2234,7 @@ void ScriptBuilder::slotLoadColorScheme(TQListBoxItem */*i*/) { sf->setArg( 0, "\"" + argLoadColorScheme->SchemeList->currentText() + "\"" ); sf->setValid( true ); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "loadColorScheme" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "loadColorScheme" ) << endl; } } @@ -2263,7 +2263,7 @@ void ScriptBuilder::slotINDIStartDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "startINDI" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "startINDI" ) << endl; } } @@ -2282,7 +2282,7 @@ void ScriptBuilder::slotINDIStartDeviceMode() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "startINDI" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "startINDI" ) << endl; } } @@ -2308,7 +2308,7 @@ void ScriptBuilder::slotINDIShutdown() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "shutdownINDI" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "shutdownINDI" ) << endl; } } @@ -2334,7 +2334,7 @@ void ScriptBuilder::slotINDISwitchDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "switchdownINDI" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "switchdownINDI" ) << endl; } } @@ -2356,7 +2356,7 @@ void ScriptBuilder::slotINDISwitchDeviceConnection() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "switchINDI" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "switchINDI" ) << endl; } } @@ -2384,7 +2384,7 @@ void ScriptBuilder::slotINDISetPortDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIPort" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIPort" ) << endl; } @@ -2412,7 +2412,7 @@ void ScriptBuilder::slotINDISetPortDevicePort() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIPort" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIPort" ) << endl; } } @@ -2438,7 +2438,7 @@ void ScriptBuilder::slotINDISetTargetCoordDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDITargetCoord" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDITargetCoord" ) << endl; } } @@ -2459,10 +2459,10 @@ void ScriptBuilder::slotINDISetTargetCoordDeviceRA() dms ra = argSetTargetCoordINDI->RaBox->createDms(false, &ok); if ( ok ) { - if (sf->argVal(1) != TQString( "%1" ).arg( ra.Hours() )) + if (sf->argVal(1) != TQString( "%1" ).tqarg( ra.Hours() )) setUnsavedChanges( true ); - sf->setArg( 1, TQString( "%1" ).arg( ra.Hours() ) ); + sf->setArg( 1, TQString( "%1" ).tqarg( ra.Hours() ) ); if ( ( ! sf->argVal(0).isEmpty() ) && ( ! sf->argVal(2).isEmpty() )) sf->setValid( true ); else sf->setValid(false); @@ -2471,7 +2471,7 @@ void ScriptBuilder::slotINDISetTargetCoordDeviceRA() sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDITargetCoord" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDITargetCoord" ) << endl; } } @@ -2492,10 +2492,10 @@ void ScriptBuilder::slotINDISetTargetCoordDeviceDEC() dms dec = argSetTargetCoordINDI->DecBox->createDms(true, &ok); if ( ok ) { - if (sf->argVal(2) != TQString( "%1" ).arg( dec.Degrees() )) + if (sf->argVal(2) != TQString( "%1" ).tqarg( dec.Degrees() )) setUnsavedChanges( true ); - sf->setArg( 2, TQString( "%1" ).arg( dec.Degrees() ) ); + sf->setArg( 2, TQString( "%1" ).tqarg( dec.Degrees() ) ); if ( ( ! sf->argVal(0).isEmpty() ) && ( ! sf->argVal(1).isEmpty() )) sf->setValid( true ); else sf->setValid(false); @@ -2504,7 +2504,7 @@ void ScriptBuilder::slotINDISetTargetCoordDeviceDEC() sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDITargetCoord" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDITargetCoord" ) << endl; } } @@ -2531,7 +2531,7 @@ void ScriptBuilder::slotINDISetTargetNameDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDITargetName" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDITargetName" ) << endl; } } @@ -2558,7 +2558,7 @@ void ScriptBuilder::slotINDISetTargetNameObjectName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDITargetName" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDITargetName" ) << endl; } } @@ -2585,7 +2585,7 @@ void ScriptBuilder::slotINDISetActionDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIAction") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIAction") << endl; } } @@ -2611,7 +2611,7 @@ void ScriptBuilder::slotINDISetActionName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIAction") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIAction") << endl; } } @@ -2638,7 +2638,7 @@ void ScriptBuilder::slotINDIWaitForActionDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "waitForINDIAction") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "waitForINDIAction") << endl; } } @@ -2664,7 +2664,7 @@ void ScriptBuilder::slotINDIWaitForActionName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "waitForINDIAction") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "waitForINDIAction") << endl; } } @@ -2685,12 +2685,12 @@ void ScriptBuilder::slotINDISetFocusSpeedDeviceName() setUnsavedChanges( true ); sf->setArg(0, argSetFocusSpeedINDI->deviceName->text()); - sf->setArg(1, TQString("%1").arg(argSetFocusSpeedINDI->speedIN->value())); + sf->setArg(1, TQString("%1").tqarg(argSetFocusSpeedINDI->speedIN->value())); sf->setValid(true); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFocusSpeed") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFocusSpeed") << endl; } } @@ -2705,13 +2705,13 @@ void ScriptBuilder::slotINDISetFocusSpeed() if (sf->argVal(1).toInt() != argSetFocusSpeedINDI->speedIN->value()) setUnsavedChanges( true ); - sf->setArg(1, TQString("%1").arg(argSetFocusSpeedINDI->speedIN->value())); + sf->setArg(1, TQString("%1").tqarg(argSetFocusSpeedINDI->speedIN->value())); if ((! sf->argVal(0).isEmpty())) sf->setValid(true); else sf->setValid(false); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFocusSpeed") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFocusSpeed") << endl; } } @@ -2737,7 +2737,7 @@ void ScriptBuilder::slotINDIStartFocusDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "StartINDIFocus") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "StartINDIFocus") << endl; } } @@ -2758,7 +2758,7 @@ void ScriptBuilder::slotINDIStartFocusDirection() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "startINDIFocus") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "startINDIFocus") << endl; } } @@ -2779,12 +2779,12 @@ void ScriptBuilder::slotINDISetFocusTimeoutDeviceName() setUnsavedChanges( true ); sf->setArg(0, argSetFocusTimeoutINDI->deviceName->text()); - sf->setArg(1, TQString("%1").arg(argSetFocusTimeoutINDI->timeOut->value())); + sf->setArg(1, TQString("%1").tqarg(argSetFocusTimeoutINDI->timeOut->value())); sf->setValid(true); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFocusTimeout") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFocusTimeout") << endl; } } @@ -2798,13 +2798,13 @@ void ScriptBuilder::slotINDISetFocusTimeout() if (sf->argVal(1).toInt() != argSetFocusTimeoutINDI->timeOut->value()) setUnsavedChanges( true ); - sf->setArg(1, TQString("%1").arg(argSetFocusTimeoutINDI->timeOut->value())); + sf->setArg(1, TQString("%1").tqarg(argSetFocusTimeoutINDI->timeOut->value())); if (! sf->argVal(0).isEmpty()) sf->setValid(true); else sf->setValid(false); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFocusTimeout") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFocusTimeout") << endl; } } @@ -2830,7 +2830,7 @@ void ScriptBuilder::slotINDISetGeoLocationDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIGeoLocation" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIGeoLocation" ) << endl; } } @@ -2851,10 +2851,10 @@ void ScriptBuilder::slotINDISetGeoLocationDeviceLong() dms longitude = argSetGeoLocationINDI->longBox->createDms(true, &ok); if ( ok ) { - if (sf->argVal(1) != TQString( "%1" ).arg( longitude.Degrees())) + if (sf->argVal(1) != TQString( "%1" ).tqarg( longitude.Degrees())) setUnsavedChanges( true ); - sf->setArg( 1, TQString( "%1" ).arg( longitude.Degrees() ) ); + sf->setArg( 1, TQString( "%1" ).tqarg( longitude.Degrees() ) ); if ( ( ! sf->argVal(0).isEmpty() ) && ( ! sf->argVal(2).isEmpty() )) sf->setValid( true ); else sf->setValid(false); @@ -2863,7 +2863,7 @@ void ScriptBuilder::slotINDISetGeoLocationDeviceLong() sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIGeoLocation" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIGeoLocation" ) << endl; } } @@ -2884,10 +2884,10 @@ void ScriptBuilder::slotINDISetGeoLocationDeviceLat() dms latitude = argSetGeoLocationINDI->latBox->createDms(true, &ok); if ( ok ) { - if (sf->argVal(2) != TQString( "%1" ).arg( latitude.Degrees())) + if (sf->argVal(2) != TQString( "%1" ).tqarg( latitude.Degrees())) setUnsavedChanges( true ); - sf->setArg( 2, TQString( "%1" ).arg( latitude.Degrees() ) ); + sf->setArg( 2, TQString( "%1" ).tqarg( latitude.Degrees() ) ); if ( ( ! sf->argVal(0).isEmpty() ) && ( ! sf->argVal(1).isEmpty() )) sf->setValid( true ); else sf->setValid(false); @@ -2896,7 +2896,7 @@ void ScriptBuilder::slotINDISetGeoLocationDeviceLat() sf->setValid( false ); } } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIGeoLocation" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIGeoLocation" ) << endl; } } @@ -2917,12 +2917,12 @@ void ScriptBuilder::slotINDIStartExposureDeviceName() setUnsavedChanges( true ); sf->setArg(0, argStartExposureINDI->deviceName->text()); - sf->setArg(1, TQString("%1").arg(argStartExposureINDI->timeOut->value())); + sf->setArg(1, TQString("%1").tqarg(argStartExposureINDI->timeOut->value())); sf->setValid(true); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "startINDIExposure") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "startINDIExposure") << endl; } } @@ -2937,13 +2937,13 @@ void ScriptBuilder::slotINDIStartExposureTimeout() if (sf->argVal(1).toInt() != argStartExposureINDI->timeOut->value()) setUnsavedChanges( true ); - sf->setArg(1, TQString("%1").arg(argStartExposureINDI->timeOut->value())); + sf->setArg(1, TQString("%1").tqarg(argStartExposureINDI->timeOut->value())); if (! sf->argVal(0).isEmpty()) sf->setValid(true); else sf->setValid(false); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "startINDIExposure") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "startINDIExposure") << endl; } } @@ -2970,7 +2970,7 @@ void ScriptBuilder::slotINDISetUTCDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIUTC" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIUTC" ) << endl; } @@ -2998,7 +2998,7 @@ void ScriptBuilder::slotINDISetUTC() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIUTC" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIUTC" ) << endl; } } @@ -3026,7 +3026,7 @@ void ScriptBuilder::slotINDISetScopeActionDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIScopeAction" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIScopeAction" ) << endl; } } @@ -3048,7 +3048,7 @@ void ScriptBuilder::slotINDISetScopeAction() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIScopeAction") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIScopeAction") << endl; } } @@ -3075,7 +3075,7 @@ void ScriptBuilder::slotINDISetFrameTypeDeviceName() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFrameType" ) << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFrameType" ) << endl; } } @@ -3096,7 +3096,7 @@ void ScriptBuilder::slotINDISetFrameType() } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFrameType") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFrameType") << endl; } } @@ -3117,12 +3117,12 @@ void ScriptBuilder::slotINDISetCCDTempDeviceName() setUnsavedChanges( true ); sf->setArg(0, argSetCCDTempINDI->deviceName->text()); - sf->setArg(1, TQString("%1").arg(argSetCCDTempINDI->temp->value())); + sf->setArg(1, TQString("%1").tqarg(argSetCCDTempINDI->temp->value())); sf->setValid(true); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDICCDTemp") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDICCDTemp") << endl; } } @@ -3137,13 +3137,13 @@ void ScriptBuilder::slotINDISetCCDTemp() if (sf->argVal(1).toInt() != argSetCCDTempINDI->temp->value()) setUnsavedChanges( true ); - sf->setArg(1, TQString("%1").arg(argSetCCDTempINDI->temp->value())); + sf->setArg(1, TQString("%1").tqarg(argSetCCDTempINDI->temp->value())); if (! sf->argVal(0).isEmpty()) sf->setValid(true); else sf->setValid(false); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDICCDTemp") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDICCDTemp") << endl; } } @@ -3165,12 +3165,12 @@ void ScriptBuilder::slotINDISetFilterNumDeviceName() setUnsavedChanges( true ); sf->setArg(0, argSetFilterNumINDI->deviceName->text()); - sf->setArg(1, TQString("%1").arg(argSetFilterNumINDI->filter_num->value())); + sf->setArg(1, TQString("%1").tqarg(argSetFilterNumINDI->filter_num->value())); sf->setValid(true); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFilterNum") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFilterNum") << endl; } } @@ -3185,13 +3185,13 @@ void ScriptBuilder::slotINDISetFilterNum() if (sf->argVal(1).toInt() != argSetFilterNumINDI->filter_num->value()) setUnsavedChanges( true ); - sf->setArg(1, TQString("%1").arg(argSetFilterNumINDI->filter_num->value())); + sf->setArg(1, TQString("%1").tqarg(argSetFilterNumINDI->filter_num->value())); if (! sf->argVal(0).isEmpty()) sf->setValid(true); else sf->setValid(false); } else { - kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFilterNum") << endl; + kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFilterNum") << endl; } diff --git a/kstars/kstars/tools/scriptbuilder.h b/kstars/kstars/tools/scriptbuilder.h index 0a532911..888028bd 100644 --- a/kstars/kstars/tools/scriptbuilder.h +++ b/kstars/kstars/tools/scriptbuilder.h @@ -68,8 +68,9 @@ class ArgSetFilterNumINDI; class ScriptBuilder : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ScriptBuilder( TQWidget *parent, const char *name=0 ); + ScriptBuilder( TQWidget *tqparent, const char *name=0 ); ~ScriptBuilder(); bool unsavedChanges() const { return UnsavedChanges; } @@ -168,7 +169,7 @@ private: ScriptBuilderUI *sb; - KStars *ks; //parent needed for sub-dialogs + KStars *ks; //tqparent needed for sub-dialogs TQPtrList KStarsFunctionList; TQPtrList INDIFunctionList; TQPtrList ScriptList; diff --git a/kstars/kstars/tools/scriptbuilderui.ui b/kstars/kstars/tools/scriptbuilderui.ui index 9de4797f..ad92aa6e 100644 --- a/kstars/kstars/tools/scriptbuilderui.ui +++ b/kstars/kstars/tools/scriptbuilderui.ui @@ -1,10 +1,10 @@ ScriptBuilderUI - + ScriptBuilderUI - + 0 0 @@ -19,9 +19,9 @@ unnamed - + - layout5 + tqlayout5 @@ -39,13 +39,13 @@ 0 - + 32 32 - + 32 32 @@ -73,13 +73,13 @@ 0 - + 32 32 - + 32 32 @@ -107,13 +107,13 @@ 0 - + 32 32 - + 32 32 @@ -141,13 +141,13 @@ 0 - + 32 32 - + 32 32 @@ -167,13 +167,13 @@ RunButton - + 32 32 - + 32 32 @@ -199,7 +199,7 @@ Expanding - + 490 20 @@ -208,7 +208,7 @@ - + splitter1 @@ -221,7 +221,7 @@ Horizontal - + groupBox2 @@ -238,9 +238,9 @@ unnamed - + - layout6 + tqlayout6 @@ -265,9 +265,9 @@ This shows the list of commands present in the current working script. Highlighting any command will present a widget where you can specify its arguments below. Use the action buttons at right to copy, remove, or change the position of the selected command. - + - layout5 + tqlayout5 @@ -277,13 +277,13 @@ AddButton - + 32 32 - + 32 32 @@ -304,13 +304,13 @@ RemoveButton - + 32 32 - + 32 32 @@ -330,13 +330,13 @@ CopyButton - + 32 32 - + 32 32 @@ -356,13 +356,13 @@ UpButton - + 32 32 - + 32 32 @@ -382,13 +382,13 @@ DownButton - + 32 32 - + 32 32 @@ -414,7 +414,7 @@ Expanding - + 20 118 @@ -425,7 +425,7 @@ - + FuncArgBox @@ -437,7 +437,7 @@ 1 - + 200 140 @@ -450,7 +450,7 @@ unnamed - + ArgStack @@ -462,7 +462,7 @@ 1 - + page @@ -475,7 +475,7 @@ - + FunctionBrowser @@ -500,7 +500,7 @@ unnamed - + splitter7 @@ -552,23 +552,23 @@ - + - layout11 + tqlayout11 unnamed - + - layout10 + tqlayout10 unnamed - + AppendINDIWait @@ -579,7 +579,7 @@ false - + ReuseINDIDeviceName @@ -602,7 +602,7 @@ Expanding - + 91 20 @@ -613,7 +613,7 @@ - + slotAddFunction() slotMoveFunctionUp() slotMoveFunctionDown() @@ -626,8 +626,8 @@ slotCopyFunction() slotRemoveFunction() slotRunScript() - - + + kpushbutton.h kpushbutton.h diff --git a/kstars/kstars/tools/scriptfunction.cpp b/kstars/kstars/tools/scriptfunction.cpp index c95594f5..4a3b70f2 100644 --- a/kstars/kstars/tools/scriptfunction.cpp +++ b/kstars/kstars/tools/scriptfunction.cpp @@ -40,42 +40,42 @@ ScriptFunction::ScriptFunction( TQString name, TQString desc, bool clockfcn, Description = ""; Description += ""; - Description += "

    " + nameStyle.arg( Name + "(" ); + Description += "

    " + nameStyle.tqarg( Name + "(" ); NumArgs = 0; if ( ! at1.isEmpty() && ! an1.isEmpty() ) { - Description += " " + typeStyle.arg( at1 ); - Description += " " + paramStyle.arg( an1 ); + Description += " " + typeStyle.tqarg( at1 ); + Description += " " + paramStyle.tqarg( an1 ); NumArgs++; } if ( ! at2.isEmpty() && ! an2.isEmpty() ) { - Description += ", " + typeStyle.arg( at2 ); - Description += " " + paramStyle.arg( an2 ); + Description += ", " + typeStyle.tqarg( at2 ); + Description += " " + paramStyle.tqarg( an2 ); NumArgs++; } if ( ! at3.isEmpty() && ! an3.isEmpty() ) { - Description += ", " + typeStyle.arg( at3 ); - Description += " " + paramStyle.arg( an3 ); + Description += ", " + typeStyle.tqarg( at3 ); + Description += " " + paramStyle.tqarg( an3 ); NumArgs++; } if ( ! at4.isEmpty() && ! an4.isEmpty() ) { - Description += ", " + typeStyle.arg( at4 ); - Description += " " + paramStyle.arg( an4 ); + Description += ", " + typeStyle.tqarg( at4 ); + Description += " " + paramStyle.tqarg( an4 ); NumArgs++; } if ( ! at5.isEmpty() && ! an5.isEmpty() ) { - Description += ", " + typeStyle.arg( at5 ); - Description += " " + paramStyle.arg( an5 ); + Description += ", " + typeStyle.tqarg( at5 ); + Description += " " + paramStyle.tqarg( an5 ); NumArgs++; } if ( ! at6.isEmpty() && ! an6.isEmpty() ) { - Description += ", " + typeStyle.arg( at6 ); - Description += " " + paramStyle.arg( an6 ); + Description += ", " + typeStyle.tqarg( at6 ); + Description += " " + paramStyle.tqarg( an6 ); NumArgs++; } @@ -85,50 +85,50 @@ ScriptFunction::ScriptFunction( TQString name, TQString desc, bool clockfcn, //Finish writing function prototype if ( NumArgs ) Description += " "; - Description += nameStyle.arg( ")" ) + "

    "; + Description += nameStyle.tqarg( ")" ) + "

    "; //before adding description, replace any '%n' instances with the corresponding //argument name in color. For now, assume that the %n's occur in order, with no skips. //Also assume that '%' is *only* used to indicate argument instances - int narg = desc.contains( '%' ); + int narg = desc.tqcontains( '%' ); switch (narg ) { case 1: - Description += desc.arg( paramStyle.arg( an1 ) ); + Description += desc.tqarg( paramStyle.tqarg( an1 ) ); break; case 2: Description += - desc.arg( paramStyle.arg( an1 ) ) - .arg( paramStyle.arg( an2 ) ); + desc.tqarg( paramStyle.tqarg( an1 ) ) + .tqarg( paramStyle.tqarg( an2 ) ); break; case 3: Description += - desc.arg( paramStyle.arg( an1 ) ) - .arg( paramStyle.arg( an2 ) ) - .arg( paramStyle.arg( an3 ) ); + desc.tqarg( paramStyle.tqarg( an1 ) ) + .tqarg( paramStyle.tqarg( an2 ) ) + .tqarg( paramStyle.tqarg( an3 ) ); break; case 4: Description += - desc.arg( paramStyle.arg( an1 ) ) - .arg( paramStyle.arg( an2 ) ) - .arg( paramStyle.arg( an3 ) ) - .arg( paramStyle.arg( an4 ) ); + desc.tqarg( paramStyle.tqarg( an1 ) ) + .tqarg( paramStyle.tqarg( an2 ) ) + .tqarg( paramStyle.tqarg( an3 ) ) + .tqarg( paramStyle.tqarg( an4 ) ); break; case 5: Description += - desc.arg( paramStyle.arg( an1 ) ) - .arg( paramStyle.arg( an2 ) ) - .arg( paramStyle.arg( an3 ) ) - .arg( paramStyle.arg( an4 ) ) - .arg( paramStyle.arg( an5 ) ); + desc.tqarg( paramStyle.tqarg( an1 ) ) + .tqarg( paramStyle.tqarg( an2 ) ) + .tqarg( paramStyle.tqarg( an3 ) ) + .tqarg( paramStyle.tqarg( an4 ) ) + .tqarg( paramStyle.tqarg( an5 ) ); break; case 6: Description += - desc.arg( paramStyle.arg( an1 ) ) - .arg( paramStyle.arg( an2 ) ) - .arg( paramStyle.arg( an3 ) ) - .arg( paramStyle.arg( an4 ) ) - .arg( paramStyle.arg( an5 ) ) - .arg( paramStyle.arg( an6 ) ); + desc.tqarg( paramStyle.tqarg( an1 ) ) + .tqarg( paramStyle.tqarg( an2 ) ) + .tqarg( paramStyle.tqarg( an3 ) ) + .tqarg( paramStyle.tqarg( an4 ) ) + .tqarg( paramStyle.tqarg( an5 ) ) + .tqarg( paramStyle.tqarg( an6 ) ); break; default: Description += desc; @@ -206,7 +206,7 @@ TQString ScriptFunction::scriptLine() const { unsigned int i=0; while ( ! ArgName[i].isEmpty() && i < 6 ) { // Wrap arg in quotes if it contains a space - if ( ArgVal[i].contains(" ") ) { + if ( ArgVal[i].tqcontains(" ") ) { out += " \"" + ArgVal[i] + "\""; } else { out += " " + ArgVal[i]; diff --git a/kstars/kstars/tools/scriptnamedialog.ui b/kstars/kstars/tools/scriptnamedialog.ui index bc493ad3..a7f4198f 100644 --- a/kstars/kstars/tools/scriptnamedialog.ui +++ b/kstars/kstars/tools/scriptnamedialog.ui @@ -1,10 +1,10 @@ ScriptNameDialog - + ScriptNameDialog - + 0 0 @@ -22,9 +22,9 @@ unnamed - + - layout3 + tqlayout3 @@ -41,7 +41,7 @@ Enter a name for the script. This is not the file name, just a short descriptive line of text. - + textLabel1 @@ -55,7 +55,7 @@ Script name: - + textLabel2 @@ -73,9 +73,9 @@ - + - layout2 + tqlayout2 @@ -91,14 +91,14 @@ Expanding - + 330 20 - + OKButton @@ -109,7 +109,7 @@ true - + CancelButton @@ -149,7 +149,7 @@ reject() - + klineedit.h klineedit.h diff --git a/kstars/kstars/tools/wutdialog.cpp b/kstars/kstars/tools/wutdialog.cpp index 584c7dfc..73d3d8a1 100644 --- a/kstars/kstars/tools/wutdialog.cpp +++ b/kstars/kstars/tools/wutdialog.cpp @@ -81,8 +81,8 @@ WUTDialog::WUTDialog(KStars *ks) : TQString sGeo = geo->translatedName(); if ( ! geo->translatedProvince().isEmpty() ) sGeo += ", " + geo->translatedProvince(); sGeo += ", " + geo->translatedCountry(); - WUT->LocationLabel->setText( i18n( "at %1" ).arg( sGeo ) ); - WUT->DateLabel->setText( i18n( "The night of %1" ).arg( Evening.date().toString( Qt::LocalDate ) ) ); + WUT->LocationLabel->setText( i18n( "at %1" ).tqarg( sGeo ) ); + WUT->DateLabel->setText( i18n( "The night of %1" ).tqarg( Evening.date().toString( Qt::LocalDate ) ) ); initCategories(); @@ -164,9 +164,9 @@ void WUTDialog::init() { sDuration = TQString().sprintf( "%02d:%02d", hDur, mDur ); } - WUT->SunSetLabel->setText( i18n( "Sunset: %1" ).arg(sSet) ); - WUT->SunRiseLabel->setText( i18n( "Sunrise: %1" ).arg(sRise) ); - WUT->NightDurationLabel->setText( i18n( "Night duration: %1 hours" ).arg( sDuration ) ); + WUT->SunSetLabel->setText( i18n( "Sunset: %1" ).tqarg(sSet) ); + WUT->SunRiseLabel->setText( i18n( "Sunrise: %1" ).tqarg(sRise) ); + WUT->NightDurationLabel->setText( i18n( "Night duration: %1 hours" ).tqarg( sDuration ) ); // moon almanac information KSMoon *oMoon = (KSMoon*) kstars->data()->Moon; @@ -189,10 +189,10 @@ void WUTDialog::init() { sSet = moonSet.addSecs(30).toString("hh:mm"); } - WUT->MoonRiseLabel->setText( i18n( "Moon rises at: %1" ).arg( sRise ) ); - WUT->MoonSetLabel->setText( i18n( "Moon sets at: %1" ).arg( sSet ) ); + WUT->MoonRiseLabel->setText( i18n( "Moon rises at: %1" ).tqarg( sRise ) ); + WUT->MoonSetLabel->setText( i18n( "Moon sets at: %1" ).tqarg( sSet ) ); oMoon->findPhase( oSun ); - WUT->MoonIllumLabel->setText( oMoon->phaseName() + TQString( " (%1%)" ).arg( + WUT->MoonIllumLabel->setText( oMoon->phaseName() + TQString( " (%1%)" ).tqarg( int(100.0*oMoon->illum() ) ) ); //Restore Sun's and Moon's coordinates, and recompute Moon's original Phase @@ -242,7 +242,7 @@ void WUTDialog::appendToList(SkyObjectName *o) { void WUTDialog::slotLoadList(int i) { WUT->ObjectListBox->clear(); - setCursor(TQCursor(Qt::WaitCursor)); + setCursor(TQCursor(TQt::WaitCursor)); TQPtrList invisibleList; for (SkyObjectName *oname=lists.visibleList[i].first(); oname; oname=lists.visibleList[i].next()) { bool visible = true; @@ -265,7 +265,7 @@ void WUTDialog::slotLoadList(int i) { lists.visibleList[i].removeRef(o); } } - setCursor(TQCursor(Qt::ArrowCursor)); + setCursor(TQCursor(TQt::ArrowCursor)); lists.initialized[i] = true; // highlight first item @@ -352,9 +352,9 @@ void WUTDialog::slotDisplayObject(TQListBoxItem *item) { WUT->DetailButton->setEnabled( true ); } - WUT->ObjectRiseLabel->setText( i18n( "Rises at: %1" ).arg( sRise ) ); - WUT->ObjectTransitLabel->setText( i18n( "Transits at: %1" ).arg( sTransit ) ); - WUT->ObjectSetLabel->setText( i18n( "Sets at: %1" ).arg( sSet ) ); + WUT->ObjectRiseLabel->setText( i18n( "Rises at: %1" ).tqarg( sRise ) ); + WUT->ObjectTransitLabel->setText( i18n( "Transits at: %1" ).tqarg( sTransit ) ); + WUT->ObjectSetLabel->setText( i18n( "Sets at: %1" ).tqarg( sSet ) ); } void WUTDialog::slotCenter() { @@ -403,7 +403,7 @@ void WUTDialog::slotChangeDate() { Evening = T0.addSecs( -6*3600 ); EveningUT = geo->LTtoUT( Evening ); - WUT->DateLabel->setText( i18n( "The night of %1" ).arg( Evening.date().toString() ) ); + WUT->DateLabel->setText( i18n( "The night of %1" ).tqarg( Evening.date().toString() ) ); int i = WUT->CategoryListBox->currentItem(); init(); @@ -421,7 +421,7 @@ void WUTDialog::slotChangeLocation() { TomorrowUT = geo->LTtoUT( Tomorrow ); EveningUT = geo->LTtoUT( Evening ); - WUT->LocationLabel->setText( i18n( "at %1" ).arg( geo->fullName() ) ); + WUT->LocationLabel->setText( i18n( "at %1" ).tqarg( geo->fullName() ) ); int i = WUT->CategoryListBox->currentItem(); init(); diff --git a/kstars/kstars/tools/wutdialog.h b/kstars/kstars/tools/wutdialog.h index 409fa4d5..012cd2a7 100644 --- a/kstars/kstars/tools/wutdialog.h +++ b/kstars/kstars/tools/wutdialog.h @@ -41,6 +41,7 @@ class TQFrame; class WUTDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/tools/wutdialogui.ui b/kstars/kstars/tools/wutdialogui.ui index 824ffe20..46ce9902 100644 --- a/kstars/kstars/tools/wutdialogui.ui +++ b/kstars/kstars/tools/wutdialogui.ui @@ -1,10 +1,10 @@ WUTDialogUI - + WUTDialogUI - + 0 0 @@ -19,35 +19,35 @@ unnamed - + - layout25 + tqlayout25 unnamed - + - layout24 + tqlayout24 unnamed - + - layout23 + tqlayout23 unnamed - + LocationLabel - + 200 0 @@ -78,7 +78,7 @@ Expanding - + 30 20 @@ -95,18 +95,18 @@ Expanding - + 20 20 - + DateLabel - + 200 0 @@ -123,9 +123,9 @@ - + - layout13 + tqlayout13 @@ -141,14 +141,14 @@ Expanding - + 108 20 - + textLabel14 @@ -160,9 +160,9 @@ - + - layout9 + tqlayout9 @@ -226,7 +226,7 @@ - + groupBox2 @@ -237,11 +237,11 @@ unnamed - + SunRiseLabel - + 0 20 @@ -257,11 +257,11 @@ Displays the time of sunrise for the selected date. - + MoonRiseLabel - + 0 20 @@ -277,11 +277,11 @@ Displays the time at which the moon rises on the selected date. - + MoonSetLabel - + 0 20 @@ -297,11 +297,11 @@ Displays the time at which the moon sets on the selected date. - + SunSetLabel - + 0 20 @@ -317,11 +317,11 @@ Displays the time of sunset for the selected date. - + NightDurationLabel - + 0 20 @@ -337,11 +337,11 @@ Displays the duration between sunset and sunrise for the selected date. - + MoonIllumLabel - + 0 20 @@ -359,9 +359,9 @@ - + - layout10 + tqlayout10 @@ -377,14 +377,14 @@ Expanding - + 164 12 - + textLabel15 @@ -402,7 +402,7 @@ ObjectListBox - + 150 0 @@ -415,7 +415,7 @@ Objects listed here are above the horizon on the selected date, and have the object type which is highlighted in the "Choose a Category" list. - + ObjectBox @@ -426,42 +426,42 @@ unnamed - + ObjectRiseLabel Rises at: 22:12 - + AlignVCenter Displays the time at which the highlighted object rises above the horizon on the selected date. - + ObjectTransitLabel Transits at: 03:45 - + AlignVCenter Displays the time at which the highlighted object transits across the local meridian on the selected date. - + ObjectSetLabel Sets at: 08:22 - + AlignVCenter @@ -478,7 +478,7 @@ Fixed - + 20 40 @@ -519,7 +519,7 @@ CategoryListBox - + 100 0 @@ -532,7 +532,7 @@ Select an item in the Categories list to display objects in that category which are above the horizon on the selected date. - + textLabel16 @@ -552,7 +552,7 @@ - + kpushbutton.h kpushbutton.h -- cgit v1.2.1