diff options
Diffstat (limited to 'kstars')
200 files changed, 1105 insertions, 4391 deletions
diff --git a/kstars/INSTALL b/kstars/INSTALL index baec6bca..70dbbece 100644 --- a/kstars/INSTALL +++ b/kstars/INSTALL @@ -15,7 +15,7 @@ Basic Installation source code, you will need to have the following packages installed. You will need both the base package and the "-devel" version. XFree86(-devel) (X11 libraries and headers) - libqt2(-devel) (QT libraries and headers) + libtqt2(-devel) (QT libraries and headers) tdelibs(-devel) (KDE libraries and headers) libpng(-devel) (PNG graphics library) libjpeg(-devel) (JPEG graphics library) diff --git a/kstars/README.planetmath b/kstars/README.planetmath index 5fd8f6f7..74d2d451 100644 --- a/kstars/README.planetmath +++ b/kstars/README.planetmath @@ -58,13 +58,13 @@ The KSplanet class contains a static OrbitDataManager member. The OrbitDataManager provides for loading and storing the A/B/C constants for each planet. In KstarsData::slotInitialize(), we simply call loadData() for each planet. KSPlanet::loadData() calls -OrbitDataManager::loadData(QString n), where n is the name of the planet. +OrbitDataManager::loadData(TQString n), where n is the name of the planet. The A/B/C constants are stored hierarchically: + The A,B,C values for a single term in an s(N) sum are stored in an OrbitData object. + The list of OrbitData objects that compose a single s(N) sum is - stored in a QVector (recall, this can have up to hundreds of elements). + stored in a QPtrVector (recall, this can have up to hundreds of elements). + The six s(N) sums (s(0) through s(5)) are collected as an array of these QVectors ( typedef QVector<OrbitData> OBArray[6] ). + The OBArrays for the Longitude, Latitude, and Distance are collected diff --git a/kstars/README.timekeeping b/kstars/README.timekeeping index 753fadc0..412c371a 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 Q_SIGNALS the update (by setting needNewCoords=true) and resets +it 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/configure.in.in b/kstars/configure.in.in index 5e2d7933..9065ba5d 100644 --- a/kstars/configure.in.in +++ b/kstars/configure.in.in @@ -46,10 +46,10 @@ if test "${use_libusb}" != false ; then AC_LANG_CPLUSPLUS ac_save_CXXFLAGS="$CXXFLAGS" ac_save_LDFLAGS="$LDFLAGS" - if test -z "$qt_includes"; then + if test -z "$tqt_includes"; then CXXFLAGS="$CXXFLAGS" else - CXXFLAGS="$CXXFLAGS -I$qt_includes" + CXXFLAGS="$CXXFLAGS -I$tqt_includes" fi LDFLAGS="$LDFLAGS -ltqt" diff --git a/kstars/kstars.kdevprj b/kstars/kstars.kdevprj deleted file mode 100644 index 50c4a484..00000000 --- a/kstars/kstars.kdevprj +++ /dev/null @@ -1,3171 +0,0 @@ -[AUTHORS] -dist=true -install=false -install_location= -type=DATA - -[COPYING] -dist=true -install=false -install_location= -type=DATA - -[ChangeLog] -dist=true -install=false -install_location= -type=DATA - -[Config for BinMakefileAm] -addcxxflags= -bin_program=kstars -cflags= -cppflags= -cxxflags=\s-O0 -g3 -Wall -ldadd=-ltdeio -ltdeprint -lm $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -ldflags=\s\s - -[General] -AMChanged=true -author=Jason Harris -configure_args=\s--build=i386-linux --host=i386-linux --target=i386-linux --prefix=/usr --with-qt-dir=/usr/lib/qt2\s -email=kstars@30doradus.org -kdevprj_version=1.3 -lfv_open_groups= -make_options=\s-j1 -makefiles=Makefile.am,kstars/Makefile.am,kstars/data/Makefile.am -modifyMakefiles=true -project_name=KStars -project_type=normal_kde2 -sgml_file= -short_info=A Desktop Planetarium for KDE -sub_dir=kstars/ -version=0.9.1 -version_control=None -workspace=33555202 - -[INSTALL] -dist=true -install=false -install_location= -type=DATA - -[LFV Groups] -GNU=AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,NEWS -Headers=*.h,*.hh,*.hxx,*.hpp,*.H -Others=* -Sources=*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l -Translations=*.po -User Interface=*.kdevdlg,*.ui,*.rc -groups=Headers,Sources,User Interface,Translations,GNU,Others - -[Makefile.am] -files=kstars.kdevprj,AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,kstars.lsm,README.customize -sub_dirs=kstars -type=normal - -[README] -dist=true -install=false -install_location= -type=DATA - -[README.customize] -dist=true -install=false -install_location= -type=DATA - -[TODO] -dist=true -install=false -install_location= -type=DATA - -[kstars.kdevprj] -dist=true -install=false -install_location= -type=DATA - -[kstars.lsm] -dist=true -install=false -install_location= -type=DATA - -[kstars/KSFileReader.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/Makefile.am] -files=kstars/main.cpp,kstars/kstars.cpp,kstars/kstars.h,kstars/kstars.desktop,kstars/skymap.cpp,kstars/skymap.h,kstars/geolocation.cpp,kstars/geolocation.h,kstars/skyobject.cpp,kstars/skyobject.h,kstars/dms.cpp,kstars/dms.h,kstars/skypoint.cpp,kstars/skypoint.h,kstars/timedialog.cpp,kstars/timedialog.h,kstars/locationdialog.cpp,kstars/locationdialog.h,kstars/mapcanvas.cpp,kstars/mapcanvas.h,kstars/viewopsdialog.cpp,kstars/viewopsdialog.h,kstars/finddialog.cpp,kstars/finddialog.h,kstars/ksplanet.cpp,kstars/ksplanet.h,kstars/kssun.cpp,kstars/kssun.h,kstars/kstarsdata.cpp,kstars/kstarsdata.h,kstars/kstarssplash.cpp,kstars/kstarssplash.h,kstars/kstarsoptions.h,kstars/kstarsoptions.cpp,kstars/magnitudespinbox.cpp,kstars/magnitudespinbox.h,kstars/skyobjectname.cpp,kstars/skyobjectname.h,kstars/ksmoon.cpp,kstars/ksmoon.h,kstars/imageviewer.cpp,kstars/imageviewer.h,kstars/timespinbox.cpp,kstars/timespinbox.h,kstars/starobject.cpp,kstars/starobject.h,kstars/starpixmap.cpp,kstars/starpixmap.h,kstars/kspluto.cpp,kstars/kspluto.h,kstars/addlinkdialog.cpp,kstars/addlinkdialog.h,kstars/toggleaction.h,kstars/toggleaction.cpp,kstars/simclock.h,kstars/simclock.cpp,kstars/ksutils.h,kstars/ksutils.cpp,kstars/ksnumbers.cpp,kstars/ksnumbers.h,kstars/kstarsui.rc,kstars/ksplanetbase.cpp,kstars/ksplanetbase.h,kstars/dmsbox.cpp,kstars/dmsbox.h,kstars/timebox.cpp,kstars/timebox.h,kstars/astrocalc.cpp,kstars/astrocalc.h,kstars/modcalcjd.cpp,kstars/modcalcjd.h,kstars/modcalcprec.cpp,kstars/modcalcprec.h,kstars/modcalcgalcoord.cpp,kstars/modcalcgalcoord.h,kstars/modcalcsidtime.cpp,kstars/modcalcsidtime.h,kstars/modcalcgeodcoord.cpp,kstars/modcalcgeodcoord.h,kstars/filesource.cpp,kstars/filesource.h,kstars/stardatasink.cpp,kstars/stardatasink.h,kstars/planetcatalog.h,kstars/planetcatalog.cpp,kstars/objectnamelist.cpp,kstars/objectnamelist.h,kstars/kstarsactions.cpp,kstars/kstarsinit.cpp,kstars/addcatdialog.cpp,kstars/addcatdialog.h,kstars/kstarsmessagebox.cpp,kstars/kstarsmessagebox.h,kstars/skymapevents.cpp,kstars/focusdialog.cpp,kstars/focusdialog.h,kstars/kstars_options_handling.cpp,kstars/timezonerule.cpp,kstars/timezonerule.h,kstars/modcalcapcoord.cpp,kstars/modcalcapcoord.h,kstars/timestepbox.cpp,kstars/timestepbox.h,kstars/timeunitbox.cpp,kstars/timeunitbox.h,kstars/detaildialog.cpp,kstars/detaildialog.h,kstars/colorscheme.cpp,kstars/colorscheme.h,kstars/infobox.cpp,kstars/infoboxes.cpp,kstars/infoboxes.h,kstars/infobox.h,kstars/modcalcdaylength.cpp,kstars/modcalcdaylength.h,kstars/lcgenerator.h,kstars/lcgenerator.cpp,kstars/jupitermoons.cpp,kstars/jupitermoons.h,kstars/modcalcazeldlg.ui,kstars/modcalcazel.cpp,kstars/modcalcazel.h,kstars/elts.cpp,kstars/elts.h,kstars/eltscanvas.cpp,kstars/eltscanvas.h,kstars/KSFileReader.h,kstars/ksfilereader.cpp,kstars/ksfilereader.h,kstars/ksasteroid.cpp,kstars/ksasteroid.h,kstars/kscomet.cpp,kstars/kscomet.h,kstars/modcalcjddlg.ui,kstars/modcalcsidtimedlg.ui,kstars/modcalcprecdlg.ui,kstars/kspopupmenu.cpp,kstars/kspopupmenu.h,kstars/skymapdraw.cpp,kstars/kstarsdcop.cpp,kstars/modcalcgeoddlg.ui,kstars/wutdialog.cpp,kstars/wutdialog.h,kstars/modcalcapcoorddlg.ui,kstars/modcalcgalcoorddlg.ui,kstars/modcalcdaylengthdlg.ui,kstars/kslineedit.cpp,kstars/kslineedit.h,kstars/focusdialogdlg.ui -sub_dirs=data -type=prog_main - -[kstars/addcatdialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/addcatdialog.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/addlinkdialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/addlinkdialog.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/astrocalc.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/astrocalc.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/colorscheme.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/colorscheme.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/data/Cities.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/Cities.dat -type=DATA - -[kstars/data/Makefile.am] -files=kstars/data/Cities.dat,kstars/data/clines.dat,kstars/data/cnames.dat,kstars/data/ngcic01.dat,kstars/data/ngcic02.dat,kstars/data/ngcic03.dat,kstars/data/ngcic04.dat,kstars/data/ngcic05.dat,kstars/data/ngcic06.dat,kstars/data/ngcic07.dat,kstars/data/ngcic08.dat,kstars/data/ngcic09.dat,kstars/data/ngcic10.dat,kstars/data/ngcic11.dat,kstars/data/ngcic12.dat,kstars/data/ngcic13.dat,kstars/data/sao01.dat,kstars/data/sao02.dat,kstars/data/sao03.dat,kstars/data/sao04.dat,kstars/data/sao05.dat,kstars/data/sao06.dat,kstars/data/sao07.dat,kstars/data/sao08.dat,kstars/data/sao09.dat,kstars/data/sao10.dat,kstars/data/sao11.dat,kstars/data/sao12.dat,kstars/data/sao13.dat,kstars/data/sao14.dat,kstars/data/sao15.dat,kstars/data/sao16.dat,kstars/data/sao17.dat,kstars/data/sao18.dat,kstars/data/sao19.dat,kstars/data/sao20.dat,kstars/data/sao21.dat,kstars/data/sao22.dat,kstars/data/sao23.dat,kstars/data/sao24.dat,kstars/data/sao25.dat,kstars/data/sao26.dat,kstars/data/sao27.dat,kstars/data/sao28.dat,kstars/data/sao29.dat,kstars/data/sao30.dat,kstars/data/sao31.dat,kstars/data/sao32.dat,kstars/data/sao33.dat,kstars/data/sao34.dat,kstars/data/sao35.dat,kstars/data/sao36.dat,kstars/data/sao37.dat,kstars/data/sao38.dat,kstars/data/sao39.dat,kstars/data/sao40.dat,kstars/data/cr16-app-kstars.png,kstars/data/cr32-app-kstars.png,kstars/data/cr48-app-kstars.png,kstars/data/lo16-app-kstars.png,kstars/data/lo32-app-kstars.png,kstars/data/lo48-app-kstars.png,kstars/data/geomap.png,kstars/data/mercury.L0.vsop,kstars/data/mercury.L1.vsop,kstars/data/mercury.L2.vsop,kstars/data/mercury.L3.vsop,kstars/data/mercury.L4.vsop,kstars/data/mercury.L5.vsop,kstars/data/mercury.B0.vsop,kstars/data/mercury.B1.vsop,kstars/data/mercury.B2.vsop,kstars/data/mercury.B3.vsop,kstars/data/mercury.B4.vsop,kstars/data/mercury.B5.vsop,kstars/data/mercury.R0.vsop,kstars/data/mercury.R1.vsop,kstars/data/mercury.R2.vsop,kstars/data/mercury.R3.vsop,kstars/data/mercury.R4.vsop,kstars/data/mercury.R5.vsop,kstars/data/venus.L0.vsop,kstars/data/venus.L1.vsop,kstars/data/venus.L2.vsop,kstars/data/venus.L3.vsop,kstars/data/venus.L4.vsop,kstars/data/venus.L5.vsop,kstars/data/venus.B0.vsop,kstars/data/venus.B1.vsop,kstars/data/venus.B2.vsop,kstars/data/venus.B3.vsop,kstars/data/venus.B4.vsop,kstars/data/venus.B5.vsop,kstars/data/venus.R0.vsop,kstars/data/venus.R1.vsop,kstars/data/venus.R2.vsop,kstars/data/venus.R3.vsop,kstars/data/venus.R4.vsop,kstars/data/venus.R5.vsop,kstars/data/earth.L0.vsop,kstars/data/earth.L1.vsop,kstars/data/earth.L2.vsop,kstars/data/earth.L3.vsop,kstars/data/earth.L4.vsop,kstars/data/earth.L5.vsop,kstars/data/earth.B0.vsop,kstars/data/earth.B1.vsop,kstars/data/earth.B2.vsop,kstars/data/earth.B3.vsop,kstars/data/earth.B4.vsop,kstars/data/earth.R0.vsop,kstars/data/earth.R1.vsop,kstars/data/earth.R2.vsop,kstars/data/earth.R3.vsop,kstars/data/earth.R4.vsop,kstars/data/earth.R5.vsop,kstars/data/mars.L0.vsop,kstars/data/mars.L1.vsop,kstars/data/mars.L2.vsop,kstars/data/mars.L3.vsop,kstars/data/mars.L4.vsop,kstars/data/mars.L5.vsop,kstars/data/mars.B0.vsop,kstars/data/mars.B1.vsop,kstars/data/mars.B2.vsop,kstars/data/mars.B3.vsop,kstars/data/mars.B4.vsop,kstars/data/mars.B5.vsop,kstars/data/mars.R0.vsop,kstars/data/mars.R1.vsop,kstars/data/mars.R2.vsop,kstars/data/mars.R3.vsop,kstars/data/mars.R4.vsop,kstars/data/mars.R5.vsop,kstars/data/jupiter.L0.vsop,kstars/data/jupiter.L1.vsop,kstars/data/jupiter.L2.vsop,kstars/data/jupiter.L3.vsop,kstars/data/jupiter.L4.vsop,kstars/data/jupiter.L5.vsop,kstars/data/jupiter.B0.vsop,kstars/data/jupiter.B1.vsop,kstars/data/jupiter.B2.vsop,kstars/data/jupiter.B3.vsop,kstars/data/jupiter.B4.vsop,kstars/data/jupiter.B5.vsop,kstars/data/jupiter.R0.vsop,kstars/data/jupiter.R1.vsop,kstars/data/jupiter.R2.vsop,kstars/data/jupiter.R3.vsop,kstars/data/jupiter.R4.vsop,kstars/data/jupiter.R5.vsop,kstars/data/saturn.L0.vsop,kstars/data/saturn.L1.vsop,kstars/data/saturn.L2.vsop,kstars/data/saturn.L3.vsop,kstars/data/saturn.L4.vsop,kstars/data/saturn.L5.vsop,kstars/data/saturn.B0.vsop,kstars/data/saturn.B1.vsop,kstars/data/saturn.B2.vsop,kstars/data/saturn.B3.vsop,kstars/data/saturn.B4.vsop,kstars/data/saturn.B5.vsop,kstars/data/saturn.R0.vsop,kstars/data/saturn.R1.vsop,kstars/data/saturn.R2.vsop,kstars/data/saturn.R3.vsop,kstars/data/saturn.R4.vsop,kstars/data/saturn.R5.vsop,kstars/data/uranus.L0.vsop,kstars/data/uranus.L1.vsop,kstars/data/uranus.L2.vsop,kstars/data/uranus.L3.vsop,kstars/data/uranus.L4.vsop,kstars/data/uranus.L5.vsop,kstars/data/uranus.B0.vsop,kstars/data/uranus.B1.vsop,kstars/data/uranus.B2.vsop,kstars/data/uranus.B3.vsop,kstars/data/uranus.B4.vsop,kstars/data/uranus.R0.vsop,kstars/data/uranus.R1.vsop,kstars/data/uranus.R2.vsop,kstars/data/uranus.R3.vsop,kstars/data/uranus.R4.vsop,kstars/data/neptune.L0.vsop,kstars/data/neptune.L1.vsop,kstars/data/neptune.L2.vsop,kstars/data/neptune.L3.vsop,kstars/data/neptune.L4.vsop,kstars/data/neptune.L5.vsop,kstars/data/neptune.B0.vsop,kstars/data/neptune.B1.vsop,kstars/data/neptune.B2.vsop,kstars/data/neptune.B3.vsop,kstars/data/neptune.B4.vsop,kstars/data/neptune.B5.vsop,kstars/data/neptune.R0.vsop,kstars/data/neptune.R1.vsop,kstars/data/neptune.R2.vsop,kstars/data/neptune.R3.vsop,kstars/data/neptune.R4.vsop,kstars/data/jupiter.png,kstars/data/mars.png,kstars/data/mercury.png,kstars/data/neptune.png,kstars/data/pluto.png,kstars/data/saturn.png,kstars/data/sun.png,kstars/data/uranus.png,kstars/data/venus.png,kstars/data/kstars.png,kstars/data/earth.png,kstars/data/moon0.png,kstars/data/moon1.png,kstars/data/moon2.png,kstars/data/moon3.png,kstars/data/moon4.png,kstars/data/moon5.png,kstars/data/moon6.png,kstars/data/moon7.png,kstars/data/moon8.png,kstars/data/moon9.png,kstars/data/moon10.png,kstars/data/moon11.png,kstars/data/moon12.png,kstars/data/moon13.png,kstars/data/moon14.png,kstars/data/moon15.png,kstars/data/moon16.png,kstars/data/moon17.png,kstars/data/moon18.png,kstars/data/moon19.png,kstars/data/moon20.png,kstars/data/moon21.png,kstars/data/moon22.png,kstars/data/moon23.png,kstars/data/moonB.dat,kstars/data/moonLR.dat,kstars/data/fr_cnames.dat,kstars/data/image_url.dat,kstars/data/info_url.dat,kstars/data/m1.png,kstars/data/m10.png,kstars/data/m100.png,kstars/data/m101.png,kstars/data/m102.png,kstars/data/m103.png,kstars/data/m104.png,kstars/data/m105.png,kstars/data/m106.png,kstars/data/m107.png,kstars/data/m108.png,kstars/data/m109.png,kstars/data/m11.png,kstars/data/m110.png,kstars/data/m12.png,kstars/data/m13.png,kstars/data/m14.png,kstars/data/m15.png,kstars/data/m16.png,kstars/data/m17.png,kstars/data/m19.png,kstars/data/m2.png,kstars/data/m20.png,kstars/data/m22.png,kstars/data/m27.png,kstars/data/m28.png,kstars/data/m3.png,kstars/data/m30.png,kstars/data/m31.png,kstars/data/m32.png,kstars/data/m33.png,kstars/data/m4.png,kstars/data/m42.png,kstars/data/m45.png,kstars/data/m49.png,kstars/data/m5.png,kstars/data/m50.png,kstars/data/m51.png,kstars/data/m53.png,kstars/data/m54.png,kstars/data/m55.png,kstars/data/m56.png,kstars/data/m57.png,kstars/data/m58.png,kstars/data/m59.png,kstars/data/m6.png,kstars/data/m60.png,kstars/data/m61.png,kstars/data/m62.png,kstars/data/m63.png,kstars/data/m64.png,kstars/data/m65.png,kstars/data/m66.png,kstars/data/m67.png,kstars/data/m68.png,kstars/data/m69.png,kstars/data/m70.png,kstars/data/m71.png,kstars/data/m72.png,kstars/data/m73.png,kstars/data/m74.png,kstars/data/m75.png,kstars/data/m76.png,kstars/data/m77.png,kstars/data/m78.png,kstars/data/m79.png,kstars/data/m8.png,kstars/data/m80.png,kstars/data/m81.png,kstars/data/m82.png,kstars/data/m83.png,kstars/data/m84.png,kstars/data/m85.png,kstars/data/m86.png,kstars/data/m87.png,kstars/data/m88.png,kstars/data/m89.png,kstars/data/m9.png,kstars/data/m90.png,kstars/data/m91.png,kstars/data/m92.png,kstars/data/m93.png,kstars/data/m94.png,kstars/data/m95.png,kstars/data/m96.png,kstars/data/m97.png,kstars/data/m98.png,kstars/data/m99.png,kstars/data/pluto.freq,kstars/data/pluto.x,kstars/data/pluto.y,kstars/data/pluto.z,kstars/data/mw01.dat,kstars/data/mw02.dat,kstars/data/mw03.dat,kstars/data/mw04.dat,kstars/data/mw05.dat,kstars/data/mw06.dat,kstars/data/mw07.dat,kstars/data/mw08.dat,kstars/data/mw09.dat,kstars/data/mw10.dat,kstars/data/mw11.dat,kstars/data/chart.colors,kstars/data/default.colors,kstars/data/night.colors,kstars/data/tips,kstars/data/show_clines.png,kstars/data/show_cnames.png,kstars/data/show_deepsky.png,kstars/data/show_grid.png,kstars/data/show_horiz.png,kstars/data/show_mw.png,kstars/data/show_planets.png,kstars/data/show_stars.png,kstars/data/TZrules.dat,kstars/data/valaav.txt,kstars/data/asteroids.dat,kstars/data/comets.dat -sub_dirs= -type=normal - -[kstars/data/TZrules.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/TZrules.dat -type=DATA - -[kstars/data/asteroids.dat] -dist=true -install=false -install_location= -type=DATA - -[kstars/data/chart.colors] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/chart.colors -type=DATA - -[kstars/data/clines.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/clines.dat -type=DATA - -[kstars/data/cnames.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/cnames.dat -type=DATA - -[kstars/data/comets.dat] -dist=true -install=false -install_location= -type=DATA - -[kstars/data/cr16-app-kstars.png] -dist=true -install=true -install_location=$$(kde_icondir)/crystalsvg/16x16/apps/kstars.png -type=DATA - -[kstars/data/cr32-app-kstars.png] -dist=true -install=true -install_location=$$(kde_icondir)/crystalsvg/32x32/apps/kstars.png \s -type=DATA - -[kstars/data/cr48-app-kstars.png] -dist=true -install=true -install_location=$$(kde_icondir)/crystalsvg/48x48/apps/kstars.png -type=DATA - -[kstars/data/default.colors] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/default.colors -type=DATA - -[kstars/data/earth.B0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.B0.vsop -type=DATA - -[kstars/data/earth.B1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.B1.vsop -type=DATA - -[kstars/data/earth.B2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.B2.vsop -type=DATA - -[kstars/data/earth.B3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.B3.vsop -type=DATA - -[kstars/data/earth.B4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.B4.vsop -type=DATA - -[kstars/data/earth.L0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.L0.vsop -type=DATA - -[kstars/data/earth.L1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.L1.vsop -type=DATA - -[kstars/data/earth.L2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.L2.vsop -type=DATA - -[kstars/data/earth.L3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.L3.vsop -type=DATA - -[kstars/data/earth.L4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.L4.vsop -type=DATA - -[kstars/data/earth.L5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.L5.vsop -type=DATA - -[kstars/data/earth.R0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.R0.vsop -type=DATA - -[kstars/data/earth.R1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.R1.vsop -type=DATA - -[kstars/data/earth.R2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.R2.vsop -type=DATA - -[kstars/data/earth.R3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.R3.vsop -type=DATA - -[kstars/data/earth.R4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.R4.vsop -type=DATA - -[kstars/data/earth.R5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.R5.vsop -type=DATA - -[kstars/data/earth.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.png -type=DATA - -[kstars/data/fr_cnames.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/fr_cnames.dat -type=DATA - -[kstars/data/geomap.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/geomap.png -type=DATA - -[kstars/data/image_url.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/image_url.dat -type=DATA - -[kstars/data/info_url.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/info_url.dat -type=DATA - -[kstars/data/jupiter.B0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.B0.vsop -type=DATA - -[kstars/data/jupiter.B1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.B1.vsop -type=DATA - -[kstars/data/jupiter.B2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.B2.vsop -type=DATA - -[kstars/data/jupiter.B3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.B3.vsop -type=DATA - -[kstars/data/jupiter.B4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.B4.vsop -type=DATA - -[kstars/data/jupiter.B5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.B5.vsop -type=DATA - -[kstars/data/jupiter.L0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.L0.vsop -type=DATA - -[kstars/data/jupiter.L1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.L1.vsop -type=DATA - -[kstars/data/jupiter.L2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.L2.vsop -type=DATA - -[kstars/data/jupiter.L3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.L3.vsop -type=DATA - -[kstars/data/jupiter.L4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.L4.vsop -type=DATA - -[kstars/data/jupiter.L5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.L5.vsop -type=DATA - -[kstars/data/jupiter.R0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.R0.vsop -type=DATA - -[kstars/data/jupiter.R1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.R1.vsop -type=DATA - -[kstars/data/jupiter.R2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.R2.vsop -type=DATA - -[kstars/data/jupiter.R3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.R3.vsop -type=DATA - -[kstars/data/jupiter.R4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.R4.vsop -type=DATA - -[kstars/data/jupiter.R5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.R5.vsop -type=DATA - -[kstars/data/jupiter.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.png -type=DATA - -[kstars/data/kstars.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/kstars.png -type=DATA - -[kstars/data/lo16-app-kstars.png] -dist=true -install=true -install_location=$$(kde_icondir)/locolor/16x16/apps/kstars.png\s -type=DATA - -[kstars/data/lo32-app-kstars.png] -dist=true -install=true -install_location=$$(kde_icondir)/locolor/32x32/apps/kstars.png\s -type=DATA - -[kstars/data/lo48-app-kstars.png] -dist=true -install=true -install_location=$$(kde_icondir)/locolor/48x48/apps/kstars.png\s -type=DATA - -[kstars/data/m1.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m1.png -type=DATA - -[kstars/data/m10.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m10.png -type=DATA - -[kstars/data/m100.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m100.png -type=DATA - -[kstars/data/m101.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m101.png -type=DATA - -[kstars/data/m102.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m102.png -type=DATA - -[kstars/data/m103.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m103.png -type=DATA - -[kstars/data/m104.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m104.png -type=DATA - -[kstars/data/m105.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m105.png -type=DATA - -[kstars/data/m106.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m106.png -type=DATA - -[kstars/data/m107.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m107.png -type=DATA - -[kstars/data/m108.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m108.png -type=DATA - -[kstars/data/m109.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m109.png -type=DATA - -[kstars/data/m11.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m11.png -type=DATA - -[kstars/data/m110.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m110.png -type=DATA - -[kstars/data/m12.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m12.png -type=DATA - -[kstars/data/m13.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m13.png -type=DATA - -[kstars/data/m14.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m14.png -type=DATA - -[kstars/data/m15.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m15.png -type=DATA - -[kstars/data/m16.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m16.png -type=DATA - -[kstars/data/m17.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m17.png -type=DATA - -[kstars/data/m19.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m19.png -type=DATA - -[kstars/data/m2.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m2.png -type=DATA - -[kstars/data/m20.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m20.png -type=DATA - -[kstars/data/m22.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m22.png -type=DATA - -[kstars/data/m27.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m27.png -type=DATA - -[kstars/data/m28.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m28.png -type=DATA - -[kstars/data/m3.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m3.png -type=DATA - -[kstars/data/m30.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m30.png -type=DATA - -[kstars/data/m31.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m31.png -type=DATA - -[kstars/data/m32.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m32.png -type=DATA - -[kstars/data/m33.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m33.png -type=DATA - -[kstars/data/m4.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m4.png -type=DATA - -[kstars/data/m42.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m42.png -type=DATA - -[kstars/data/m45.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m45.png -type=DATA - -[kstars/data/m49.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m49.png -type=DATA - -[kstars/data/m5.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m5.png -type=DATA - -[kstars/data/m50.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m50.png -type=DATA - -[kstars/data/m51.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m51.png -type=DATA - -[kstars/data/m53.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m53.png -type=DATA - -[kstars/data/m54.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m54.png -type=DATA - -[kstars/data/m55.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m55.png -type=DATA - -[kstars/data/m56.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m56.png -type=DATA - -[kstars/data/m57.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m57.png -type=DATA - -[kstars/data/m58.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m58.png -type=DATA - -[kstars/data/m59.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m59.png -type=DATA - -[kstars/data/m6.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m6.png -type=DATA - -[kstars/data/m60.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m60.png -type=DATA - -[kstars/data/m61.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m61.png -type=DATA - -[kstars/data/m62.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m62.png -type=DATA - -[kstars/data/m63.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m63.png -type=DATA - -[kstars/data/m64.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m64.png -type=DATA - -[kstars/data/m65.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m65.png -type=DATA - -[kstars/data/m66.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m66.png -type=DATA - -[kstars/data/m67.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m67.png -type=DATA - -[kstars/data/m68.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m68.png -type=DATA - -[kstars/data/m69.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m69.png -type=DATA - -[kstars/data/m70.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m70.png -type=DATA - -[kstars/data/m71.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m71.png -type=DATA - -[kstars/data/m72.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m72.png -type=DATA - -[kstars/data/m73.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m73.png -type=DATA - -[kstars/data/m74.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m74.png -type=DATA - -[kstars/data/m75.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m75.png -type=DATA - -[kstars/data/m76.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m76.png -type=DATA - -[kstars/data/m77.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m77.png -type=DATA - -[kstars/data/m78.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m78.png -type=DATA - -[kstars/data/m79.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m79.png -type=DATA - -[kstars/data/m8.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m8.png -type=DATA - -[kstars/data/m80.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m80.png -type=DATA - -[kstars/data/m81.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m81.png -type=DATA - -[kstars/data/m82.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m82.png -type=DATA - -[kstars/data/m83.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m83.png -type=DATA - -[kstars/data/m84.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m84.png -type=DATA - -[kstars/data/m85.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m85.png -type=DATA - -[kstars/data/m86.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m86.png -type=DATA - -[kstars/data/m87.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m87.png -type=DATA - -[kstars/data/m88.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m88.png -type=DATA - -[kstars/data/m89.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m89.png -type=DATA - -[kstars/data/m9.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m9.png -type=DATA - -[kstars/data/m90.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m90.png -type=DATA - -[kstars/data/m91.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m91.png -type=DATA - -[kstars/data/m92.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m92.png -type=DATA - -[kstars/data/m93.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m93.png -type=DATA - -[kstars/data/m94.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m94.png -type=DATA - -[kstars/data/m95.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m95.png -type=DATA - -[kstars/data/m96.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m96.png -type=DATA - -[kstars/data/m97.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m97.png -type=DATA - -[kstars/data/m98.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m98.png -type=DATA - -[kstars/data/m99.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m99.png -type=DATA - -[kstars/data/mars.B0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.B0.vsop -type=DATA - -[kstars/data/mars.B1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.B1.vsop -type=DATA - -[kstars/data/mars.B2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.B2.vsop -type=DATA - -[kstars/data/mars.B3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.B3.vsop -type=DATA - -[kstars/data/mars.B4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.B4.vsop -type=DATA - -[kstars/data/mars.B5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.B5.vsop -type=DATA - -[kstars/data/mars.L0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.L0.vsop -type=DATA - -[kstars/data/mars.L1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.L1.vsop -type=DATA - -[kstars/data/mars.L2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.L2.vsop -type=DATA - -[kstars/data/mars.L3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.L3.vsop -type=DATA - -[kstars/data/mars.L4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.L4.vsop -type=DATA - -[kstars/data/mars.L5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.L5.vsop -type=DATA - -[kstars/data/mars.R0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.R0.vsop -type=DATA - -[kstars/data/mars.R1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.R1.vsop -type=DATA - -[kstars/data/mars.R2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.R2.vsop -type=DATA - -[kstars/data/mars.R3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.R3.vsop -type=DATA - -[kstars/data/mars.R4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.R4.vsop -type=DATA - -[kstars/data/mars.R5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.R5.vsop -type=DATA - -[kstars/data/mars.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.png -type=DATA - -[kstars/data/mercury.B0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.B0.vsop -type=DATA - -[kstars/data/mercury.B1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.B1.vsop -type=DATA - -[kstars/data/mercury.B2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.B2.vsop -type=DATA - -[kstars/data/mercury.B3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.B3.vsop -type=DATA - -[kstars/data/mercury.B4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.B4.vsop -type=DATA - -[kstars/data/mercury.B5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.B5.vsop -type=DATA - -[kstars/data/mercury.L0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.L0.vsop -type=DATA - -[kstars/data/mercury.L1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.L1.vsop -type=DATA - -[kstars/data/mercury.L2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.L2.vsop -type=DATA - -[kstars/data/mercury.L3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.L3.vsop -type=DATA - -[kstars/data/mercury.L4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.L4.vsop -type=DATA - -[kstars/data/mercury.L5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.L5.vsop -type=DATA - -[kstars/data/mercury.R0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.R0.vsop -type=DATA - -[kstars/data/mercury.R1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.R1.vsop -type=DATA - -[kstars/data/mercury.R2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.R2.vsop -type=DATA - -[kstars/data/mercury.R3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.R3.vsop -type=DATA - -[kstars/data/mercury.R4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.R4.vsop -type=DATA - -[kstars/data/mercury.R5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.R5.vsop -type=DATA - -[kstars/data/mercury.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.png -type=DATA - -[kstars/data/moon0.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon0.png -type=DATA - -[kstars/data/moon1.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon1.png -type=DATA - -[kstars/data/moon10.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon10.png -type=DATA - -[kstars/data/moon11.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon11.png -type=DATA - -[kstars/data/moon12.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon12.png -type=DATA - -[kstars/data/moon13.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon13.png -type=DATA - -[kstars/data/moon14.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon14.png -type=DATA - -[kstars/data/moon15.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon15.png -type=DATA - -[kstars/data/moon16.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon16.png -type=DATA - -[kstars/data/moon17.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon17.png -type=DATA - -[kstars/data/moon18.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon18.png -type=DATA - -[kstars/data/moon19.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon19.png -type=DATA - -[kstars/data/moon2.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon2.png -type=DATA - -[kstars/data/moon20.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon20.png -type=DATA - -[kstars/data/moon21.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon21.png -type=DATA - -[kstars/data/moon22.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon22.png -type=DATA - -[kstars/data/moon23.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon23.png -type=DATA - -[kstars/data/moon3.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon3.png -type=DATA - -[kstars/data/moon4.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon4.png -type=DATA - -[kstars/data/moon5.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon5.png -type=DATA - -[kstars/data/moon6.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon6.png -type=DATA - -[kstars/data/moon7.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon7.png -type=DATA - -[kstars/data/moon8.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon8.png -type=DATA - -[kstars/data/moon9.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon9.png -type=DATA - -[kstars/data/moonB.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moonB.dat -type=DATA - -[kstars/data/moonLR.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moonLR.dat -type=DATA - -[kstars/data/mw01.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw01.dat -type=DATA - -[kstars/data/mw02.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw02.dat -type=DATA - -[kstars/data/mw03.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw03.dat -type=DATA - -[kstars/data/mw04.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw04.dat -type=DATA - -[kstars/data/mw05.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw05.dat -type=DATA - -[kstars/data/mw06.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw06.dat -type=DATA - -[kstars/data/mw07.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw07.dat -type=DATA - -[kstars/data/mw08.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw08.dat -type=DATA - -[kstars/data/mw09.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw09.dat -type=DATA - -[kstars/data/mw10.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw10.dat -type=DATA - -[kstars/data/mw11.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw11.dat -type=DATA - -[kstars/data/neptune.B0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.B0.vsop -type=DATA - -[kstars/data/neptune.B1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.B1.vsop -type=DATA - -[kstars/data/neptune.B2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.B2.vsop -type=DATA - -[kstars/data/neptune.B3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.B3.vsop -type=DATA - -[kstars/data/neptune.B4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.B4.vsop -type=DATA - -[kstars/data/neptune.B5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.B5.vsop -type=DATA - -[kstars/data/neptune.L0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.L0.vsop -type=DATA - -[kstars/data/neptune.L1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.L1.vsop -type=DATA - -[kstars/data/neptune.L2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.L2.vsop -type=DATA - -[kstars/data/neptune.L3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.L3.vsop -type=DATA - -[kstars/data/neptune.L4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.L4.vsop -type=DATA - -[kstars/data/neptune.L5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.L5.vsop -type=DATA - -[kstars/data/neptune.R0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.R0.vsop -type=DATA - -[kstars/data/neptune.R1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.R1.vsop -type=DATA - -[kstars/data/neptune.R2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.R2.vsop -type=DATA - -[kstars/data/neptune.R3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.R3.vsop -type=DATA - -[kstars/data/neptune.R4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.R4.vsop -type=DATA - -[kstars/data/neptune.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.png -type=DATA - -[kstars/data/ngcic01.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic01.dat -type=DATA - -[kstars/data/ngcic02.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic02.dat -type=DATA - -[kstars/data/ngcic03.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic03.dat -type=DATA - -[kstars/data/ngcic04.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic04.dat -type=DATA - -[kstars/data/ngcic05.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic05.dat -type=DATA - -[kstars/data/ngcic06.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic06.dat -type=DATA - -[kstars/data/ngcic07.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic07.dat -type=DATA - -[kstars/data/ngcic08.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic08.dat -type=DATA - -[kstars/data/ngcic09.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic09.dat -type=DATA - -[kstars/data/ngcic10.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic10.dat -type=DATA - -[kstars/data/ngcic11.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic11.dat -type=DATA - -[kstars/data/ngcic12.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic12.dat -type=DATA - -[kstars/data/ngcic13.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic13.dat -type=DATA - -[kstars/data/night.colors] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/night.colors -type=DATA - -[kstars/data/pluto.freq] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/pluto.freq -type=DATA - -[kstars/data/pluto.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/pluto.png -type=DATA - -[kstars/data/pluto.x] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/pluto.x -type=DATA - -[kstars/data/pluto.y] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/pluto.y -type=DATA - -[kstars/data/pluto.z] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/pluto.z -type=DATA - -[kstars/data/sao01.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao01.dat -type=DATA - -[kstars/data/sao02.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao02.dat -type=DATA - -[kstars/data/sao03.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao03.dat -type=DATA - -[kstars/data/sao04.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao04.dat -type=DATA - -[kstars/data/sao05.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao05.dat -type=DATA - -[kstars/data/sao06.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao06.dat -type=DATA - -[kstars/data/sao07.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao07.dat -type=DATA - -[kstars/data/sao08.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao08.dat -type=DATA - -[kstars/data/sao09.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao09.dat -type=DATA - -[kstars/data/sao10.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao10.dat -type=DATA - -[kstars/data/sao11.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao11.dat -type=DATA - -[kstars/data/sao12.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao12.dat -type=DATA - -[kstars/data/sao13.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao13.dat -type=DATA - -[kstars/data/sao14.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao14.dat -type=DATA - -[kstars/data/sao15.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao15.dat -type=DATA - -[kstars/data/sao16.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao16.dat -type=DATA - -[kstars/data/sao17.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao17.dat -type=DATA - -[kstars/data/sao18.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao18.dat -type=DATA - -[kstars/data/sao19.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao19.dat -type=DATA - -[kstars/data/sao20.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao20.dat -type=DATA - -[kstars/data/sao21.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao21.dat -type=DATA - -[kstars/data/sao22.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao22.dat -type=DATA - -[kstars/data/sao23.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao23.dat -type=DATA - -[kstars/data/sao24.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao24.dat -type=DATA - -[kstars/data/sao25.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao25.dat -type=DATA - -[kstars/data/sao26.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao26.dat -type=DATA - -[kstars/data/sao27.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao27.dat -type=DATA - -[kstars/data/sao28.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao28.dat -type=DATA - -[kstars/data/sao29.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao29.dat -type=DATA - -[kstars/data/sao30.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao30.dat -type=DATA - -[kstars/data/sao31.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao31.dat -type=DATA - -[kstars/data/sao32.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao32.dat -type=DATA - -[kstars/data/sao33.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao33.dat -type=DATA - -[kstars/data/sao34.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao34.dat -type=DATA - -[kstars/data/sao35.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao35.dat -type=DATA - -[kstars/data/sao36.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao36.dat -type=DATA - -[kstars/data/sao37.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao37.dat -type=DATA - -[kstars/data/sao38.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao38.dat -type=DATA - -[kstars/data/sao39.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao39.dat -type=DATA - -[kstars/data/sao40.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao40.dat -type=DATA - -[kstars/data/saturn.B0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.B0.vsop -type=DATA - -[kstars/data/saturn.B1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.B1.vsop -type=DATA - -[kstars/data/saturn.B2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.B2.vsop -type=DATA - -[kstars/data/saturn.B3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.B3.vsop -type=DATA - -[kstars/data/saturn.B4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.B4.vsop -type=DATA - -[kstars/data/saturn.B5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.B5.vsop -type=DATA - -[kstars/data/saturn.L0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.L0.vsop -type=DATA - -[kstars/data/saturn.L1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.L1.vsop -type=DATA - -[kstars/data/saturn.L2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.L2.vsop -type=DATA - -[kstars/data/saturn.L3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.L3.vsop -type=DATA - -[kstars/data/saturn.L4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.L4.vsop -type=DATA - -[kstars/data/saturn.L5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.L5.vsop -type=DATA - -[kstars/data/saturn.R0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.R0.vsop -type=DATA - -[kstars/data/saturn.R1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.R1.vsop -type=DATA - -[kstars/data/saturn.R2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.R2.vsop -type=DATA - -[kstars/data/saturn.R3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.R3.vsop -type=DATA - -[kstars/data/saturn.R4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.R4.vsop -type=DATA - -[kstars/data/saturn.R5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.R5.vsop -type=DATA - -[kstars/data/saturn.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.png -type=DATA - -[kstars/data/show_clines.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/show_clines.png -type=DATA - -[kstars/data/show_cnames.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/show_cnames.png -type=DATA - -[kstars/data/show_deepsky.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/show_deepsky.png -type=DATA - -[kstars/data/show_grid.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/show_grid.png -type=DATA - -[kstars/data/show_horiz.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/show_horiz.png -type=DATA - -[kstars/data/show_mw.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/show_mw.png -type=DATA - -[kstars/data/show_planets.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/show_planets.png -type=DATA - -[kstars/data/show_stars.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/show_stars.png -type=DATA - -[kstars/data/sun.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sun.png -type=DATA - -[kstars/data/tips] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/tips -type=DATA - -[kstars/data/uranus.B0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.B0.vsop -type=DATA - -[kstars/data/uranus.B1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.B1.vsop -type=DATA - -[kstars/data/uranus.B2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.B2.vsop -type=DATA - -[kstars/data/uranus.B3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.B3.vsop -type=DATA - -[kstars/data/uranus.B4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.B4.vsop -type=DATA - -[kstars/data/uranus.L0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.L0.vsop -type=DATA - -[kstars/data/uranus.L1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.L1.vsop -type=DATA - -[kstars/data/uranus.L2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.L2.vsop -type=DATA - -[kstars/data/uranus.L3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.L3.vsop -type=DATA - -[kstars/data/uranus.L4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.L4.vsop -type=DATA - -[kstars/data/uranus.L5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.L5.vsop -type=DATA - -[kstars/data/uranus.R0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.R0.vsop -type=DATA - -[kstars/data/uranus.R1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.R1.vsop -type=DATA - -[kstars/data/uranus.R2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.R2.vsop -type=DATA - -[kstars/data/uranus.R3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.R3.vsop -type=DATA - -[kstars/data/uranus.R4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.R4.vsop -type=DATA - -[kstars/data/uranus.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.png -type=DATA - -[kstars/data/valaav.txt] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/valaav.txt -type=DATA - -[kstars/data/venus.B0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.B0.vsop -type=DATA - -[kstars/data/venus.B1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.B1.vsop -type=DATA - -[kstars/data/venus.B2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.B2.vsop -type=DATA - -[kstars/data/venus.B3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.B3.vsop -type=DATA - -[kstars/data/venus.B4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.B4.vsop -type=DATA - -[kstars/data/venus.B5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.B5.vsop -type=DATA - -[kstars/data/venus.L0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.L0.vsop -type=DATA - -[kstars/data/venus.L1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.L1.vsop -type=DATA - -[kstars/data/venus.L2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.L2.vsop -type=DATA - -[kstars/data/venus.L3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.L3.vsop -type=DATA - -[kstars/data/venus.L4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.L4.vsop -type=DATA - -[kstars/data/venus.L5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.L5.vsop -type=DATA - -[kstars/data/venus.R0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.R0.vsop -type=DATA - -[kstars/data/venus.R1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.R1.vsop -type=DATA - -[kstars/data/venus.R2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.R2.vsop -type=DATA - -[kstars/data/venus.R3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.R3.vsop -type=DATA - -[kstars/data/venus.R4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.R4.vsop -type=DATA - -[kstars/data/venus.R5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.R5.vsop -type=DATA - -[kstars/data/venus.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.png -type=DATA - -[kstars/detaildialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/detaildialog.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/dms.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/dms.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/dmsbox.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/dmsbox.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/elts.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/elts.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/eltscanvas.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/eltscanvas.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/filesource.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/filesource.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/finddialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/finddialog.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/focusdialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/focusdialog.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/focusdialogdlg.ui] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/geolocation.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/geolocation.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/imageviewer.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/imageviewer.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/infobox.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/infobox.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/infoboxes.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/infoboxes.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/jupitermoons.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/jupitermoons.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/ksasteroid.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/ksasteroid.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kscomet.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kscomet.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/ksfilereader.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/ksfilereader.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/ksmoon.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/ksmoon.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/ksnumbers.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/ksnumbers.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/ksplanet.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/ksplanet.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/ksplanetbase.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/ksplanetbase.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kspluto.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kspluto.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kspopupmenu.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kspopupmenu.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kssun.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kssun.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kstars.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kstars.desktop] -dist=true -install=true -install_location=$$(kde_appsdir)/Edutainment/Science/kstars.desktop -type=DATA - -[kstars/kstars.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kstars/kslineedit.cpp] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kstars/kslineedit.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kstars_options_handling.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kstarsactions.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kstarsdata.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kstarsdata.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kstarsdcop.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kstarsinit.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kstarsmessagebox.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kstarsmessagebox.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kstarsoptions.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kstarsoptions.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kstarssplash.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kstarssplash.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kstarsui.rc] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/kstarsui.rc -type=DATA - -[kstars/ksutils.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/ksutils.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/lcgenerator.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/lcgenerator.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/locationdialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/locationdialog.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/magnitudespinbox.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/magnitudespinbox.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/main.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/mapcanvas.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/mapcanvas.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/modcalcapcoord.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcapcoord.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/modcalcapcoorddlg.ui] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcazel.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcazel.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/modcalcazeldlg.ui] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcdaylength.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcdaylength.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/modcalcdaylengthdlg.ui] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcgalcoord.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcgalcoord.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/modcalcgalcoorddlg.ui] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcgeodcoord.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcgeodcoord.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/modcalcgeoddlg.ui] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcjd.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcjd.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/modcalcjddlg.ui] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcprec.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcprec.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/modcalcprecdlg.ui] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcsidtime.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcsidtime.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/modcalcsidtimedlg.ui] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/objectnamelist.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/objectnamelist.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/planetcatalog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/planetcatalog.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/simclock.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/simclock.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/skymap.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/skymap.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/skymapdraw.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/skymapevents.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/skyobject.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/skyobject.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/skyobjectname.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/skyobjectname.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/skypoint.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/skypoint.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/stardatasink.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/stardatasink.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/starobject.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/starobject.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/starpixmap.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/starpixmap.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/timebox.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/timebox.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/timedialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/timedialog.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/timespinbox.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/timespinbox.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/timestepbox.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/timestepbox.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/timeunitbox.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/timeunitbox.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/timezonerule.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/timezonerule.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/toggleaction.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/toggleaction.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/viewopsdialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/viewopsdialog.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/wutdialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/wutdialog.h] -dist=true -install=false -install_location= -type=HEADER diff --git a/kstars/kstars.tdevelop b/kstars/kstars.tdevelop deleted file mode 100644 index cd5d5374..00000000 --- a/kstars/kstars.tdevelop +++ /dev/null @@ -1,97 +0,0 @@ -<!DOCTYPE tdevelop> -<tdevelop> - <general> - <author>Jason Harris</author> - <email>kstars@30doradus.org</email> - <projectmanagement>KDevKDEAutoProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>KDE</keyword> - <keyword>Qt</keyword> - </keywords> - </general> - <kdevautoproject> - <general> - <mainprogram>kstars</mainprogram> - </general> - <configure> - <configargs>\s--build=i386-linux --host=i386-linux --target=i386-linux --prefix=/usr --with-qt-dir=/usr/lib/qt2\s</configargs> - </configure> - <make> - <abortonerror/> - <numberofjobs/> - <dontact/> - <makebin/> - <envvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </envvars> - </make> - <compiler> - <cflags/> - <cxxflags>\s-O0 -g3 -Wall</cxxflags> - </compiler> - <makeenvvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </makeenvvars> - <run> - <directoryradio>executable</directoryradio> - </run> - </kdevautoproject> - <kdevfileview> - <groups> - <group pattern="*.h,*.hh,*.hxx,*.hpp,*.H" name="Headers" /> - <group pattern="*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l" name="Sources" /> - <group pattern="*.kdevdlg,*.ui,*.rc" name="User Interface" /> - <group pattern="*.po" name="Translations" /> - <group pattern="AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,NEWS" name="GNU" /> - <group pattern="*" name="Others" /> - </groups> - <tree> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidepatterns></hidepatterns> - <showvcsfields>false</showvcsfields> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>gtk</toc> - <toc>gnustep</toc> - <toc>python</toc> - <toc>php</toc> - <toc>perl</toc> - </ignoretocs> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - </general> - </kdevdebugger> - <kdevcvs> - <cvsoptions>-f</cvsoptions> - <commitoptions></commitoptions> - <addoptions></addoptions> - <logoptions></logoptions> - <updateoptions>-dP</updateoptions> - <removeoptions>-f</removeoptions> - <revertoptions>-C -d -P</revertoptions> - <diffoptions>-u3 -p</diffoptions> - <rshoptions></rshoptions> - </kdevcvs> - <kdevcppsupport> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - </codecompletion> - <references/> - </kdevcppsupport> -</tdevelop> diff --git a/kstars/kstars/Makefile.am b/kstars/kstars/Makefile.am index ef7cae2d..c90b8ca4 100644 --- a/kstars/kstars/Makefile.am +++ b/kstars/kstars/Makefile.am @@ -54,7 +54,7 @@ INCLUDES= -I$(top_srcdir) -Itools -I$(srcdir)/tools $(all_includes) METASOURCES = AUTO # the library search path. -kstars_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kstars_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # Uncomment the following two lines if you add a ui.rc file for your application to make use of # KDE diff --git a/kstars/kstars/addcatdialog.cpp b/kstars/kstars/addcatdialog.cpp index 2487a6f3..ffb3f65c 100644 --- a/kstars/kstars/addcatdialog.cpp +++ b/kstars/kstars/addcatdialog.cpp @@ -41,11 +41,11 @@ AddCatDialog::AddCatDialog( TQWidget *parent ) acd = new AddCatDialogUI(page); vlay->addWidget( acd ); - connect( acd->DataURL->lineEdit(), TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotShowDataFile() ) ); - connect( acd->DataURL, TQT_SIGNAL( urlSelected( const TQString & ) ), - this, TQT_SLOT( slotShowDataFile() ) ); - connect( acd->PreviewButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotPreviewCatalog() ) ); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotCreateCatalog() ) ); + connect( acd->DataURL->lineEdit(), TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotShowDataFile() ) ); + connect( acd->DataURL, TQ_SIGNAL( urlSelected( const TQString & ) ), + this, TQ_SLOT( slotShowDataFile() ) ); + connect( acd->PreviewButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotPreviewCatalog() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotCreateCatalog() ) ); acd->FieldList->insertItem( i18n( "ID Number" ) ); acd->FieldList->insertItem( i18n( "Right Ascension" ) ); @@ -187,7 +187,7 @@ void AddCatDialog::slotShowDataFile() { if ( ! acd->DataURL->url().isEmpty() && dataFile.open( IO_ReadOnly ) ) { acd->DataFileBox->clear(); TQTextStream dataStream( &dataFile ); - acd->DataFileBox->insertStringList( TQStringList::split( "\n", dataStream.read(), TRUE ) ); + acd->DataFileBox->insertStringList( TQStringList::split( "\n", dataStream.read(), true ) ); dataFile.close(); } } diff --git a/kstars/kstars/addcatdialog.h b/kstars/kstars/addcatdialog.h index 9cb931b1..385c2fe3 100644 --- a/kstars/kstars/addcatdialog.h +++ b/kstars/kstars/addcatdialog.h @@ -35,7 +35,7 @@ */ class AddCatDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /**Default constructor diff --git a/kstars/kstars/addlinkdialog.cpp b/kstars/kstars/addlinkdialog.cpp index a52b6fc5..9649d719 100644 --- a/kstars/kstars/addlinkdialog.cpp +++ b/kstars/kstars/addlinkdialog.cpp @@ -38,8 +38,8 @@ AddLinkDialog::AddLinkDialog( TQWidget *parent, const TQString &oname ) vlay->activate(); //connect signals to slots - connect( ald->URLButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( checkURL() ) ); - connect( ald->TypeBox, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( changeDefaultDescription( int ) ) ); + connect( ald->URLButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( checkURL() ) ); + connect( ald->TypeBox, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( changeDefaultDescription( int ) ) ); ald->ImageRadio->setChecked(true); ald->DescBox->setText( i18n( "Show image of " ) + ObjectName ); @@ -48,12 +48,12 @@ AddLinkDialog::AddLinkDialog( TQWidget *parent, const TQString &oname ) void AddLinkDialog::checkURL( void ) { KURL _url ( url() ); if ( _url.isValid() ) { //Is the string a valid URL? - kapp->invokeBrowser( _url.url() ); //If so, launch the browser to see if it's the correct document + tdeApp->invokeBrowser( _url.url() ); //If so, launch the browser to see if it's the correct document } else { //If not, print a warning message box that offers to open the browser to a search engine. TQString message = i18n( "The URL is not valid. Would you like to open a browser window\nto the Google search engine?" ); TQString caption = i18n( "Invalid URL" ); if ( KMessageBox::warningYesNo( 0, message, caption, i18n("Browse Google"), i18n("Do Not Browse") )==KMessageBox::Yes ) { - kapp->invokeBrowser( "http://www.google.com" ); + tdeApp->invokeBrowser( "http://www.google.com" ); } } } diff --git a/kstars/kstars/addlinkdialog.h b/kstars/kstars/addlinkdialog.h index 64722467..23206924 100644 --- a/kstars/kstars/addlinkdialog.h +++ b/kstars/kstars/addlinkdialog.h @@ -35,7 +35,7 @@ class SkyMap; */ class AddLinkDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /**Constructor. */ @@ -60,7 +60,7 @@ public: */ void setDesc( const TQString &s ) { ald->DescBox->setText( s ); } -/**@return TRUE if user declared the link is an image */ +/**@return true if user declared the link is an image */ bool isImageLink() const { return ald->ImageRadio->isChecked(); } /**@short Set the link type diff --git a/kstars/kstars/ccdpreviewwg.cpp b/kstars/kstars/ccdpreviewwg.cpp index 6d86c413..fc953a61 100644 --- a/kstars/kstars/ccdpreviewwg.cpp +++ b/kstars/kstars/ccdpreviewwg.cpp @@ -76,12 +76,12 @@ FILE *CCDwfp; imgFormatCombo->insertStrList(TQImage::outputFormats()); - connect(playB, TQT_SIGNAL(clicked()), this, TQT_SLOT(playPressed())); - connect(captureB, TQT_SIGNAL(clicked()), this, TQT_SLOT(captureImage())); - connect(brightnessBar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(brightnessChanged(int))); - connect(contrastBar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(contrastChanged(int))); - connect(gammaBar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(gammaChanged(int))); - connect(focalEdit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(updateFWHM())); + connect(playB, TQ_SIGNAL(clicked()), this, TQ_SLOT(playPressed())); + connect(captureB, TQ_SIGNAL(clicked()), this, TQ_SLOT(captureImage())); + connect(brightnessBar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(brightnessChanged(int))); + connect(contrastBar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(contrastChanged(int))); + connect(gammaBar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(gammaChanged(int))); + connect(focalEdit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(updateFWHM())); } CCDPreviewWG::~CCDPreviewWG() @@ -128,7 +128,7 @@ void CCDPreviewWG::setColorFrame(bool color) // callback notified sNotifier = new TQSocketNotifier( streamFD, TQSocketNotifier::Read, this); - TQObject::connect( sNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(streamReceived())); + TQObject::connect( sNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(streamReceived())); }*/ void CCDPreviewWG::enableStream(bool enable) diff --git a/kstars/kstars/ccdpreviewwg.h b/kstars/kstars/ccdpreviewwg.h index 17315e4a..7c785f39 100644 --- a/kstars/kstars/ccdpreviewwg.h +++ b/kstars/kstars/ccdpreviewwg.h @@ -30,7 +30,7 @@ enum Pixelorder {PIXELORDER_NORMAL=1, PIXELORDER_DUAL=2}; class CCDPreviewWG : public CCDPreviewForm { - Q_OBJECT + TQ_OBJECT public: @@ -73,7 +73,7 @@ enum Pixelorder {PIXELORDER_NORMAL=1, PIXELORDER_DUAL=2}; class CCDVideoWG : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/colorscheme.cpp b/kstars/kstars/colorscheme.cpp index f9e01e5e..9c0188fa 100644 --- a/kstars/kstars/colorscheme.cpp +++ b/kstars/kstars/colorscheme.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "ksutils.h" #include "colorscheme.h" diff --git a/kstars/kstars/colorscheme.h b/kstars/kstars/colorscheme.h index 696abcc0..e6190c8e 100644 --- a/kstars/kstars/colorscheme.h +++ b/kstars/kstars/colorscheme.h @@ -93,13 +93,13 @@ class ColorScheme { /**Load a color scheme from a *.colors file *@p filename the filename of the color scheme to be loaded. - *@return TRUE if the scheme was successfully loaded + *@return true if the scheme was successfully loaded */ bool load( const TQString &filename ); /**Save the current color scheme to a *.colors file. *@p name the filename to create - *@return TRUE if the color scheme is successfully writeen to a file + *@return true if the color scheme is successfully writeen to a file */ bool save( const TQString &name ); diff --git a/kstars/kstars/conbridlg.cpp b/kstars/kstars/conbridlg.cpp index 2334d6f1..0a60d4c6 100644 --- a/kstars/kstars/conbridlg.cpp +++ b/kstars/kstars/conbridlg.cpp @@ -68,8 +68,8 @@ ContrastBrightnessDlg::ContrastBrightnessDlg(TQWidget *parent) : setMainWidget(ConBriDlg); show(); - connect(ConBriDlg->conSlider, TQT_SIGNAL( valueChanged(int)), this, TQT_SLOT (setContrast(int ))); - connect(ConBriDlg->briSlider, TQT_SIGNAL( valueChanged(int)), this, TQT_SLOT (setBrightness(int))); + connect(ConBriDlg->conSlider, TQ_SIGNAL( valueChanged(int)), this, TQ_SLOT (setContrast(int ))); + connect(ConBriDlg->briSlider, TQ_SIGNAL( valueChanged(int)), this, TQ_SLOT (setBrightness(int))); } diff --git a/kstars/kstars/conbridlg.h b/kstars/kstars/conbridlg.h index 03c704ca..046293ef 100644 --- a/kstars/kstars/conbridlg.h +++ b/kstars/kstars/conbridlg.h @@ -28,7 +28,7 @@ class ContrastBrightnessDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ContrastBrightnessDlg(TQWidget *parent=0); diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp index d90131a3..5a6af06a 100644 --- a/kstars/kstars/detaildialog.cpp +++ b/kstars/kstars/detaildialog.cpp @@ -22,7 +22,7 @@ #include <tqregexp.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <kactivelabel.h> #include <kpushbutton.h> @@ -91,10 +91,10 @@ DetailDialog::DetailDialog(SkyObject *o, const KStarsDateTime &ut, GeoLocation * createLogTab(); //Connections - connect( Data->ObsListButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addToObservingList() ) ); - connect( Data->CenterButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( centerMap() ) ); - connect( Data->ScopeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( centerTelescope() ) ); - connect( Data->Image, TQT_SIGNAL( clicked() ), this, TQT_SLOT( updateThumbnail() ) ); + connect( Data->ObsListButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addToObservingList() ) ); + connect( Data->CenterButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( centerMap() ) ); + connect( Data->ScopeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( centerTelescope() ) ); + connect( Data->Image, TQ_SIGNAL( clicked() ), this, TQ_SLOT( updateThumbnail() ) ); } void DetailDialog::createGeneralTab() @@ -434,13 +434,13 @@ void DetailDialog::createLinksTab() } // Signals/Slots - connect( Links->ViewButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( viewLink() ) ); - connect( Links->AddLinkButton, TQT_SIGNAL(clicked()), ksw->map(), TQT_SLOT( addLink() ) ); - connect( Links->EditLinkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( editLinkDialog() ) ); - connect( Links->RemoveLinkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( removeLinkDialog() ) ); - connect( Links->InfoList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT( unselectImagesList() ) ); - connect( Links->ImagesList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT( unselectInfoList() ) ); - connect( ksw->map(), TQT_SIGNAL(linkAdded()), this, TQT_SLOT( updateLists() ) ); + connect( Links->ViewButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( viewLink() ) ); + connect( Links->AddLinkButton, TQ_SIGNAL(clicked()), ksw->map(), TQ_SLOT( addLink() ) ); + connect( Links->EditLinkButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( editLinkDialog() ) ); + connect( Links->RemoveLinkButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( removeLinkDialog() ) ); + connect( Links->InfoList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT( unselectImagesList() ) ); + connect( Links->ImagesList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT( unselectInfoList() ) ); + connect( ksw->map(), TQ_SIGNAL(linkAdded()), this, TQ_SLOT( updateLists() ) ); } void DetailDialog::createAdvancedTab() @@ -461,7 +461,7 @@ void DetailDialog::createAdvancedTab() vlay->addWidget( Adv ); treeIt = new TQPtrListIterator<ADVTreeData> (ksw->data()->ADVtreeList); - connect( Adv->ADVTree, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(viewADVData())); + connect( Adv->ADVTree, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, TQ_SLOT(viewADVData())); populateADVTree(NULL); } @@ -489,7 +489,7 @@ void DetailDialog::createLogTab() Log->UserLog->setText(selectedObject->userLog); //Automatically save the log contents when the widget loses focus - connect( Log->UserLog, TQT_SIGNAL( focusOut() ), this, TQT_SLOT( saveLogData() ) ); + connect( Log->UserLog, TQ_SIGNAL( focusOut() ), this, TQ_SLOT( saveLogData() ) ); } @@ -514,7 +514,7 @@ void DetailDialog::viewLink() URL = TQString( *selectedObject->ImageList.at( Links->ImagesList->currentItem() ) ); if (!URL.isEmpty()) - kapp->invokeBrowser(URL); + tdeApp->invokeBrowser(URL); } void DetailDialog::updateLists() @@ -837,7 +837,7 @@ void DetailDialog::viewADVData() link = treeIt->current()->Link; link = parseADVData(link); - kapp->invokeBrowser(link); + tdeApp->invokeBrowser(link); } TQString DetailDialog::parseADVData(TQString link) diff --git a/kstars/kstars/detaildialog.h b/kstars/kstars/detaildialog.h index 734ccf7d..1d025c7c 100644 --- a/kstars/kstars/detaildialog.h +++ b/kstars/kstars/detaildialog.h @@ -55,7 +55,7 @@ struct ADVTreeData *@version 1.0 */ class LogEdit : public KTextEdit { - Q_OBJECT + TQ_OBJECT public: LogEdit( TQWidget *parent=0, const char *name=0 ); @@ -73,7 +73,7 @@ protected: *@version 1.0 */ class ClickLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT public: ClickLabel( TQWidget *parent=0, const char *name=0 ); @@ -83,7 +83,7 @@ signals: void clicked(); protected: - void mousePressEvent( TQMouseEvent *e ) { if ( e->button() == Qt::LeftButton ) emit clicked(); } + void mousePressEvent( TQMouseEvent *e ) { if ( e->button() == TQt::LeftButton ) emit clicked(); } }; /**@class DetailDialog is a window showing detailed information for a selected object. @@ -105,7 +105,7 @@ protected: */ class DetailDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /**Constructor diff --git a/kstars/kstars/devicemanager.cpp b/kstars/kstars/devicemanager.cpp index c88e645d..df3380d5 100644 --- a/kstars/kstars/devicemanager.cpp +++ b/kstars/kstars/devicemanager.cpp @@ -109,7 +109,7 @@ bool DeviceManager::indiConnect(TQString inHost, TQString inPort) // callback notified sNotifier = new TQSocketNotifier( serverFD, TQSocketNotifier::Read, this); - TQObject::connect( sNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(dataReceived())); + TQObject::connect( sNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(dataReceived())); if (XMLParser) delLilXML(XMLParser); diff --git a/kstars/kstars/devicemanager.h b/kstars/kstars/devicemanager.h index 05337aa2..4eea0a29 100644 --- a/kstars/kstars/devicemanager.h +++ b/kstars/kstars/devicemanager.h @@ -25,7 +25,7 @@ // INDI device manager class DeviceManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: DeviceManager(INDIMenu *INDIparent, int inID); diff --git a/kstars/kstars/dms.h b/kstars/kstars/dms.h index b66814da..cc7bfaf1 100644 --- a/kstars/kstars/dms.h +++ b/kstars/kstars/dms.h @@ -348,7 +348,7 @@ public: *@li space-delimited ( 5 0 0; -33 0 0 ) or ( 5 0.0 or -33 0.0 ) *@li space-delimited, with unit labels ( 5h 0m 0s or -33d 0m 0s ) *@param s the string to be parsed as an angle value - *@param deg if TRUE, s is expressed in degrees; if FALSE, s is expressed in hours + *@param deg if true, s is expressed in degrees; if false, s is expressed in hours *@return a dms object whose value is parsed from the string argument */ static dms fromString(TQString & s, bool deg); diff --git a/kstars/kstars/dmsbox.cpp b/kstars/kstars/dmsbox.cpp index 32fd2fd2..a0e1981d 100644 --- a/kstars/kstars/dmsbox.cpp +++ b/kstars/kstars/dmsbox.cpp @@ -33,7 +33,7 @@ dmsBox::dmsBox(TQWidget *parent, const char *name, bool dg) setDegType( dg ); - connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotTextChanged( const TQString & ) ) ); } void dmsBox::setEmptyText() { diff --git a/kstars/kstars/dmsbox.h b/kstars/kstars/dmsbox.h index 6932ff8d..7b04b411 100644 --- a/kstars/kstars/dmsbox.h +++ b/kstars/kstars/dmsbox.h @@ -41,7 +41,7 @@ */ class dmsBox : public KLineEdit { -Q_OBJECT +TQ_OBJECT TQ_PROPERTY (bool degType READ degType WRITE setDegType) @@ -49,10 +49,10 @@ public: /**Constructor for the dmsBox object. *@param parent pointer to the parent TQWidget *@param ni the name of the object - *@param deg if TRUE use deg/arcmin/arcsec; otherwise + *@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 *parent, const char *ni=0, bool deg=true); /**Destructor (empty)*/ ~dmsBox(); @@ -82,19 +82,19 @@ public: /**Display an angle. Simply calls showInDegrees(t) or *showInHours(t) depending on the value of deg. *@param t the dms object which is to be displayed. - *@param deg if TRUE, display Deg/Arcmin/Arcsec; otherwise + *@param deg if true, display Deg/Arcmin/Arcsec; otherwise *display Hours/Min/Sec. */ - void show(dms t, bool deg=TRUE); + void show(dms t, bool deg=true); /**Display an angle. Simply calls showInDegrees(t) or *showInHours(t) depending on the value of deg. *This behaves essentially like the above function. It *differs only in the data type of its argument. *@param t the dms object which is to be displayed. - *@param deg if TRUE, display Deg/Arcmin/Arcsec; otherwise + *@param deg if true, display Deg/Arcmin/Arcsec; otherwise *display Hours/Min/Sec. */ - void show(const dms *t,bool deg=TRUE); + void show(const dms *t,bool deg=true); /**Simply display a string. *@note JH: Why don't we just use KLineEdit::setText() instead? @@ -107,12 +107,12 @@ public: *or colons) representing deg/hrs, min, sec. It is also possible to have two *fields. In this case, if the second field is a double, it is converted *to decimal min and double sec. - *@param deg if TRUE use deg/arcmin/arcsec; otherwise + *@param deg if true use deg/arcmin/arcsec; otherwise * use hours/min/sec. *@param ok set to true if a dms object was succedssfully created. *@return a dms object constructed from the fields of the dmsbox */ - dms createDms(bool deg=TRUE, bool *ok=0); + dms createDms(bool deg=true, bool *ok=0); /**@return a boolean indicating if object contains degrees or hours */ diff --git a/kstars/kstars/draglistbox.cpp b/kstars/kstars/draglistbox.cpp index 324b0690..81cbc711 100644 --- a/kstars/kstars/draglistbox.cpp +++ b/kstars/kstars/draglistbox.cpp @@ -24,8 +24,8 @@ DragListBox::DragListBox( TQWidget *parent, const char *name, WFlags f ) : TDEListBox( parent, name, f ) { - setAcceptDrops( TRUE ); - dragging = FALSE; + setAcceptDrops( true ); + dragging = false; } DragListBox::~DragListBox() {} @@ -70,7 +70,7 @@ void DragListBox::dropEvent( TQDropEvent *evt ) { void DragListBox::mousePressEvent( TQMouseEvent *evt ) { TQListBox::mousePressEvent( evt ); - dragging = TRUE; + dragging = true; //Record position of the Ignore item; we may have to restore it. if ( currentText() == i18n("Ignore") ) @@ -85,7 +85,7 @@ void DragListBox::mouseMoveEvent( TQMouseEvent * ) if ( dragging ) { TQDragObject *drag = new TQTextDrag( currentText(), this ); drag->dragMove(); - dragging = FALSE; + dragging = false; } } diff --git a/kstars/kstars/draglistbox.h b/kstars/kstars/draglistbox.h index 2327c21c..ffafdac8 100644 --- a/kstars/kstars/draglistbox.h +++ b/kstars/kstars/draglistbox.h @@ -31,7 +31,7 @@ class TQDragDropEvent; */ class DragListBox : public TDEListBox { - Q_OBJECT + TQ_OBJECT public: /**@short Default constructor diff --git a/kstars/kstars/filesource.h b/kstars/kstars/filesource.h index 7de46055..8189e5f0 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 TQList in StarDataSink will take the most time and this + *appending to TQPtrList 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 f73c3b08..ea9c0139 100644 --- a/kstars/kstars/finddialog.cpp +++ b/kstars/kstars/finddialog.cpp @@ -91,16 +91,16 @@ FindDialog::FindDialog( TQWidget* parent ) : Filter = 0; //Connect signals to slots -// connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() ) ) ; - connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( reject() ) ); - connect( SearchBox, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( filter() ) ); - connect( SearchBox, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotOk() ) ); - connect( filterType, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( setFilter( int ) ) ); - connect( SearchList, TQT_SIGNAL (selectionChanged (TQListBoxItem *)), TQT_SLOT (updateSelection (TQListBoxItem *))); - connect( SearchList, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ), TQT_SLOT( slotOk() ) ); +// connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( accept() ) ) ; + connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( reject() ) ); + connect( SearchBox, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( filter() ) ); + connect( SearchBox, TQ_SIGNAL( returnPressed() ), TQ_SLOT( slotOk() ) ); + connect( filterType, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( setFilter( int ) ) ); + connect( SearchList, TQ_SIGNAL (selectionChanged (TQListBoxItem *)), TQ_SLOT (updateSelection (TQListBoxItem *))); + connect( SearchList, TQ_SIGNAL( doubleClicked ( TQListBoxItem * ) ), TQ_SLOT( slotOk() ) ); // first create and paint dialog and then load list - TQTimer::singleShot(0, this, TQT_SLOT( init() )); + TQTimer::singleShot(0, this, TQ_SLOT( init() )); } FindDialog::~FindDialog() { @@ -126,7 +126,7 @@ void FindDialog::filter() { //Filter the list of names with the string in the S if ( name->text().lower().startsWith( searchFor ) ) { new SkyObjectNameListItem ( SearchList, name ); /* if ( i++ >= 5000 ) { //Every 5000 name insertions, - kapp->processEvents ( 50 ); //spend 50 msec processing TDEApplication events + tdeApp->processEvents ( 50 ); //spend 50 msec processing TDEApplication events i = 0; }*/ } @@ -182,14 +182,14 @@ void FindDialog::setFilter( int f ) { Filter = f2; if ( Filter == 0 ) { // any type will shown // delete old connections and create new connections - disconnect( SearchBox, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( filterByType() ) ); - connect( SearchBox, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( filter() ) ); + disconnect( SearchBox, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( filterByType() ) ); + connect( SearchBox, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( filter() ) ); filter(); } else { // delete old connections and create new connections - disconnect( SearchBox, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( filter() ) ); - connect( SearchBox, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( filterByType() ) ); + disconnect( SearchBox, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( filter() ) ); + connect( SearchBox, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( filterByType() ) ); filterByType(); } } diff --git a/kstars/kstars/finddialog.h b/kstars/kstars/finddialog.h index 589a6398..b7711209 100644 --- a/kstars/kstars/finddialog.h +++ b/kstars/kstars/finddialog.h @@ -45,7 +45,7 @@ class SkyObjectNameListItem; */ class FindDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kstars/kstars/fitshistogram.cpp b/kstars/kstars/fitshistogram.cpp index 55f634a1..aea3730e 100644 --- a/kstars/kstars/fitshistogram.cpp +++ b/kstars/kstars/fitshistogram.cpp @@ -58,11 +58,11 @@ histFrame->setMouseTracking(true); setMouseTracking(true); - connect(minSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateBoxes())); - connect(minSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateIntenFreq(int ))); - connect(maxSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateBoxes())); - connect(maxSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateIntenFreq(int ))); - connect(applyB, TQT_SIGNAL(clicked()), this, TQT_SLOT(applyScale())); + connect(minSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateBoxes())); + connect(minSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateIntenFreq(int ))); + connect(maxSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateBoxes())); + connect(maxSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateIntenFreq(int ))); + connect(applyB, TQ_SIGNAL(clicked()), this, TQ_SLOT(applyScale())); constructHistogram(viewer->imgBuffer); diff --git a/kstars/kstars/fitshistogram.h b/kstars/kstars/fitshistogram.h index f16d3c86..9952ebb9 100644 --- a/kstars/kstars/fitshistogram.h +++ b/kstars/kstars/fitshistogram.h @@ -28,7 +28,7 @@ class FITSHistogram : public histDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/fitsimage.h b/kstars/kstars/fitsimage.h index 514fc5dc..78a8db8c 100644 --- a/kstars/kstars/fitsimage.h +++ b/kstars/kstars/fitsimage.h @@ -43,7 +43,7 @@ class FITSViewer; class FITSFrame; class FITSImage : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: @@ -108,7 +108,7 @@ class FITSImage : public TQScrollView { class FITSFrame : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/fitsprocess.cpp b/kstars/kstars/fitsprocess.cpp index 717650fe..aa2bf2c4 100644 --- a/kstars/kstars/fitsprocess.cpp +++ b/kstars/kstars/fitsprocess.cpp @@ -64,7 +64,7 @@ } reduceProgress.progressBar()->setProgress(++nprogress); - kapp->processEvents(); + tdeApp->processEvents(); darkFrames.append(buffer); } @@ -78,7 +78,7 @@ } reduceProgress.progressBar()->setProgress(++nprogress); - kapp->processEvents(); + tdeApp->processEvents(); flatFrames.append(buffer); } @@ -92,7 +92,7 @@ } reduceProgress.progressBar()->setProgress(++nprogress); - kapp->processEvents(); + tdeApp->processEvents(); darkflatFrames.append(buffer); } @@ -266,29 +266,29 @@ void FITSProcess::reduce() reduceProgress.show(); reduceProgress.progressBar()->setProgress(1); - kapp->processEvents(); + tdeApp->processEvents(); /* Combine darks */ finalDark = combine(darkFrames, darkCombineMode); reduceProgress.progressBar()->setProgress(5); - kapp->processEvents(); + tdeApp->processEvents(); /* Combine flats */ finalFlat = combine(flatFrames, flatCombineMode); reduceProgress.progressBar()->setProgress(10); - kapp->processEvents(); + tdeApp->processEvents(); /* Combine dark flats */ finalDarkFlat = combine(darkflatFrames, darkflatCombineMode); reduceProgress.progressBar()->setProgress(12); - kapp->processEvents(); + tdeApp->processEvents(); /* Subtract the dark frame */ if (finalDark) subtract( viewer->imgBuffer, finalDark); reduceProgress.progressBar()->setProgress(14); - kapp->processEvents(); + tdeApp->processEvents(); /* Subtract the fark frame from the flat field and then apply to the image buffer */ @@ -297,17 +297,17 @@ void FITSProcess::reduce() if (finalDarkFlat) subtract( finalFlat, finalDarkFlat); reduceProgress.progressBar()->setProgress(16); - kapp->processEvents(); + tdeApp->processEvents(); normalize(finalFlat); reduceProgress.progressBar()->setProgress(18); - kapp->processEvents(); + tdeApp->processEvents(); divide(viewer->imgBuffer, finalFlat); } reduceProgress.progressBar()->setProgress(20); - kapp->processEvents(); + tdeApp->processEvents(); } diff --git a/kstars/kstars/fitsviewer.cpp b/kstars/kstars/fitsviewer.cpp index b054c940..f10dfe95 100644 --- a/kstars/kstars/fitsviewer.cpp +++ b/kstars/kstars/fitsviewer.cpp @@ -105,7 +105,7 @@ FITSViewer::FITSViewer (const KURL *url, TQWidget *parent, const char *name) history->setUndoLimit(10); history->setRedoLimit(10); history->documentSaved(); - connect(history, TQT_SIGNAL(documentRestored()), this, TQT_SLOT(fitsRestore())); + connect(history, TQ_SIGNAL(documentRestored()), this, TQ_SLOT(fitsRestore())); /* Setup image widget */ image = new FITSImage(this); @@ -131,39 +131,39 @@ FITSViewer::FITSViewer (const KURL *url, TQWidget *parent, const char *name) if (KSUtils::openDataFile( tempFile, "imgreduction.png" ) ) { - new TDEAction( i18n("Image Reduction"), tempFile.name(), TDEShortcut( "Ctrl+R" ), TQT_TQOBJECT(this), TQT_SLOT( imageReduction()), actionCollection(), "image_reduce"); + new TDEAction( i18n("Image Reduction"), tempFile.name(), TDEShortcut( "Ctrl+R" ), this, TQ_SLOT( imageReduction()), actionCollection(), "image_reduce"); tempFile.close(); } else - new TDEAction( i18n("Image Reduction"), "blend", TDEShortcut( "Ctrl+R" ), TQT_TQOBJECT(this), TQT_SLOT( imageReduction()), actionCollection(), "image_reduce"); + new TDEAction( i18n("Image Reduction"), "blend", TDEShortcut( "Ctrl+R" ), this, TQ_SLOT( imageReduction()), actionCollection(), "image_reduce"); /*if (KSUtils::openDataFile( tempFile, "bricon.png" ) ) { - new TDEAction( i18n("Brightness/Contrast"), tempFile.name(), TDEShortcut( "Ctrl+T" ), TQT_TQOBJECT(this), TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); + new TDEAction( i18n("Brightness/Contrast"), tempFile.name(), TDEShortcut( "Ctrl+T" ), this, TQ_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); tempFile.close(); } else*/ - new TDEAction( i18n("Brightness/Contrast"), "contrast+", TDEShortcut( "Ctrl+T" ), TQT_TQOBJECT(this), TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); + new TDEAction( i18n("Brightness/Contrast"), "contrast+", TDEShortcut( "Ctrl+T" ), this, TQ_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); if (KSUtils::openDataFile( tempFile, "histogram.png" ) ) { - new TDEAction ( i18n("Histogram"), tempFile.name(), TDEShortcut("Ctrl+H"), TQT_TQOBJECT(this), TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram"); + new TDEAction ( i18n("Histogram"), tempFile.name(), TDEShortcut("Ctrl+H"), this, TQ_SLOT (imageHistogram()), actionCollection(), "image_histogram"); tempFile.close(); } else - new TDEAction ( i18n("Histogram"), "wizard", TDEShortcut("Ctrl+H"), TQT_TQOBJECT(this), TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram"); + new TDEAction ( i18n("Histogram"), "wizard", TDEShortcut("Ctrl+H"), this, TQ_SLOT (imageHistogram()), actionCollection(), "image_histogram"); - 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()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + KStdAction::close(this, TQ_SLOT(slotClose()), actionCollection()); + KStdAction::copy(this, TQ_SLOT(fitsCOPY()), actionCollection()); + KStdAction::zoomIn(image, TQ_SLOT(fitsZoomIn()), actionCollection()); + KStdAction::zoomOut(image, TQ_SLOT(fitsZoomOut()), actionCollection()); new TDEAction( i18n( "&Default Zoom" ), "viewmagfit.png", TDEShortcut( "Ctrl+D" ), - TQT_TQOBJECT(image), TQT_SLOT(fitsZoomDefault()), actionCollection(), "zoom_default" ); - new TDEAction( i18n( "Statistics"), "sum", 0, TQT_TQOBJECT(this), TQT_SLOT(fitsStatistics()), actionCollection(), "image_stats"); - new TDEAction( i18n( "FITS Header"), "frame_spreadsheet.png", 0, TQT_TQOBJECT(this), TQT_SLOT(fitsHeader()), actionCollection(), "fits_editor"); + image, TQ_SLOT(fitsZoomDefault()), actionCollection(), "zoom_default" ); + new TDEAction( i18n( "Statistics"), "sum", 0, this, TQ_SLOT(fitsStatistics()), actionCollection(), "image_stats"); + new TDEAction( i18n( "FITS Header"), "frame_spreadsheet.png", 0, this, TQ_SLOT(fitsHeader()), actionCollection(), "fits_editor"); /* Create GUI */ createGUI("fitsviewer.rc"); @@ -557,7 +557,7 @@ void FITSViewer::fileSave() if (TQFile::exists(currentURL.path())) { - int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), + int r=KMessageBox::warningContinueCancel(static_cast<TQWidget*>(parent()), i18n( "A file named \"%1\" already exists. " "Overwrite it?" ).arg(currentURL.fileName()), i18n( "Overwrite File?" ), @@ -712,7 +712,7 @@ void FITSViewer::fileSaveAs() void FITSViewer::fitsCOPY() { - kapp->clipboard()->setImage(*image->displayImage); + tdeApp->clipboard()->setImage(*image->displayImage); } void FITSViewer::updateImgBuffer() diff --git a/kstars/kstars/fitsviewer.h b/kstars/kstars/fitsviewer.h index a951d01c..5e2abd2f 100644 --- a/kstars/kstars/fitsviewer.h +++ b/kstars/kstars/fitsviewer.h @@ -46,7 +46,7 @@ class FITSImage; class FITSHistogram; class FITSViewer : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/focusdialog.cpp b/kstars/kstars/focusdialog.cpp index 997550ee..3dcfbf3a 100644 --- a/kstars/kstars/focusdialog.cpp +++ b/kstars/kstars/focusdialog.cpp @@ -42,14 +42,14 @@ FocusDialog::FocusDialog( TQWidget *parent ) setMainWidget(page); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, spacingHint() ); fdlg = new FocusDialogDlg(page); - fdlg->epochName->setValidator( new KDoubleValidator( TQT_TQOBJECT(fdlg->epochName) ) ); + fdlg->epochName->setValidator( new KDoubleValidator( fdlg->epochName ) ); vlay->addWidget( fdlg ); - connect( fdlg->raBox, TQT_SIGNAL(textChanged( const TQString & ) ), this, TQT_SLOT( checkLineEdits() ) ); - connect( fdlg->decBox, TQT_SIGNAL(textChanged( const TQString & ) ), this, TQT_SLOT( checkLineEdits() ) ); - connect( fdlg->azBox, TQT_SIGNAL(textChanged( const TQString & ) ), this, TQT_SLOT( checkLineEdits() ) ); - connect( fdlg->altBox, TQT_SIGNAL(textChanged( const TQString & ) ), this, TQT_SLOT( checkLineEdits() ) ); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( validatePoint() ) ); + connect( fdlg->raBox, TQ_SIGNAL(textChanged( const TQString & ) ), this, TQ_SLOT( checkLineEdits() ) ); + connect( fdlg->decBox, TQ_SIGNAL(textChanged( const TQString & ) ), this, TQ_SLOT( checkLineEdits() ) ); + connect( fdlg->azBox, TQ_SIGNAL(textChanged( const TQString & ) ), this, TQ_SLOT( checkLineEdits() ) ); + connect( fdlg->altBox, TQ_SIGNAL(textChanged( const TQString & ) ), this, TQ_SLOT( checkLineEdits() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( validatePoint() ) ); fdlg->raBox->setDegType(false); //RA box should be HMS-style fdlg->raBox->setFocus(); //set input focus diff --git a/kstars/kstars/focusdialog.h b/kstars/kstars/focusdialog.h index c2d03de0..e02ecb0a 100644 --- a/kstars/kstars/focusdialog.h +++ b/kstars/kstars/focusdialog.h @@ -34,7 +34,7 @@ class FocusDialogDlg; */ class FocusDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /**Constructor. */ diff --git a/kstars/kstars/focusdialogdlg.ui b/kstars/kstars/focusdialogdlg.ui index 38fe97a7..d661282a 100644 --- a/kstars/kstars/focusdialogdlg.ui +++ b/kstars/kstars/focusdialogdlg.ui @@ -201,9 +201,9 @@ <data format="XPM.GZ" length="4350">789c6dd7594f23471007f0f7fd14d6d6db2aaaf58c3db647511eb831b7317794879ac30760cc61c010e5bba7dcf5af5688167664fdb66bbaababbb67cccf1f8dab93c3c68f9fdf5e16b298968d7222cf8d1fd5eb6cf6f1e75f7ffcfded7b9a3656ff9aad46fafdb76fdf078b46d9389a3fd42bf04841699e964933b830b79a7019dd0b96955b895b5a703bcd572e08eea576ff6570ae0eedd477b792103f854b8b2fc6d1163f77237e646e37113f89b6f8307e3bf1785a8b0eedbc696eb7ad9db7e01ee6476ee4ffe0c6fd158c7c69182cde4eec6e87fea50dfbf8176e6ba7d07f96669999cfa325ccaf862bcc97a36dbccf60f178cee11cde706761f16917ae30fe6b7488a7851bf14d7327417f676eb4f756eea41e2f57e6d83e83919f6cba117f04235fd9765b3b0fa36dfc398cf973edc67a6fb951ffe768ab6765ee26b8dff213ef5f4630e2b9e7463ea7ee8ee5ff60ee2618af8eb6fe3238437eb91bf1299cdbfacad3cadd5617f5a11738c7fe4adcb8ffd68d7aeec15e8fc3683b9f62ee2518ef33dafa3f75e3bc957086f86eb4d56f3db8e8e6dd56f01a5cc1bbe65e629673d8ebd18d0efdc9058cf9f2c08df9e630ce037db8719ec37c7a9a7fb708f10267b65e7cef46fb3e9ca3fd23dad6ef0cf67abe99f304f95ec3a8871cbb71be52d8d777e8b6fee412f6f958be3adf5ea817b561afe7d86ded7c67ce13c46fc37ede2766c17a17059cd9f38e466e8c3f8eb6fd700f0b9ef7095c37cd3d37de178f2be76dcf876fa343bd790267f012f67a77cc319f69b4ed872e2ca8e732daeabfe3c6fa9cc235f21f9b8bd4f2a5cd687bfedbfd659ee7ede017b842becf6eb44fa3cbd0df8559b0ffe808ceb0ff37e01afba3652e52cc87a26dbe276ecca7097790ff73b4cdef0616ac4fdf6df1c2d1d67ee8c6f80318eb4bd1180ff529513f0ecf7b694b62f5a002ceccb2662e523c2fb7605f9f0fd8fbbf75e3bc2dcd3e9ebcb9f17ce8c05e8f83685bcf701e44eb2db65e4fd1b65eebe62245be53b8c6f3ffdd8dfd3933fbf884761f5f0edcd88f951bf118bf44bde926dae24fe01ae7af76e3f9169e2f45bb143c0f5fdcf6fea23b18f773eac6f3e63ddac6db75e37df5e8c6fbae65aebcde6d37beaf84f528aa52f03c9dc3359ea79939c627d136deab1befaf75b883ef23e76e3ccfaea36d7dc2f795322b05ebfb0ad738af7db7ad371f99fd7e59b8b13f276e9cdf1318f5e54337e6d78cb67cf761ec170efba1acaa1afd9db92d3f3a36d729ea77efc6f33cbccf2beddfe6478fe6d85e45dbfd851bf1577007f5d877e3bc86f5a9ea3a2d6cffdfc1debe116df5db73a39e37b0e777191dda257c7fa83b6e8a2eaae00eeceb13d6b7d69f325b79b058fd32b170c1a55ebffaac2ccae2b9e6118f79c253bd6ef9ee3fd7587fef79c60f7acf3cc617fcc84ffcac6d8ffcc20b7ee5377ee7257ff027aff1bac66ff0269716cf5b1ab7cd3bbcabb17ddee37d3ee0433ee2633ee1019ff290cff89c2ff89229c48b66f1ac3d5df135df7093134eb9c56dcef4b3c35dee71ce393111dbfa8c784a4205955451cd1d1ad1982634a55bbad3f80eddd38c1ef882e66cf52ab5ff2b8d7ea4277aa6175ad06bb866f446efb4d4df0ffad4fed762ffb7b44e1b9cd2266dd142c75e5ddb3cd0bb3e347a477bd9d5f83ee245e3f7689f0ee830f67d44c77412ee186946033aa5e197fecfe85c7bf7be2fe892aee89a6ea84989f6bfa434f4eff9df52c509b5d0779b32ea684d13ea528f728d1e882ebfce37f6cf077422b4ea5b440ad14af1a15452ab473aee52c65ff39789b64fe955f44eb9937b5d858c5b32d377c0c32a7fee7ecd5fe61aff284ff22c2fb290577993775db1443fb53ef2219f5ff2bf93356d5b970dd9d41eb77820dbb223bbab155ed55ffab2f725ffb1eccb81aed6931cca116ab490633909d10339fd5ffdef795d869ae7923bc27226e772415d5986b51d683663b9d4fcfbb1ff190fe54aaec35aeaa577ee20f24673e94b531249a585fc2b69ebfe3ed7dae91f75ba964b5c03e9d344ba1add93bce0826c3f87f3b2a9fb6f18aeba10ba2f563f25eb1b563771a5d17531e2513c5fba538b3111cd690dd73c7ef6a95f4c8aa99de12fe77da4951de9ffffea730be7fd9fdfbffd0b690edc6c</data> </image> </images> -<Q_SLOTS> +<slots> <slot>checkLineEdits()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">dmsbox.h</include> diff --git a/kstars/kstars/fov.cpp b/kstars/kstars/fov.cpp index af40388c..1b34f910 100644 --- a/kstars/kstars/fov.cpp +++ b/kstars/kstars/fov.cpp @@ -19,7 +19,7 @@ #include <tqfile.h> #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "fov.h" diff --git a/kstars/kstars/fovdialog.cpp b/kstars/kstars/fovdialog.cpp index 2e1722e9..07f249e6 100644 --- a/kstars/kstars/fovdialog.cpp +++ b/kstars/kstars/fovdialog.cpp @@ -29,7 +29,7 @@ #include <knuminput.h> #include <klineedit.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "fovdialog.h" #include "kstars.h" @@ -42,17 +42,17 @@ FOVDialog::FOVDialog( TQWidget *parent ) : KDialogBase( KDialogBase::Plain, i18n( "Set FOV Indicator" ), Ok|Cancel, Ok, parent ) { - ks = (KStars*)TQT_TQWIDGET(parent); + ks = (KStars*)parent; TQFrame *page = plainPage(); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 ); fov = new FOVDialogUI( page ); vlay->addWidget( fov ); - connect( fov->FOVListBox, TQT_SIGNAL( currentChanged( TQListBoxItem* ) ), TQT_SLOT( slotSelect( TQListBoxItem* ) ) ); - connect( fov->NewButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotNewFOV() ) ); - connect( fov->EditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditFOV() ) ); - connect( fov->RemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemoveFOV() ) ); + connect( fov->FOVListBox, TQ_SIGNAL( currentChanged( TQListBoxItem* ) ), TQ_SLOT( slotSelect( TQListBoxItem* ) ) ); + connect( fov->NewButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotNewFOV() ) ); + connect( fov->EditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditFOV() ) ); + connect( fov->RemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemoveFOV() ) ); FOVList.setAutoDelete( true ); initList(); @@ -199,13 +199,13 @@ NewFOV::NewFOV( TQWidget *parent ) ui = new NewFOVUI( page ); vlay->addWidget( ui ); - connect( ui->FOVName, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotUpdateFOV() ) ); - connect( ui->FOVEdit, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotUpdateFOV() ) ); - connect( ui->ColorButton, TQT_SIGNAL( changed( const TQColor & ) ), TQT_SLOT( slotUpdateFOV() ) ); - connect( ui->ShapeBox, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotUpdateFOV() ) ); - connect( ui->ComputeEyeFOV, TQT_SIGNAL( clicked() ), TQT_SLOT( slotComputeFOV() ) ); - connect( ui->ComputeCameraFOV, TQT_SIGNAL( clicked() ), TQT_SLOT( slotComputeFOV() ) ); - connect( ui->ComputeHPBW, TQT_SIGNAL( clicked() ), TQT_SLOT( slotComputeFOV() ) ); + connect( ui->FOVName, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotUpdateFOV() ) ); + connect( ui->FOVEdit, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotUpdateFOV() ) ); + connect( ui->ColorButton, TQ_SIGNAL( changed( const TQColor & ) ), TQ_SLOT( slotUpdateFOV() ) ); + connect( ui->ShapeBox, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotUpdateFOV() ) ); + connect( ui->ComputeEyeFOV, TQ_SIGNAL( clicked() ), TQ_SLOT( slotComputeFOV() ) ); + connect( ui->ComputeCameraFOV, TQ_SIGNAL( clicked() ), TQ_SLOT( slotComputeFOV() ) ); + connect( ui->ComputeHPBW, TQ_SIGNAL( clicked() ), TQ_SLOT( slotComputeFOV() ) ); slotUpdateFOV(); } @@ -237,15 +237,15 @@ void NewFOV::paintEvent( TQPaintEvent * ) { void NewFOV::slotComputeFOV() { //DEBUG - kdDebug() << ":" << TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() << ":" << endl; - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "ComputeEyeFOV" ) ) kdDebug() << "A" << endl; - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "ComputeEyeFOV" ) && ui->TLength1->value() > 0.0 ) kdDebug() << "B" << endl; + 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; - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "ComputeEyeFOV" ) && ui->TLength1->value() > 0.0 ) + if ( sender()->name() == TQString( "ComputeEyeFOV" ) && ui->TLength1->value() > 0.0 ) ui->FOVEdit->setText( TDEGlobal::locale()->formatNumber( ui->EyeFOV->value() * ui->EyeLength->value() / ui->TLength1->value() ) ); - else if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "ComputeCameraFOV" ) && ui->TLength2->value() > 0.0 ) + else if ( sender()->name() == TQString( "ComputeCameraFOV" ) && ui->TLength2->value() > 0.0 ) ui->FOVEdit->setText( TDEGlobal::locale()->formatNumber( ui->ChipSize->value() * 3438.0 / ui->TLength2->value() ) ); - else if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "ComputeHPBW" ) && ui->RTDiameter->value() > 0.0 && ui->WaveLength->value() > 0.0 ) { + else if ( sender()->name() == TQString( "ComputeHPBW" ) && ui->RTDiameter->value() > 0.0 && ui->WaveLength->value() > 0.0 ) { ui->FOVEdit->setText( TDEGlobal::locale()->formatNumber( 34.34 * 1.2 * ui->WaveLength->value() / ui->RTDiameter->value() ) ); // Beam width for an antenna is usually a circle on the sky. ui->ShapeBox->setCurrentItem(4); diff --git a/kstars/kstars/fovdialog.h b/kstars/kstars/fovdialog.h index ce25d7e7..62ad30c3 100644 --- a/kstars/kstars/fovdialog.h +++ b/kstars/kstars/fovdialog.h @@ -33,7 +33,7 @@ class NewFOVUI; class FOVDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: FOVDialog( TQWidget *parent=0 ); @@ -63,7 +63,7 @@ private: */ class NewFOV : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: NewFOV( TQWidget *parent=0 ); diff --git a/kstars/kstars/imagereductiondlg.cpp b/kstars/kstars/imagereductiondlg.cpp index f5776c8c..08e28f39 100644 --- a/kstars/kstars/imagereductiondlg.cpp +++ b/kstars/kstars/imagereductiondlg.cpp @@ -26,15 +26,15 @@ ImageReductionDlg::ImageReductionDlg(TQWidget * parent, const char * name) : imageReductionUI(parent, name) { - connect(darkAddB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addDarkFile())); - connect(flatAddB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addFlatFile())); - connect(darkRemoveB, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeDarkFile())); - connect(flatRemoveB, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeFlatFile())); - connect(darkDetailsB, TQT_SIGNAL(clicked()), this, TQT_SLOT(detailsDarkFile())); - connect(flatDetailsB, TQT_SIGNAL(clicked()), this, TQT_SLOT(detailsFlatFile())); - connect(darkflatAddB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addDarkFlatFile())); - connect(darkflatRemoveB, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeDarkFlatFile())); - connect(darkflatDetailsB, TQT_SIGNAL(clicked()), this, TQT_SLOT(detailsDarkFlatFile())); + connect(darkAddB, TQ_SIGNAL(clicked()), this, TQ_SLOT(addDarkFile())); + connect(flatAddB, TQ_SIGNAL(clicked()), this, TQ_SLOT(addFlatFile())); + connect(darkRemoveB, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeDarkFile())); + connect(flatRemoveB, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeFlatFile())); + connect(darkDetailsB, TQ_SIGNAL(clicked()), this, TQ_SLOT(detailsDarkFile())); + connect(flatDetailsB, TQ_SIGNAL(clicked()), this, TQ_SLOT(detailsFlatFile())); + connect(darkflatAddB, TQ_SIGNAL(clicked()), this, TQ_SLOT(addDarkFlatFile())); + connect(darkflatRemoveB, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeDarkFlatFile())); + connect(darkflatDetailsB, TQ_SIGNAL(clicked()), this, TQ_SLOT(detailsDarkFlatFile())); darkListView->setSorting(-1); flatListView->setSorting(-1); diff --git a/kstars/kstars/imagereductiondlg.h b/kstars/kstars/imagereductiondlg.h index 8461d90f..1a5594bc 100644 --- a/kstars/kstars/imagereductiondlg.h +++ b/kstars/kstars/imagereductiondlg.h @@ -22,7 +22,7 @@ class ImageReductionDlg : public imageReductionUI { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/imagereductionui.ui b/kstars/kstars/imagereductionui.ui index 7a2f75a2..87cb0e86 100644 --- a/kstars/kstars/imagereductionui.ui +++ b/kstars/kstars/imagereductionui.ui @@ -565,9 +565,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -582,9 +579,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/kstars/kstars/imagesequence.cpp b/kstars/kstars/imagesequence.cpp index a05b65ad..6e98b10f 100644 --- a/kstars/kstars/imagesequence.cpp +++ b/kstars/kstars/imagesequence.cpp @@ -46,8 +46,8 @@ imagesequence::imagesequence(TQWidget* parent, const char* name, bool modal, WFl if (devMenu) { - connect (devMenu, TQT_SIGNAL(newDevice()), this, TQT_SLOT(newCCD())); - connect (devMenu, TQT_SIGNAL(newDevice()), this, TQT_SLOT(newFilter())); + connect (devMenu, TQ_SIGNAL(newDevice()), this, TQ_SLOT(newCCD())); + connect (devMenu, TQ_SIGNAL(newDevice()), this, TQ_SLOT(newFilter())); } seqTimer = new TQTimer(this); @@ -55,12 +55,12 @@ imagesequence::imagesequence(TQWidget* parent, const char* name, bool modal, WFl setModal(false); // Connect signals and slots - connect(startB, TQT_SIGNAL(clicked()), this, TQT_SLOT(startSequence())); - connect(stopB, TQT_SIGNAL(clicked()), this, TQT_SLOT(stopSequence())); - connect(closeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(close())); - connect(seqTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(prepareCapture())); - connect(CCDCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(checkCCD(int))); - connect(filterCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateFilterCombo(int))); + connect(startB, TQ_SIGNAL(clicked()), this, TQ_SLOT(startSequence())); + connect(stopB, TQ_SIGNAL(clicked()), this, TQ_SLOT(stopSequence())); + connect(closeB, TQ_SIGNAL(clicked()), this, TQ_SLOT(close())); + connect(seqTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(prepareCapture())); + connect(CCDCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(checkCCD(int))); + connect(filterCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateFilterCombo(int))); active = false; ISOStamp = false; @@ -253,7 +253,7 @@ void imagesequence::startSequence() currentImgCountOUT->setText(TQString("%1").arg(seqCurrentCount)); // Ok, now let's connect signals and slots for this device - connect(stdDevCCD, TQT_SIGNAL(FITSReceived(TQString)), this, TQT_SLOT(newFITS(TQString))); + connect(stdDevCCD, TQ_SIGNAL(FITSReceived(TQString)), this, TQ_SLOT(newFITS(TQString))); // set the progress info imgProgress->setEnabled(true); @@ -294,7 +294,7 @@ void imagesequence::stopSequence() stdDevCCD->batchMode = false; stdDevCCD->ISOMode = false; - stdDevCCD->disconnect( TQT_SIGNAL(FITSReceived(TQString))); + stdDevCCD->disconnect( TQ_SIGNAL(FITSReceived(TQString))); } } @@ -358,7 +358,7 @@ void imagesequence::newFITS(TQString deviceLabel) seqTimer->stop(); if (stdDevCCD) - stdDevCCD->disconnect( TQT_SIGNAL(FITSReceived(TQString))); + stdDevCCD->disconnect( TQ_SIGNAL(FITSReceived(TQString))); resetButtons(); } @@ -469,7 +469,7 @@ bool imagesequence::verifyFilterIntegrity() return false; } - // #3 Make sure it has FILTER_SLOT std property by searching for its TQT_SLOT element + // #3 Make sure it has FILTER_SLOT std property by searching for its SLOT element filterElem = filterDevice->findElem("SLOT"); if (filterElem == NULL) { @@ -507,7 +507,7 @@ void imagesequence::prepareCapture() if ( stdDevFilter && ((tempProp = stdDevFilter->dp->findProp("FILTER_SLOT")) != NULL)) { - connect (tempProp, TQT_SIGNAL(okState()), this, TQT_SLOT(captureImage())); + connect (tempProp, TQ_SIGNAL(okState()), this, TQ_SLOT(captureImage())); selectFilter(); } else @@ -531,7 +531,7 @@ void imagesequence::captureImage() // D. The property has been lost. if ( stdDevFilter && ((tempProp = stdDevFilter->dp->findProp("FILTER_SLOT")) != NULL)) - tempProp->disconnect( TQT_SIGNAL (okState())); + tempProp->disconnect( TQ_SIGNAL (okState())); if (!verifyCCDIntegrity()) { diff --git a/kstars/kstars/imagesequence.h b/kstars/kstars/imagesequence.h index 2622bbfb..dc4e1231 100644 --- a/kstars/kstars/imagesequence.h +++ b/kstars/kstars/imagesequence.h @@ -20,11 +20,11 @@ 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* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~imagesequence(); diff --git a/kstars/kstars/imageviewer.cpp b/kstars/kstars/imageviewer.cpp index 7e31d3cc..480104d9 100644 --- a/kstars/kstars/imageviewer.cpp +++ b/kstars/kstars/imageviewer.cpp @@ -37,9 +37,9 @@ ImageViewer::ImageViewer (const KURL *url, const TQString &capText, TQWidget *pa // JH: easier to just disable its mobility toolBar()->setMovingEnabled( false ); - TDEAction *action = new TDEAction (i18n ("Close Window"), "window-close", CTRL+Key_Q, TQT_TQOBJECT(this), TQT_SLOT (close()), actionCollection()); + TDEAction *action = new TDEAction (i18n ("Close Window"), "window-close", CTRL+Key_Q, this, TQ_SLOT (close()), actionCollection()); action->plug (toolBar()); - action = new TDEAction (i18n ("Save Image"), "document-save", CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT (saveFileToDisc()), actionCollection()); + action = new TDEAction (i18n ("Save Image"), "document-save", CTRL+Key_S, this, TQ_SLOT (saveFileToDisc()), actionCollection()); action->plug (toolBar()); statusBar()->insertItem( capText, 0, 1, true ); @@ -132,7 +132,7 @@ void ImageViewer::loadImageFromURL() kdDebug()<<"tempfile-URL is malformed\n"; downloadJob = TDEIO::copy (imageURL, saveURL); // starts the download asynchron - connect (downloadJob, TQT_SIGNAL (result (TDEIO::Job *)), TQT_SLOT (downloadReady (TDEIO::Job *))); + connect (downloadJob, TQ_SIGNAL (result (TDEIO::Job *)), TQ_SLOT (downloadReady (TDEIO::Job *))); } void ImageViewer::downloadReady (TDEIO::Job *job) @@ -173,7 +173,7 @@ void ImageViewer::showImage() image.smoothScale ( statusBar()->width() , image.height() * statusBar()->width() / image.width() ); } - TQRect deskRect = kapp->desktop()->availableGeometry(); + TQRect deskRect = tdeApp->desktop()->availableGeometry(); int w = deskRect.width(); // screen width int h = deskRect.height(); // screen height int h2 = image.height() + toolBar()->height() + statusBar()->height(); //height required for ImageViewer @@ -208,7 +208,7 @@ void ImageViewer::saveFileToDisc() TQFile f (newURL.directory() + "/" + newURL.fileName()); if (f.exists()) { - int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), + int r=KMessageBox::warningContinueCancel(static_cast<TQWidget*>(parent()), i18n( "A file named \"%1\" already exists. " "Overwrite it?" ).arg(newURL.fileName()), i18n( "Overwrite File?" ), diff --git a/kstars/kstars/imageviewer.h b/kstars/kstars/imageviewer.h index 36aacb42..e7071f1f 100644 --- a/kstars/kstars/imageviewer.h +++ b/kstars/kstars/imageviewer.h @@ -46,7 +46,7 @@ class KURL; class TQFile; class ImageViewer : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/indi/Makefile.am b/kstars/kstars/indi/Makefile.am index 303dffad..fc78522a 100644 --- a/kstars/kstars/indi/Makefile.am +++ b/kstars/kstars/indi/Makefile.am @@ -20,59 +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) $(QT_LDFLAGS) +indiserver_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) 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) $(QT_LDFLAGS) +lx200generic_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) lx200basic_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c lx200basic.cpp lx200basic_LDADD = liblilxml.a libindicom.a -lx200basic_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +lx200basic_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) celestrongps_SOURCES = indidrivermain.c base64.c eventloop.c celestronprotocol.c celestrongps.cpp celestrongps_LDADD = liblilxml.a libindicom.a -lm -celestrongps_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +celestrongps_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) apmount_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c apmount.cpp apmount_LDADD = liblilxml.a libindicom.a -apmount_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +apmount_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) 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) $(QT_LDFLAGS) +fliccd_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) 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) $(QT_LDFLAGS) +fliwheel_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) 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) $(QT_LDFLAGS) +v4ldriver_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) 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) $(QT_LDFLAGS) +v4lphilips_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) 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) $(QT_LDFLAGS) +meade_lpi_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) temma_SOURCES = indidrivermain.c base64.c eventloop.c temmadriver.c temma_LDADD = liblilxml.a libindicom.a -lm -temma_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +temma_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) skycommander_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c skycommander.c skycommander_LDADD = liblilxml.a libindicom.a -lm -skycommander_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +skycommander_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) 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) $(QT_LDFLAGS) +apogee_ppi_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) sbigccd_SOURCES = sbigccd.cpp base64.c eventloop.c indidrivermain.c sbigccd_LDADD = libindicom.a liblilxml.a -lz -sbigccd_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +sbigccd_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(bindir) diff --git a/kstars/kstars/indi/apogee/ApogeeLinux.h b/kstars/kstars/indi/apogee/ApogeeLinux.h index d17e7bde..dd181027 100644 --- a/kstars/kstars/indi/apogee/ApogeeLinux.h +++ b/kstars/kstars/indi/apogee/ApogeeLinux.h @@ -10,6 +10,10 @@ #ifndef APOGEELINUX_H #define APOGEELINUX_H +#ifdef Q_OS_SOLARIS +#include <sys/ioccom.h> +#endif /* solaris */ + #define APISA_READ_USHORT _IOR('a', 0x01, unsigned int) #define APISA_READ_LINE _IOR('a', 0x02, unsigned int) #define APISA_WRITE_USHORT _IOW('a', 0x03, unsigned int) diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp index 67d217ec..e508789d 100644 --- a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp @@ -14,7 +14,6 @@ #include <unistd.h> #include <fcntl.h> #define HANDLE int -#define FALSE 0 #define DWORD long #define _ASSERT assert #define REALTIME_PRIORITY_CLASS 1 @@ -203,7 +202,7 @@ void CCameraIO::RegWrite( short reg, unsigned short val ) m_RegShadow[ Reg_BICCounter ] = val; break; default: - _ASSERT( FALSE ); // application program bug + _ASSERT( false ); // application program bug } } diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp index 16a6bb72..41fd4fe5 100644 --- a/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp @@ -13,7 +13,6 @@ #include <fcntl.h> #include <stdio.h> #define HANDLE int -#define FALSE 0 #define DWORD long #define _ASSERT assert #define REALTIME_PRIORITY_CLASS 1 diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp index a83a594e..80d66fdc 100644 --- a/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp @@ -13,7 +13,6 @@ #include <fcntl.h> #include <stdio.h> #define HANDLE int -#define FALSE 0 #define DWORD long #define _ASSERT assert #define REALTIME_PRIORITY_CLASS 1 diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp index 7025d9ce..b9613498 100644 --- a/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp @@ -13,7 +13,6 @@ #include <fcntl.h> #include <stdio.h> #define HANDLE int -#define FALSE 0 #define DWORD long #define _ASSERT assert #define REALTIME_PRIORITY_CLASS 1 diff --git a/kstars/kstars/indi/apogee/CameraIO_PCI.cpp b/kstars/kstars/indi/apogee/CameraIO_PCI.cpp index 3e6cc43e..65ab972d 100644 --- a/kstars/kstars/indi/apogee/CameraIO_PCI.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_PCI.cpp @@ -72,7 +72,7 @@ long CCameraIO_PCI::Read(unsigned short reg, unsigned short& val) RegNumber = RegPCI_CommandReadback; break; default: - _ASSERT( FALSE ); // Application program bug + _ASSERT( false ); // Application program bug val = 0; return 0; } @@ -348,7 +348,7 @@ bool CCameraIO_PCI::InitDriver() return false; } - BOOL IoctlResult = DeviceIoControl( + BOOLEAN IoctlResult = DeviceIoControl( m_hDriver, // Handle to device IOCTL_PCI_BUS_SCAN, // IO Control code for PCI Bus Scan NULL, // Buffer to driver. diff --git a/kstars/kstars/indi/fli/libfli-usb-sys-bsd.c b/kstars/kstars/indi/fli/libfli-usb-sys-bsd.c index caccf859..cf9ff447 100644 --- a/kstars/kstars/indi/fli/libfli-usb-sys-bsd.c +++ b/kstars/kstars/indi/fli/libfli-usb-sys-bsd.c @@ -93,7 +93,7 @@ long unix_usbverifydescriptor(flidev_t dev, fli_unixio_t *io) break; } - DEVICE->devinfo.fwrev = usb_desc.bcdDevice; + DEVICE->devinfo.fwrev = (long)usb_desc.bcdDevice; } return 0; diff --git a/kstars/kstars/indidevice.cpp b/kstars/kstars/indidevice.cpp index 23914204..1fb309f4 100644 --- a/kstars/kstars/indidevice.cpp +++ b/kstars/kstars/indidevice.cpp @@ -404,15 +404,15 @@ int INDI_D::setLabelState (INDI_P *pp, XMLEle *root, char errmsg[]) if (islight) break; - lp->push_w->setDown(state == PS_ON ? true : false); + lp->push_w->setDown(state == PS_ON); buttonFont = lp->push_w->font(); - buttonFont.setBold(state == PS_ON ? TRUE : FALSE); + buttonFont.setBold(state == PS_ON); lp->push_w->setFont(buttonFont); break; case PG_RADIO: - lp->check_w->setChecked(state == PS_ON ? true : false); + lp->check_w->setChecked(state == PS_ON); break; case PG_MENU: if (state == PS_ON) diff --git a/kstars/kstars/indidevice.h b/kstars/kstars/indidevice.h index 366e7b3a..13013845 100644 --- a/kstars/kstars/indidevice.h +++ b/kstars/kstars/indidevice.h @@ -69,7 +69,7 @@ class TQVBox; /* INDI device */ class INDI_D : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: INDI_D(INDIMenu *parentMenu, DeviceManager *parentManager, TQString inName, TQString inLabel); diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp index ae5997f1..1241a322 100644 --- a/kstars/kstars/indidriver.cpp +++ b/kstars/kstars/indidriver.cpp @@ -34,11 +34,11 @@ #include <kiconloader.h> #include <tdelistview.h> #include <tdepopupmenu.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdemessagebox.h> #include <kpushbutton.h> #include <klineedit.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeaction.h> #include <kextsock.h> @@ -46,7 +46,7 @@ /* * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. + * true to construct a modal dialog. */ INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent ) @@ -96,28 +96,28 @@ INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent ) lastGroup = NULL; - TQObject::connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addINDIHost())); - TQObject::connect(modifyB, TQT_SIGNAL(clicked()), this, TQT_SLOT(modifyINDIHost())); - TQObject::connect(removeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeINDIHost())); + TQObject::connect(addB, TQ_SIGNAL(clicked()), this, TQ_SLOT(addINDIHost())); + TQObject::connect(modifyB, TQ_SIGNAL(clicked()), this, TQ_SLOT(modifyINDIHost())); + TQObject::connect(removeB, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeINDIHost())); - TQObject::connect(clientListView, TQT_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(ClientprocessRightButton( TQListViewItem *, const TQPoint &, int ))); + TQObject::connect(clientListView, TQ_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQ_SLOT(ClientprocessRightButton( TQListViewItem *, const TQPoint &, int ))); -TQObject::connect(ClientpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processHostStatus(int))); +TQObject::connect(ClientpopMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(processHostStatus(int))); -TQObject::connect(localListView, TQT_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(LocalprocessRightButton( TQListViewItem *, const TQPoint &, int ))); +TQObject::connect(localListView, TQ_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQ_SLOT(LocalprocessRightButton( TQListViewItem *, const TQPoint &, int ))); -TQObject::connect(LocalpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processDeviceStatus(int))); +TQObject::connect(LocalpopMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(processDeviceStatus(int))); -TQObject::connect(ksw->getINDIMenu(), TQT_SIGNAL(driverDisconnected(int)), this, TQT_SLOT(shutdownHost(int))); +TQObject::connect(ksw->getINDIMenu(), TQ_SIGNAL(driverDisconnected(int)), this, TQ_SLOT(shutdownHost(int))); -TQObject::connect(connectHostB, TQT_SIGNAL(clicked()), this, TQT_SLOT(activateHostConnection())); -TQObject::connect(disconnectHostB, TQT_SIGNAL(clicked()), this, TQT_SLOT(activateHostDisconnection())); +TQObject::connect(connectHostB, TQ_SIGNAL(clicked()), this, TQ_SLOT(activateHostConnection())); +TQObject::connect(disconnectHostB, TQ_SIGNAL(clicked()), this, TQ_SLOT(activateHostDisconnection())); -TQObject::connect(runServiceB, TQT_SIGNAL(clicked()), this, TQT_SLOT(activateRunService())); -TQObject::connect(stopServiceB, TQT_SIGNAL(clicked()), this, TQT_SLOT(activateStopService())); +TQObject::connect(runServiceB, TQ_SIGNAL(clicked()), this, TQ_SLOT(activateRunService())); +TQObject::connect(stopServiceB, TQ_SIGNAL(clicked()), this, TQ_SLOT(activateStopService())); -TQObject::connect(localListView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateLocalButtons())); -TQObject::connect(clientListView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateClientButtons())); +TQObject::connect(localListView, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(updateLocalButtons())); +TQObject::connect(clientListView, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(updateClientButtons())); readXMLDriver(); resize( 500, 300); @@ -415,7 +415,7 @@ bool INDIDriver::runDevice(IDevice *dev) else localListView->selectedItem()->setPixmap(2, serverMode); - connect(dev->proc, TQT_SIGNAL(receivedStderr (TDEProcess *, char *, int)), dev, TQT_SLOT(processstd(TDEProcess *, char*, int))); + connect(dev->proc, TQ_SIGNAL(receivedStderr (TDEProcess *, char *, int)), dev, TQ_SLOT(processstd(TDEProcess *, char*, int))); dev->proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr); //dev->proc->start(); @@ -724,7 +724,7 @@ bool INDIDriver::buildDriverElement(XMLEle *root, TQListViewItem *DGroup, int gr dv = new IDevice(label, driver, version); dv->deviceType = groupType; - connect(dv, TQT_SIGNAL(newServerInput()), this, TQT_SLOT(updateLocalButtons())); + connect(dv, TQ_SIGNAL(newServerInput()), this, TQ_SLOT(updateLocalButtons())); if (focal_length > 0) dv->focal_length = focal_length; if (aperture > 0) @@ -732,7 +732,7 @@ bool INDIDriver::buildDriverElement(XMLEle *root, TQListViewItem *DGroup, int gr devices.push_back(dv); - // SLOTS/SIGNAL, pop menu, indi server logic + // SLOTS/TQ_SIGNAL, pop menu, indi server logic return true; } diff --git a/kstars/kstars/indidriver.h b/kstars/kstars/indidriver.h index 617d89de..fe7eaf18 100644 --- a/kstars/kstars/indidriver.h +++ b/kstars/kstars/indidriver.h @@ -42,7 +42,7 @@ struct INDIHostsInfo class IDevice : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -79,7 +79,7 @@ class IDevice : public TQObject class INDIDriver : public devManager { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/indielement.cpp b/kstars/kstars/indielement.cpp index 4308de45..4e2a7759 100644 --- a/kstars/kstars/indielement.cpp +++ b/kstars/kstars/indielement.cpp @@ -287,10 +287,10 @@ void INDI_E::setupElementScale(int length) int steps = (int) ((max - min) / step); spin_w = new KDoubleSpinBox(min, max, step, value, 2, pp->pg->propertyContainer ); -slider_w = new TQSlider(0, steps, 1, (int) ((value - min) / step), Qt::Horizontal, pp->pg->propertyContainer ); +slider_w = new TQSlider(0, steps, 1, (int) ((value - min) / step), TQt::Horizontal, pp->pg->propertyContainer ); -connect(spin_w, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(spinChanged(double ))); -connect(slider_w, TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(sliderChanged(int ))); +connect(spin_w, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(spinChanged(double ))); +connect(slider_w, TQ_SIGNAL(sliderMoved(int)), this, TQ_SLOT(sliderChanged(int ))); //kdDebug() << "For element " << label << " we have step of " << step << endl; @@ -363,7 +363,7 @@ void INDI_E::setupElementWrite(int length) write_w->setMinimumWidth( length ); write_w->setMaximumWidth( length); - TQObject::connect(write_w, TQT_SIGNAL(returnPressed()), pp, TQT_SLOT(newText())); + TQObject::connect(write_w, TQ_SIGNAL(returnPressed()), pp, TQ_SLOT(newText())); EHBox->addWidget(write_w); } @@ -373,12 +373,12 @@ void INDI_E::setupElementRead(int length) read_w = new KLineEdit( pp->pg->propertyContainer ); read_w->setMinimumWidth( length ); - read_w->setFocusPolicy( TQ_NoFocus ); + read_w->setFocusPolicy( TQWidget::NoFocus ); read_w->setFrameShape( KLineEdit::GroupBoxPanel ); read_w->setFrameShadow( KLineEdit::Plain ); read_w->setCursorPosition( 0 ); read_w->setAlignment( int( KLineEdit::AlignHCenter ) ); - read_w->setReadOnly( TRUE ); + read_w->setReadOnly( true ); read_w->setText(text); EHBox->addWidget(read_w); @@ -393,7 +393,7 @@ void INDI_E::setupBrowseButton() browse_w->setMaximumWidth( MAX_SET_WIDTH ); EHBox->addWidget(browse_w); - TQObject::connect(browse_w, TQT_SIGNAL(clicked()), this, TQT_SLOT(browseBlob())); + TQObject::connect(browse_w, TQ_SIGNAL(clicked()), this, TQ_SLOT(browseBlob())); } diff --git a/kstars/kstars/indielement.h b/kstars/kstars/indielement.h index c7ae6dd4..0bf7c321 100644 --- a/kstars/kstars/indielement.h +++ b/kstars/kstars/indielement.h @@ -88,7 +88,7 @@ XMLEle * findEle (XMLEle *ep , INDI_P *pp, const char *child, char errmsg /* INDI Element */ class INDI_E : public TQObject { - Q_OBJECT + TQ_OBJECT public: INDI_E(INDI_P *parentProperty, TQString inName, TQString inLabel); @@ -98,7 +98,7 @@ class INDI_E : public TQObject PState state; /* control on/off t/f etc */ INDI_P *pp; /* parent property */ - TQHBoxLayout *EHBox; /*Qt::Horizontal layout */ + TQHBoxLayout *EHBox; /* Horizontal layout */ /* GUI widgets, only malloced when needed */ KSqueezedTextLabel *label_w; // label diff --git a/kstars/kstars/indifitsconf.cpp b/kstars/kstars/indifitsconf.cpp index 83779bb1..e362d805 100644 --- a/kstars/kstars/indifitsconf.cpp +++ b/kstars/kstars/indifitsconf.cpp @@ -29,8 +29,8 @@ INDIFITSConf::INDIFITSConf(TQWidget* parent, const char* name, bool modal, WFlag TDEIconLoader *icons = TDEGlobal::iconLoader(); selectDirB->setPixmap( icons->loadIcon( "document-open", TDEIcon::Toolbar ) ); - connect(selectDirB, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveFITSDirectory())); - connect(filterCombo, TQT_SIGNAL(activated (int)), this, TQT_SLOT(comboUpdate(int))); + connect(selectDirB, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveFITSDirectory())); + connect(filterCombo, TQ_SIGNAL(activated (int)), this, TQ_SLOT(comboUpdate(int))); } diff --git a/kstars/kstars/indifitsconf.h b/kstars/kstars/indifitsconf.h index 90687f3c..09e6aa34 100644 --- a/kstars/kstars/indifitsconf.h +++ b/kstars/kstars/indifitsconf.h @@ -14,11 +14,11 @@ 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* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~INDIFITSConf(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/kstars/kstars/indigroup.h b/kstars/kstars/indigroup.h index b68a976d..097e6a10 100644 --- a/kstars/kstars/indigroup.h +++ b/kstars/kstars/indigroup.h @@ -35,7 +35,7 @@ class INDI_G INDI_D *dp; /* Parent device */ TQFrame *propertyContainer; /* Properties container */ TQVBoxLayout *propertyLayout; /* Properties layout */ - TQSpacerItem *VerticalSpacer; /*Qt::Vertical spacer */ + TQSpacerItem *VerticalSpacer; /* Vertical spacer */ TQPtrList<INDI_P> pl; /* malloced list of pointers to properties */ diff --git a/kstars/kstars/indimenu.cpp b/kstars/kstars/indimenu.cpp index 8a4df6d2..b1a59593 100644 --- a/kstars/kstars/indimenu.cpp +++ b/kstars/kstars/indimenu.cpp @@ -127,8 +127,8 @@ DeviceManager *dev; drivers->devices[i]->mgrID = mgrCounter; drivers->devices[i]->managed = true; mgr.append(dev); - connect(dev, TQT_SIGNAL(newDevice()), drivers, TQT_SLOT(updateMenuActions())); - connect(dev, TQT_SIGNAL(newDevice()), this, TQT_SLOT(discoverDevice())); + connect(dev, TQ_SIGNAL(newDevice()), drivers, TQ_SLOT(updateMenuActions())); + connect(dev, TQ_SIGNAL(newDevice()), this, TQ_SLOT(discoverDevice())); mgrCounter++; @@ -165,8 +165,8 @@ int INDIMenu::processClient(TQString hostname, TQString portnumber) mgr.append(dev); if (drivers) { - connect(dev, TQT_SIGNAL(newDevice()), drivers, TQT_SLOT(updateMenuActions())); - connect(dev, TQT_SIGNAL(newDevice()), this, TQT_SLOT(discoverDevice())); + connect(dev, TQ_SIGNAL(newDevice()), drivers, TQ_SLOT(updateMenuActions())); + connect(dev, TQ_SIGNAL(newDevice()), this, TQ_SLOT(discoverDevice())); } } else @@ -234,7 +234,7 @@ else void INDIMenu::discoverDevice() { - TQTimer::singleShot( 1000, this, TQT_SLOT(announceDevice()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(announceDevice()) ); } void INDIMenu::announceDevice() diff --git a/kstars/kstars/indimenu.h b/kstars/kstars/indimenu.h index 3ff8f4fc..45c3d552 100644 --- a/kstars/kstars/indimenu.h +++ b/kstars/kstars/indimenu.h @@ -47,7 +47,7 @@ class DeviceManager; class INDIMenu : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: INDIMenu(TQWidget * parent = 0 , const char *name = 0); diff --git a/kstars/kstars/indiproperty.cpp b/kstars/kstars/indiproperty.cpp index 85899ce3..d828ca8f 100644 --- a/kstars/kstars/indiproperty.cpp +++ b/kstars/kstars/indiproperty.cpp @@ -126,7 +126,7 @@ void INDI_P::drawLt(PState lstate) case PS_OK: light->setColor(TQt::green); emit okState(); - disconnect( this, TQT_SIGNAL(okState()), 0, 0 ); + disconnect( this, TQ_SIGNAL(okState()), 0, 0 ); break; case PS_BUSY: @@ -278,14 +278,14 @@ void INDI_P::newSwitch(int id) el.at(i)->push_w->setDown(false); buttonFont = el.at(i)->push_w->font(); - buttonFont.setBold(FALSE); + buttonFont.setBold(false); el.at(i)->push_w->setFont(buttonFont); el.at(i)->state = PS_OFF; } lp->push_w->setDown(true); buttonFont = lp->push_w->font(); - buttonFont.setBold(TRUE); + buttonFont.setBold(true); lp->push_w->setFont(buttonFont); lp->state = PS_ON; @@ -508,12 +508,12 @@ int INDI_P::buildTextGUI(XMLEle *root, char errmsg[]) if (name == "TIME") { setupSetButton("Time"); - TQObject::connect(set_w, TQT_SIGNAL(clicked()), indistd, TQT_SLOT(newTime())); + TQObject::connect(set_w, TQ_SIGNAL(clicked()), indistd, TQ_SLOT(newTime())); } else { setupSetButton("Set"); - TQObject::connect(set_w, TQT_SIGNAL(clicked()), this, TQT_SLOT(newText())); + TQObject::connect(set_w, TQ_SIGNAL(clicked()), this, TQ_SLOT(newText())); } return 0; @@ -591,7 +591,7 @@ int INDI_P::buildNumberGUI (XMLEle *root, char errmsg[]) else setupSetButton("Set"); - TQObject::connect(set_w, TQT_SIGNAL(clicked()), this, TQT_SLOT(newText())); + TQObject::connect(set_w, TQ_SIGNAL(clicked()), this, TQ_SLOT(newText())); return (0); } @@ -682,7 +682,7 @@ int INDI_P::buildMenuGUI(XMLEle *root, char errmsg[]) PHBox->addWidget(om_w); PHBox->addItem(HorSpacer); - TQObject::connect(om_w, TQT_SIGNAL(activated(int)), this, TQT_SLOT(newSwitch(int))); + TQObject::connect(om_w, TQ_SIGNAL(activated(int)), this, TQ_SLOT(newSwitch(int))); return (0); } @@ -703,7 +703,7 @@ int INDI_P::buildSwitchesGUI(XMLEle *root, char errmsg[]) if (guitype == PG_BUTTONS) groupB->setExclusive(true); - TQObject::connect(groupB, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(newSwitch(int))); + TQObject::connect(groupB, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(newSwitch(int))); for (sep = nextXMLEle (root, 1), j=-1; sep != NULL; sep = nextXMLEle (root, 0)) { @@ -754,7 +754,7 @@ int INDI_P::buildSwitchesGUI(XMLEle *root, char errmsg[]) { button->setDown(true); buttonFont = button->font(); - buttonFont.setBold(TRUE); + buttonFont.setBold(true); button->setFont(buttonFont); } @@ -900,7 +900,7 @@ int INDI_P::buildBLOBGUI(XMLEle *root, char errmsg[]) return 0; setupSetButton(i18n("Upload")); - TQObject::connect(set_w, TQT_SIGNAL(clicked()), this, TQT_SLOT(newBlob())); + TQObject::connect(set_w, TQ_SIGNAL(clicked()), this, TQ_SLOT(newBlob())); return 0; diff --git a/kstars/kstars/indiproperty.h b/kstars/kstars/indiproperty.h index c655903a..e0fb3f15 100644 --- a/kstars/kstars/indiproperty.h +++ b/kstars/kstars/indiproperty.h @@ -33,7 +33,7 @@ class TQButtonGroup; /* INDI property */ class INDI_P : public TQObject { - Q_OBJECT + TQ_OBJECT public: INDI_P(INDI_G *parentGroup, TQString inName); @@ -57,9 +57,9 @@ class INDI_P : public TQObject TQLabel *label_w; /* Label widget */ TQPushButton *set_w; /* set button */ - TQSpacerItem *HorSpacer; /*Qt::Horizontal spacer */ - TQHBoxLayout *PHBox; /*Qt::Horizontal container */ - TQVBoxLayout *PVBox; /*Qt::Vertical container */ + TQSpacerItem *HorSpacer; /* Horizontal spacer */ + TQHBoxLayout *PHBox; /* Horizontal container */ + TQVBoxLayout *PVBox; /* Vertical container */ TQButtonGroup *groupB; /* group button for radio and check boxes (Elements) */ KComboBox *om_w; /* Combo box for menu */ diff --git a/kstars/kstars/indistd.cpp b/kstars/kstars/indistd.cpp index 6bfe8ef9..cc009405 100644 --- a/kstars/kstars/indistd.cpp +++ b/kstars/kstars/indistd.cpp @@ -77,8 +77,8 @@ telescopeSkyObject = new SkyObject(0, 0, 0, 0, i18n("Telescope")); ksw->data()->appendTelescopeObject(telescopeSkyObject); - connect( devTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerDone()) ); - connect( seqLister, TQT_SIGNAL(newItems (const KFileItemList & )), this, TQT_SLOT(checkSeqBoundary(const KFileItemList &))); + connect( devTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerDone()) ); + connect( seqLister, TQ_SIGNAL(newItems (const KFileItemList & )), this, TQ_SLOT(checkSeqBoundary(const KFileItemList &))); downloadDialog = new KProgressDialog(NULL, 0, i18n("INDI"), i18n("Downloading Data...")); downloadDialog->cancel(); diff --git a/kstars/kstars/indistd.h b/kstars/kstars/indistd.h index a23178ab..3de233ba 100644 --- a/kstars/kstars/indistd.h +++ b/kstars/kstars/indistd.h @@ -32,7 +32,7 @@ /* This class implmements standard properties on the device level*/ class INDIStdDevice : public TQObject { - Q_OBJECT + TQ_OBJECT public: INDIStdDevice(INDI_D *associatedDevice, KStars * kswPtr); @@ -97,7 +97,7 @@ /* This class implmements standard properties */ class INDIStdProperty : public TQObject { - Q_OBJECT + TQ_OBJECT public: INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, INDIStdDevice *stdDevPtr); diff --git a/kstars/kstars/infobox.h b/kstars/kstars/infobox.h index f7269e49..591ed1d6 100644 --- a/kstars/kstars/infobox.h +++ b/kstars/kstars/infobox.h @@ -36,7 +36,7 @@ class TQPainter; class InfoBox : public TQObject { - Q_OBJECT + TQ_OBJECT public: /**default constructor. Creates an infobox with empty text string @@ -47,7 +47,7 @@ public: /**General constructor. Specify The text string, x,y position and size. *@param x the X-coordinate for the box *@param y the Y-coordinate for the box - *@param shade if TRUE, apply text shading as well + *@param shade if true, apply text shading as well *@param t1 The first line of text *@param t2 The second line of text *@param t3 The third line of text @@ -58,7 +58,7 @@ public: *This behaves just like the above function. It differs only in the data types *of its arguments. *@param p The (x,y) position of the box - *@param shade if TRUE, apply text shading as well + *@param shade if true, apply text shading as well *@param t1 The first line of text *@param t2 The second line of text *@param t3 The third line of text @@ -113,7 +113,7 @@ public: /**Make sure the InfoBox is inside (or outside) the TQRect r. *@return true if the function was able to obey the constraint. *@param r the Rect which the box must lie completely inside/outside of. - *@param inside if TRUE (the default), the box must lie inside the rect r. + *@param inside if true (the default), the box must lie inside the rect r. *Otherwise, the box must lie *outside* rect r. */ bool constrain( TQRect r, bool inside=true ); @@ -173,10 +173,10 @@ public: /**@return the geometry of the box*/ TQRect rect() const; - /**@return TRUE if the box is anchored to the right window edge*/ + /**@return true if the box is anchored to the right window edge*/ bool anchorRight() const { return ( AnchorFlag & AnchorRight ); } - /**@return TRUE if the box is anchored to the bottom window edge*/ + /**@return true if the box is anchored to the bottom window edge*/ bool anchorBottom() const { return ( AnchorFlag & AnchorBottom ); } /**Set the box to be anchored to the right window edge*/ diff --git a/kstars/kstars/infoboxes.h b/kstars/kstars/infoboxes.h index e8ba6d18..45410684 100644 --- a/kstars/kstars/infoboxes.h +++ b/kstars/kstars/infoboxes.h @@ -44,7 +44,7 @@ class InfoBox; class KStarsDateTime; class InfoBoxes : public TQObject { -Q_OBJECT +TQ_OBJECT public: /**Constructor. Create three infoboxes and place them in the skymap. @@ -54,13 +54,13 @@ public: *(typically the height of the SkyMap) *@param tx the x-position of the Time infobox *@param ty the y-position of the Time infobox - *@param tshade if TRUE, apply text shading to the Time infobox + *@param tshade if true, apply text shading to the Time infobox *@param gx the x-position of the Geographic infobox *@param gy the y-position of the Geographic infobox - *@param gshade if TRUE, apply text shading to the Geographic infobox + *@param gshade if true, apply text shading to the Geographic infobox *@param fx the x-position of the Focus-object infobox *@param fy the y-position of the Focus-object infobox - *@param fshade if TRUE, apply text shading to the Focus-object infobox + *@param fshade if true, apply text shading to the Focus-object infobox *@param colorText The foreground color for infoboxes *@param colorGrab The foreground color for infoboxes, while they are *"grabbed" by the user @@ -85,11 +85,11 @@ public: *@param h The height of the region in which the boxes can be drawn *(typically the height of the SkyMap) *@param tp the position of the Time infobox - *@param tshade if TRUE, apply text shading to the Time infobox + *@param tshade if true, apply text shading to the Time infobox *@param gp the position of the Geographic infobox - *@param gshade if TRUE, apply text shading to the Geographic infobox + *@param gshade if true, apply text shading to the Geographic infobox *@param fp the position of the Focus-object infobox - *@param fshade if TRUE, apply text shading to the Focus-object infobox + *@param fshade if true, apply text shading to the Focus-object infobox *@param colorText The foreground color for infoboxes *@param colorGrab The foreground color for infoboxes, while they are *"grabbed" by the user diff --git a/kstars/kstars/jupitermoons.h b/kstars/kstars/jupitermoons.h index 4555d74a..230c4d1f 100644 --- a/kstars/kstars/jupitermoons.h +++ b/kstars/kstars/jupitermoons.h @@ -69,7 +69,7 @@ public: */ SkyPoint* pos( int id ) { return &Pos[id]; } - /**@return TRUE if the Moon is nearer to Earth than Jupiter. + /**@return true if the Moon is nearer to Earth than Jupiter. *@param id which moon? 0=Io, 1=Europa, 2=Ganymede, 3=Callisto */ bool inFront( int id ) const { return InFront[id]; } diff --git a/kstars/kstars/ksfilereader.h b/kstars/kstars/ksfilereader.h index c062cdab..c3a18d1f 100644 --- a/kstars/kstars/ksfilereader.h +++ b/kstars/kstars/ksfilereader.h @@ -33,7 +33,7 @@ class TQFile; class TQString; class KSFileReader : public TQObject { - Q_OBJECT + TQ_OBJECT public: /**Constructor. Read an entire file into a TQStringList object. @@ -44,7 +44,7 @@ public: /**Destructor*/ ~KSFileReader(); - /**@return TRUE if we are not yet at the end of the file. + /**@return true if we are not yet at the end of the file. */ bool hasMoreLines(); diff --git a/kstars/kstars/ksnewstuff.cpp b/kstars/kstars/ksnewstuff.cpp index eaf455df..f0163440 100644 --- a/kstars/kstars/ksnewstuff.cpp +++ b/kstars/kstars/ksnewstuff.cpp @@ -22,7 +22,7 @@ #include <tdeaction.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdirwatch.h> #include <kprogress.h> #include <ktar.h> @@ -42,7 +42,7 @@ KSNewStuff::KSNewStuff( TQWidget *parent ) : { ks = (KStars*)parent; kdw = new KDirWatch( this ); - kdw->addDir( TDEGlobal::dirs()->saveLocation("data", kapp->instanceName(), true) ); + kdw->addDir( TDEGlobal::dirs()->saveLocation("data", tdeApp->instanceName(), true) ); } bool KSNewStuff::install( const TQString &fileName ) @@ -54,15 +54,15 @@ bool KSNewStuff::install( const TQString &fileName ) return false; const KArchiveDirectory *archiveDir = archive.directory(); - const TQString destDir = TDEGlobal::dirs()->saveLocation("data", kapp->instanceName(), true); + const TQString destDir = TDEGlobal::dirs()->saveLocation("data", tdeApp->instanceName(), true); TDEStandardDirs::makeDir( destDir ); //monitor destDir for changes; inform updateData when files are created. - connect( kdw, TQT_SIGNAL( dirty( const TQString & ) ), this, TQT_SLOT( updateData( const TQString & ) ) ); + connect( kdw, TQ_SIGNAL( dirty( const TQString & ) ), this, TQ_SLOT( updateData( const TQString & ) ) ); archiveDir->copyTo(destDir); archive.close(); - kapp->processEvents(10000); + tdeApp->processEvents(10000); //read the new data into the program //this return might be the result of checking if everything is installed ok @@ -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); + tdeApp->processEvents(1000); //First, remove the existing NGC/IC objects from the ObjectNameList. for ( DeepSkyObject *o = ks->data()->deepSkyList.first(); o; o = ks->data()->deepSkyList.next() ) { @@ -105,8 +105,8 @@ void KSNewStuff::updateData( const TQString &path ) { ks->data()->deepSkyList.clear(); //Send progress messages to the console - connect( ks->data(), TQT_SIGNAL( progressText(TQString) ), ks->data(), TQT_SLOT( slotConsoleMessage(TQString) ) ); - connect( ks->data(), TQT_SIGNAL( progressText(TQString) ), ks->data(), TQT_SLOT( slotProcessEvents() ) ); + connect( ks->data(), TQ_SIGNAL( progressText(TQString) ), ks->data(), TQ_SLOT( slotConsoleMessage(TQString) ) ); + connect( ks->data(), TQ_SIGNAL( progressText(TQString) ), ks->data(), TQ_SLOT( slotProcessEvents() ) ); //We are now ready to read the new NGC/IC catalog ks->data()->readDeepSkyData(); @@ -150,7 +150,7 @@ void KSNewStuff::updateData( const TQString &path ) { ks->data()->cometList.clear(); //Send progress messages to the console - connect( ks->data(), TQT_SIGNAL( progressText(TQString) ), ks->data(), TQT_SLOT( slotConsoleMessage(TQString) ) ); + connect( ks->data(), TQ_SIGNAL( progressText(TQString) ), ks->data(), TQ_SLOT( slotConsoleMessage(TQString) ) ); //add new asteroids and comets ks->data()->readAsteroidData(); @@ -166,7 +166,7 @@ void KSNewStuff::updateData( const TQString &path ) { ks->setCursor(TQCursor(TQt::ArrowCursor)); } -void KSNewStuff::slotProcessEvents() { kapp->processEvents( 500 ); } +void KSNewStuff::slotProcessEvents() { tdeApp->processEvents( 500 ); } #include "ksnewstuff.moc" diff --git a/kstars/kstars/ksnewstuff.h b/kstars/kstars/ksnewstuff.h index 69e8fbc4..71a506cd 100644 --- a/kstars/kstars/ksnewstuff.h +++ b/kstars/kstars/ksnewstuff.h @@ -43,7 +43,7 @@ class KStars; class KSNewStuff : public TQObject, public TDENewStuff { - Q_OBJECT + TQ_OBJECT public: /** @@ -78,7 +78,7 @@ class KSNewStuff : public TQObject, public TDENewStuff void updateData( const TQString &newFile ); /** - *Simply calls kapp->processEvents(), to make the UI responsive while + *Simply calls tdeApp->processEvents(), to make the UI responsive while *new NGC/IC data are being added to the program. */ void slotProcessEvents(); diff --git a/kstars/kstars/ksplanetbase.cpp b/kstars/kstars/ksplanetbase.cpp index 87f5e004..4b787318 100644 --- a/kstars/kstars/ksplanetbase.cpp +++ b/kstars/kstars/ksplanetbase.cpp @@ -45,7 +45,7 @@ KSPlanetBase::KSPlanetBase( KStarsData *kd, TQString s, TQString image_file, dou PositionAngle = 0.0; ImageAngle = 0.0; PhysicalSize = pSize; - Trail.setAutoDelete( TRUE ); + Trail.setAutoDelete( true ); } void KSPlanetBase::EquatorialToEcliptic( const dms *Obliquity ) { diff --git a/kstars/kstars/kspopupmenu.cpp b/kstars/kstars/kspopupmenu.cpp index 80125fbe..34716d10 100644 --- a/kstars/kstars/kspopupmenu.cpp +++ b/kstars/kstars/kspopupmenu.cpp @@ -45,8 +45,8 @@ KSPopupMenu::~KSPopupMenu() void KSPopupMenu::createEmptyMenu( SkyObject *nullObj ) { 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() ) ); + insertItem( i18n( "First Generation Digitized Sky Survey", "Show 1st-Gen DSS Image" ), ksw->map(), TQ_SLOT( slotDSS() ) ); + insertItem( i18n( "Second Generation Digitized Sky Survey", "Show 2nd-Gen DSS Image" ), ksw->map(), TQ_SLOT( slotDSS2() ) ); } void KSPopupMenu::createStarMenu( StarObject *star ) { @@ -58,8 +58,8 @@ void KSPopupMenu::createStarMenu( StarObject *star ) { if ( star->name() != "star" ) { addLinksToMenu( star ); } else { - 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() ) ); + insertItem( i18n( "First Generation Digitized Sky Survey", "Show 1st-Gen DSS Image" ), ksw->map(), TQ_SLOT( slotDSS() ) ); + insertItem( i18n( "Second Generation Digitized Sky Survey", "Show 2nd-Gen DSS Image" ), ksw->map(), TQ_SLOT( slotDSS2() ) ); } } @@ -104,13 +104,13 @@ void KSPopupMenu::addLinksToMenu( SkyObject *obj, bool showDSS, bool allowCustom for ( ; itList != itListEnd; ++itList ) { TQString t = TQString(*itTitle); sURL = TQString(*itList); - insertItem( i18n( "Image/info menu item (should be translated)", t.local8Bit() ), ksw->map(), TQT_SLOT( slotImage( int ) ), 0, id++ ); + insertItem( i18n( "Image/info menu item (should be translated)", t.local8Bit() ), ksw->map(), TQ_SLOT( slotImage( int ) ), 0, id++ ); ++itTitle; } if ( showDSS ) { - 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() ) ); + insertItem( i18n( "First Generation Digitized Sky Survey", "Show 1st-Gen DSS Image" ), ksw->map(), TQ_SLOT( slotDSS() ) ); + insertItem( i18n( "Second Generation Digitized Sky Survey", "Show 2nd-Gen DSS Image" ), ksw->map(), TQ_SLOT( slotDSS2() ) ); insertSeparator(); } else if ( obj->ImageList.count() ) insertSeparator(); @@ -123,13 +123,13 @@ void KSPopupMenu::addLinksToMenu( SkyObject *obj, bool showDSS, bool allowCustom for ( ; itList != itListEnd; ++itList ) { TQString t = TQString(*itTitle); sURL = TQString(*itList); - insertItem( i18n( "Image/info menu item (should be translated)", t.local8Bit() ), ksw->map(), TQT_SLOT( slotInfo( int ) ), 0, id++ ); + insertItem( i18n( "Image/info menu item (should be translated)", t.local8Bit() ), ksw->map(), TQ_SLOT( slotInfo( int ) ), 0, id++ ); ++itTitle; } if ( allowCustom ) { insertSeparator(); - insertItem( i18n( "Add Link..." ), ksw->map(), TQT_SLOT( addLink() ), 0, id++ ); + insertItem( i18n( "Add Link..." ), ksw->map(), TQ_SLOT( addLink() ), 0, id++ ); } } @@ -201,7 +201,7 @@ bool KSPopupMenu::addINDI(void) } } - TQObject::connect(menuDevice, TQT_SIGNAL(activated(int)), prop, TQT_SLOT (convertSwitch(int))); + TQObject::connect(menuDevice, TQ_SIGNAL(activated(int)), prop, TQ_SLOT (convertSwitch(int))); } // end property } // end group @@ -217,7 +217,7 @@ bool KSPopupMenu::addINDI(void) prop = dev->findElem("ALT")->pp; prop->assosiatedPopup = menuDevice; - TQObject::connect(menuDevice, TQT_SIGNAL(activated(int)), prop, TQT_SLOT(convertSwitch(int))); + TQObject::connect(menuDevice, TQ_SIGNAL(activated(int)), prop, TQ_SLOT(convertSwitch(int))); } } // end device @@ -239,8 +239,8 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr pmTitle = new TQLabel( s1, this ); pmTitle->setAlignment( 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 ) ); + pal.setColor( TQPalette::Active, TQColorGroup::Background, pal.color( TQPalette::Active, TQColorGroup::Base ) ); + pal.setColor( TQPalette::Active, TQColorGroup::Foreground, pal.color( TQPalette::Active, TQColorGroup::Text ) ); pmTitle->setPalette( pal ); insertItem( pmTitle ); @@ -291,15 +291,15 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr //Insert item for centering on object if ( showCenterTrack && obj ) { insertSeparator(); - insertItem( i18n( "Center && Track" ), ksw->map(), TQT_SLOT( slotCenter() ) ); + insertItem( i18n( "Center && Track" ), ksw->map(), TQ_SLOT( slotCenter() ) ); } //Insert item for measuring distances if ( showAngularDistance && obj ) { if (! (ksw->map()->isAngleMode()) ) { - insertItem( i18n( "Angular Distance To... [" ), ksw->map(), TQT_SLOT( slotBeginAngularDistance() ) ); + insertItem( i18n( "Angular Distance To... [" ), ksw->map(), TQ_SLOT( slotBeginAngularDistance() ) ); } else { - insertItem( i18n( "Compute Angular Distance ]" ), ksw->map(), TQT_SLOT( slotEndAngularDistance() ) ); + insertItem( i18n( "Compute Angular Distance ]" ), ksw->map(), TQ_SLOT( slotEndAngularDistance() ) ); } } @@ -307,30 +307,30 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr //Insert item for Showing details dialog if ( showDetails && obj ) { - insertItem( i18n( "Show Detailed Information Dialog", "Details" ), ksw->map(), TQT_SLOT( slotDetail() ) ); + insertItem( i18n( "Show Detailed Information Dialog", "Details" ), ksw->map(), TQ_SLOT( slotDetail() ) ); } //Insert "Add/Remove Label" item if ( showLabel && obj ) { if ( ksw->map()->isObjectLabeled( obj ) ) { - insertItem( i18n( "Remove Label" ), ksw->map(), TQT_SLOT( slotRemoveObjectLabel() ) ); + insertItem( i18n( "Remove Label" ), ksw->map(), TQ_SLOT( slotRemoveObjectLabel() ) ); } else { - insertItem( i18n( "Attach Label" ), ksw->map(), TQT_SLOT( slotAddObjectLabel() ) ); + insertItem( i18n( "Attach Label" ), ksw->map(), TQ_SLOT( slotAddObjectLabel() ) ); } } if ( showObsList && obj ) { if ( ksw->observingList()->contains( obj ) ) - insertItem( i18n("Remove From List"), ksw->observingList(), TQT_SLOT( slotRemoveObject() ) ); + insertItem( i18n("Remove From List"), ksw->observingList(), TQ_SLOT( slotRemoveObject() ) ); else - insertItem( i18n("Add to List"), ksw->observingList(), TQT_SLOT( slotAddObject() ) ); + insertItem( i18n("Add to List"), ksw->observingList(), TQ_SLOT( slotAddObject() ) ); } if ( showTrail && obj && obj->isSolarSystem() ) { if ( addTrail ) { - insertItem( i18n( "Add Trail" ), ksw->map(), TQT_SLOT( slotAddPlanetTrail() ) ); + insertItem( i18n( "Add Trail" ), ksw->map(), TQ_SLOT( slotAddPlanetTrail() ) ); } else { - insertItem( i18n( "Remove Trail" ), ksw->map(), TQT_SLOT( slotRemovePlanetTrail() ) ); + insertItem( i18n( "Remove Trail" ), ksw->map(), TQ_SLOT( slotRemovePlanetTrail() ) ); } } diff --git a/kstars/kstars/kspopupmenu.h b/kstars/kstars/kspopupmenu.h index a96b4118..e2031e81 100644 --- a/kstars/kstars/kspopupmenu.h +++ b/kstars/kstars/kspopupmenu.h @@ -38,7 +38,7 @@ class TQLabel; class KSPopupMenu : public TDEPopupMenu { -Q_OBJECT +TQ_OBJECT public: /**Default constructor*/ @@ -76,8 +76,8 @@ public: *"Add link..." item will be included, which allows the user to add their own cutsom *URLs for this object. *@param obj pointer to the skyobject which the menu describes - *@param showDSS if TRUE, include DSS Image links - *@param allowCustom if TRUE, include the "Add Link..." item + *@param showDSS if true, include DSS Image links + *@param allowCustom if true, include the "Add Link..." item */ void addLinksToMenu( SkyObject *obj, bool showDSS=true, bool allowCustom=true ); diff --git a/kstars/kstars/kstars.cpp b/kstars/kstars/kstars.cpp index e75199d4..34b656b9 100644 --- a/kstars/kstars/kstars.cpp +++ b/kstars/kstars/kstars.cpp @@ -57,17 +57,17 @@ KStars::KStars( bool doSplash, bool clockrun, const TQString &startdate ) : pd = new privatedata(this); // we're nowhere near ready to take dcop calls - kapp->dcopClient()->suspend(); + tdeApp->dcopClient()->suspend(); if ( doSplash ) { pd->kstarsData = new KStarsData(); - TQObject::connect(pd->kstarsData, TQT_SIGNAL( initFinished(bool) ), - this, TQT_SLOT( datainitFinished(bool) ) ); + TQObject::connect(pd->kstarsData, TQ_SIGNAL( initFinished(bool) ), + this, TQ_SLOT( datainitFinished(bool) ) ); pd->splash = new KStarsSplash(0, "Splash"); - TQObject::connect(pd->splash, TQT_SIGNAL( closeWindow() ), kapp, TQT_SLOT( quit() ) ); - TQObject::connect(pd->kstarsData, TQT_SIGNAL( progressText(TQString) ), - pd->splash, TQT_SLOT( setMessage(TQString) )); + TQObject::connect(pd->splash, TQ_SIGNAL( closeWindow() ), tdeApp, TQ_SLOT( quit() ) ); + TQObject::connect(pd->kstarsData, TQ_SIGNAL( progressText(TQString) ), + pd->splash, TQ_SLOT( setMessage(TQString) )); pd->splash->show(); } @@ -81,10 +81,10 @@ KStars::KStars( bool doSplash, bool clockrun, const TQString &startdate ) : //set up Dark color scheme for application windows DarkPalette = TQPalette(TQColor("red4"), TQColor("DarkRed")); - DarkPalette.setColor( TQPalette::Normal, TQColorGroup::Base, TQColor( "black" ) ); - DarkPalette.setColor( TQPalette::Normal, TQColorGroup::Text, TQColor( "red2" ) ); - DarkPalette.setColor( TQPalette::Normal, TQColorGroup::Highlight, TQColor( "red2" ) ); - DarkPalette.setColor( TQPalette::Normal, TQColorGroup::HighlightedText, TQColor( "black" ) ); + DarkPalette.setColor( TQPalette::Active, TQColorGroup::Base, TQColor( "black" ) ); + DarkPalette.setColor( TQPalette::Active, TQColorGroup::Text, TQColor( "red2" ) ); + DarkPalette.setColor( TQPalette::Active, TQColorGroup::Highlight, TQColor( "red2" ) ); + DarkPalette.setColor( TQPalette::Active, TQColorGroup::HighlightedText, TQColor( "black" ) ); //store original color scheme OriginalPalette = TQApplication::palette(); @@ -108,7 +108,7 @@ KStars::~KStars() Options::setWindowHeight( height() ); //We need to explicitly save the colorscheme data to the config file - data()->colorScheme()->saveToConfig( kapp->config() ); + data()->colorScheme()->saveToConfig( tdeApp->config() ); //synch the config file with the Config object Options::writeConfig(); @@ -182,7 +182,7 @@ void KStars::applyConfig() { ((TDEToggleAction*)actionCollection()->action("show_horizon"))->setChecked( Options::showGround() ); //color scheme - pd->kstarsData->colorScheme()->loadFromConfig( kapp->config() ); + pd->kstarsData->colorScheme()->loadFromConfig( tdeApp->config() ); if ( Options::darkAppColors() ) { TQApplication::setPalette( DarkPalette, true ); } else { @@ -243,7 +243,7 @@ void KStars::updateTime( const bool automaticDSTchange ) { //Wrap the call to manualTick() in a singleshot timer so that it doesn't get called until //the skymap has been completely updated. if ( Data->clock()->isManualMode() && Data->clock()->isActive() ) { - TQTimer::singleShot( 0, Data->clock(), TQT_SLOT( manualTick() ) ); + TQTimer::singleShot( 0, Data->clock(), TQ_SLOT( manualTick() ) ); } } diff --git a/kstars/kstars/kstars.h b/kstars/kstars/kstars.h index 51b55cf1..db8ac252 100644 --- a/kstars/kstars/kstars.h +++ b/kstars/kstars/kstars.h @@ -67,7 +67,7 @@ class imagesequence; class KStars : public TDEMainWindow, virtual public KStarsInterface { - Q_OBJECT + TQ_OBJECT public: /** @@ -431,7 +431,7 @@ class KStars : public TDEMainWindow, virtual public KStarsInterface /** *Resume execution of DCOP commands */ - void resumeDCOP( void ) { kapp->dcopClient()->resume(); } + void resumeDCOP( void ) { tdeApp->dcopClient()->resume(); } /** *Remove all trails which may have been added to solar system bodies diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp index 81ac63ba..0f2288d6 100644 --- a/kstars/kstars/kstarsactions.cpp +++ b/kstars/kstars/kstarsactions.cpp @@ -28,13 +28,13 @@ #include <tdemessagebox.h> #include <tdetempfile.h> #include <ktip.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfigdialog.h> #include <tdefiledialog.h> #include <kinputdialog.h> #include <tdepopupmenu.h> #include <kstatusbar.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqcheckbox.h> #include <tqdir.h> #include <tdeversion.h> @@ -93,23 +93,23 @@ void KStars::slotViewToolBar() { - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_stars" ) ) { + if ( sender()->name() == TQString( "show_stars" ) ) { Options::setShowStars( !Options::showStars() ); - } else if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_deepsky" ) ) { + } else if ( sender()->name() == TQString( "show_deepsky" ) ) { Options::setShowDeepSky( ! Options::showDeepSky() ); - } else if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_planets" ) ) { + } else if ( sender()->name() == TQString( "show_planets" ) ) { Options::setShowPlanets( ! Options::showPlanets() ); - } else if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_clines" ) ) { + } else if ( sender()->name() == TQString( "show_clines" ) ) { Options::setShowCLines( !Options::showCLines() ); - } else if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_cnames" ) ) { + } else if ( sender()->name() == TQString( "show_cnames" ) ) { Options::setShowCNames( !Options::showCNames() ); - } else if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_cbounds" ) ) { + } else if ( sender()->name() == TQString( "show_cbounds" ) ) { Options::setShowCBounds( !Options::showCBounds() ); - } else if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_mw" ) ) { + } else if ( sender()->name() == TQString( "show_mw" ) ) { Options::setShowMilkyWay( !Options::showMilkyWay() ); - } else if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_grid" ) ) { + } else if ( sender()->name() == TQString( "show_grid" ) ) { Options::setShowGrid( !Options::showGrid() ); - } else if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_horizon" ) ) { + } else if ( sender()->name() == TQString( "show_horizon" ) ) { Options::setShowGround( !Options::showGround() ); } @@ -198,7 +198,7 @@ void KStars::slotWUT() { //FIXME GLOSSARY // void KStars::slotGlossary(){ -// GlossaryDialog *dlg = new GlossaryDialog( true, TQT_TQOBJECT(this), "glossary" ); +// GlossaryDialog *dlg = new GlossaryDialog( true, this, "glossary" ); // TQString glossaryfile =data()->stdDirs->findResource( "data", "kstars/glossary.xml" ); // KURL u = glossaryfile; // Glossary *g = Glossary::readFromXML( u ); @@ -356,8 +356,8 @@ void KStars::slotViewOps() { TDEConfigDialog* dialog = new TDEConfigDialog( this, "settings", Options::self() ); - connect( dialog, TQT_SIGNAL( applyClicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotApplySettings() ) ); - connect( dialog, TQT_SIGNAL( okClicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotApplySettings() ) ); + connect( dialog, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( slotApplySettings() ) ); + connect( dialog, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotApplySettings() ) ); OpsCatalog *opcatalog = new OpsCatalog( this, "catalogs" ); OpsGuides *opguides = new OpsGuides( this, "guides" ); @@ -450,7 +450,7 @@ void KStars::slotExportImage() { //Warn user if file exists! if (TQFile::exists(fileURL.path())) { - int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), + int r=KMessageBox::warningContinueCancel(static_cast<TQWidget*>(parent()), i18n( "A file named \"%1\" already exists. " "Overwrite it?" ).arg(fileURL.fileName()), i18n( "Overwrite File?" ), @@ -569,7 +569,7 @@ void KStars::slotRunScript() { p << f.name(); p.start( TDEProcess::DontCare ); - while ( p.isRunning() ) kapp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes. + while ( p.isRunning() ) tdeApp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes. } } @@ -623,7 +623,7 @@ void KStars::slotToggleTimer() { //Focus void KStars::slotPointFocus() { - TQString sentFrom( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() ); + TQString sentFrom( sender()->name() ); if ( sentFrom == "zenith" ) map()->invokeKey( KKey( "Z" ).keyCodeQt() ); @@ -813,12 +813,12 @@ void KStars::slotCoordSys() { //Settings Menu: void KStars::slotColorScheme() { //use mid(3) to exclude the leading "cs_" prefix from the action name - TQString filename = TQString( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() ).mid(3) + ".colors"; + TQString filename = TQString( sender()->name() ).mid(3) + ".colors"; loadColorScheme( filename ); } void KStars::slotTargetSymbol() { - TQString symbolName( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() ); + TQString symbolName( sender()->name() ); FOV f( symbolName ); //read data from fov.dat Options::setFOVName( f.name() ); @@ -873,7 +873,7 @@ void KStars::slotFOVEdit() { if ( fields.count() == 4 ) { TQString nm = fields[0].stripWhiteSpace(); - TDEToggleAction *kta = new TDEToggleAction( nm, 0, TQT_TQOBJECT(this), TQT_SLOT( slotTargetSymbol() ), + TDEToggleAction *kta = new TDEToggleAction( nm, 0, this, TQ_SLOT( slotTargetSymbol() ), actionCollection(), nm.utf8() ); kta->setExclusiveGroup( "fovsymbol" ); fovActionMenu->insert( kta ); @@ -884,8 +884,8 @@ void KStars::slotFOVEdit() { } fovActionMenu->popupMenu()->insertSeparator(); - fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); + fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, this, + TQ_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); //set FOV to whatever was highlighted in FOV dialog if ( fovdlg.FOVList.count() > 0 ) { @@ -955,24 +955,24 @@ void KStars::slotClearAllTrails() { //toggle display of GUI Items on/off void KStars::slotShowGUIItem( bool show ) { //Toolbars - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_mainToolBar" ) ) { + if ( sender()->name() == TQString( "show_mainToolBar" ) ) { Options::setShowMainToolBar( show ); if ( show ) toolBar( "mainToolBar" )->show(); else toolBar( "mainToolBar" )->hide(); } - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_viewToolBar" ) ) { + if ( sender()->name() == TQString( "show_viewToolBar" ) ) { Options::setShowViewToolBar( show ); if ( show ) toolBar( "viewToolBar" )->show(); else toolBar( "viewToolBar" )->hide(); } - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_statusBar" ) ) { + if ( sender()->name() == TQString( "show_statusBar" ) ) { Options::setShowStatusBar( show ); if ( show ) statusBar()->show(); else statusBar()->hide(); } - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_sbAzAlt" ) ) { + if ( 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 ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_sbRADec" ) ) { + if ( 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,19 +1008,19 @@ 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 ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_boxes" ) ) + if ( sender()->name() == TQString( "show_boxes" ) ) Options::setShowInfoBoxes( show ); - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_time_box" ) ) + if ( sender()->name() == TQString( "show_time_box" ) ) Options::setShowTimeBox( show ); - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_location_box" ) ) + if ( sender()->name() == TQString( "show_location_box" ) ) Options::setShowGeoBox( show ); - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_focus_box" ) ) + if ( sender()->name() == TQString( "show_focus_box" ) ) Options::setShowFocusBox( show ); } void KStars::addColorMenuItem( TQString name, TQString actionName ) { colorActionMenu->insert( new TDEAction( name, 0, - TQT_TQOBJECT(this), TQT_SLOT( slotColorScheme() ), actionCollection(), actionName.local8Bit() ) ); + this, TQ_SLOT( slotColorScheme() ), actionCollection(), actionName.local8Bit() ) ); } void KStars::removeColorMenuItem( TQString actionName ) { diff --git a/kstars/kstars/kstarsdata.cpp b/kstars/kstars/kstarsdata.cpp index 95ca0d50..68746191 100644 --- a/kstars/kstars/kstarsdata.cpp +++ b/kstars/kstars/kstarsdata.cpp @@ -23,7 +23,7 @@ #include <tdemessagebox.h> #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "kstarsdata.h" @@ -88,41 +88,41 @@ KStarsData::KStarsData() : stdDirs(0), locale(0), //initialize FOV symbol fovSymbol = FOV(); - //set AutoDelete property for TQPtrLists. Most are set TRUE, - //but some 'meta-lists' need to be FALSE. - starList.setAutoDelete( TRUE ); - ADVtreeList.setAutoDelete( TRUE ); - geoList.setAutoDelete( TRUE ); - deepSkyList.setAutoDelete( TRUE ); // list of all deep space objects + //set AutoDelete property for TQPtrLists. Most are set true, + //but some 'meta-lists' need to be false. + starList.setAutoDelete( true ); + ADVtreeList.setAutoDelete( true ); + geoList.setAutoDelete( true ); + deepSkyList.setAutoDelete( true ); // list of all deep space objects //separate lists for each deep-sky catalog. The objects are duplicates of //deepSkyList, so do not delete them twice! - deepSkyListMessier.setAutoDelete( FALSE ); - deepSkyListNGC.setAutoDelete( FALSE ); - deepSkyListIC.setAutoDelete( FALSE ); - deepSkyListOther.setAutoDelete( FALSE ); + deepSkyListMessier.setAutoDelete( false ); + deepSkyListNGC.setAutoDelete( false ); + deepSkyListIC.setAutoDelete( false ); + deepSkyListOther.setAutoDelete( false ); //ObjLabelList does not construct new objects, so no autoDelete needed - ObjLabelList.setAutoDelete( FALSE ); + ObjLabelList.setAutoDelete( false ); - cometList.setAutoDelete( TRUE ); - asteroidList.setAutoDelete( TRUE ); + cometList.setAutoDelete( true ); + asteroidList.setAutoDelete( true ); //Constellation lines are now pointers to existing StarObjects; //these are already auto-deleted by starList. - clineList.setAutoDelete( FALSE ); - clineModeList.setAutoDelete( TRUE ); - cnameList.setAutoDelete( TRUE ); - csegmentList.setAutoDelete( TRUE ); + clineList.setAutoDelete( false ); + clineModeList.setAutoDelete( true ); + cnameList.setAutoDelete( true ); + csegmentList.setAutoDelete( true ); - Equator.setAutoDelete( TRUE ); - Ecliptic.setAutoDelete( TRUE ); - Horizon.setAutoDelete( TRUE ); - for ( unsigned int i=0; i<11; ++i ) MilkyWay[i].setAutoDelete( TRUE ); + Equator.setAutoDelete( true ); + Ecliptic.setAutoDelete( true ); + Horizon.setAutoDelete( true ); + for ( unsigned int i=0; i<11; ++i ) MilkyWay[i].setAutoDelete( true ); - VariableStarsList.setAutoDelete(TRUE); - INDIHostsList.setAutoDelete(TRUE); - INDITelescopeList.setAutoDelete(TRUE); + VariableStarsList.setAutoDelete(true); + INDIHostsList.setAutoDelete(true); + INDITelescopeList.setAutoDelete(true); //Initialize object type strings TypeName[0] = i18n( "star" ); @@ -1698,9 +1698,9 @@ void KStarsData::setMagnitude( float newMagnitude, bool forceReload ) { if (reloadingData() == false) { // if not already reloading data source = new FileSource(this, newMagnitude); loader = new StarDataSink(this); - connect(loader, TQT_SIGNAL(done()), this, TQT_SLOT(checkDataPumpAction())); - connect(loader, TQT_SIGNAL(updateSkymap()), this, TQT_SLOT(updateSkymap())); - connect(loader, TQT_SIGNAL(clearCache()), this, TQT_SLOT(sendClearCache())); + connect(loader, TQ_SIGNAL(done()), this, TQ_SLOT(checkDataPumpAction())); + connect(loader, TQ_SIGNAL(updateSkymap()), this, TQ_SLOT(updateSkymap())); + connect(loader, TQ_SIGNAL(clearCache()), this, TQ_SLOT(sendClearCache())); // start reloading pump = new TQDataPump (source, (TQDataSink*) loader); } @@ -1762,7 +1762,7 @@ void KStarsData::initialize() { if (startupComplete) return; initTimer = new TQTimer; - TQObject::connect(initTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( slotInitialize() ) ); + TQObject::connect(initTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT( slotInitialize() ) ); initCounter = 0; initTimer->start(1); } @@ -1808,7 +1808,7 @@ void KStarsData::slotInitialize() { TQFile imFile; TQString ImageName; - kapp->flush(); // flush all paint events before loading data + tdeApp->flush(); // flush all paint events before loading data switch ( initCounter ) { @@ -2219,7 +2219,7 @@ void KStarsData::updateTime( GeoLocation *geo, SkyMap *skymap, const bool automa skymap->updateFocus(); if ( clock()->isManualMode() ) - TQTimer::singleShot( 0, skymap, TQT_SLOT( forceUpdateNow() ) ); + TQTimer::singleShot( 0, skymap, TQ_SLOT( forceUpdateNow() ) ); else skymap->forceUpdate(); } } diff --git a/kstars/kstars/kstarsdata.h b/kstars/kstars/kstarsdata.h index 3007ed58..3c835da3 100644 --- a/kstars/kstars/kstarsdata.h +++ b/kstars/kstars/kstarsdata.h @@ -88,7 +88,7 @@ class CustomCatalog; class KStarsData : public TQObject { - Q_OBJECT + TQ_OBJECT public: //Friend classes can see the private data. @@ -283,7 +283,7 @@ public: *@li 13-15 IAU Abbreviation [string] e.g., 'Ori' == Orion *@li 17- Constellation name [string] *@short Read in constellation name data. - *@return TRUE if data file was successfully read. + *@return true if data file was successfully read. */ bool readCNameData( void ); @@ -302,7 +302,7 @@ public: *word-by-word, rather than line-by-line as we do in other files. * *@short Read in the constellation boundary data. - *@return TRUE if the boundary data is successfully parsed. + *@return true if the boundary data is successfully parsed. */ bool readCBoundData( void ); @@ -367,7 +367,7 @@ public: /**@short open a file containing URL links. *@param urlfile string representation of the filename to open *@param file reference to the TQFile object which will be opened to this file. - *@return TRUE if file successfully opened. + *@return true if file successfully opened. */ bool openURLFile(TQString urlfile, TQFile& file); @@ -526,7 +526,7 @@ public: *be used if you have previously called setSnapNextFocus(true), but then decided *you didn't want that after all. In other words, it's extremely unlikely you'd *ever want to use setSnapNextFocus(false). - *@param b when TRUE (the default), the next Focus chnage will omit the slewing + *@param b when true (the default), the next Focus chnage will omit the slewing *animation. */ void setSnapNextFocus(bool b=true) { snapToFocus = b; } @@ -536,7 +536,7 @@ public: *a sky image in command-line dump mode). *@param name the filename of the script to "execute". *@param map pointer to the SkyMap object. - *@return TRUE if the script was successfully parsed. + *@return true if the script was successfully parsed. */ bool executeScript( const TQString &name, SkyMap *map ); @@ -596,17 +596,17 @@ public slots: void setTimeDirection( float scale ); /**@short Save the shaded state of the Time infobox. - *@param b TRUE if the box is shaded + *@param b true if the box is shaded */ void saveTimeBoxShaded( bool b ); /**@short Save the shaded state of the Geo infobox. - *@param b TRUE if the box is shaded + *@param b true if the box is shaded */ void saveGeoBoxShaded( bool b ); /**@short Save the shaded state of the Focus infobox. - *@param b TRUE if the box is shaded + *@param b true if the box is shaded */ void saveFocusBoxShaded( bool b ); @@ -656,7 +656,7 @@ private: *was marked as "required", then abort the program when the messagebox is closed. *Otherwise, continue loading the program. *@param fn the name of the file which could not be opened. - *@param required if TRUE, then the error message is more severe, and the program + *@param required if true, then the error message is more severe, and the program *exits when the messagebox is closed. */ void initError(TQString fn, bool required); diff --git a/kstars/kstars/kstarsdcop.cpp b/kstars/kstars/kstarsdcop.cpp index bc1f4ff4..3266370b 100644 --- a/kstars/kstars/kstarsdcop.cpp +++ b/kstars/kstars/kstarsdcop.cpp @@ -105,14 +105,14 @@ void KStars::setLocalTime(int yr, int mth, int day, int hr, int min, int sec) { } void KStars::waitFor( double t ) { - kapp->dcopClient()->suspend(); - TQTimer::singleShot( int( 1000.*t ), this, TQT_SLOT( resumeDCOP() ) ); + tdeApp->dcopClient()->suspend(); + TQTimer::singleShot( int( 1000.*t ), this, TQ_SLOT( resumeDCOP() ) ); } void KStars::waitForKey( const TQString k ) { data()->resumeKey = KKey( k ); if ( ! data()->resumeKey.isNull() ) { - kapp->dcopClient()->suspend(); + tdeApp->dcopClient()->suspend(); } else { kdDebug() << i18n( "Error [DCOP waitForKey()]: Invalid key requested." ) << endl; } @@ -420,8 +420,8 @@ void KStars::exportImage( const TQString url, int w, int h ) { else if ( ext.lower() == "bmp" ) { format = "BMP"; } else { kdWarning() << i18n( "Could not parse image format of %1; assuming PNG." ).arg( fname ) << endl; } - map()->exportSkyImage( TQT_TQPAINTDEVICE(&skyimage) ); - kapp->processEvents(10000); + map()->exportSkyImage( &skyimage ); + tdeApp->processEvents(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. @@ -472,7 +472,7 @@ void KStars::printImage( bool usePrintDialog, bool useChartColors ) { ok = printer.autoConfigure(); if( ok ) { - kapp->setOverrideCursor( waitCursor ); + tdeApp->setOverrideCursor( waitCursor ); //Save current colorscheme and switch to Star Chart colors //(if requested) @@ -496,7 +496,7 @@ void KStars::printImage( bool usePrintDialog, bool useChartColors ) { map()->forceUpdate(); } - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } } @@ -775,12 +775,12 @@ void KStars::waitForINDIAction(TQString deviceName, TQString action) el = dev->findElem(action); if (!el) return; - TQObject::connect(el->pp, TQT_SIGNAL(okState()), this, TQT_SLOT(resumeDCOP(void ))); + TQObject::connect(el->pp, TQ_SIGNAL(okState()), this, TQ_SLOT(resumeDCOP(void ))); } else - TQObject::connect(prop, TQT_SIGNAL(okState()), this, TQT_SLOT(resumeDCOP(void ))); + TQObject::connect(prop, TQ_SIGNAL(okState()), this, TQ_SLOT(resumeDCOP(void ))); - kapp->dcopClient()->suspend(); + tdeApp->dcopClient()->suspend(); } @@ -977,7 +977,7 @@ void KStars::setINDIFilterNum(TQString deviceName, int filter_num) prop = dev->findProp("FILTER_SLOT"); if (!prop) return; - el = prop->findElement("SLOT"); + el = prop->findElement("TQ_SLOT"); if (!el) return; if (el->write_w) diff --git a/kstars/kstars/kstarsinit.cpp b/kstars/kstars/kstarsinit.cpp index 71ff520b..cf5ec4b5 100644 --- a/kstars/kstars/kstarsinit.cpp +++ b/kstars/kstars/kstarsinit.cpp @@ -25,7 +25,7 @@ #include <kstatusbar.h> #include <ktip.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeversion.h> #include "Options.h" @@ -49,66 +49,66 @@ void KStars::initActions() { //File Menu: new TDEAction(i18n("&New Window"), "window-new", TDEShortcut( "Ctrl+N" ), - TQT_TQOBJECT(this), TQT_SLOT( newWindow() ), actionCollection(), "new_window"); + this, TQ_SLOT( newWindow() ), actionCollection(), "new_window"); new TDEAction(i18n("&Close Window"), "window-close", TDEShortcut( "Ctrl+W" ), - TQT_TQOBJECT(this), TQT_SLOT( closeWindow() ), actionCollection(), "close_window"); + this, TQ_SLOT( closeWindow() ), actionCollection(), "close_window"); new TDEAction( i18n( "&Download Data..." ), "knewstuff", TDEShortcut( "Ctrl+D" ), - TQT_TQOBJECT(this), TQT_SLOT( slotDownload() ), actionCollection(), "get_data" ); - new TDEAction( i18n( "Open FITS..."), "document-open", TDEShortcut( "Ctrl+O"), TQT_TQOBJECT(this), TQT_SLOT( slotOpenFITS()), actionCollection(), "open_file"); + this, TQ_SLOT( slotDownload() ), actionCollection(), "get_data" ); + new TDEAction( i18n( "Open FITS..."), "document-open", TDEShortcut( "Ctrl+O"), this, TQ_SLOT( slotOpenFITS()), actionCollection(), "open_file"); new TDEAction( i18n( "&Save Sky Image..." ), "fileexport", TDEShortcut( "Ctrl+I" ), - TQT_TQOBJECT(this), TQT_SLOT( slotExportImage() ), actionCollection(), "export_image" ); + this, TQ_SLOT( slotExportImage() ), actionCollection(), "export_image" ); new TDEAction( i18n( "&Run Script..." ), "launch", TDEShortcut( "Ctrl+R" ), - 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" ); + this, TQ_SLOT( slotRunScript() ), actionCollection(), "run_script" ); + KStdAction::print(this, TQ_SLOT( slotPrint() ), actionCollection(), "print" ); + KStdAction::quit(this, TQ_SLOT( close() ), actionCollection(), "quit" ); //Time Menu: new TDEAction( i18n( "Set Time to &Now" ), TDEShortcut( "Ctrl+E" ), - TQT_TQOBJECT(this), TQT_SLOT( slotSetTimeToNow() ), actionCollection(), "time_to_now" ); + this, TQ_SLOT( slotSetTimeToNow() ), actionCollection(), "time_to_now" ); new TDEAction( i18n( "set Clock to New Time", "&Set Time..." ), "clock", TDEShortcut( "Ctrl+S" ), - TQT_TQOBJECT(this), TQT_SLOT( slotSetTime() ), actionCollection(), "time_dialog" ); + this, TQ_SLOT( slotSetTime() ), actionCollection(), "time_dialog" ); ToggleAction *actTimeRun = new ToggleAction( i18n( "Stop &Clock" ), BarIcon("media-playback-pause"), i18n("Start &Clock"), BarIcon("1rightarrow"), - 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleTimer() ), actionCollection(), "timer_control" ); + 0, this, TQ_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()) ); - TQObject::connect(data()->clock(), TQT_SIGNAL(clockStopped()), actTimeRun, TQT_SLOT(turnOff()) ); + TQObject::connect(data()->clock(), TQ_SIGNAL(clockStarted()), actTimeRun, TQ_SLOT(turnOn()) ); + TQObject::connect(data()->clock(), TQ_SIGNAL(clockStopped()), actTimeRun, TQ_SLOT(turnOff()) ); //UpdateTime() if clock is stopped (so hidden objects get drawn) - TQObject::connect(data()->clock(), TQT_SIGNAL(clockStopped()), this, TQT_SLOT(updateTime()) ); + TQObject::connect(data()->clock(), TQ_SIGNAL(clockStopped()), this, TQ_SLOT(updateTime()) ); //Focus Menu: new TDEAction(i18n( "&Zenith" ), TDEShortcut( "Z" ), - TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "zenith"); + this, TQ_SLOT( slotPointFocus() ), actionCollection(), "zenith"); new TDEAction(i18n( "&North" ), TDEShortcut( "N" ), - TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "north"); + this, TQ_SLOT( slotPointFocus() ), actionCollection(), "north"); new TDEAction(i18n( "&East" ), TDEShortcut( "E" ), - TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "east"); + this, TQ_SLOT( slotPointFocus() ), actionCollection(), "east"); new TDEAction(i18n( "&South" ), TDEShortcut( "S" ), - TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "south"); + this, TQ_SLOT( slotPointFocus() ), actionCollection(), "south"); new TDEAction(i18n( "&West" ), TDEShortcut( "W" ), - TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "west"); - TDEAction *tmpAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotFind() ), + this, TQ_SLOT( slotPointFocus() ), actionCollection(), "west"); + TDEAction *tmpAction = KStdAction::find( this, TQ_SLOT( slotFind() ), actionCollection(), "find_object" ); tmpAction->setText( i18n( "&Find Object..." ) ); tmpAction->setToolTip( i18n( "Find object" ) ); new TDEAction( i18n( "Engage &Tracking" ), "decrypted", TDEShortcut( "Ctrl+T" ), - TQT_TQOBJECT(this), TQT_SLOT( slotTrack() ), actionCollection(), "track_object" ); + this, TQ_SLOT( slotTrack() ), actionCollection(), "track_object" ); new TDEAction( i18n( "Set Focus &Manually..." ), TDEShortcut( "Ctrl+M" ), - TQT_TQOBJECT(this), TQT_SLOT( slotManualFocus() ), actionCollection(), "manual_focus" ); + this, TQ_SLOT( slotManualFocus() ), actionCollection(), "manual_focus" ); //View Menu: - KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT( slotZoomIn() ), actionCollection(), "zoom_in" ); - KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT( slotZoomOut() ), actionCollection(), "zoom_out" ); + KStdAction::zoomIn(this, TQ_SLOT( slotZoomIn() ), actionCollection(), "zoom_in" ); + KStdAction::zoomOut(this, TQ_SLOT( slotZoomOut() ), actionCollection(), "zoom_out" ); new TDEAction( i18n( "&Default Zoom" ), "viewmagfit.png", TDEShortcut( "Ctrl+Z" ), - TQT_TQOBJECT(this), TQT_SLOT( slotDefaultZoom() ), actionCollection(), "zoom_default" ); + this, TQ_SLOT( slotDefaultZoom() ), actionCollection(), "zoom_default" ); new TDEAction( i18n( "&Zoom to Angular Size..." ), "viewmag.png", TDEShortcut( "Ctrl+Shift+Z" ), - TQT_TQOBJECT(this), TQT_SLOT( slotSetZoom() ), actionCollection(), "zoom_set" ); + this, TQ_SLOT( slotSetZoom() ), actionCollection(), "zoom_set" ); actCoordSys = new ToggleAction( i18n("Horizontal &Coordinates"), i18n( "Equatorial &Coordinates" ), - Key_Space, TQT_TQOBJECT(this), TQT_SLOT( slotCoordSys() ), actionCollection(), "coordsys" ); - KStdAction::fullScreen( TQT_TQOBJECT(this), TQT_SLOT( slotFullScreen() ), actionCollection(), 0 ); + Key_Space, this, TQ_SLOT( slotCoordSys() ), actionCollection(), "coordsys" ); + KStdAction::fullScreen( this, TQ_SLOT( slotFullScreen() ), actionCollection(), 0 ); //Settings Menu: @@ -122,45 +122,45 @@ void KStars::initActions() { TDEToggleAction *a = new TDEToggleAction(i18n( "Show the information boxes", "Show &Info Boxes"), 0, 0, 0, actionCollection(), "show_boxes"); a->setChecked( Options::showInfoBoxes() ); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), infoBoxes(), TQT_SLOT(setVisible(bool))); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), infoBoxes(), TQ_SLOT(setVisible(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); a = new TDEToggleAction(i18n( "Show time-related info box", "Show &Time Box"), 0, 0, 0, actionCollection(), "show_time_box"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), infoBoxes(), TQT_SLOT(showTimeBox(bool))); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), infoBoxes(), TQ_SLOT(showTimeBox(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); a = new TDEToggleAction(i18n( "Show focus-related info box", "Show &Focus Box"), 0, 0, 0, actionCollection(), "show_focus_box"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), infoBoxes(), TQT_SLOT(showFocusBox(bool))); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), infoBoxes(), TQ_SLOT(showFocusBox(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); a = new TDEToggleAction(i18n( "Show location-related info box", "Show &Location Box"), 0, 0, 0, actionCollection(), "show_location_box"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), infoBoxes(), TQT_SLOT(showGeoBox(bool))); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), infoBoxes(), TQ_SLOT(showGeoBox(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); //Toolbar view options a = new TDEToggleAction(i18n( "Show Main Toolbar" ), 0, 0, 0, actionCollection(), "show_mainToolBar"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); a = new TDEToggleAction(i18n( "Show View Toolbar" ), 0, 0, 0, actionCollection(), "show_viewToolBar"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); //Statusbar view options a = new TDEToggleAction(i18n( "Show Statusbar" ), 0, 0, 0, actionCollection(), "show_statusBar"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); a = new TDEToggleAction(i18n( "Show Az/Alt Field" ), 0, 0, 0, actionCollection(), "show_sbAzAlt"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); a = new TDEToggleAction(i18n( "Show RA/Dec Field" ), 0, 0, 0, actionCollection(), "show_sbRADec"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); //Color scheme actions. These are added to the "colorschemes" TDEActionMenu. colorActionMenu = new TDEActionMenu( i18n( "C&olor Schemes" ), actionCollection(), "colorschemes" ); @@ -191,62 +191,62 @@ void KStars::initActions() { initFOV(); new TDEAction( i18n( "Location on Earth", "&Geographic..." ), - "kstars_geo", TDEShortcut( "Ctrl+G" ), TQT_TQOBJECT(this), - TQT_SLOT( slotGeoLocator() ), actionCollection(), "geolocation" ); + "kstars_geo", TDEShortcut( "Ctrl+G" ), this, + TQ_SLOT( slotGeoLocator() ), actionCollection(), "geolocation" ); - KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotViewOps() ), actionCollection(), "configure" ); + KStdAction::preferences( this, TQ_SLOT( slotViewOps() ), actionCollection(), "configure" ); new TDEAction(i18n( "Startup Wizard..." ), "wizard", TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( slotWizard() ), actionCollection(), "startwizard" ); + this, TQ_SLOT( slotWizard() ), actionCollection(), "startwizard" ); //Tools Menu: new TDEAction(i18n( "Calculator..."), TDEShortcut( "Ctrl+C"), - TQT_TQOBJECT(this), TQT_SLOT( slotCalculator() ), actionCollection(), "astrocalculator"); + this, TQ_SLOT( slotCalculator() ), actionCollection(), "astrocalculator"); new TDEAction(i18n( "Observing List..."), TDEShortcut( "Ctrl+L"), - TQT_TQOBJECT(this), TQT_SLOT( slotObsList() ), actionCollection(), "obslist"); + this, TQ_SLOT( slotObsList() ), actionCollection(), "obslist"); // enable action only if file was loaded and processed successfully. if (!data()->VariableStarsList.isEmpty()) new TDEAction(i18n( "AAVSO Light Curves..."), TDEShortcut( "Ctrl+V"), - TQT_TQOBJECT(this), TQT_SLOT( slotLCGenerator() ), actionCollection(), "lightcurvegenerator"); + this, TQ_SLOT( slotLCGenerator() ), actionCollection(), "lightcurvegenerator"); new TDEAction(i18n( "Altitude vs. Time..."), TDEShortcut( "Ctrl+A"), - TQT_TQOBJECT(this), TQT_SLOT( slotAVT() ), actionCollection(), "altitude_vs_time"); + this, TQ_SLOT( slotAVT() ), actionCollection(), "altitude_vs_time"); new TDEAction(i18n( "What's up Tonight..."), TDEShortcut("Ctrl+U"), - TQT_TQOBJECT(this), TQT_SLOT(slotWUT()), actionCollection(), "whats_up_tonight"); + this, TQ_SLOT(slotWUT()), actionCollection(), "whats_up_tonight"); //FIXME GLOSSARY // new TDEAction(i18n( "Glossary..."), TDEShortcut("Ctrl+K"), -// this, TQT_SLOT(slotGlossary()), actionCollection(), "glossary"); +// this, TQ_SLOT(slotGlossary()), actionCollection(), "glossary"); new TDEAction(i18n( "Script Builder..."), TDEShortcut("Ctrl+B"), - TQT_TQOBJECT(this), TQT_SLOT(slotScriptBuilder()), actionCollection(), "scriptbuilder"); + this, TQ_SLOT(slotScriptBuilder()), actionCollection(), "scriptbuilder"); new TDEAction(i18n( "Solar System..."), TDEShortcut("Ctrl+Y"), - TQT_TQOBJECT(this), TQT_SLOT(slotSolarSystem()), actionCollection(), "solarsystem"); + this, TQ_SLOT(slotSolarSystem()), actionCollection(), "solarsystem"); new TDEAction(i18n( "Jupiter's Moons..."), TDEShortcut("Ctrl+J"), - TQT_TQOBJECT(this), TQT_SLOT(slotJMoonTool()), actionCollection(), "jmoontool"); + this, TQ_SLOT(slotJMoonTool()), actionCollection(), "jmoontool"); // devices Menu - new TDEAction(i18n("Telescope Wizard..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTelescopeWizard()), actionCollection(), "telescope_wizard"); - new TDEAction(i18n("Telescope Properties..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTelescopeProperties()), actionCollection(), "telescope_properties"); - new TDEAction(i18n("Device Manager..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIDriver()), actionCollection(), "device_manager"); + new TDEAction(i18n("Telescope Wizard..."), 0, this, TQ_SLOT(slotTelescopeWizard()), actionCollection(), "telescope_wizard"); + new TDEAction(i18n("Telescope Properties..."), 0, this, TQ_SLOT(slotTelescopeProperties()), actionCollection(), "telescope_properties"); + new TDEAction(i18n("Device Manager..."), 0, this, TQ_SLOT(slotINDIDriver()), actionCollection(), "device_manager"); - tmpAction = new TDEAction(i18n("Capture Image Sequence..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImageSequence()), actionCollection(), "capture_sequence"); + tmpAction = new TDEAction(i18n("Capture Image Sequence..."), 0, this, TQ_SLOT(slotImageSequence()), actionCollection(), "capture_sequence"); tmpAction->setEnabled(false); - tmpAction = new TDEAction(i18n("INDI Control Panel..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIPanel()), actionCollection(), "indi_control_panel"); + tmpAction = new TDEAction(i18n("INDI Control Panel..."), 0, this, TQ_SLOT(slotINDIPanel()), actionCollection(), "indi_control_panel"); tmpAction->setEnabled(false); - new TDEAction(i18n("Configure INDI..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIConf()), actionCollection(), "configure_indi"); + new TDEAction(i18n("Configure INDI..."), 0, this, TQ_SLOT(slotINDIConf()), actionCollection(), "configure_indi"); //Help Menu: new TDEAction( i18n( "Tip of the Day" ), "idea", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotTipOfDay() ), actionCollection(), "help_tipofday" ); + this, TQ_SLOT( slotTipOfDay() ), actionCollection(), "help_tipofday" ); //Handbook toolBar item: new TDEAction( i18n( "&Handbook" ), "contents", TDEShortcut( "F1" ), - TQT_TQOBJECT(this), TQT_SLOT( appHelpActivated() ), actionCollection(), "handbook" ); + this, TQ_SLOT( appHelpActivated() ), actionCollection(), "handbook" ); // //viewToolBar actions: @@ -254,39 +254,39 @@ void KStars::initActions() { //show_stars: a = new TDEToggleAction( i18n( "Toggle Stars" ), "kstars_stars", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_stars" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_stars" ); //show_deepsky: a = new TDEToggleAction( i18n( "Toggle Deep Sky Objects" ), "kstars_deepsky", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_deepsky" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_deepsky" ); //show_planets: a = new TDEToggleAction( i18n( "Toggle Solar System" ), "kstars_planets", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_planets" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_planets" ); //show_clines: a = new TDEToggleAction( i18n( "Toggle Constellation Lines" ), "kstars_clines", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_clines" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_clines" ); //show_cnames: a = new TDEToggleAction( i18n( "Toggle Constellation Names" ), "kstars_cnames", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cnames" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_cnames" ); //show_cbound: a = new TDEToggleAction( i18n( "Toggle Constellation Boundaries" ), "kstars_cbound", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cbounds" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_cbounds" ); //show_mw: a = new TDEToggleAction( i18n( "Toggle Milky Way" ), "kstars_mw", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_mw" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_mw" ); //show_grid: a = new TDEToggleAction( i18n( "Toggle Coordinate Grid" ), "kstars_grid", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_grid" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_grid" ); //show_horizon: a = new TDEToggleAction( i18n( "Toggle Ground" ), "kstars_horizon", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_horizon" ); + 0, this, TQ_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(); - TDEToggleAction *kta = new TDEToggleAction( nm, 0, TQT_TQOBJECT(this), TQT_SLOT( slotTargetSymbol() ), + TDEToggleAction *kta = new TDEToggleAction( nm, 0, this, TQ_SLOT( slotTargetSymbol() ), actionCollection(), nm.utf8() ); kta->setExclusiveGroup( "fovsymbol" ); if ( nm == Options::fOVName() ) kta->setChecked( true ); @@ -339,7 +339,7 @@ void KStars::initFOV() { } fovActionMenu->popupMenu()->insertSeparator(); - fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); + fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, this, TQ_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); } void KStars::initStatusBar() { @@ -365,7 +365,7 @@ void KStars::initStatusBar() { void KStars::datainitFinished(bool worked) { if (!worked) { - kapp->quit(); + tdeApp->quit(); return; } @@ -459,7 +459,7 @@ void KStars::privatedata::buildGUI() { ks->skymap = new SkyMap( ks->data(), ks->centralWidget ); // update skymap if KStarsData send update signal - TQObject::connect(kstarsData, TQT_SIGNAL( update() ), ks->skymap, TQT_SLOT( forceUpdateNow() ) ); + TQObject::connect(kstarsData, TQ_SIGNAL( update() ), ks->skymap, TQ_SLOT( forceUpdateNow() ) ); // get focus of keyboard and mouse actions (for example zoom in with +) ks->map()->TQWidget::setFocus(); @@ -484,11 +484,11 @@ void KStars::privatedata::buildGUI() { //Changing the timestep needs to propagate to the clock, check if slew mode should be //(dis)engaged, and return input focus to the skymap. - connect( ks->TimeStep, TQT_SIGNAL( scaleChanged( float ) ), ks->data(), TQT_SLOT( setTimeDirection( float ) ) ); - connect( ks->TimeStep, TQT_SIGNAL( scaleChanged( float ) ), ks->data()->clock(), TQT_SLOT( setScale( float )) ); -// connect( ks->TimeStep, TQT_SIGNAL( scaleChanged( float ) ), ks->skymap, TQT_SLOT( slotClockSlewing() ) ); - connect( ks->data()->clock(), TQT_SIGNAL( scaleChanged( float ) ), ks->map(), TQT_SLOT( slotClockSlewing() ) ); - connect( ks->TimeStep, TQT_SIGNAL( scaleChanged( float ) ), ks, TQT_SLOT( mapGetsFocus() ) ); + connect( ks->TimeStep, TQ_SIGNAL( scaleChanged( float ) ), ks->data(), TQ_SLOT( setTimeDirection( float ) ) ); + connect( ks->TimeStep, TQ_SIGNAL( scaleChanged( float ) ), ks->data()->clock(), TQ_SLOT( setScale( float )) ); +// connect( ks->TimeStep, TQ_SIGNAL( scaleChanged( float ) ), ks->skymap, TQ_SLOT( slotClockSlewing() ) ); + connect( ks->data()->clock(), TQ_SIGNAL( scaleChanged( float ) ), ks->map(), TQ_SLOT( slotClockSlewing() ) ); + connect( ks->TimeStep, TQ_SIGNAL( scaleChanged( float ) ), ks, TQ_SLOT( mapGetsFocus() ) ); ks->resize( Options::windowWidth(), Options::windowHeight() ); @@ -507,11 +507,11 @@ void KStars::privatedata::buildGUI() { ks->data()->initGuides(&tempnum); //Connect the clock. - TQObject::connect( ks->data()->clock(), TQT_SIGNAL( timeAdvanced() ), ks, TQT_SLOT( updateTime() ) ); - TQObject::connect( ks->data()->clock(), TQT_SIGNAL( timeChanged() ), ks, TQT_SLOT( updateTime() ) ); + TQObject::connect( ks->data()->clock(), TQ_SIGNAL( timeAdvanced() ), ks, TQ_SLOT( updateTime() ) ); + TQObject::connect( ks->data()->clock(), TQ_SIGNAL( timeChanged() ), ks, TQ_SLOT( updateTime() ) ); // Connect cache function - TQObject::connect( kstarsData, TQT_SIGNAL( clearCache() ), ks, TQT_SLOT( clearCachedFindDialog() ) ); + TQObject::connect( kstarsData, TQ_SIGNAL( clearCache() ), ks, TQ_SLOT( clearCachedFindDialog() ) ); SkyPoint newPoint; if ( ks->data()->useDefaultOptions ) { @@ -578,5 +578,5 @@ void KStars::privatedata::buildGUI() { if ( Options::zoomFactor() >= MAXZOOM ) ks->actionCollection()->action("zoom_in")->setEnabled( false ); if ( Options::zoomFactor() <= MINZOOM ) ks->actionCollection()->action("zoom_out")->setEnabled( false ); - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); } diff --git a/kstars/kstars/kstarsinterface.h b/kstars/kstars/kstarsinterface.h index 5bf2aa2c..2df3adc4 100644 --- a/kstars/kstars/kstarsinterface.h +++ b/kstars/kstars/kstarsinterface.h @@ -107,7 +107,7 @@ class KStarsInterface : virtual public DCOPObject /**Turn tracking mode on or off. If tracking is on, then the coordinates at *the center of the screen remain fixed with time. If tracking is off, then *the sky "drifts" past the screen at the sidereal rate. - *@param track if TRUE, turn tracking on; otherwise turn it off. + *@param track if true, turn tracking on; otherwise turn it off. */ virtual ASYNC setTracking( bool track ) = 0; diff --git a/kstars/kstars/kstarssplash.cpp b/kstars/kstars/kstarssplash.cpp index 4867c0fd..cb850820 100644 --- a/kstars/kstars/kstarssplash.cpp +++ b/kstars/kstars/kstarssplash.cpp @@ -54,9 +54,9 @@ KStarsSplash::KStarsSplash( TQWidget *parent, const char* name ) //initialize the "Welcome to KStars message label label = new TQLabel( page, "label1" ); TQPalette pal( label->palette() ); - pal.setColor( TQPalette::Normal, TQColorGroup::Background, TQColor( "Black" ) ); + pal.setColor( TQPalette::Active, TQColorGroup::Background, TQColor( "Black" ) ); pal.setColor( TQPalette::Inactive, TQColorGroup::Background, TQColor( "Black" ) ); - pal.setColor( TQPalette::Normal, TQColorGroup::Foreground, TQColor( "White" ) ); + pal.setColor( TQPalette::Active, TQColorGroup::Foreground, TQColor( "White" ) ); pal.setColor( TQPalette::Inactive, TQColorGroup::Foreground, TQColor( "White" ) ); label->setPalette( pal ); label->setAlignment( AlignHCenter ); @@ -97,7 +97,7 @@ void KStarsSplash::setMessage( TQString s ) { *repaint call will queued in event buffer. With flush all X11 events of *this application will flushed. */ - kapp->flush(); + tdeApp->flush(); } #include "kstarssplash.moc" diff --git a/kstars/kstars/kstarssplash.h b/kstars/kstars/kstarssplash.h index 66b327d6..996606d0 100644 --- a/kstars/kstars/kstarssplash.h +++ b/kstars/kstars/kstarssplash.h @@ -32,7 +32,7 @@ class TQLabel; class KStarsSplash : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/ksutils.cpp b/kstars/kstars/ksutils.cpp index 666b9117..44b87b2b 100644 --- a/kstars/kstars/ksutils.cpp +++ b/kstars/kstars/ksutils.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include "ksutils.h" diff --git a/kstars/kstars/kswizard.cpp b/kstars/kstars/kswizard.cpp index 1c4ed73d..ff8015dc 100644 --- a/kstars/kstars/kswizard.cpp +++ b/kstars/kstars/kswizard.cpp @@ -86,14 +86,14 @@ KSWizard::KSWizard( TQWidget *parent, const char *name ) #endif //connect signals/slots - connect( CityListBox, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotChangeCity() ) ); - connect( CityFilter, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotFilterCities() ) ); - connect( ProvinceFilter, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotFilterCities() ) ); - connect( CountryFilter, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotFilterCities() ) ); + connect( CityListBox, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotChangeCity() ) ); + connect( CityFilter, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotFilterCities() ) ); + connect( ProvinceFilter, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotFilterCities() ) ); + connect( CountryFilter, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotFilterCities() ) ); //Uncomment if we ever need the telescope page... -// connect( TelescopeWizardButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTelescopeSetup() ) ); +// connect( TelescopeWizardButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotTelescopeSetup() ) ); #if ( KDE_IS_VERSION( 3, 2, 90 ) ) - connect( DownloadButton, TQT_SIGNAL( clicked() ), ksw, TQT_SLOT( slotDownload() ) ); + connect( DownloadButton, TQ_SIGNAL( clicked() ), ksw, TQ_SLOT( slotDownload() ) ); #endif //Initialize Geographic Location page diff --git a/kstars/kstars/kswizard.h b/kstars/kstars/kswizard.h index 6cc832d6..061af9f3 100644 --- a/kstars/kstars/kswizard.h +++ b/kstars/kstars/kswizard.h @@ -38,7 +38,7 @@ class GeoLocation; class KSWizard : public KSWizardUI { -Q_OBJECT +TQ_OBJECT public: /** diff --git a/kstars/kstars/locationdialog.cpp b/kstars/kstars/locationdialog.cpp index 0ac2a751..6054440a 100644 --- a/kstars/kstars/locationdialog.cpp +++ b/kstars/kstars/locationdialog.cpp @@ -19,7 +19,7 @@ #include <stdio.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <klineedit.h> #include <tqlayout.h> @@ -180,21 +180,21 @@ LocationDialog::LocationDialog( TQWidget* parent ) CoordLay->activate(); RootLay->activate(); - connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( reject() ) ); - connect( CityFilter, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( filterCity() ) ); - connect( ProvinceFilter, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( filterCity() ) ); - connect( CountryFilter, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( filterCity() ) ); - connect( NewCityName, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( nameChanged() ) ); - connect( NewProvinceName, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( nameChanged() ) ); - connect( NewCountryName, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( nameChanged() ) ); - connect( NewLong, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( dataChanged() ) ); - connect( NewLat, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( dataChanged() ) ); - connect( TZBox, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( dataChanged() ) ); - connect( TZRuleBox, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( dataChanged() ) ); - connect( GeoBox, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( changeCity() ) ); - connect( AddCityButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addCity() ) ); - connect( ClearFields, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clearFields() ) ); - connect( ShowTZRules, TQT_SIGNAL( clicked() ), this, TQT_SLOT( showTZRules() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( reject() ) ); + connect( CityFilter, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( filterCity() ) ); + connect( ProvinceFilter, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( filterCity() ) ); + connect( CountryFilter, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( filterCity() ) ); + connect( NewCityName, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( nameChanged() ) ); + connect( NewProvinceName, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( nameChanged() ) ); + connect( NewCountryName, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( nameChanged() ) ); + connect( NewLong, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( dataChanged() ) ); + connect( NewLat, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( dataChanged() ) ); + connect( TZBox, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( dataChanged() ) ); + connect( TZRuleBox, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( dataChanged() ) ); + connect( GeoBox, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( changeCity() ) ); + connect( AddCityButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addCity() ) ); + connect( ClearFields, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clearFields() ) ); + connect( ShowTZRules, TQ_SIGNAL( clicked() ), this, TQ_SLOT( showTZRules() ) ); dataModified = false; nameModified = false; diff --git a/kstars/kstars/locationdialog.h b/kstars/kstars/locationdialog.h index b4756898..590948fb 100644 --- a/kstars/kstars/locationdialog.h +++ b/kstars/kstars/locationdialog.h @@ -57,7 +57,7 @@ class MapCanvas; class dmsBox; class LocationDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/main.cpp b/kstars/kstars/main.cpp index 8a516860..f8d12121 100644 --- a/kstars/kstars/main.cpp +++ b/kstars/kstars/main.cpp @@ -94,15 +94,15 @@ int main(int argc, char *argv[]) } KStarsData *dat = new KStarsData(); - TQObject::connect( dat, TQT_SIGNAL( progressText(TQString) ), dat, TQT_SLOT( slotConsoleMessage(TQString) ) ); + TQObject::connect( dat, TQ_SIGNAL( progressText(TQString) ), dat, TQ_SLOT( slotConsoleMessage(TQString) ) ); dat->initialize(); - while (!dat->startupComplete) { kapp->processEvents(50); } + while (!dat->startupComplete) { tdeApp->processEvents(50); } //Set Geographic Location dat->setLocationFromOptions(); //Set color scheme - dat->colorScheme()->loadFromConfig( kapp->config() ); + dat->colorScheme()->loadFromConfig( tdeApp->config() ); //set clock now that we have a location: //Check to see if user provided a date/time string. If not, use current CPU time @@ -111,13 +111,13 @@ int main(int argc, char *argv[]) if ( ! datestring.isEmpty() ) { if ( datestring.contains( "-" ) ) { //assume ISODate format if ( datestring.contains( ":" ) ) { //also includes time - kdt = KStarsDateTime::fromString( datestring, Qt::ISODate ); + kdt = KStarsDateTime::fromString( datestring, TQt::ISODate ); } else { //string probably contains date only - kdt.setDate( ExtDate::fromString( datestring, Qt::ISODate ) ); + kdt.setDate( ExtDate::fromString( datestring, TQt::ISODate ) ); kdt.setTime( TQTime( 0, 0, 0 ) ); } } else { //assume Text format for date string - kdt = dat->geo()->LTtoUT( KStarsDateTime::fromString( datestring, Qt::TextDate ) ); + kdt = dat->geo()->LTtoUT( KStarsDateTime::fromString( datestring, TQt::TextDate ) ); } if ( ! kdt.isValid() ) { @@ -160,10 +160,10 @@ int main(int argc, char *argv[]) dat->setFullTimeUpdate(); dat->updateTime(dat->geo(), map ); - kapp->processEvents(100000); + tdeApp->processEvents(100000); map->setMapGeometry(); - map->exportSkyImage( TQT_TQPAINTDEVICE(&sky) ); - kapp->processEvents(100000); + map->exportSkyImage( &sky ); + tdeApp->processEvents(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; @@ -185,7 +185,7 @@ int main(int argc, char *argv[]) new KStars( true, ! args->isSet( "paused" ), datestring ); args->clear(); - TQObject::connect(kapp, TQT_SIGNAL(lastWindowClosed()), kapp, TQT_SLOT(quit())); + TQObject::connect(tdeApp, TQ_SIGNAL(lastWindowClosed()), tdeApp, TQ_SLOT(quit())); return a.exec(); } diff --git a/kstars/kstars/mapcanvas.cpp b/kstars/kstars/mapcanvas.cpp index 6059c1c7..0c2c081b 100644 --- a/kstars/kstars/mapcanvas.cpp +++ b/kstars/kstars/mapcanvas.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include <stdlib.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqpainter.h> #include <tqpixmap.h> diff --git a/kstars/kstars/mapcanvas.h b/kstars/kstars/mapcanvas.h index 60742d62..8900e4eb 100644 --- a/kstars/kstars/mapcanvas.h +++ b/kstars/kstars/mapcanvas.h @@ -37,7 +37,7 @@ class TQPixmap; class MapCanvas : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /**Default constructor. Initialize the widget: create pixmaps, load the diff --git a/kstars/kstars/objectnamelist.h b/kstars/kstars/objectnamelist.h index 63f5349a..4ff9bbb5 100644 --- a/kstars/kstars/objectnamelist.h +++ b/kstars/kstars/objectnamelist.h @@ -56,7 +56,7 @@ class ObjectNameList { /**Appends a skyobject to the list. *@param object pointer to the SkyObject to be appended to the list. - *@param useLongName if TRUE, use the longname of the object, + *@param useLongName if true, use the longname of the object, *rather than the primary name */ void append(SkyObject *object, bool useLongName=false); diff --git a/kstars/kstars/opsadvanced.cpp b/kstars/kstars/opsadvanced.cpp index 83cad040..50086e69 100644 --- a/kstars/kstars/opsadvanced.cpp +++ b/kstars/kstars/opsadvanced.cpp @@ -32,9 +32,9 @@ OpsAdvanced::OpsAdvanced( TQWidget *p, const char *name, WFlags fl ) //Initialize the timestep value SlewTimeScale->tsbox()->changeScale( Options::slewTimeScale() ); - connect( SlewTimeScale, TQT_SIGNAL( scaleChanged( float ) ), this, TQT_SLOT( slotChangeTimeScale( float ) ) ); + connect( SlewTimeScale, TQ_SIGNAL( scaleChanged( float ) ), this, TQ_SLOT( slotChangeTimeScale( float ) ) ); - connect( kcfg_HideOnSlew, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotToggleHideOptions() ) ); + connect( kcfg_HideOnSlew, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotToggleHideOptions() ) ); } OpsAdvanced::~OpsAdvanced() {} diff --git a/kstars/kstars/opsadvanced.h b/kstars/kstars/opsadvanced.h index ed107ea8..cb337dac 100644 --- a/kstars/kstars/opsadvanced.h +++ b/kstars/kstars/opsadvanced.h @@ -35,7 +35,7 @@ class KStars; class OpsAdvanced : public OpsAdvancedUI { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/opscatalog.cpp b/kstars/kstars/opscatalog.cpp index 71909872..07282cbf 100644 --- a/kstars/kstars/opscatalog.cpp +++ b/kstars/kstars/opscatalog.cpp @@ -64,17 +64,17 @@ OpsCatalog::OpsCatalog( TQWidget *p, const char *name, WFlags fl ) newItem->setOn( Options::showCatalog()[i] ); } - connect( CatalogList, TQT_SIGNAL( clicked( TQListViewItem* ) ), this, TQT_SLOT( updateDisplay() ) ); - connect( CatalogList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( selectCatalog() ) ); - connect( AddCatalog, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddCatalog() ) ); - connect( LoadCatalog, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotLoadCatalog() ) ); - connect( RemoveCatalog, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveCatalog() ) ); - - connect( kcfg_MagLimitDrawStar, TQT_SIGNAL( valueChanged(double) ), - TQT_SLOT( slotSetDrawStarMagnitude(double) ) ); - connect( kcfg_MagLimitDrawStarZoomOut, TQT_SIGNAL( valueChanged(double) ), - TQT_SLOT( slotSetDrawStarZoomOutMagnitude(double) ) ); - connect( kcfg_ShowStars, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotStarWidgets(bool) ) ); + connect( CatalogList, TQ_SIGNAL( clicked( TQListViewItem* ) ), this, TQ_SLOT( updateDisplay() ) ); + connect( CatalogList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( selectCatalog() ) ); + connect( AddCatalog, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddCatalog() ) ); + connect( LoadCatalog, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotLoadCatalog() ) ); + connect( RemoveCatalog, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveCatalog() ) ); + + connect( kcfg_MagLimitDrawStar, TQ_SIGNAL( valueChanged(double) ), + TQ_SLOT( slotSetDrawStarMagnitude(double) ) ); + connect( kcfg_MagLimitDrawStarZoomOut, TQ_SIGNAL( valueChanged(double) ), + TQ_SLOT( slotSetDrawStarZoomOutMagnitude(double) ) ); + connect( kcfg_ShowStars, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotStarWidgets(bool) ) ); } //empty destructor @@ -82,7 +82,7 @@ OpsCatalog::~OpsCatalog() {} void OpsCatalog::updateDisplay() { //Modify display according to settings in the CatalogList - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "CatalogList" ) ) + if ( sender()->name() == TQString( "CatalogList" ) ) Options::setShowDeepSky( true ); Options::setShowMessier( showMessier->isOn() ); diff --git a/kstars/kstars/opscatalog.h b/kstars/kstars/opscatalog.h index 1f31be9d..2cb1f852 100644 --- a/kstars/kstars/opscatalog.h +++ b/kstars/kstars/opscatalog.h @@ -38,7 +38,7 @@ class TQCheckListItem; class OpsCatalog : public OpsCatalogUI { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/opscolors.cpp b/kstars/kstars/opscolors.cpp index 1b7bcbb7..e9456b98 100644 --- a/kstars/kstars/opscolors.cpp +++ b/kstars/kstars/opscolors.cpp @@ -24,7 +24,7 @@ #include <kcolordialog.h> #include <tdemessagebox.h> #include <kinputdialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "opscolors.h" #include "kstars.h" @@ -82,12 +82,12 @@ OpsColors::OpsColors( TQWidget *p, const char *name, WFlags fl ) else kcfg_StarColorIntensity->setEnabled( true ); - connect( ColorPalette, TQT_SIGNAL( clicked( TQListBoxItem* ) ), this, TQT_SLOT( newColor( TQListBoxItem* ) ) ); - connect( kcfg_StarColorIntensity, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotStarColorIntensity( int ) ) ); - connect( kcfg_StarColorMode, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotStarColorMode( int ) ) ); - connect( PresetBox, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( slotPreset( int ) ) ); - connect( AddPreset, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddPreset() ) ); - connect( RemovePreset, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemovePreset() ) ); + connect( ColorPalette, TQ_SIGNAL( clicked( TQListBoxItem* ) ), this, TQ_SLOT( newColor( TQListBoxItem* ) ) ); + connect( kcfg_StarColorIntensity, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotStarColorIntensity( int ) ) ); + connect( kcfg_StarColorMode, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotStarColorMode( int ) ) ); + connect( PresetBox, TQ_SIGNAL( highlighted( int ) ), this, TQ_SLOT( slotPreset( int ) ) ); + connect( AddPreset, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddPreset() ) ); + connect( RemovePreset, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemovePreset() ) ); RemovePreset->setEnabled( false ); } @@ -190,13 +190,13 @@ void OpsColors::slotRemovePreset() { //Remove entry from the ListBox and from the TQStringList holding filenames. //We don't want another color scheme to be selected, so first //temporarily disconnect the "highlighted" signal. - disconnect( PresetBox, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( slotPreset( int ) ) ); + disconnect( PresetBox, TQ_SIGNAL( highlighted( int ) ), this, TQ_SLOT( slotPreset( int ) ) ); PresetBox->removeItem( PresetBox->currentItem() ); PresetBox->setCurrentItem( -1 ); RemovePreset->setEnabled( false ); //Reconnect the "highlighted" signal - connect( PresetBox, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( slotPreset( int ) ) ); + connect( PresetBox, TQ_SIGNAL( highlighted( int ) ), this, TQ_SLOT( slotPreset( int ) ) ); //Read the contents of colors.dat into a TQStringList, except for the entry to be removed. TQTextStream stream( &cdatFile ); diff --git a/kstars/kstars/opscolors.h b/kstars/kstars/opscolors.h index 87f36997..ef9aed5d 100644 --- a/kstars/kstars/opscolors.h +++ b/kstars/kstars/opscolors.h @@ -40,7 +40,7 @@ class KStars; class OpsColors : public OpsColorsUI { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/opsguides.cpp b/kstars/kstars/opsguides.cpp index 7b554280..48a9bee0 100644 --- a/kstars/kstars/opsguides.cpp +++ b/kstars/kstars/opsguides.cpp @@ -21,10 +21,10 @@ OpsGuides::OpsGuides( TQWidget* parent, const char* name, WFlags fl ) : OpsGuidesUI( parent, name, fl ) { - connect( kcfg_ShowCNames, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotToggleConstellOptions() ) ); - connect( kcfg_ShowMilkyWay, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotToggleMilkyWayOptions() ) ); + connect( kcfg_ShowCNames, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotToggleConstellOptions() ) ); + connect( kcfg_ShowMilkyWay, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotToggleMilkyWayOptions() ) ); } OpsGuides::~OpsGuides() diff --git a/kstars/kstars/opsguides.h b/kstars/kstars/opsguides.h index 3658d3be..b7a6b9e2 100644 --- a/kstars/kstars/opsguides.h +++ b/kstars/kstars/opsguides.h @@ -21,7 +21,7 @@ class OpsGuides : public OpsGuidesUI { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/opssolarsystem.cpp b/kstars/kstars/opssolarsystem.cpp index 90202a56..e9426c46 100644 --- a/kstars/kstars/opssolarsystem.cpp +++ b/kstars/kstars/opssolarsystem.cpp @@ -26,11 +26,11 @@ OpsSolarSystem::OpsSolarSystem( TQWidget *parent, const char *name, WFlags fl ) { ksw = (KStars *)parent; - connect( kcfg_ShowAsteroids, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotAsteroidWidgets(bool) ) ); - connect( kcfg_ShowComets, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotCometWidgets(bool) ) ); - connect( ClearAllTrails, TQT_SIGNAL( clicked() ), ksw, TQT_SLOT( slotClearAllTrails() ) ); - connect( showAllPlanets, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSelectPlanets() ) ); - connect( showNonePlanets, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSelectPlanets() ) ); + connect( kcfg_ShowAsteroids, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotAsteroidWidgets(bool) ) ); + connect( kcfg_ShowComets, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotCometWidgets(bool) ) ); + connect( ClearAllTrails, TQ_SIGNAL( clicked() ), ksw, TQ_SLOT( slotClearAllTrails() ) ); + connect( showAllPlanets, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSelectPlanets() ) ); + connect( showNonePlanets, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSelectPlanets() ) ); slotAsteroidWidgets( kcfg_ShowAsteroids->isChecked() ); slotCometWidgets( kcfg_ShowComets->isChecked() ); @@ -58,7 +58,7 @@ void OpsSolarSystem::slotCometWidgets( bool on ) { void OpsSolarSystem::slotSelectPlanets() { bool b=true; - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "showNonePlanets" ) ) b = false; + if ( 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 97fbb87c..5fd964d3 100644 --- a/kstars/kstars/opssolarsystem.h +++ b/kstars/kstars/opssolarsystem.h @@ -31,7 +31,7 @@ class KStars; */ class OpsSolarSystem : public OpsSolarSystemUI { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/planetcatalog.cpp b/kstars/kstars/planetcatalog.cpp index 3367f35c..34579fea 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 TQList + // do NOT delete Sun. It is also in the TQPtrList // and will be deleted automatically. // delete Earth; diff --git a/kstars/kstars/planetcatalog.h b/kstars/kstars/planetcatalog.h index 0a7f4556..c6337b2a 100644 --- a/kstars/kstars/planetcatalog.h +++ b/kstars/kstars/planetcatalog.h @@ -47,7 +47,7 @@ class ObjectNameList; class dms; class PlanetCatalog : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/simclock.cpp b/kstars/kstars/simclock.cpp index 25fe72d9..2bb5ae3b 100644 --- a/kstars/kstars/simclock.cpp +++ b/kstars/kstars/simclock.cpp @@ -38,7 +38,7 @@ SimClock::SimClock(TQObject *parent, const KStarsDateTime &when) : ManualMode = false; ManualActive = false; - TQObject::connect(&tmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(tick())); + TQObject::connect(&tmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(tick())); } SimClock::SimClock (const SimClock &old) : @@ -54,7 +54,7 @@ SimClock::SimClock (const SimClock &old) : ManualMode = old.ManualMode; ManualActive = old.ManualActive; - TQObject::connect(&tmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(tick())); + TQObject::connect(&tmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(tick())); } void SimClock::tick() { diff --git a/kstars/kstars/simclock.h b/kstars/kstars/simclock.h index 51ac4576..5a81f008 100644 --- a/kstars/kstars/simclock.h +++ b/kstars/kstars/simclock.h @@ -31,7 +31,7 @@ */ class SimClock : public TQObject, public SimClockInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/skymap.cpp b/kstars/kstars/skymap.cpp index f236be0a..16150d16 100644 --- a/kstars/kstars/skymap.cpp +++ b/kstars/kstars/skymap.cpp @@ -21,7 +21,7 @@ #include <kstatusbar.h> #include <tdemessagebox.h> #include <tdeaction.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqmemarray.h> #include <tqpointarray.h> @@ -72,7 +72,7 @@ SkyMap::SkyMap(KStarsData *d, TQWidget *parent, const char *name ) setBackgroundColor( TQColor( data->colorScheme()->colorNamed( "SkyColor" ) ) ); setBackgroundMode( TQWidget::NoBackground ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setMinimumSize( 380, 250 ); setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); @@ -91,8 +91,8 @@ SkyMap::SkyMap(KStarsData *d, TQWidget *parent, const char *name ) //Initialize Transient label stuff TransientTimeout = 100; //fade label color every 0.2 sec - connect( &HoverTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTransientLabel() ) ); - connect( &TransientTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTransientTimeout() ) ); + connect( &HoverTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTransientLabel() ) ); + connect( &TransientTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTransientTimeout() ) ); IBoxes = new InfoBoxes( Options::windowWidth(), Options::windowHeight(), Options::positionTimeBox(), Options::shadeTimeBox(), @@ -111,14 +111,14 @@ SkyMap::SkyMap(KStarsData *d, TQWidget *parent, const char *name ) IBoxes->geoChanged( data->geo() ); - connect( IBoxes->timeBox(), TQT_SIGNAL( shaded(bool) ), data, TQT_SLOT( saveTimeBoxShaded(bool) ) ); - connect( IBoxes->geoBox(), TQT_SIGNAL( shaded(bool) ), data, TQT_SLOT( saveGeoBoxShaded(bool) ) ); - connect( IBoxes->focusBox(), TQT_SIGNAL( shaded(bool) ), data, TQT_SLOT( saveFocusBoxShaded(bool) ) ); - connect( IBoxes->timeBox(), TQT_SIGNAL( moved(TQPoint) ), data, TQT_SLOT( saveTimeBoxPos(TQPoint) ) ); - connect( IBoxes->geoBox(), TQT_SIGNAL( moved(TQPoint) ), data, TQT_SLOT( saveGeoBoxPos(TQPoint) ) ); - connect( IBoxes->focusBox(), TQT_SIGNAL( moved(TQPoint) ), data, TQT_SLOT( saveFocusBoxPos(TQPoint) ) ); + connect( IBoxes->timeBox(), TQ_SIGNAL( shaded(bool) ), data, TQ_SLOT( saveTimeBoxShaded(bool) ) ); + connect( IBoxes->geoBox(), TQ_SIGNAL( shaded(bool) ), data, TQ_SLOT( saveGeoBoxShaded(bool) ) ); + connect( IBoxes->focusBox(), TQ_SIGNAL( shaded(bool) ), data, TQ_SLOT( saveFocusBoxShaded(bool) ) ); + connect( IBoxes->timeBox(), TQ_SIGNAL( moved(TQPoint) ), data, TQ_SLOT( saveTimeBoxPos(TQPoint) ) ); + connect( IBoxes->geoBox(), TQ_SIGNAL( moved(TQPoint) ), data, TQ_SLOT( saveGeoBoxPos(TQPoint) ) ); + connect( IBoxes->focusBox(), TQ_SIGNAL( moved(TQPoint) ), data, TQ_SLOT( saveFocusBoxPos(TQPoint) ) ); - connect( this, TQT_SIGNAL( destinationChanged() ), this, TQT_SLOT( slewFocus() ) ); + connect( this, TQ_SIGNAL( destinationChanged() ), this, TQ_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. @@ -650,7 +650,7 @@ void SkyMap::slotInfo( int id ) { TQString sURL = (*it); KURL url ( sURL ); if (!url.isEmpty()) - kapp->invokeBrowser(sURL); + tdeApp->invokeBrowser(sURL); } void SkyMap::slotBeginAngularDistance(void) { @@ -925,7 +925,7 @@ void SkyMap::slewFocus( void ) { fadeTransientLabel(); forceUpdate(); - kapp->processEvents(10); //keep up with other stuff + tdeApp->processEvents(10); //keep up with other stuff if ( Options::useAltAz() ) { dX = destination()->az()->Degrees() - focus()->az()->Degrees(); diff --git a/kstars/kstars/skymap.h b/kstars/kstars/skymap.h index 3f199d7a..55c4da2e 100644 --- a/kstars/kstars/skymap.h +++ b/kstars/kstars/skymap.h @@ -57,7 +57,7 @@ class DeepSkyObject; */ class SkyMap : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** @@ -161,8 +161,8 @@ public: void setFocusAltAz(double alt, double az); /**@short sets the destination point of the sky map. - *@note setDestination() emits the destinationChanged() SIGNAL, - *which triggers the TQT_SLOT function SkyMap::slewFocus(). This + *@note setDestination() emits the destinationChanged() signal, + *which triggers the slot function SkyMap::slewFocus(). This *function iteratively steps the Focus point toward Destination, *repainting the sky at each step (if Options::useAnimatedSlewing()==true). *@param f a pointer to the SkyPoint the map should slew to @@ -353,7 +353,7 @@ public: *so we save a lot of time by bringing the code which sets their values outside of checkVisibility() *(which must be run for each and every SkyPoint). setMapGeometry() is called once in paintEvent(). *The variables set by setMapGeometry are: - *@li isPoleVisible TRUE if a coordinate Pole is on-screen + *@li isPoleVisible true if a coordinate Pole is on-screen *@li XMax the horizontal center-to-edge angular distance *@li guideXMax a version of XMax used for guide lines (same as XMax at low zoom; 2x XMAX otherwise) *@li guideFOV similar to guideXMax, but for the vertical direction. @@ -431,7 +431,7 @@ public slots: *There are two cases: the true altitude is known, and the apparent altitude is needed; *or the apparent altitude is known and the true altitude is needed. *@param alt The input altitude - *@param findApparent if TRUE, then alt is the true altitude, and we'll find the apparent alt. + *@param findApparent if true, then alt is the true altitude, and we'll find the apparent alt. *@return the corrected altitude, as a dms object. */ dms refract( const dms *alt, bool findApparent ); @@ -445,7 +445,7 @@ public slots: /**@short Center the display at the point ClickedPoint. * *The essential part of the function is to simply set the Destination point, which will emit - *the destinationChanged() SIGNAL, which triggers the slewFocus() SLOT. Additionally, this + *the destinationChanged() signal, which triggers the slewFocus() slot. Additionally, this *function performs some bookkeeping tasks, such updating whether we are tracking the new *object/position, adding a Planet Trail if required, etc. * @@ -699,8 +699,8 @@ private: *@param psky reference to the TQPainter on which to draw (either the sky pixmap or printer device) *@param catalog List of pointers to the objects in a particular deep-sky catalog. *@param color The color to be used when drawing the symbols for this catalog. - *@param drawObject if TRUE, the object symbols will be drawn - *@param drawImage if TRUE, the object images will be drawn + *@param drawObject if true, the object symbols will be drawn + *@param drawImage if true, the object images will be drawn *@param scale the scaling factor. We use the default value (1.0) everywhere, except when printing. */ void drawDeepSkyCatalog( TQPainter& psky, TQPtrList<DeepSkyObject>& catalog, TQColor& color, bool drawObject, bool drawImage, double scale = 1.0 ); @@ -717,14 +717,14 @@ private: /**@short Draw all solar system bodies: Sun, Moon, 8 planets, comets, asteroids. *@param psky reference to the TQPainter on which to draw (either the sky pixmap or printer device) - *@param drawPlanets if FALSE, do nothing + *@param drawPlanets if false, do nothing *@param scale the scaling factor. We use the default value (1.0) everywhere, except when printing. */ void drawSolarSystem( TQPainter& psky, bool drawPlanets, double scale = 1.0 ); /**@short Draw "User Labels". User labels are name labels attached to objects manually with *the right-click popup menu. Also adds a label to the FocusObject if the Option UseAutoLabel - *is TRUE. + *is true. *@param psky reference to the TQPainter on which to draw (either the sky pixmap or printer device) *@param scale the scaling factor. We use the default value (1.0) everywhere, except when printing. */ @@ -815,8 +815,8 @@ private: *pixel coordinates in the SkyMap. *@return TQPoint containing screen pixel x, y coordinates of SkyPoint. *@param o pointer to the SkyPoint for which to calculate x, y coordinates. - *@param Horiz if TRUE, use Alt/Az coordinates. - *@param doRefraction if TRUE, correct for atmospheric refraction + *@param Horiz if true, use Alt/Az coordinates. + *@param doRefraction if true, correct for atmospheric refraction *@param scale scaling factor (unused?) */ TQPoint getXY( SkyPoint *o, bool Horiz, bool doRefraction=true, double scale = 1.0 ); @@ -825,10 +825,10 @@ 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 the 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 + *@param doRefraction if true, correct for atmospheric refraction */ SkyPoint dXdYToRaDec( double dx, double dy, bool Horiz, dms *LST, const dms *lat, bool doRefraction=true ); @@ -849,7 +849,7 @@ private: * *The function first checks the difference between the Declination/Altitude *coordinate of the Focus position, and that of the point p. If the absolute - *value of this difference is larger than fov, then the function returns FALSE. + *value of this difference is larger than fov, then the function returns false. *For most configurations of the sky map window, this simple check is enough to *exclude a large number of objects. * @@ -857,7 +857,7 @@ private: *(Equatorial or 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 + *If a Pole is visible, then it will return true immediately. The idea is that *when a pole is on-screen it is computationally expensive to determine whether *a particular position is on-screen or not: for many valid Dec/Alt values, *all* *values of RA/Az will indeed be onscreen, but for other valid Dec/Alt values, @@ -867,8 +867,8 @@ private: * *Finally, if no Pole is onscreen, it checks the difference between the Focus *position's RA/Az coordinate and that of the point p. If the absolute value of - *this difference is larger than XMax, the function returns FALSE. Otherwise, - *it returns TRUE. + *this difference is larger than XMax, the function returns false. Otherwise, + *it returns true. *@param p pointer to the skypoint to be checked. *@param fov the vertical center-to-edge angle of the window, in degrees @@ -885,8 +885,8 @@ private: *NULL pointer, and the TransientTimer is not already active. These conditions *are met when the mouse did not move for HOVER_INTERVAL msec (triggering a *TransientLabel), but the mouse has since been moved, thus ending the Hover event. - *This function merely starts the TransientTimer, whose timeout TQT_SIGNAL is - *connected to the slotTransientTimeout() SLOT, which handles the actual fading + *This function merely starts the TransientTimer, whose timeout signal is + *connected to the slotTransientTimeout() slot, which handles the actual fading *of the transient label, and eventually resets TransientObject to NULL. *@sa SkyMap::slotTransientLabel(), SkyMap::slotTransientTimeout() */ diff --git a/kstars/kstars/skymapdraw.cpp b/kstars/kstars/skymapdraw.cpp index ff7150f8..d9a2a25d 100644 --- a/kstars/kstars/skymapdraw.cpp +++ b/kstars/kstars/skymapdraw.cpp @@ -1578,7 +1578,7 @@ void SkyMap::drawPlanetTrail( TQPainter& psky, KSPlanetBase *ksp, double scale ) if ( ( o.x() >= -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 ( ! TQT_TQRECT_OBJECT(rect()).contains( o ) && ! TQT_TQRECT_OBJECT(rect()).contains( cur ) ) doDrawLine = false; + if ( ! rect().contains( o ) && ! rect().contains( cur ) ) doDrawLine = false; cur = o; if ( doDrawLine ) { diff --git a/kstars/kstars/skymapevents.cpp b/kstars/kstars/skymapevents.cpp index 8bc88002..8e4d0220 100644 --- a/kstars/kstars/skymapevents.cpp +++ b/kstars/kstars/skymapevents.cpp @@ -250,7 +250,7 @@ void SkyMap::keyPressEvent( TQKeyEvent *e ) { data->clock()->manualTick( true ); data->clock()->setScale( -1.0 * data->clock()->scale() ); //reset original sign of time step update(); - kapp->processEvents(); + tdeApp->processEvents(); break; case Key_Period: //advance one step forward in time @@ -258,7 +258,7 @@ void SkyMap::keyPressEvent( TQKeyEvent *e ) { if ( data->clock()->isActive() ) data->clock()->stop(); data->clock()->manualTick( true ); update(); - kapp->processEvents(); + tdeApp->processEvents(); break; //FIXME: Uncomment after feature thaw! @@ -629,12 +629,12 @@ void SkyMap::mouseReleaseEvent( TQMouseEvent * ) { void SkyMap::mousePressEvent( TQMouseEvent *e ) { //did we Grab an infoBox? - if ( e->button() == Qt::LeftButton && infoBoxes()->grabBox( e ) ) { + if ( e->button() == TQt::LeftButton && infoBoxes()->grabBox( e ) ) { update(); //refresh without redrawing skymap return; } - if ( (e->state() & ControlButton) && (e->button() == Qt::LeftButton) ) { + if ( (e->state() & ControlButton) && (e->button() == TQt::LeftButton) ) { ZoomRect.moveCenter( e->pos() ); setZoomMouseCursor(); update(); //refresh without redrawing skymap @@ -643,19 +643,19 @@ void SkyMap::mousePressEvent( TQMouseEvent *e ) { // if button is down and cursor is not moved set the move cursor after 500 ms TQTimer t; - t.singleShot (500, this, TQT_SLOT (setMouseMoveCursor())); + t.singleShot (500, this, TQ_SLOT (setMouseMoveCursor())); double dx = ( 0.5*width() - e->x() )/Options::zoomFactor(); double dy = ( 0.5*height() - e->y() )/Options::zoomFactor(); if (unusablePoint (dx, dy)) return; // break if point is unusable - if ( !midMouseButtonDown && e->button() == Qt::MidButton ) { + if ( !midMouseButtonDown && e->button() == TQt::MidButton ) { y0 = 0.5*height() - e->y(); //record y pixel coordinate for middle-button zooming midMouseButtonDown = true; } if ( !mouseButtonDown ) { - if ( e->button()==Qt::LeftButton ) { + if ( e->button()==TQt::LeftButton ) { mouseButtonDown = true; scrollCount = 0; } @@ -671,11 +671,11 @@ void SkyMap::mousePressEvent( TQMouseEvent *e ) { if ( clickedObject() ) { setClickedPoint( clickedObject() ); - if ( e->button() == Qt::RightButton ) { + if ( e->button() == TQt::RightButton ) { clickedObject()->showPopupMenu( pmenu, TQCursor::pos() ); } - if ( ksw && e->button() == Qt::LeftButton ) { + if ( ksw && e->button() == TQt::LeftButton ) { ksw->statusBar()->changeItem( clickedObject()->translatedLongName(), 0 ); } } else { @@ -684,10 +684,10 @@ void SkyMap::mousePressEvent( TQMouseEvent *e ) { setClickedObject( NULL ); switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: if ( ksw ) ksw->statusBar()->changeItem( i18n( "Empty sky" ), 0 ); break; - case Qt::RightButton: + case TQt::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() == Qt::LeftButton ) { + if ( e->button() == TQt::LeftButton ) { if ( infoBoxes()->shadeBox( e ) ) { update(); return; diff --git a/kstars/kstars/skyobject.cpp b/kstars/kstars/skyobject.cpp index 0f4e4d18..d6e07991 100644 --- a/kstars/kstars/skyobject.cpp +++ b/kstars/kstars/skyobject.cpp @@ -18,7 +18,7 @@ #include <iostream> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqpoint.h> #include <tqregexp.h> #include <tqfile.h> diff --git a/kstars/kstars/skyobject.h b/kstars/kstars/skyobject.h index b0742d9f..da86b5d8 100644 --- a/kstars/kstars/skyobject.h +++ b/kstars/kstars/skyobject.h @@ -172,14 +172,14 @@ public: *@return the local time that the object will rise *@param dt current UT date/time *@param geo current geographic location - *@param rst If TRUE, compute rise time. If FALSE, compute set time. + *@param rst If true, compute rise time. If false, compute set time. */ TQTime riseSetTime( const KStarsDateTime &dt, const GeoLocation *geo, bool rst ); /**@return the UT time when the object will rise or set *@param dt target date/time *@param geo pointer to Geographic location - *@param rst Boolean. If TRUE will compute rise time. If FALSE + *@param rst Boolean. If true will compute rise time. If false * will compute set time. */ TQTime riseSetTimeUT( const KStarsDateTime &dt, const GeoLocation *geo, bool rst); @@ -187,7 +187,7 @@ public: /**@return the LST time when the object will rise or set *@param dt target date/time *@param geo pointer to Geographic location - *@param rst Boolean. If TRUE will compute rise time. If FALSE + *@param rst Boolean. If true will compute rise time. If false * will compute set time. */ dms riseSetTimeLST( const KStarsDateTime &dt, const GeoLocation *geo, bool rst); @@ -196,7 +196,7 @@ public: *recomputes set or rise UT times. *@param dt target date/time *@param geo GeoLocation object - *@param rst Boolen. If TRUE will compute rise time. If FALSE + *@param rst Boolen. If true will compute rise time. If false * will compute set time. */ dms riseSetTimeAz( const KStarsDateTime &dt, const GeoLocation *geo, bool rst); @@ -262,7 +262,7 @@ private: *@param geo pointer to Geographic location *@param righta pointer to Right ascention of the object *@param decl pointer to Declination of the object - *@param rst Boolean. If TRUE will compute rise time. If FALSE + *@param rst Boolean. If true will compute rise time. If false * will compute set time. *@return the time at which the given position will rise or set. */ @@ -276,7 +276,7 @@ private: *@param gLt Geographic latitude *@param rga Right ascention of the object *@param decl Declination of the object - *@param rst Boolean. If TRUE will compute rise time. If FALSE + *@param rst Boolean. If true will compute rise time. If false * will compute set time. */ dms auxRiseSetTimeLST( const dms *gLt, const dms *rga, const dms *decl, bool rst ); diff --git a/kstars/kstars/stardatasink.h b/kstars/kstars/stardatasink.h index abfa23ee..59efb9eb 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 TQList of star data. It's an asynchronous io class. + *to a TQPtrList of star data. It's an asynchronous io class. *@author Thomas Kabelmann *@version 1.0 */ @@ -37,7 +37,7 @@ class StarDataSink : public TQObject, public TQDataSink { /** *class needs signals */ - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/streamwg.cpp b/kstars/kstars/streamwg.cpp index 696f3468..a8a2a9fb 100644 --- a/kstars/kstars/streamwg.cpp +++ b/kstars/kstars/streamwg.cpp @@ -63,8 +63,8 @@ FILE *wfp; imgFormatCombo->insertStrList(TQImage::outputFormats()); - connect(playB, TQT_SIGNAL(clicked()), this, TQT_SLOT(playPressed())); - connect(captureB, TQT_SIGNAL(clicked()), this, TQT_SLOT(captureImage())); + connect(playB, TQ_SIGNAL(clicked()), this, TQ_SLOT(playPressed())); + connect(captureB, TQ_SIGNAL(clicked()), this, TQ_SLOT(captureImage())); } @@ -112,7 +112,7 @@ void StreamWG::setColorFrame(bool color) // callback notified sNotifier = new TQSocketNotifier( streamFD, TQSocketNotifier::Read, this); - TQObject::connect( sNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(streamReceived())); + TQObject::connect( sNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(streamReceived())); }*/ void StreamWG::enableStream(bool enable) diff --git a/kstars/kstars/streamwg.h b/kstars/kstars/streamwg.h index 8d0f684c..1e1ca1c2 100644 --- a/kstars/kstars/streamwg.h +++ b/kstars/kstars/streamwg.h @@ -28,7 +28,7 @@ class StreamWG : public streamForm { - Q_OBJECT + TQ_OBJECT public: @@ -66,7 +66,7 @@ class VideoWG : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/telescopeprop.cpp b/kstars/kstars/telescopeprop.cpp index 93d15861..28cd1313 100644 --- a/kstars/kstars/telescopeprop.cpp +++ b/kstars/kstars/telescopeprop.cpp @@ -39,11 +39,11 @@ telescopeProp::telescopeProp(TQWidget* parent, const char* name, bool modal, WFl indi_driver = ksw->getINDIDriver(); newScopePending = false; - connect (newB, TQT_SIGNAL(clicked()), this, TQT_SLOT(newScope())); - connect (saveB, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveScope())); - connect (removeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeScope())); - connect (telescopeListBox, TQT_SIGNAL(highlighted(int)),this, TQT_SLOT(updateScopeDetails(int))); - connect(closeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(close())); + connect (newB, TQ_SIGNAL(clicked()), this, TQ_SLOT(newScope())); + connect (saveB, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveScope())); + connect (removeB, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeScope())); + connect (telescopeListBox, TQ_SIGNAL(highlighted(int)),this, TQ_SLOT(updateScopeDetails(int))); + connect(closeB, TQ_SIGNAL(clicked()), this, TQ_SLOT(close())); // Fill the combo box with drivers driverCombo->insertStringList(indi_driver->driversList); diff --git a/kstars/kstars/telescopeprop.h b/kstars/kstars/telescopeprop.h index 1e7ae171..c2404230 100644 --- a/kstars/kstars/telescopeprop.h +++ b/kstars/kstars/telescopeprop.h @@ -25,11 +25,11 @@ 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* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~telescopeProp(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/kstars/kstars/telescopewizardprocess.cpp b/kstars/kstars/telescopewizardprocess.cpp index d7eb6bd5..becd8ade 100644 --- a/kstars/kstars/telescopewizardprocess.cpp +++ b/kstars/kstars/telescopewizardprocess.cpp @@ -91,14 +91,14 @@ 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(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())); - connect(setLocationB, TQT_SIGNAL(clicked()), this, TQT_SLOT(newLocation())); + connect(helpB, TQ_SIGNAL(clicked()), parent, TQ_SLOT(appHelpActivated())); + connect(nextB, TQ_SIGNAL(clicked()), this, TQ_SLOT(processNext())); + connect(backB, TQ_SIGNAL(clicked()), this, TQ_SLOT(processBack())); + connect(setTimeB, TQ_SIGNAL(clicked()), this, TQ_SLOT(newTime())); + connect(setLocationB, TQ_SIGNAL(clicked()), this, TQ_SLOT(newLocation())); newDeviceTimer = new TQTimer(this); - TQObject::connect( newDeviceTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processPort()) ); + TQObject::connect( newDeviceTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processPort()) ); } @@ -289,8 +289,8 @@ void telescopeWizardProcess::processPort() { newDeviceTimer->stop(); linkRejected = false; - connect(indiDev->stdDev, TQT_SIGNAL(linkRejected()), this, TQT_SLOT(scanPorts())); - connect(indiDev->stdDev, TQT_SIGNAL(linkAccepted()), this, TQT_SLOT(linkSuccess())); + connect(indiDev->stdDev, TQ_SIGNAL(linkRejected()), this, TQ_SLOT(scanPorts())); + connect(indiDev->stdDev, TQ_SIGNAL(linkAccepted()), this, TQ_SLOT(linkSuccess())); scanPorts(); return; } diff --git a/kstars/kstars/telescopewizardprocess.h b/kstars/kstars/telescopewizardprocess.h index 232cd29b..04c24054 100644 --- a/kstars/kstars/telescopewizardprocess.h +++ b/kstars/kstars/telescopewizardprocess.h @@ -25,7 +25,7 @@ class KProgressDialog; class telescopeWizardProcess : public telescopeWizard { -Q_OBJECT +TQ_OBJECT public: diff --git a/kstars/kstars/thumbnaileditor.cpp b/kstars/kstars/thumbnaileditor.cpp index cfef5bf4..f5049e92 100644 --- a/kstars/kstars/thumbnaileditor.cpp +++ b/kstars/kstars/thumbnaileditor.cpp @@ -43,7 +43,7 @@ ThumbnailEditor::ThumbnailEditor( TQWidget *parent, const char *name ) tp->imageRect()->width(), tp->imageRect()->height() ); ui->ImageCanvas->setImage( tp->currentListImage() ); - connect( ui->ImageCanvas, TQT_SIGNAL(cropRegionModified()), TQT_SLOT( slotUpdateCropLabel() ) ); + connect( ui->ImageCanvas, TQ_SIGNAL(cropRegionModified()), TQ_SLOT( slotUpdateCropLabel() ) ); slotUpdateCropLabel(); update(); @@ -130,7 +130,7 @@ void ThumbImage::paintEvent( TQPaintEvent* ) { } void ThumbImage::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton && CropRect->contains( e->pos() ) ) { + if ( e->button() == TQt::LeftButton && CropRect->contains( 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 4a4484d9..4e82cb72 100644 --- a/kstars/kstars/thumbnaileditor.h +++ b/kstars/kstars/thumbnaileditor.h @@ -27,7 +27,7 @@ class TQPoint; class ThumbImage : public TQLabel { -Q_OBJECT +TQ_OBJECT public: ThumbImage( TQWidget *parent, const char *name = 0 ); @@ -62,7 +62,7 @@ private: class ThumbnailEditor : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: ThumbnailEditor( TQWidget *parent, const char *name=0 ); diff --git a/kstars/kstars/thumbnailpicker.cpp b/kstars/kstars/thumbnailpicker.cpp index 08fd3328..229052dc 100644 --- a/kstars/kstars/thumbnailpicker.cpp +++ b/kstars/kstars/thumbnailpicker.cpp @@ -59,14 +59,14 @@ ThumbnailPicker::ThumbnailPicker( SkyObject *o, const TQPixmap ¤t, TQWidge PixList.setAutoDelete( true ); - connect( ui->EditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditImage() ) ); - connect( ui->UnsetButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUnsetImage() ) ); - connect( ui->ImageList, TQT_SIGNAL( highlighted( int ) ), - this, TQT_SLOT( slotSetFromList( int ) ) ); - connect( ui->ImageURLBox, TQT_SIGNAL( urlSelected( const TQString& ) ), - this, TQT_SLOT( slotSetFromURL() ) ); - connect( ui->ImageURLBox, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( slotSetFromURL() ) ); + connect( ui->EditButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditImage() ) ); + connect( ui->UnsetButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUnsetImage() ) ); + connect( ui->ImageList, TQ_SIGNAL( highlighted( int ) ), + this, TQ_SLOT( slotSetFromList( int ) ) ); + connect( ui->ImageURLBox, TQ_SIGNAL( urlSelected( const TQString& ) ), + this, TQ_SLOT( slotSetFromURL() ) ); + connect( ui->ImageURLBox, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( slotSetFromURL() ) ); ui->ImageURLBox->lineEdit()->setTrapReturnKey( true ); ui->EditButton->setEnabled( false ); @@ -115,7 +115,7 @@ void ThumbnailPicker::slotFillList() { #if KDE_IS_VERSION( 3, 3, 90 ) ((TDEIO::CopyJob*)JobList.current())->setInteractive( false ); // suppress error dialogs #endif - connect (JobList.current(), TQT_SIGNAL (result(TDEIO::Job *)), TQT_SLOT (downloadReady (TDEIO::Job *))); + connect (JobList.current(), TQ_SIGNAL (result(TDEIO::Job *)), TQ_SLOT (downloadReady (TDEIO::Job *))); } } @@ -176,7 +176,7 @@ void ThumbnailPicker::downloadReady(TDEIO::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 tdeApp->style().pixelMetric( TQStyle::PM_TitleBarHeight ) //for the titlebar height, but this returned zero. //Hard-coding 25 instead :( if ( tmp.exists() ) { @@ -191,11 +191,11 @@ void ThumbnailPicker::downloadReady(TDEIO::Job *job) { uint w = im.width(); uint h = im.height(); uint pad = 4*marginHint() + 2*ui->SearchLabel->height() + actionButton( Ok )->height() + 25; - uint hDesk = kapp->desktop()->availableGeometry().height() - pad; + uint hDesk = tdeApp->desktop()->availableGeometry().height() - pad; // this returns zero... // //DEBUG -// kdDebug() << "Title bar height: " << kapp->style().pixelMetric( TQStyle::PM_TitleBarHeight ) << endl; +// kdDebug() << "Title bar height: " << tdeApp->style().pixelMetric( TQStyle::PM_TitleBarHeight ) << endl; if ( h > hDesk ) im = im.smoothScale( w*hDesk/h, hDesk ); @@ -321,7 +321,7 @@ void ThumbnailPicker::slotSetFromURL() { uint w = im.width(); uint h = im.height(); uint pad = 4*marginHint() + 2*ui->SearchLabel->height() + actionButton( Ok )->height() + 25; - uint hDesk = kapp->desktop()->availableGeometry().height() - pad; + uint hDesk = tdeApp->desktop()->availableGeometry().height() - pad; if ( h > hDesk ) im = im.smoothScale( w*hDesk/h, hDesk ); @@ -343,7 +343,7 @@ void ThumbnailPicker::slotSetFromURL() { #if KDE_IS_VERSION( 3, 3, 90 ) ((TDEIO::CopyJob*)JobList.current())->setInteractive( false ); // suppress error dialogs #endif - connect (JobList.current(), TQT_SIGNAL (result(TDEIO::Job *)), TQT_SLOT (downloadReady (TDEIO::Job *))); + connect (JobList.current(), TQ_SIGNAL (result(TDEIO::Job *)), TQ_SLOT (downloadReady (TDEIO::Job *))); // } diff --git a/kstars/kstars/thumbnailpicker.h b/kstars/kstars/thumbnailpicker.h index 9f060ade..4396e189 100644 --- a/kstars/kstars/thumbnailpicker.h +++ b/kstars/kstars/thumbnailpicker.h @@ -36,7 +36,7 @@ class SkyObject; class ThumbnailPicker : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: ThumbnailPicker( SkyObject *o, const TQPixmap ¤t, TQWidget *parent=0, const char *name=0 ); diff --git a/kstars/kstars/timebox.h b/kstars/kstars/timebox.h index 7e515731..3632b169 100644 --- a/kstars/kstars/timebox.h +++ b/kstars/kstars/timebox.h @@ -43,7 +43,7 @@ public: * @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 *parent, const char *n, bool tt=true); ~timeBox(); diff --git a/kstars/kstars/timedialog.cpp b/kstars/kstars/timedialog.cpp index fec1d1c1..e7bfacc7 100644 --- a/kstars/kstars/timedialog.cpp +++ b/kstars/kstars/timedialog.cpp @@ -42,9 +42,9 @@ TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* parent ) HourBox = new TQSpinBox( page, "HourBox" ); TQFont Box_font( HourBox->font() ); - Box_font.setBold( TRUE ); + Box_font.setBold( true ); HourBox->setFont( Box_font ); - HourBox->setWrapping( TRUE ); + HourBox->setWrapping( true ); HourBox->setMaxValue( 23 ); HourBox->setButtonSymbols( TQSpinBox::PlusMinus ); HourBox->setValue( now.time().hour() ); @@ -56,7 +56,7 @@ TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* parent ) MinuteBox = new TQSpinBox( page, "MinuteBox" ); TQFont MinuteBox_font( MinuteBox->font() ); MinuteBox->setFont( Box_font ); - MinuteBox->setWrapping( TRUE ); + MinuteBox->setWrapping( true ); MinuteBox->setMaxValue( 59 ); MinuteBox->setButtonSymbols( TQSpinBox::PlusMinus ); MinuteBox->setValue( now.time().minute() ); @@ -67,7 +67,7 @@ TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* parent ) SecondBox = new TQSpinBox( page, "SecondBox" ); SecondBox->setFont( Box_font ); SecondBox->setMaxValue( 59 ); - SecondBox->setWrapping( TRUE ); + SecondBox->setWrapping( true ); SecondBox->setButtonSymbols( TQSpinBox::PlusMinus ); SecondBox->setValue( now.time().second() ); @@ -87,12 +87,12 @@ TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* parent ) vlay->activate(); - TQObject::connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() )); - TQObject::connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( reject() )); - TQObject::connect( NowButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( setNow() )); - TQObject::connect( HourBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( HourPrefix( int ) )); - TQObject::connect( MinuteBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( MinutePrefix( int ) )); - TQObject::connect( SecondBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( SecondPrefix( int ) )); + TQObject::connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( accept() )); + TQObject::connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( reject() )); + TQObject::connect( NowButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( setNow() )); + TQObject::connect( HourBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( HourPrefix( int ) )); + TQObject::connect( MinuteBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( MinutePrefix( int ) )); + TQObject::connect( SecondBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( SecondPrefix( int ) )); } //Add handler for Escape key to close window diff --git a/kstars/kstars/timedialog.h b/kstars/kstars/timedialog.h index f1657c94..18d0558b 100644 --- a/kstars/kstars/timedialog.h +++ b/kstars/kstars/timedialog.h @@ -42,7 +42,7 @@ class KStars; */ class TimeDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kstars/kstars/timespinbox.cpp b/kstars/kstars/timespinbox.cpp index 40e0b94f..df3fa775 100644 --- a/kstars/kstars/timespinbox.cpp +++ b/kstars/kstars/timespinbox.cpp @@ -56,7 +56,7 @@ TimeSpinBox::TimeSpinBox( TQWidget *parent, const char *name, bool _daysonly ) } setFixedWidth( wmax + extra ); - connect( this, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( reportChange() ) ); + connect( this, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( reportChange() ) ); updateDisplay(); } diff --git a/kstars/kstars/timespinbox.h b/kstars/kstars/timespinbox.h index bfba1ee5..2498c516 100644 --- a/kstars/kstars/timespinbox.h +++ b/kstars/kstars/timespinbox.h @@ -29,7 +29,7 @@ */ class TimeSpinBox : public TQSpinBox { -Q_OBJECT +TQ_OBJECT public: /**Constructor */ @@ -46,7 +46,7 @@ public: /**Convert the displayed string to an internal value. *@note reimplemented from TQSpinBox - *@p ok bool pointer set to TRUE if conversion was successful + *@p ok bool pointer set to true if conversion was successful *@return internal value converted from displayed text */ virtual int mapTextToValue( bool *ok); diff --git a/kstars/kstars/timestepbox.cpp b/kstars/kstars/timestepbox.cpp index 4941d56d..8b728768 100644 --- a/kstars/kstars/timestepbox.cpp +++ b/kstars/kstars/timestepbox.cpp @@ -42,9 +42,9 @@ TimeStepBox::TimeStepBox( TQWidget *parent, const char* name, bool daysonly ) timeBox->setValue( 4 ); //real-time - connect( unitBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changeUnits() ) ); - connect( timeBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( syncUnits( int ) ) ); - connect( timeBox, TQT_SIGNAL( scaleChanged( float ) ), this, TQT_SIGNAL( scaleChanged( float ) ) ); + connect( unitBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changeUnits() ) ); + connect( timeBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( syncUnits( int ) ) ); + connect( timeBox, TQ_SIGNAL( scaleChanged( float ) ), this, TQ_SIGNAL( scaleChanged( float ) ) ); } @@ -58,9 +58,9 @@ void TimeStepBox::syncUnits( int tstep ) { if ( abs(tstep) >= unitBox->getUnitValue( i ) ) break; //don't want setValue to trigger changeUnits()... - disconnect( unitBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changeUnits() ) ); + disconnect( unitBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changeUnits() ) ); unitBox->setValue( tstep < 0 ? -i : i ); - connect( unitBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changeUnits() ) ); + connect( unitBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changeUnits() ) ); } void TimeStepBox::setDaysOnly( bool daysonly ) { diff --git a/kstars/kstars/timestepbox.h b/kstars/kstars/timestepbox.h index c05ec1d3..e8a1c6ba 100644 --- a/kstars/kstars/timestepbox.h +++ b/kstars/kstars/timestepbox.h @@ -34,7 +34,7 @@ */ class TimeStepBox : public TQFrame { -Q_OBJECT +TQ_OBJECT public: /**Constructor. */ diff --git a/kstars/kstars/timeunitbox.cpp b/kstars/kstars/timeunitbox.cpp index 0b89f057..4305fbd0 100644 --- a/kstars/kstars/timeunitbox.cpp +++ b/kstars/kstars/timeunitbox.cpp @@ -34,8 +34,8 @@ TimeUnitBox::TimeUnitBox(TQWidget *parent, const char *name, bool daysonly ) setDaysOnly( daysonly ); - connect( UpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( increase() ) ); - connect( DownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( decrease() ) ); + connect( UpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( increase() ) ); + connect( DownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( decrease() ) ); } TimeUnitBox::~TimeUnitBox(){ diff --git a/kstars/kstars/timeunitbox.h b/kstars/kstars/timeunitbox.h index d93ec215..ae57e2b0 100644 --- a/kstars/kstars/timeunitbox.h +++ b/kstars/kstars/timeunitbox.h @@ -44,7 +44,7 @@ class TQPushButton; class TimeUnitBox : public TQVBox { - Q_OBJECT + TQ_OBJECT public: /**Constructor*/ diff --git a/kstars/kstars/timezonerule.h b/kstars/kstars/timezonerule.h index 3cadb4e5..fc2ec80e 100644 --- a/kstars/kstars/timezonerule.h +++ b/kstars/kstars/timezonerule.h @@ -78,11 +78,11 @@ public: */ bool isDSTActive( const KStarsDateTime &date ); - /**@return TRUE if the rule is the "empty" TZ rule. */ + /**@return true if the rule is the "empty" TZ rule. */ bool isEmptyRule() { return ( HourOffset == 0.0 ); } /** Toggle DST on/off. The @p activate argument should probably be isDSTActive() - *@param activate if TRUE, then set DST active; otherwise, deactivate DST + *@param activate if true, then set DST active; otherwise, deactivate DST */ void setDST( bool activate=true ); @@ -110,7 +110,7 @@ public: */ KStarsDateTime nextDSTChange_LTime() { return next_change_ltime; } - /**@return TRUE if this rule is the same as the argument. + /**@return true if this rule is the same as the argument. *@p r the rule to check for equivalence */ bool equals( TimeZoneRule *r ); @@ -144,7 +144,7 @@ private: *be 1-3 (1st/2nd/third weekday of the month), or 5 (last weekday of the month) *@p day the day integer is returned by reference through this value *@p week the week integer is returned by reference through this value - *@return TRUE if the day string was successfully parsed + *@return true if the day string was successfully parsed */ bool initDay( const TQString &d, int &day, int &week ); diff --git a/kstars/kstars/toggleaction.h b/kstars/kstars/toggleaction.h index 5c62909d..b4ee9441 100644 --- a/kstars/kstars/toggleaction.h +++ b/kstars/kstars/toggleaction.h @@ -30,7 +30,7 @@ #include <tdeaction.h> class ToggleAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/tools/altvstime.cpp b/kstars/kstars/tools/altvstime.cpp index 9a95e188..869fa888 100644 --- a/kstars/kstars/tools/altvstime.cpp +++ b/kstars/kstars/tools/altvstime.cpp @@ -87,21 +87,21 @@ AltVsTime::AltVsTime( TQWidget* parent) : setLSTLimits(); View->updateTickmarks(); - connect( avtUI->browseButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBrowseObject() ) ); - connect( avtUI->cityButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChooseCity() ) ); - connect( avtUI->updateButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpdateDateLoc() ) ); - connect( avtUI->clearButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClear() ) ); - connect( avtUI->addButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddSource() ) ); - connect( avtUI->nameBox, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotAddSource() ) ); - connect( avtUI->raBox, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotAddSource() ) ); - connect( avtUI->decBox, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotAddSource() ) ); - connect( avtUI->clearFieldsButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClearBoxes() ) ); - connect( avtUI->longBox, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotAdvanceFocus() ) ); - connect( avtUI->latBox, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotAdvanceFocus() ) ); - connect( avtUI->PlotList, TQT_SIGNAL( highlighted(int) ), this, TQT_SLOT( slotHighlight() ) ); - - pList.setAutoDelete(FALSE); - deleteList.setAutoDelete(TRUE); //needed for skypoints which may be created in this class + connect( avtUI->browseButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBrowseObject() ) ); + connect( avtUI->cityButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChooseCity() ) ); + connect( avtUI->updateButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUpdateDateLoc() ) ); + connect( avtUI->clearButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClear() ) ); + connect( avtUI->addButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddSource() ) ); + connect( avtUI->nameBox, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotAddSource() ) ); + connect( avtUI->raBox, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotAddSource() ) ); + connect( avtUI->decBox, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotAddSource() ) ); + connect( avtUI->clearFieldsButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClearBoxes() ) ); + connect( avtUI->longBox, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotAdvanceFocus() ) ); + connect( avtUI->latBox, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotAdvanceFocus() ) ); + connect( avtUI->PlotList, TQ_SIGNAL( highlighted(int) ), this, TQ_SLOT( slotHighlight() ) ); + + pList.setAutoDelete(false); + deleteList.setAutoDelete(true); //needed for skypoints which may be created in this class //ther edit boxes should not pass on the return key! avtUI->nameBox->setTrapReturnKey( true ); @@ -307,11 +307,11 @@ void AltVsTime::slotHighlight(void) { //move input focus to the next logical widget void AltVsTime::slotAdvanceFocus(void) { - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "nameBox" ) ) avtUI->addButton->setFocus(); - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "raBox" ) ) avtUI->decBox->setFocus(); - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "decbox" ) ) avtUI->addButton->setFocus(); - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "longBox" ) ) avtUI->latBox->setFocus(); - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "latBox" ) ) avtUI->updateButton->setFocus(); + 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(); } void AltVsTime::slotClear(void) { diff --git a/kstars/kstars/tools/altvstime.h b/kstars/kstars/tools/altvstime.h index f68d1612..952d9bea 100644 --- a/kstars/kstars/tools/altvstime.h +++ b/kstars/kstars/tools/altvstime.h @@ -47,7 +47,7 @@ class AltVsTimeUI; */ class AVTPlotWidget : public KStarsPlotWidget { - Q_OBJECT + TQ_OBJECT public: /**Constructor @@ -93,7 +93,7 @@ private: class AltVsTime : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/tools/argsetgeolocation.ui b/kstars/kstars/tools/argsetgeolocation.ui index 2f8088b6..25e6a7a8 100644 --- a/kstars/kstars/tools/argsetgeolocation.ui +++ b/kstars/kstars/tools/argsetgeolocation.ui @@ -188,9 +188,9 @@ <tabstop>CountryName</tabstop> <tabstop>FindCityButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotFindCity()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/astrocalc.cpp b/kstars/kstars/tools/astrocalc.cpp index bd9d2037..7ff8e73a 100644 --- a/kstars/kstars/tools/astrocalc.cpp +++ b/kstars/kstars/tools/astrocalc.cpp @@ -92,8 +92,8 @@ AstroCalc::AstroCalc( TQWidget* parent ) : solarItem->setPixmap(0,solarIcon); /*TQListViewItem * planetsItem = */new TQListViewItem(solarItem,i18n("Planets Coordinates")); - connect(navigationPanel, TQT_SIGNAL(clicked(TQListViewItem *)), this, - TQT_SLOT(slotItemSelection(TQListViewItem *))); + connect(navigationPanel, TQ_SIGNAL(clicked(TQListViewItem *)), this, + TQ_SLOT(slotItemSelection(TQListViewItem *))); } AstroCalc::~AstroCalc() diff --git a/kstars/kstars/tools/astrocalc.h b/kstars/kstars/tools/astrocalc.h index 6d56bdd7..ebb70d4c 100644 --- a/kstars/kstars/tools/astrocalc.h +++ b/kstars/kstars/tools/astrocalc.h @@ -56,7 +56,7 @@ class modCalcVlsr; class AstroCalc : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: /** construtor */ diff --git a/kstars/kstars/tools/jmoontool.h b/kstars/kstars/tools/jmoontool.h index e7a7e0b6..0b3d9f29 100644 --- a/kstars/kstars/tools/jmoontool.h +++ b/kstars/kstars/tools/jmoontool.h @@ -29,7 +29,7 @@ class KStars; */ class JMoonTool : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: JMoonTool(TQWidget *parent = 0, const char *name = 0); diff --git a/kstars/kstars/tools/kstarsplotwidget.h b/kstars/kstars/tools/kstarsplotwidget.h index 03339f93..29ce890e 100644 --- a/kstars/kstars/tools/kstarsplotwidget.h +++ b/kstars/kstars/tools/kstarsplotwidget.h @@ -37,7 +37,7 @@ class TQPixmap; */ class KStarsPlotWidget : public KPlotWidget { - Q_OBJECT + TQ_OBJECT public: /**Constructor diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp index ff86b542..63cd0720 100644 --- a/kstars/kstars/tools/lcgenerator.cpp +++ b/kstars/kstars/tools/lcgenerator.cpp @@ -30,7 +30,7 @@ #include <tdeio/netaccess.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "lcgenerator.h" #include "imageviewer.h" @@ -68,7 +68,7 @@ void LCGenerator::createGUI() SDLayout = new TQHBoxLayout( 0, 0, 6, "SDLayout"); StarInfoBox = new TQGroupBox( page, "StarInfoBox" ); - StarInfoBox->setColumnLayout(0, Qt::Vertical ); + StarInfoBox->setColumnLayout(0, TQt::Vertical ); StarInfoBox->layout()->setSpacing( 6 ); StarInfoBox->layout()->setMargin( 11 ); StarInfoBoxLayout = new TQVBoxLayout( StarInfoBox->layout() ); @@ -124,37 +124,37 @@ void LCGenerator::createGUI() SDLayout->addWidget( StarInfoBox ); DataSelectBox = new TQGroupBox( page, "DataSelectBox" ); - DataSelectBox->setColumnLayout(0, Qt::Vertical ); + DataSelectBox->setColumnLayout(0, TQt::Vertical ); DataSelectBox->layout()->setSpacing( 6 ); DataSelectBox->layout()->setMargin( 11 ); DataSelectBoxLayout = new TQVBoxLayout( DataSelectBox->layout() ); DataSelectBoxLayout->setAlignment( TQt::AlignTop ); VisualCheck = new TQCheckBox( DataSelectBox, "VisualCheck" ); - VisualCheck->setChecked( TRUE ); + VisualCheck->setChecked( true ); DataSelectBoxLayout->addWidget( VisualCheck ); FainterCheck = new TQCheckBox( DataSelectBox, "FainterCheck" ); - FainterCheck->setChecked( TRUE ); + FainterCheck->setChecked( true ); DataSelectBoxLayout->addWidget( FainterCheck ); DiscrepantCheck = new TQCheckBox( DataSelectBox, "DiscrepantCheck" ); DataSelectBoxLayout->addWidget( DiscrepantCheck ); CCDBCheck = new TQCheckBox( DataSelectBox, "CCDBCheck" ); - CCDBCheck->setChecked( TRUE ); + CCDBCheck->setChecked( true ); DataSelectBoxLayout->addWidget( CCDBCheck ); CCDVCheck = new TQCheckBox( DataSelectBox, "CCDVCheck" ); - CCDVCheck->setChecked( TRUE ); + CCDVCheck->setChecked( true ); DataSelectBoxLayout->addWidget( CCDVCheck ); CCDRCheck = new TQCheckBox( DataSelectBox, "CCDRCheck" ); - CCDRCheck->setChecked( TRUE ); + CCDRCheck->setChecked( true ); DataSelectBoxLayout->addWidget( CCDRCheck ); CCDICheck = new TQCheckBox( DataSelectBox, "CCDICheck" ); - CCDICheck->setChecked( TRUE ); + CCDICheck->setChecked( true ); DataSelectBoxLayout->addWidget( CCDICheck ); PlotHLayout = new TQHBoxLayout( 0, 0, 6, "PlotHLayout"); @@ -212,11 +212,11 @@ void LCGenerator::createGUI() resize( TQSize(500, 360) ); // Signals/Slots - TQObject::connect(CloseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(close())); - TQObject::connect(GetCurveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(VerifyData())); - TQObject::connect(UpdateListButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateStarList())); - TQObject::connect(DesignationIn, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(updateNameList(int))); - TQObject::connect(NameIn, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(updateDesigList(int))); + TQObject::connect(CloseButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(close())); + TQObject::connect(GetCurveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(VerifyData())); + TQObject::connect(UpdateListButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateStarList())); + TQObject::connect(DesignationIn, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(updateNameList(int))); + TQObject::connect(NameIn, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(updateDesigList(int))); } @@ -427,7 +427,7 @@ void LCGenerator::updateStarList() KURL saveFile (file->name()); downloadJob = TDEIO::file_copy (AAVSOFile, saveFile, -1, true); - connect (downloadJob, TQT_SIGNAL (result (TDEIO::Job *)), TQT_SLOT (downloadReady (TDEIO::Job *))); + connect (downloadJob, TQ_SIGNAL (result (TDEIO::Job *)), TQ_SLOT (downloadReady (TDEIO::Job *))); } void LCGenerator::downloadReady(TDEIO::Job * job) diff --git a/kstars/kstars/tools/lcgenerator.h b/kstars/kstars/tools/lcgenerator.h index c0faacbe..f74d46b0 100644 --- a/kstars/kstars/tools/lcgenerator.h +++ b/kstars/kstars/tools/lcgenerator.h @@ -53,7 +53,7 @@ struct VariableStarInfo class LCGenerator : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalcangdist.cpp b/kstars/kstars/tools/modcalcangdist.cpp index 1a13ddf1..7c9185e2 100644 --- a/kstars/kstars/tools/modcalcangdist.cpp +++ b/kstars/kstars/tools/modcalcangdist.cpp @@ -32,8 +32,8 @@ modCalcAngDist::modCalcAngDist(TQWidget *parentSplit, const char *name) : modCalcAngDistDlg(parentSplit,name) { - ra0Box->setDegType(FALSE); - ra1Box->setDegType(FALSE); + ra0Box->setDegType(false); + ra1Box->setDegType(false); show(); } @@ -44,7 +44,7 @@ modCalcAngDist::~modCalcAngDist(){ SkyPoint modCalcAngDist::getCoords (dmsBox* rBox, dmsBox* dBox) { dms raCoord, decCoord; - raCoord = rBox->createDms(FALSE); + raCoord = rBox->createDms(false); decCoord = dBox->createDms(); SkyPoint sp = SkyPoint (raCoord, decCoord); @@ -149,10 +149,10 @@ void modCalcAngDist::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(ra0CheckBatch->isChecked() ) { - ra0B = dms::fromString( fields[i],FALSE); + ra0B = dms::fromString( fields[i],false); i++; } else - ra0B = ra0BoxBatch->createDms(FALSE); + ra0B = ra0BoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << ra0B.toHMSString() << space; @@ -163,7 +163,7 @@ void modCalcAngDist::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(dec0CheckBatch->isChecked() ) { - dec0B = dms::fromString( fields[i], TRUE); + dec0B = dms::fromString( fields[i], true); i++; } else dec0B = dec0BoxBatch->createDms(); @@ -177,10 +177,10 @@ void modCalcAngDist::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(ra1CheckBatch->isChecked() ) { - ra1B = dms::fromString( fields[i],FALSE); + ra1B = dms::fromString( fields[i],false); i++; } else - ra1B = ra1BoxBatch->createDms(FALSE); + ra1B = ra1BoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << ra1B.toHMSString() << space; @@ -191,7 +191,7 @@ void modCalcAngDist::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(dec1CheckBatch->isChecked() ) { - dec1B = dms::fromString( fields[i], TRUE); + dec1B = dms::fromString( fields[i], true); i++; } else dec1B = dec1BoxBatch->createDms(); diff --git a/kstars/kstars/tools/modcalcangdist.h b/kstars/kstars/tools/modcalcangdist.h index 0d938b58..af66f566 100644 --- a/kstars/kstars/tools/modcalcangdist.h +++ b/kstars/kstars/tools/modcalcangdist.h @@ -33,7 +33,7 @@ class TQTextStream; class modCalcAngDist : public modCalcAngDistDlg { -Q_OBJECT +TQ_OBJECT public: /**Constructor. */ diff --git a/kstars/kstars/tools/modcalcangdistdlg.ui b/kstars/kstars/tools/modcalcangdistdlg.ui index 33bfc084..aed9a174 100644 --- a/kstars/kstars/tools/modcalcangdistdlg.ui +++ b/kstars/kstars/tools/modcalcangdistdlg.ui @@ -660,13 +660,13 @@ <slot>slotOutputFile()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotComputeDist()</slot> <slot>slotClearCoords()</slot> <slot>slotInputFile()</slot> <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcapcoord.cpp b/kstars/kstars/tools/modcalcapcoord.cpp index c50b7b9c..0b718ef3 100644 --- a/kstars/kstars/tools/modcalcapcoord.cpp +++ b/kstars/kstars/tools/modcalcapcoord.cpp @@ -40,8 +40,8 @@ modCalcApCoord::modCalcApCoord(TQWidget *parentSplit, const char *name) : modCalcApCoordDlg(parentSplit,name) { showCurrentTime(); - ra0Box->setDegType(FALSE); - rafBox->setDegType(FALSE); + ra0Box->setDegType(false); + rafBox->setDegType(false); show(); } @@ -52,7 +52,7 @@ modCalcApCoord::~modCalcApCoord(){ SkyPoint modCalcApCoord::getEquCoords (void) { dms raCoord, decCoord; - raCoord = ra0Box->createDms(FALSE); + raCoord = ra0Box->createDms(false); decCoord = dec0Box->createDms(); SkyPoint sp = SkyPoint (raCoord, decCoord); @@ -87,7 +87,7 @@ double modCalcApCoord::getEpoch (TQString eName) { } void modCalcApCoord::showEquCoords ( SkyPoint sp ) { - rafBox->show( sp.ra() , FALSE); + rafBox->show( sp.ra() , false); decfBox->show( sp.dec() ); } @@ -265,10 +265,10 @@ void modCalcApCoord::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(raCheckBatch->isChecked() ) { - raB = dms::fromString( fields[i],FALSE); + raB = dms::fromString( fields[i],false); i++; } else - raB = raBoxBatch->createDms(FALSE); + raB = raBoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << raB.toHMSString() << space; @@ -279,7 +279,7 @@ void modCalcApCoord::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(decCheckBatch->isChecked() ) { - decB = dms::fromString( fields[i], TRUE); + decB = dms::fromString( fields[i], true); i++; } else decB = decBoxBatch->createDms(); diff --git a/kstars/kstars/tools/modcalcapcoord.h b/kstars/kstars/tools/modcalcapcoord.h index f99bc418..06c5fec1 100644 --- a/kstars/kstars/tools/modcalcapcoord.h +++ b/kstars/kstars/tools/modcalcapcoord.h @@ -35,7 +35,7 @@ class TQTextStream; class modCalcApCoord : public modCalcApCoordDlg { -Q_OBJECT +TQ_OBJECT public: /**Constructor. */ diff --git a/kstars/kstars/tools/modcalcapcoorddlg.ui b/kstars/kstars/tools/modcalcapcoorddlg.ui index ac79690f..f8b9502c 100644 --- a/kstars/kstars/tools/modcalcapcoorddlg.ui +++ b/kstars/kstars/tools/modcalcapcoorddlg.ui @@ -842,7 +842,7 @@ <tabstop>OutputLineEditBatch</tabstop> <tabstop>runButtonBatch</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotComputeCoords()</slot> <slot>slotRadioBatch()</slot> <slot>slotUtCheckedBatch()</slot> @@ -854,7 +854,7 @@ <slot>slotRunBatch()</slot> <slot>slotInputFile()</slot> <slot>slotOutputFile()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcazel.cpp b/kstars/kstars/tools/modcalcazel.cpp index 04a03904..0d7cfcbe 100644 --- a/kstars/kstars/tools/modcalcazel.cpp +++ b/kstars/kstars/tools/modcalcazel.cpp @@ -41,8 +41,8 @@ modCalcAzel::modCalcAzel(TQWidget *parentSplit, const char *name) : modCalcAzelD showCurrentDateTime(); initGeo(); showLongLat(); - horInputCoords = FALSE; - raBox->setDegType(FALSE); + horInputCoords = false; + raBox->setDegType(false); show(); } @@ -54,7 +54,7 @@ SkyPoint modCalcAzel::getEquCoords (void) { dms raCoord, decCoord; - raCoord = raBox->createDms(FALSE); + raCoord = raBox->createDms(false); decCoord = decBox->createDms(); SkyPoint sp = SkyPoint (raCoord, decCoord); @@ -156,7 +156,7 @@ void modCalcAzel::showHorCoords ( SkyPoint sp ) void modCalcAzel::showEquCoords ( SkyPoint sp ) { - raBox->show( sp.ra(), FALSE ); + raBox->show( sp.ra(), false ); decBox->show( sp.dec() ); showEpoch( getDateTime() ); } @@ -293,7 +293,7 @@ void modCalcAzel::horNoCheck() { azBoxBatch->setEnabled(false); elCheckBatch->setChecked(false); elBoxBatch->setEnabled(false); - horInputCoords = FALSE; + horInputCoords = false; } @@ -302,7 +302,7 @@ void modCalcAzel::equNoCheck() { raBoxBatch->setEnabled(false); decCheckBatch->setChecked(false); decBoxBatch->setEnabled(false); - horInputCoords = TRUE; + horInputCoords = true; } @@ -410,10 +410,10 @@ void modCalcAzel::processLines( TQTextStream &istream ) { // Read Longitude and write in ostream if corresponds if (longCheckBatch->isChecked() ) { - longB = dms::fromString( fields[i],TRUE); + longB = dms::fromString( fields[i],true); i++; } else - longB = longBoxBatch->createDms(TRUE); + longB = longBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << longB.toDMSString() << space; @@ -425,10 +425,10 @@ void modCalcAzel::processLines( TQTextStream &istream ) { if (latCheckBatch->isChecked() ) { - latB = dms::fromString( fields[i], TRUE); + latB = dms::fromString( fields[i], true); i++; } else - latB = latBoxBatch->createDms(TRUE); + latB = latBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << latB.toDMSString() << space; else @@ -462,10 +462,10 @@ void modCalcAzel::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(raCheckBatch->isChecked() ) { - raB = dms::fromString( fields[i],FALSE); + raB = dms::fromString( fields[i],false); i++; } else - raB = raBoxBatch->createDms(FALSE); + raB = raBoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << raB.toHMSString() << space; @@ -476,7 +476,7 @@ void modCalcAzel::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(decCheckBatch->isChecked() ) { - decB = dms::fromString( fields[i], TRUE); + decB = dms::fromString( fields[i], true); i++; } else decB = decBoxBatch->createDms(); @@ -496,7 +496,7 @@ void modCalcAzel::processLines( TQTextStream &istream ) { } else { if(azCheckBatch->isChecked() ) { - azB = dms::fromString( fields[i],FALSE); + azB = dms::fromString( fields[i],false); i++; } else azB = azBoxBatch->createDms(); @@ -510,7 +510,7 @@ void modCalcAzel::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(elCheckBatch->isChecked() ) { - elB = dms::fromString( fields[i], TRUE); + elB = dms::fromString( fields[i], true); i++; } else elB = decBoxBatch->createDms(); diff --git a/kstars/kstars/tools/modcalcazel.h b/kstars/kstars/tools/modcalcazel.h index c6b0ad25..022dae12 100644 --- a/kstars/kstars/tools/modcalcazel.h +++ b/kstars/kstars/tools/modcalcazel.h @@ -34,7 +34,7 @@ class dms; class modCalcAzel : public modCalcAzelDlg { -Q_OBJECT +TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalcazeldlg.ui b/kstars/kstars/tools/modcalcazeldlg.ui index eff053a8..3b81c72c 100644 --- a/kstars/kstars/tools/modcalcazeldlg.ui +++ b/kstars/kstars/tools/modcalcazeldlg.ui @@ -1041,7 +1041,7 @@ <tabstop>OutButtonBatch</tabstop> <tabstop>runButtonBatch</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotClearCoords()</slot> <slot>slotComputeCoords()</slot> <slot>slotInputFile()</slot> @@ -1057,7 +1057,7 @@ <slot>slotAzChecked()</slot> <slot>slotElChecked()</slot> <slot>newSlot()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcdaylength.h b/kstars/kstars/tools/modcalcdaylength.h index 268491db..db9055c4 100644 --- a/kstars/kstars/tools/modcalcdaylength.h +++ b/kstars/kstars/tools/modcalcdaylength.h @@ -29,7 +29,7 @@ class KStarsDateTime; class GeoLocation; class modCalcDayLength : public modCalcDayLengthDlg { -Q_OBJECT +TQ_OBJECT public: /**Constructor. */ diff --git a/kstars/kstars/tools/modcalcdaylengthdlg.ui b/kstars/kstars/tools/modcalcdaylengthdlg.ui index 2f58bbd4..10d3a9e0 100644 --- a/kstars/kstars/tools/modcalcdaylengthdlg.ui +++ b/kstars/kstars/tools/modcalcdaylengthdlg.ui @@ -635,10 +635,10 @@ <tabstop>azSetBox</tabstop> <tabstop>azRiseBox</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotComputePosTime()</slot> <slot>slotClearCoords()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalceclipticcoords.cpp b/kstars/kstars/tools/modcalceclipticcoords.cpp index 33aa83ae..f3b88036 100644 --- a/kstars/kstars/tools/modcalceclipticcoords.cpp +++ b/kstars/kstars/tools/modcalceclipticcoords.cpp @@ -37,8 +37,8 @@ modCalcEclCoords::modCalcEclCoords(TQWidget *parentSplit, const char *name) : modCalcEclCoordsDlg(parentSplit,name) { - equRadio->setChecked(TRUE); - raBox->setDegType(FALSE); + equRadio->setChecked(true); + raBox->setDegType(false); this->show(); } @@ -54,7 +54,7 @@ void modCalcEclCoords::getEclCoords (void) { void modCalcEclCoords::getEquCoords (void) { - raCoord = raBox->createDms(FALSE); + raCoord = raBox->createDms(false); decCoord = decBox->createDms(); epoch = getEpoch( epochName->text() ); } @@ -90,7 +90,7 @@ void modCalcEclCoords::slotComputeCoords (void) { } void modCalcEclCoords::showEquCoords(void) { - raBox->show( raCoord , FALSE); + raBox->show( raCoord , false); decBox->show( decCoord ); } @@ -135,7 +135,7 @@ void modCalcEclCoords::eclCheck() { eclLatBoxBatch->setEnabled(false); eclLongCheckBatch->setChecked(false); eclLongBoxBatch->setEnabled(false); - eclInputCoords = FALSE; + eclInputCoords = false; } @@ -146,7 +146,7 @@ void modCalcEclCoords::equCheck() { decCheckBatch->setChecked(false); decBoxBatch->setEnabled(false); //epochCheckBatch->setChecked(false); - eclInputCoords = TRUE; + eclInputCoords = true; } @@ -278,10 +278,10 @@ void modCalcEclCoords::processLines( TQTextStream &istream ) { // Read Ecliptic Longitude and write in ostream if corresponds if(eclLongCheckBatch->isChecked() ) { - eclLongB = dms::fromString( fields[i], TRUE); + eclLongB = dms::fromString( fields[i], true); i++; } else - eclLongB = eclLongBoxBatch->createDms(TRUE); + eclLongB = eclLongBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << eclLongB.toDMSString() << space; @@ -292,7 +292,7 @@ void modCalcEclCoords::processLines( TQTextStream &istream ) { // Read Ecliptic Latitude and write in ostream if corresponds if(eclLatCheckBatch->isChecked() ) { - eclLatB = dms::fromString( fields[i], TRUE); + eclLatB = dms::fromString( fields[i], true); i++; } else if ( allRadioBatch->isChecked() ) @@ -329,10 +329,10 @@ void modCalcEclCoords::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(raCheckBatch->isChecked() ) { - raB = dms::fromString( fields[i],FALSE); + raB = dms::fromString( fields[i],false); i++; } else - raB = raBoxBatch->createDms(FALSE); + raB = raBoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << raB.toHMSString() << space; @@ -343,7 +343,7 @@ void modCalcEclCoords::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(decCheckBatch->isChecked() ) { - decB = dms::fromString( fields[i], TRUE); + decB = dms::fromString( fields[i], true); i++; } else decB = decBoxBatch->createDms(); diff --git a/kstars/kstars/tools/modcalceclipticcoords.h b/kstars/kstars/tools/modcalceclipticcoords.h index b8a4cf65..c6c40277 100644 --- a/kstars/kstars/tools/modcalceclipticcoords.h +++ b/kstars/kstars/tools/modcalceclipticcoords.h @@ -33,7 +33,7 @@ class TQString; class modCalcEclCoords : public modCalcEclCoordsDlg { -Q_OBJECT +TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui index 1615a7c0..2908c5a8 100644 --- a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui +++ b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui @@ -891,7 +891,7 @@ <slot>slotOutputFile()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotComputeCoords()</slot> <slot>slotClearCoords()</slot> <slot>slotEclLatCheckedBatch()</slot> @@ -902,7 +902,7 @@ <slot>slotInputFile()</slot> <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcequinox.cpp b/kstars/kstars/tools/modcalcequinox.cpp index 50fbd979..3f72a1fe 100644 --- a/kstars/kstars/tools/modcalcequinox.cpp +++ b/kstars/kstars/tools/modcalcequinox.cpp @@ -44,7 +44,7 @@ modCalcEquinox::~modCalcEquinox(){ int modCalcEquinox::getYear (TQString eName) { - bool ok = FALSE; + bool ok = false; int equinoxYear = eName.toInt(&ok); if ( ok ) return equinoxYear; @@ -212,10 +212,10 @@ void modCalcEquinox::processLines( TQTextStream &istream ) { KStarsDateTime dta( jdau ); KStarsDateTime dtw( jdwin ); - ostream << dts.toString(Qt::ISODate) << space << (float)(jdsu - jdsp) << space - << dtu.toString(Qt::ISODate) << space << (float)(jdau - jdsu) << space - << dta.toString(Qt::ISODate) << space << (float)(jdwin - jdau) << space - << dtw.toString(Qt::ISODate) << space << (float)(jdsp1 - jdwin) << endl; + ostream << dts.toString(TQt::ISODate) << space << (float)(jdsu - jdsp) << space + << dtu.toString(TQt::ISODate) << space << (float)(jdau - jdsu) << space + << dta.toString(TQt::ISODate) << space << (float)(jdwin - jdau) << space + << dtw.toString(TQt::ISODate) << space << (float)(jdsp1 - jdwin) << endl; } diff --git a/kstars/kstars/tools/modcalcequinox.h b/kstars/kstars/tools/modcalcequinox.h index 03fdf30d..35220ed1 100644 --- a/kstars/kstars/tools/modcalcequinox.h +++ b/kstars/kstars/tools/modcalcequinox.h @@ -31,7 +31,7 @@ class TQTextStream; class modCalcEquinox : public modCalcEquinoxDlg { -Q_OBJECT +TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalcequinoxdlg.ui b/kstars/kstars/tools/modcalcequinoxdlg.ui index 4924f7bd..bac4f242 100644 --- a/kstars/kstars/tools/modcalcequinoxdlg.ui +++ b/kstars/kstars/tools/modcalcequinoxdlg.ui @@ -559,12 +559,12 @@ <slot>slotRunBatch()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotComputeEquinoxesAndSolstices()</slot> <slot>slotInputFile()</slot> <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcgalcoord.cpp b/kstars/kstars/tools/modcalcgalcoord.cpp index 8c555b68..6ed71bb3 100644 --- a/kstars/kstars/tools/modcalcgalcoord.cpp +++ b/kstars/kstars/tools/modcalcgalcoord.cpp @@ -36,8 +36,8 @@ modCalcGalCoord::modCalcGalCoord(TQWidget *parentSplit, const char *name) : modCalcGalCoordDlg(parentSplit,name) { - equRadio->setChecked(TRUE); - raBox->setDegType(FALSE); + equRadio->setChecked(true); + raBox->setDegType(false); show(); } @@ -53,7 +53,7 @@ void modCalcGalCoord::getGalCoords (void) { void modCalcGalCoord::getEquCoords (void) { - raCoord = raBox->createDms(FALSE); + raCoord = raBox->createDms(false); decCoord = decBox->createDms(); epoch = getEpoch( epochName->text() ); } @@ -91,7 +91,7 @@ void modCalcGalCoord::slotComputeCoords (void) { } void modCalcGalCoord::showEquCoords(void) { - raBox->show( raCoord , FALSE); + raBox->show( raCoord , false); decBox->show( decCoord ); } @@ -135,7 +135,7 @@ void modCalcGalCoord::galCheck() { galLatBoxBatch->setEnabled(false); galLongCheckBatch->setChecked(false); galLongBoxBatch->setEnabled(false); - galInputCoords = FALSE; + galInputCoords = false; } @@ -146,7 +146,7 @@ void modCalcGalCoord::equCheck() { decCheckBatch->setChecked(false); decBoxBatch->setEnabled(false); epochCheckBatch->setChecked(false); - galInputCoords = TRUE; + galInputCoords = true; } @@ -281,10 +281,10 @@ void modCalcGalCoord::processLines( TQTextStream &istream ) { // Read Galactic Longitude and write in ostream if corresponds if(galLongCheckBatch->isChecked() ) { - galLongB = dms::fromString( fields[i], TRUE); + galLongB = dms::fromString( fields[i], true); i++; } else - galLongB = galLongBoxBatch->createDms(TRUE); + galLongB = galLongBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << galLongB.toDMSString() << space; @@ -295,10 +295,10 @@ void modCalcGalCoord::processLines( TQTextStream &istream ) { // Read Galactic Latitude and write in ostream if corresponds if(galLatCheckBatch->isChecked() ) { - galLatB = dms::fromString( fields[i], TRUE); + galLatB = dms::fromString( fields[i], true); i++; } else - galLatB = galLatBoxBatch->createDms(TRUE); + galLatB = galLatBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << galLatB.toDMSString() << space; @@ -316,10 +316,10 @@ void modCalcGalCoord::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(raCheckBatch->isChecked() ) { - raB = dms::fromString( fields[i],FALSE); + raB = dms::fromString( fields[i],false); i++; } else - raB = raBoxBatch->createDms(FALSE); + raB = raBoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << raB.toHMSString() << space; @@ -330,7 +330,7 @@ void modCalcGalCoord::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(decCheckBatch->isChecked() ) { - decB = dms::fromString( fields[i], TRUE); + decB = dms::fromString( fields[i], true); i++; } else decB = decBoxBatch->createDms(); diff --git a/kstars/kstars/tools/modcalcgalcoord.h b/kstars/kstars/tools/modcalcgalcoord.h index 93793d83..2dad8602 100644 --- a/kstars/kstars/tools/modcalcgalcoord.h +++ b/kstars/kstars/tools/modcalcgalcoord.h @@ -32,7 +32,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 3486d18a..60cda815 100644 --- a/kstars/kstars/tools/modcalcgalcoorddlg.ui +++ b/kstars/kstars/tools/modcalcgalcoorddlg.ui @@ -902,7 +902,7 @@ <tabstop>OutButtonBatch</tabstop> <tabstop>runButtonBatch</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotComputeCoords()</slot> <slot>slotClearCoords()</slot> <slot>slotInputFile()</slot> @@ -913,7 +913,7 @@ <slot>slotGalLatCheckedBatch()</slot> <slot>slotGalLongCheckedBatch()</slot> <slot>slotRunBatch()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcgeodcoord.cpp b/kstars/kstars/tools/modcalcgeodcoord.cpp index fb54a23b..c9dd1e05 100644 --- a/kstars/kstars/tools/modcalcgeodcoord.cpp +++ b/kstars/kstars/tools/modcalcgeodcoord.cpp @@ -42,7 +42,7 @@ modCalcGeodCoord::modCalcGeodCoord(TQWidget *parentSplit, const char *name) : mo static const char *ellipsoidList[] = { "IAU76", "GRS80", "MERIT83", "WGS84", "IERS89"}; - spheRadio->setChecked(TRUE); + spheRadio->setChecked(true); ellipsoidBox->insertStrList (ellipsoidList,5); geoPlace = new GeoLocation(); showLongLat(); @@ -137,7 +137,7 @@ void modCalcGeodCoord::geoCheck(void) { yCheckBatch->setChecked( false ); zBoxBatch->setEnabled( false ); zCheckBatch->setChecked( false ); - xyzInputCoords = FALSE; + xyzInputCoords = false; } void modCalcGeodCoord::xyzCheck(void) { @@ -148,7 +148,7 @@ void modCalcGeodCoord::xyzCheck(void) { latCheckBatch->setChecked( false ); elevBoxBatch->setEnabled( false ); elevCheckBatch->setChecked( false ); - xyzInputCoords = TRUE; + xyzInputCoords = true; } @@ -346,10 +346,10 @@ void modCalcGeodCoord::processLines( TQTextStream &istream ) { // Read Longitude and write in ostream if corresponds if(longCheckBatch->isChecked() ) { - longB = dms::fromString( fields[i],TRUE); + longB = dms::fromString( fields[i],true); i++; } else - longB = longBoxBatch->createDms(TRUE); + longB = longBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << longB.toDMSString() << space; @@ -360,10 +360,10 @@ void modCalcGeodCoord::processLines( TQTextStream &istream ) { // Read Latitude and write in ostream if corresponds if(latCheckBatch->isChecked() ) { - latB = dms::fromString( fields[i], TRUE); + latB = dms::fromString( fields[i], true); i++; } else - latB = latBoxBatch->createDms(TRUE); + latB = latBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << latB.toDMSString() << space; diff --git a/kstars/kstars/tools/modcalcgeodcoord.h b/kstars/kstars/tools/modcalcgeodcoord.h index b8bd7927..93b4a416 100644 --- a/kstars/kstars/tools/modcalcgeodcoord.h +++ b/kstars/kstars/tools/modcalcgeodcoord.h @@ -37,7 +37,7 @@ class GeoLocation; class modCalcGeodCoord : public modCalcGeodCoordDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalcgeoddlg.ui b/kstars/kstars/tools/modcalcgeoddlg.ui index c4b294fe..387408cd 100644 --- a/kstars/kstars/tools/modcalcgeoddlg.ui +++ b/kstars/kstars/tools/modcalcgeoddlg.ui @@ -787,7 +787,7 @@ <tabstop>OutputLineEditBatch</tabstop> <tabstop>runButtonBatch</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotComputeGeoCoords()</slot> <slot>slotClearGeoCoords()</slot> <slot>slotInputFile()</slot> @@ -799,7 +799,7 @@ <slot>slotXCheckedBatch()</slot> <slot>slotYCheckedBatch()</slot> <slot>slotZCheckedBatch()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcjd.h b/kstars/kstars/tools/modcalcjd.h index 3fb80ccb..5522d784 100644 --- a/kstars/kstars/tools/modcalcjd.h +++ b/kstars/kstars/tools/modcalcjd.h @@ -38,7 +38,7 @@ class KStarsDateTime; class modCalcJD : public modCalcJdDlg { -Q_OBJECT +TQ_OBJECT public: modCalcJD(TQWidget *p, const char *n); diff --git a/kstars/kstars/tools/modcalcjddlg.ui b/kstars/kstars/tools/modcalcjddlg.ui index 9db090eb..bf9ddf3f 100644 --- a/kstars/kstars/tools/modcalcjddlg.ui +++ b/kstars/kstars/tools/modcalcjddlg.ui @@ -494,11 +494,11 @@ <slot>slotComputeTime()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotClearTime()</slot> <slot>slotComputeTime()</slot> <slot>showCurrentTime()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcplanets.cpp b/kstars/kstars/tools/modcalcplanets.cpp index e1c8b070..474fda8a 100644 --- a/kstars/kstars/tools/modcalcplanets.cpp +++ b/kstars/kstars/tools/modcalcplanets.cpp @@ -41,7 +41,7 @@ modCalcPlanets::modCalcPlanets(TQWidget *parentSplit, const char *name) : modCalcPlanetsDlg (parentSplit,name) { showCurrentDateTime(); showLongLat(); - raBox->setDegType(FALSE); + raBox->setDegType(false); show(); } @@ -232,7 +232,7 @@ void modCalcPlanets::showGeocentricEclipticCoords(const dms *eLong, const dms *e void modCalcPlanets::showEquatorialCoords(const dms *ra, const dms *dec) { - raBox->show( ra, FALSE ); + raBox->show( ra, false ); decBox->show( dec ); } @@ -459,7 +459,7 @@ void modCalcPlanets::processLines( TQTextStream &istream ) { // Read date and write in ostream if corresponds if(dateCheckBatch->isChecked() ) { - dtB = ExtDate::fromString( fields[i], Qt::ISODate ); + dtB = ExtDate::fromString( fields[i], TQt::ISODate ); if ( !dtB.isValid() ) { kdWarning() << i18n( "Line %1 contains an invalid date: " ).arg(nline) << fields[i] << endl ; @@ -479,10 +479,10 @@ void modCalcPlanets::processLines( TQTextStream &istream ) { // Read Longitude and write in ostream if corresponds if (longCheckBatch->isChecked() ) { - longB = dms::fromString( fields[i],TRUE); + longB = dms::fromString( fields[i],true); i++; } else - longB = longBoxBatch->createDms(TRUE); + longB = longBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) lineToWrite += longB.toDMSString() + space; @@ -493,10 +493,10 @@ void modCalcPlanets::processLines( TQTextStream &istream ) { // Read Latitude if (latCheckBatch->isChecked() ) { - latB = dms::fromString( fields[i], TRUE); + latB = dms::fromString( fields[i], true); i++; } else - latB = latBoxBatch->createDms(TRUE); + latB = latBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) lineToWrite += latB.toDMSString() + space; else diff --git a/kstars/kstars/tools/modcalcplanets.h b/kstars/kstars/tools/modcalcplanets.h index 0eaf8776..8b3621b8 100644 --- a/kstars/kstars/tools/modcalcplanets.h +++ b/kstars/kstars/tools/modcalcplanets.h @@ -37,7 +37,7 @@ class KSPluto; class modCalcPlanets : public modCalcPlanetsDlg { -Q_OBJECT +TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalcplanetsdlg.ui b/kstars/kstars/tools/modcalcplanetsdlg.ui index 9b9f6099..04a878dc 100644 --- a/kstars/kstars/tools/modcalcplanetsdlg.ui +++ b/kstars/kstars/tools/modcalcplanetsdlg.ui @@ -1358,7 +1358,7 @@ <tabstop>OutButtonBatch</tabstop> <tabstop>runButtonBatch</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotComputePosition()</slot> <slot>slotClear()</slot> <slot>slotInputFile()</slot> @@ -1369,7 +1369,7 @@ <slot>slotLatCheckedBatch()</slot> <slot>slotRunBatch()</slot> <slot>slotPlanetsCheckedBatch()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcprec.cpp b/kstars/kstars/tools/modcalcprec.cpp index d489f1b0..efa7de5c 100644 --- a/kstars/kstars/tools/modcalcprec.cpp +++ b/kstars/kstars/tools/modcalcprec.cpp @@ -33,8 +33,8 @@ modCalcPrec::modCalcPrec(TQWidget *parentSplit, const char *name) : modCalcPrecDlg(parentSplit,name) { - ra0Box->setDegType(FALSE); - rafBox->setDegType(FALSE); + ra0Box->setDegType(false); + rafBox->setDegType(false); show(); } @@ -46,7 +46,7 @@ modCalcPrec::~modCalcPrec(){ SkyPoint modCalcPrec::getEquCoords (void) { dms raCoord, decCoord; - raCoord = ra0Box->createDms(FALSE); + raCoord = ra0Box->createDms(false); decCoord = dec0Box->createDms(); SkyPoint sp = SkyPoint (raCoord, decCoord); @@ -111,7 +111,7 @@ void modCalcPrec::slotComputeCoords (void) { } void modCalcPrec::showEquCoords ( SkyPoint sp ) { - rafBox->show( sp.ra(),FALSE ); + rafBox->show( sp.ra(),false ); decfBox->show( sp.dec() ); } @@ -229,10 +229,10 @@ void modCalcPrec::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(raCheckBatch->isChecked() ) { - raB = dms::fromString( fields[i],FALSE); + raB = dms::fromString( fields[i],false); i++; } else - raB = raBoxBatch->createDms(FALSE); + raB = raBoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << raB.toHMSString() << space; @@ -243,7 +243,7 @@ void modCalcPrec::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(decCheckBatch->isChecked() ) { - decB = dms::fromString( fields[i], TRUE); + decB = dms::fromString( fields[i], true); i++; } else decB = decBoxBatch->createDms(); diff --git a/kstars/kstars/tools/modcalcprec.h b/kstars/kstars/tools/modcalcprec.h index 7447871a..21a42c24 100644 --- a/kstars/kstars/tools/modcalcprec.h +++ b/kstars/kstars/tools/modcalcprec.h @@ -37,7 +37,7 @@ class SkyPoint; class modCalcPrec : public modCalcPrecDlg { -Q_OBJECT +TQ_OBJECT public: modCalcPrec(TQWidget *p, const char *n); diff --git a/kstars/kstars/tools/modcalcprecdlg.ui b/kstars/kstars/tools/modcalcprecdlg.ui index 0c749118..19e8a394 100644 --- a/kstars/kstars/tools/modcalcprecdlg.ui +++ b/kstars/kstars/tools/modcalcprecdlg.ui @@ -729,7 +729,7 @@ <tabstop>OutputLineEditBatch</tabstop> <tabstop>runButtonBatch_2</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotComputeCoords()</slot> <slot>slotClearCoords()</slot> <slot>slotRaCheckedBatch()</slot> @@ -741,7 +741,7 @@ <slot>slotInputFile()</slot> <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcsidtime.cpp b/kstars/kstars/tools/modcalcsidtime.cpp index 8d38f257..aa7ad586 100644 --- a/kstars/kstars/tools/modcalcsidtime.cpp +++ b/kstars/kstars/tools/modcalcsidtime.cpp @@ -158,14 +158,14 @@ void modCalcSidTime::slotLongChecked(){ void modCalcSidTime::sidNoCheck() { stBoxBatch->setEnabled(false); - stInputTime = FALSE; + stInputTime = false; } void modCalcSidTime::utNoCheck() { utBoxBatch->setEnabled(false); - stInputTime = TRUE; + stInputTime = true; } void modCalcSidTime::slotInputFile() { @@ -245,10 +245,10 @@ void modCalcSidTime::processLines( TQTextStream &istream ) { // Read Longitude and write in ostream if corresponds if (longCheckBatch->isChecked() ) { - longB = dms::fromString( fields[i],TRUE); + longB = dms::fromString( fields[i],true); i++; } else - longB = longBoxBatch->createDms(TRUE); + longB = longBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << longB.toDMSString() << space; diff --git a/kstars/kstars/tools/modcalcsidtime.h b/kstars/kstars/tools/modcalcsidtime.h index 83740efa..e0b4b356 100644 --- a/kstars/kstars/tools/modcalcsidtime.h +++ b/kstars/kstars/tools/modcalcsidtime.h @@ -36,7 +36,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 7469390a..b4e4706b 100644 --- a/kstars/kstars/tools/modcalcsidtimedlg.ui +++ b/kstars/kstars/tools/modcalcsidtimedlg.ui @@ -849,7 +849,7 @@ <tabstop>OutButtonBatch</tabstop> <tabstop>runButtonBatch</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotComputeTime()</slot> <slot>slotClearFields()</slot> <slot>slotLongChecked()</slot> @@ -859,7 +859,7 @@ <slot>slotRunBatch()</slot> <slot>slotInputFile()</slot> <slot>slotOutputFile()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcvlsr.cpp b/kstars/kstars/tools/modcalcvlsr.cpp index ffe6ed29..d69a143a 100644 --- a/kstars/kstars/tools/modcalcvlsr.cpp +++ b/kstars/kstars/tools/modcalcvlsr.cpp @@ -42,7 +42,7 @@ modCalcVlsr::modCalcVlsr(TQWidget *parentSplit, const char *name) : modCalcVlsrD showCurrentDateTime(); initGeo(); showLongLat(); - raBox->setDegType(FALSE); + raBox->setDegType(false); show(); } @@ -54,7 +54,7 @@ SkyPoint modCalcVlsr::getEquCoords (void) { dms raCoord, decCoord; - raCoord = raBox->createDms(FALSE); + raCoord = raBox->createDms(false); decCoord = decBox->createDms(); SkyPoint sp = SkyPoint (raCoord, decCoord); @@ -457,10 +457,10 @@ void modCalcVlsr::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(raCheckBatch->isChecked() ) { - raB = dms::fromString( fields[i],FALSE); + raB = dms::fromString( fields[i],false); i++; } else - raB = raBoxBatch->createDms(FALSE); + raB = raBoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << raB.toHMSString() << space; @@ -471,7 +471,7 @@ void modCalcVlsr::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(decCheckBatch->isChecked() ) { - decB = dms::fromString( fields[i], TRUE); + decB = dms::fromString( fields[i], true); i++; } else decB = decBoxBatch->createDms(); @@ -513,10 +513,10 @@ void modCalcVlsr::processLines( TQTextStream &istream ) { // Read Longitude and write in ostream if corresponds if (longCheckBatch->isChecked() ) { - longB = dms::fromString( fields[i],TRUE); + longB = dms::fromString( fields[i],true); i++; } else - longB = longBoxBatch->createDms(TRUE); + longB = longBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << longB.toDMSString() << space; @@ -528,10 +528,10 @@ void modCalcVlsr::processLines( TQTextStream &istream ) { if (latCheckBatch->isChecked() ) { - latB = dms::fromString( fields[i], TRUE); + latB = dms::fromString( fields[i], true); i++; } else - latB = latBoxBatch->createDms(TRUE); + latB = latBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << latB.toDMSString() << space; else diff --git a/kstars/kstars/tools/modcalcvlsr.h b/kstars/kstars/tools/modcalcvlsr.h index 182fc690..de6d739a 100644 --- a/kstars/kstars/tools/modcalcvlsr.h +++ b/kstars/kstars/tools/modcalcvlsr.h @@ -37,7 +37,7 @@ class dms; class modCalcVlsr : public modCalcVlsrDlg { -Q_OBJECT +TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalcvlsrdlg.ui b/kstars/kstars/tools/modcalcvlsrdlg.ui index d223ca0a..6eccbb84 100644 --- a/kstars/kstars/tools/modcalcvlsrdlg.ui +++ b/kstars/kstars/tools/modcalcvlsrdlg.ui @@ -1171,7 +1171,7 @@ <tabstop>runButtonBatch</tabstop> <tabstop>kTextBrowser1</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotComputeVelocities()</slot> <slot>slotClearCoords()</slot> <slot>slotUtChecked()</slot> @@ -1186,7 +1186,7 @@ <slot>slotInputFile()</slot> <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp index e67f933c..5aae1f0c 100644 --- a/kstars/kstars/tools/observinglist.cpp +++ b/kstars/kstars/tools/observinglist.cpp @@ -67,40 +67,40 @@ ObservingList::ObservingList( KStars *_ks, TQWidget* parent ) ui->MiniButton->hide(); //Connections - connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SLOT( slotClose() ) ); - connect( ui->TableStack, TQT_SIGNAL( aboutToShow( TQWidget* ) ), - this, TQT_SLOT( slotPrepTable( TQWidget* ) ) ); - connect( ui->FullTable, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotNewSelection() ) ); - connect( ui->TinyTable, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotNewSelection() ) ); - connect( ui->FullTable, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int) ), - this, TQT_SLOT( slotCenterObject() ) ); - connect( ui->TinyTable, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ), - this, TQT_SLOT( slotCenterObject() ) ); - connect( ui->RemoveButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotRemoveObjects() ) ); - connect( ui->CenterButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotCenterObject() ) ); - connect( ui->ScopeButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotSlewToObject() ) ); - connect( ui->DetailsButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotDetails() ) ); - connect( ui->AVTButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotAVT() ) ); - - connect( ui->OpenButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotOpenList() ) ); - connect( ui->SaveButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotSaveList() ) ); - connect( ui->SaveAsButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotSaveListAs() ) ); - connect( ui->WizardButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotWizard() ) ); + connect( this, TQ_SIGNAL( closeClicked() ), this, TQ_SLOT( slotClose() ) ); + connect( ui->TableStack, TQ_SIGNAL( aboutToShow( TQWidget* ) ), + this, TQ_SLOT( slotPrepTable( TQWidget* ) ) ); + connect( ui->FullTable, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotNewSelection() ) ); + connect( ui->TinyTable, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotNewSelection() ) ); + connect( ui->FullTable, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int) ), + this, TQ_SLOT( slotCenterObject() ) ); + connect( ui->TinyTable, TQ_SIGNAL( doubleClicked( TQListBoxItem* ) ), + this, TQ_SLOT( slotCenterObject() ) ); + connect( ui->RemoveButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotRemoveObjects() ) ); + connect( ui->CenterButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotCenterObject() ) ); + connect( ui->ScopeButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotSlewToObject() ) ); + connect( ui->DetailsButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotDetails() ) ); + connect( ui->AVTButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotAVT() ) ); + + connect( ui->OpenButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotOpenList() ) ); + connect( ui->SaveButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotSaveList() ) ); + connect( ui->SaveAsButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotSaveListAs() ) ); + connect( ui->WizardButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotWizard() ) ); //FIXME: enable MiniButton -// connect( ui->MiniButton, TQT_SIGNAL( clicked() ), -// this, TQT_SLOT( slotToggleSize() ) ); +// connect( ui->MiniButton, TQ_SIGNAL( clicked() ), +// this, TQ_SLOT( slotToggleSize() ) ); obsList.setAutoDelete( false ); //do NOT delete removed pointers! diff --git a/kstars/kstars/tools/observinglist.h b/kstars/kstars/tools/observinglist.h index 62f5d27e..719c4850 100644 --- a/kstars/kstars/tools/observinglist.h +++ b/kstars/kstars/tools/observinglist.h @@ -57,7 +57,7 @@ class TQStringList; class ObservingList : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/tools/observinglistui.ui b/kstars/kstars/tools/observinglistui.ui index 583a6ea6..6d00cabd 100644 --- a/kstars/kstars/tools/observinglistui.ui +++ b/kstars/kstars/tools/observinglistui.ui @@ -261,9 +261,6 @@ <property name="text"> <string>Scope</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Point telescope at highlighted object</string> </property> @@ -286,9 +283,6 @@ <property name="text"> <string>Details</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Show details for highlighted object</string> </property> diff --git a/kstars/kstars/tools/obslistwizard.cpp b/kstars/kstars/tools/obslistwizard.cpp index cf6c64d1..13864ece 100644 --- a/kstars/kstars/tools/obslistwizard.cpp +++ b/kstars/kstars/tools/obslistwizard.cpp @@ -44,35 +44,35 @@ ObsListWizard::ObsListWizard( TQWidget *parent, const char *name ) olw = new ObsListWizardUI( page ); vlay->addWidget( olw ); - connect( olw->AllButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAllButton() ) ); - connect( olw->NoneButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotNoneButton() ) ); - connect( olw->DeepSkyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDeepSkyButton() ) ); - connect( olw->SolarSystemButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSolarSystemButton() ) ); - connect( olw->LocationButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChangeLocation() ) ); + connect( olw->AllButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAllButton() ) ); + connect( olw->NoneButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNoneButton() ) ); + connect( olw->DeepSkyButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDeepSkyButton() ) ); + connect( olw->SolarSystemButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSolarSystemButton() ) ); + connect( olw->LocationButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChangeLocation() ) ); - connect( olw->FilterList, TQT_SIGNAL( clicked(TQListViewItem*) ), this, TQT_SLOT( slotShowStackWidget(TQListViewItem*) ) ); + connect( olw->FilterList, TQ_SIGNAL( clicked(TQListViewItem*) ), this, TQ_SLOT( slotShowStackWidget(TQListViewItem*) ) ); //Update the selected observing list when certain UI elements are modified - connect( olw->TypeList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->ConstellationList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->RAMin, TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->RAMax, TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->DecMin, TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->DecMax, TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->RA, TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->Dec, TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->Radius, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( slotUpdateObjectCount() ) ); -// connect( olw->Date, TQT_SIGNAL( valueChanged( const ExtDate& ) ), this, TQT_SLOT( slotApplyFilters() ) ); - connect( olw->Mag, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->ExcludeNoMag, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - - connect( olw->SelectByConstellation, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEnableConstellationPage(bool) ) ); - connect( olw->SelectByRect, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEnableRectPage(bool) ) ); - connect( olw->SelectByCirc, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEnableCircPage(bool) ) ); -// connect( olw->SelectByDate, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEnableDatePage(bool) ) ); - connect( olw->SelectByMag, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEnableMagPage(bool) ) ); - - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotApplyFilters() ) ); + connect( olw->TypeList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->ConstellationList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->RAMin, TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->RAMax, TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->DecMin, TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->DecMax, TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->RA, TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->Dec, TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->Radius, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( slotUpdateObjectCount() ) ); +// connect( olw->Date, TQ_SIGNAL( valueChanged( const ExtDate& ) ), this, TQ_SLOT( slotApplyFilters() ) ); + connect( olw->Mag, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->ExcludeNoMag, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + + connect( olw->SelectByConstellation, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEnableConstellationPage(bool) ) ); + connect( olw->SelectByRect, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEnableRectPage(bool) ) ); + connect( olw->SelectByCirc, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEnableCircPage(bool) ) ); +// connect( olw->SelectByDate, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEnableDatePage(bool) ) ); + connect( olw->SelectByMag, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEnableMagPage(bool) ) ); + + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotApplyFilters() ) ); initialize(); } diff --git a/kstars/kstars/tools/obslistwizard.h b/kstars/kstars/tools/obslistwizard.h index c4552f2c..ca6ca609 100644 --- a/kstars/kstars/tools/obslistwizard.h +++ b/kstars/kstars/tools/obslistwizard.h @@ -30,7 +30,7 @@ class TQListViewItem; class ObsListWizard : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /**@short Constructor diff --git a/kstars/kstars/tools/obslistwizardui.ui b/kstars/kstars/tools/obslistwizardui.ui index 7c6b2938..d1123754 100644 --- a/kstars/kstars/tools/obslistwizardui.ui +++ b/kstars/kstars/tools/obslistwizardui.ui @@ -336,9 +336,6 @@ <property name="text"> <string>Select objects in region:</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQLayoutWidget"> <property name="name"> @@ -523,9 +520,6 @@ <property name="text"> <string>Select objects within circle:</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQLayoutWidget"> <property name="name"> diff --git a/kstars/kstars/tools/planetviewer.cpp b/kstars/kstars/tools/planetviewer.cpp index a3f00266..178a0722 100644 --- a/kstars/kstars/tools/planetviewer.cpp +++ b/kstars/kstars/tools/planetviewer.cpp @@ -86,13 +86,13 @@ PlanetViewer::PlanetViewer(TQWidget *parent, const char *name) UpdateInterval[7] = 75; UpdateInterval[8] = 113; - TQTimer::singleShot( 0, this, TQT_SLOT( initPlotObjects() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( initPlotObjects() ) ); - connect( &tmr, TQT_SIGNAL( timeout() ), TQT_SLOT( tick() ) ); - connect( pw->timeStep, TQT_SIGNAL( scaleChanged(float) ), TQT_SLOT( setTimeScale(float) ) ); - connect( pw->RunButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRunClock() ) ); - connect( pw->dateBox, TQT_SIGNAL( valueChanged( const ExtDate & ) ), TQT_SLOT( slotChangeDate( const ExtDate & ) ) ); - connect( pw->TodayButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotToday() ) ); + connect( &tmr, TQ_SIGNAL( timeout() ), TQ_SLOT( tick() ) ); + connect( pw->timeStep, TQ_SIGNAL( scaleChanged(float) ), TQ_SLOT( setTimeScale(float) ) ); + connect( pw->RunButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRunClock() ) ); + connect( pw->dateBox, TQ_SIGNAL( valueChanged( const ExtDate & ) ), TQ_SLOT( slotChangeDate( const ExtDate & ) ) ); + connect( pw->TodayButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotToday() ) ); } PlanetViewer::~PlanetViewer() @@ -231,7 +231,7 @@ 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( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setMouseTracking (true); pv = (PlanetViewer*)topLevelWidget(); } @@ -239,7 +239,7 @@ PVPlotWidget::PVPlotWidget( double x1, double x2, double y1, double y2, TQWidget PVPlotWidget::PVPlotWidget( TQWidget *parent, const char *name ) : KStarsPlotWidget( 0.0, 1.0, 0.0, 1.0, parent, name ), mouseButtonDown(false), oldx(0), oldy(0) { - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setMouseTracking (true); pv = (PlanetViewer*)topLevelWidget(); } @@ -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); + tdeApp->processEvents(20); } oldx = e->x(); diff --git a/kstars/kstars/tools/planetviewer.h b/kstars/kstars/tools/planetviewer.h index a4be70f8..315621e0 100644 --- a/kstars/kstars/tools/planetviewer.h +++ b/kstars/kstars/tools/planetviewer.h @@ -33,7 +33,7 @@ */ class PlanetViewer : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: PlanetViewer(TQWidget *parent = 0, const char *name = 0); @@ -77,7 +77,7 @@ private: class PVPlotWidget : public KStarsPlotWidget { -Q_OBJECT +TQ_OBJECT public: PVPlotWidget( double x1, double x2, double y1, double y2, diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp index b9f480f7..df3cfff1 100644 --- a/kstars/kstars/tools/scriptbuilder.cpp +++ b/kstars/kstars/tools/scriptbuilder.cpp @@ -28,14 +28,14 @@ #include <tdeio/netaccess.h> #include <tdelistbox.h> #include <tdelistview.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <ktextedit.h> #include <tdetempfile.h> #include <kdatewidget.h> #include <tdemessagebox.h> #include <tdefiledialog.h> #include <kstdguiitem.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurl.h> #include <kurlrequester.h> #include <knuminput.h> @@ -112,13 +112,13 @@ ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name ) sb = new ScriptBuilderUI( page ); vlay->addWidget( sb ); - KStarsFunctionList.setAutoDelete( TRUE ); - INDIFunctionList.setAutoDelete( TRUE); - ScriptList.setAutoDelete( TRUE ); + KStarsFunctionList.setAutoDelete( true ); + INDIFunctionList.setAutoDelete( true); + ScriptList.setAutoDelete( true ); //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_OBJECT_NAME_STRING, "dir" ) ); + false, "TQString", "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_OBJECT_NAME_STRING, "key" ) ); + false, "TQString", "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_OBJECT_NAME_STRING, "opName", TQSTRING_OBJECT_NAME_STRING, "opValue" ) ); + KStarsFunctionList.append( new ScriptFunction( "changeViewOption", i18n( "Change view option named %1 to value %2." ), false, "TQString", "opName", "TQString", "opValue" ) ); KStarsFunctionList.append( new ScriptFunction( "setGeoLocation", i18n( "Set the geographic location to the city specified by %1, %2 and %3." ), - 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" ) ); + 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" ) ); 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_OBJECT_NAME_STRING, "deviceName", "bool", "useLocal"); + startINDIFunc = new ScriptFunction( "startINDI", i18n("Establish an INDI device either in local mode or server mode."), false, "TQString", "deviceName", "bool", "useLocal"); INDIFunctionList.append ( startINDIFunc ); - shutdownINDIFunc = new ScriptFunction( "shutdownINDI", i18n("Shutdown an INDI device."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName"); + shutdownINDIFunc = new ScriptFunction( "shutdownINDI", i18n("Shutdown an INDI device."), false, "TQString", "deviceName"); INDIFunctionList.append ( shutdownINDIFunc); - switchINDIFunc = new ScriptFunction( "switchINDI", i18n("Connect or Disconnect an INDI device."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "bool", "turnOn"); + switchINDIFunc = new ScriptFunction( "switchINDI", i18n("Connect or Disconnect an INDI device."), false, "TQString", "deviceName", "bool", "turnOn"); switchINDIFunc->setINDIProperty("CONNECTION"); INDIFunctionList.append ( switchINDIFunc); - setINDIPortFunc = new ScriptFunction( "setINDIPort", i18n("Set INDI's device connection port."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "port"); + setINDIPortFunc = new ScriptFunction( "setINDIPort", i18n("Set INDI's device connection port."), false, "TQString", "deviceName", "TQString", "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_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "action"); + setINDIScopeActionFunc = new ScriptFunction( "setINDIScopeAction", i18n("Set the telescope action. Available actions are SLEW, TRACK, SYNC, PARK, and ABORT."), false, "TQString", "deviceName", "TQString", "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_OBJECT_NAME_STRING, "deviceName", "double", "RA", "double", "DEC" ); + 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"); INDIFunctionList.append ( setINDITargetCoordFunc ); - 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 = 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"); INDIFunctionList.append( setINDITargetNameFunc); - 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 = new ScriptFunction ( "setINDIGeoLocation", i18n("Set the telescope longitude and latitude. The longitude is E of N."), false, "TQString", "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_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "UTCDateTime"); + 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->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_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "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", "deviceName", "TQString", "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_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "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", "deviceName", "TQString", "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_OBJECT_NAME_STRING, "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", "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_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "Dir"); + 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->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_OBJECT_NAME_STRING, "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", "deviceName", "int", "timeout"); setINDIFocusTimeoutFunc->setINDIProperty("FOCUS_TIMER"); INDIFunctionList.append( setINDIFocusTimeoutFunc); - setINDICCDTempFunc = new ScriptFunction( "setINDICCDTemp", i18n("Set the target CCD chip temperature."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "int", "temp"); + setINDICCDTempFunc = new ScriptFunction( "setINDICCDTemp", i18n("Set the target CCD chip temperature."), false, "TQString", "deviceName", "int", "temp"); setINDICCDTempFunc->setINDIProperty("CCD_TEMPERATURE"); INDIFunctionList.append( setINDICCDTempFunc); - setINDIFilterNumFunc = new ScriptFunction( "setINDIFilterNum", i18n("Set the target filter position."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "int", "filter_num"); + setINDIFilterNumFunc = new ScriptFunction( "setINDIFilterNum", i18n("Set the target filter position."), false, "TQString", "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_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "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", "deviceName", "TQString", "type"); setINDIFrameTypeFunc->setINDIProperty("FRAME_TYPE"); INDIFunctionList.append( setINDIFrameTypeFunc); - startINDIExposureFunc = new ScriptFunction ( "startINDIExposure", i18n("Start Camera/CCD exposure. The duration is in seconds."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "int", "timeout"); + startINDIExposureFunc = new ScriptFunction ( "startINDIExposure", i18n("Start Camera/CCD exposure. The duration is in seconds."), false, "TQString", "deviceName", "int", "timeout"); startINDIExposureFunc->setINDIProperty("CCD_EXPOSE_DURATION"); INDIFunctionList.append( startINDIExposureFunc); @@ -371,129 +371,129 @@ ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name ) initViewOptions(); //connect widgets in ScriptBuilderUI - connect( sb->FunctionListView, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT( slotAddFunction() ) ); - connect( sb->FunctionListView, TQT_SIGNAL( currentChanged(TQListViewItem*) ), this, TQT_SLOT( slotShowDoc() ) ); - connect( sb->UpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveFunctionUp() ) ); - connect( sb->ScriptListBox, TQT_SIGNAL( currentChanged(TQListBoxItem*) ), this, TQT_SLOT( slotArgWidget() ) ); - connect( sb->DownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveFunctionDown() ) ); - connect( sb->CopyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopyFunction() ) ); - connect( sb->RemoveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveFunction() ) ); - connect( sb->NewButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotNew() ) ); - connect( sb->OpenButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOpen() ) ); - connect( sb->SaveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSave() ) ); - connect( sb->SaveAsButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSaveAs() ) ); - connect( sb->AddButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddFunction() ) ); - connect( sb->RunButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRunScript() ) ); + connect( sb->FunctionListView, TQ_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int )), this, TQ_SLOT( slotAddFunction() ) ); + connect( sb->FunctionListView, TQ_SIGNAL( currentChanged(TQListViewItem*) ), this, TQ_SLOT( slotShowDoc() ) ); + connect( sb->UpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveFunctionUp() ) ); + connect( sb->ScriptListBox, TQ_SIGNAL( currentChanged(TQListBoxItem*) ), this, TQ_SLOT( slotArgWidget() ) ); + connect( sb->DownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveFunctionDown() ) ); + connect( sb->CopyButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCopyFunction() ) ); + connect( sb->RemoveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveFunction() ) ); + connect( sb->NewButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNew() ) ); + connect( sb->OpenButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpen() ) ); + connect( sb->SaveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSave() ) ); + connect( sb->SaveAsButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSaveAs() ) ); + connect( sb->AddButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddFunction() ) ); + connect( sb->RunButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRunScript() ) ); //Connections for Arg Widgets - connect( argSetGeoLocation->FindCityButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotFindCity() ) ); - connect( argLookToward->FindButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotFindObject() ) ); - connect( argChangeViewOption->TreeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowOptions() ) ); - - connect( argLookToward->FocusEdit, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotLookToward() ) ); - connect( argSetRaDec->RaBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotRa() ) ); - connect( argSetRaDec->DecBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotDec() ) ); - connect( argSetAltAz->AltBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotAlt() ) ); - connect( argSetAltAz->AzBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotAz() ) ); - connect( argSetLocalTime->DateBox, TQT_SIGNAL( changed(ExtDate) ), this, TQT_SLOT( slotChangeDate() ) ); - connect( argSetLocalTime->TimeBox, TQT_SIGNAL( valueChanged(const TQTime&) ), this, TQT_SLOT( slotChangeTime() ) ); - connect( argWaitFor->DelayBox, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotWaitFor() ) ); - connect( argWaitForKey->WaitKeyEdit, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotWaitForKey() ) ); - connect( argSetTracking->CheckTrack, TQT_SIGNAL( stateChanged(int) ), this, TQT_SLOT( slotTracking() ) ); - connect( argChangeViewOption->OptionName, TQT_SIGNAL( activated(const TQString &) ), this, TQT_SLOT( slotViewOption() ) ); - connect( argChangeViewOption->OptionValue, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotViewOption() ) ); - connect( argSetGeoLocation->CityName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotChangeCity() ) ); - connect( argSetGeoLocation->ProvinceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotChangeProvince() ) ); - connect( argSetGeoLocation->CountryName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotChangeCountry() ) ); - connect( argTimeScale->TimeScale, TQT_SIGNAL( scaleChanged(float) ), this, TQT_SLOT( slotTimeScale() ) ); - connect( argZoom->ZoomBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotZoom() ) ); - connect( argExportImage->ExportFileName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotExportImage() ) ); - connect( argExportImage->ExportWidth, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotExportImage() ) ); - connect( argExportImage->ExportHeight, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotExportImage() ) ); - connect( argPrintImage->UsePrintDialog, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotPrintImage() ) ); - connect( argPrintImage->UseChartColors, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotPrintImage() ) ); - connect( argSetColor->ColorName, TQT_SIGNAL( activated(const TQString &) ), this, TQT_SLOT( slotChangeColorName() ) ); - connect( argSetColor->ColorValue, TQT_SIGNAL( changed(const TQColor &) ), this, TQT_SLOT( slotChangeColor() ) ); - connect( argLoadColorScheme->SchemeList, TQT_SIGNAL( clicked( TQListBoxItem* ) ), this, TQT_SLOT( slotLoadColorScheme( TQListBoxItem* ) ) ); - connect( snd->ScriptName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotEnableScriptNameOK() ) ); - - connect( sb->AppendINDIWait, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT(slotINDIWaitCheck(bool))); + connect( argSetGeoLocation->FindCityButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotFindCity() ) ); + connect( argLookToward->FindButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotFindObject() ) ); + connect( argChangeViewOption->TreeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotShowOptions() ) ); + + connect( argLookToward->FocusEdit, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotLookToward() ) ); + connect( argSetRaDec->RaBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotRa() ) ); + connect( argSetRaDec->DecBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotDec() ) ); + connect( argSetAltAz->AltBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotAlt() ) ); + connect( argSetAltAz->AzBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotAz() ) ); + connect( argSetLocalTime->DateBox, TQ_SIGNAL( changed(ExtDate) ), this, TQ_SLOT( slotChangeDate() ) ); + connect( argSetLocalTime->TimeBox, TQ_SIGNAL( valueChanged(const TQTime&) ), this, TQ_SLOT( slotChangeTime() ) ); + connect( argWaitFor->DelayBox, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotWaitFor() ) ); + connect( argWaitForKey->WaitKeyEdit, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotWaitForKey() ) ); + connect( argSetTracking->CheckTrack, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( slotTracking() ) ); + connect( argChangeViewOption->OptionName, TQ_SIGNAL( activated(const TQString &) ), this, TQ_SLOT( slotViewOption() ) ); + connect( argChangeViewOption->OptionValue, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotViewOption() ) ); + connect( argSetGeoLocation->CityName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotChangeCity() ) ); + connect( argSetGeoLocation->ProvinceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotChangeProvince() ) ); + connect( argSetGeoLocation->CountryName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotChangeCountry() ) ); + connect( argTimeScale->TimeScale, TQ_SIGNAL( scaleChanged(float) ), this, TQ_SLOT( slotTimeScale() ) ); + connect( argZoom->ZoomBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotZoom() ) ); + connect( argExportImage->ExportFileName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotExportImage() ) ); + connect( argExportImage->ExportWidth, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotExportImage() ) ); + connect( argExportImage->ExportHeight, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotExportImage() ) ); + connect( argPrintImage->UsePrintDialog, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotPrintImage() ) ); + connect( argPrintImage->UseChartColors, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotPrintImage() ) ); + connect( argSetColor->ColorName, TQ_SIGNAL( activated(const TQString &) ), this, TQ_SLOT( slotChangeColorName() ) ); + connect( argSetColor->ColorValue, TQ_SIGNAL( changed(const TQColor &) ), this, TQ_SLOT( slotChangeColor() ) ); + connect( argLoadColorScheme->SchemeList, TQ_SIGNAL( clicked( TQListBoxItem* ) ), this, TQ_SLOT( slotLoadColorScheme( TQListBoxItem* ) ) ); + connect( snd->ScriptName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotEnableScriptNameOK() ) ); + + connect( sb->AppendINDIWait, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT(slotINDIWaitCheck(bool))); // Connections for INDI's Arg widgets // INDI Start Device - connect (argStartINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDIStartDeviceName())); - connect (argStartINDI->INDIMode, TQT_SIGNAL ( clicked( int)), this, TQT_SLOT (slotINDIStartDeviceMode())); + connect (argStartINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDIStartDeviceName())); + connect (argStartINDI->INDIMode, TQ_SIGNAL ( clicked( int)), this, TQ_SLOT (slotINDIStartDeviceMode())); // INDI Shutdown Device - connect (argShutdownINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDIShutdown())); + connect (argShutdownINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDIShutdown())); // INDI Swtich Device - connect (argSwitchINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISwitchDeviceName())); - connect (argSwitchINDI->INDIConnection, TQT_SIGNAL ( clicked( int)), this, TQT_SLOT (slotINDISwitchDeviceConnection())); + connect (argSwitchINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISwitchDeviceName())); + connect (argSwitchINDI->INDIConnection, TQ_SIGNAL ( clicked( int)), this, TQ_SLOT (slotINDISwitchDeviceConnection())); // INDI Set Device Port - connect (argSetPortINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetPortDeviceName())); - connect (argSetPortINDI->devicePort, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetPortDevicePort())); + connect (argSetPortINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetPortDeviceName())); + connect (argSetPortINDI->devicePort, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetPortDevicePort())); // INDI Set Target Coord - connect (argSetTargetCoordINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetTargetCoordDeviceName())); - connect( argSetTargetCoordINDI->RaBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotINDISetTargetCoordDeviceRA() ) ); - connect( argSetTargetCoordINDI->DecBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotINDISetTargetCoordDeviceDEC() ) ); + connect (argSetTargetCoordINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetTargetCoordDeviceName())); + connect( argSetTargetCoordINDI->RaBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotINDISetTargetCoordDeviceRA() ) ); + connect( argSetTargetCoordINDI->DecBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotINDISetTargetCoordDeviceDEC() ) ); // INDI Set Target Name - connect( argSetTargetNameINDI->FindButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotINDIFindObject() ) ); - connect (argSetTargetNameINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetTargetNameDeviceName())); - connect (argSetTargetNameINDI->objectName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetTargetNameObjectName())); + connect( argSetTargetNameINDI->FindButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotINDIFindObject() ) ); + connect (argSetTargetNameINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetTargetNameDeviceName())); + connect (argSetTargetNameINDI->objectName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetTargetNameObjectName())); // INDI Set Action - connect (argSetActionINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetActionDeviceName())); - connect (argSetActionINDI->actionName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetActionName())); + connect (argSetActionINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetActionDeviceName())); + connect (argSetActionINDI->actionName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetActionName())); // INDI Wait For Action - connect (argWaitForActionINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDIWaitForActionDeviceName())); - connect (argWaitForActionINDI->actionName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDIWaitForActionName())); + connect (argWaitForActionINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDIWaitForActionDeviceName())); + connect (argWaitForActionINDI->actionName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDIWaitForActionName())); // INDI Set Focus Speed - connect (argSetFocusSpeedINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetFocusSpeedDeviceName())); - connect (argSetFocusSpeedINDI->speedIN, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT(slotINDISetFocusSpeed())); + connect (argSetFocusSpeedINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetFocusSpeedDeviceName())); + connect (argSetFocusSpeedINDI->speedIN, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT(slotINDISetFocusSpeed())); // INDI Start Focus - connect (argStartFocusINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDIStartFocusDeviceName())); - connect (argStartFocusINDI->directionCombo, TQT_SIGNAL( activated(const TQString &) ), this, TQT_SLOT(slotINDIStartFocusDirection())); + connect (argStartFocusINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDIStartFocusDeviceName())); + connect (argStartFocusINDI->directionCombo, TQ_SIGNAL( activated(const TQString &) ), this, TQ_SLOT(slotINDIStartFocusDirection())); // INDI Set Focus Timeout - connect (argSetFocusTimeoutINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetFocusTimeoutDeviceName())); - connect (argSetFocusTimeoutINDI->timeOut, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT(slotINDISetFocusTimeout())); + connect (argSetFocusTimeoutINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetFocusTimeoutDeviceName())); + connect (argSetFocusTimeoutINDI->timeOut, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT(slotINDISetFocusTimeout())); // INDI Set Geo Location - connect (argSetGeoLocationINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetGeoLocationDeviceName())); - connect( argSetGeoLocationINDI->longBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotINDISetGeoLocationDeviceLong() ) ); - connect( argSetGeoLocationINDI->latBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotINDISetGeoLocationDeviceLat() ) ); + connect (argSetGeoLocationINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetGeoLocationDeviceName())); + connect( argSetGeoLocationINDI->longBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotINDISetGeoLocationDeviceLong() ) ); + connect( argSetGeoLocationINDI->latBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotINDISetGeoLocationDeviceLat() ) ); // INDI Start Exposure - connect (argStartExposureINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDIStartExposureDeviceName())); - connect (argStartExposureINDI->timeOut, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT(slotINDIStartExposureTimeout())); + connect (argStartExposureINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDIStartExposureDeviceName())); + connect (argStartExposureINDI->timeOut, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT(slotINDIStartExposureTimeout())); // INDI Set UTC - connect (argSetUTCINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetUTCDeviceName())); - connect (argSetUTCINDI->UTC, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetUTC())); + connect (argSetUTCINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetUTCDeviceName())); + connect (argSetUTCINDI->UTC, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetUTC())); // INDI Set Scope Action - connect (argSetScopeActionINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetScopeActionDeviceName())); - connect (argSetScopeActionINDI->actionCombo, TQT_SIGNAL( activated(const TQString &) ), this, TQT_SLOT(slotINDISetScopeAction())); + connect (argSetScopeActionINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetScopeActionDeviceName())); + connect (argSetScopeActionINDI->actionCombo, TQ_SIGNAL( activated(const TQString &) ), this, TQ_SLOT(slotINDISetScopeAction())); // INDI Set Frame type - connect (argSetFrameTypeINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetFrameTypeDeviceName())); - connect (argSetFrameTypeINDI->typeCombo, TQT_SIGNAL( activated(const TQString &) ), this, TQT_SLOT(slotINDISetFrameType())); + connect (argSetFrameTypeINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetFrameTypeDeviceName())); + connect (argSetFrameTypeINDI->typeCombo, TQ_SIGNAL( activated(const TQString &) ), this, TQ_SLOT(slotINDISetFrameType())); // INDI Set CCD Temp - connect (argSetCCDTempINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetCCDTempDeviceName())); - connect (argSetCCDTempINDI->temp, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT(slotINDISetCCDTemp())); + connect (argSetCCDTempINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetCCDTempDeviceName())); + connect (argSetCCDTempINDI->temp, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT(slotINDISetCCDTemp())); // INDI Set Filter Num - connect (argSetFilterNumINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetFilterNumDeviceName())); - connect (argSetFilterNumINDI->filter_num, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT(slotINDISetFilterNum())); + connect (argSetFilterNumINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetFilterNumDeviceName())); + connect (argSetFilterNumINDI->filter_num, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT(slotINDISetFilterNum())); //disbale some buttons @@ -803,7 +803,7 @@ void ScriptBuilder::slotSave() { //Warn user if file exists if (TQFile::exists(currentFileURL.path())) { - int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), + int r=KMessageBox::warningContinueCancel(static_cast<TQWidget*>(parent()), i18n( "A file named \"%1\" already exists. " "Overwrite it?" ).arg(currentFileURL.fileName()), i18n( "Overwrite File?" ), @@ -903,7 +903,7 @@ void ScriptBuilder::slotRunScript() { if ( ! p.start( TDEProcess::DontCare ) ) kdDebug() << "Process did not start." << endl; - while ( p.isRunning() ) kapp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes. + while ( p.isRunning() ) tdeApp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes. //delete temp file if ( f.exists() ) f.remove(); diff --git a/kstars/kstars/tools/scriptbuilder.h b/kstars/kstars/tools/scriptbuilder.h index d491ffb1..3ae58b86 100644 --- a/kstars/kstars/tools/scriptbuilder.h +++ b/kstars/kstars/tools/scriptbuilder.h @@ -67,7 +67,7 @@ class ArgSetFilterNumINDI; */ class ScriptBuilder : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: ScriptBuilder( TQWidget *parent, const char *name=0 ); diff --git a/kstars/kstars/tools/scriptbuilderui.ui b/kstars/kstars/tools/scriptbuilderui.ui index 12470945..31c36ba5 100644 --- a/kstars/kstars/tools/scriptbuilderui.ui +++ b/kstars/kstars/tools/scriptbuilderui.ui @@ -613,7 +613,7 @@ </widget> </grid> </widget> -<Q_SLOTS> +<slots> <slot>slotAddFunction()</slot> <slot>slotMoveFunctionUp()</slot> <slot>slotMoveFunctionDown()</slot> @@ -626,7 +626,7 @@ <slot>slotCopyFunction()</slot> <slot>slotRemoveFunction()</slot> <slot>slotRunScript()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="4"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/wutdialog.cpp b/kstars/kstars/tools/wutdialog.cpp index 632f6254..d326ae06 100644 --- a/kstars/kstars/tools/wutdialog.cpp +++ b/kstars/kstars/tools/wutdialog.cpp @@ -82,27 +82,27 @@ WUTDialog::WUTDialog(KStars *ks) : 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->DateLabel->setText( i18n( "The night of %1" ).arg( Evening.date().toString( TQt::LocalDate ) ) ); initCategories(); makeConnections(); - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } WUTDialog::~WUTDialog(){ } void WUTDialog::makeConnections() { - connect( WUT->DateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotChangeDate() ) ); - connect( WUT->LocationButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotChangeLocation() ) ); - connect( WUT->CenterButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCenter() ) ); - connect( WUT->DetailButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDetails() ) ); - connect( WUT->CategoryListBox, TQT_SIGNAL( highlighted(int) ), TQT_SLOT( slotLoadList(int) ) ); - connect( WUT->ObjectListBox, TQT_SIGNAL( selectionChanged(TQListBoxItem*) ), - TQT_SLOT( slotDisplayObject(TQListBoxItem*) ) ); - connect( WUT->EveningMorningBox, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotEveningMorning(int) ) ); + connect( WUT->DateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotChangeDate() ) ); + connect( WUT->LocationButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotChangeLocation() ) ); + connect( WUT->CenterButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCenter() ) ); + connect( WUT->DetailButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDetails() ) ); + connect( WUT->CategoryListBox, TQ_SIGNAL( highlighted(int) ), TQ_SLOT( slotLoadList(int) ) ); + connect( WUT->ObjectListBox, TQ_SIGNAL( selectionChanged(TQListBoxItem*) ), + TQ_SLOT( slotDisplayObject(TQListBoxItem*) ) ); + connect( WUT->EveningMorningBox, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotEveningMorning(int) ) ); } void WUTDialog::initCategories() { diff --git a/kstars/kstars/tools/wutdialog.h b/kstars/kstars/tools/wutdialog.h index 1806b7f0..95f83b90 100644 --- a/kstars/kstars/tools/wutdialog.h +++ b/kstars/kstars/tools/wutdialog.h @@ -40,7 +40,7 @@ class TQFrame; */ class WUTDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -97,7 +97,7 @@ class WUTDialog : public KDialogBase { KStars *kstars; WUTDialogUI *WUT; - /**@short Initialize all SIGNAL/TQT_SLOT connections, used in constructor */ + /**@short Initialize all signal/slot connections, used in constructor */ void makeConnections(); /**@short Initialize catgory list, used in constructor */ |