summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-18 18:30:46 -0600
committerTimothy Pearson <[email protected]>2011-12-18 18:30:46 -0600
commit999f961ff5278b84c8ffd8a91addb9343e589cf0 (patch)
treeed392c698357e3037e6d9f5f40a33797b72e6129
parent2d7b541a4e0095d40e37aaefbf9c4a9b9d149302 (diff)
downloadtdeedu-999f961ff5278b84c8ffd8a91addb9343e589cf0.tar.gz
tdeedu-999f961ff5278b84c8ffd8a91addb9343e589cf0.zip
Rename old tq methods that no longer need a unique name
-rw-r--r--blinken/src/highscoredialog.cpp2
-rw-r--r--kalzium/RELEASE-PLAN2
-rw-r--r--kalzium/src/eqresult.cpp4
-rw-r--r--kalzium/src/kalzium.cpp2
-rw-r--r--kalzium/src/kalziumtip.cpp4
-rw-r--r--kalzium/src/molcalcwidgetbase.ui2
-rw-r--r--kalzium/src/plotsetupwidget.ui2
-rw-r--r--kalzium/src/settings_misc.ui2
-rw-r--r--kalzium/src/somwidget.ui8
-rw-r--r--kalzium/src/somwidget_impl.cpp2
-rw-r--r--kalzium/src/spectrumview.ui4
-rw-r--r--kalzium/src/spectrumviewimpl.cpp2
-rw-r--r--kalzium/src/spectrumwidget.cpp2
-rw-r--r--kalzium/src/timewidget.ui8
-rw-r--r--kalzium/src/timewidget_impl.cpp2
-rw-r--r--kanagram/src/mainsettingswidget.ui2
-rw-r--r--kanagram/src/newstuffwidget.ui2
-rw-r--r--kbruch/src/mainqtwidget.cpp4
-rw-r--r--kbruch/src/taskvieweroptionsbase.ui2
-rw-r--r--keduca/keduca/configdialogbase.ui2
-rw-r--r--keduca/keduca/kcheckeduca.cpp10
-rw-r--r--keduca/keduca/keduca.cpp2
-rw-r--r--keduca/keduca/keducaprefs.cpp4
-rw-r--r--keduca/keduca/keducaview.cpp26
-rw-r--r--keduca/keduca/keducaview.h2
-rw-r--r--keduca/keduca/kgroupeduca.cpp2
-rw-r--r--keduca/keduca/kquestion.cpp4
-rw-r--r--keduca/keduca/kradioeduca.cpp10
-rw-r--r--keduca/keducabuilder/kcontroladdeditbase.ui34
-rw-r--r--keduca/keducabuilder/kcontrolheader.cpp38
-rw-r--r--keduca/keducabuilder/kcontrolheaderbase.ui16
-rw-r--r--keduca/keducabuilder/keducabuilder.cpp4
-rw-r--r--keduca/keducabuilder/keducaeditorstartdialogbase.ui6
-rw-r--r--keduca/keducabuilder/klangcombo.cpp6
-rw-r--r--keduca/keducabuilder/ktagcombobox.cpp2
-rw-r--r--keduca/libkeduca/kgallerydialogbase.ui12
-rw-r--r--kgeography/src/answer.cpp6
-rw-r--r--kgeography/src/answersdialog.cpp4
-rw-r--r--kgeography/src/askwidget.cpp2
-rw-r--r--kgeography/src/kgeography.cpp2
-rw-r--r--kgeography/src/mapasker.cpp2
-rw-r--r--kgeography/src/mapwidget.cpp4
-rw-r--r--kgeography/src/mapwidget.h2
-rw-r--r--kgeography/src/mypopup.cpp8
-rw-r--r--khangman/khangman/khangman.cpp2
-rw-r--r--khangman/khangman/khangmanview.cpp6
-rw-r--r--khangman/khangman/timerdlg.ui8
-rw-r--r--kig/filters/drgeo-filter-chooserbase.ui2
-rw-r--r--kig/filters/drgeo-filter.cc2
-rw-r--r--kig/filters/filters-common.cc2
-rw-r--r--kig/filters/kgeo-filter.cc2
-rw-r--r--kig/filters/kgeo-filter.h2
-rw-r--r--kig/filters/kseg-filter.cc2
-rw-r--r--kig/filters/native-filter.cc10
-rw-r--r--kig/kfile/kfile_kig.cpp4
-rw-r--r--kig/kig/kig_view.cpp10
-rw-r--r--kig/kig/kig_view.h2
-rw-r--r--kig/misc/coordinate_system.cpp16
-rw-r--r--kig/misc/guiaction.cc8
-rw-r--r--kig/misc/kiginputdialog.cc2
-rw-r--r--kig/misc/kigpainter.cpp8
-rw-r--r--kig/misc/object_hierarchy.cc6
-rw-r--r--kig/modes/construct_mode.cc2
-rw-r--r--kig/modes/edittype.cc4
-rw-r--r--kig/modes/edittypebase.ui4
-rw-r--r--kig/modes/macrowizard.cc4
-rw-r--r--kig/modes/popup.cc8
-rw-r--r--kig/modes/textlabelwizard.cc4
-rw-r--r--kig/modes/typesdialog.cpp4
-rw-r--r--kig/modes/typesdialogbase.ui4
-rw-r--r--kig/objects/object_imp_factory.cc36
-rw-r--r--kig/objects/point_type.cc2
-rw-r--r--kig/scripting/newscriptwizard.cc4
-rw-r--r--kig/scripting/script-common.cc2
-rw-r--r--kiten/configdictionariesbase.ui8
-rw-r--r--kiten/configlearn.ui4
-rw-r--r--kiten/configsearching.ui2
-rw-r--r--kiten/dict.cpp10
-rw-r--r--kiten/edict4
-rw-r--r--kiten/widgets.cpp2
-rw-r--r--klatin/klatin/klatinchoose.ui8
-rw-r--r--klatin/klatin/klatingrammarwidget.ui12
-rw-r--r--klatin/klatin/klatinresultsdialog.ui2
-rw-r--r--klatin/klatin/klatinverbswidget.ui10
-rw-r--r--klatin/klatin/klatinvocabwidget.ui14
-rw-r--r--klettres/klettres/klettres.cpp2
-rw-r--r--klettres/klettres/timerdlg.ui14
-rw-r--r--kmplot/kmplot/FktDlgData.ui8
-rw-r--r--kmplot/kmplot/View.cpp2
-rw-r--r--kmplot/kmplot/editderivativespage.ui2
-rw-r--r--kmplot/kmplot/editfunctionpage.ui20
-rw-r--r--kmplot/kmplot/editintegralpage.ui2
-rw-r--r--kmplot/kmplot/kmplot.cpp2
-rw-r--r--kmplot/kmplot/qconstanteditor.ui2
-rw-r--r--kmplot/kmplot/qeditconstant.ui2
-rw-r--r--kmplot/kmplot/qeditparametric.ui2
-rw-r--r--kmplot/kmplot/qeditpolar.ui2
-rw-r--r--kmplot/kmplot/qparametereditor.ui4
-rw-r--r--kmplot/kmplot/settingspagecolor.ui6
-rw-r--r--kmplot/kmplot/settingspagecoords.ui4
-rw-r--r--kmplot/kmplot/settingspagefonts.ui2
-rw-r--r--kmplot/kmplot/settingspageprecision.ui4
-rw-r--r--kmplot/kmplot/settingspagescaling.ui2
-rw-r--r--kmplot/kmplot/sliderwindow.ui4
-rw-r--r--kpercentage/kpercentage/kanswer.cpp2
-rw-r--r--kpercentage/kpercentage/kpercentmain.cpp6
-rw-r--r--kpercentage/kpercentage/ksplashscreen.cpp2
-rw-r--r--kstars/kstars/addcatdialog.cpp2
-rw-r--r--kstars/kstars/addcatdialogui.ui4
-rw-r--r--kstars/kstars/addlinkdialogui.ui6
-rw-r--r--kstars/kstars/ccdpreviewui.ui14
-rw-r--r--kstars/kstars/conbridlg.cpp2
-rw-r--r--kstars/kstars/conbridlg.h2
-rw-r--r--kstars/kstars/details_data.ui14
-rw-r--r--kstars/kstars/details_links.ui4
-rw-r--r--kstars/kstars/details_position.ui12
-rw-r--r--kstars/kstars/devicemanager.cpp4
-rw-r--r--kstars/kstars/devmanager.ui14
-rw-r--r--kstars/kstars/finddialog.cpp2
-rw-r--r--kstars/kstars/fitsheaderdialog.ui2
-rw-r--r--kstars/kstars/focusdialog.cpp2
-rw-r--r--kstars/kstars/focusdialog.h2
-rw-r--r--kstars/kstars/focusdialogdlg.ui4
-rw-r--r--kstars/kstars/fovdialogui.ui10
-rw-r--r--kstars/kstars/histdialog.ui12
-rw-r--r--kstars/kstars/imagereductionui.ui14
-rw-r--r--kstars/kstars/imagesequence.cpp2
-rw-r--r--kstars/kstars/imagesequence.h2
-rw-r--r--kstars/kstars/imgsequencedlgui.ui10
-rw-r--r--kstars/kstars/indi/apmount.cpp2
-rw-r--r--kstars/kstars/indi/apogee/ApnCamera.cpp60
-rw-r--r--kstars/kstars/indi/apogee/ApnCamera.h10
-rw-r--r--kstars/kstars/indi/apogee/ApnCamera_Linux.cpp4
-rw-r--r--kstars/kstars/indi/apogee/ApnCamera_NET.cpp2
-rw-r--r--kstars/kstars/indi/apogee/ApnCamera_USB.cpp4
-rw-r--r--kstars/kstars/indi/apogee/Apogee.h8
-rw-r--r--kstars/kstars/indi/apogee/CameraIO_Linux.cpp80
-rw-r--r--kstars/kstars/indi/apogee/CameraIO_Linux.h18
-rw-r--r--kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp8
-rw-r--r--kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp8
-rw-r--r--kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp8
-rw-r--r--kstars/kstars/indi/apogee/CameraIO_PCI.cpp6
-rw-r--r--kstars/kstars/indi/apogee_ppi.cpp12
-rw-r--r--kstars/kstars/indi/fli/libfli.c8
-rw-r--r--kstars/kstars/indi/fli/libfli.h2
-rw-r--r--kstars/kstars/indi/fli_ccd.c2
-rw-r--r--kstars/kstars/indi/lx200_16.cpp2
-rw-r--r--kstars/kstars/indi/lx200driver.c14
-rw-r--r--kstars/kstars/indi/lx200driver.h6
-rw-r--r--kstars/kstars/indi/lx200generic.cpp2
-rw-r--r--kstars/kstars/indi/lx200gps.cpp2
-rw-r--r--kstars/kstars/indi/sbigccd.cpp8
-rw-r--r--kstars/kstars/indiconf.ui10
-rw-r--r--kstars/kstars/indidriver.cpp16
-rw-r--r--kstars/kstars/indidriver.h4
-rw-r--r--kstars/kstars/indielement.cpp12
-rw-r--r--kstars/kstars/indihostconf.ui4
-rw-r--r--kstars/kstars/indimenu.cpp2
-rw-r--r--kstars/kstars/indimenu.h2
-rw-r--r--kstars/kstars/indiproperty.cpp6
-rw-r--r--kstars/kstars/ksnewstuff.cpp6
-rw-r--r--kstars/kstars/kspopupmenu.cpp14
-rw-r--r--kstars/kstars/kstars.cpp4
-rw-r--r--kstars/kstars/kstars.h2
-rw-r--r--kstars/kstars/kstarsactions.cpp14
-rw-r--r--kstars/kstars/kstarsdatetime.cpp6
-rw-r--r--kstars/kstars/kstarsdatetime.h2
-rw-r--r--kstars/kstars/kstarsdcop.cpp12
-rw-r--r--kstars/kstars/kstarssplash.cpp14
-rw-r--r--kstars/kstars/kstarssplash.h2
-rw-r--r--kstars/kstars/kswizardui.ui46
-rw-r--r--kstars/kstars/main.cpp10
-rw-r--r--kstars/kstars/mapcanvas.cpp6
-rw-r--r--kstars/kstars/newfovui.ui22
-rw-r--r--kstars/kstars/opsadvancedui.ui10
-rw-r--r--kstars/kstars/opscatalogui.ui20
-rw-r--r--kstars/kstars/opscolorsui.ui8
-rw-r--r--kstars/kstars/opsguidesui.ui6
-rw-r--r--kstars/kstars/opssolarsystemui.ui8
-rw-r--r--kstars/kstars/simclock.h2
-rw-r--r--kstars/kstars/skymap.cpp4
-rw-r--r--kstars/kstars/skymapdraw.cpp4
-rw-r--r--kstars/kstars/streamformui.ui10
-rw-r--r--kstars/kstars/telescopepropui.ui6
-rw-r--r--kstars/kstars/telescopewizard.ui22
-rw-r--r--kstars/kstars/telescopewizardprocess.cpp10
-rw-r--r--kstars/kstars/thumbnailpicker.cpp4
-rw-r--r--kstars/kstars/thumbnailpickerui.ui18
-rw-r--r--kstars/kstars/timebox.cpp4
-rw-r--r--kstars/kstars/timedialog.cpp2
-rw-r--r--kstars/kstars/tools/altvstime.cpp4
-rw-r--r--kstars/kstars/tools/altvstimeui.ui16
-rw-r--r--kstars/kstars/tools/argchangeviewoption.ui6
-rw-r--r--kstars/kstars/tools/argexportimage.ui10
-rw-r--r--kstars/kstars/tools/arglooktoward.ui4
-rw-r--r--kstars/kstars/tools/argprintimage.ui2
-rw-r--r--kstars/kstars/tools/argsetactionindi.ui4
-rw-r--r--kstars/kstars/tools/argsetaltaz.ui2
-rw-r--r--kstars/kstars/tools/argsetccdtempindi.ui4
-rw-r--r--kstars/kstars/tools/argsetcolor.ui8
-rw-r--r--kstars/kstars/tools/argsetfilternumindi.ui4
-rw-r--r--kstars/kstars/tools/argsetfocusspeedindi.ui4
-rw-r--r--kstars/kstars/tools/argsetfocustimeoutindi.ui4
-rw-r--r--kstars/kstars/tools/argsetframetypeindi.ui4
-rw-r--r--kstars/kstars/tools/argsetgeolocation.ui6
-rw-r--r--kstars/kstars/tools/argsetgeolocationindi.ui2
-rw-r--r--kstars/kstars/tools/argsetlocaltime.ui4
-rw-r--r--kstars/kstars/tools/argsetportindi.ui2
-rw-r--r--kstars/kstars/tools/argsetradec.ui2
-rw-r--r--kstars/kstars/tools/argsetscopeactionindi.ui4
-rw-r--r--kstars/kstars/tools/argsettargetcoordindi.ui2
-rw-r--r--kstars/kstars/tools/argsettargetnameindi.ui4
-rw-r--r--kstars/kstars/tools/argsettrack.ui4
-rw-r--r--kstars/kstars/tools/argsetutcindi.ui4
-rw-r--r--kstars/kstars/tools/argshutdownindi.ui2
-rw-r--r--kstars/kstars/tools/argstartexposureindi.ui4
-rw-r--r--kstars/kstars/tools/argstartfocusindi.ui4
-rw-r--r--kstars/kstars/tools/argstartindi.ui4
-rw-r--r--kstars/kstars/tools/argswitchindi.ui4
-rw-r--r--kstars/kstars/tools/argtimescale.ui4
-rw-r--r--kstars/kstars/tools/argwaitfor.ui4
-rw-r--r--kstars/kstars/tools/argwaitforkey.ui4
-rw-r--r--kstars/kstars/tools/argzoom.ui4
-rw-r--r--kstars/kstars/tools/astrocalc.cpp2
-rw-r--r--kstars/kstars/tools/astrocalc.h2
-rw-r--r--kstars/kstars/tools/jmoontool.cpp16
-rw-r--r--kstars/kstars/tools/lcgenerator.cpp4
-rw-r--r--kstars/kstars/tools/modcalcangdistdlg.ui28
-rw-r--r--kstars/kstars/tools/modcalcapcoord.cpp4
-rw-r--r--kstars/kstars/tools/modcalcapcoorddlg.ui36
-rw-r--r--kstars/kstars/tools/modcalcazel.cpp4
-rw-r--r--kstars/kstars/tools/modcalcazeldlg.ui48
-rw-r--r--kstars/kstars/tools/modcalcdaylength.cpp4
-rw-r--r--kstars/kstars/tools/modcalcdaylengthdlg.ui38
-rw-r--r--kstars/kstars/tools/modcalceclipticcoordsdlg.ui40
-rw-r--r--kstars/kstars/tools/modcalcequinox.cpp2
-rw-r--r--kstars/kstars/tools/modcalcequinoxdlg.ui22
-rw-r--r--kstars/kstars/tools/modcalcgalcoorddlg.ui38
-rw-r--r--kstars/kstars/tools/modcalcgeoddlg.ui18
-rw-r--r--kstars/kstars/tools/modcalcjd.cpp4
-rw-r--r--kstars/kstars/tools/modcalcjddlg.ui32
-rw-r--r--kstars/kstars/tools/modcalcplanets.cpp2
-rw-r--r--kstars/kstars/tools/modcalcplanetsdlg.ui64
-rw-r--r--kstars/kstars/tools/modcalcprec.cpp2
-rw-r--r--kstars/kstars/tools/modcalcprecdlg.ui24
-rw-r--r--kstars/kstars/tools/modcalcsidtime.cpp2
-rw-r--r--kstars/kstars/tools/modcalcsidtimedlg.ui36
-rw-r--r--kstars/kstars/tools/modcalcvlsr.cpp4
-rw-r--r--kstars/kstars/tools/modcalcvlsrdlg.ui50
-rw-r--r--kstars/kstars/tools/observinglistui.ui30
-rw-r--r--kstars/kstars/tools/obslistwizardui.ui32
-rw-r--r--kstars/kstars/tools/optionstreeview.ui2
-rw-r--r--kstars/kstars/tools/planetviewer.cpp6
-rw-r--r--kstars/kstars/tools/planetviewerui.ui4
-rw-r--r--kstars/kstars/tools/scriptbuilder.cpp6
-rw-r--r--kstars/kstars/tools/scriptbuilderui.ui48
-rw-r--r--kstars/kstars/tools/scriptnamedialog.ui2
-rw-r--r--kstars/kstars/tools/wutdialogui.ui30
-rw-r--r--ktouch/src/ktouch.cpp8
-rw-r--r--ktouch/src/ktouch.h4
-rw-r--r--ktouch/src/ktouchcoloreditor_dlg.ui18
-rw-r--r--ktouch/src/ktouchkeyboardeditor_dlg.ui6
-rw-r--r--ktouch/src/ktouchlectureeditor_dlg.ui26
-rw-r--r--ktouch/src/ktouchopenrequest_dlg.ui12
-rw-r--r--ktouch/src/ktouchprefcolorslayout.ui30
-rw-r--r--ktouch/src/ktouchprefgenerallayout.ui14
-rw-r--r--ktouch/src/ktouchprefkeyboardlayout.ui4
-rw-r--r--ktouch/src/ktouchpreftraininglayout.ui14
-rw-r--r--ktouch/src/ktouchstatistics.cpp8
-rw-r--r--ktouch/src/ktouchstatistics_dlg.ui38
-rw-r--r--ktouch/src/ktouchstatus.cpp8
-rw-r--r--ktouch/src/ktouchstatus.h8
-rw-r--r--ktouch/src/ktouchstatuslayout.ui20
-rw-r--r--ktouch/src/ktouchtrainer.cpp18
-rw-r--r--ktouch/src/ktouchtrainer.h6
-rw-r--r--kturtle/src/kturtle.cpp8
-rw-r--r--kverbos/kverbos/kerfassen.cpp12
-rw-r--r--kverbos/kverbos/kverbosdoc.cpp4
-rw-r--r--kverbos/kverbos/kverbosdoc.h4
-rw-r--r--kverbos/kverbos/kverbosuser.cpp2
-rw-r--r--kverbos/kverbos/kverbosview.cpp14
-rw-r--r--kverbos/kverbos/qerfassen.ui212
-rw-r--r--kverbos/kverbos/qlernen.ui70
-rw-r--r--kverbos/kverbos/qverbedit.ui2
-rw-r--r--kverbos/kverbos/qverbosoptions.ui92
-rw-r--r--kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui6
-rw-r--r--kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui4
-rw-r--r--kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui2
-rw-r--r--kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui2
-rw-r--r--kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp18
-rw-r--r--kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui2
-rw-r--r--kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui8
-rw-r--r--kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui12
-rw-r--r--kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui6
-rw-r--r--kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui2
-rw-r--r--kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui8
-rw-r--r--kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui2
-rw-r--r--kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui2
-rw-r--r--kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui4
-rw-r--r--kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui2
-rw-r--r--kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui2
-rw-r--r--kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui10
-rw-r--r--kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui24
-rw-r--r--kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui10
-rw-r--r--kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp6
-rw-r--r--kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui2
-rw-r--r--kvoctrain/kvoctrain/kva_header.cpp12
-rw-r--r--kvoctrain/kvoctrain/kva_init.cpp8
-rw-r--r--kvoctrain/kvoctrain/kvoctrain.cpp8
-rw-r--r--kvoctrain/kvoctrain/kvoctrain.h2
-rw-r--r--kvoctrain/kvoctrain/kvoctraintable.cpp4
-rw-r--r--kvoctrain/kvoctrain/kvoctraintableitem.cpp2
-rw-r--r--kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui2
-rw-r--r--kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp18
-rw-r--r--kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp16
-rw-r--r--kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui2
-rw-r--r--kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp6
-rw-r--r--kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui2
-rw-r--r--kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui2
-rw-r--r--kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui2
-rw-r--r--kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui2
-rw-r--r--kwordquiz/src/dlglanguagebase.ui10
-rw-r--r--kwordquiz/src/dlgrcbase.ui2
-rw-r--r--kwordquiz/src/dlgsortbase.ui2
-rw-r--r--kwordquiz/src/dlgspecchar.cpp2
-rw-r--r--kwordquiz/src/flashviewbase.ui16
-rw-r--r--kwordquiz/src/kwordquiz.cpp2
-rw-r--r--kwordquiz/src/multipleviewbase.ui36
-rw-r--r--kwordquiz/src/prefcardappearancebase.ui6
-rw-r--r--kwordquiz/src/prefcharacterbase.ui8
-rw-r--r--kwordquiz/src/prefeditorbase.ui4
-rw-r--r--kwordquiz/src/prefquizbase.ui6
-rw-r--r--kwordquiz/src/qaviewbase.ui28
-rw-r--r--kwordquiz/src/wqprintdialogpage.cpp2
-rw-r--r--libtdeedu/extdate/extcalendarsystemgregorian.cpp2
-rw-r--r--libtdeedu/extdate/extdatepicker.cpp28
-rw-r--r--libtdeedu/extdate/extdatepicker.h6
-rw-r--r--libtdeedu/extdate/extdatetbl.cpp36
-rw-r--r--libtdeedu/extdate/extdatetbl.h8
-rw-r--r--libtdeedu/extdate/extdatetime.cpp22
-rw-r--r--libtdeedu/extdate/extdatetime.h6
-rw-r--r--libtdeedu/extdate/extdatetimeedit.cpp70
-rw-r--r--libtdeedu/extdate/extdatetimeedit.h12
-rw-r--r--libtdeedu/extdate/extdatewidget.cpp4
-rw-r--r--libtdeedu/extdate/test_extdate.cc16
-rw-r--r--libtdeedu/extdate/testwidget.cpp4
346 files changed, 1717 insertions, 1717 deletions
diff --git a/blinken/src/highscoredialog.cpp b/blinken/src/highscoredialog.cpp
index 4fb63e93..e3e9f4e8 100644
--- a/blinken/src/highscoredialog.cpp
+++ b/blinken/src/highscoredialog.cpp
@@ -119,7 +119,7 @@ class myTabWidget : public TQTabWidget
TQSize tabBarSizeHint() const
{
- return tabBar() -> tqsizeHint();
+ return tabBar() -> sizeHint();
}
};
diff --git a/kalzium/RELEASE-PLAN b/kalzium/RELEASE-PLAN
index b9ddf5d5..83580931 100644
--- a/kalzium/RELEASE-PLAN
+++ b/kalzium/RELEASE-PLAN
@@ -1,7 +1,7 @@
Release plan
============
-tqStatus: Under discussion
+Status: Under discussion
Overview
diff --git a/kalzium/src/eqresult.cpp b/kalzium/src/eqresult.cpp
index 742c3ad1..1f3f44bf 100644
--- a/kalzium/src/eqresult.cpp
+++ b/kalzium/src/eqresult.cpp
@@ -61,7 +61,7 @@ void AnswerItem::paint( TQPainter* painter )
TQRect r ( 0, 0, listBox()->contentsWidth(), height( listBox() ) );
painter->fillRect( r, m_bgcolor );
- TQColorGroup cg = listBox()->tqcolorGroup();
+ TQColorGroup cg = listBox()->colorGroup();
cg.setColor( TQColorGroup::Background, m_bgcolor );
m_richtext->draw(painter, 0, 0, r, cg );
@@ -101,7 +101,7 @@ EqResult::~EqResult()
void EqResult::add(const TQString & question, const TQString & answer)
{
- TQColor bgcolor = tqcolorGroup().base();
+ TQColor bgcolor = colorGroup().base();
if ( m_alternate_color )
bgcolor = bgcolor.dark( 120 );
diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp
index 2046825b..25d51465 100644
--- a/kalzium/src/kalzium.cpp
+++ b/kalzium/src/kalzium.cpp
@@ -212,7 +212,7 @@ void Kalzium::setupSidebars()
TQVBoxLayout *lay = new TQVBoxLayout( fake, 5 );
lay->activate();
m_detailWidget = new DetailedGraphicalOverview( fake, "DetailedGraphicalOverview" );
- m_detailWidget->setMinimumSize( 200, m_detailWidget->tqminimumSize().height() );
+ m_detailWidget->setMinimumSize( 200, m_detailWidget->minimumSize().height() );
connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotSelectedNumber( int ) ));
lay->addWidget( m_detailWidget );
lay->addItem( new TQSpacerItem( 10, 10, TQSizePolicy::Fixed, TQSizePolicy::MinimumExpanding ) );
diff --git a/kalzium/src/kalziumtip.cpp b/kalzium/src/kalziumtip.cpp
index 671b1759..57bdb15e 100644
--- a/kalzium/src/kalziumtip.cpp
+++ b/kalzium/src/kalziumtip.cpp
@@ -206,13 +206,13 @@ void KalziumTip::displayInternal()
}
// draw text shadow
- TQColorGroup cg = tqcolorGroup();
+ TQColorGroup cg = colorGroup();
cg.setColor(TQColorGroup::Text, cg.background().dark(115));
int shadowOffset = TQApplication::reverseLayout() ? -1 : 1;
m_richText->draw(&bufferPainter, 5 + textX + shadowOffset, textY + 1, TQRect(), cg);
// draw text
- cg = tqcolorGroup();
+ cg = colorGroup();
m_richText->draw(&bufferPainter, 5 + textX, textY, rect(), cg);
}
diff --git a/kalzium/src/molcalcwidgetbase.ui b/kalzium/src/molcalcwidgetbase.ui
index 04760f0d..777b49a4 100644
--- a/kalzium/src/molcalcwidgetbase.ui
+++ b/kalzium/src/molcalcwidgetbase.ui
@@ -83,7 +83,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>10</height>
diff --git a/kalzium/src/plotsetupwidget.ui b/kalzium/src/plotsetupwidget.ui
index 06ef3fa5..ad0ee99e 100644
--- a/kalzium/src/plotsetupwidget.ui
+++ b/kalzium/src/plotsetupwidget.ui
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>60</height>
diff --git a/kalzium/src/settings_misc.ui b/kalzium/src/settings_misc.ui
index 0e88167d..85751dbd 100644
--- a/kalzium/src/settings_misc.ui
+++ b/kalzium/src/settings_misc.ui
@@ -58,7 +58,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
diff --git a/kalzium/src/somwidget.ui b/kalzium/src/somwidget.ui
index 057dc235..0b41d400 100644
--- a/kalzium/src/somwidget.ui
+++ b/kalzium/src/somwidget.ui
@@ -26,7 +26,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>10</height>
@@ -58,7 +58,7 @@ the state of matter</string>
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>10</height>
@@ -91,7 +91,7 @@ the state of matter</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -141,7 +141,7 @@ the state of matter</string>
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>5</width>
<height>20</height>
diff --git a/kalzium/src/somwidget_impl.cpp b/kalzium/src/somwidget_impl.cpp
index 54d078a8..5f0f45cd 100644
--- a/kalzium/src/somwidget_impl.cpp
+++ b/kalzium/src/somwidget_impl.cpp
@@ -35,7 +35,7 @@ SOMWidgetIMPL::SOMWidgetIMPL( TQWidget *parent, const char* name )
{
m_list = KalziumDataObject::instance()->ElementList;
- text->tqsetAlignment( text->tqalignment() | TQt::WordBreak );
+ text->setAlignment( text->tqalignment() | TQt::WordBreak );
text->setTextFormat( TQt::RichText );
text->setReadOnly( true );
text->setPaletteBackgroundColor( paletteBackgroundColor() );
diff --git a/kalzium/src/spectrumview.ui b/kalzium/src/spectrumview.ui
index 89204944..f136aa5d 100644
--- a/kalzium/src/spectrumview.ui
+++ b/kalzium/src/spectrumview.ui
@@ -126,7 +126,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>211</width>
<height>21</height>
@@ -159,7 +159,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>1</height>
diff --git a/kalzium/src/spectrumviewimpl.cpp b/kalzium/src/spectrumviewimpl.cpp
index 826c008b..f360b485 100644
--- a/kalzium/src/spectrumviewimpl.cpp
+++ b/kalzium/src/spectrumviewimpl.cpp
@@ -25,7 +25,7 @@
SpectrumViewImpl::SpectrumViewImpl( TQWidget *parent, const char* name )
: SpectrumView( parent, name )
{
- resize( tqminimumSizeHint() );
+ resize( minimumSizeHint() );
// simulating an update
m_spectrumWidget->setRightBorder( maximumValue->value() );
exportButton->setGuiItem( KGuiItem( i18n( "&Export Spectrum as Image" ), "fileexport" ) );
diff --git a/kalzium/src/spectrumwidget.cpp b/kalzium/src/spectrumwidget.cpp
index 8dff10e3..3a72f2a6 100644
--- a/kalzium/src/spectrumwidget.cpp
+++ b/kalzium/src/spectrumwidget.cpp
@@ -57,7 +57,7 @@ SpectrumWidget::SpectrumWidget( TQWidget *parent, const char* name ) : TQWidget(
setType( EmissionSpectrum );
setMinimumSize( 400, 230 );
- tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+ setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
setBackgroundMode( NoBackground );
}
diff --git a/kalzium/src/timewidget.ui b/kalzium/src/timewidget.ui
index 28ddf7a5..72eafd28 100644
--- a/kalzium/src/timewidget.ui
+++ b/kalzium/src/timewidget.ui
@@ -26,7 +26,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -67,7 +67,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -117,7 +117,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>5</width>
<height>21</height>
@@ -150,7 +150,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/kalzium/src/timewidget_impl.cpp b/kalzium/src/timewidget_impl.cpp
index a08dbe9e..885e65cf 100644
--- a/kalzium/src/timewidget_impl.cpp
+++ b/kalzium/src/timewidget_impl.cpp
@@ -23,7 +23,7 @@
TimeWidgetIMPL::TimeWidgetIMPL( TQWidget *parent, const char* name )
: TimeWidget( parent, name )
{
- text->tqsetAlignment( text->tqalignment() | TQt::WordBreak );
+ text->setAlignment( text->tqalignment() | TQt::WordBreak );
text->setTextFormat( TQt::RichText );
text->setReadOnly( true );
text->setPaletteBackgroundColor( paletteBackgroundColor() );
diff --git a/kanagram/src/mainsettingswidget.ui b/kanagram/src/mainsettingswidget.ui
index b8d29ccb..034479fb 100644
--- a/kanagram/src/mainsettingswidget.ui
+++ b/kanagram/src/mainsettingswidget.ui
@@ -165,7 +165,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>16</height>
diff --git a/kanagram/src/newstuffwidget.ui b/kanagram/src/newstuffwidget.ui
index 55163cdd..1b45c449 100644
--- a/kanagram/src/newstuffwidget.ui
+++ b/kanagram/src/newstuffwidget.ui
@@ -41,7 +41,7 @@ the button to get new vocabulary files.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp
index ed0836c8..f04fc17a 100644
--- a/kbruch/src/mainqtwidget.cpp
+++ b/kbruch/src/mainqtwidget.cpp
@@ -109,7 +109,7 @@ MainQtWidget::MainQtWidget()
#if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3)
#else
- resize(TQSize(TQMAX(toolBar()->tqsizeHint().width(), tqsizeHint().width()), tqsizeHint().height()));
+ resize(TQSize(TQMAX(toolBar()->sizeHint().width(), sizeHint().width()), sizeHint().height()));
#endif
// now show the last exercise
m_exercises->showPage(SettingsClass::activeExercise());
@@ -243,7 +243,7 @@ void MainQtWidget::setupActions()
#if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3)
if (!initialGeometrySet())
- resize( TQSize(725, 330).expandedTo(tqminimumSizeHint()));
+ resize( TQSize(725, 330).expandedTo(minimumSizeHint()));
setupGUI(ToolBar | Keys | StatusBar | Create);
setAutoSaveSettings();
#endif
diff --git a/kbruch/src/taskvieweroptionsbase.ui b/kbruch/src/taskvieweroptionsbase.ui
index 8938ac96..d7bdd95a 100644
--- a/kbruch/src/taskvieweroptionsbase.ui
+++ b/kbruch/src/taskvieweroptionsbase.ui
@@ -42,7 +42,7 @@
</widget>
<widget class="TQGroupBox">
<property name="name">
- <cstring>tqcolorGroupBox</cstring>
+ <cstring>colorGroupBox</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
diff --git a/keduca/keduca/configdialogbase.ui b/keduca/keduca/configdialogbase.ui
index 7eff82a8..a5926ad1 100644
--- a/keduca/keduca/configdialogbase.ui
+++ b/keduca/keduca/configdialogbase.ui
@@ -87,7 +87,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>51</height>
diff --git a/keduca/keduca/kcheckeduca.cpp b/keduca/keduca/kcheckeduca.cpp
index 1fd7465e..edeb42fd 100644
--- a/keduca/keduca/kcheckeduca.cpp
+++ b/keduca/keduca/kcheckeduca.cpp
@@ -38,7 +38,7 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){
int extra_width, indicator_width;
extra_width = 8;
- indicator_width = tqstyle().tqpixelMetric(TQStyle::PM_IndicatorWidth, 0);
+ indicator_width = tqstyle().pixelMetric(TQStyle::PM_IndicatorWidth, 0);
y = 0;
x = indicator_width + extra_width; //###
@@ -61,14 +61,14 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){
yo = (cr.height()-rh)/2;
if ( !isEnabled() ) {
- TQColorGroup cg = tqcolorGroup();
+ TQColorGroup cg = colorGroup();
cg.setColor( TQColorGroup::Text, cg.light() );
_doc->draw(p, cr.x()+xo+1, cr.y()+yo+1, cr, cg, 0);
}
- _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, tqcolorGroup(), 0);
+ _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, colorGroup(), 0);
if ( hasFocus() ) {
-// TQRect br = tqstyle().tqitemRect( p, x, y, rw, rh+yo,
+// TQRect br = tqstyle().itemRect( p, x, y, rw, rh+yo,
// AlignLeft|AlignVCenter|ShowPrefix,
// isEnabled(),
// pixmap(), text().visual() );
@@ -80,6 +80,6 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){
br.setBottom( br.bottom()+2);
br = br.intersect( TQRect(0,0,rw, rh+yo ) );
- tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, tqcolorGroup());
+ tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup());
}
}
diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp
index 5c39c0ed..508a137a 100644
--- a/keduca/keduca/keduca.cpp
+++ b/keduca/keduca/keduca.cpp
@@ -53,7 +53,7 @@ Keduca::Keduca( TQWidget* parent, const char *name, WFlags f )
kdFatal() << "The library \"libkeducapart\" could not be found. Aborting." << endl;
}
if (!initialGeometrySet())
- resize( TQSize(550, 450).expandedTo(tqminimumSizeHint()));
+ resize( TQSize(550, 450).expandedTo(minimumSizeHint()));
}
Keduca::~Keduca()
diff --git a/keduca/keduca/keducaprefs.cpp b/keduca/keduca/keducaprefs.cpp
index f118f3ad..dbf130dc 100644
--- a/keduca/keduca/keducaprefs.cpp
+++ b/keduca/keduca/keducaprefs.cpp
@@ -48,7 +48,7 @@ void KEducaPrefs::setPageGeneral()
buttonGroup1->tqlayout()->setSpacing( 0 );
buttonGroup1->tqlayout()->setMargin( 0 );
TQVBoxLayout *buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->tqlayout() );
- buttonGroup1Layout->tqsetAlignment( TQt::AlignTop );
+ buttonGroup1Layout->setAlignment( TQt::AlignTop );
buttonGroup1Layout->setSpacing( 6 );
buttonGroup1Layout->setMargin( 11 );
@@ -66,7 +66,7 @@ void KEducaPrefs::setPageGeneral()
GroupBox1->tqlayout()->setSpacing( 0 );
GroupBox1->tqlayout()->setMargin( 0 );
TQVBoxLayout *GroupBox1Layout = new TQVBoxLayout( GroupBox1->tqlayout() );
- GroupBox1Layout->tqsetAlignment( TQt::AlignTop );
+ GroupBox1Layout->setAlignment( TQt::AlignTop );
GroupBox1Layout->setSpacing( 6 );
GroupBox1Layout->setMargin( 11 );
diff --git a/keduca/keduca/keducaview.cpp b/keduca/keduca/keducaview.cpp
index f7871e5c..97a46e35 100644
--- a/keduca/keduca/keducaview.cpp
+++ b/keduca/keduca/keducaview.cpp
@@ -60,7 +60,7 @@ void KEducaView::init()
// Intro Screen
_introWidget = new TQLabel( this, "introScreen" );
_introWidget->setBackgroundColor( TQt::white );
- _introWidget->tqsetAlignment( AlignCenter );
+ _introWidget->setAlignment( AlignCenter );
_introWidget->setPixmap( TQPixmap( locate("data","keduca/pics/keduca_init.png") ) );
addWidget( _introWidget, 0 );
@@ -121,7 +121,7 @@ void KEducaView::slotButtonNext()
_questionText->countdown(0);
}
- if( ( visibleWidget() == _questionWidget ) && !_isInittqStatus )
+ if( ( visibleWidget() == _questionWidget ) && !_isInitStatus )
setResults();
_buttonGroup->clearAnswers();
@@ -404,7 +404,7 @@ bool KEducaView::openURL( const KURL &url)
if ( !_keducaFile->openFile( url ) )
return false;
- _isInittqStatus = true;
+ _isInitStatus = true;
_results = "<HTML>";
_correctAnswer = 0;
_correctPoints = 0;
@@ -436,12 +436,12 @@ void KEducaView::configWrite()
Settings::writeConfig();
}
-/** current tqStatus Points */
+/** current Status Points */
TQString KEducaView::currentStatusPoints()
{
- TQString temptqStatus;
+ TQString tempStatus;
- temptqStatus = insertTable()
+ tempStatus = insertTable()
+ insertRow( i18n("Statistics"), true, 4)
+ insertRow( i18n("Correct questions"),
TQString().setNum( _correctAnswer ),
@@ -449,20 +449,20 @@ TQString KEducaView::currentStatusPoints()
TQString().setNum( _incorrectAnswer ), true);
if( _keducaFile->getTotalPoints() > 0 )
- temptqStatus += insertRow( i18n("Total points"), true, 4 )
+ tempStatus += insertRow( i18n("Total points"), true, 4 )
+ insertRow( i18n("Correct points"),
TQString().setNum( _correctPoints ),
i18n("Incorrect points"),
TQString().setNum( _incorrectPoints ), true );
if( _keducaFile->getTotalTime() > 0 )
- temptqStatus += insertRow( i18n("Time"), true, 4 )
+ tempStatus += insertRow( i18n("Time"), true, 4 )
+ insertRow( i18n("Total time"),
TQString().setNum( _keducaFile->getTotalTime() ),
i18n("Time in tests"),
TQString().setNum( _currentTime ), true );
- temptqStatus += insertTableClose();
- return temptqStatus;
+ tempStatus += insertTableClose();
+ return tempStatus;
}
/** Set HTML table view with correct and incorrect answers */
@@ -503,15 +503,15 @@ TQString KEducaView::getTableQuestion( bool isCorrect, const TQString &correct,
/** Define the next questions (random, secuencial) */
bool KEducaView::questionNext()
{
- if( !Settings::randomQuestions() && !_isInittqStatus )
+ if( !Settings::randomQuestions() && !_isInitStatus )
{
_keducaFile->recordNext();
return _keducaFile->recordEOF() ? false : true;
}
- if( _isInittqStatus )
+ if( _isInitStatus )
{
- _isInittqStatus = false;
+ _isInitStatus = false;
if( !Settings::randomQuestions() ) return true;
}
diff --git a/keduca/keduca/keducaview.h b/keduca/keduca/keducaview.h
index 45387f0f..ed226f1b 100644
--- a/keduca/keduca/keducaview.h
+++ b/keduca/keduca/keducaview.h
@@ -115,7 +115,7 @@ private:
/** Current results */
TQString _currentResults;
/** If is init window */
- bool _isInittqStatus;
+ bool _isInitStatus;
TQTimer *_timeoutTimer;
/** Num of correct answers */
int _correctAnswer;
diff --git a/keduca/keduca/kgroupeduca.cpp b/keduca/keduca/kgroupeduca.cpp
index 747b65da..9f7a2413 100644
--- a/keduca/keduca/kgroupeduca.cpp
+++ b/keduca/keduca/kgroupeduca.cpp
@@ -54,7 +54,7 @@ void KGroupEduca::insertAnswer( const TQString& text)
answer = new KCheckEduca( _vbox2 );
break;
}
- answer->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0 ) );
+ answer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0 ) );
answer->setText( text );
answer->show();
insert(answer);
diff --git a/keduca/keduca/kquestion.cpp b/keduca/keduca/kquestion.cpp
index fee2abc7..7b549168 100644
--- a/keduca/keduca/kquestion.cpp
+++ b/keduca/keduca/kquestion.cpp
@@ -51,7 +51,7 @@ void KQuestion::initGUI()
_picture->setPalette( TQPalette( TQt::white ) );
_countdownWidget = new KProgress( picBox );
- _countdownWidget->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred,
+ _countdownWidget->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred,
TQSizePolicy::Preferred ) );
_countdownWidget->setFormat( i18n( "%v seconds left" ) );
@@ -60,7 +60,7 @@ void KQuestion::initGUI()
_view->setFrameShape( TQTextEdit::NoFrame );
_view->setHScrollBarMode( TQTextEdit::AlwaysOff );
_view->setTextFormat( TQTextEdit::RichText );
- _view->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, true ) );
+ _view->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, true ) );
}
/** Set text */
diff --git a/keduca/keduca/kradioeduca.cpp b/keduca/keduca/kradioeduca.cpp
index 9b8ffe4f..4cf0185f 100644
--- a/keduca/keduca/kradioeduca.cpp
+++ b/keduca/keduca/kradioeduca.cpp
@@ -37,7 +37,7 @@ void KRadioEduca::drawButtonLabel( TQPainter *p)
int x, y, w, h;
int extra_width, indicator_width;
extra_width = 8;
- indicator_width = tqstyle().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0);
+ indicator_width = tqstyle().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0);
y = 0;
x = indicator_width + extra_width; //###
@@ -60,14 +60,14 @@ void KRadioEduca::drawButtonLabel( TQPainter *p)
yo = (cr.height()-rh)/2;
if (!isEnabled() ) {
- TQColorGroup cg = tqcolorGroup();
+ TQColorGroup cg = colorGroup();
cg.setColor( TQColorGroup::Text, cg.light() );
_doc->draw(p, cr.x()+xo+1, cr.y()+yo+1, cr, cg, 0);
}
- _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, tqcolorGroup(), 0);
+ _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, colorGroup(), 0);
if ( hasFocus() ) {
-// TQRect br = tqstyle().tqitemRect( p, x, y, rw, rh+yo,
+// TQRect br = tqstyle().itemRect( p, x, y, rw, rh+yo,
// AlignLeft|AlignVCenter|ShowPrefix,
// isEnabled(),
// pixmap(), text().visual() );
@@ -78,6 +78,6 @@ void KRadioEduca::drawButtonLabel( TQPainter *p)
br.setTop( br.top()-2 );
br.setBottom( br.bottom()+2);
br = br.intersect( TQRect(0,0,rw, rh+yo ) );
- tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, tqcolorGroup());
+ tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup());
}
}
diff --git a/keduca/keducabuilder/kcontroladdeditbase.ui b/keduca/keducabuilder/kcontroladdeditbase.ui
index b7e042b4..a2a92780 100644
--- a/keduca/keducabuilder/kcontroladdeditbase.ui
+++ b/keduca/keducabuilder/kcontroladdeditbase.ui
@@ -30,13 +30,13 @@
<property name="name">
<cstring>frame3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>125</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>125</width>
<height>32767</height>
@@ -59,13 +59,13 @@
<property name="name">
<cstring>_questionPreview</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>100</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>100</width>
<height>100</height>
@@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -130,7 +130,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>41</height>
@@ -314,7 +314,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>20</height>
@@ -346,7 +346,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>131</width>
<height>20</height>
@@ -377,13 +377,13 @@
<property name="name">
<cstring>frame3_2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>125</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>125</width>
<height>32767</height>
@@ -406,13 +406,13 @@
<property name="name">
<cstring>_answerPreview</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>100</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>100</width>
<height>100</height>
@@ -448,7 +448,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -477,7 +477,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>41</height>
@@ -531,7 +531,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>20</height>
@@ -717,7 +717,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>10</height>
@@ -756,7 +756,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp
index 49075f59..f126d07d 100644
--- a/keduca/keducabuilder/kcontrolheader.cpp
+++ b/keduca/keducabuilder/kcontrolheader.cpp
@@ -85,7 +85,7 @@ void KControlHeader::init()
GroupBox7->tqlayout()->setSpacing( 0 );
GroupBox7->tqlayout()->setMargin( 0 );
TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->tqlayout() );
- GroupBox7Layout->tqsetAlignment( TQt::AlignTop );
+ GroupBox7Layout->setAlignment( TQt::AlignTop );
GroupBox7Layout->setSpacing( 6 );
GroupBox7Layout->setMargin( 11 );
@@ -95,7 +95,7 @@ void KControlHeader::init()
TQLabel *TextLabel10 = new TQLabel( GroupBox7, "TextLabel10" );
TextLabel10->setText( i18n( "Type:" ));
- TextLabel10->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel10->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
Layout13->addWidget( TextLabel10, 2, 0 );
@@ -108,7 +108,7 @@ void KControlHeader::init()
TQLabel *TextLabel11 = new TQLabel( GroupBox7, "TextLabel11" );
TextLabel11->setText( i18n( "Level:" ));
- TextLabel11->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel11->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
Layout12->addWidget( TextLabel11 );
_headerLevel = new KComboBox( FALSE, GroupBox7, "_headerLevel" );
@@ -117,7 +117,7 @@ void KControlHeader::init()
TQLabel *TextLabel12 = new TQLabel( GroupBox7, "TextLabel12" );
TextLabel12->setText( i18n( "Language:" ));
- TextLabel12->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel12->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
Layout13->addWidget( TextLabel12, 3, 0 );
_headerLang = new KLanguageCombo( GroupBox7, "_headerLang" );
@@ -126,7 +126,7 @@ void KControlHeader::init()
TQLabel *TextLabel9 = new TQLabel( GroupBox7, "TextLabel9" );
TextLabel9->setText( i18n( "Category:" ));
- TextLabel9->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel9->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
Layout13->addWidget( TextLabel9, 1, 0 );
@@ -138,7 +138,7 @@ void KControlHeader::init()
TQLabel *TextLabel8 = new TQLabel( GroupBox7, "TextLabel8" );
TextLabel8->setText( i18n( "Title:" ));
- TextLabel8->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel8->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
Layout13->addWidget( TextLabel8, 0, 0 );
GroupBox7Layout->addLayout( Layout13 );
@@ -150,7 +150,7 @@ void KControlHeader::init()
GroupBox8->tqlayout()->setSpacing( 0 );
GroupBox8->tqlayout()->setMargin( 0 );
TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->tqlayout() );
- GroupBox8Layout->tqsetAlignment( TQt::AlignTop );
+ GroupBox8Layout->setAlignment( TQt::AlignTop );
GroupBox8Layout->setSpacing( 6 );
GroupBox8Layout->setMargin( 11 );
@@ -168,7 +168,7 @@ void KControlHeader::init()
GroupBox6->tqlayout()->setSpacing( 0 );
GroupBox6->tqlayout()->setMargin( 0 );
TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->tqlayout() );
- GroupBox6Layout->tqsetAlignment( TQt::AlignTop );
+ GroupBox6Layout->setAlignment( TQt::AlignTop );
GroupBox6Layout->setSpacing( 6 );
GroupBox6Layout->setMargin( 11 );
@@ -182,19 +182,19 @@ void KControlHeader::init()
TQLabel *TextLabel7 = new TQLabel( GroupBox6, "TextLabel7" );
TextLabel7->setText( i18n( "Web page:" ));
- TextLabel7->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel7->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
GroupBox6Layout->addWidget( TextLabel7, 2, 0 );
TQLabel *TextLabel6 = new TQLabel( GroupBox6, "TextLabel6" );
TextLabel6->setText( i18n( "Email:" ));
- TextLabel6->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel6->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
GroupBox6Layout->addWidget( TextLabel6, 1, 0 );
TQLabel *TextLabel5 = new TQLabel( GroupBox6, "TextLabel5" );
TextLabel5->setText( i18n( "Name:" ));
- TextLabel5->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+ TextLabel5->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
GroupBox6Layout->addWidget( TextLabel5, 0, 0 );
@@ -246,12 +246,12 @@ void KControlHeader::insertHeader()
/** Load country list */
void KControlHeader::loadCountryList(KLanguageCombo *combo)
{
- TQString sub = TQString::tqfromLatin1("l10n/");
+ TQString sub = TQString::fromLatin1("l10n/");
// clear the list
combo->clear();
- TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*.desktop"));
+ TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop"));
regionlist.sort();
for ( TQStringList::ConstIterator it = regionlist.begin();
@@ -268,23 +268,23 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo)
if (index != -1) tag.truncate(index);
KSimpleConfig entry(*it);
- entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
- TQString name = entry.readEntry(TQString::tqfromLatin1("Name"));
+ entry.setGroup(TQString::fromLatin1("KCM Locale"));
+ TQString name = entry.readEntry(TQString::fromLatin1("Name"));
combo->insertSubmenu( name, '-' + tag, sub );
}
// add all languages to the list
- TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*/entry.desktop"));
+ TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop"));
countrylist.sort();
for ( TQStringList::ConstIterator it = countrylist.begin();
it != countrylist.end(); ++it )
{
KSimpleConfig entry(*it);
- entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
- TQString name = entry.readEntry(TQString::tqfromLatin1("Name"));
- TQString submenu = '-' + entry.readEntry(TQString::tqfromLatin1("Region"));
+ entry.setGroup(TQString::fromLatin1("KCM Locale"));
+ TQString name = entry.readEntry(TQString::fromLatin1("Name"));
+ TQString submenu = '-' + entry.readEntry(TQString::fromLatin1("Region"));
TQString tag = *it;
int index = tag.findRev('/');
diff --git a/keduca/keducabuilder/kcontrolheaderbase.ui b/keduca/keducabuilder/kcontrolheaderbase.ui
index 24dbbf09..242b9358 100644
--- a/keduca/keducabuilder/kcontrolheaderbase.ui
+++ b/keduca/keducabuilder/kcontrolheaderbase.ui
@@ -23,13 +23,13 @@
<property name="name">
<cstring>frame3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>50</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>50</height>
@@ -59,13 +59,13 @@
<property name="name">
<cstring>frame4</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>125</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>125</width>
<height>32767</height>
@@ -104,7 +104,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>60</width>
<height>21</height>
@@ -209,7 +209,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -344,7 +344,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>40</height>
@@ -389,7 +389,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp
index 6af778b8..88db1b59 100644
--- a/keduca/keducabuilder/keducabuilder.cpp
+++ b/keduca/keducabuilder/keducabuilder.cpp
@@ -91,7 +91,7 @@ void KEducaBuilder::init()
_split->setOrientation( Qt::Vertical );
_listAnswer = new KListBox( _split, "_listAnswer" );
- _listAnswer->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) );
+ _listAnswer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) );
connect( _listAnswer, TQT_SIGNAL( highlighted(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotPreview(TQListBoxItem *) ) );
connect( _listAnswer, TQT_SIGNAL( doubleClicked(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotEditbyList(TQListBoxItem *) ) );
@@ -103,7 +103,7 @@ void KEducaBuilder::init()
setCentralWidget( mainView );
if (!initialGeometrySet())
- resize( TQSize(500, 400).expandedTo(tqminimumSizeHint()));
+ resize( TQSize(500, 400).expandedTo(minimumSizeHint()));
setupGUI( ToolBar | Keys | StatusBar | Create, "keducabuilderui.rc" );
setAutoSaveSettings();
}
diff --git a/keduca/keducabuilder/keducaeditorstartdialogbase.ui b/keduca/keducabuilder/keducaeditorstartdialogbase.ui
index c873a844..e7686ff9 100644
--- a/keduca/keducabuilder/keducaeditorstartdialogbase.ui
+++ b/keduca/keducabuilder/keducaeditorstartdialogbase.ui
@@ -100,7 +100,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -154,7 +154,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -238,7 +238,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/keduca/keducabuilder/klangcombo.cpp b/keduca/keducabuilder/klangcombo.cpp
index 66f77e45..05a36669 100644
--- a/keduca/keducabuilder/klangcombo.cpp
+++ b/keduca/keducabuilder/klangcombo.cpp
@@ -38,14 +38,14 @@ KLanguageCombo::KLanguageCombo (TQWidget * parent, const char *name)
void KLanguageCombo::insertLanguage(const TQString& path, const TQString& name, const TQString& sub, const TQString &submenu)
{
- TQString output = name + TQString::tqfromLatin1(" (") + path + TQString::tqfromLatin1(")");
- TQPixmap flag(locate("locale", sub + path + TQString::tqfromLatin1("/flag.png")));
+ TQString output = name + TQString::fromLatin1(" (") + path + TQString::fromLatin1(")");
+ TQPixmap flag(locate("locale", sub + path + TQString::fromLatin1("/flag.png")));
insertItem(TQIconSet(flag), output, path, submenu);
}
void KLanguageCombo::changeLanguage(const TQString& name, int i)
{
if (i < 0 || i >= count()) return;
- TQString output = name + TQString::tqfromLatin1(" (") + tag(i) + TQString::tqfromLatin1(")");
+ TQString output = name + TQString::fromLatin1(" (") + tag(i) + TQString::fromLatin1(")");
changeItem(output, i);
}
diff --git a/keduca/keducabuilder/ktagcombobox.cpp b/keduca/keducabuilder/ktagcombobox.cpp
index e6d0e617..8c317255 100644
--- a/keduca/keducabuilder/ktagcombobox.cpp
+++ b/keduca/keducabuilder/ktagcombobox.cpp
@@ -170,7 +170,7 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev)
// Text
TQRect clip(2, 2, width() - 4, height() - 4);
if ( hasFocus())
- p.setPen( tqcolorGroup().highlightedText() );
+ p.setPen( colorGroup().highlightedText() );
p.drawText(clip, AlignCenter | SingleLine, _popup->text( _current ));
// Icon
diff --git a/keduca/libkeduca/kgallerydialogbase.ui b/keduca/libkeduca/kgallerydialogbase.ui
index 9a11d8b4..44b60949 100644
--- a/keduca/libkeduca/kgallerydialogbase.ui
+++ b/keduca/libkeduca/kgallerydialogbase.ui
@@ -97,7 +97,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>10</height>
@@ -108,7 +108,7 @@
<property name="name">
<cstring>buttonAdd</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -274,7 +274,7 @@
<property name="name">
<cstring>buttonHelp</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -294,7 +294,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -305,7 +305,7 @@
<property name="name">
<cstring>buttonOpen</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -322,7 +322,7 @@
<property name="name">
<cstring>buttonCancel</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
diff --git a/kgeography/src/answer.cpp b/kgeography/src/answer.cpp
index 428ceb20..43cf45d1 100644
--- a/kgeography/src/answer.cpp
+++ b/kgeography/src/answer.cpp
@@ -93,7 +93,7 @@ void userAnswer::putWidgets(TQWidget *w, TQGridLayout *lay, int row) const
TQLabel *l;
l = new TQLabel(w);
l -> setPixmap(v -> toImage());
- l -> tqsetAlignment(TQt::AlignHCenter);
+ l -> setAlignment(TQt::AlignHCenter);
l -> setMargin(KDialog::marginHint() / 2);
widgets[i] = l;
}
@@ -104,8 +104,8 @@ void userAnswer::putWidgets(TQWidget *w, TQGridLayout *lay, int row) const
if (!p_correct)
{
TQColor back, fore;
- back = widgets[0] -> tqcolorGroup().highlight();
- fore = widgets[0] -> tqcolorGroup().highlightedText();
+ back = widgets[0] -> colorGroup().highlight();
+ fore = widgets[0] -> colorGroup().highlightedText();
for (int i = 0; i < 3; i++)
{
widgets[i] -> setPaletteBackgroundColor(back);
diff --git a/kgeography/src/answersdialog.cpp b/kgeography/src/answersdialog.cpp
index 7ff19bde..63756c70 100644
--- a/kgeography/src/answersdialog.cpp
+++ b/kgeography/src/answersdialog.cpp
@@ -40,7 +40,7 @@ answersDialog::answersDialog(TQWidget *parent, const TQValueVector<userAnswer> &
bigFont.setPointSize(24);
l1 = new TQLabel(question, p_container);
l1 -> setFont(bigFont);
- l1 -> tqsetAlignment(TQt::AlignCenter);
+ l1 -> setAlignment(TQt::AlignCenter);
lay->addMultiCellWidget(l1, 0, 0, 0, 4);
// Headers
@@ -68,7 +68,7 @@ answersDialog::answersDialog(TQWidget *parent, const TQValueVector<userAnswer> &
lay -> addItem(new TQSpacerItem(20, 20, TQSizePolicy::Fixed, TQSizePolicy::Fixed), totalAnswers + 3, 2);
l1 = new TQLabel(i18n("You answered correctly %1 out of %2 questions.").tqarg(correctAnswers).tqarg(totalAnswers), p_container);
- l1 -> tqsetAlignment(TQt::AlignCenter);
+ l1 -> setAlignment(TQt::AlignCenter);
lay->addMultiCellWidget(l1, totalAnswers + 4, totalAnswers + 4, 0, 4);
p_sv -> addChild(p_container);
diff --git a/kgeography/src/askwidget.cpp b/kgeography/src/askwidget.cpp
index 95ca4fcd..ddf21ec1 100644
--- a/kgeography/src/askwidget.cpp
+++ b/kgeography/src/askwidget.cpp
@@ -21,7 +21,7 @@ askWidget::askWidget(TQWidget *parent, KGmap *m, TQWidget *w, uint count, bool s
if (showLabel)
{
p_answers = new TQLabel(w);
- p_answers -> tqsetAlignment(AlignTop | AlignHCenter);
+ p_answers -> setAlignment(AlignTop | AlignHCenter);
resetAnswers();
p_answers -> show();
}
diff --git a/kgeography/src/kgeography.cpp b/kgeography/src/kgeography.cpp
index de850afb..46dd58bb 100644
--- a/kgeography/src/kgeography.cpp
+++ b/kgeography/src/kgeography.cpp
@@ -45,7 +45,7 @@ kgeography::kgeography() : KMainWindow(), p_firstShow(true), p_mustShowResultsDi
TQVBox *p_leftWidget = new TQVBox(p_bigWidget);
p_currentMap = new TQLabel(p_leftWidget);
- p_currentMap -> tqsetAlignment(AlignCenter);
+ p_currentMap -> setAlignment(AlignCenter);
p_consult = new KPushButton(i18n("&Browse Map"), p_leftWidget);
TQWhatsThis::add(p_consult, i18n("In this section left click on any part of the map to learn about the divisions" ));
p_askMap = new KPushButton(i18n("&Click Division in Map..."), p_leftWidget);
diff --git a/kgeography/src/mapasker.cpp b/kgeography/src/mapasker.cpp
index 47de1dff..bafbcfed 100644
--- a/kgeography/src/mapasker.cpp
+++ b/kgeography/src/mapasker.cpp
@@ -53,7 +53,7 @@ mapAsker::mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint cou
{
TQBoxLayout *vbl = dynamic_cast<TQBoxLayout*>(w -> tqlayout());
p_next = new TQLabel(w);
- p_next -> tqsetAlignment(AlignTop | AlignHCenter);
+ p_next -> setAlignment(AlignTop | AlignHCenter);
p_fill = new TQWidget(w);
p_fill -> show();
vbl -> setStretchFactor(p_fill, 1);
diff --git a/kgeography/src/mapwidget.cpp b/kgeography/src/mapwidget.cpp
index e039952c..c40a6dbd 100644
--- a/kgeography/src/mapwidget.cpp
+++ b/kgeography/src/mapwidget.cpp
@@ -61,9 +61,9 @@ void mapWidget::setMapZoom(bool b)
}
}
-TQSize mapWidget::tqsizeHint() const
+TQSize mapWidget::sizeHint() const
{
- return tqmaximumSize();
+ return maximumSize();
}
void mapWidget::updateHPosition(int value)
diff --git a/kgeography/src/mapwidget.h b/kgeography/src/mapwidget.h
index a54463b1..5b024bb0 100644
--- a/kgeography/src/mapwidget.h
+++ b/kgeography/src/mapwidget.h
@@ -27,7 +27,7 @@ Q_OBJECT
void setMapMove(bool b);
void setMapZoom(bool b);
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
TQSize mapSize() const;
public slots:
diff --git a/kgeography/src/mypopup.cpp b/kgeography/src/mypopup.cpp
index b37264df..154da915 100644
--- a/kgeography/src/mypopup.cpp
+++ b/kgeography/src/mypopup.cpp
@@ -33,7 +33,7 @@ myPopup::myPopup(TQWidget *parent, const TQString &text, const TQString &text2,
if (!text2.isNull())
{
TQLabel *l2 = new TQLabel(text2, vbox);
- l2 -> tqsetAlignment(TQt::AlignCenter);
+ l2 -> setAlignment(TQt::AlignCenter);
vboxLayout -> addWidget(l2);
}
@@ -43,10 +43,10 @@ myPopup::myPopup(TQWidget *parent, const TQString &text, const TQString &text2,
lay -> addWidget(flag);
TQImage flagImg(flagFile);
flag -> setPixmap(flagImg.smoothScale(flagImg.width() / 5, flagImg. height() / 5));
- flag -> tqsetAlignment(TQt::AlignCenter);
+ flag -> setAlignment(TQt::AlignCenter);
}
- l -> tqsetAlignment(TQt::AlignCenter);
+ l -> setAlignment(TQt::AlignCenter);
TQFont f = l -> font();
f.setBold(true);
l -> setFont(f);
@@ -55,7 +55,7 @@ myPopup::myPopup(TQWidget *parent, const TQString &text, const TQString &text2,
setFrameStyle(TQFrame::Box | TQFrame::Plain);
setLineWidth(2);
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
}
void myPopup::mousePressEvent(TQMouseEvent *)
diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp
index 116d880b..e8527c77 100644
--- a/khangman/khangman/khangman.cpp
+++ b/khangman/khangman/khangman.cpp
@@ -228,7 +228,7 @@ void KHangMan::setLanguages()
for (uint i=0; i<m_languages.count(); i++) {
TQString tmp = m_languages[i];
if (!config->readEntry(tmp))
- config->writeEntry(tmp, TQString(TQDate::tqcurrentDate().toString(Qt::ISODate)));
+ config->writeEntry(tmp, TQString(TQDate::currentDate().toString(Qt::ISODate)));
}
// We look in $TDEDIR/share/locale/all_languages from
diff --git a/khangman/khangman/khangmanview.cpp b/khangman/khangman/khangmanview.cpp
index e3a646cf..0a7960a5 100644
--- a/khangman/khangman/khangmanview.cpp
+++ b/khangman/khangman/khangmanview.cpp
@@ -48,16 +48,16 @@ KHangManView::KHangManView(KHangMan*parent, const char *name)
// The widget for entering letters.
m_letterInput = new KLineEdit( this, "charWrite" );
- m_letterInput->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType) 1,
+ m_letterInput->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType) 1,
(TQSizePolicy::SizeType) 0,
0, 0,
m_letterInput->sizePolicy().hasHeightForWidth() ) );
m_letterInput->setMaxLength( 1 );
- m_letterInput->tqsetAlignment( int( TQLineEdit::AlignHCenter ) );
+ m_letterInput->setAlignment( int( TQLineEdit::AlignHCenter ) );
// Press this button to enter a letter (or press enter)
m_guessButton = new KPushButton( this, "guessButton" );
- m_guessButton->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType) 1,
+ m_guessButton->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType) 1,
(TQSizePolicy::SizeType) 0,
0, 0,
m_guessButton->sizePolicy().hasHeightForWidth() ) );
diff --git a/khangman/khangman/timerdlg.ui b/khangman/khangman/timerdlg.ui
index dbd09dd7..e296c955 100644
--- a/khangman/khangman/timerdlg.ui
+++ b/khangman/khangman/timerdlg.ui
@@ -77,7 +77,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>295</width>
<height>20</height>
@@ -94,7 +94,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>25</width>
<height>16</height>
@@ -191,7 +191,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>25</width>
<height>16</height>
@@ -208,7 +208,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>295</width>
<height>20</height>
diff --git a/kig/filters/drgeo-filter-chooserbase.ui b/kig/filters/drgeo-filter-chooserbase.ui
index 1a9589b2..16c10b15 100644
--- a/kig/filters/drgeo-filter-chooserbase.ui
+++ b/kig/filters/drgeo-filter-chooserbase.ui
@@ -96,7 +96,7 @@ Please select which to import:</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kig/filters/drgeo-filter.cc b/kig/filters/drgeo-filter.cc
index 6596bf44..7acc2adf 100644
--- a/kig/filters/drgeo-filter.cc
+++ b/kig/filters/drgeo-filter.cc
@@ -770,7 +770,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
{
std::vector<ObjectCalcer*> args2;
args2.push_back( o->nameCalcer() );
- oc2 = fact->attachedLabelCalcer( TQString::tqfromLatin1( "%1" ), oc,
+ oc2 = fact->attachedLabelCalcer( TQString::fromLatin1( "%1" ), oc,
static_cast<const PointImp*>( oc->imp() )->coordinate(),
false, args2, *ret );
co = TQt::black;
diff --git a/kig/filters/filters-common.cc b/kig/filters/filters-common.cc
index 6ae6cef9..4ba24e9f 100644
--- a/kig/filters/filters-common.cc
+++ b/kig/filters/filters-common.cc
@@ -34,6 +34,6 @@ ObjectTypeCalcer* filtersConstructTextObject(
propo->calc( doc );
std::vector<ObjectCalcer*> args;
args.push_back( propo );
- return fact->labelCalcer( TQString::tqfromLatin1( "%1" ), c, needframe,
+ return fact->labelCalcer( TQString::fromLatin1( "%1" ), c, needframe,
args, doc );
}
diff --git a/kig/filters/kgeo-filter.cc b/kig/filters/kgeo-filter.cc
index 8d37a871..8849256b 100644
--- a/kig/filters/kgeo-filter.cc
+++ b/kig/filters/kgeo-filter.cc
@@ -130,7 +130,7 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c
elems.push_back( elem );
for ( const char* parent = parents.first(); parent; parent = parents.next() )
{
- int parentIndex = TQString::tqfromLatin1( parent ).toInt( &ok );
+ int parentIndex = TQString::fromLatin1( parent ).toInt( &ok );
if ( ! ok ) KIG_FILTER_PARSE_ERROR;
if ( parentIndex != 0 )
elems[i].parents.push_back( parentIndex - 1 );
diff --git a/kig/filters/kgeo-filter.h b/kig/filters/kgeo-filter.h
index e2317d1b..52107203 100644
--- a/kig/filters/kgeo-filter.h
+++ b/kig/filters/kgeo-filter.h
@@ -29,7 +29,7 @@ class KSimpleConfig;
* supposed to be its successor, and this import filter is part of my
* attempt to achieve that :)
*
- * tqStatus: a significant part of KGeo's format is supported, not all
+ * Status: a significant part of KGeo's format is supported, not all
* yet, though..
*/
class KigFilterKGeo
diff --git a/kig/filters/kseg-filter.cc b/kig/filters/kseg-filter.cc
index 7ddfcde4..286f23cd 100644
--- a/kig/filters/kseg-filter.cc
+++ b/kig/filters/kseg-filter.cc
@@ -636,7 +636,7 @@ KigDocument* KigFilterKSeg::load( const TQString& file )
std::vector<ObjectCalcer*> args2;
args2.push_back( object->nameCalcer() );
ObjectCalcer* oc2 = fact->attachedLabelCalcer(
- TQString::tqfromLatin1( "%1" ), object->calcer(),
+ TQString::fromLatin1( "%1" ), object->calcer(),
static_cast<const PointImp*>( object->imp() )->coordinate(),
false, args2, *retdoc );
oc2->calc( *retdoc );
diff --git a/kig/filters/native-filter.cc b/kig/filters/native-filter.cc
index d3323778..4c83c517 100644
--- a/kig/filters/native-filter.cc
+++ b/kig/filters/native-filter.cc
@@ -114,7 +114,7 @@ KigDocument* KigFilterNative::load( const TQString& file )
TQFile kigdoc( file );
#ifndef KIG_NO_COMPRESSED_FILES
bool iscompressed = false;
- if ( !file.tqendsWith( ".kig", false ) )
+ if ( !file.endsWith( ".kig", false ) )
{
// the file is compressed, so we have to decompress it and fetch the
// kig file inside it...
@@ -125,7 +125,7 @@ KigDocument* KigFilterNative::load( const TQString& file )
KIG_FILTER_PARSE_ERROR;
TQString tempname = file.section( '/', -1 );
- if ( file.tqendsWith( ".kigz", false ) )
+ if ( file.endsWith( ".kigz", false ) )
{
tempname.remove( TQRegExp( "\\.[Kk][Ii][Gg][Zz]$" ) );
}
@@ -642,7 +642,7 @@ bool KigFilterNative::save07( const KigDocument& kdoc, TQTextStream& stream )
TQDomElement drawelem = doc.createElement( "Draw" );
drawelem.setAttribute( "object", id );
drawelem.setAttribute( "color", d->color().name() );
- drawelem.setAttribute( "shown", TQString::tqfromLatin1( d->shown() ? "true" : "false" ) );
+ drawelem.setAttribute( "shown", TQString::fromLatin1( d->shown() ? "true" : "false" ) );
drawelem.setAttribute( "width", TQString::number( d->width() ) );
drawelem.setAttribute( "style", d->styleToString() );
drawelem.setAttribute( "point-style", d->pointStyleToString() );
@@ -683,7 +683,7 @@ bool KigFilterNative::save07( const KigDocument& data, const TQString& outfile )
return save07( data, stdoutstream );
}
#ifndef KIG_NO_COMPRESSED_FILES
- if ( !outfile.tqendsWith( ".kig", false ) )
+ if ( !outfile.endsWith( ".kig", false ) )
{
// the user wants to save a compressed file, so we have to save our kig
// file to a temp file and then compress it...
@@ -693,7 +693,7 @@ bool KigFilterNative::save07( const KigDocument& data, const TQString& outfile )
return false;
TQString tempname = outfile.section( '/', -1 );
- if ( outfile.tqendsWith( ".kigz", false ) )
+ if ( outfile.endsWith( ".kigz", false ) )
tempname.remove( TQRegExp( "\\.[Kk][Ii][Gg][Zz]$" ) );
else
return false;
diff --git a/kig/kfile/kfile_kig.cpp b/kig/kfile/kfile_kig.cpp
index 496a851f..7618d3b4 100644
--- a/kig/kfile/kfile_kig.cpp
+++ b/kig/kfile/kfile_kig.cpp
@@ -58,7 +58,7 @@ bool KigPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ )
TQString sfile = metainfo.path();
bool iscompressed = false;
TQFile f( sfile );
- if ( !sfile.tqendsWith( ".kig", false ) )
+ if ( !sfile.endsWith( ".kig", false ) )
{
iscompressed = true;
@@ -67,7 +67,7 @@ bool KigPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ )
return false;
TQString tempname = sfile.section( '/', -1 );
- if ( sfile.tqendsWith( ".kigz", false ) )
+ if ( sfile.endsWith( ".kigz", false ) )
{
tempname.remove( TQRegExp( "\\.[Kk][Ii][Gg][Zz]$" ) );
}
diff --git a/kig/kig/kig_view.cpp b/kig/kig/kig_view.cpp
index fe2da6e1..24f507d9 100644
--- a/kig/kig/kig_view.cpp
+++ b/kig/kig/kig_view.cpp
@@ -314,7 +314,7 @@ KigView::KigView( KigPart* part,
mtqlayout->addWidget( mrealwidget, 0, 0 );
mtqlayout->addWidget( mrightscroll, 0, 1 );
- resize( tqsizeHint() );
+ resize( sizeHint() );
mrealwidget->recenterScreen();
part->redrawScreen( mrealwidget );
updateScrollBars();
@@ -443,7 +443,7 @@ const KigDocument& KigWidget::document() const
return mpart->document();
}
-TQSize KigWidget::tqsizeHint() const
+TQSize KigWidget::sizeHint() const
{
return TQSize( 630, 450 );
}
@@ -508,9 +508,9 @@ void KigView::toggleFullScreen()
{
mrealwidget->setFullScreen( ! mrealwidget->isFullScreen() );
if ( mrealwidget->isFullScreen() )
- tqtopLevelWidget()->showFullScreen();
+ topLevelWidget()->showFullScreen();
else
- tqtopLevelWidget()->showNormal();
+ topLevelWidget()->showNormal();
}
void KigWidget::setFullScreen( bool f )
@@ -568,7 +568,7 @@ void KigWidget::zoomArea()
KigInputDialog::getTwoCoordinates( i18n( "Select Zoom Area" ),
i18n( "Select the zoom area by entering the coordinates of "
"the upper left corner and the lower right corner." ) +
- TQString::tqfromLatin1("<br>") +
+ TQString::fromLatin1("<br>") +
mpart->document().coordinateSystem().coordinateFormatNoticeMarkup(),
this, &ok, mpart->document(), &tl, &br );
if ( ok )
diff --git a/kig/kig/kig_view.h b/kig/kig/kig_view.h
index 6cda690b..e574d6f0 100644
--- a/kig/kig/kig_view.h
+++ b/kig/kig/kig_view.h
@@ -62,7 +62,7 @@ class KigWidget : public TQWidget
void paintEvent( TQPaintEvent* e );
void wheelEvent( TQWheelEvent* e );
void resizeEvent( TQResizeEvent* );
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
/**
* this is called to match a rect's dimensions to the dimensions of
diff --git a/kig/misc/coordinate_system.cpp b/kig/misc/coordinate_system.cpp
index 10bd96ce..b518078e 100644
--- a/kig/misc/coordinate_system.cpp
+++ b/kig/misc/coordinate_system.cpp
@@ -116,19 +116,19 @@ void CoordinateValidator::fixup( TQString & input ) const
sc = input.length();
KLocale* l = KGlobal::locale();
if ( mpolar )
- input.append( TQString::tqfromLatin1( ";" ) + l->positiveSign() +
- TQString::tqfromLatin1( "0�" ) );
+ input.append( TQString::fromLatin1( ";" ) + l->positiveSign() +
+ TQString::fromLatin1( "0�" ) );
else
- input.append( TQString::tqfromLatin1( ";" ) + l->positiveSign() +
- TQString::tqfromLatin1( "0" ) + l->decimalSymbol() +
- TQString::tqfromLatin1( "0" ) );
+ input.append( TQString::fromLatin1( ";" ) + l->positiveSign() +
+ TQString::fromLatin1( "0" ) + l->decimalSymbol() +
+ TQString::fromLatin1( "0" ) );
};
mre.exactMatch( input );
TQString ds1 = mre.cap( 1 );
mdv.fixup( ds1 );
TQString ds2 = mre.cap( 2 );
mdv.fixup( ds2 );
- input = ds1 + TQString::tqfromLatin1( "; " ) + ds2;
+ input = ds1 + TQString::fromLatin1( "; " ) + ds2;
}
EuclideanCoords::EuclideanCoords()
@@ -146,7 +146,7 @@ TQString EuclideanCoords::fromScreen( const Coordinate& p, const KigDocument& d
int l = kigMax( 0, (int) ( 3 - log10( m ) ) );
TQString xs = KGlobal::locale()->formatNumber( p.x, l );
TQString ys = KGlobal::locale()->formatNumber( p.y, l );
- return TQString::tqfromLatin1( "( %1; %2 )" ).tqarg( xs ).tqarg( ys );
+ return TQString::fromLatin1( "( %1; %2 )" ).tqarg( xs ).tqarg( ys );
}
Coordinate EuclideanCoords::toScreen(const TQString& s, bool& ok) const
@@ -354,7 +354,7 @@ TQString PolarCoords::fromScreen( const Coordinate& pt, const KigDocument& d ) c
TQString rs = KGlobal::locale()->formatNumber( r, l );
TQString ts = KGlobal::locale()->formatNumber( theta, 0 );
- return TQString::tqfromLatin1("( %1; %2� )").tqarg( rs ).tqarg( ts );
+ return TQString::fromLatin1("( %1; %2� )").tqarg( rs ).tqarg( ts );
}
TQString PolarCoords::coordinateFormatNotice() const
diff --git a/kig/misc/guiaction.cc b/kig/misc/guiaction.cc
index f19f2d82..d42b7ca4 100644
--- a/kig/misc/guiaction.cc
+++ b/kig/misc/guiaction.cc
@@ -223,7 +223,7 @@ void AddFixedPointAction::act( KigPart& doc )
KigInputDialog::getCoordinate(
i18n( "Fixed Point" ),
i18n( "Enter the coordinates for the new point." ) +
- TQString::tqfromLatin1( "<br>" ) +
+ TQString::fromLatin1( "<br>" ) +
doc.document().coordinateSystem().coordinateFormatNoticeMarkup(),
doc.widget(), &ok, doc.document(), &c );
if ( ! ok ) return;
@@ -272,7 +272,7 @@ TestAction::~TestAction()
TQString TestAction::description() const
{
- return TQString::tqfromLatin1( "Test stuff !!!" );
+ return TQString::fromLatin1( "Test stuff !!!" );
}
TQCString TestAction::iconFileName() const
@@ -282,7 +282,7 @@ TQCString TestAction::iconFileName() const
TQString TestAction::descriptiveName() const
{
- return TQString::tqfromLatin1( "Test stuff !!!" );
+ return TQString::fromLatin1( "Test stuff !!!" );
}
const char* TestAction::actionName() const
@@ -297,7 +297,7 @@ void TestAction::act( KigPart& doc )
Object* constantpoint = ObjectFactory::instance()->fixedPoint( Coordinate( -1, -1 ) );
constantpoint->calc( doc );
- Object* codeobject = new DataObject( new StringImp( TQString::tqfromLatin1( script ) ) );
+ Object* codeobject = new DataObject( new StringImp( TQString::fromLatin1( script ) ) );
Object* compiledcode = new RealObject( PythonCompileType::instance(), Objects( codeobject ) );
compiledcode->calc( doc );
diff --git a/kig/misc/kiginputdialog.cc b/kig/misc/kiginputdialog.cc
index 99e635b2..f45d6949 100644
--- a/kig/misc/kiginputdialog.cc
+++ b/kig/misc/kiginputdialog.cc
@@ -85,7 +85,7 @@ KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label,
d->m_textEdit->setText( label );
d->m_textEdit->setReadOnly( true );
d->m_textEdit->setFocusPolicy( TQ_NoFocus );
-// d->m_textEdit->tqsetAlignment( d->m_textEdit->tqalignment() | TQt::WordBreak );
+// d->m_textEdit->setAlignment( d->m_textEdit->tqalignment() | TQt::WordBreak );
d->m_textEdit->setFrameStyle( TQFrame::NoFrame );
mainlay->addWidget( d->m_textEdit );
diff --git a/kig/misc/kigpainter.cpp b/kig/misc/kigpainter.cpp
index 81ae6574..4b3ede2e 100644
--- a/kig/misc/kigpainter.cpp
+++ b/kig/misc/kigpainter.cpp
@@ -300,7 +300,7 @@ void KigPainter::drawPolygon( const std::vector<TQPoint>& pts,
{
t.putPoints( c++, 1, i->x(), i->y() );
};
- mP.tqdrawPolygon( t, winding, index, npoints );
+ mP.drawPolygon( t, winding, index, npoints );
setPen( oldpen );
setBrush( oldbrush );
if( mNeedOverlay ) mOverlay.push_back( t.boundingRect() );
@@ -645,7 +645,7 @@ void KigPainter::drawAngle( const Coordinate& cpoint, const double dstartangle,
setBrushStyle( Qt::SolidPattern );
// drawPolygon( arrow );
- mP.tqdrawPolygon( arrow, false, 0, -1 );
+ mP.drawPolygon( arrow, false, 0, -1 );
// if ( mNeedOverlay ) mOverlay.push_back( toScreen( r ) );
setWholeWinOverlay(); //mp: ugly! why not compute a correct overlay?
@@ -859,7 +859,7 @@ void KigPainter::drawCurve( const CurveImp* curve )
if ( curpolylinenextfree > 0 && curpolyline[curpolylinenextfree - 1] != tp1 )
{
// flush the current part of the curve
- mP.tqdrawPolyline( curpolyline, 0, curpolylinenextfree );
+ mP.drawPolyline( curpolyline, 0, curpolylinenextfree );
curpolylinenextfree = 0;
}
if ( curpolylinenextfree == 0 )
@@ -883,7 +883,7 @@ void KigPainter::drawCurve( const CurveImp* curve )
}
}
// flush the rest of the curve
- mP.tqdrawPolyline( curpolyline, 0, curpolylinenextfree );
+ mP.drawPolyline( curpolyline, 0, curpolylinenextfree );
curpolylinenextfree = 0;
if ( ! workstack.empty () )
diff --git a/kig/misc/object_hierarchy.cc b/kig/misc/object_hierarchy.cc
index e72a3c19..55914081 100644
--- a/kig/misc/object_hierarchy.cc
+++ b/kig/misc/object_hierarchy.cc
@@ -419,10 +419,10 @@ void ObjectHierarchy::serialize( TQDomElement& parent, TQDomDocument& doc ) cons
// we don't save these atm, since the user can't define them.
// we only load them from builtin macro's.
// TQDomElement ut = doc.createElement( "UseText" );
-// ut.appendChild( doc.createTextNode( TQString::tqfromLatin1(musetexts[i].c_str() ) ) );
+// ut.appendChild( doc.createTextNode( TQString::fromLatin1(musetexts[i].c_str() ) ) );
// e.appendChild( ut );
// TQDomElement ss = doc.createElement( "SelectStatement" );
-// ss.appendChild( doc.createTextNode( TQString::tqfromLatin1(mselectstatements[i].c_str() ) ) );
+// ss.appendChild( doc.createTextNode( TQString::fromLatin1(mselectstatements[i].c_str() ) ) );
// e.appendChild( ss );
parent.appendChild( e );
}
@@ -437,7 +437,7 @@ void ObjectHierarchy::serialize( TQDomElement& parent, TQDomDocument& doc ) cons
{
const ApplyTypeNode* node = static_cast<const ApplyTypeNode*>( mnodes[i] );
e.setAttribute( "action", "calc" );
- e.setAttribute( "type", TQString::tqfromLatin1( node->type()->fullName() ) );
+ e.setAttribute( "type", TQString::fromLatin1( node->type()->fullName() ) );
for ( uint i = 0; i < node->parents().size(); ++i )
{
int parent = node->parents()[i] + 1;
diff --git a/kig/modes/construct_mode.cc b/kig/modes/construct_mode.cc
index e9e2e5ad..f2d5f2ed 100644
--- a/kig/modes/construct_mode.cc
+++ b/kig/modes/construct_mode.cc
@@ -485,7 +485,7 @@ void TestConstructMode::leftClickedObject( ObjectHolder* o, const TQPoint& p,
std::vector<ObjectCalcer*> parents;
parents.push_back( new ObjectConstCalcer( new IntImp( test_has_frame_dflt ) ) );
parents.push_back( new ObjectConstCalcer( new PointImp( loc ) ) );
- parents.push_back( new ObjectConstCalcer( new StringImp( TQString::tqfromLatin1( "%1" ) ) ) );
+ parents.push_back( new ObjectConstCalcer( new StringImp( TQString::fromLatin1( "%1" ) ) ) );
assert( mresult->imp()->inherits( TestResultImp::stype() ) );
parents.push_back(
new ObjectPropertyCalcer(
diff --git a/kig/modes/edittype.cc b/kig/modes/edittype.cc
index d2f25a47..f4ed323e 100644
--- a/kig/modes/edittype.cc
+++ b/kig/modes/edittype.cc
@@ -50,8 +50,8 @@ EditType::~EditType()
void EditType::helpSlot()
{
- kapp->invokeHelp( TQString::tqfromLatin1( "working-with-types" ),
- TQString::tqfromLatin1( "kig" ) );
+ kapp->invokeHelp( TQString::fromLatin1( "working-with-types" ),
+ TQString::fromLatin1( "kig" ) );
}
void EditType::okSlot()
diff --git a/kig/modes/edittypebase.ui b/kig/modes/edittypebase.ui
index e69d9f13..91ff6df4 100644
--- a/kig/modes/edittypebase.ui
+++ b/kig/modes/edittypebase.ui
@@ -152,7 +152,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -212,7 +212,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kig/modes/macrowizard.cc b/kig/modes/macrowizard.cc
index 1b25c803..662e3a0d 100644
--- a/kig/modes/macrowizard.cc
+++ b/kig/modes/macrowizard.cc
@@ -85,6 +85,6 @@ void MacroWizard::accept()
void MacroWizard::slotHelpClicked()
{
- kapp->invokeHelp( TQString::tqfromLatin1( "defining-macros"),
- TQString::tqfromLatin1( "kig" ) );
+ kapp->invokeHelp( TQString::fromLatin1( "defining-macros"),
+ TQString::fromLatin1( "kig" ) );
}
diff --git a/kig/modes/popup.cc b/kig/modes/popup.cc
index 32280d62..321675c0 100644
--- a/kig/modes/popup.cc
+++ b/kig/modes/popup.cc
@@ -198,7 +198,7 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part,
else if ( single )
{
if ( !objs[0]->name().isNull() )
- title = TQString::tqfromLatin1( "%1 %2" ).tqarg( objs[0]->imp()->type()->translatedName() ).tqarg( objs[0]->name() );
+ title = TQString::fromLatin1( "%1 %2" ).tqarg( objs[0]->imp()->type()->translatedName() ).tqarg( objs[0]->name() );
else
title = objs[0]->imp()->type()->translatedName();
}
@@ -518,7 +518,7 @@ static void addNameLabel( ObjectCalcer* object, ObjectCalcer* namecalcer, const
object->imp()->inherits( CurveImp::stype() ) )
attachto = object;
ObjectHolder* label = ObjectFactory::instance()->attachedLabel(
- TQString::tqfromLatin1( "%1" ), attachto, loc, namelabelneedsframe, args, doc.document() );
+ TQString::fromLatin1( "%1" ), attachto, loc, namelabelneedsframe, args, doc.document() );
doc.addObject( label );
}
@@ -924,7 +924,7 @@ bool PropertiesActionsProvider::executeAction(
// /////// Coordinate c = Coordinate::invalidCoord();
Coordinate c = w.fromScreen( popup.plc() );
ObjectHolder* label = ObjectFactory::instance()->attachedLabel(
- TQString::tqfromLatin1( "%1" ), parent->calcer(), c,
+ TQString::fromLatin1( "%1" ), parent->calcer(), c,
false, args, doc.document() );
doc.addObject( label );
}
@@ -1182,7 +1182,7 @@ ObjectChooserPopup::ObjectChooserPopup( const TQPoint& p, KigWidget& view,
for ( uint i = 0; i < mobjs.size(); i++ )
{
insertItem( !mobjs[i]->name().isEmpty()
- ? TQString::tqfromLatin1( "%1 %2" ).tqarg( mobjs[i]->imp()->type()->translatedName() ).tqarg( mobjs[i]->name() )
+ ? TQString::fromLatin1( "%1 %2" ).tqarg( mobjs[i]->imp()->type()->translatedName() ).tqarg( mobjs[i]->name() )
: mobjs[i]->imp()->type()->translatedName(),
i );
}
diff --git a/kig/modes/textlabelwizard.cc b/kig/modes/textlabelwizard.cc
index e35e707a..8991a93c 100644
--- a/kig/modes/textlabelwizard.cc
+++ b/kig/modes/textlabelwizard.cc
@@ -89,7 +89,7 @@ void TextLabelWizard::relayoutArgsPage()
void TextLabelWizard::slotHelpClicked()
{
- kapp->invokeHelp( TQString::tqfromLatin1( "text-labels" ),
- TQString::tqfromLatin1( "kig" ) );
+ kapp->invokeHelp( TQString::fromLatin1( "text-labels" ),
+ TQString::fromLatin1( "kig" ) );
}
diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp
index df061888..b4336bf2 100644
--- a/kig/modes/typesdialog.cpp
+++ b/kig/modes/typesdialog.cpp
@@ -108,8 +108,8 @@ TypesDialog::~TypesDialog()
void TypesDialog::helpSlot()
{
- kapp->invokeHelp( TQString::tqfromLatin1( "working-with-types" ),
- TQString::tqfromLatin1( "kig" ) );
+ kapp->invokeHelp( TQString::fromLatin1( "working-with-types" ),
+ TQString::fromLatin1( "kig" ) );
}
void TypesDialog::okSlot()
diff --git a/kig/modes/typesdialogbase.ui b/kig/modes/typesdialogbase.ui
index 89f00986..347eb831 100644
--- a/kig/modes/typesdialogbase.ui
+++ b/kig/modes/typesdialogbase.ui
@@ -138,7 +138,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -228,7 +228,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kig/objects/object_imp_factory.cc b/kig/objects/object_imp_factory.cc
index a29cf5e8..1d466835 100644
--- a/kig/objects/object_imp_factory.cc
+++ b/kig/objects/object_imp_factory.cc
@@ -84,33 +84,33 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
parent.appendChild(
doc.createTextNode(
TQString::number( static_cast<const IntImp&>( d ).data() ) ) );
- return TQString::tqfromLatin1( "int" );
+ return TQString::fromLatin1( "int" );
}
else if ( d.inherits( DoubleImp::stype() ) )
{
parent.appendChild(
doc.createTextNode(
TQString::number( static_cast<const DoubleImp&>( d ).data() ) ) );
- return TQString::tqfromLatin1( "double" );
+ return TQString::fromLatin1( "double" );
}
else if( d.inherits( StringImp::stype() ) )
{
parent.appendChild(
doc.createTextNode(
static_cast<const StringImp&>( d ).data() ) );
- return TQString::tqfromLatin1( "string" );
+ return TQString::fromLatin1( "string" );
}
else if ( d.inherits( TestResultImp::stype() ) )
{
parent.appendChild(
doc.createTextNode(
static_cast<const TestResultImp&>( d ).data() ) );
- return TQString::tqfromLatin1( "testresult" );
+ return TQString::fromLatin1( "testresult" );
}
else if( d.inherits( HierarchyImp::stype() ) )
{
static_cast<const HierarchyImp&>( d ).data().serialize( parent, doc );
- return TQString::tqfromLatin1( "hierarchy" );
+ return TQString::fromLatin1( "hierarchy" );
}
else if ( d.inherits( TransformationImp::stype() ) )
{
@@ -135,7 +135,7 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
homothetye.appendChild( doc.createTextNode( ishomothety ) );
parent.appendChild( homothetye );
- return TQString::tqfromLatin1( "transformation" );
+ return TQString::fromLatin1( "transformation" );
}
else if( d.inherits( AbstractLineImp::stype() ) )
{
@@ -143,28 +143,28 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
addCoordinateElement( "a", l.a, parent, doc );
addCoordinateElement( "b", l.b, parent, doc );
if( d.inherits( SegmentImp::stype() ) )
- return TQString::tqfromLatin1( "segment" );
+ return TQString::fromLatin1( "segment" );
else if( d.inherits( RayImp::stype() ) )
- return TQString::tqfromLatin1( "ray" );
- else return TQString::tqfromLatin1( "line" );
+ return TQString::fromLatin1( "ray" );
+ else return TQString::fromLatin1( "line" );
}
else if( d.inherits( PointImp::stype() ) )
{
addXYElements( static_cast<const PointImp&>( d ).coordinate(),
parent, doc );
- return TQString::tqfromLatin1( "point" );
+ return TQString::fromLatin1( "point" );
}
else if( d.inherits( TextImp::stype() ) )
{
TQString text = static_cast<const TextImp&>( d ).text();
parent.appendChild(
doc.createTextNode( text ) );
- return TQString::tqfromLatin1( "text" );
+ return TQString::fromLatin1( "text" );
}
else if( d.inherits( AngleImp::stype() ) )
{
addDoubleElement( "size", static_cast<const AngleImp&>( d ).size(), parent, doc );
- return TQString::tqfromLatin1( "angle" );
+ return TQString::fromLatin1( "angle" );
}
else if ( d.inherits( ArcImp::stype() ) )
{
@@ -173,13 +173,13 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
addDoubleElement( "radius", a.radius(), parent, doc );
addDoubleElement( "startangle", a.startAngle(), parent, doc );
addDoubleElement( "angle", a.angle(), parent, doc );
- return TQString::tqfromLatin1( "arc" );
+ return TQString::fromLatin1( "arc" );
}
else if( d.inherits( VectorImp::stype() ) )
{
Coordinate dir = static_cast<const VectorImp&>( d ).dir();
addXYElements( dir, parent, doc );
- return TQString::tqfromLatin1( "vector" );
+ return TQString::fromLatin1( "vector" );
}
else if( d.inherits( LocusImp::stype() ) )
{
@@ -197,14 +197,14 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
locus.hierarchy().serialize( hier, doc );
parent.appendChild( hier );
- return TQString::tqfromLatin1( "locus" );
+ return TQString::fromLatin1( "locus" );
}
else if( d.inherits( CircleImp::stype() ) )
{
const CircleImp& c = static_cast<const CircleImp&>( d );
addCoordinateElement( "center", c.center(), parent, doc );
addDoubleElement( "radius", c.radius(), parent, doc );
- return TQString::tqfromLatin1( "circle" );
+ return TQString::fromLatin1( "circle" );
}
else if( d.inherits( ConicImp::stype() ) )
{
@@ -213,7 +213,7 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
addDoubleElement( "pdimen", data.pdimen, parent, doc );
addDoubleElement( "ecostheta0", data.ecostheta0, parent, doc );
addDoubleElement( "esintheta0", data.esintheta0, parent, doc );
- return TQString::tqfromLatin1( "conic" );
+ return TQString::fromLatin1( "conic" );
}
else if( d.inherits( CubicImp::stype() ) )
{
@@ -230,7 +230,7 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
addDoubleElement( "a122", data.coeffs[8], coeffs, doc );
addDoubleElement( "a222", data.coeffs[9], coeffs, doc );
parent.appendChild( coeffs );
- return TQString::tqfromLatin1( "cubic" );
+ return TQString::fromLatin1( "cubic" );
}
assert( false );
return TQString();
diff --git a/kig/objects/point_type.cc b/kig/objects/point_type.cc
index f1c59ac4..2acd8479 100644
--- a/kig/objects/point_type.cc
+++ b/kig/objects/point_type.cc
@@ -395,7 +395,7 @@ void FixedPointType::executeAction(
Coordinate oldc = static_cast<const PointImp*>( o.imp() )->coordinate();
KigInputDialog::getCoordinate(
i18n( "Set Coordinate" ),
- i18n( "Enter the new coordinate." ) + TQString::tqfromLatin1( "<br>" ) +
+ i18n( "Enter the new coordinate." ) + TQString::fromLatin1( "<br>" ) +
d.document().coordinateSystem().coordinateFormatNoticeMarkup(),
&w, &ok, d.document(), &oldc );
if ( ! ok ) break;
diff --git a/kig/scripting/newscriptwizard.cc b/kig/scripting/newscriptwizard.cc
index 255a6073..e2a8fe25 100644
--- a/kig/scripting/newscriptwizard.cc
+++ b/kig/scripting/newscriptwizard.cc
@@ -159,8 +159,8 @@ void NewScriptWizard::accept()
void NewScriptWizard::slotHelpClicked()
{
- kapp->invokeHelp( TQString::tqfromLatin1( "scripting" ),
- TQString::tqfromLatin1( "kig" ) );
+ kapp->invokeHelp( TQString::fromLatin1( "scripting" ),
+ TQString::fromLatin1( "kig" ) );
}
void NewScriptWizard::setText( const TQString& text )
diff --git a/kig/scripting/script-common.cc b/kig/scripting/script-common.cc
index 1f5d8c4a..fbdf0a54 100644
--- a/kig/scripting/script-common.cc
+++ b/kig/scripting/script-common.cc
@@ -44,7 +44,7 @@ TQString ScriptType::templateCode( ScriptType::Type type, std::list<ObjectHolder
{
if ( type == Python )
{
- TQString tempcode = TQString::tqfromLatin1( "def calc( " );
+ TQString tempcode = TQString::fromLatin1( "def calc( " );
bool firstarg = true;
TQString temparg = i18n( "Note to translators: this should be a default "
"name for an argument in a Python function. The "
diff --git a/kiten/configdictionariesbase.ui b/kiten/configdictionariesbase.ui
index 8695a10a..6ef31c7f 100644
--- a/kiten/configdictionariesbase.ui
+++ b/kiten/configdictionariesbase.ui
@@ -71,7 +71,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -149,7 +149,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>120</height>
@@ -209,7 +209,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -287,7 +287,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>120</height>
diff --git a/kiten/configlearn.ui b/kiten/configlearn.ui
index 00baf74e..26072ac2 100644
--- a/kiten/configlearn.ui
+++ b/kiten/configlearn.ui
@@ -45,7 +45,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -141,7 +141,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kiten/configsearching.ui b/kiten/configsearching.ui
index b183b1e3..39f7012b 100644
--- a/kiten/configsearching.ui
+++ b/kiten/configsearching.ui
@@ -53,7 +53,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kiten/dict.cpp b/kiten/dict.cpp
index 90af2878..cde11f1c 100644
--- a/kiten/dict.cpp
+++ b/kiten/dict.cpp
@@ -769,8 +769,8 @@ TQString Dict::firstEntryText(Dict::SearchResult result)
///////////////////////////////////////////////////////////////
Entry::Entry(const TQString & kanji, const TQString & reading, const TQStringList &meanings)
- : DictName(TQString::tqfromLatin1("__NOTSET"))
- , Header(TQString::tqfromLatin1("__NOTSET"))
+ : DictName(TQString::fromLatin1("__NOTSET"))
+ , Header(TQString::fromLatin1("__NOTSET"))
, Meanings(meanings)
, Kanji(kanji)
, KanaOnly(reading.isEmpty())
@@ -784,8 +784,8 @@ Entry::Entry(const TQString & kanji, const TQString & reading, const TQStringLis
}
Entry::Entry(const TQString &kanji, TQStringList &readings, TQStringList &meanings, unsigned int grade, unsigned int freq, unsigned int strokes, unsigned int miscount)
- : DictName(TQString::tqfromLatin1("__NOTSET"))
- , Header(TQString::tqfromLatin1("__NOTSET"))
+ : DictName(TQString::fromLatin1("__NOTSET"))
+ , Header(TQString::fromLatin1("__NOTSET"))
, Meanings(meanings)
, Kanji(kanji)
, KanaOnly(false)
@@ -806,7 +806,7 @@ Entry::Entry(const TQString &dictname)
}
Entry::Entry(const TQString &headername, bool)
- : DictName(TQString::tqfromLatin1("__NOTSET"))
+ : DictName(TQString::fromLatin1("__NOTSET"))
, Header(headername)
, KanaOnly(true)
, ExtendedKanjiInfo(false)
diff --git a/kiten/edict b/kiten/edict
index b97f749e..755afd4b 100644
--- a/kiten/edict
+++ b/kiten/edict
@@ -63535,7 +63535,7 @@
�ͻ����� [���󤸤��礦����] /personnel administration/
�ͻ��ʾ� [���󤸤����礦] /(n) litigation related to personal status (e.g. divorce actions, etc.)/
�ͻ��ʾٻ��� [���󤸤����礦������] /(n) litigation related to personal status (e.g. divorce actions, etc.)/
-�ͻ��ʾټ�³��ˡ [���󤸤����礦�ƤĤŤ��ۤ�] /(n) Personal tqStatus Actions Procedure Law (e.g., divorce actions, etc.)/
+�ͻ��ʾټ�³��ˡ [���󤸤����礦�ƤĤŤ��ۤ�] /(n) Personal Status Actions Procedure Law (e.g., divorce actions, etc.)/
�ͻ��Ծ� [���󤸤դ���] /(n) unconsciousness/
�ͻ��� [���󤸤�] /(n) personnel department/
�ͻ��� [���󤸤��] /(n) personal column/
@@ -83790,7 +83790,7 @@
���� [�ʤ󤯤�] /(n) fault/
��̱ [�ʤ�ߤ�] /(n) refugees/(P)/
��̱���� [�ʤ�ߤ󤭤���] /return of refugees/
-��̱���� [�ʤ�ߤ󤸤礦�䤯] /Convention Relating to the tqStatus of Refugees/
+��̱���� [�ʤ�ߤ󤸤礦�䤯] /Convention Relating to the Status of Refugees/
��̵�� [�ʤ�ʤ�] /(adv) easily/
���� [�ʤ���] /(n) perplexity/difficult question/difficult problem/(P)/
������ [�ʤ������] /(n) difficult problem or question/
diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp
index 284e0618..b2a86f39 100644
--- a/kiten/widgets.cpp
+++ b/kiten/widgets.cpp
@@ -256,7 +256,7 @@ void ResultView::print(TQString title)
TQRect view(body);
int page = 1;
- TQColorGroup goodColorGroup = TQColorGroup(tqcolorGroup());
+ TQColorGroup goodColorGroup = TQColorGroup(colorGroup());
goodColorGroup.setColor(TQColorGroup::Link, TQt::black);
do
diff --git a/klatin/klatin/klatinchoose.ui b/klatin/klatin/klatinchoose.ui
index 684ebc5a..b93172c3 100644
--- a/klatin/klatin/klatinchoose.ui
+++ b/klatin/klatin/klatinchoose.ui
@@ -87,7 +87,7 @@ Please Choose Section of Revision</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -167,7 +167,7 @@ verb and noun tables</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
@@ -194,7 +194,7 @@ verb and noun tables</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>34</height>
@@ -239,7 +239,7 @@ verb and noun tables</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>33</height>
diff --git a/klatin/klatin/klatingrammarwidget.ui b/klatin/klatin/klatingrammarwidget.ui
index 850945ed..1ea323b0 100644
--- a/klatin/klatin/klatingrammarwidget.ui
+++ b/klatin/klatin/klatingrammarwidget.ui
@@ -12,7 +12,7 @@
<height>320</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -29,7 +29,7 @@
<property name="name">
<cstring>TitleGrammar</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -87,7 +87,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -133,13 +133,13 @@ Line 4</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -342,7 +342,7 @@ Line 4</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>294</width>
<height>20</height>
diff --git a/klatin/klatin/klatinresultsdialog.ui b/klatin/klatin/klatinresultsdialog.ui
index 84d15eec..983ddc2f 100644
--- a/klatin/klatin/klatinresultsdialog.ui
+++ b/klatin/klatin/klatinresultsdialog.ui
@@ -180,7 +180,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>291</width>
<height>20</height>
diff --git a/klatin/klatin/klatinverbswidget.ui b/klatin/klatin/klatinverbswidget.ui
index 46492b5d..e866ba8f 100644
--- a/klatin/klatin/klatinverbswidget.ui
+++ b/klatin/klatin/klatinverbswidget.ui
@@ -69,7 +69,7 @@ tested on</string>
<property name="name">
<cstring>ChooseVoice</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
@@ -99,7 +99,7 @@ tested on</string>
<property name="name">
<cstring>ChangeButton</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>25</width>
<height>32767</height>
@@ -177,13 +177,13 @@ Line 4</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -383,7 +383,7 @@ Line 4</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>297</width>
<height>20</height>
diff --git a/klatin/klatin/klatinvocabwidget.ui b/klatin/klatin/klatinvocabwidget.ui
index 6b1840f5..84b956ef 100644
--- a/klatin/klatin/klatinvocabwidget.ui
+++ b/klatin/klatin/klatinvocabwidget.ui
@@ -23,7 +23,7 @@
<property name="name">
<cstring>TitleLabel</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>500</width>
<height>0</height>
@@ -98,7 +98,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -255,7 +255,7 @@
<property name="name">
<cstring>Answer1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>150</width>
<height>40</height>
@@ -272,7 +272,7 @@
<property name="name">
<cstring>Answer2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>150</width>
<height>40</height>
@@ -299,7 +299,7 @@
<property name="name">
<cstring>Answer3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>150</width>
<height>40</height>
@@ -316,7 +316,7 @@
<property name="name">
<cstring>Answer4</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>150</width>
<height>40</height>
@@ -349,7 +349,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>326</width>
<height>20</height>
diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp
index d1d5e550..e9168379 100644
--- a/klettres/klettres/klettres.cpp
+++ b/klettres/klettres/klettres.cpp
@@ -127,7 +127,7 @@ void KLettres::findLanguages()
{
TQString tmp = m_languages[i];
if (!config->readEntry(tmp))
- config->writeEntry(tmp, TQString(TQDate::tqcurrentDate().toString()));
+ config->writeEntry(tmp, TQString(TQDate::currentDate().toString()));
}
//we look in $TDEDIR/share/locale/all_languages from /tdelibs/tdecore/all_languages
//to find the name of the country
diff --git a/klettres/klettres/timerdlg.ui b/klettres/klettres/timerdlg.ui
index 089399a8..82637661 100644
--- a/klettres/klettres/timerdlg.ui
+++ b/klettres/klettres/timerdlg.ui
@@ -12,7 +12,7 @@
<height>260</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>264</width>
<height>20</height>
@@ -97,7 +97,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>25</width>
<height>16</height>
@@ -114,7 +114,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>270</width>
<height>20</height>
@@ -163,7 +163,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>228</width>
<height>20</height>
@@ -199,7 +199,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>226</width>
<height>20</height>
@@ -216,7 +216,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>25</width>
<height>16</height>
diff --git a/kmplot/kmplot/FktDlgData.ui b/kmplot/kmplot/FktDlgData.ui
index c2d8b98a..7f8ef8fc 100644
--- a/kmplot/kmplot/FktDlgData.ui
+++ b/kmplot/kmplot/FktDlgData.ui
@@ -12,7 +12,7 @@
<height>355</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>250</height>
@@ -57,7 +57,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -262,7 +262,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -329,7 +329,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kmplot/kmplot/View.cpp b/kmplot/kmplot/View.cpp
index a88d364e..d9d88613 100644
--- a/kmplot/kmplot/View.cpp
+++ b/kmplot/kmplot/View.cpp
@@ -140,7 +140,7 @@ void View::draw(TQPaintDevice *dev, int form)
DC.resetXForm();
DC.scale((float)w/(float)(lx+2*ref.x()), (float)w/(float)(lx+2*ref.x()));
}
- wm=DC.tqworldMatrix();
+ wm=DC.worldMatrix();
s=DC.xForm(TQPoint(1000, 0)).x()/1000.;
dgr.Create( ref, lx, ly, xmin, xmax, ymin, ymax );
}
diff --git a/kmplot/kmplot/editderivativespage.ui b/kmplot/kmplot/editderivativespage.ui
index f8693ecc..235721f2 100644
--- a/kmplot/kmplot/editderivativespage.ui
+++ b/kmplot/kmplot/editderivativespage.ui
@@ -217,7 +217,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>110</height>
diff --git a/kmplot/kmplot/editfunctionpage.ui b/kmplot/kmplot/editfunctionpage.ui
index e7ecf01d..47973b30 100644
--- a/kmplot/kmplot/editfunctionpage.ui
+++ b/kmplot/kmplot/editfunctionpage.ui
@@ -366,7 +366,7 @@ Example: f(x)=x^2</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -466,7 +466,7 @@ Example: f(x)=x^2</string>
<slot access="public" specifier="">setPalette(const QPalette&amp;)</slot>
<slot access="public" specifier="">setSelection(int,int)</slot>
<slot access="public" specifier="">setCursorPosition(int)</slot>
- <slot access="public" specifier="">tqsetAlignment(int)</slot>
+ <slot access="public" specifier="">setAlignment(int)</slot>
<slot access="public" specifier="">cut()</slot>
<slot access="public" specifier="">copy()</slot>
<slot access="public" specifier="">paste()</slot>
@@ -492,8 +492,8 @@ Example: f(x)=x^2</string>
<property type="Bool">enabled</property>
<property type="Rect">tqgeometry</property>
<property type="SizePolicy">sizePolicy</property>
- <property type="Size">tqminimumSize</property>
- <property type="Size">tqmaximumSize</property>
+ <property type="Size">minimumSize</property>
+ <property type="Size">maximumSize</property>
<property type="Size">sizeIncrement</property>
<property type="Size">baseSize</property>
<property type="Color">paletteForegroundColor</property>
@@ -608,8 +608,8 @@ Example: f(x)=x^2</string>
<property type="Bool">enabled</property>
<property type="Rect">tqgeometry</property>
<property type="SizePolicy">sizePolicy</property>
- <property type="Size">tqminimumSize</property>
- <property type="Size">tqmaximumSize</property>
+ <property type="Size">minimumSize</property>
+ <property type="Size">maximumSize</property>
<property type="Size">sizeIncrement</property>
<property type="Size">baseSize</property>
<property type="Color">paletteForegroundColor</property>
@@ -715,8 +715,8 @@ Example: f(x)=x^2</string>
<property type="Bool">enabled</property>
<property type="Rect">tqgeometry</property>
<property type="SizePolicy">sizePolicy</property>
- <property type="Size">tqminimumSize</property>
- <property type="Size">tqmaximumSize</property>
+ <property type="Size">minimumSize</property>
+ <property type="Size">maximumSize</property>
<property type="Size">sizeIncrement</property>
<property type="Size">baseSize</property>
<property type="Color">paletteForegroundColor</property>
@@ -820,8 +820,8 @@ Example: f(x)=x^2</string>
<property type="Bool">enabled</property>
<property type="Rect">tqgeometry</property>
<property type="SizePolicy">sizePolicy</property>
- <property type="Size">tqminimumSize</property>
- <property type="Size">tqmaximumSize</property>
+ <property type="Size">minimumSize</property>
+ <property type="Size">maximumSize</property>
<property type="Size">sizeIncrement</property>
<property type="Size">baseSize</property>
<property type="Color">paletteForegroundColor</property>
diff --git a/kmplot/kmplot/editintegralpage.ui b/kmplot/kmplot/editintegralpage.ui
index 694edf46..70c63f6a 100644
--- a/kmplot/kmplot/editintegralpage.ui
+++ b/kmplot/kmplot/editintegralpage.ui
@@ -229,7 +229,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>62</height>
diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp
index f9d84256..5eb17971 100644
--- a/kmplot/kmplot/kmplot.cpp
+++ b/kmplot/kmplot/kmplot.cpp
@@ -82,7 +82,7 @@ KmPlot::KmPlot( KCmdLineArgs* args)
}
if (!initialGeometrySet())
- resize( TQSize(450, 520).expandedTo(tqminimumSizeHint()));
+ resize( TQSize(450, 520).expandedTo(minimumSizeHint()));
// apply the saved mainwindow settings, if any, and ask the mainwindow
// to automatically save settings if changed: window size, toolbar
diff --git a/kmplot/kmplot/qconstanteditor.ui b/kmplot/kmplot/qconstanteditor.ui
index a367d809..215b4d65 100644
--- a/kmplot/kmplot/qconstanteditor.ui
+++ b/kmplot/kmplot/qconstanteditor.ui
@@ -133,7 +133,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>147</height>
diff --git a/kmplot/kmplot/qeditconstant.ui b/kmplot/kmplot/qeditconstant.ui
index 85e9236d..c368e865 100644
--- a/kmplot/kmplot/qeditconstant.ui
+++ b/kmplot/kmplot/qeditconstant.ui
@@ -67,7 +67,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>20</height>
diff --git a/kmplot/kmplot/qeditparametric.ui b/kmplot/kmplot/qeditparametric.ui
index 41fa84c4..5ac56e19 100644
--- a/kmplot/kmplot/qeditparametric.ui
+++ b/kmplot/kmplot/qeditparametric.ui
@@ -340,7 +340,7 @@ Example: sin(t)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kmplot/kmplot/qeditpolar.ui b/kmplot/kmplot/qeditpolar.ui
index e582734b..61624136 100644
--- a/kmplot/kmplot/qeditpolar.ui
+++ b/kmplot/kmplot/qeditpolar.ui
@@ -218,7 +218,7 @@ Example: loop(angle)=ln(angle)</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kmplot/kmplot/qparametereditor.ui b/kmplot/kmplot/qparametereditor.ui
index 18d7dce4..d87d1784 100644
--- a/kmplot/kmplot/qparametereditor.ui
+++ b/kmplot/kmplot/qparametereditor.ui
@@ -119,7 +119,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>80</height>
@@ -153,7 +153,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
diff --git a/kmplot/kmplot/settingspagecolor.ui b/kmplot/kmplot/settingspagecolor.ui
index ba35f0c5..8656b3e8 100644
--- a/kmplot/kmplot/settingspagecolor.ui
+++ b/kmplot/kmplot/settingspagecolor.ui
@@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -274,7 +274,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -428,7 +428,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kmplot/kmplot/settingspagecoords.ui b/kmplot/kmplot/settingspagecoords.ui
index 65d78d92..067deba2 100644
--- a/kmplot/kmplot/settingspagecoords.ui
+++ b/kmplot/kmplot/settingspagecoords.ui
@@ -544,7 +544,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
@@ -677,7 +677,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kmplot/kmplot/settingspagefonts.ui b/kmplot/kmplot/settingspagefonts.ui
index 7564d04a..3ed93a8f 100644
--- a/kmplot/kmplot/settingspagefonts.ui
+++ b/kmplot/kmplot/settingspagefonts.ui
@@ -26,7 +26,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>110</height>
diff --git a/kmplot/kmplot/settingspageprecision.ui b/kmplot/kmplot/settingspageprecision.ui
index 3ad5d990..7608a107 100644
--- a/kmplot/kmplot/settingspageprecision.ui
+++ b/kmplot/kmplot/settingspageprecision.ui
@@ -26,7 +26,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>29</height>
@@ -149,7 +149,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>20</height>
diff --git a/kmplot/kmplot/settingspagescaling.ui b/kmplot/kmplot/settingspagescaling.ui
index 3b0cd872..cac6a75b 100644
--- a/kmplot/kmplot/settingspagescaling.ui
+++ b/kmplot/kmplot/settingspagescaling.ui
@@ -396,7 +396,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>91</height>
diff --git a/kmplot/kmplot/sliderwindow.ui b/kmplot/kmplot/sliderwindow.ui
index c54384a2..18a27f17 100644
--- a/kmplot/kmplot/sliderwindow.ui
+++ b/kmplot/kmplot/sliderwindow.ui
@@ -23,7 +23,7 @@
<property name="name">
<cstring>slider</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -60,7 +60,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>45</width>
<height>0</height>
diff --git a/kpercentage/kpercentage/kanswer.cpp b/kpercentage/kpercentage/kanswer.cpp
index 51d5c8d5..538af052 100644
--- a/kpercentage/kpercentage/kanswer.cpp
+++ b/kpercentage/kpercentage/kanswer.cpp
@@ -63,7 +63,7 @@ KAnswer::KAnswer( TQWidget *parent ): KDialog( parent, "answer", TRUE )
TextLabelAnswer->setBackgroundOrigin( TQLabel::ParentOrigin );
TextLabelAnswer->setBackgroundPixmap( bgp );
- canvas->tqsetBackgroundPixmap( bgp );
+ canvas->setBackgroundPixmap( bgp );
canvas_view->setBackgroundOrigin( TQCanvasView::ParentOrigin );
canvas_view->setBackgroundPixmap( bgp );
diff --git a/kpercentage/kpercentage/kpercentmain.cpp b/kpercentage/kpercentage/kpercentmain.cpp
index d02b57fd..4cf2972f 100644
--- a/kpercentage/kpercentage/kpercentmain.cpp
+++ b/kpercentage/kpercentage/kpercentmain.cpp
@@ -55,15 +55,15 @@ KPercentMain::KPercentMain( TQWidget *parent, const char *name ) :
KIntValidator *validLine = new KIntValidator( this );
line_edit_percentage = new TQLineEdit( this, "line_edit_percentage" );
- line_edit_percentage->tqsetAlignment( int( TQLineEdit::AlignHCenter ) );
+ line_edit_percentage->setAlignment( int( TQLineEdit::AlignHCenter ) );
line_edit_percentage->setValidator( validLine );
line_edit_basevalue = new TQLineEdit( this, "line_edit_basevalue" );
- line_edit_basevalue->tqsetAlignment( int( TQLineEdit::AlignHCenter ) );
+ line_edit_basevalue->setAlignment( int( TQLineEdit::AlignHCenter ) );
line_edit_basevalue->setValidator( validLine );
line_edit_percentvalue = new TQLineEdit( this, "line_edit_percentvalue" );
- line_edit_percentvalue->tqsetAlignment( int( TQLineEdit::AlignHCenter ) );
+ line_edit_percentvalue->setAlignment( int( TQLineEdit::AlignHCenter ) );
line_edit_percentvalue->setValidator( validLine );
progress_bar_count = new TQProgressBar( this, "progress_bar_count" );
diff --git a/kpercentage/kpercentage/ksplashscreen.cpp b/kpercentage/kpercentage/ksplashscreen.cpp
index 226fa881..07c5b0d7 100644
--- a/kpercentage/kpercentage/ksplashscreen.cpp
+++ b/kpercentage/kpercentage/ksplashscreen.cpp
@@ -42,7 +42,7 @@ KSplashScreen::KSplashScreen( KPercentage *percentage, const char *name ) :
TQCanvas *canvas = new TQCanvas( TQT_TQOBJECT(this) );
canvas->resize( 400, 300 );
/* set the background pixmap */
- canvas->tqsetBackgroundPixmap( bgp );
+ canvas->setBackgroundPixmap( bgp );
//remove version number from splash annma 14/02/2005
//TQCanvasText *t = new TQCanvasText( KPERCENTAGE_VERSION, canvas );
//t->move( 330.0, 260.0 );
diff --git a/kstars/kstars/addcatdialog.cpp b/kstars/kstars/addcatdialog.cpp
index 86c2b6dd..22c35355 100644
--- a/kstars/kstars/addcatdialog.cpp
+++ b/kstars/kstars/addcatdialog.cpp
@@ -106,7 +106,7 @@ void AddCatDialog::slotHelp() {
* Position angle: floating-point value (position angle, in degrees)
*/
bool AddCatDialog::validateDataFile() {
- KStars *ksw = (KStars*) tqtopLevelWidget()->parent();
+ KStars *ksw = (KStars*) topLevelWidget()->parent();
//Create the catalog file contents: first the header
CatalogContents = writeCatalogHeader();
diff --git a/kstars/kstars/addcatdialogui.ui b/kstars/kstars/addcatdialogui.ui
index 30abaeb3..daa0ea0a 100644
--- a/kstars/kstars/addcatdialogui.ui
+++ b/kstars/kstars/addcatdialogui.ui
@@ -234,7 +234,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -308,7 +308,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/kstars/kstars/addlinkdialogui.ui b/kstars/kstars/addlinkdialogui.ui
index 89092759..290b2e35 100644
--- a/kstars/kstars/addlinkdialogui.ui
+++ b/kstars/kstars/addlinkdialogui.ui
@@ -86,7 +86,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>450</width>
<height>0</height>
@@ -113,7 +113,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -140,7 +140,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kstars/kstars/ccdpreviewui.ui b/kstars/kstars/ccdpreviewui.ui
index 4f4399f9..43a349d0 100644
--- a/kstars/kstars/ccdpreviewui.ui
+++ b/kstars/kstars/ccdpreviewui.ui
@@ -31,13 +31,13 @@
<property name="name">
<cstring>playB</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -57,13 +57,13 @@
<property name="name">
<cstring>captureB</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -97,7 +97,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>300</width>
<height>21</height>
@@ -118,7 +118,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>160</width>
<height>120</height>
@@ -351,7 +351,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
diff --git a/kstars/kstars/conbridlg.cpp b/kstars/kstars/conbridlg.cpp
index 4b57b431..ec9aa240 100644
--- a/kstars/kstars/conbridlg.cpp
+++ b/kstars/kstars/conbridlg.cpp
@@ -231,7 +231,7 @@ void ContrastBrightnessDlg::setBrightness(int brightnessValue)
}
-TQSize ContrastBrightnessDlg::tqsizeHint() const
+TQSize ContrastBrightnessDlg::sizeHint() const
{
return TQSize(400,130);
}
diff --git a/kstars/kstars/conbridlg.h b/kstars/kstars/conbridlg.h
index 1f9ce088..fb914b16 100644
--- a/kstars/kstars/conbridlg.h
+++ b/kstars/kstars/conbridlg.h
@@ -34,7 +34,7 @@ class ContrastBrightnessDlg : public KDialogBase {
ContrastBrightnessDlg(TQWidget *parent=0);
~ContrastBrightnessDlg();
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
void range(int min, int max, int & num);
void range(float min, float max, float & num);
diff --git a/kstars/kstars/details_data.ui b/kstars/kstars/details_data.ui
index e665d099..a5d9a9ba 100644
--- a/kstars/kstars/details_data.ui
+++ b/kstars/kstars/details_data.ui
@@ -180,7 +180,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>140</width>
<height>20</height>
@@ -199,7 +199,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -235,7 +235,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>77</width>
<height>20</height>
@@ -449,7 +449,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>8</height>
@@ -481,7 +481,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -532,7 +532,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -557,7 +557,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>8</height>
diff --git a/kstars/kstars/details_links.ui b/kstars/kstars/details_links.ui
index 352d4b5b..758a82d7 100644
--- a/kstars/kstars/details_links.ui
+++ b/kstars/kstars/details_links.ui
@@ -66,7 +66,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -163,7 +163,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/kstars/kstars/details_position.ui b/kstars/kstars/details_position.ui
index 940b16a2..439ce387 100644
--- a/kstars/kstars/details_position.ui
+++ b/kstars/kstars/details_position.ui
@@ -194,7 +194,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>90</width>
<height>16</height>
@@ -321,7 +321,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -405,7 +405,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>170</width>
<height>20</height>
@@ -487,7 +487,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -718,7 +718,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>83</width>
<height>20</height>
@@ -894,7 +894,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
diff --git a/kstars/kstars/devicemanager.cpp b/kstars/kstars/devicemanager.cpp
index a83cd5cc..bb6bf287 100644
--- a/kstars/kstars/devicemanager.cpp
+++ b/kstars/kstars/devicemanager.cpp
@@ -155,7 +155,7 @@ void DeviceManager::dataReceived()
sNotifier->disconnect();
close(serverFD);
parent->removeDeviceMgr(mgrID);
- KMessageBox::error(0, TQString::tqfromLatin1(errmsg));
+ KMessageBox::error(0, TQString::fromLatin1(errmsg));
return;
}
@@ -397,7 +397,7 @@ void DeviceManager::doMsg (XMLEle *msg, INDI_D *dp)
if (timestamp)
txt_w->insert(TQString(valuXMLAtt(timestamp)) + TQString(" "));
else
- txt_w->insert( KStarsDateTime::tqcurrentDateTime().toString("yyyy/mm/dd - h:m:s ap "));
+ txt_w->insert( KStarsDateTime::currentDateTime().toString("yyyy/mm/dd - h:m:s ap "));
/* finally! the msg */
message = findXMLAtt(msg, "message");
diff --git a/kstars/kstars/devmanager.ui b/kstars/kstars/devmanager.ui
index 4a7b5be8..56a0029a 100644
--- a/kstars/kstars/devmanager.ui
+++ b/kstars/kstars/devmanager.ui
@@ -51,7 +51,7 @@
</column>
<column>
<property name="text">
- <string>tqStatus</string>
+ <string>Status</string>
</property>
<property name="clickable">
<bool>true</bool>
@@ -104,7 +104,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>125</height>
@@ -126,7 +126,7 @@
<property name="name">
<cstring>serverLogText</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>90</height>
@@ -216,7 +216,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>20</height>
@@ -241,7 +241,7 @@
<widget class="KListView">
<column>
<property name="text">
- <string>tqStatus</string>
+ <string>Status</string>
</property>
<property name="clickable">
<bool>true</bool>
@@ -366,7 +366,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
@@ -396,7 +396,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>289</width>
<height>20</height>
diff --git a/kstars/kstars/finddialog.cpp b/kstars/kstars/finddialog.cpp
index c1aa5321..84dfe5c0 100644
--- a/kstars/kstars/finddialog.cpp
+++ b/kstars/kstars/finddialog.cpp
@@ -48,7 +48,7 @@ FindDialog::FindDialog( TQWidget* parent ) :
SearchBox = new TQLineEdit( page, "SearchBox" );
filterTypeLabel = new TQLabel( page, "filterTypeLabel" );
- filterTypeLabel->tqsetAlignment( AlignRight );
+ filterTypeLabel->setAlignment( AlignRight );
filterTypeLabel->setText( i18n( "Filter by type: " ) );
filterType = new TQComboBox( page, "filterType" );
diff --git a/kstars/kstars/fitsheaderdialog.ui b/kstars/kstars/fitsheaderdialog.ui
index d00c90ee..7903b000 100644
--- a/kstars/kstars/fitsheaderdialog.ui
+++ b/kstars/kstars/fitsheaderdialog.ui
@@ -82,7 +82,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>300</width>
<height>20</height>
diff --git a/kstars/kstars/focusdialog.cpp b/kstars/kstars/focusdialog.cpp
index 7b182225..8da163c2 100644
--- a/kstars/kstars/focusdialog.cpp
+++ b/kstars/kstars/focusdialog.cpp
@@ -152,7 +152,7 @@ long double FocusDialog::epochToJd (double epoch) {
}
-TQSize FocusDialog::tqsizeHint() const
+TQSize FocusDialog::sizeHint() const
{
return TQSize(240,210);
}
diff --git a/kstars/kstars/focusdialog.h b/kstars/kstars/focusdialog.h
index 20bf2428..e6707028 100644
--- a/kstars/kstars/focusdialog.h
+++ b/kstars/kstars/focusdialog.h
@@ -47,7 +47,7 @@ public:
SkyPoint* point() const { return Point; }
/**@return suggested size of focus window. */
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
/**@return whether user set the AltAz coords */
bool usedAltAz() const { return UsedAltAz; }
diff --git a/kstars/kstars/focusdialogdlg.ui b/kstars/kstars/focusdialogdlg.ui
index 4484e1be..12149e0c 100644
--- a/kstars/kstars/focusdialogdlg.ui
+++ b/kstars/kstars/focusdialogdlg.ui
@@ -138,7 +138,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -155,7 +155,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kstars/kstars/fovdialogui.ui b/kstars/kstars/fovdialogui.ui
index 31df9717..e75a1986 100644
--- a/kstars/kstars/fovdialogui.ui
+++ b/kstars/kstars/fovdialogui.ui
@@ -23,7 +23,7 @@
<property name="name">
<cstring>FOVListBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>160</width>
<height>0</height>
@@ -68,7 +68,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -113,7 +113,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -132,7 +132,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>80</width>
<height>80</height>
@@ -169,7 +169,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>60</height>
diff --git a/kstars/kstars/histdialog.ui b/kstars/kstars/histdialog.ui
index 2711b215..c01043bc 100644
--- a/kstars/kstars/histdialog.ui
+++ b/kstars/kstars/histdialog.ui
@@ -20,13 +20,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>640</width>
<height>325</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>640</width>
<height>325</height>
@@ -70,13 +70,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>500</width>
<height>150</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>500</width>
<height>150</height>
@@ -141,7 +141,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>130</width>
<height>20</height>
@@ -240,7 +240,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>270</width>
<height>20</height>
diff --git a/kstars/kstars/imagereductionui.ui b/kstars/kstars/imagereductionui.ui
index 6fd1a362..faa1e7ef 100644
--- a/kstars/kstars/imagereductionui.ui
+++ b/kstars/kstars/imagereductionui.ui
@@ -95,7 +95,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>20</height>
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
@@ -273,7 +273,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>20</height>
@@ -354,7 +354,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
@@ -441,7 +441,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>20</height>
@@ -522,7 +522,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
@@ -551,7 +551,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>210</width>
<height>20</height>
diff --git a/kstars/kstars/imagesequence.cpp b/kstars/kstars/imagesequence.cpp
index 73026e99..d33617bc 100644
--- a/kstars/kstars/imagesequence.cpp
+++ b/kstars/kstars/imagesequence.cpp
@@ -79,7 +79,7 @@ imagesequence::~imagesequence()
{
}
-bool imagesequence::updatetqStatus()
+bool imagesequence::updateStatus()
{
bool result;
diff --git a/kstars/kstars/imagesequence.h b/kstars/kstars/imagesequence.h
index 304b9ad3..d04bf0a0 100644
--- a/kstars/kstars/imagesequence.h
+++ b/kstars/kstars/imagesequence.h
@@ -28,7 +28,7 @@ public:
~imagesequence();
-bool updatetqStatus();
+bool updateStatus();
private:
KStars *ksw;
diff --git a/kstars/kstars/imgsequencedlgui.ui b/kstars/kstars/imgsequencedlgui.ui
index 14bb6a94..a3f57deb 100644
--- a/kstars/kstars/imgsequencedlgui.ui
+++ b/kstars/kstars/imgsequencedlgui.ui
@@ -64,7 +64,7 @@
<property name="name">
<cstring>currentImgCountOUT</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
@@ -89,7 +89,7 @@
<property name="name">
<cstring>fullImgCountOUT</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
@@ -141,7 +141,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -168,7 +168,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>270</width>
<height>20</height>
@@ -460,7 +460,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>81</height>
diff --git a/kstars/kstars/indi/apmount.cpp b/kstars/kstars/indi/apmount.cpp
index a9857df3..4edae7c4 100644
--- a/kstars/kstars/indi/apmount.cpp
+++ b/kstars/kstars/indi/apmount.cpp
@@ -729,7 +729,7 @@ void APMount::ISNewSwitch (const char *dev, const char *name, ISState *states, c
IUUpdateSwitches(&AlignmentSP, states, names, n);
index = getOnSwitch(&AlignmentSP);
- if ( ( err = tqsetAlignmentMode(index) < 0) )
+ if ( ( err = setAlignmentMode(index) < 0) )
{
handleError(&AlignmentSP, err, "Setting tqalignment");
return;
diff --git a/kstars/kstars/indi/apogee/ApnCamera.cpp b/kstars/kstars/indi/apogee/ApnCamera.cpp
index 431fe392..946c444c 100644
--- a/kstars/kstars/indi/apogee/ApnCamera.cpp
+++ b/kstars/kstars/indi/apogee/ApnCamera.cpp
@@ -45,7 +45,7 @@ bool CApnCamera::Expose( double Duration, bool Light )
unsigned short TotalVPixels;
- while ( read_ImagingtqStatus() != Apn_Status_Flushing )
+ while ( read_ImagingStatus() != Apn_Status_Flushing )
{
Sleep( 20 );
}
@@ -296,7 +296,7 @@ unsigned short CApnCamera::GetExposurePixelsV()
double CApnCamera::read_InputVoltage()
{
- UpdateGeneraltqStatus();
+ UpdateGeneralStatus();
return m_pvtInputVoltage;
}
@@ -329,7 +329,7 @@ unsigned short CApnCamera::read_FirmwareVersion()
bool CApnCamera::read_ShutterState()
{
- UpdateGeneraltqStatus();
+ UpdateGeneralStatus();
return m_pvtShutterState;
}
@@ -559,15 +559,15 @@ void CApnCamera::write_DataBits( Apn_Resolution BitResolution )
}
}
-Apn_tqStatus CApnCamera::read_ImagingtqStatus()
+Apn_Status CApnCamera::read_ImagingStatus()
{
bool Exposing, Active, Done, Flushing, WaitOnTrigger;
bool DataHalted, RamError;
- UpdateGeneraltqStatus();
+ UpdateGeneralStatus();
- // Update the ImagingtqStatus
+ // Update the ImagingStatus
Exposing = false;
Active = false;
Done = false;
@@ -599,42 +599,42 @@ Apn_tqStatus CApnCamera::read_ImagingtqStatus()
if ( RamError )
{
- m_pvtImagingtqStatus = Apn_Status_PatternError;
+ m_pvtImagingStatus = Apn_Status_PatternError;
}
else
{
if ( DataHalted )
{
- m_pvtImagingtqStatus = Apn_Status_DataError;
+ m_pvtImagingStatus = Apn_Status_DataError;
}
else
{
if ( WaitOnTrigger )
{
- m_pvtImagingtqStatus = Apn_Status_WaitingOnTrigger;
+ m_pvtImagingStatus = Apn_Status_WaitingOnTrigger;
}
else
{
if ( Done && m_pvtImageInProgress )
{
m_pvtImageReady = true;
- m_pvtImagingtqStatus = Apn_Status_ImageReady;
+ m_pvtImagingStatus = Apn_Status_ImageReady;
}
else
{
if ( Active )
{
if ( Exposing )
- m_pvtImagingtqStatus = Apn_Status_Exposing;
+ m_pvtImagingStatus = Apn_Status_Exposing;
else
- m_pvtImagingtqStatus = Apn_Status_ImagingActive;
+ m_pvtImagingStatus = Apn_Status_ImagingActive;
}
else
{
if ( Flushing )
- m_pvtImagingtqStatus = Apn_Status_Flushing;
+ m_pvtImagingStatus = Apn_Status_Flushing;
else
- m_pvtImagingtqStatus = Apn_Status_Idle;
+ m_pvtImagingStatus = Apn_Status_Idle;
}
}
}
@@ -642,7 +642,7 @@ Apn_tqStatus CApnCamera::read_ImagingtqStatus()
}
/*
- switch( m_pvtImagingtqStatus )
+ switch( m_pvtImagingStatus )
{
case Apn_Status_DataError:
OutputDebugString( "ImagingStatus: Apn_Status_DataError" );
@@ -674,7 +674,7 @@ Apn_tqStatus CApnCamera::read_ImagingtqStatus()
}
*/
- return m_pvtImagingtqStatus;
+ return m_pvtImagingStatus;
}
Apn_LedMode CApnCamera::read_LedMode()
@@ -763,16 +763,16 @@ void CApnCamera::write_CoolerEnable( bool CoolerEnable )
m_pvtCoolerEnable = CoolerEnable;
}
-Apn_CoolertqStatus CApnCamera::read_CoolertqStatus()
+Apn_CoolerStatus CApnCamera::read_CoolerStatus()
{
bool CoolerAtTemp;
bool CoolerActive;
bool CoolerTempRevised;
- UpdateGeneraltqStatus();
+ UpdateGeneralStatus();
- // Update CoolertqStatus
+ // Update CoolerStatus
CoolerActive = false;
CoolerAtTemp = false;
CoolerTempRevised = false;
@@ -789,25 +789,25 @@ Apn_CoolertqStatus CApnCamera::read_CoolertqStatus()
// Now derive our cooler state
if ( !CoolerActive )
{
- m_pvtCoolertqStatus = Apn_CoolerStatus_Off;
+ m_pvtCoolerStatus = Apn_CoolerStatus_Off;
}
else
{
if ( CoolerTempRevised )
{
- m_pvtCoolertqStatus = Apn_CoolerStatus_Revision;
+ m_pvtCoolerStatus = Apn_CoolerStatus_Revision;
}
else
{
if ( CoolerAtTemp )
- m_pvtCoolertqStatus = Apn_CoolerStatus_AtSetPoint;
+ m_pvtCoolerStatus = Apn_CoolerStatus_AtSetPoint;
else
- m_pvtCoolertqStatus = Apn_CoolerStatus_RampingToSetPoint;
+ m_pvtCoolerStatus = Apn_CoolerStatus_RampingToSetPoint;
}
}
- return m_pvtCoolertqStatus;
+ return m_pvtCoolerStatus;
}
double CApnCamera::read_CoolerSetPoint()
@@ -874,14 +874,14 @@ void CApnCamera::write_CoolerBackoffPoint( double BackoffPoint )
double CApnCamera::read_CoolerDrive()
{
- UpdateGeneraltqStatus();
+ UpdateGeneralStatus();
return m_pvtCoolerDrive;
}
double CApnCamera::read_TempCCD()
{
- // UpdateGeneraltqStatus();
+ // UpdateGeneralStatus();
unsigned short TempReg;
unsigned short TempAvg;
@@ -910,7 +910,7 @@ double CApnCamera::read_TempCCD()
double CApnCamera::read_TempHeatsink()
{
- // UpdateGeneraltqStatus();
+ // UpdateGeneralStatus();
unsigned short TempReg;
unsigned short TempAvg;
@@ -1782,8 +1782,8 @@ long CApnCamera::InitDefaults()
Write( FPGA_REG_TEMP_RAMP_DOWN_A, m_ApnSensorInfo->m_TempRampRateOne );
Write( FPGA_REG_TEMP_RAMP_DOWN_B, m_ApnSensorInfo->m_TempRampRateTwo );
// the collor code not only determines the m_pvtCoolerEnable state, but
- // also implicitly calls UpdateGeneraltqStatus() as part of read_CoolertqStatus()
- if ( read_CoolertqStatus() == Apn_CoolerStatus_Off )
+ // also implicitly calls UpdateGeneralStatus() as part of read_CoolerStatus()
+ if ( read_CoolerStatus() == Apn_CoolerStatus_Off )
m_pvtCoolerEnable = false;
else
m_pvtCoolerEnable = true;
@@ -1827,7 +1827,7 @@ long CApnCamera::WriteTwelveBitOffset()
return 0;
}
-void CApnCamera::UpdateGeneraltqStatus()
+void CApnCamera::UpdateGeneralStatus()
{
unsigned short StatusReg;
unsigned short HeatsinkTempReg;
diff --git a/kstars/kstars/indi/apogee/ApnCamera.h b/kstars/kstars/indi/apogee/ApnCamera.h
index 90f49ff2..b0e6af03 100644
--- a/kstars/kstars/indi/apogee/ApnCamera.h
+++ b/kstars/kstars/indi/apogee/ApnCamera.h
@@ -129,7 +129,7 @@ public:
void write_DataBits( Apn_Resolution BitResolution );
- Apn_tqStatus read_ImagingtqStatus();
+ Apn_Status read_ImagingStatus();
Apn_LedMode read_LedMode();
void write_LedMode( Apn_LedMode LedMode );
@@ -138,7 +138,7 @@ public:
bool read_CoolerEnable();
void write_CoolerEnable( bool CoolerEnable );
- Apn_CoolertqStatus read_CoolertqStatus();
+ Apn_CoolerStatus read_CoolerStatus();
double read_CoolerSetPoint();
void write_CoolerSetPoint( double SetPoint );
double read_CoolerBackoffPoint();
@@ -231,7 +231,7 @@ public:
long InitTwelveBitAD();
long WriteTwelveBitOffset();
- void UpdateGeneraltqStatus();
+ void UpdateGeneralStatus();
// Internal private variables
bool m_ResetVerticalArrays;
@@ -264,8 +264,8 @@ public:
double m_pvtCoolerBackoffPoint;
- Apn_CoolertqStatus m_pvtCoolertqStatus;
- Apn_tqStatus m_pvtImagingtqStatus;
+ Apn_CoolerStatus m_pvtCoolerStatus;
+ Apn_Status m_pvtImagingStatus;
bool m_pvtShutterState;
bool m_pvtImageInProgress;
bool m_pvtImageReady;
diff --git a/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp b/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp
index 095dcf0a..cce9ba37 100644
--- a/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp
+++ b/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp
@@ -16,14 +16,14 @@ bool CApnCamera::read_Present()
{
// OutputDebugString( "read_Present()" );
- USHORT AptqStatus;
+ USHORT ApStatus;
USHORT DatumA;
USHORT DatumB;
char szMsg[80];
DatumA = 0x0;
DatumB = 0x0;
- AptqStatus = 0;
+ ApStatus = 0;
Write( FPGA_REG_SCRATCH, 0x8086 );
Read( FPGA_REG_SCRATCH, DatumA );
diff --git a/kstars/kstars/indi/apogee/ApnCamera_NET.cpp b/kstars/kstars/indi/apogee/ApnCamera_NET.cpp
index 9113ae8f..0f739121 100644
--- a/kstars/kstars/indi/apogee/ApnCamera_NET.cpp
+++ b/kstars/kstars/indi/apogee/ApnCamera_NET.cpp
@@ -92,7 +92,7 @@ bool CApnCamera::GetImageData( unsigned short *pImageBuffer,
while ( !ImageReady() )
{
Sleep( 50 );
- read_ImagingtqStatus();
+ read_ImagingStatus();
}
Width = m_pvtWidth;
diff --git a/kstars/kstars/indi/apogee/ApnCamera_USB.cpp b/kstars/kstars/indi/apogee/ApnCamera_USB.cpp
index 1661d028..a6bbad42 100644
--- a/kstars/kstars/indi/apogee/ApnCamera_USB.cpp
+++ b/kstars/kstars/indi/apogee/ApnCamera_USB.cpp
@@ -76,7 +76,7 @@ bool CApnCamera::GetImageData( unsigned short *pImageBuffer,
while ( !ImageReady() )
{
Sleep( 50 );
- read_ImagingtqStatus();
+ read_ImagingStatus();
}
Width = m_pvtWidth;
@@ -161,7 +161,7 @@ long CApnCamera::PostStopExposure( bool DigitizeData )
while ( !ImageReady() )
{
Sleep( 50 );
- read_ImagingtqStatus();
+ read_ImagingStatus();
}
pRequestData = new USHORT[m_pvtWidth*m_pvtHeight];
diff --git a/kstars/kstars/indi/apogee/Apogee.h b/kstars/kstars/indi/apogee/Apogee.h
index 70c1c359..d97740b2 100644
--- a/kstars/kstars/indi/apogee/Apogee.h
+++ b/kstars/kstars/indi/apogee/Apogee.h
@@ -29,7 +29,7 @@
#define Apn_CameraMode_ExternalTrigger 3
#define Apn_CameraMode_ExternalShutter 4
-#define Apn_tqStatus int
+#define Apn_Status int
#define Apn_Status_DataError -2
#define Apn_Status_PatternError -1
#define Apn_Status_Idle 0
@@ -54,7 +54,7 @@
#define Apn_LedState_ExtStartReadout 6
#define Apn_LedState_AtTemp 7
-#define Apn_CoolertqStatus int
+#define Apn_CoolerStatus int
#define Apn_CoolerStatus_Off 0
#define Apn_CoolerStatus_RampingToSetPoint 1
#define Apn_CoolerStatus_AtSetPoint 2
@@ -67,7 +67,7 @@
#define Apn_FanMode_High 3
-#define Camera_tqStatus int
+#define Camera_Status int
#define Camera_Status_Idle 0
#define Camera_Status_Waiting 1
#define Camera_Status_Exposing 2
@@ -76,7 +76,7 @@
#define Camera_Status_ImageReady 5
#define Camera_Status_Flushing 6
-#define Camera_CoolertqStatus int
+#define Camera_CoolerStatus int
#define Camera_CoolerStatus_Off 0
#define Camera_CoolerStatus_RampingToSetPoint 1
#define Camera_CoolerStatus_Correcting 2
diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp
index 0481ecfc..45c16e13 100644
--- a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp
+++ b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp
@@ -56,8 +56,8 @@ CCameraIO::CCameraIO()
m_WaitingforLine = false;
m_WaitingforTrigger = false;
- m_tqStatus = Camera_Status_Idle;
- m_CoolertqStatus = Camera_CoolerStatus_Off;
+ m_Status = Camera_Status_Idle;
+ m_CoolerStatus = Camera_CoolerStatus_Off;
m_ExposureBinX = 0;
m_ExposureBinY = 0;
@@ -240,7 +240,7 @@ bool CCameraIO::FilterHome()
// Check for strobe
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( val & RegBit_GotTrigger )
{
// Cycle all the way around if it's on the first time
@@ -268,13 +268,13 @@ bool CCameraIO::FilterHome()
Sleep ( STEP_DELAY );
val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( val & RegBit_GotTrigger )
{
Sleep ( 10 );
val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( val & RegBit_GotTrigger )
{
// Restore normal priority
@@ -502,12 +502,12 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize
int i;
unsigned short BIC = m_ExposureBIC + m_ExposureStartX;
- // Update internal variables in case application did not poll read_tqStatus
+ // Update internal variables in case application did not poll read_Status
m_WaitingforTrigger = false;
m_WaitingforLine = false;
if ( m_WaitingforImage )
- { // In case application did not poll read_tqStatus
+ { // In case application did not poll read_Status
m_WaitingforImage = false;
/////////////////////////////////////
@@ -516,7 +516,7 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_FrameDone ) != 0 ) break;
if ( clock() > StopTime ) return false; // Timed out
@@ -553,7 +553,7 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_LineDone ) != 0 ) break; // Line done
if ( clock() > StopTime )
@@ -679,7 +679,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize )
int i;
if ( m_WaitingforLine )
- { // In case application did not poll read_tqStatus
+ { // In case application did not poll read_Status
m_WaitingforLine = false;
/////////////////////////////////////
@@ -688,7 +688,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize )
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_LineDone ) != 0 ) break; // Line done
if ( clock() > StopTime )
@@ -763,10 +763,10 @@ bool CCameraIO::Snap( double Duration, bool Light, unsigned short* pImageData, s
if ( m_WaitingforTrigger )
{
- Camera_tqStatus stat;
+ Camera_Status stat;
while ( true )
{ // This will wait forever if no trigger happens
- stat = read_tqStatus();
+ stat = read_Status();
if ( stat == Camera_Status_Exposing ) break;
Sleep( 220 ); // dont bog down the CPU while polling
}
@@ -778,7 +778,7 @@ bool CCameraIO::Snap( double Duration, bool Light, unsigned short* pImageData, s
clock_t StopTime = clock() + long( ( 1.2 * Duration + m_Timeout ) * CLOCKS_PER_SEC );
while ( true )
{
- Camera_tqStatus stat = read_tqStatus();
+ Camera_Status stat = read_Status();
if ( stat == Camera_Status_ImageReady ) break;
if ( clock() > StopTime ) return false; // Timed out, no image available
@@ -791,43 +791,43 @@ bool CCameraIO::Snap( double Duration, bool Light, unsigned short* pImageData, s
////////////////////////////////////////////////////////////
// Camera Settings
-Camera_tqStatus CCameraIO::read_tqStatus()
+Camera_Status CCameraIO::read_Status()
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( val & RegBit_Exposing ) //11.0
{
ATLTRACE( "Exposing\r\n" );
m_WaitingforTrigger = false;
- m_tqStatus = Camera_Status_Exposing;
+ m_Status = Camera_Status_Exposing;
}
else if ( m_WaitingforTrigger )
- m_tqStatus = Camera_Status_Waiting;
+ m_Status = Camera_Status_Waiting;
else if ( m_WaitingforImage && ( val & RegBit_FrameDone ) ) //11.11
{
ATLTRACE( "ImageReady\r\n" );
m_WaitingforImage = false;
- m_tqStatus = Camera_Status_ImageReady;
+ m_Status = Camera_Status_ImageReady;
}
else if ( m_WaitingforLine && ( val & RegBit_LineDone ) ) //11.1
{
ATLTRACE( "LineReady\r\n" );
m_WaitingforLine = false;
- m_tqStatus = Camera_Status_LineReady;
+ m_Status = Camera_Status_LineReady;
}
else if ( m_WaitingforImage || m_WaitingforLine )
{
ATLTRACE( "Flushing\r\n" );
- m_tqStatus = Camera_Status_Flushing;
+ m_Status = Camera_Status_Flushing;
}
else
- m_tqStatus = Camera_Status_Idle;
+ m_Status = Camera_Status_Idle;
- return m_tqStatus;
+ return m_Status;
}
bool CCameraIO::read_Present()
@@ -839,13 +839,13 @@ bool CCameraIO::read_Present()
bool FailedLoopback = false;
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( !( val & RegBit_LoopbackTest ) ) FailedLoopback = true;
m_RegShadow[ Reg_BICCounter ] &= ~RegBit_LoopbackTest; // clear bit to 0
Write( Reg_BICCounter, m_RegShadow[ Reg_BICCounter ] );
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( val & RegBit_LoopbackTest ) FailedLoopback = true;
*/
@@ -884,7 +884,7 @@ bool CCameraIO::read_Present()
bool CCameraIO::read_Shutter()
{
unsigned short regval = 0;
- Read( Reg_tqStatus, regval );
+ Read( Reg_Status, regval );
if ( !( regval & RegBit_Exposing ) )
{ // We are not exposing, but might have finnshed an exposure
// and have not called GetImage yet, so update our internal variable
@@ -917,7 +917,7 @@ void CCameraIO::write_ForceShutterOpen( bool val )
m_RegShadow[ Reg_Command ] &= ~RegBit_ShutterOverride; // clear bit to 0
unsigned short regval = 0;
- Read( Reg_tqStatus, regval );
+ Read( Reg_Status, regval );
if ( ( regval & RegBit_Exposing ) )
{
// Shutter will remain open if a Light frame is being taken
@@ -1076,7 +1076,7 @@ void CCameraIO::write_CoolerSetPoint( double val )
Write( Reg_TempSetPoint, m_RegShadow[ Reg_TempSetPoint ] );
}
-Camera_CoolertqStatus CCameraIO::read_CoolertqStatus()
+Camera_CoolerStatus CCameraIO::read_CoolerStatus()
{
unsigned short val = 0;
Read( Reg_CommandReadback, val );
@@ -1084,34 +1084,34 @@ Camera_CoolertqStatus CCameraIO::read_CoolertqStatus()
if ( val & RegBit_CoolerEnable ) //12.15
{
unsigned short val2 = 0;
- Read( Reg_tqStatus, val2 );
+ Read( Reg_Status, val2 );
if ( val & RegBit_CoolerShutdown ) //12.8
{
if ( val2 & RegBit_ShutdownComplete ) //11.6
- m_CoolertqStatus = Camera_CoolerStatus_AtAmbient;
+ m_CoolerStatus = Camera_CoolerStatus_AtAmbient;
else
- m_CoolertqStatus = Camera_CoolerStatus_RampingToAmbient;
+ m_CoolerStatus = Camera_CoolerStatus_RampingToAmbient;
}
else
{
if ( val2 & RegBit_TempAtMax ) //11.5
- m_CoolertqStatus = Camera_CoolerStatus_AtMax;
+ m_CoolerStatus = Camera_CoolerStatus_AtMax;
else if ( val2 & RegBit_TempAtMin ) //11.4
- m_CoolertqStatus = Camera_CoolerStatus_AtMin;
+ m_CoolerStatus = Camera_CoolerStatus_AtMin;
else if ( val2 & RegBit_TempAtSetPoint ) //11.7
- m_CoolertqStatus = Camera_CoolerStatus_AtSetPoint;
+ m_CoolerStatus = Camera_CoolerStatus_AtSetPoint;
// Check against last known cooler status
- else if ( m_CoolertqStatus == Camera_CoolerStatus_AtSetPoint )
- m_CoolertqStatus = Camera_CoolerStatus_Correcting;
+ else if ( m_CoolerStatus == Camera_CoolerStatus_AtSetPoint )
+ m_CoolerStatus = Camera_CoolerStatus_Correcting;
else
- m_CoolertqStatus = Camera_CoolerStatus_RampingToSetPoint;
+ m_CoolerStatus = Camera_CoolerStatus_RampingToSetPoint;
}
}
else
- m_CoolertqStatus = Camera_CoolerStatus_Off;
+ m_CoolerStatus = Camera_CoolerStatus_Off;
- return m_CoolertqStatus;
+ return m_CoolerStatus;
}
Camera_CoolerMode CCameraIO::read_CoolerMode()
@@ -1319,7 +1319,7 @@ void CCameraIO::Flush( short Rows )
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_FrameDone ) != 0 ) break;
if ( clock() > StopTime ) break; // Timed out
diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.h b/kstars/kstars/indi/apogee/CameraIO_Linux.h
index e614aee1..e61ad838 100644
--- a/kstars/kstars/indi/apogee/CameraIO_Linux.h
+++ b/kstars/kstars/indi/apogee/CameraIO_Linux.h
@@ -104,8 +104,8 @@ const long Reg_TempData = 9; // Register 10
const unsigned short RegBitShift_TempData = 0; // Bit 0
const unsigned short RegBitMask_TempData = 0xFF; // 8 bits
-const long RegISA_tqStatus = 0x006; // Register 11 in firmware
-const long Reg_tqStatus = 10; // Register 11
+const long RegISA_Status = 0x006; // Register 11 in firmware
+const long Reg_Status = 10; // Register 11
const unsigned short RegBit_Exposing = 0x1; // Bit 0
const unsigned short RegBit_LineDone = 0x2; // Bit 1
const unsigned short RegBit_CacheReadOK = 0x4; // Bit 2
@@ -139,7 +139,7 @@ const long RegPCI_BICCounter = 0x01C; // Register 8 in PCI fir
const long RegPCI_BICCounterRead = 0x03C;
const long RegPCI_ImageData = 0x000; // Register 9 in PCI firmware
const long RegPCI_TempData = 0x004; // Register 10 in PCI firmware
-const long RegPCI_tqStatus = 0x00C; // Register 11 in firmware
+const long RegPCI_Status = 0x00C; // Register 11 in firmware
const long RegPCI_CommandReadback = 0x010; // Register 12 in PCI firmware
@@ -161,7 +161,7 @@ public:
////////////////////////////////////////////////////////////
// Camera Settings
- Camera_tqStatus read_tqStatus(); // Current camera state
+ Camera_Status read_Status(); // Current camera state
// <0: error codes
// 0: idle
// 1: flushing
@@ -223,7 +223,7 @@ public:
double read_CoolerSetPoint(); // Returns/sets setpoint temperature in degrees
void write_CoolerSetPoint( double val ); // Celcius.
- Camera_CoolertqStatus read_CoolertqStatus(); // Returns current cooler status
+ Camera_CoolerStatus read_CoolerStatus(); // Returns current cooler status
Camera_CoolerMode read_CoolerMode(); // Returns/sets current cooler operation mode.
void write_CoolerMode( Camera_CoolerMode val );
@@ -300,7 +300,7 @@ public:
// The Duration parameter is the exposure time in seconds. The Light parameter controls
// the status of the shutter during the exposure, Light = True opens the shutter, Light
- // = False closes the shutter. Returns immediately after invocation, poll the CameratqStatus
+ // = False closes the shutter. Returns immediately after invocation, poll the CameraStatus
// property to determine the start time of a triggered exposure and the end of an exposure.
bool Expose( double Duration, bool Light );
@@ -314,7 +314,7 @@ public:
// Drift scan methods
// Begins clocking and digitization of a single line of data begining with a vertical clock
- // sequence and ending with a buffer full of line data. Poll the CameratqStatus property to
+ // sequence and ending with a buffer full of line data. Poll the CameraStatus property to
// determine when the data is ready for download.
bool DigitizeLine();
@@ -346,7 +346,7 @@ public:
short m_FilterStepPos; // Current filter position in our internal array
bool m_Shutter; // Last known shutter state
- Camera_tqStatus m_tqStatus; // Last known camera status
+ Camera_Status m_Status; // Last known camera status
Camera_Interface m_Interface; // String acronyms may be used in INI file.
// 0 or ISA: Industry Standard Architecture bus
@@ -356,7 +356,7 @@ public:
Camera_SensorType m_SensorType; // 0 or CCD: Charge Coupled Device
// 1 or CMOS: Complementary Metal-Oxide-Silicon
- Camera_CoolertqStatus m_CoolertqStatus; // Last known cooler status.
+ Camera_CoolerStatus m_CoolerStatus; // Last known cooler status.
unsigned int m_IRTQMask; // Set of IRQs masked on user request // 0: Off
// 1: Ramping to set point
// 2: Correcting
diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp
index bbff2080..16a6bb72 100644
--- a/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp
+++ b/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp
@@ -145,8 +145,8 @@ long CCameraIO::Read( unsigned short reg, unsigned short& val )
case Reg_TempData:
realreg = RegISA_TempData;
break;
- case Reg_tqStatus:
- realreg = RegISA_tqStatus;
+ case Reg_Status:
+ realreg = RegISA_Status;
break;
case Reg_CommandReadback:
realreg = RegISA_CommandReadback;
@@ -212,7 +212,7 @@ long CCameraIO::ReadLine( long SkipPixels, long Pixels,unsigned short* pLineBuff
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done
if ( clock() > StopTime ) return 1; // Timed out
@@ -301,7 +301,7 @@ long CCameraIO::InternalReadLine( bool KeepData, long SkipC, long XEnd, unsigned
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done
clock_t CurrentTime = clock();
diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp
index 15c139dd..a83a594e 100644
--- a/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp
+++ b/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp
@@ -199,8 +199,8 @@ long CCameraIO::Read( unsigned short reg, unsigned short& val )
case Reg_TempData:
RegNumber = RegPCI_TempData;
break;
- case Reg_tqStatus:
- RegNumber = RegPCI_tqStatus;
+ case Reg_Status:
+ RegNumber = RegPCI_Status;
break;
case Reg_CommandReadback:
RegNumber = RegPCI_CommandReadback;
@@ -266,7 +266,7 @@ long CCameraIO::ReadLine( long SkipPixels, long Pixels,unsigned short* pLineBuff
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done
if ( clock() > StopTime ) return 1; // Timed out
@@ -355,7 +355,7 @@ long CCameraIO::InternalReadLine( bool KeepData, long SkipC, long XEnd, unsigned
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done
clock_t CurrentTime = clock();
diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp
index bb143e55..7025d9ce 100644
--- a/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp
+++ b/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp
@@ -147,8 +147,8 @@ long CCameraIO::Read( unsigned short reg, unsigned short& val )
case Reg_TempData:
realreg = RegISA_TempData;
break;
- case Reg_tqStatus:
- realreg = RegISA_tqStatus;
+ case Reg_Status:
+ realreg = RegISA_Status;
break;
case Reg_CommandReadback:
realreg = RegISA_CommandReadback;
@@ -216,7 +216,7 @@ long CCameraIO::ReadLine( long SkipPixels, long Pixels,unsigned short* pLineBuff
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done
if ( clock() > StopTime ) return 1; // Timed out
@@ -307,7 +307,7 @@ long CCameraIO::InternalReadLine( bool KeepData, long SkipC, long XEnd, unsigned
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done
clock_t CurrentTime = clock();
diff --git a/kstars/kstars/indi/apogee/CameraIO_PCI.cpp b/kstars/kstars/indi/apogee/CameraIO_PCI.cpp
index ba9ce96d..3e6cc43e 100644
--- a/kstars/kstars/indi/apogee/CameraIO_PCI.cpp
+++ b/kstars/kstars/indi/apogee/CameraIO_PCI.cpp
@@ -65,8 +65,8 @@ long CCameraIO_PCI::Read(unsigned short reg, unsigned short& val)
case Reg_TempData:
RegNumber = RegPCI_TempData;
break;
- case Reg_tqStatus:
- RegNumber = RegPCI_tqStatus;
+ case Reg_Status:
+ RegNumber = RegPCI_Status;
break;
case Reg_CommandReadback:
RegNumber = RegPCI_CommandReadback;
@@ -268,7 +268,7 @@ long CCameraIO_PCI::ReadLine( long SkipPixels, long Pixels, unsigned short* pLin
while ( true )
{
unsigned short val = 0;
- Read( Reg_tqStatus, val );
+ Read( Reg_Status, val );
if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done
if ( clock() > StopTime ) return 1; // Timed out
diff --git a/kstars/kstars/indi/apogee_ppi.cpp b/kstars/kstars/indi/apogee_ppi.cpp
index e6edfbbb..38c909b2 100644
--- a/kstars/kstars/indi/apogee_ppi.cpp
+++ b/kstars/kstars/indi/apogee_ppi.cpp
@@ -393,7 +393,7 @@ void ApogeeCam::ISNewNumber (const char */*dev*/, const char *name, double value
void ApogeeCam::ISPoll()
{
static int mtc=5;
- int readtqStatus=0;
+ int readStatus=0;
double ccdTemp;
if (!isCCDConnected())
@@ -407,16 +407,16 @@ void ApogeeCam::ISPoll()
case IPS_BUSY:
- readtqStatus = cam->read_tqStatus();
- if (readtqStatus < 0)
+ readStatus = cam->read_Status();
+ if (readStatus < 0)
{
- IDLog("Error in exposure! Read status: %d\n", readtqStatus);
+ IDLog("Error in exposure! Read status: %d\n", readStatus);
ExposeTimeNP.s = IPS_ALERT;
ExposeTimeN[0].value = 0;
- IDSetNumber(&ExposeTimeNP, "Error in exposure procedure. Read states: %d", readtqStatus);
+ IDSetNumber(&ExposeTimeNP, "Error in exposure procedure. Read states: %d", readStatus);
return;
}
- else if (readtqStatus == Camera_Status_ImageReady)
+ else if (readStatus == Camera_Status_ImageReady)
{
ExposeTimeN[0].value = 0;
ExposeTimeNP.s = IPS_OK;
diff --git a/kstars/kstars/indi/fli/libfli.c b/kstars/kstars/indi/fli/libfli.c
index f089403c..701115b2 100644
--- a/kstars/kstars/indi/fli/libfli.c
+++ b/kstars/kstars/indi/fli/libfli.c
@@ -489,7 +489,7 @@ LIBFLIAPI FLIGetVisibleArea(flidev_t dev, long* ul_x, long* ul_y,
@see FLIExposeFrame
@see FLICancelExposure
- @see FLIGetExposuretqStatus
+ @see FLIGetExposureStatus
*/
LIBFLIAPI FLISetExposureTime(flidev_t dev, long exptime)
{
@@ -626,7 +626,7 @@ LIBFLIAPI FLISetFrameType(flidev_t dev, fliframe_t frametype)
@return Non-zero on failure.
@see FLIExposeFrame
- @see FLIGetExposuretqStatus
+ @see FLIGetExposureStatus
@see FLISetExposureTime
*/
LIBFLIAPI FLICancelExposure(flidev_t dev)
@@ -652,7 +652,7 @@ LIBFLIAPI FLICancelExposure(flidev_t dev)
@see FLICancelExposure
@see FLISetExposureTime
*/
-LIBFLIAPI FLIGetExposuretqStatus(flidev_t dev, long *timeleft)
+LIBFLIAPI FLIGetExposureStatus(flidev_t dev, long *timeleft)
{
CHKDEVICE(dev);
@@ -752,7 +752,7 @@ LIBFLIAPI FLIGrabRow(flidev_t dev, void *buff, size_t width)
@see FLISetBitDepth
@see FLIGrabFrame
@see FLICancelExposure
- @see FLIGetExposuretqStatus
+ @see FLIGetExposureStatus
*/
LIBFLIAPI FLIExposeFrame(flidev_t dev)
{
diff --git a/kstars/kstars/indi/fli/libfli.h b/kstars/kstars/indi/fli/libfli.h
index ca6a7200..351a9e8e 100644
--- a/kstars/kstars/indi/fli/libfli.h
+++ b/kstars/kstars/indi/fli/libfli.h
@@ -176,7 +176,7 @@ LIBFLIAPI FLISetHBin(flidev_t dev, long hbin);
LIBFLIAPI FLISetVBin(flidev_t dev, long vbin);
LIBFLIAPI FLISetFrameType(flidev_t dev, fliframe_t frametype);
LIBFLIAPI FLICancelExposure(flidev_t dev);
-LIBFLIAPI FLIGetExposuretqStatus(flidev_t dev, long *timeleft);
+LIBFLIAPI FLIGetExposureStatus(flidev_t dev, long *timeleft);
LIBFLIAPI FLISetTemperature(flidev_t dev, double temperature);
LIBFLIAPI FLIGetTemperature(flidev_t dev, double *temperature);
LIBFLIAPI FLIGrabRow(flidev_t dev, void *buff, size_t width);
diff --git a/kstars/kstars/indi/fli_ccd.c b/kstars/kstars/indi/fli_ccd.c
index eaa356a1..70a1aceb 100644
--- a/kstars/kstars/indi/fli_ccd.c
+++ b/kstars/kstars/indi/fli_ccd.c
@@ -610,7 +610,7 @@ void ISPoll(void *p)
break;
case IPS_BUSY:
- if ( (err = FLIGetExposuretqStatus(fli_dev, &timeleft)))
+ if ( (err = FLIGetExposureStatus(fli_dev, &timeleft)))
{
ExposeTimeNP.s = IPS_IDLE;
ExposeTimeN[0].value = 0;
diff --git a/kstars/kstars/indi/lx200_16.cpp b/kstars/kstars/indi/lx200_16.cpp
index a376b0d9..fe37df18 100644
--- a/kstars/kstars/indi/lx200_16.cpp
+++ b/kstars/kstars/indi/lx200_16.cpp
@@ -304,7 +304,7 @@ void LX200_16::handleAltAzSlew()
case IPS_BUSY:
- if ( (err = getHomeSearchtqStatus(&searchResult)) < 0)
+ if ( (err = getHomeSearchStatus(&searchResult)) < 0)
{
handleError(&HomeSearchSw, err, "Home search");
return;
diff --git a/kstars/kstars/indi/lx200driver.c b/kstars/kstars/indi/lx200driver.c
index bd85ba88..45eef056 100644
--- a/kstars/kstars/indi/lx200driver.c
+++ b/kstars/kstars/indi/lx200driver.c
@@ -78,8 +78,8 @@ int getCalenderDate(char *date);
int getSiteName(char *siteName, int siteNum);
/* Get Number of Bars */
int getNumberOfBars(int *value);
-/* Get Home Search tqStatus */
-int getHomeSearchtqStatus(int *status);
+/* Get Home Search Status */
+int getHomeSearchStatus(int *status);
/* Get OTA Temperature */
int getOTATemp(double * value);
/* Get time format: 12 or 24 */
@@ -99,7 +99,7 @@ int setStandardProcedure(char * writeData);
/* Set Slew Mode */
int setSlewMode(int slewMode);
/* Set Alignment mode */
-int tqsetAlignmentMode(unsigned int alignMode);
+int setAlignmentMode(unsigned int alignMode);
/* Set Object RA */
int setObjectRA(double ra);
/* set Object DEC */
@@ -203,7 +203,7 @@ int testTelescope()
int testAP()
{
int i=0;
- char tqcurrentDate[64];
+ char currentDate[64];
fprintf(stderr, "Testing telescope's connection...\n");
@@ -211,7 +211,7 @@ int testAP()
/ We're going to request the calander date */
for (i=0; i < 2; i++)
{
- if (!getCalenderDate(tqcurrentDate))
+ if (!getCalenderDate(currentDate))
return 0;
usleep(50000);
@@ -534,7 +534,7 @@ int getNumberOfBars(int *value)
return 0;
}
-int getHomeSearchtqStatus(int *status)
+int getHomeSearchStatus(int *status)
{
char tempString[16];
@@ -726,7 +726,7 @@ int setCommandXYZ(int x, int y, int z, const char *cmd)
return (setStandardProcedure(tempString));
}
-int tqsetAlignmentMode(unsigned int alignMode)
+int setAlignmentMode(unsigned int alignMode)
{
fprintf(stderr , "Set tqalignment mode %d\n", alignMode);
diff --git a/kstars/kstars/indi/lx200driver.h b/kstars/kstars/indi/lx200driver.h
index 529dfa02..06b8017f 100644
--- a/kstars/kstars/indi/lx200driver.h
+++ b/kstars/kstars/indi/lx200driver.h
@@ -157,8 +157,8 @@ int getCalenderDate(char *date);
int getSiteName(char *siteName, int siteNum);
/* Get Number of Bars */
int getNumberOfBars(int *value);
-/* Get Home Search tqStatus */
-int getHomeSearchtqStatus(int *status);
+/* Get Home Search Status */
+int getHomeSearchStatus(int *status);
/* Get OTA Temperature */
int getOTATemp(double * value);
/* Get time format: 12 or 24 */
@@ -178,7 +178,7 @@ int setStandardProcedure(char * writeData);
/* Set Slew Mode */
int setSlewMode(int slewMode);
/* Set Alignment mode */
-int tqsetAlignmentMode(unsigned int alignMode);
+int setAlignmentMode(unsigned int alignMode);
/* Set Object RA */
int setObjectRA(double ra);
/* set Object DEC */
diff --git a/kstars/kstars/indi/lx200generic.cpp b/kstars/kstars/indi/lx200generic.cpp
index 3e6e398a..975641fd 100644
--- a/kstars/kstars/indi/lx200generic.cpp
+++ b/kstars/kstars/indi/lx200generic.cpp
@@ -907,7 +907,7 @@ void LX200Generic::ISNewSwitch (const char *dev, const char *name, ISState *stat
IUUpdateSwitches(&AlignmentSw, states, names, n);
index = getOnSwitch(&AlignmentSw);
- if ( ( err = tqsetAlignmentMode(index) < 0) )
+ if ( ( err = setAlignmentMode(index) < 0) )
{
handleError(&AlignmentSw, err, "Setting tqalignment");
return;
diff --git a/kstars/kstars/indi/lx200gps.cpp b/kstars/kstars/indi/lx200gps.cpp
index 0bdb2efc..451a7269 100644
--- a/kstars/kstars/indi/lx200gps.cpp
+++ b/kstars/kstars/indi/lx200gps.cpp
@@ -139,7 +139,7 @@ void LX200GPS::ISNewNumber (const char *dev, const char *name, double values[],
return;
}
- /* GPS tqStatus Update */
+ /* GPS Status Update */
if (!strcmp(name,GPSStatusSw.name))
{
if (checkPower(&GPSStatusSw))
diff --git a/kstars/kstars/indi/sbigccd.cpp b/kstars/kstars/indi/sbigccd.cpp
index 9eef1a42..fb35cf59 100644
--- a/kstars/kstars/indi/sbigccd.cpp
+++ b/kstars/kstars/indi/sbigccd.cpp
@@ -326,7 +326,7 @@ void SBIGCam::ISStaticPoll(void *p)
void SBIGCam::ISPoll()
{
static int mtc=5;
- int readtqStatus=0;
+ int readStatus=0;
double ccdTemp (0);
switch (ExposeTimeNP.s)
@@ -340,8 +340,8 @@ void SBIGCam::ISPoll()
// JM: Here we check the status of the camera (whether it's still capturing an image or has finished that)
// ISPoll is called once per second. e.g. below for how we do this for Apogee Cameras
/*
- readtqStatus = cam->read_tqStatus();
- if (readtqStatus < 0)
+ readStatus = cam->read_Status();
+ if (readStatus < 0)
{
IDLog("Error in exposure!\n");
ExposeTimeNP.s = IPS_IDLE;
@@ -349,7 +349,7 @@ void SBIGCam::ISPoll()
IDSetNumber(&ExposeTimeNP, "Error in exposure procedure.");
return;
}
- else if (readtqStatus == Camera_Status_ImageReady)
+ else if (readStatus == Camera_Status_ImageReady)
{
ExposeTimeN[0].value = 0;
ExposeTimeNP.s = IPS_OK;
diff --git a/kstars/kstars/indiconf.ui b/kstars/kstars/indiconf.ui
index cd8917e4..afb72e3b 100644
--- a/kstars/kstars/indiconf.ui
+++ b/kstars/kstars/indiconf.ui
@@ -66,13 +66,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>28</width>
<height>28</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>28</width>
<height>28</height>
@@ -153,7 +153,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -238,7 +238,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>200</width>
<height>21</height>
@@ -372,7 +372,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>20</height>
diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp
index 5814989b..070e55dd 100644
--- a/kstars/kstars/indidriver.cpp
+++ b/kstars/kstars/indidriver.cpp
@@ -102,11 +102,11 @@ INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent )
TQObject::connect(clientListView, TQT_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(ClientprocessRightButton( TQListViewItem *, const TQPoint &, int )));
-TQObject::connect(ClientpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processHosttqStatus(int)));
+TQObject::connect(ClientpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processHostStatus(int)));
TQObject::connect(localListView, TQT_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(LocalprocessRightButton( TQListViewItem *, const TQPoint &, int )));
-TQObject::connect(LocalpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processDevicetqStatus(int)));
+TQObject::connect(LocalpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processDeviceStatus(int)));
TQObject::connect(ksw->getINDIMenu(), TQT_SIGNAL(driverDisconnected(int)), this, TQT_SLOT(shutdownHost(int)));
@@ -183,22 +183,22 @@ void INDIDriver::LocalprocessRightButton( TQListViewItem *item, const TQPoint &p
void INDIDriver::activateRunService()
{
- processDevicetqStatus(0);
+ processDeviceStatus(0);
}
void INDIDriver::activateStopService()
{
- processDevicetqStatus(1);
+ processDeviceStatus(1);
}
void INDIDriver::activateHostConnection()
{
- processHosttqStatus(0);
+ processHostStatus(0);
}
void INDIDriver::activateHostDisconnection()
{
- processHosttqStatus(1);
+ processHostStatus(1);
}
void INDIDriver::updateLocalButtons()
@@ -244,7 +244,7 @@ for (uint i=0; i < ksw->data()->INDIHostsList.count(); i++)
}
-void INDIDriver::processDevicetqStatus(int id)
+void INDIDriver::processDeviceStatus(int id)
{
if (localListView->selectedItem() == NULL)
return;
@@ -301,7 +301,7 @@ void INDIDriver::processDevicetqStatus(int id)
}
}
-void INDIDriver::processHosttqStatus(int id)
+void INDIDriver::processHostStatus(int id)
{
int mgrID;
bool toConnect = (id == 0);
diff --git a/kstars/kstars/indidriver.h b/kstars/kstars/indidriver.h
index 9cddeb99..6994b775 100644
--- a/kstars/kstars/indidriver.h
+++ b/kstars/kstars/indidriver.h
@@ -132,8 +132,8 @@ public slots:
void updateMenuActions();
void ClientprocessRightButton( TQListViewItem *, const TQPoint &, int );
void LocalprocessRightButton( TQListViewItem *, const TQPoint &, int );
- void processDevicetqStatus(int);
- void processHosttqStatus(int);
+ void processDeviceStatus(int);
+ void processHostStatus(int);
void addINDIHost();
void modifyINDIHost();
void removeINDIHost();
diff --git a/kstars/kstars/indielement.cpp b/kstars/kstars/indielement.cpp
index ed1834c0..1a20771f 100644
--- a/kstars/kstars/indielement.cpp
+++ b/kstars/kstars/indielement.cpp
@@ -110,7 +110,7 @@ label_w->setMaximumWidth(ELEMENT_LABEL_WIDTH);
label_w->setFrameShape( KSqueezedTextLabel::Box );
label_w->setPaletteBackgroundColor( TQColor( 224, 232, 238 ) );
label_w->setTextFormat( TQLabel::RichText );
-label_w->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) );
+label_w->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) );
if (label.length() > MAX_LABEL_LENGTH)
{
@@ -295,9 +295,9 @@ connect(slider_w, TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(sliderChanged(int
//kdDebug() << "For element " << label << " we have step of " << step << endl;
if (length == ELEMENT_FULL_WIDTH)
- spin_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) );
+ spin_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) );
else
- spin_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) );
+ spin_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) );
spin_w->setMinimumWidth( (int) (length * 0.45) );
slider_w->setMinimumWidth( (int) (length * 0.55) );
@@ -359,7 +359,7 @@ void INDI_E::setMax (double inMax)
void INDI_E::setupElementWrite(int length)
{
write_w = new KLineEdit( pp->pg->propertyContainer);
- write_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, write_w->sizePolicy().hasHeightForWidth() ));
+ write_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, write_w->sizePolicy().hasHeightForWidth() ));
write_w->setMinimumWidth( length );
write_w->setMaximumWidth( length);
@@ -377,7 +377,7 @@ void INDI_E::setupElementRead(int length)
read_w->setFrameShape( KLineEdit::GroupBoxPanel );
read_w->setFrameShadow( KLineEdit::Plain );
read_w->setCursorPosition( 0 );
- read_w->tqsetAlignment( int( KLineEdit::AlignHCenter ) );
+ read_w->setAlignment( int( KLineEdit::AlignHCenter ) );
read_w->setReadOnly( TRUE );
read_w->setText(text);
@@ -388,7 +388,7 @@ void INDI_E::setupElementRead(int length)
void INDI_E::setupBrowseButton()
{
browse_w = new KPushButton("...", pp->pg->propertyContainer);
- browse_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, browse_w->sizePolicy().hasHeightForWidth() ) );
+ browse_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, browse_w->sizePolicy().hasHeightForWidth() ) );
browse_w->setMinimumWidth( MIN_SET_WIDTH );
browse_w->setMaximumWidth( MAX_SET_WIDTH );
diff --git a/kstars/kstars/indihostconf.ui b/kstars/kstars/indihostconf.ui
index e91f64bf..91ad8cf5 100644
--- a/kstars/kstars/indihostconf.ui
+++ b/kstars/kstars/indihostconf.ui
@@ -98,7 +98,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>35</height>
@@ -129,7 +129,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kstars/kstars/indimenu.cpp b/kstars/kstars/indimenu.cpp
index fb5b4c73..44f7bdea 100644
--- a/kstars/kstars/indimenu.cpp
+++ b/kstars/kstars/indimenu.cpp
@@ -82,7 +82,7 @@ INDIMenu::~INDIMenu()
** Traverse the drivers list, check for updated drivers and take
** appropriate action
*********************************************************************/
-void INDIMenu::updatetqStatus()
+void INDIMenu::updateStatus()
{
INDIDriver *drivers = ksw->getINDIDriver();
diff --git a/kstars/kstars/indimenu.h b/kstars/kstars/indimenu.h
index 7ed8986d..abb2cfe9 100644
--- a/kstars/kstars/indimenu.h
+++ b/kstars/kstars/indimenu.h
@@ -67,7 +67,7 @@ class INDIMenu : public KDialogBase
TQPtrList<DeviceManager> mgr;
- void updatetqStatus();
+ void updateStatus();
//bool removeDevice(TQString devName);
void removeDeviceMgr(int mgrID);
void setCustomLabel(TQString deviceName);
diff --git a/kstars/kstars/indiproperty.cpp b/kstars/kstars/indiproperty.cpp
index 9c2fd658..b37756f2 100644
--- a/kstars/kstars/indiproperty.cpp
+++ b/kstars/kstars/indiproperty.cpp
@@ -438,12 +438,12 @@ void INDI_P::addGUI (XMLEle *root)
else
label_w = new TQLabel(label, pg->propertyContainer);
- label_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, label_w->sizePolicy().hasHeightForWidth() ) );
+ label_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, label_w->sizePolicy().hasHeightForWidth() ) );
label_w->setFrameShape( TQLabel::GroupBoxPanel );
label_w->setMinimumWidth(PROPERTY_LABEL_WIDTH);
label_w->setMaximumWidth(PROPERTY_LABEL_WIDTH);
label_w->setTextFormat( TQLabel::RichText );
- label_w->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignHCenter) );
+ label_w->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignHCenter) );
PHBox->addWidget(label_w);
@@ -600,7 +600,7 @@ int INDI_P::buildNumberGUI (XMLEle *root, char errmsg[])
void INDI_P::setupSetButton(TQString caption)
{
set_w = new TQPushButton(caption, pg->propertyContainer);
- set_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, set_w->sizePolicy().hasHeightForWidth() ) );
+ set_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, set_w->sizePolicy().hasHeightForWidth() ) );
set_w->setMinimumWidth( MIN_SET_WIDTH );
set_w->setMaximumWidth( MAX_SET_WIDTH );
diff --git a/kstars/kstars/ksnewstuff.cpp b/kstars/kstars/ksnewstuff.cpp
index 7539ddc4..3c14c73f 100644
--- a/kstars/kstars/ksnewstuff.cpp
+++ b/kstars/kstars/ksnewstuff.cpp
@@ -62,7 +62,7 @@ bool KSNewStuff::install( const TQString &fileName )
archiveDir->copyTo(destDir);
archive.close();
- kapp->tqprocessEvents(10000);
+ kapp->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->tqprocessEvents(1000);
+ kapp->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() ) {
@@ -166,7 +166,7 @@ void KSNewStuff::updateData( const TQString &path ) {
ks->setCursor(TQCursor(TQt::ArrowCursor));
}
-void KSNewStuff::slotProcessEvents() { kapp->tqprocessEvents( 500 ); }
+void KSNewStuff::slotProcessEvents() { kapp->processEvents( 500 ); }
#include "ksnewstuff.moc"
diff --git a/kstars/kstars/kspopupmenu.cpp b/kstars/kstars/kspopupmenu.cpp
index 33282ab0..6f10b09b 100644
--- a/kstars/kstars/kspopupmenu.cpp
+++ b/kstars/kstars/kspopupmenu.cpp
@@ -237,7 +237,7 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr
if ( s1 == i18n( "star" ) || s1 == i18n( "Empty sky" ) ) showLabel = false;
pmTitle = new TQLabel( s1, this );
- pmTitle->tqsetAlignment( AlignCenter );
+ 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 ) );
@@ -246,38 +246,38 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr
if ( ! s2.isEmpty() ) {
pmTitle2 = new TQLabel( s2, this );
- pmTitle2->tqsetAlignment( AlignCenter );
+ pmTitle2->setAlignment( AlignCenter );
pmTitle2->setPalette( pal );
insertItem( pmTitle2 );
}
if ( ! s3.isEmpty() ) {
pmType = new TQLabel( s3, this );
- pmType->tqsetAlignment( AlignCenter );
+ pmType->setAlignment( AlignCenter );
pmType->setPalette( pal );
insertItem( pmType );
}
TQString c = obj->constellation( ksw->data()->csegmentList, ksw->data()->cnameList );
pmConstellation = new TQLabel( c, this );
- pmConstellation->tqsetAlignment( AlignCenter );
+ pmConstellation->setAlignment( AlignCenter );
pmConstellation->setPalette( pal );
insertItem( pmConstellation );
//Insert Rise/Set/Transit labels
if ( showRiseSet && obj ) {
pmRiseTime = new TQLabel( i18n( "Rise time: 00:00" ), this );
- pmRiseTime->tqsetAlignment( AlignCenter );
+ pmRiseTime->setAlignment( AlignCenter );
pmRiseTime->setPalette( pal );
TQFont rsFont = pmRiseTime->font();
rsFont.setPointSize( rsFont.pointSize() - 2 );
pmRiseTime->setFont( rsFont );
pmSetTime = new TQLabel( i18n( "the time at which an object falls below the horizon", "Set time:" ) + " 00:00", this );
- pmSetTime->tqsetAlignment( AlignCenter );
+ pmSetTime->setAlignment( AlignCenter );
pmSetTime->setPalette( pal );
pmSetTime->setFont( rsFont );
pmTransitTime = new TQLabel( i18n( "Transit time: 00:00" ), this );
- pmTransitTime->tqsetAlignment( AlignCenter );
+ pmTransitTime->setAlignment( AlignCenter );
pmTransitTime->setPalette( pal );
pmTransitTime->setFont( rsFont );
insertSeparator();
diff --git a/kstars/kstars/kstars.cpp b/kstars/kstars/kstars.cpp
index 6cde713d..999a0bfc 100644
--- a/kstars/kstars/kstars.cpp
+++ b/kstars/kstars/kstars.cpp
@@ -184,9 +184,9 @@ void KStars::applyConfig() {
//color scheme
pd->kstarsData->colorScheme()->loadFromConfig( kapp->config() );
if ( Options::darkAppColors() ) {
- TQApplication::tqsetPalette( DarkPalette, true );
+ TQApplication::setPalette( DarkPalette, true );
} else {
- TQApplication::tqsetPalette( OriginalPalette, true );
+ TQApplication::setPalette( OriginalPalette, true );
}
//Infoboxes, toolbars, statusbars
diff --git a/kstars/kstars/kstars.h b/kstars/kstars/kstars.h
index 569c70f7..1665423c 100644
--- a/kstars/kstars/kstars.h
+++ b/kstars/kstars/kstars.h
@@ -625,7 +625,7 @@ class KStars : public KMainWindow, virtual public KStarsInterface
void initFOV();
/**
- *Initialize tqStatus bar.
+ *Initialize Status bar.
*/
void initStatusBar();
diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp
index 4768f703..0ab9935a 100644
--- a/kstars/kstars/kstarsactions.cpp
+++ b/kstars/kstars/kstarsactions.cpp
@@ -227,7 +227,7 @@ void KStars::slotImageSequence()
if (indiseq == NULL)
indiseq = new imagesequence(this);
- if (indiseq->updatetqStatus())
+ if (indiseq->updateStatus())
indiseq->show();
}
@@ -248,7 +248,7 @@ void KStars::slotINDIPanel() {
if (indimenu == NULL)
indimenu = new INDIMenu(this);
- indimenu->updatetqStatus();
+ indimenu->updateStatus();
}
void KStars::slotINDIDriver() {
@@ -569,7 +569,7 @@ void KStars::slotRunScript() {
p << f.name();
p.start( KProcess::DontCare );
- while ( p.isRunning() ) kapp->tqprocessEvents( 50 ); //otherwise tempfile may get deleted before script completes.
+ while ( p.isRunning() ) kapp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes.
}
}
@@ -595,7 +595,7 @@ void KStars::slotPrint() {
//Set Time to CPU clock
void KStars::slotSetTimeToNow() {
- data()->changeDateTime( geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ) );
+ data()->changeDateTime( geo()->LTtoUT( KStarsDateTime::currentDateTime() ) );
if ( Options::useAltAz() ) {
map()->focus()->HorizontalToEquatorial( LST(), geo()->lat() );
@@ -914,11 +914,11 @@ void KStars::slotTipOfDay() {
// Toggle to and from full screen mode
void KStars::slotFullScreen()
{
- if ( tqtopLevelWidget()->isFullScreen() ) {
- tqtopLevelWidget()->showNormal();
+ if ( topLevelWidget()->isFullScreen() ) {
+ topLevelWidget()->showNormal();
}
else {
- tqtopLevelWidget()->showFullScreen();
+ topLevelWidget()->showFullScreen();
}
}
diff --git a/kstars/kstars/kstarsdatetime.cpp b/kstars/kstars/kstarsdatetime.cpp
index 25c3be0b..6b406f44 100644
--- a/kstars/kstars/kstarsdatetime.cpp
+++ b/kstars/kstars/kstarsdatetime.cpp
@@ -55,10 +55,10 @@ KStarsDateTime::KStarsDateTime( long double _jd ) : ExtDateTime() {
setDJD( _jd );
}
-KStarsDateTime KStarsDateTime::tqcurrentDateTime() {
- KStarsDateTime dt( ExtDate::tqcurrentDate(), TQTime::currentTime() );
+KStarsDateTime KStarsDateTime::currentDateTime() {
+ KStarsDateTime dt( ExtDate::currentDate(), TQTime::currentTime() );
if ( dt.time().hour()==0 && dt.time().minute()==0 ) // midnight or right after?
- dt.setDate( ExtDate::tqcurrentDate() ); // fetch date again
+ dt.setDate( ExtDate::currentDate() ); // fetch date again
return dt;
}
diff --git a/kstars/kstars/kstarsdatetime.h b/kstars/kstars/kstarsdatetime.h
index dec5daa0..c7ada867 100644
--- a/kstars/kstars/kstarsdatetime.h
+++ b/kstars/kstars/kstarsdatetime.h
@@ -134,7 +134,7 @@ public:
*@return the date and time according to the CPU clock (note that this is not
*necessarily UT)
*/
- static KStarsDateTime tqcurrentDateTime();
+ static KStarsDateTime currentDateTime();
/**
*@return the julian day as a long double, including the time as the fractional portion.
diff --git a/kstars/kstars/kstarsdcop.cpp b/kstars/kstars/kstarsdcop.cpp
index 8649ccba..f41472d0 100644
--- a/kstars/kstars/kstarsdcop.cpp
+++ b/kstars/kstars/kstarsdcop.cpp
@@ -376,12 +376,12 @@ void KStars::loadColorScheme( const TQString _name ) {
if ( Options::darkAppColors() == false && filename == "night.colors" ) {
Options::setDarkAppColors( true );
OriginalPalette = TQApplication::palette();
- TQApplication::tqsetPalette( DarkPalette, true );
+ TQApplication::setPalette( DarkPalette, true );
}
if ( Options::darkAppColors() && filename != "night.colors" ) {
Options::setDarkAppColors( false );
- TQApplication::tqsetPalette( OriginalPalette, true );
+ TQApplication::setPalette( OriginalPalette, true );
}
map()->forceUpdate();
@@ -421,7 +421,7 @@ void KStars::exportImage( const TQString url, int w, int h ) {
else { kdWarning() << i18n( "Could not parse image format of %1; assuming PNG." ).tqarg( fname ) << endl; }
map()->exportSkyImage( TQT_TQPAINTDEVICE(&skyimage) );
- kapp->tqprocessEvents(10000);
+ kapp->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.
@@ -523,7 +523,7 @@ void KStars::startINDI (TQString deviceName, bool useLocal)
if (indidriver->isDeviceRunning(deviceName))
{
indidriver->localListView->setSelected(driverItem, true);
- indidriver->processDevicetqStatus(1);
+ indidriver->processDeviceStatus(1);
}
// Set custome label for device
@@ -538,7 +538,7 @@ void KStars::startINDI (TQString deviceName, bool useLocal)
indidriver->serverR->setChecked(true);
// Run it
- indidriver->processDevicetqStatus(0);
+ indidriver->processDeviceStatus(0);
}
@@ -558,7 +558,7 @@ void KStars::shutdownINDI (TQString deviceName)
return;
}
- indidriver->processDevicetqStatus(1);
+ indidriver->processDeviceStatus(1);
}
diff --git a/kstars/kstars/kstarssplash.cpp b/kstars/kstars/kstarssplash.cpp
index 29198caa..defd0007 100644
--- a/kstars/kstars/kstarssplash.cpp
+++ b/kstars/kstars/kstarssplash.cpp
@@ -59,15 +59,15 @@ KStarsSplash::KStarsSplash( TQWidget *parent, const char* name )
pal.setColor( TQPalette::Normal, TQColorGroup::Foreground, TQColor( "White" ) );
pal.setColor( TQPalette::Inactive, TQColorGroup::Foreground, TQColor( "White" ) );
label->setPalette( pal );
- label->tqsetAlignment( AlignHCenter );
+ label->setAlignment( AlignHCenter );
label->setText( i18n( "Welcome to KStars. Please stand by while loading..." ) );
topLayout->addWidget( label );
//initialize the progress message label
- textCurrenttqStatus = new TQLabel( page, "label2" );
- textCurrenttqStatus->setPalette( pal );
- textCurrenttqStatus->tqsetAlignment( AlignHCenter );
- topLayout->addWidget( textCurrenttqStatus );
+ textCurrentStatus = new TQLabel( page, "label2" );
+ textCurrentStatus->setPalette( pal );
+ textCurrentStatus->setAlignment( AlignHCenter );
+ topLayout->addWidget( textCurrentStatus );
topLayout->activate();
disableResize();
@@ -81,7 +81,7 @@ KStarsSplash::~KStarsSplash() {
void KStarsSplash::paintEvent( TQPaintEvent* ) {
bitBlt( Banner, 0, 0, splashImage, 0, 0, -1, -1 );
label->tqrepaint(); // standard text label
- textCurrenttqStatus->tqrepaint(); // status text label
+ textCurrentStatus->tqrepaint(); // status text label
}
void KStarsSplash::closeEvent( TQCloseEvent *e ) {
@@ -90,7 +90,7 @@ void KStarsSplash::closeEvent( TQCloseEvent *e ) {
}
void KStarsSplash::setMessage( TQString s ) {
- textCurrenttqStatus->setText( s );
+ textCurrentStatus->setText( s );
tqrepaint(); // tqrepaint splash screen
/**
*Flush all event data. This is needed because events will buffered and
diff --git a/kstars/kstars/kstarssplash.h b/kstars/kstars/kstarssplash.h
index 8d9b2236..443eb1b6 100644
--- a/kstars/kstars/kstarssplash.h
+++ b/kstars/kstars/kstarssplash.h
@@ -66,7 +66,7 @@ class KStarsSplash : public KDialogBase
void closeWindow();
private:
- TQLabel *textCurrenttqStatus, *label;
+ TQLabel *textCurrentStatus, *label;
TQWidget *Banner;
TQPixmap *splashImage;
};
diff --git a/kstars/kstars/kswizardui.ui b/kstars/kstars/kswizardui.ui
index 53d6871f..12c189a2 100644
--- a/kstars/kstars/kswizardui.ui
+++ b/kstars/kstars/kswizardui.ui
@@ -35,7 +35,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>120</width>
<height>360</height>
@@ -79,7 +79,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -111,7 +111,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>189</height>
@@ -145,7 +145,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>120</width>
<height>360</height>
@@ -197,7 +197,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -239,7 +239,7 @@ country.&lt;/p&gt;
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -314,7 +314,7 @@ country.&lt;/p&gt;
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -333,7 +333,7 @@ country.&lt;/p&gt;
<property name="name">
<cstring>LatBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
@@ -366,7 +366,7 @@ country.&lt;/p&gt;
<property name="name">
<cstring>LongBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
@@ -386,7 +386,7 @@ country.&lt;/p&gt;
<property name="name">
<cstring>CityListBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>180</width>
<height>0</height>
@@ -428,7 +428,7 @@ country.&lt;/p&gt;
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>120</width>
<height>360</height>
@@ -472,7 +472,7 @@ country.&lt;/p&gt;
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -507,7 +507,7 @@ can also control telescopes remotely over the Internet.</string>
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -535,7 +535,7 @@ You can always set up devices later using the &lt;b&gt;Devices&lt;/b&gt; menu.</
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -560,7 +560,7 @@ You can always set up devices later using the &lt;b&gt;Devices&lt;/b&gt; menu.</
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -592,7 +592,7 @@ and other astronomical devices such as CCD cameras and focusers.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -611,7 +611,7 @@ and other astronomical devices such as CCD cameras and focusers.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>117</height>
@@ -649,7 +649,7 @@ and other astronomical devices such as CCD cameras and focusers.</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>120</width>
<height>360</height>
@@ -693,7 +693,7 @@ and other astronomical devices such as CCD cameras and focusers.</string>
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -735,7 +735,7 @@ button to proceed. &lt;/p&gt;
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
@@ -760,7 +760,7 @@ button to proceed. &lt;/p&gt;
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -785,7 +785,7 @@ button to proceed. &lt;/p&gt;
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -804,7 +804,7 @@ button to proceed. &lt;/p&gt;
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>90</height>
diff --git a/kstars/kstars/main.cpp b/kstars/kstars/main.cpp
index b96756c4..0a83531e 100644
--- a/kstars/kstars/main.cpp
+++ b/kstars/kstars/main.cpp
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
KStarsData *dat = new KStarsData();
TQObject::connect( dat, TQT_SIGNAL( progressText(TQString) ), dat, TQT_SLOT( slotConsoleMessage(TQString) ) );
dat->initialize();
- while (!dat->startupComplete) { kapp->tqprocessEvents(50); }
+ while (!dat->startupComplete) { kapp->processEvents(50); }
//Set Geographic Location
dat->setLocationFromOptions();
@@ -128,10 +128,10 @@ int main(int argc, char *argv[])
kdWarning() << " 25 Feb 1950 ; 25 Feb 1950 05:30:00" << endl;
kdWarning() << i18n( "Using CPU date/time instead." ) << endl;
- kdt = dat->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() );
+ kdt = dat->geo()->LTtoUT( KStarsDateTime::currentDateTime() );
}
} else {
- kdt = dat->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() );
+ kdt = dat->geo()->LTtoUT( KStarsDateTime::currentDateTime() );
}
dat->clock()->setUTC( kdt );
@@ -160,10 +160,10 @@ int main(int argc, char *argv[])
dat->setFullTimeUpdate();
dat->updateTime(dat->geo(), map );
- kapp->tqprocessEvents(100000);
+ kapp->processEvents(100000);
map->setMapGeometry();
map->exportSkyImage( TQT_TQPAINTDEVICE(&sky) );
- kapp->tqprocessEvents(100000);
+ kapp->processEvents(100000);
if ( ! sky.save( fname, format ) ) kdWarning() << i18n( "Unable to save image: %1 " ).tqarg( fname ) << endl;
else kdDebug() << i18n( "Saved to file: %1" ).tqarg( fname ) << endl;
diff --git a/kstars/kstars/mapcanvas.cpp b/kstars/kstars/mapcanvas.cpp
index 928623f8..85dbd1ca 100644
--- a/kstars/kstars/mapcanvas.cpp
+++ b/kstars/kstars/mapcanvas.cpp
@@ -31,7 +31,7 @@ MapCanvas::MapCanvas(TQWidget *parent, const char *name ) : TQWidget(parent,name
setBackgroundMode( TQWidget::NoBackground );
Canvas = new TQPixmap();
bgImage = new TQPixmap();
- LocationDialog *ld = (LocationDialog *)tqtopLevelWidget();
+ LocationDialog *ld = (LocationDialog *)topLevelWidget();
KStars *ks = (KStars *)ld->parent();
TQString bgFile = ks->data()->stdDirs->findResource( "data", "kstars/geomap.png" );
bgImage->load( bgFile, "PNG" );
@@ -57,7 +57,7 @@ void MapCanvas::setGeometry( const TQRect &r ) {
}
void MapCanvas::mousePressEvent( TQMouseEvent *e ) {
- LocationDialog *ld = (LocationDialog *)tqtopLevelWidget();
+ LocationDialog *ld = (LocationDialog *)topLevelWidget();
//Determine Lat/Long corresponding to event press
int lng = ( e->x() - origin.x() );
@@ -68,7 +68,7 @@ void MapCanvas::mousePressEvent( TQMouseEvent *e ) {
void MapCanvas::paintEvent( TQPaintEvent * ) {
TQPainter pcanvas;
- LocationDialog *ld = (LocationDialog *)tqtopLevelWidget();
+ LocationDialog *ld = (LocationDialog *)topLevelWidget();
KStars *ks = (KStars *)ld->parent();
//prepare the canvas
diff --git a/kstars/kstars/newfovui.ui b/kstars/kstars/newfovui.ui
index 649c04e9..cc7728af 100644
--- a/kstars/kstars/newfovui.ui
+++ b/kstars/kstars/newfovui.ui
@@ -244,7 +244,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -269,7 +269,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>152</width>
<height>20</height>
@@ -333,7 +333,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view"
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>180</width>
<height>20</height>
@@ -350,7 +350,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view"
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>22</height>
@@ -367,7 +367,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view"
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>22</height>
@@ -441,7 +441,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo
<property name="name">
<cstring>textLabel6_2_3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>60</width>
<height>0</height>
@@ -578,7 +578,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo
<property name="name">
<cstring>textLabel6_2_3_4</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>60</width>
<height>0</height>
@@ -645,7 +645,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>51</height>
@@ -670,7 +670,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>281</width>
<height>21</height>
@@ -742,7 +742,7 @@ You can either enter a value directly, or use the "Eyepiece" or "Camera" Tabs to
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>298</width>
<height>20</height>
@@ -872,7 +872,7 @@ Circle, Square, Crosshairs, Bullseye.</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>80</width>
<height>80</height>
diff --git a/kstars/kstars/opsadvancedui.ui b/kstars/kstars/opsadvancedui.ui
index 86527bf2..cea4b508 100644
--- a/kstars/kstars/opsadvancedui.ui
+++ b/kstars/kstars/opsadvancedui.ui
@@ -117,7 +117,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -175,7 +175,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -224,7 +224,7 @@
<property name="name">
<cstring>kcfg_MagLimitHideStar</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>40</width>
<height>0</height>
@@ -258,7 +258,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>240</width>
<height>20</height>
@@ -409,7 +409,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/kstars/kstars/opscatalogui.ui b/kstars/kstars/opscatalogui.ui
index 28866b7a..d7012f99 100644
--- a/kstars/kstars/opscatalogui.ui
+++ b/kstars/kstars/opscatalogui.ui
@@ -132,7 +132,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>65</width>
<height>20</height>
@@ -149,7 +149,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>65</width>
<height>20</height>
@@ -168,7 +168,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -223,7 +223,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -250,7 +250,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -291,7 +291,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -423,7 +423,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>68</height>
@@ -522,7 +522,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>65</width>
<height>20</height>
@@ -539,7 +539,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>65</width>
<height>20</height>
@@ -560,7 +560,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/kstars/kstars/opscolorsui.ui b/kstars/kstars/opscolorsui.ui
index 94cc9e70..1c08c304 100644
--- a/kstars/kstars/opscolorsui.ui
+++ b/kstars/kstars/opscolorsui.ui
@@ -185,7 +185,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -216,7 +216,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -233,7 +233,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -250,7 +250,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/kstars/kstars/opsguidesui.ui b/kstars/kstars/opsguidesui.ui
index 40075880..8294be8b 100644
--- a/kstars/kstars/opsguidesui.ui
+++ b/kstars/kstars/opsguidesui.ui
@@ -120,7 +120,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -165,7 +165,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -252,7 +252,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>60</height>
diff --git a/kstars/kstars/opssolarsystemui.ui b/kstars/kstars/opssolarsystemui.ui
index dc872a3b..05cc5c28 100644
--- a/kstars/kstars/opssolarsystemui.ui
+++ b/kstars/kstars/opssolarsystemui.ui
@@ -230,7 +230,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>100</width>
<height>20</height>
@@ -263,7 +263,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -307,7 +307,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -492,7 +492,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/kstars/kstars/simclock.h b/kstars/kstars/simclock.h
index a4b16787..d652c304 100644
--- a/kstars/kstars/simclock.h
+++ b/kstars/kstars/simclock.h
@@ -40,7 +40,7 @@ class SimClock : public TQObject, public SimClockInterface {
* @param parent parent object for the clock
* @param when the date/time to which the SimClock should be initialized in UTC
*/
- SimClock(TQObject *parent = 0, const KStarsDateTime &when = KStarsDateTime::tqcurrentDateTime() );
+ SimClock(TQObject *parent = 0, const KStarsDateTime &when = KStarsDateTime::currentDateTime() );
/**
* Constructor
* @param old a SimClock to initialize from.
diff --git a/kstars/kstars/skymap.cpp b/kstars/kstars/skymap.cpp
index 4dab3cee..976bcfb9 100644
--- a/kstars/kstars/skymap.cpp
+++ b/kstars/kstars/skymap.cpp
@@ -74,7 +74,7 @@ SkyMap::SkyMap(KStarsData *d, TQWidget *parent, const char *name )
setBackgroundMode( TQWidget::NoBackground );
setFocusPolicy( TQ_StrongFocus );
setMinimumSize( 380, 250 );
- tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+ setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
setMouseTracking (true); //Generate MouseMove events!
midMouseButtonDown = false;
@@ -925,7 +925,7 @@ void SkyMap::slewFocus( void ) {
fadeTransientLabel();
forceUpdate();
- kapp->tqprocessEvents(10); //keep up with other stuff
+ kapp->processEvents(10); //keep up with other stuff
if ( Options::useAltAz() ) {
dX = destination()->az()->Degrees() - focus()->az()->Degrees();
diff --git a/kstars/kstars/skymapdraw.cpp b/kstars/kstars/skymapdraw.cpp
index 77f17268..ab83a8c6 100644
--- a/kstars/kstars/skymapdraw.cpp
+++ b/kstars/kstars/skymapdraw.cpp
@@ -299,7 +299,7 @@ void SkyMap::drawMilkyWay( TQPainter& psky, double scale )
}
if ( ptsCount && partVisible ) {
- psky.tqdrawPolygon( ( const TQPointArray ) *pts, false, 0, ptsCount );
+ psky.drawPolygon( ( const TQPointArray ) *pts, false, 0, ptsCount );
}
} else {
TQPoint o = getXY( data->MilkyWay[j].at(0), Options::useAltAz(), Options::useRefraction(), scale );
@@ -905,7 +905,7 @@ void SkyMap::drawHorizon( TQPainter& psky, double scale )
}
//Draw the Horizon polygon
- psky.tqdrawPolygon( ( const TQPointArray ) *pts, false, 0, ptsCount );
+ psky.drawPolygon( ( const TQPointArray ) *pts, false, 0, ptsCount );
//remove all items in points list
for ( register unsigned int i=0; i<points.count(); ++i ) {
diff --git a/kstars/kstars/streamformui.ui b/kstars/kstars/streamformui.ui
index 5e222427..86088d12 100644
--- a/kstars/kstars/streamformui.ui
+++ b/kstars/kstars/streamformui.ui
@@ -31,13 +31,13 @@
<property name="name">
<cstring>playB</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -57,13 +57,13 @@
<property name="name">
<cstring>captureB</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -97,7 +97,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>300</width>
<height>21</height>
diff --git a/kstars/kstars/telescopepropui.ui b/kstars/kstars/telescopepropui.ui
index bcff2bd6..6968b989 100644
--- a/kstars/kstars/telescopepropui.ui
+++ b/kstars/kstars/telescopepropui.ui
@@ -72,7 +72,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>236</width>
<height>20</height>
@@ -101,7 +101,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>130</width>
<height>0</height>
@@ -242,7 +242,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>190</height>
diff --git a/kstars/kstars/telescopewizard.ui b/kstars/kstars/telescopewizard.ui
index fa67eea5..d9bfbddb 100644
--- a/kstars/kstars/telescopewizard.ui
+++ b/kstars/kstars/telescopewizard.ui
@@ -20,13 +20,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>500</width>
<height>300</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>800</width>
<height>300</height>
@@ -74,7 +74,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>56</width>
<height>11</height>
@@ -181,7 +181,7 @@ Please select your telescope model from the list below. Click next after selecti
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>25</height>
@@ -211,7 +211,7 @@ Please select your telescope model from the list below. Click next after selecti
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>196</width>
<height>16</height>
@@ -230,7 +230,7 @@ Please select your telescope model from the list below. Click next after selecti
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>25</height>
@@ -320,7 +320,7 @@ Verify if the following time, date, and location settings are correct. If any of
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -486,7 +486,7 @@ Verify if the following time, date, and location settings are correct. If any of
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -538,7 +538,7 @@ Enter the port number your telescope is connected to. If you only have one seria
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>25</height>
@@ -576,7 +576,7 @@ Enter the port number your telescope is connected to. If you only have one seria
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>141</width>
<height>16</height>
@@ -595,7 +595,7 @@ Enter the port number your telescope is connected to. If you only have one seria
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>25</height>
diff --git a/kstars/kstars/telescopewizardprocess.cpp b/kstars/kstars/telescopewizardprocess.cpp
index d29c6ba2..0355d7c0 100644
--- a/kstars/kstars/telescopewizardprocess.cpp
+++ b/kstars/kstars/telescopewizardprocess.cpp
@@ -106,7 +106,7 @@ telescopeWizardProcess::~telescopeWizardProcess()
{
if (progressScan)
if (progressScan->wasCancelled())
- indidriver->processDevicetqStatus(1);
+ indidriver->processDeviceStatus(1);
Options::setIndiMessages( INDIMessageBar );
@@ -237,7 +237,7 @@ int telescopeWizardProcess::establishLink()
if (indidriver->isDeviceRunning(telescopeCombo->currentText()))
{
indidriver->localListView->setSelected(driverItem, true);
- indidriver->processDevicetqStatus(1);
+ indidriver->processDeviceStatus(1);
}
// Set custome label for device
@@ -248,7 +248,7 @@ int telescopeWizardProcess::establishLink()
// Make sure we start is locally
indidriver->localR->setChecked(true);
// Run it
- indidriver->processDevicetqStatus(0);
+ indidriver->processDeviceStatus(0);
if (!indidriver->isDeviceRunning(telescopeCombo->currentText()))
return (3);
@@ -274,7 +274,7 @@ void telescopeWizardProcess::processPort()
if (timeOutCount >= TIMEOUT_THRESHHOLD)
{
- indidriver->processDevicetqStatus(1);
+ indidriver->processDeviceStatus(1);
Reset();
KMessageBox::error(0, i18n("Error: connection timeout. Unable to communicate with an INDI server"));
close();
@@ -335,7 +335,7 @@ void telescopeWizardProcess::scanPorts()
{
KMessageBox::sorry(0, i18n("Sorry. KStars failed to detect any attached telescopes, please check your settings and try again."));
linkRejected = true;
- indidriver->processDevicetqStatus(1);
+ indidriver->processDeviceStatus(1);
Reset();
return;
}
diff --git a/kstars/kstars/thumbnailpicker.cpp b/kstars/kstars/thumbnailpicker.cpp
index 5a4887a9..e39ceb19 100644
--- a/kstars/kstars/thumbnailpicker.cpp
+++ b/kstars/kstars/thumbnailpicker.cpp
@@ -176,7 +176,7 @@ void ThumbnailPicker::downloadReady(KIO::Job *job) {
//Add image to list
//If image is taller than desktop, rescale it.
- //I tried to use kapp->style().tqpixelMetric( TQStyle::PM_TitleBarHeight )
+ //I tried to use kapp->style().pixelMetric( TQStyle::PM_TitleBarHeight )
//for the titlebar height, but this returned zero.
//Hard-coding 25 instead :(
if ( tmp.exists() ) {
@@ -195,7 +195,7 @@ void ThumbnailPicker::downloadReady(KIO::Job *job) {
// this returns zero...
// //DEBUG
-// kdDebug() << "Title bar height: " << kapp->style().tqpixelMetric( TQStyle::PM_TitleBarHeight ) << endl;
+// kdDebug() << "Title bar height: " << kapp->style().pixelMetric( TQStyle::PM_TitleBarHeight ) << endl;
if ( h > hDesk )
im = im.smoothScale( w*hDesk/h, hDesk );
diff --git a/kstars/kstars/thumbnailpickerui.ui b/kstars/kstars/thumbnailpickerui.ui
index 591f7cdc..1058ee6c 100644
--- a/kstars/kstars/thumbnailpickerui.ui
+++ b/kstars/kstars/thumbnailpickerui.ui
@@ -56,7 +56,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -80,7 +80,7 @@
<property name="name">
<cstring>ImageList</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>300</width>
<height>0</height>
@@ -134,7 +134,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>53</width>
<height>20</height>
@@ -169,13 +169,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>200</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>200</width>
<height>200</height>
@@ -200,7 +200,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>53</width>
<height>20</height>
@@ -227,7 +227,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -270,7 +270,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -289,7 +289,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>233</height>
diff --git a/kstars/kstars/timebox.cpp b/kstars/kstars/timebox.cpp
index b3dabc31..d95927c5 100644
--- a/kstars/kstars/timebox.cpp
+++ b/kstars/kstars/timebox.cpp
@@ -159,9 +159,9 @@ ExtDate timeBox::createDate (bool */*ok*/)
if ( !date.isValid() ) {
kdDebug() << k_funcinfo << "Invalid date" << endl;
- showDate(ExtDate::tqcurrentDate());
+ showDate(ExtDate::currentDate());
entry = text().stripWhiteSpace();
- return ExtDate::tqcurrentDate();
+ return ExtDate::currentDate();
} else {
return date;
}
diff --git a/kstars/kstars/timedialog.cpp b/kstars/kstars/timedialog.cpp
index d3ff7ecb..f68d56dc 100644
--- a/kstars/kstars/timedialog.cpp
+++ b/kstars/kstars/timedialog.cpp
@@ -112,7 +112,7 @@ void TimeDialog::keyReleaseEvent( TQKeyEvent *kev ) {
void TimeDialog::setNow( void )
{
- KStarsDateTime dt( KStarsDateTime::tqcurrentDateTime() );
+ KStarsDateTime dt( KStarsDateTime::currentDateTime() );
dPicker->setDate( dt.date() );
TQTime t = dt.time();
diff --git a/kstars/kstars/tools/altvstime.cpp b/kstars/kstars/tools/altvstime.cpp
index c271319d..39013999 100644
--- a/kstars/kstars/tools/altvstime.cpp
+++ b/kstars/kstars/tools/altvstime.cpp
@@ -53,7 +53,7 @@ AltVsTime::AltVsTime( TQWidget* parent) :
View = new AVTPlotWidget( -12.0, 12.0, -90.0, 90.0, page );
View->setMinimumSize( 400, 400 );
- View->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding );
+ View->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding );
View->setXAxisType( KStarsPlotWidget::TIME );
View->setYAxisType( KStarsPlotWidget::ANGLE );
View->setShowGrid( false );
@@ -468,7 +468,7 @@ void AltVsTime::setLSTLimits(void) {
void AltVsTime::showCurrentDate (void)
{
- KStarsDateTime dt = KStarsDateTime::tqcurrentDateTime();
+ KStarsDateTime dt = KStarsDateTime::currentDateTime();
if ( dt.time() > TQTime( 12, 0, 0 ) ) dt = dt.addDays( 1 );
avtUI->dateBox->setDate( dt.date() );
}
diff --git a/kstars/kstars/tools/altvstimeui.ui b/kstars/kstars/tools/altvstimeui.ui
index 323c9fd7..2738dbb8 100644
--- a/kstars/kstars/tools/altvstimeui.ui
+++ b/kstars/kstars/tools/altvstimeui.ui
@@ -150,13 +150,13 @@
<property name="name">
<cstring>epochName</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>80</width>
<height>32767</height>
@@ -228,7 +228,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -260,7 +260,7 @@
<property name="name">
<cstring>PlotList</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -303,7 +303,7 @@
<property name="name">
<cstring>dateBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>90</width>
<height>0</height>
@@ -320,7 +320,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>257</width>
<height>20</height>
@@ -421,7 +421,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -446,7 +446,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/kstars/kstars/tools/argchangeviewoption.ui b/kstars/kstars/tools/argchangeviewoption.ui
index 1da77198..aac25fe2 100644
--- a/kstars/kstars/tools/argchangeviewoption.ui
+++ b/kstars/kstars/tools/argchangeviewoption.ui
@@ -45,7 +45,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>50</width>
<height>20</height>
@@ -95,7 +95,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>160</width>
<height>20</height>
@@ -122,7 +122,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/kstars/kstars/tools/argexportimage.ui b/kstars/kstars/tools/argexportimage.ui
index 9228373b..085646f6 100644
--- a/kstars/kstars/tools/argexportimage.ui
+++ b/kstars/kstars/tools/argexportimage.ui
@@ -36,7 +36,7 @@
<property name="name">
<cstring>ExportFileName</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>160</width>
<height>0</height>
@@ -63,7 +63,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -136,7 +136,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -223,8 +223,8 @@
<property type="Bool">enabled</property>
<property type="Rect">tqgeometry</property>
<property type="SizePolicy">sizePolicy</property>
- <property type="Size">tqminimumSize</property>
- <property type="Size">tqmaximumSize</property>
+ <property type="Size">minimumSize</property>
+ <property type="Size">maximumSize</property>
<property type="Size">sizeIncrement</property>
<property type="Size">baseSize</property>
<property type="Color">paletteForegroundColor</property>
diff --git a/kstars/kstars/tools/arglooktoward.ui b/kstars/kstars/tools/arglooktoward.ui
index ea505d2c..c8d47e35 100644
--- a/kstars/kstars/tools/arglooktoward.ui
+++ b/kstars/kstars/tools/arglooktoward.ui
@@ -125,7 +125,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -144,7 +144,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kstars/kstars/tools/argprintimage.ui b/kstars/kstars/tools/argprintimage.ui
index 362e8289..dc50ac07 100644
--- a/kstars/kstars/tools/argprintimage.ui
+++ b/kstars/kstars/tools/argprintimage.ui
@@ -45,7 +45,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>70</height>
diff --git a/kstars/kstars/tools/argsetactionindi.ui b/kstars/kstars/tools/argsetactionindi.ui
index 9e8465ad..b299ce35 100644
--- a/kstars/kstars/tools/argsetactionindi.ui
+++ b/kstars/kstars/tools/argsetactionindi.ui
@@ -83,7 +83,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -102,7 +102,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>9</height>
diff --git a/kstars/kstars/tools/argsetaltaz.ui b/kstars/kstars/tools/argsetaltaz.ui
index 1c373ebb..52a7aebf 100644
--- a/kstars/kstars/tools/argsetaltaz.ui
+++ b/kstars/kstars/tools/argsetaltaz.ui
@@ -100,7 +100,7 @@ The azimuth is one of the coordinates in the horizontal coordinate system. It i
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kstars/kstars/tools/argsetccdtempindi.ui b/kstars/kstars/tools/argsetccdtempindi.ui
index ba6eed5a..17eb9e8a 100644
--- a/kstars/kstars/tools/argsetccdtempindi.ui
+++ b/kstars/kstars/tools/argsetccdtempindi.ui
@@ -86,7 +86,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>27</width>
<height>21</height>
@@ -105,7 +105,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>9</height>
diff --git a/kstars/kstars/tools/argsetcolor.ui b/kstars/kstars/tools/argsetcolor.ui
index e2e2f2e2..326a15bf 100644
--- a/kstars/kstars/tools/argsetcolor.ui
+++ b/kstars/kstars/tools/argsetcolor.ui
@@ -66,7 +66,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -92,7 +92,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -182,8 +182,8 @@
<property type="Bool">enabled</property>
<property type="Rect">tqgeometry</property>
<property type="SizePolicy">sizePolicy</property>
- <property type="Size">tqminimumSize</property>
- <property type="Size">tqmaximumSize</property>
+ <property type="Size">minimumSize</property>
+ <property type="Size">maximumSize</property>
<property type="Size">sizeIncrement</property>
<property type="Size">baseSize</property>
<property type="Color">paletteForegroundColor</property>
diff --git a/kstars/kstars/tools/argsetfilternumindi.ui b/kstars/kstars/tools/argsetfilternumindi.ui
index dbb9aff4..a5681d90 100644
--- a/kstars/kstars/tools/argsetfilternumindi.ui
+++ b/kstars/kstars/tools/argsetfilternumindi.ui
@@ -89,7 +89,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>27</width>
<height>21</height>
@@ -108,7 +108,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>9</height>
diff --git a/kstars/kstars/tools/argsetfocusspeedindi.ui b/kstars/kstars/tools/argsetfocusspeedindi.ui
index 07c37429..012ca14f 100644
--- a/kstars/kstars/tools/argsetfocusspeedindi.ui
+++ b/kstars/kstars/tools/argsetfocusspeedindi.ui
@@ -26,7 +26,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>9</height>
@@ -43,7 +43,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>45</width>
<height>21</height>
diff --git a/kstars/kstars/tools/argsetfocustimeoutindi.ui b/kstars/kstars/tools/argsetfocustimeoutindi.ui
index 63d2e9c3..0247bd6e 100644
--- a/kstars/kstars/tools/argsetfocustimeoutindi.ui
+++ b/kstars/kstars/tools/argsetfocustimeoutindi.ui
@@ -86,7 +86,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>27</width>
<height>21</height>
@@ -105,7 +105,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>9</height>
diff --git a/kstars/kstars/tools/argsetframetypeindi.ui b/kstars/kstars/tools/argsetframetypeindi.ui
index 31e7cf34..61dd9e9c 100644
--- a/kstars/kstars/tools/argsetframetypeindi.ui
+++ b/kstars/kstars/tools/argsetframetypeindi.ui
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>56</width>
<height>21</height>
@@ -99,7 +99,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>9</height>
diff --git a/kstars/kstars/tools/argsetgeolocation.ui b/kstars/kstars/tools/argsetgeolocation.ui
index 5318e530..1456e43d 100644
--- a/kstars/kstars/tools/argsetgeolocation.ui
+++ b/kstars/kstars/tools/argsetgeolocation.ui
@@ -117,7 +117,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>49</width>
<height>20</height>
@@ -152,7 +152,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>49</width>
<height>20</height>
@@ -171,7 +171,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kstars/kstars/tools/argsetgeolocationindi.ui b/kstars/kstars/tools/argsetgeolocationindi.ui
index 127d7b8f..9e7a5f6e 100644
--- a/kstars/kstars/tools/argsetgeolocationindi.ui
+++ b/kstars/kstars/tools/argsetgeolocationindi.ui
@@ -129,7 +129,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>23</height>
diff --git a/kstars/kstars/tools/argsetlocaltime.ui b/kstars/kstars/tools/argsetlocaltime.ui
index 623d263d..ef804797 100644
--- a/kstars/kstars/tools/argsetlocaltime.ui
+++ b/kstars/kstars/tools/argsetlocaltime.ui
@@ -39,7 +39,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>70</width>
<height>20</height>
@@ -69,7 +69,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kstars/kstars/tools/argsetportindi.ui b/kstars/kstars/tools/argsetportindi.ui
index 8472c2d0..215de8cc 100644
--- a/kstars/kstars/tools/argsetportindi.ui
+++ b/kstars/kstars/tools/argsetportindi.ui
@@ -62,7 +62,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>9</height>
diff --git a/kstars/kstars/tools/argsetradec.ui b/kstars/kstars/tools/argsetradec.ui
index e47fd936..f5d7eee0 100644
--- a/kstars/kstars/tools/argsetradec.ui
+++ b/kstars/kstars/tools/argsetradec.ui
@@ -100,7 +100,7 @@ Right Ascension is one of the coordinates in the Equatorial coordinate system.
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kstars/kstars/tools/argsetscopeactionindi.ui b/kstars/kstars/tools/argsetscopeactionindi.ui
index 3aea9afe..559083d2 100644
--- a/kstars/kstars/tools/argsetscopeactionindi.ui
+++ b/kstars/kstars/tools/argsetscopeactionindi.ui
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>56</width>
<height>21</height>
@@ -99,7 +99,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>9</height>
diff --git a/kstars/kstars/tools/argsettargetcoordindi.ui b/kstars/kstars/tools/argsettargetcoordindi.ui
index a047a74b..0876841e 100644
--- a/kstars/kstars/tools/argsettargetcoordindi.ui
+++ b/kstars/kstars/tools/argsettargetcoordindi.ui
@@ -129,7 +129,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>24</height>
diff --git a/kstars/kstars/tools/argsettargetnameindi.ui b/kstars/kstars/tools/argsettargetnameindi.ui
index 344ebd59..ed1bb8b8 100644
--- a/kstars/kstars/tools/argsettargetnameindi.ui
+++ b/kstars/kstars/tools/argsettargetnameindi.ui
@@ -88,7 +88,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>52</width>
<height>20</height>
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>8</height>
diff --git a/kstars/kstars/tools/argsettrack.ui b/kstars/kstars/tools/argsettrack.ui
index b6467496..e163e972 100644
--- a/kstars/kstars/tools/argsettrack.ui
+++ b/kstars/kstars/tools/argsettrack.ui
@@ -50,7 +50,7 @@ If unchecked, then Tracking will be forced off, even if an object has been cente
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -69,7 +69,7 @@ If unchecked, then Tracking will be forced off, even if an object has been cente
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kstars/kstars/tools/argsetutcindi.ui b/kstars/kstars/tools/argsetutcindi.ui
index 7a9d5f6a..8c79ee06 100644
--- a/kstars/kstars/tools/argsetutcindi.ui
+++ b/kstars/kstars/tools/argsetutcindi.ui
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -99,7 +99,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>9</height>
diff --git a/kstars/kstars/tools/argshutdownindi.ui b/kstars/kstars/tools/argshutdownindi.ui
index d09a9ce5..77a1053e 100644
--- a/kstars/kstars/tools/argshutdownindi.ui
+++ b/kstars/kstars/tools/argshutdownindi.ui
@@ -59,7 +59,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>33</height>
diff --git a/kstars/kstars/tools/argstartexposureindi.ui b/kstars/kstars/tools/argstartexposureindi.ui
index 7b6d0a78..163b2ae3 100644
--- a/kstars/kstars/tools/argstartexposureindi.ui
+++ b/kstars/kstars/tools/argstartexposureindi.ui
@@ -86,7 +86,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>27</width>
<height>21</height>
@@ -105,7 +105,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>9</height>
diff --git a/kstars/kstars/tools/argstartfocusindi.ui b/kstars/kstars/tools/argstartfocusindi.ui
index 8f014162..e4a39111 100644
--- a/kstars/kstars/tools/argstartfocusindi.ui
+++ b/kstars/kstars/tools/argstartfocusindi.ui
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>56</width>
<height>21</height>
@@ -99,7 +99,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>9</height>
diff --git a/kstars/kstars/tools/argstartindi.ui b/kstars/kstars/tools/argstartindi.ui
index 540441b0..308c2c79 100644
--- a/kstars/kstars/tools/argstartindi.ui
+++ b/kstars/kstars/tools/argstartindi.ui
@@ -57,7 +57,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>20</height>
@@ -108,7 +108,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kstars/kstars/tools/argswitchindi.ui b/kstars/kstars/tools/argswitchindi.ui
index f998c4be..6e83732e 100644
--- a/kstars/kstars/tools/argswitchindi.ui
+++ b/kstars/kstars/tools/argswitchindi.ui
@@ -57,7 +57,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>20</height>
@@ -111,7 +111,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>33</height>
diff --git a/kstars/kstars/tools/argtimescale.ui b/kstars/kstars/tools/argtimescale.ui
index cd55da63..dd5a9181 100644
--- a/kstars/kstars/tools/argtimescale.ui
+++ b/kstars/kstars/tools/argtimescale.ui
@@ -39,7 +39,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>150</width>
<height>20</height>
@@ -58,7 +58,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kstars/kstars/tools/argwaitfor.ui b/kstars/kstars/tools/argwaitfor.ui
index 77ea5077..523ddbeb 100644
--- a/kstars/kstars/tools/argwaitfor.ui
+++ b/kstars/kstars/tools/argwaitfor.ui
@@ -53,7 +53,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -72,7 +72,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kstars/kstars/tools/argwaitforkey.ui b/kstars/kstars/tools/argwaitforkey.ui
index 82876087..40459a55 100644
--- a/kstars/kstars/tools/argwaitforkey.ui
+++ b/kstars/kstars/tools/argwaitforkey.ui
@@ -55,7 +55,7 @@ Only simple keys can currently be used; you cannot use modifier keys such as Ctr
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -74,7 +74,7 @@ Only simple keys can currently be used; you cannot use modifier keys such as Ctr
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kstars/kstars/tools/argzoom.ui b/kstars/kstars/tools/argzoom.ui
index 5d1ea8e8..20e6f2a0 100644
--- a/kstars/kstars/tools/argzoom.ui
+++ b/kstars/kstars/tools/argzoom.ui
@@ -56,7 +56,7 @@ The Zoom level specifies the number of pixels which span one radian of arc. Rea
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -75,7 +75,7 @@ The Zoom level specifies the number of pixels which span one radian of arc. Rea
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kstars/kstars/tools/astrocalc.cpp b/kstars/kstars/tools/astrocalc.cpp
index bf477300..3383a1b8 100644
--- a/kstars/kstars/tools/astrocalc.cpp
+++ b/kstars/kstars/tools/astrocalc.cpp
@@ -374,7 +374,7 @@ void AstroCalc::genVlsrFrame(void)
rightPanel = Vlsr;
}
-TQSize AstroCalc::tqsizeHint() const
+TQSize AstroCalc::sizeHint() const
{
return TQSize(640,430);
}
diff --git a/kstars/kstars/tools/astrocalc.h b/kstars/kstars/tools/astrocalc.h
index fe8b5f49..44daeeb5 100644
--- a/kstars/kstars/tools/astrocalc.h
+++ b/kstars/kstars/tools/astrocalc.h
@@ -120,7 +120,7 @@ TQ_OBJECT
void delRightPanel(void);
/**@returns suggested size of calculator window. */
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
public slots:
/**Determine which item is selected in the function menu TQListBox.
diff --git a/kstars/kstars/tools/jmoontool.cpp b/kstars/kstars/tools/jmoontool.cpp
index 90303b38..7d7add93 100644
--- a/kstars/kstars/tools/jmoontool.cpp
+++ b/kstars/kstars/tools/jmoontool.cpp
@@ -49,14 +49,14 @@ JMoonTool::JMoonTool(TQWidget *parent, const char *name)
TQLabel *labGn = new TQLabel( "Ganymede", page );
TQLabel *labCa = new TQLabel( "Callisto", page );
- labIo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
- labEu->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
- labGn->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
- labCa->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
- labIo->tqsetAlignment( AlignHCenter );
- labEu->tqsetAlignment( AlignHCenter );
- labGn->tqsetAlignment( AlignHCenter );
- labCa->tqsetAlignment( AlignHCenter );
+ labIo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+ labEu->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+ labGn->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+ labCa->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+ labIo->setAlignment( AlignHCenter );
+ labEu->setAlignment( AlignHCenter );
+ labGn->setAlignment( AlignHCenter );
+ labCa->setAlignment( AlignHCenter );
labIo->setPaletteForegroundColor( colIo );
labEu->setPaletteForegroundColor( colEu );
diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp
index 3b5e4524..027172a3 100644
--- a/kstars/kstars/tools/lcgenerator.cpp
+++ b/kstars/kstars/tools/lcgenerator.cpp
@@ -72,7 +72,7 @@ void LCGenerator::createGUI()
StarInfoBox->tqlayout()->setSpacing( 6 );
StarInfoBox->tqlayout()->setMargin( 11 );
StarInfoBoxLayout = new TQVBoxLayout( StarInfoBox->tqlayout() );
- StarInfoBoxLayout->tqsetAlignment( TQt::AlignTop );
+ StarInfoBoxLayout->setAlignment( TQt::AlignTop );
DesignHLayout = new TQHBoxLayout( 0, 0, 6, "DesignHLayout");
@@ -128,7 +128,7 @@ void LCGenerator::createGUI()
DataSelectBox->tqlayout()->setSpacing( 6 );
DataSelectBox->tqlayout()->setMargin( 11 );
DataSelectBoxLayout = new TQVBoxLayout( DataSelectBox->tqlayout() );
- DataSelectBoxLayout->tqsetAlignment( TQt::AlignTop );
+ DataSelectBoxLayout->setAlignment( TQt::AlignTop );
VisualCheck = new TQCheckBox( DataSelectBox, "VisualCheck" );
VisualCheck->setChecked( TRUE );
diff --git a/kstars/kstars/tools/modcalcangdistdlg.ui b/kstars/kstars/tools/modcalcangdistdlg.ui
index 77b92b4b..589490b3 100644
--- a/kstars/kstars/tools/modcalcangdistdlg.ui
+++ b/kstars/kstars/tools/modcalcangdistdlg.ui
@@ -57,7 +57,7 @@
<property name="name">
<cstring>ra0Box</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -71,7 +71,7 @@
<property name="name">
<cstring>dec0Box</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -114,7 +114,7 @@
<property name="name">
<cstring>ra1Box</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -128,7 +128,7 @@
<property name="name">
<cstring>dec1Box</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>145</width>
<height>20</height>
@@ -201,7 +201,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>146</width>
<height>20</height>
@@ -226,7 +226,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>145</width>
<height>20</height>
@@ -256,7 +256,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>102</width>
<height>20</height>
@@ -275,7 +275,7 @@
<property name="name">
<cstring>distBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -295,7 +295,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>70</width>
<height>20</height>
@@ -314,7 +314,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>171</height>
@@ -541,7 +541,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>151</width>
<height>21</height>
@@ -574,7 +574,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>131</width>
<height>21</height>
@@ -593,7 +593,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
diff --git a/kstars/kstars/tools/modcalcapcoord.cpp b/kstars/kstars/tools/modcalcapcoord.cpp
index 17dfb81f..6eecfe6b 100644
--- a/kstars/kstars/tools/modcalcapcoord.cpp
+++ b/kstars/kstars/tools/modcalcapcoord.cpp
@@ -64,7 +64,7 @@ void modCalcApCoord::showCurrentTime (void)
{
KStars *ks = (KStars*) parent()->parent()->parent();
- KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() );
+ KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() );
datBox->setDate( dt.date() );
timBox->setTime( dt.time() );
}
@@ -98,7 +98,7 @@ void modCalcApCoord::slotClearCoords(){
rafBox->clearFields();
decfBox->clearFields();
epoch0Name->setText("");
- datBox->setDate(ExtDate::tqcurrentDate());
+ datBox->setDate(ExtDate::currentDate());
timBox->setTime(TQTime(0,0,0));
}
diff --git a/kstars/kstars/tools/modcalcapcoorddlg.ui b/kstars/kstars/tools/modcalcapcoorddlg.ui
index 9953b588..ae08f3a5 100644
--- a/kstars/kstars/tools/modcalcapcoorddlg.ui
+++ b/kstars/kstars/tools/modcalcapcoorddlg.ui
@@ -82,7 +82,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -98,7 +98,7 @@
<property name="name">
<cstring>datBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -125,7 +125,7 @@
<property name="name">
<cstring>ra0Box</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -139,7 +139,7 @@
<property name="name">
<cstring>dec0Box</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -208,7 +208,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>20</height>
@@ -233,7 +233,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>70</width>
<height>20</height>
@@ -258,7 +258,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>91</width>
<height>20</height>
@@ -288,7 +288,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>102</width>
<height>20</height>
@@ -323,7 +323,7 @@
<property name="name">
<cstring>rafBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -337,7 +337,7 @@
<property name="name">
<cstring>decfBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -359,7 +359,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>70</width>
<height>20</height>
@@ -378,7 +378,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>70</height>
@@ -440,7 +440,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -457,7 +457,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -526,7 +526,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -641,7 +641,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>151</width>
<height>21</height>
@@ -674,7 +674,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>131</width>
<height>21</height>
@@ -693,7 +693,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
diff --git a/kstars/kstars/tools/modcalcazel.cpp b/kstars/kstars/tools/modcalcazel.cpp
index 818488f5..b405175b 100644
--- a/kstars/kstars/tools/modcalcazel.cpp
+++ b/kstars/kstars/tools/modcalcazel.cpp
@@ -81,7 +81,7 @@ void modCalcAzel::showCurrentDateTime (void)
{
KStars *ks = (KStars*) parent()->parent()->parent();
- KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() );
+ KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() );
datBox->setDate( dt.date() );
timBox->setTime( dt.time() );
@@ -179,7 +179,7 @@ void modCalcAzel::slotClearCoords()
elBox->clearFields();
epochName->setText("");
- datBox->setDate(ExtDate::tqcurrentDate());
+ datBox->setDate(ExtDate::currentDate());
timBox->setTime(TQTime(0,0,0));
}
diff --git a/kstars/kstars/tools/modcalcazeldlg.ui b/kstars/kstars/tools/modcalcazeldlg.ui
index 1b4b9d2d..5b2dc953 100644
--- a/kstars/kstars/tools/modcalcazeldlg.ui
+++ b/kstars/kstars/tools/modcalcazeldlg.ui
@@ -105,7 +105,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -132,7 +132,7 @@
<property name="name">
<cstring>longBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -154,7 +154,7 @@
<property name="name">
<cstring>latBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -218,13 +218,13 @@
<property name="name">
<cstring>Compute</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>120</width>
<height>32767</height>
@@ -238,13 +238,13 @@
<property name="name">
<cstring>Clear</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>120</width>
<height>32767</height>
@@ -290,7 +290,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -312,7 +312,7 @@
<property name="name">
<cstring>decBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -334,7 +334,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -361,7 +361,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -383,7 +383,7 @@
<property name="name">
<cstring>azBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -413,7 +413,7 @@
<property name="name">
<cstring>elBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -437,7 +437,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>77</height>
@@ -557,7 +557,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -574,7 +574,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -615,7 +615,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -632,7 +632,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -649,7 +649,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -677,7 +677,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -713,7 +713,7 @@
<property name="name">
<cstring>dateBoxBatch</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -817,7 +817,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>151</width>
<height>21</height>
@@ -850,7 +850,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>131</width>
<height>21</height>
@@ -869,7 +869,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
diff --git a/kstars/kstars/tools/modcalcdaylength.cpp b/kstars/kstars/tools/modcalcdaylength.cpp
index 08f836d2..97346c94 100644
--- a/kstars/kstars/tools/modcalcdaylength.cpp
+++ b/kstars/kstars/tools/modcalcdaylength.cpp
@@ -40,7 +40,7 @@ modCalcDayLength::~modCalcDayLength() {}
void modCalcDayLength::showCurrentDate (void)
{
- KStarsDateTime dt( KStarsDateTime::tqcurrentDateTime() );
+ KStarsDateTime dt( KStarsDateTime::currentDateTime() );
datBox->setDate( dt.date() );
}
@@ -71,7 +71,7 @@ void modCalcDayLength::slotClearCoords(){
elTransitBox->clearFields();
// reset to current date
- datBox->setDate(ExtDate::tqcurrentDate());
+ datBox->setDate(ExtDate::currentDate());
// reset times to 00:00:00
setTimeBox->clearFields();
diff --git a/kstars/kstars/tools/modcalcdaylengthdlg.ui b/kstars/kstars/tools/modcalcdaylengthdlg.ui
index 458c7442..cb14f3d5 100644
--- a/kstars/kstars/tools/modcalcdaylengthdlg.ui
+++ b/kstars/kstars/tools/modcalcdaylengthdlg.ui
@@ -56,7 +56,7 @@
<property name="name">
<cstring>latBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>16</height>
@@ -78,7 +78,7 @@
<property name="name">
<cstring>longBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>16</height>
@@ -100,7 +100,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>60</width>
<height>20</height>
@@ -127,7 +127,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
@@ -147,7 +147,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -174,7 +174,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>21</height>
@@ -199,7 +199,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -224,7 +224,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>20</height>
@@ -264,7 +264,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>90</width>
<height>20</height>
@@ -294,7 +294,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>90</width>
<height>20</height>
@@ -332,7 +332,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>90</width>
<height>20</height>
@@ -354,7 +354,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>90</width>
<height>20</height>
@@ -384,7 +384,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -427,7 +427,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -457,7 +457,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -479,7 +479,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -499,7 +499,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -518,7 +518,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -537,7 +537,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>110</height>
diff --git a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui
index 3430d683..ac400e73 100644
--- a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui
+++ b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui
@@ -58,7 +58,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>97</width>
<height>21</height>
@@ -86,7 +86,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>96</width>
<height>21</height>
@@ -114,7 +114,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>97</width>
<height>21</height>
@@ -141,7 +141,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>21</height>
@@ -166,7 +166,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>21</height>
@@ -191,7 +191,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>21</height>
@@ -231,7 +231,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -261,7 +261,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -318,7 +318,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -372,7 +372,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -394,7 +394,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -416,7 +416,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>230</width>
<height>20</height>
@@ -437,7 +437,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>110</height>
@@ -486,7 +486,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -503,7 +503,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -548,7 +548,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -565,7 +565,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -742,7 +742,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>151</width>
<height>21</height>
@@ -775,7 +775,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>131</width>
<height>21</height>
@@ -794,7 +794,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>16</height>
diff --git a/kstars/kstars/tools/modcalcequinox.cpp b/kstars/kstars/tools/modcalcequinox.cpp
index 45f66940..416f47e7 100644
--- a/kstars/kstars/tools/modcalcequinox.cpp
+++ b/kstars/kstars/tools/modcalcequinox.cpp
@@ -56,7 +56,7 @@ int modCalcEquinox::getYear (TQString eName)
void modCalcEquinox::showCurrentYear (void)
{
- KStarsDateTime dt( KStarsDateTime::tqcurrentDateTime() );
+ KStarsDateTime dt( KStarsDateTime::currentDateTime() );
yearEdit->setText( TQString( "%1").tqarg( dt.date().year() ) );
}
diff --git a/kstars/kstars/tools/modcalcequinoxdlg.ui b/kstars/kstars/tools/modcalcequinoxdlg.ui
index 2c459b93..91d918ab 100644
--- a/kstars/kstars/tools/modcalcequinoxdlg.ui
+++ b/kstars/kstars/tools/modcalcequinoxdlg.ui
@@ -61,7 +61,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>70</width>
<height>21</height>
@@ -103,7 +103,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -133,7 +133,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>31</height>
@@ -160,7 +160,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>20</height>
@@ -185,7 +185,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -210,7 +210,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>91</width>
<height>21</height>
@@ -271,7 +271,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>237</height>
@@ -334,7 +334,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>111</width>
<height>21</height>
@@ -446,7 +446,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>151</width>
<height>21</height>
@@ -479,7 +479,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>131</width>
<height>21</height>
@@ -498,7 +498,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>71</height>
diff --git a/kstars/kstars/tools/modcalcgalcoorddlg.ui b/kstars/kstars/tools/modcalcgalcoorddlg.ui
index e1741cb4..76c1c91a 100644
--- a/kstars/kstars/tools/modcalcgalcoorddlg.ui
+++ b/kstars/kstars/tools/modcalcgalcoorddlg.ui
@@ -58,7 +58,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>97</width>
<height>21</height>
@@ -86,7 +86,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>96</width>
<height>21</height>
@@ -114,7 +114,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>97</width>
<height>21</height>
@@ -141,7 +141,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>21</height>
@@ -166,7 +166,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>21</height>
@@ -191,7 +191,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>21</height>
@@ -231,7 +231,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -261,7 +261,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -318,7 +318,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>15</width>
<height>20</height>
@@ -372,7 +372,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -394,7 +394,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -420,7 +420,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>160</height>
@@ -469,7 +469,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -486,7 +486,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -601,7 +601,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -618,7 +618,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -725,7 +725,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>151</width>
<height>21</height>
@@ -758,7 +758,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>131</width>
<height>21</height>
@@ -777,7 +777,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>71</height>
diff --git a/kstars/kstars/tools/modcalcgeoddlg.ui b/kstars/kstars/tools/modcalcgeoddlg.ui
index bb74be14..7e31adde 100644
--- a/kstars/kstars/tools/modcalcgeoddlg.ui
+++ b/kstars/kstars/tools/modcalcgeoddlg.ui
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>20</height>
@@ -153,7 +153,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -178,7 +178,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>91</width>
<height>21</height>
@@ -262,7 +262,7 @@
<property name="name">
<cstring>lonGeoBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>70</width>
<height>0</height>
@@ -276,7 +276,7 @@
<property name="name">
<cstring>latGeoBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>70</width>
<height>0</height>
@@ -332,7 +332,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>120</height>
@@ -600,7 +600,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>151</width>
<height>21</height>
@@ -633,7 +633,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>131</width>
<height>21</height>
@@ -652,7 +652,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>41</height>
diff --git a/kstars/kstars/tools/modcalcjd.cpp b/kstars/kstars/tools/modcalcjd.cpp
index 7fb71c4c..8b87b998 100644
--- a/kstars/kstars/tools/modcalcjd.cpp
+++ b/kstars/kstars/tools/modcalcjd.cpp
@@ -95,7 +95,7 @@ void modCalcJD::slotClearTime (void)
{
JdName->setText ("");
MjdName->setText ("");
- datBox->setDate( ExtDate::tqcurrentDate() );
+ datBox->setDate( ExtDate::currentDate() );
timBox->setTime(TQTime(0,0,0));
}
@@ -103,7 +103,7 @@ void modCalcJD::showCurrentTime (void)
{
KStars *ks = (KStars*) parent()->parent()->parent();
- KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() );
+ KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() );
datBox->setDate( dt.date() );
timBox->setTime( dt.time() );
computeFromCalendar();
diff --git a/kstars/kstars/tools/modcalcjddlg.ui b/kstars/kstars/tools/modcalcjddlg.ui
index c94441cc..66839f81 100644
--- a/kstars/kstars/tools/modcalcjddlg.ui
+++ b/kstars/kstars/tools/modcalcjddlg.ui
@@ -129,7 +129,7 @@
<property name="name">
<cstring>JdName</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>130</width>
<height>0</height>
@@ -161,7 +161,7 @@
<property name="name">
<cstring>MjdName</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>130</width>
<height>0</height>
@@ -193,7 +193,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -212,7 +212,7 @@
<property name="name">
<cstring>timBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -229,7 +229,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -256,7 +256,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -273,7 +273,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -300,7 +300,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>23</width>
<height>20</height>
@@ -333,7 +333,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>39</width>
<height>21</height>
@@ -352,13 +352,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>30</height>
@@ -378,7 +378,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>37</width>
<height>20</height>
@@ -397,13 +397,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>30</height>
@@ -423,7 +423,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>38</width>
<height>20</height>
@@ -442,7 +442,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
diff --git a/kstars/kstars/tools/modcalcplanets.cpp b/kstars/kstars/tools/modcalcplanets.cpp
index 8273f6be..42545737 100644
--- a/kstars/kstars/tools/modcalcplanets.cpp
+++ b/kstars/kstars/tools/modcalcplanets.cpp
@@ -51,7 +51,7 @@ modCalcPlanets::~modCalcPlanets(){
void modCalcPlanets::showCurrentDateTime (void)
{
KStars *ks = (KStars*) parent()->parent()->parent(); // TQSplitter->AstroCalc->KStars
- KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() );
+ KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() );
dateBox->setDate( dt.date() );
timeBox->setTime( dt.time() );
diff --git a/kstars/kstars/tools/modcalcplanetsdlg.ui b/kstars/kstars/tools/modcalcplanetsdlg.ui
index 2f25aa40..0f781ad1 100644
--- a/kstars/kstars/tools/modcalcplanetsdlg.ui
+++ b/kstars/kstars/tools/modcalcplanetsdlg.ui
@@ -63,7 +63,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>21</height>
@@ -148,7 +148,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>151</width>
<height>21</height>
@@ -177,7 +177,7 @@
<property name="name">
<cstring>dateBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
@@ -199,7 +199,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -234,7 +234,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>50</width>
<height>20</height>
@@ -261,7 +261,7 @@
<property name="name">
<cstring>longBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -283,7 +283,7 @@
<property name="name">
<cstring>latBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -305,7 +305,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -347,7 +347,7 @@
<property name="name">
<cstring>raBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -374,7 +374,7 @@
<property name="name">
<cstring>decBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -393,7 +393,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -433,7 +433,7 @@
<property name="name">
<cstring>altBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -452,7 +452,7 @@
<property name="name">
<cstring>azBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -471,7 +471,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -513,7 +513,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -535,7 +535,7 @@
<property name="name">
<cstring>helLongBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -554,7 +554,7 @@
<property name="name">
<cstring>helLatBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -581,7 +581,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -616,7 +616,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -638,7 +638,7 @@
<property name="name">
<cstring>geoLongBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -649,7 +649,7 @@
<property name="name">
<cstring>geoLatBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -676,7 +676,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -703,7 +703,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>111</width>
<height>20</height>
@@ -728,7 +728,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -753,7 +753,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>91</width>
<height>20</height>
@@ -772,7 +772,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>60</height>
@@ -829,7 +829,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -857,7 +857,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -882,7 +882,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -1159,7 +1159,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>151</width>
<height>21</height>
@@ -1192,7 +1192,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>131</width>
<height>21</height>
@@ -1211,7 +1211,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
diff --git a/kstars/kstars/tools/modcalcprec.cpp b/kstars/kstars/tools/modcalcprec.cpp
index 05ef4718..10665daa 100644
--- a/kstars/kstars/tools/modcalcprec.cpp
+++ b/kstars/kstars/tools/modcalcprec.cpp
@@ -63,7 +63,7 @@ TQString modCalcPrec:: showCurrentEpoch () {
}
double modCalcPrec::setCurrentEpoch () {
- return KStarsDateTime::tqcurrentDateTime().epoch();
+ return KStarsDateTime::currentDateTime().epoch();
}
double modCalcPrec::getEpoch (TQString eName) {
diff --git a/kstars/kstars/tools/modcalcprecdlg.ui b/kstars/kstars/tools/modcalcprecdlg.ui
index 3811922b..57f720ba 100644
--- a/kstars/kstars/tools/modcalcprecdlg.ui
+++ b/kstars/kstars/tools/modcalcprecdlg.ui
@@ -55,7 +55,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>98</width>
<height>20</height>
@@ -140,7 +140,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>98</width>
<height>20</height>
@@ -167,7 +167,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>91</width>
<height>20</height>
@@ -192,7 +192,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -217,7 +217,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>91</width>
<height>21</height>
@@ -236,7 +236,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -264,7 +264,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>90</width>
<height>20</height>
@@ -323,7 +323,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>90</width>
<height>20</height>
@@ -342,7 +342,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>70</height>
@@ -567,7 +567,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>151</width>
<height>21</height>
@@ -600,7 +600,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>131</width>
<height>21</height>
@@ -619,7 +619,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>30</height>
diff --git a/kstars/kstars/tools/modcalcsidtime.cpp b/kstars/kstars/tools/modcalcsidtime.cpp
index d973d902..987087ba 100644
--- a/kstars/kstars/tools/modcalcsidtime.cpp
+++ b/kstars/kstars/tools/modcalcsidtime.cpp
@@ -99,7 +99,7 @@ dms modCalcSidTime::getLongitude( void )
}
void modCalcSidTime::slotClearFields(){
- datBox->setDate(ExtDate::tqcurrentDate());
+ datBox->setDate(ExtDate::currentDate());
TQTime time(0,0,0);
UtBox->setTime(time);
StBox->setTime(time);
diff --git a/kstars/kstars/tools/modcalcsidtimedlg.ui b/kstars/kstars/tools/modcalcsidtimedlg.ui
index 055446fd..37c5e7cd 100644
--- a/kstars/kstars/tools/modcalcsidtimedlg.ui
+++ b/kstars/kstars/tools/modcalcsidtimedlg.ui
@@ -111,7 +111,7 @@
<property name="name">
<cstring>longBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -125,7 +125,7 @@
<property name="name">
<cstring>datBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -157,7 +157,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>21</height>
@@ -182,7 +182,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>21</height>
@@ -207,7 +207,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -245,7 +245,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -275,7 +275,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -305,7 +305,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -335,7 +335,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -356,7 +356,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>204</height>
@@ -391,7 +391,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>90</width>
<height>0</height>
@@ -452,7 +452,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -474,7 +474,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -501,7 +501,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -559,7 +559,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -663,7 +663,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>151</width>
<height>21</height>
@@ -696,7 +696,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>131</width>
<height>21</height>
@@ -715,7 +715,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>16</height>
diff --git a/kstars/kstars/tools/modcalcvlsr.cpp b/kstars/kstars/tools/modcalcvlsr.cpp
index 5a499c5c..fe5ca2e8 100644
--- a/kstars/kstars/tools/modcalcvlsr.cpp
+++ b/kstars/kstars/tools/modcalcvlsr.cpp
@@ -143,7 +143,7 @@ void modCalcVlsr::showCurrentDateTime (void)
{
KStars *ks = (KStars*) parent()->parent()->parent();
- KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() );
+ KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() );
datBox->setDate( dt.date() );
timBox->setTime( dt.time() );
@@ -212,7 +212,7 @@ void modCalcVlsr::slotClearCoords()
vGeoBox->setText("");
vTopoBox->setText("");
- datBox->setDate(ExtDate::tqcurrentDate());
+ datBox->setDate(ExtDate::currentDate());
timBox->setTime(TQTime(0,0,0));
}
diff --git a/kstars/kstars/tools/modcalcvlsrdlg.ui b/kstars/kstars/tools/modcalcvlsrdlg.ui
index e096407d..ce0a1693 100644
--- a/kstars/kstars/tools/modcalcvlsrdlg.ui
+++ b/kstars/kstars/tools/modcalcvlsrdlg.ui
@@ -63,7 +63,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -93,7 +93,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -136,7 +136,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -155,7 +155,7 @@
<property name="name">
<cstring>heightBox</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>1000</width>
<height>32767</height>
@@ -169,7 +169,7 @@
<property name="name">
<cstring>longBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -207,7 +207,7 @@
<property name="name">
<cstring>latBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -239,7 +239,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>120</width>
<height>31</height>
@@ -272,7 +272,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -294,7 +294,7 @@
<property name="name">
<cstring>decBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -316,7 +316,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -343,7 +343,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>100</width>
<height>20</height>
@@ -435,7 +435,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>21</height>
@@ -510,13 +510,13 @@
<property name="name">
<cstring>Compute</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>120</width>
<height>32767</height>
@@ -530,13 +530,13 @@
<property name="name">
<cstring>Clear</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>120</width>
<height>32767</height>
@@ -558,7 +558,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -675,7 +675,7 @@
<property name="name">
<cstring>dateBoxBatch</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -689,7 +689,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -706,7 +706,7 @@
<property name="enabled">
<bool>false</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -736,7 +736,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -764,7 +764,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
@@ -953,7 +953,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>151</width>
<height>21</height>
@@ -986,7 +986,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>131</width>
<height>21</height>
@@ -1005,7 +1005,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
diff --git a/kstars/kstars/tools/observinglistui.ui b/kstars/kstars/tools/observinglistui.ui
index 57a1403b..07922d8e 100644
--- a/kstars/kstars/tools/observinglistui.ui
+++ b/kstars/kstars/tools/observinglistui.ui
@@ -39,13 +39,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -73,13 +73,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -107,13 +107,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -141,13 +141,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -173,7 +173,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>350</width>
<height>20</height>
@@ -192,13 +192,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -350,7 +350,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -488,7 +488,7 @@
<verstretch>4</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>100</height>
@@ -534,13 +534,13 @@
<verstretch>1</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>100</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>160</height>
diff --git a/kstars/kstars/tools/obslistwizardui.ui b/kstars/kstars/tools/obslistwizardui.ui
index b5bb1eaf..cf4ed2d9 100644
--- a/kstars/kstars/tools/obslistwizardui.ui
+++ b/kstars/kstars/tools/obslistwizardui.ui
@@ -273,7 +273,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>90</height>
@@ -371,7 +371,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -393,7 +393,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -455,7 +455,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -477,7 +477,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -496,7 +496,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>215</height>
@@ -574,7 +574,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -596,7 +596,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -629,7 +629,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>170</height>
@@ -669,7 +669,7 @@
<property name="name">
<cstring>Date</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>160</width>
<height>0</height>
@@ -686,7 +686,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -752,7 +752,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -780,7 +780,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -799,7 +799,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>176</height>
@@ -861,7 +861,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>295</width>
<height>20</height>
@@ -895,7 +895,7 @@ have &amp;no magnitude</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>179</height>
diff --git a/kstars/kstars/tools/optionstreeview.ui b/kstars/kstars/tools/optionstreeview.ui
index 4a9e11e3..5e4e66b2 100644
--- a/kstars/kstars/tools/optionstreeview.ui
+++ b/kstars/kstars/tools/optionstreeview.ui
@@ -78,7 +78,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>80</width>
<height>20</height>
diff --git a/kstars/kstars/tools/planetviewer.cpp b/kstars/kstars/tools/planetviewer.cpp
index d036b925..bde44c2c 100644
--- a/kstars/kstars/tools/planetviewer.cpp
+++ b/kstars/kstars/tools/planetviewer.cpp
@@ -233,7 +233,7 @@ PVPlotWidget::PVPlotWidget( double x1, double x2, double y1, double y2, TQWidget
mouseButtonDown(false), oldx(0), oldy(0) {
setFocusPolicy( TQ_StrongFocus );
setMouseTracking (true);
- pv = (PlanetViewer*)tqtopLevelWidget();
+ pv = (PlanetViewer*)topLevelWidget();
}
PVPlotWidget::PVPlotWidget( TQWidget *parent, const char *name ) :
@@ -241,7 +241,7 @@ PVPlotWidget::PVPlotWidget( TQWidget *parent, const char *name ) :
mouseButtonDown(false), oldx(0), oldy(0) {
setFocusPolicy( TQ_StrongFocus );
setMouseTracking (true);
- pv = (PlanetViewer*)tqtopLevelWidget();
+ pv = (PlanetViewer*)topLevelWidget();
}
PVPlotWidget::~ PVPlotWidget() {}
@@ -416,7 +416,7 @@ void PVPlotWidget::mouseMoveEvent( TQMouseEvent *e ) {
setLimits( xc - 0.5*dataWidth(), xc + 0.5*dataWidth(),
yc - 0.5*dataHeight(), yc + 0.5*dataHeight() );
update();
- kapp->tqprocessEvents(20);
+ kapp->processEvents(20);
}
oldx = e->x();
diff --git a/kstars/kstars/tools/planetviewerui.ui b/kstars/kstars/tools/planetviewerui.ui
index d2ac73a7..acd5a81c 100644
--- a/kstars/kstars/tools/planetviewerui.ui
+++ b/kstars/kstars/tools/planetviewerui.ui
@@ -44,7 +44,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>34</width>
<height>34</height>
@@ -69,7 +69,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>120</width>
<height>20</height>
diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp
index 183b22d4..ff9d48f5 100644
--- a/kstars/kstars/tools/scriptbuilder.cpp
+++ b/kstars/kstars/tools/scriptbuilder.cpp
@@ -903,7 +903,7 @@ void ScriptBuilder::slotRunScript() {
if ( ! p.start( KProcess::DontCare ) )
kdDebug() << "Process did not start." << endl;
- while ( p.isRunning() ) kapp->tqprocessEvents( 50 ); //otherwise tempfile may get deleted before script completes.
+ while ( p.isRunning() ) kapp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes.
//delete temp file
if ( f.exists() ) f.remove();
@@ -920,7 +920,7 @@ void ScriptBuilder::writeScript( TQTextStream &ostream ) {
ostream << "#!/bin/bash" << endl;
ostream << "#KStars DCOP script: " << currentScriptName << endl;
ostream << "#by " << currentAuthor << endl;
- ostream << "#last modified: " << KStarsDateTime::tqcurrentDateTime().toString() << endl;
+ ostream << "#last modified: " << KStarsDateTime::currentDateTime().toString() << endl;
ostream << "#" << endl;
ostream << "KSTARS=`dcopfind -a 'kstars*'`" << endl;
ostream << "MAIN=KStarsInterface" << endl;
@@ -1322,7 +1322,7 @@ void ScriptBuilder::slotArgWidget() {
if (ok) month = sf->argVal(1).toInt(&ok);
if (ok) day = sf->argVal(2).toInt(&ok);
if (ok) argSetLocalTime->DateBox->setDate( ExtDate( year, month, day ) );
- else argSetLocalTime->DateBox->setDate( ExtDate::tqcurrentDate() );
+ else argSetLocalTime->DateBox->setDate( ExtDate::currentDate() );
hour = sf->argVal(3).toInt(&ok);
if ( sf->argVal(3).isEmpty() ) ok = false;
diff --git a/kstars/kstars/tools/scriptbuilderui.ui b/kstars/kstars/tools/scriptbuilderui.ui
index 7b6d8feb..aecbe3e9 100644
--- a/kstars/kstars/tools/scriptbuilderui.ui
+++ b/kstars/kstars/tools/scriptbuilderui.ui
@@ -39,13 +39,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -73,13 +73,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -107,13 +107,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -141,13 +141,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -167,13 +167,13 @@
<property name="name">
<cstring>RunButton</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -199,7 +199,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>490</width>
<height>20</height>
@@ -277,13 +277,13 @@
<property name="name">
<cstring>AddButton</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -304,13 +304,13 @@
<property name="name">
<cstring>RemoveButton</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -330,13 +330,13 @@
<property name="name">
<cstring>CopyButton</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -356,13 +356,13 @@
<property name="name">
<cstring>UpButton</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -382,13 +382,13 @@
<property name="name">
<cstring>DownButton</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -414,7 +414,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>118</height>
@@ -437,7 +437,7 @@
<verstretch>1</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>140</height>
@@ -602,7 +602,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>91</width>
<height>20</height>
diff --git a/kstars/kstars/tools/scriptnamedialog.ui b/kstars/kstars/tools/scriptnamedialog.ui
index fb176c14..c19007a9 100644
--- a/kstars/kstars/tools/scriptnamedialog.ui
+++ b/kstars/kstars/tools/scriptnamedialog.ui
@@ -91,7 +91,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>330</width>
<height>20</height>
diff --git a/kstars/kstars/tools/wutdialogui.ui b/kstars/kstars/tools/wutdialogui.ui
index 2bdeb50e..77d52ee5 100644
--- a/kstars/kstars/tools/wutdialogui.ui
+++ b/kstars/kstars/tools/wutdialogui.ui
@@ -47,7 +47,7 @@
<property name="name">
<cstring>LocationLabel</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -78,7 +78,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -95,7 +95,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -106,7 +106,7 @@
<property name="name">
<cstring>DateLabel</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -141,7 +141,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>108</width>
<height>20</height>
@@ -241,7 +241,7 @@
<property name="name">
<cstring>SunRiseLabel</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -261,7 +261,7 @@
<property name="name">
<cstring>MoonRiseLabel</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -281,7 +281,7 @@
<property name="name">
<cstring>MoonSetLabel</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -301,7 +301,7 @@
<property name="name">
<cstring>SunSetLabel</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -321,7 +321,7 @@
<property name="name">
<cstring>NightDurationLabel</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -341,7 +341,7 @@
<property name="name">
<cstring>MoonIllumLabel</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -377,7 +377,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>164</width>
<height>12</height>
@@ -402,7 +402,7 @@
<property name="name">
<cstring>ObjectListBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@@ -478,7 +478,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -519,7 +519,7 @@
<property name="name">
<cstring>CategoryListBox</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp
index cf6bd2e3..432fa386 100644
--- a/ktouch/src/ktouch.cpp
+++ b/ktouch/src/ktouch.cpp
@@ -75,7 +75,7 @@ KTouch::KTouch()
setupActions();
// create the GUI reading the ui.rc file
if (!initialGeometrySet())
- resize( TQSize(700, 510).expandedTo(tqminimumSizeHint()));
+ resize( TQSize(700, 510).expandedTo(minimumSizeHint()));
setupGUI(ToolBar | Keys | StatusBar | Create);
setAutoSaveSettings();
// Read user statistics
@@ -659,11 +659,11 @@ void KTouch::initTrainingSession() {
// keyboard grow according to their vertical stretch factors (see last argument in the constructors
// of TQSizePolicy)
TQVBox * mainLayout = new TQVBox( this );
- m_statusWidget = new KTouchtqStatus( mainLayout );
+ m_statusWidget = new KTouchStatus( mainLayout );
m_slideLineWidget = new KTouchSlideLine( mainLayout );
- m_slideLineWidget->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 0, 1) );
+ m_slideLineWidget->setSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 0, 1) );
m_keyboardWidget = new KTouchKeyboardWidget( mainLayout );
- m_keyboardWidget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 0, 3) );
+ m_keyboardWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 0, 3) );
setCentralWidget(mainLayout);
// apply the settings to the widgets
m_slideLineWidget->applyPreferences();
diff --git a/ktouch/src/ktouch.h b/ktouch/src/ktouch.h
index 4703fd92..620dfb49 100644
--- a/ktouch/src/ktouch.h
+++ b/ktouch/src/ktouch.h
@@ -30,7 +30,7 @@ class KToggleAction;
class KActionMenu;
class KSelectAction;
-class KTouchtqStatus;
+class KTouchStatus;
class KTouchSlideLine;
class KTouchKeyboardWidget;
class KTouchTrainer;
@@ -154,7 +154,7 @@ class KTouch : public KMainWindow {
KSelectAction *m_keyboardColorAction;
KSelectAction *m_defaultLectureAction;
- KTouchtqStatus *m_statusWidget; ///< Pointer to the status widget on top of the main widget.
+ KTouchStatus *m_statusWidget; ///< Pointer to the status widget on top of the main widget.
KTouchSlideLine *m_slideLineWidget; ///< Pointer to the sliding line widget.
KTouchKeyboardWidget *m_keyboardWidget; ///< Pointer to the keyboard widget.
KTouchTrainer *m_trainer; ///< The training 'master' (runs the training).
diff --git a/ktouch/src/ktouchcoloreditor_dlg.ui b/ktouch/src/ktouchcoloreditor_dlg.ui
index 0be9d5f2..2e13f7d0 100644
--- a/ktouch/src/ktouchcoloreditor_dlg.ui
+++ b/ktouch/src/ktouchcoloreditor_dlg.ui
@@ -31,7 +31,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -99,7 +99,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -211,7 +211,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -246,7 +246,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -337,7 +337,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -383,7 +383,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -400,7 +400,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -417,7 +417,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -514,7 +514,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/ktouch/src/ktouchkeyboardeditor_dlg.ui b/ktouch/src/ktouchkeyboardeditor_dlg.ui
index 14c1c6bb..23c88168 100644
--- a/ktouch/src/ktouchkeyboardeditor_dlg.ui
+++ b/ktouch/src/ktouchkeyboardeditor_dlg.ui
@@ -45,7 +45,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -128,7 +128,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>100</height>
@@ -290,7 +290,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>70</height>
diff --git a/ktouch/src/ktouchlectureeditor_dlg.ui b/ktouch/src/ktouchlectureeditor_dlg.ui
index a4e8f989..bbe6cc8d 100644
--- a/ktouch/src/ktouchlectureeditor_dlg.ui
+++ b/ktouch/src/ktouchlectureeditor_dlg.ui
@@ -87,7 +87,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>70</height>
@@ -165,13 +165,13 @@
<property name="name">
<cstring>upBtn</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>35</width>
<height>28</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>32767</height>
@@ -188,13 +188,13 @@
<property name="name">
<cstring>downBtn</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>35</width>
<height>28</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>32767</height>
@@ -211,13 +211,13 @@
<property name="name">
<cstring>newBtn</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>35</width>
<height>28</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>32767</height>
@@ -242,13 +242,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>35</width>
<height>28</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>32767</height>
@@ -273,7 +273,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -358,7 +358,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -383,7 +383,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -510,7 +510,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>248</width>
<height>20</height>
diff --git a/ktouch/src/ktouchopenrequest_dlg.ui b/ktouch/src/ktouchopenrequest_dlg.ui
index f878335f..d224bce3 100644
--- a/ktouch/src/ktouchopenrequest_dlg.ui
+++ b/ktouch/src/ktouchopenrequest_dlg.ui
@@ -42,7 +42,7 @@
<property name="name">
<cstring>currentRadioBtn</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -56,7 +56,7 @@
<property name="name">
<cstring>presetRadioBtn</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -89,7 +89,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -106,7 +106,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -151,7 +151,7 @@
<property name="name">
<cstring>openFileRadioBtn</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -181,7 +181,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/ktouch/src/ktouchprefcolorslayout.ui b/ktouch/src/ktouchprefcolorslayout.ui
index 53c87079..2d519808 100644
--- a/ktouch/src/ktouchprefcolorslayout.ui
+++ b/ktouch/src/ktouchprefcolorslayout.ui
@@ -59,7 +59,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -130,7 +130,7 @@
<property name="name">
<cstring>kcfg_TeacherBackgroundColor</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>40</width>
<height>0</height>
@@ -166,7 +166,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>40</width>
<height>0</height>
@@ -189,7 +189,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -206,7 +206,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -217,7 +217,7 @@
<property name="name">
<cstring>kcfg_StudentTextColor</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>40</width>
<height>0</height>
@@ -245,7 +245,7 @@
<property name="name">
<cstring>kcfg_StudentBackgroundColor</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>40</width>
<height>0</height>
@@ -273,7 +273,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -306,7 +306,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>34</width>
<height>20</height>
@@ -333,7 +333,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -369,7 +369,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>140</width>
<height>20</height>
@@ -391,7 +391,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>40</width>
<height>0</height>
@@ -424,7 +424,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -446,7 +446,7 @@
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>40</width>
<height>0</height>
@@ -485,7 +485,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/ktouch/src/ktouchprefgenerallayout.ui b/ktouch/src/ktouchprefgenerallayout.ui
index 95c44ed6..ff4959f6 100644
--- a/ktouch/src/ktouchprefgenerallayout.ui
+++ b/ktouch/src/ktouchprefgenerallayout.ui
@@ -106,7 +106,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>227</width>
<height>20</height>
@@ -117,7 +117,7 @@
<property name="name">
<cstring>kcfg_SlidingSpeed</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>20</height>
@@ -149,7 +149,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -184,7 +184,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -238,7 +238,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -271,7 +271,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>114</width>
<height>20</height>
@@ -323,7 +323,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>30</height>
diff --git a/ktouch/src/ktouchprefkeyboardlayout.ui b/ktouch/src/ktouchprefkeyboardlayout.ui
index 1c25d804..c9a2d75b 100644
--- a/ktouch/src/ktouchprefkeyboardlayout.ui
+++ b/ktouch/src/ktouchprefkeyboardlayout.ui
@@ -65,7 +65,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -121,7 +121,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
diff --git a/ktouch/src/ktouchpreftraininglayout.ui b/ktouch/src/ktouchpreftraininglayout.ui
index c2928dc0..7f68f36a 100644
--- a/ktouch/src/ktouchpreftraininglayout.ui
+++ b/ktouch/src/ktouchpreftraininglayout.ui
@@ -51,7 +51,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -121,7 +121,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -146,7 +146,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -165,7 +165,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -235,7 +235,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -252,7 +252,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -310,7 +310,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/ktouch/src/ktouchstatistics.cpp b/ktouch/src/ktouchstatistics.cpp
index c8483096..8ae335d0 100644
--- a/ktouch/src/ktouchstatistics.cpp
+++ b/ktouch/src/ktouchstatistics.cpp
@@ -328,7 +328,7 @@ void KTouchStatistics::updateChartTab() {
{
double t = m_currSessionStats.m_elapsedTime;
double wpm = m_currSessionStats.m_words/t*60.0;
- double tp = TQDateTime::tqcurrentDateTime().toTime_t()/(3600.0*24);
+ double tp = TQDateTime::currentDateTime().toTime_t()/(3600.0*24);
data.push_back(std::make_pair(tp, wpm) );
}
chartWidget->LeftAxis.setLabel( i18n("Words per minute") );
@@ -352,7 +352,7 @@ void KTouchStatistics::updateChartTab() {
{
double t = m_currSessionStats.m_elapsedTime;
double cpm = m_currSessionStats.m_correctChars/t*60.0;
- double tp = TQDateTime::tqcurrentDateTime().toTime_t()/(3600.0*24);
+ double tp = TQDateTime::currentDateTime().toTime_t()/(3600.0*24);
data.push_back(std::make_pair(tp, cpm) );
}
chartWidget->LeftAxis.setLabel( i18n("Characters per minute") );
@@ -376,7 +376,7 @@ void KTouchStatistics::updateChartTab() {
{
double tc = m_currSessionStats.m_totalChars;
double corr = m_currSessionStats.m_correctChars/tc;
- double tp = TQDateTime::tqcurrentDateTime().toTime_t()/(3600.0*24);
+ double tp = TQDateTime::currentDateTime().toTime_t()/(3600.0*24);
data.push_back(std::make_pair(tp, corr) );
}
chartWidget->LeftAxis.setLabel( i18n("Correctness") );
@@ -407,7 +407,7 @@ void KTouchStatistics::updateChartTab() {
double t = m_currSessionStats.m_elapsedTime;
double cpm = m_currSessionStats.m_correctChars/t*60.0;
double skill = corr*cpm;
- double tp = TQDateTime::tqcurrentDateTime().toTime_t()/(3600.0*24);
+ double tp = TQDateTime::currentDateTime().toTime_t()/(3600.0*24);
data.push_back(std::make_pair(tp, skill) );
}
chartWidget->LeftAxis.setLabel( i18n("Skill") );
diff --git a/ktouch/src/ktouchstatistics_dlg.ui b/ktouch/src/ktouchstatistics_dlg.ui
index 568ed7ef..d54fd2b1 100644
--- a/ktouch/src/ktouchstatistics_dlg.ui
+++ b/ktouch/src/ktouchstatistics_dlg.ui
@@ -172,7 +172,7 @@
<property name="name">
<cstring>elapsedTimeLCD</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -189,7 +189,7 @@
<property name="name">
<cstring>totalCharsLCD</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -206,7 +206,7 @@
<property name="name">
<cstring>wrongCharsLCD</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -223,7 +223,7 @@
<property name="name">
<cstring>wordsLCD</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -264,7 +264,7 @@
<property name="name">
<cstring>frame4</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>20</width>
<height>0</height>
@@ -414,7 +414,7 @@
<property name="name">
<cstring>charSpeedLCD</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -431,7 +431,7 @@
<property name="name">
<cstring>wordSpeedLCD</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -479,7 +479,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -618,7 +618,7 @@
<property name="name">
<cstring>elapsedTimeLCDLevel</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -632,7 +632,7 @@
<property name="name">
<cstring>totalCharsLCDLevel</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -646,7 +646,7 @@
<property name="name">
<cstring>wrongCharsLCDLevel</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -660,7 +660,7 @@
<property name="name">
<cstring>wordsLCDLevel</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -698,7 +698,7 @@
<property name="name">
<cstring>frame4_2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>20</width>
<height>0</height>
@@ -848,7 +848,7 @@
<property name="name">
<cstring>charSpeedLCDLevel</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -862,7 +862,7 @@
<property name="name">
<cstring>wordSpeedLCDLevel</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -904,7 +904,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>89</height>
@@ -1060,7 +1060,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -1189,7 +1189,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1232,7 +1232,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/ktouch/src/ktouchstatus.cpp b/ktouch/src/ktouchstatus.cpp
index bfbac46c..94d11894 100644
--- a/ktouch/src/ktouchstatus.cpp
+++ b/ktouch/src/ktouchstatus.cpp
@@ -20,13 +20,13 @@
#include <kpushbutton.h>
#include "prefs.h"
-KTouchtqStatus::KTouchtqStatus(TQWidget *parent)
+KTouchStatus::KTouchStatus(TQWidget *parent)
: KTouchStatusLayout(parent)
{
applyPreferences();
}
-void KTouchtqStatus::applyPreferences() {
+void KTouchStatus::applyPreferences() {
if (Prefs::autoLevelChange()) {
levelUpBtn->setEnabled( !Prefs::disableManualLevelChange() );
levelDownBtn->setEnabled( !Prefs::disableManualLevelChange() );
@@ -37,11 +37,11 @@ void KTouchtqStatus::applyPreferences() {
}
}
-void KTouchtqStatus::setNewChars(const TQString& newChars) {
+void KTouchStatus::setNewChars(const TQString& newChars) {
newCharsLabel->setText(newChars);
}
-void KTouchtqStatus::updatetqStatus(unsigned int level, double correctness) {
+void KTouchStatus::updateStatus(unsigned int level, double correctness) {
levelLCD->display(static_cast<int>(level)+1); // +1 because our level variable ranges from 0...n-1
correctnessBar->setProgress(static_cast<int>(correctness*100) );
}
diff --git a/ktouch/src/ktouchstatus.h b/ktouch/src/ktouchstatus.h
index 229ed903..f4be66f4 100644
--- a/ktouch/src/ktouchstatus.h
+++ b/ktouch/src/ktouchstatus.h
@@ -22,21 +22,21 @@
/** This is the implementation of the status widget (at the top of the main view).
* It simply displays the status but does not have a functionality of its own.
* Everythings is calculated in the trainer (see KTouchTrainer)and then displayed
- * using the updatetqStatus() member function.
+ * using the updateStatus() member function.
* The "new characters" string is set using the member function setNewChars().
*/
-class KTouchtqStatus : public KTouchStatusLayout {
+class KTouchStatus : public KTouchStatusLayout {
Q_OBJECT
TQ_OBJECT
public:
/// Constructor
- KTouchtqStatus(TQWidget *parent);
+ KTouchStatus(TQWidget *parent);
/// Called when the preferences have changed in the configuration dialog.
void applyPreferences();
/// Sets the new characters text.
void setNewChars(const TQString& newChars);
/// Updates the level LCD and the correctness progress bar
- void updatetqStatus(unsigned int level, double correctness);
+ void updateStatus(unsigned int level, double correctness);
};
#endif // KTOUCHSTATUS_H
diff --git a/ktouch/src/ktouchstatuslayout.ui b/ktouch/src/ktouchstatuslayout.ui
index 3721f578..29fda5be 100644
--- a/ktouch/src/ktouchstatuslayout.ui
+++ b/ktouch/src/ktouchstatuslayout.ui
@@ -58,7 +58,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
@@ -95,7 +95,7 @@
<property name="name">
<cstring>levelUpBtn</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -112,7 +112,7 @@
<property name="name">
<cstring>levelDownBtn</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>20</width>
<height>20</height>
@@ -160,7 +160,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>2</height>
@@ -171,7 +171,7 @@
<property name="name">
<cstring>speedLCD</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
@@ -203,7 +203,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>2</height>
@@ -233,7 +233,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>2</height>
@@ -261,7 +261,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>2</height>
@@ -291,7 +291,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>2</height>
@@ -337,7 +337,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>2</height>
diff --git a/ktouch/src/ktouchtrainer.cpp b/ktouch/src/ktouchtrainer.cpp
index b2e48277..7ed140ca 100644
--- a/ktouch/src/ktouchtrainer.cpp
+++ b/ktouch/src/ktouchtrainer.cpp
@@ -31,7 +31,7 @@
#include "ktouchdefaults.h"
#include "prefs.h"
-KTouchTrainer::KTouchTrainer(KTouchtqStatus *status, KTouchSlideLine *slideLine, KTouchKeyboardWidget *keyboard, KTouchLecture *lecture)
+KTouchTrainer::KTouchTrainer(KTouchStatus *status, KTouchSlideLine *slideLine, KTouchKeyboardWidget *keyboard, KTouchLecture *lecture)
: TQObject(),
m_trainingTimer(new TQTimer),
m_statusWidget(status),
@@ -233,7 +233,7 @@ void KTouchTrainer::enterPressed() {
void KTouchTrainer::updateWidgets() {
// update status widget
- m_statusWidget->updatetqStatus(m_level, m_levelStats.correctness());
+ m_statusWidget->updateStatus(m_level, m_levelStats.correctness());
// update slide line widget
m_slideLineWidget->setStudentText(m_studentText);
// update keyboard widget -> show next to be pressed char.
@@ -270,7 +270,7 @@ void KTouchTrainer::startTraining(bool keepLevel) {
gotoFirstLine();
updateStatusBarMessage(i18n("Starting training session: Waiting for first keypress...") );
updateStatusBar();
- m_statusWidget->updatetqStatus(m_level, 1);
+ m_statusWidget->updateStatus(m_level, 1);
m_statusWidget->speedLCD->display( 0 );
m_trainingPaused=true; // Go into "Pause" mode
m_trainingTimer->stop(); // Training timer will be started on first keypress.
@@ -285,7 +285,7 @@ void KTouchTrainer::pauseTraining() {
m_trainingPaused=true;
m_trainingTimer->stop();
m_slideLineWidget->setCursorTimerEnabled(false);
- m_statusWidget->updatetqStatus(m_level, m_levelStats.correctness());
+ m_statusWidget->updateStatus(m_level, m_levelStats.correctness());
m_statusWidget->speedLCD->display( m_levelStats.charSpeed() );
updateStatusBarMessage(i18n("Training session paused. Training continues on next keypress...") );
updateStatusBar();
@@ -298,7 +298,7 @@ void KTouchTrainer::pauseTraining() {
void KTouchTrainer::continueTraining() {
m_trainingPaused=false;
m_slideLineWidget->setCursorTimerEnabled(true);
- m_statusWidget->updatetqStatus(m_level, m_levelStats.correctness() );
+ m_statusWidget->updateStatus(m_level, m_levelStats.correctness() );
m_statusWidget->speedLCD->display( m_levelStats.charSpeed() );
updateStatusBarMessage(i18n("Training session! The time is running...") );
updateStatusBar();
@@ -317,12 +317,12 @@ void KTouchTrainer::storeTrainingStatistics() {
// are there level stats to be stored?
if (m_levelStats.m_elapsedTime != 0) {
//kdDebug() << "[KTouchTrainer::storeTrainingStatistics] Storing level statistics!" << endl;
- m_levelStats.m_timeRecorded = TQDateTime::tqcurrentDateTime();
+ m_levelStats.m_timeRecorded = TQDateTime::currentDateTime();
data.m_levelStats.push_back( m_levelStats );
}
if (m_sessionStats.m_elapsedTime != 0) {
//kdDebug() << "[KTouchTrainer::storeTrainingStatistics] Storing session statistics!" << endl;
- m_sessionStats.m_timeRecorded = TQDateTime::tqcurrentDateTime();
+ m_sessionStats.m_timeRecorded = TQDateTime::currentDateTime();
data.m_sessionStats.push_back( m_sessionStats );
}
}
@@ -487,7 +487,7 @@ void KTouchTrainer::statsChangeLevel() {
// are there level stats to be stored?
if (m_levelStats.m_elapsedTime != 0) {
//kdDebug() << "[KTouchTrainer::storeTrainingStatistics] Storing level statistics!" << endl;
- m_levelStats.m_timeRecorded = TQDateTime::tqcurrentDateTime();
+ m_levelStats.m_timeRecorded = TQDateTime::currentDateTime();
data.m_levelStats.push_back( m_levelStats );
}
// clear level stats
@@ -497,6 +497,6 @@ void KTouchTrainer::statsChangeLevel() {
// remember level in session stats
m_sessionStats.m_levelNums.insert(m_level);
// show new level (in status widet) and 100% correctness
- m_statusWidget->updatetqStatus(m_level, 1);
+ m_statusWidget->updateStatus(m_level, 1);
}
// ----------------------------------------------------------------------------
diff --git a/ktouch/src/ktouchtrainer.h b/ktouch/src/ktouchtrainer.h
index 4dba8ebc..2a766a64 100644
--- a/ktouch/src/ktouchtrainer.h
+++ b/ktouch/src/ktouchtrainer.h
@@ -23,7 +23,7 @@
class TQTimer;
-class KTouchtqStatus;
+class KTouchStatus;
class KTouchSlideLine;
class KTouchKeyboardWidget;
class KTouchLecture;
@@ -62,7 +62,7 @@ class KTouchTrainer : public TQObject {
TQ_OBJECT
public:
/// Constructor.
- KTouchTrainer(KTouchtqStatus *status, KTouchSlideLine *slideLine, KTouchKeyboardWidget *keyboard, KTouchLecture *lecture);
+ KTouchTrainer(KTouchStatus *status, KTouchSlideLine *slideLine, KTouchKeyboardWidget *keyboard, KTouchLecture *lecture);
/// Destructor
virtual ~KTouchTrainer();
/// Jumps to the first line in the current level (m_level) (Note: has no effect on the training statistics).
@@ -149,7 +149,7 @@ class KTouchTrainer : public TQObject {
/// right before a new level and new line is started).
void statsChangeLevel();
- KTouchtqStatus *m_statusWidget; ///< Pointer to the status widget on top of the main window.
+ KTouchStatus *m_statusWidget; ///< Pointer to the status widget on top of the main window.
KTouchSlideLine *m_slideLineWidget; ///< Pointer to the sliding line widget.
KTouchKeyboardWidget *m_keyboardWidget; ///< Pointer to the keyboard widget.
KTouchLecture *m_lecture; ///< Pointer to the lecture data.
diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp
index ffa528f3..b9963a2e 100644
--- a/kturtle/src/kturtle.cpp
+++ b/kturtle/src/kturtle.cpp
@@ -880,7 +880,7 @@ void MainWindow::slotSettings()
WidthHeightBox->tqlayout()->setSpacing( 6 );
WidthHeightBox->tqlayout()->setMargin( 11 );
TQVBoxLayout *WidthHeightBoxLayout = new TQVBoxLayout( WidthHeightBox->tqlayout() );
- WidthHeightBoxLayout->tqsetAlignment( TQt::AlignTop );
+ WidthHeightBoxLayout->setAlignment( TQt::AlignTop );
TQHBoxLayout *tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3");
TQVBoxLayout *tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2");
@@ -909,7 +909,7 @@ void MainWindow::slotSettings()
TQLabel* WidthHeightLabel = new TQLabel(i18n("You need to restart before these settings have effect"), WidthHeightBox);
WidthHeightBoxLayout->addWidget( WidthHeightLabel );
generalLayout->addWidget( WidthHeightBox, 0, 0 );
- general->resize( TQSize(234, 109).expandedTo(tqminimumSizeHint()) );
+ general->resize( TQSize(234, 109).expandedTo(minimumSizeHint()) );
dialog->addPage( general, i18n("General"), "package_settings", i18n("General Settings") );
@@ -921,7 +921,7 @@ void MainWindow::slotSettings()
groupBox1->tqlayout()->setSpacing( 6 );
groupBox1->tqlayout()->setMargin( 11 );
TQGridLayout *groupBox1Layout = new TQGridLayout( groupBox1->tqlayout() );
- groupBox1Layout->tqsetAlignment( TQt::AlignTop );
+ groupBox1Layout->setAlignment( TQt::AlignTop );
TQVBoxLayout *tqlayout4 = new TQVBoxLayout( 0, 0, 6, "tqlayout4");
@@ -941,7 +941,7 @@ void MainWindow::slotSettings()
groupBox1Layout->addLayout( tqlayout4, 0, 0 );
languageLayout->addWidget( groupBox1, 0, 0 );
- language->resize( TQSize(373, 80).expandedTo(tqminimumSizeHint()) );
+ language->resize( TQSize(373, 80).expandedTo(minimumSizeHint()) );
dialog->addPage( language, i18n("Language"), "locale", i18n("Language Settings") );
diff --git a/kverbos/kverbos/kerfassen.cpp b/kverbos/kverbos/kerfassen.cpp
index 0fbc20c4..9ae8c2b7 100644
--- a/kverbos/kverbos/kerfassen.cpp
+++ b/kverbos/kverbos/kerfassen.cpp
@@ -352,42 +352,42 @@ void KErfassen::slotNewVerb()
void KErfassen::slotN()
{
- TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget());
+ TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget());
if (pl)
pl->insert("�");
}
void KErfassen::slotA()
{
- TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget());
+ TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget());
if (pl)
pl->insert("�");
}
void KErfassen::slotE()
{
- TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget());
+ TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget());
if (pl)
pl->insert("�");
}
void KErfassen::slotI()
{
- TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget());
+ TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget());
if (pl)
pl->insert("�");
}
void KErfassen::slotO()
{
- TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget());
+ TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget());
if (pl)
pl->insert("�");
}
void KErfassen::slotU()
{
- TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget());
+ TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget());
if (pl)
pl->insert("�");
}
diff --git a/kverbos/kverbos/kverbosdoc.cpp b/kverbos/kverbos/kverbosdoc.cpp
index 1abb6774..58f3c510 100644
--- a/kverbos/kverbos/kverbosdoc.cpp
+++ b/kverbos/kverbos/kverbosdoc.cpp
@@ -658,10 +658,10 @@ void KVerbosDoc::deleteContents()
}
// Ein Verb wird der Liste hinzugef�gt.
-void KVerbosDoc::appendVerb(const verbSpanish v, bool emittqStatus /*= true*/)
+void KVerbosDoc::appendVerb(const verbSpanish v, bool emitStatus /*= true*/)
{
verbList2.append(v);
- if (emittqStatus)
+ if (emitStatus)
emit anzahlVerbenGeaendert(getAnzahl());
}
diff --git a/kverbos/kverbos/kverbosdoc.h b/kverbos/kverbos/kverbosdoc.h
index 41dbc2c4..0795e823 100644
--- a/kverbos/kverbos/kverbosdoc.h
+++ b/kverbos/kverbos/kverbosdoc.h
@@ -114,10 +114,10 @@ class KVerbosDoc : public TQObject
const KURL& URL() const;
/** sets the URL of the document */
void setURL(const KURL& url);
- /** es wird ein Verb der Liste hinzugef�gt, ist emittqStatus = true, wird auch
+ /** es wird ein Verb der Liste hinzugef�gt, ist emitStatus = true, wird auch
* die Statuszeile entsprechend angepasst.
*/
- void appendVerb(const verbSpanish v, bool emittqStatus = true);
+ void appendVerb(const verbSpanish v, bool emitStatus = true);
/** pr�ft, ob die Liste des Dokumentes leer ist */
bool isEmpty() const;
/** Gibt einen Zeiger auf die Verbliste des Dokumentes zur�ck */
diff --git a/kverbos/kverbos/kverbosuser.cpp b/kverbos/kverbos/kverbosuser.cpp
index 90896a3b..6088e90b 100644
--- a/kverbos/kverbos/kverbosuser.cpp
+++ b/kverbos/kverbos/kverbosuser.cpp
@@ -227,7 +227,7 @@ bool KVerbosUser::saveUser(const int& res, const int& num)
};
if (j == 1)
{
- TQDate d = TQDate::tqcurrentDate();
+ TQDate d = TQDate::currentDate();
t << d.toString() << endl;
t << res << endl;
t << num << endl;
diff --git a/kverbos/kverbos/kverbosview.cpp b/kverbos/kverbos/kverbosview.cpp
index bb62cba5..d79c690a 100644
--- a/kverbos/kverbos/kverbosview.cpp
+++ b/kverbos/kverbos/kverbosview.cpp
@@ -115,7 +115,7 @@ TQString KVerbosView::deleteAccents(const TQString& s) const
void KVerbosView::slotN()
{
- TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget());
+ TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget());
if (pl)
{
pl->insert("�");
@@ -124,7 +124,7 @@ void KVerbosView::slotN()
void KVerbosView::slotA()
{
- TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget());
+ TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget());
if (pl)
{
pl->insert("�");
@@ -133,7 +133,7 @@ void KVerbosView::slotA()
void KVerbosView::slotE()
{
- TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget());
+ TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget());
if (pl)
{
pl->insert("�");
@@ -142,7 +142,7 @@ void KVerbosView::slotE()
void KVerbosView::slotI()
{
- TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget());
+ TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget());
if (pl)
{
pl->insert("�");
@@ -151,7 +151,7 @@ void KVerbosView::slotI()
void KVerbosView::slotO()
{
- TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget());
+ TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget());
if (pl)
{
pl->insert("�");
@@ -160,7 +160,7 @@ void KVerbosView::slotO()
void KVerbosView::slotU()
{
- TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget());
+ TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget());
if (pl)
{
pl->insert("�");
@@ -332,7 +332,7 @@ void KVerbosView::slotFont()
if (corrected)
{
TQFont fontNormal = EditVerbo->font();
- TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget());
+ TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget());
if (0 != pl)
{
pl->setFont(fontNormal);
diff --git a/kverbos/kverbos/qerfassen.ui b/kverbos/kverbos/qerfassen.ui
index 42489cfe..9717e9f5 100644
--- a/kverbos/kverbos/qerfassen.ui
+++ b/kverbos/kverbos/qerfassen.ui
@@ -341,7 +341,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextYo1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -355,7 +355,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextTu1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -369,7 +369,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextEl1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -383,7 +383,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextNosotros1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -397,7 +397,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextVosotros1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -411,7 +411,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextEllos1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -441,7 +441,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditYo2_1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -452,7 +452,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditTu2_1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -463,7 +463,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditEl2_1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -474,7 +474,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditNosotros2_1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -485,7 +485,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditVosotros2_1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -496,7 +496,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditEllos2_1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -609,7 +609,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextYo2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -623,7 +623,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextTu2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -637,7 +637,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextEl2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -651,7 +651,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextNosotros2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -665,7 +665,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextVosotros2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -679,7 +679,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextEllos2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -709,7 +709,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditYo2_2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -720,7 +720,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditTu2_2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -731,7 +731,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditEl2_2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -742,7 +742,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditNosotros2_2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -753,7 +753,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditVosotros2_2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -764,7 +764,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditEllos2_2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -877,7 +877,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextYo3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -891,7 +891,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextTu3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -905,7 +905,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextEl3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -919,7 +919,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextNosotros3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -933,7 +933,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextVosotros3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -947,7 +947,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextEllos3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -977,7 +977,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditYo2_3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -988,7 +988,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditTu2_3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -999,7 +999,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditEl2_3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1010,7 +1010,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditNosotros2_3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1021,7 +1021,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditVosotros2_3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1032,7 +1032,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditEllos2_3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1145,7 +1145,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextYo4</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1159,7 +1159,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextTu4</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1173,7 +1173,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextEl4</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1187,7 +1187,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextNosotros4</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1201,7 +1201,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextVosotros4</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1215,7 +1215,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextEllos4</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1245,7 +1245,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditYo2_4</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1256,7 +1256,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditTu2_4</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1267,7 +1267,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditEl2_4</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1278,7 +1278,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditNosotros2_4</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1289,7 +1289,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditVosotros2_4</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1300,7 +1300,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditEllos2_4</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1413,7 +1413,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextYo5</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1427,7 +1427,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextTu5</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1441,7 +1441,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextEl5</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1455,7 +1455,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextNosotros5</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1469,7 +1469,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextVosotros5</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1483,7 +1483,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextEllos5</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1513,7 +1513,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditYo2_5</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1524,7 +1524,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditTu2_5</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1535,7 +1535,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditEl2_5</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1546,7 +1546,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditNosotros2_5</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1557,7 +1557,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditVosotros2_5</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1568,7 +1568,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditEllos2_5</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1681,7 +1681,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextYo6</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1695,7 +1695,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextTu6</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1709,7 +1709,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextEl6</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1723,7 +1723,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextNosotros6</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1737,7 +1737,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextVosotros6</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1751,7 +1751,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextEllos6</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1781,7 +1781,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditYo2_6</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1792,7 +1792,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditTu2_6</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1803,7 +1803,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditEl2_6</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1814,7 +1814,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditNosotros2_6</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1825,7 +1825,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditVosotros2_6</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1836,7 +1836,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditEllos2_6</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -1949,7 +1949,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextYo7</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1963,7 +1963,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextTu7</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1977,7 +1977,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextEl7</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -1991,7 +1991,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextNosotros7</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -2005,7 +2005,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextVosotros7</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -2019,7 +2019,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextEllos7</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -2049,7 +2049,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditYo2_7</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -2060,7 +2060,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditTu2_7</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -2071,7 +2071,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditEl2_7</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -2082,7 +2082,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditNosotros2_7</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -2093,7 +2093,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditVosotros2_7</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -2104,7 +2104,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditEllos2_7</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -2231,7 +2231,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextYo8</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -2245,7 +2245,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextTu8</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -2259,7 +2259,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextEl8</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -2273,7 +2273,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextNosotros8</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -2287,7 +2287,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>TextVosotros8</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -2327,7 +2327,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditYo2_8</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -2338,7 +2338,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditTu2_8</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -2349,7 +2349,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditEl2_8</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -2360,7 +2360,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditNosotros2_8</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -2371,7 +2371,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditVosotros2_8</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -2382,7 +2382,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>EditEllos2_8</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -2462,7 +2462,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>ButtonN</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -2476,7 +2476,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>ButtonA</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -2490,7 +2490,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>ButtonE</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -2504,7 +2504,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>ButtonI</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -2518,7 +2518,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>ButtonO</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -2532,7 +2532,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>ButtonU</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -2562,7 +2562,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>ButtonLoeschen</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>90</width>
<height>0</height>
@@ -2587,7 +2587,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>PushZurueck</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>90</width>
<height>0</height>
@@ -2601,7 +2601,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>PushWeiter</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>90</width>
<height>0</height>
@@ -2615,7 +2615,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>PushNewVerb</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>90</width>
<height>0</height>
@@ -2629,7 +2629,7 @@ und in die Liste aufgenommen wird.
<property name="name">
<cstring>PushBeenden</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>90</width>
<height>0</height>
diff --git a/kverbos/kverbos/qlernen.ui b/kverbos/kverbos/qlernen.ui
index 42efac62..c963079b 100644
--- a/kverbos/kverbos/qlernen.ui
+++ b/kverbos/kverbos/qlernen.ui
@@ -81,7 +81,7 @@ The user learns with this GUI.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -108,7 +108,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>EditAleman</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -138,7 +138,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>TextTiempo2</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>70</width>
<height>32767</height>
@@ -190,7 +190,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>TextYo</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -204,7 +204,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>TextTu</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -218,7 +218,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>TextEl</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -232,7 +232,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>TextNosotros</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -246,7 +246,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>TextVosotros</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -260,7 +260,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>TextEllos</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -290,7 +290,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>EditYo1</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -301,7 +301,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>EditTu1</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -312,7 +312,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>EditEl1</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -323,7 +323,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>EditNosotros1</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -334,7 +334,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>EditVosotros1</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -345,7 +345,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>EditEllos1</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -372,7 +372,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>EditYo2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -383,7 +383,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>EditTu2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -394,7 +394,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>EditEl2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -405,7 +405,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>EditNosotros2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -416,7 +416,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>EditVosotros2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -427,7 +427,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>EditEllos2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -459,7 +459,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>EditTu3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -470,7 +470,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>EditEl3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -481,7 +481,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>EditNosotros3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -492,7 +492,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>EditVosotros3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -503,7 +503,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>EditEllos3</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -543,7 +543,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>ButtonN</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -557,7 +557,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>ButtonA</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -571,7 +571,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>ButtonE</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -585,7 +585,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>ButtonI</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -599,7 +599,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>ButtonO</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -613,7 +613,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>ButtonU</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -721,7 +721,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>ButtonLoeschen</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -746,7 +746,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>ButtonKorrektur</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -768,7 +768,7 @@ The user learns with this GUI.</comment>
<property name="name">
<cstring>ButtonWeiter</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
diff --git a/kverbos/kverbos/qverbedit.ui b/kverbos/kverbos/qverbedit.ui
index 76f4f411..60913993 100644
--- a/kverbos/kverbos/qverbedit.ui
+++ b/kverbos/kverbos/qverbedit.ui
@@ -76,7 +76,7 @@ und können bearbeitet werden.</comment>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kverbos/kverbos/qverbosoptions.ui b/kverbos/kverbos/qverbosoptions.ui
index 6f0344b5..455f292c 100644
--- a/kverbos/kverbos/qverbosoptions.ui
+++ b/kverbos/kverbos/qverbosoptions.ui
@@ -93,7 +93,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="name">
<cstring>LabelTiempos</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -107,7 +107,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="name">
<cstring>LabelPresente</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -121,7 +121,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="name">
<cstring>LabelImperfecto</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -135,7 +135,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="name">
<cstring>LabelIndefinido</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -149,7 +149,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="name">
<cstring>LabelFuturo</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -163,7 +163,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="name">
<cstring>LabelCondicional</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -180,7 +180,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -197,7 +197,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -214,7 +214,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -231,7 +231,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="enabled">
<bool>true</bool>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -251,7 +251,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -278,7 +278,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="name">
<cstring>LabelNormal</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -300,7 +300,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -322,7 +322,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -344,7 +344,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -366,7 +366,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -388,7 +388,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -413,7 +413,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -438,7 +438,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -463,7 +463,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -488,7 +488,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -508,7 +508,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -535,7 +535,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="name">
<cstring>LabelProgresivo</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -557,7 +557,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -579,7 +579,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -601,7 +601,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -623,7 +623,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -645,7 +645,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -670,7 +670,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -695,7 +695,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -720,7 +720,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -740,7 +740,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -757,7 +757,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -784,7 +784,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="name">
<cstring>LabelPerfecto</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -806,7 +806,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -828,7 +828,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -842,7 +842,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="name">
<cstring>TextLabel1</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -864,7 +864,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -886,7 +886,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -911,7 +911,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -936,7 +936,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -961,7 +961,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
@@ -981,7 +981,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -998,7 +998,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1106,7 +1106,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1165,7 +1165,7 @@ Zeiten geübt werden sollen und welche nicht.</comment>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui b/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui
index 6fe8b52a..76550b4a 100644
--- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui
@@ -12,7 +12,7 @@
<height>127</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>400</width>
<height>120</height>
@@ -110,7 +110,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -129,7 +129,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>340</width>
<height>22</height>
diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui
index e64f19a2..2c8112e5 100644
--- a/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui
@@ -190,7 +190,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -241,7 +241,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>380</width>
<height>30</height>
diff --git a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui
index d64fb69a..48897be5 100644
--- a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui
@@ -165,7 +165,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>123</height>
diff --git a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui
index 937e8a75..98a2cfff 100644
--- a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui
@@ -127,7 +127,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>150</width>
<height>16</height>
diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
index d0715a1d..2eb3a124 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
@@ -1015,8 +1015,8 @@ void LanguageOptions::loadCountryData()
locale.setLanguage(curr_lang);
KGlobal::_locale = &locale;
- TQString sub = TQString::tqfromLatin1("l10n/");
- TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*.desktop"));
+ TQString sub = TQString::fromLatin1("l10n/");
+ TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop"));
regionlist.sort();
TQMap<TQString, Region> regions;
@@ -1033,22 +1033,22 @@ void LanguageOptions::loadCountryData()
if (index != -1) tag.truncate(index);
KSimpleConfig entry(*it);
- entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
- TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
+ entry.setGroup(TQString::fromLatin1("KCM Locale"));
+ TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
regions.insert(tag, Region(name));
}
// add all languages to the list
- TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*/entry.desktop"));
+ TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop"));
int idx = 0;
for (TQStringList::ConstIterator sit = countrylist.begin(); sit != countrylist.end(); ++sit)
{
KSimpleConfig entry(*sit);
- entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
- TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
- TQString submenu = entry.readEntry(TQString::tqfromLatin1("Region"));
+ entry.setGroup(TQString::fromLatin1("KCM Locale"));
+ TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
+ TQString submenu = entry.readEntry(TQString::fromLatin1("Region"));
TQString tag = *sit;
int index = tag.findRev('/');
@@ -1059,7 +1059,7 @@ void LanguageOptions::loadCountryData()
if (tag == "C")
continue;
- TQStringList all_langs = TQStringList::split(",", entry.readEntry(TQString::tqfromLatin1("Languages")));
+ TQStringList all_langs = TQStringList::split(",", entry.readEntry(TQString::fromLatin1("Languages")));
TQValueList<int> langs;
TQString pixmap = *sit;
diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui
index 12b3b98e..724f4700 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui
@@ -323,7 +323,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>390</width>
<height>20</height>
diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui
index 142ee7f5..2524dc71 100644
--- a/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui
@@ -37,7 +37,7 @@
<property name="name">
<cstring>SeparatorCombo</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>140</width>
<height>0</height>
@@ -60,7 +60,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>310</width>
<height>20</height>
@@ -145,7 +145,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>21</height>
@@ -164,7 +164,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>80</width>
<height>31</height>
diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui
index 3250b83e..6eee844b 100644
--- a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui
@@ -242,7 +242,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>48</height>
@@ -261,7 +261,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -290,7 +290,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>111</width>
<height>20</height>
@@ -309,7 +309,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>290</width>
<height>20</height>
@@ -439,7 +439,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>83</width>
<height>20</height>
@@ -475,7 +475,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>200</width>
<height>16</height>
diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui
index 788ff271..1997b61b 100644
--- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui
@@ -209,7 +209,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
@@ -226,7 +226,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>80</height>
@@ -285,7 +285,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>290</width>
<height>16</height>
diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
index 9c6b18e6..1729c84f 100644
--- a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
@@ -448,7 +448,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>20</height>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui
index cd5b426b..eef4d0d4 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui
@@ -70,7 +70,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>70</width>
<height>0</height>
@@ -93,7 +93,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -225,7 +225,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>50</width>
<height>20</height>
@@ -464,7 +464,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>50</width>
<height>20</height>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui
index e189b5bc..dbd8e918 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui
@@ -52,7 +52,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui
index 7ee368cc..910056d3 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui
@@ -52,7 +52,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui
index 7a4aff84..fb07ebca 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui
@@ -109,7 +109,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -126,7 +126,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui
index d5207579..2a9126d0 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui
@@ -52,7 +52,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui
index bca2b89d..14ef81ce 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui
+++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui
@@ -52,7 +52,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui
index b5cea508..131df53c 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui
+++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui
@@ -70,7 +70,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>80</height>
@@ -89,7 +89,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>80</height>
@@ -108,7 +108,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>80</height>
@@ -182,7 +182,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>80</height>
@@ -207,7 +207,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>80</height>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui
index 428e902f..4f1b4a96 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui
+++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui
@@ -165,13 +165,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>30</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>30</height>
@@ -196,13 +196,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>30</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>30</height>
@@ -257,7 +257,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -300,13 +300,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>30</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>30</height>
@@ -358,13 +358,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>30</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>30</width>
<height>24</height>
@@ -387,7 +387,7 @@
<property name="sizeType">
<enum>Preferred</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -406,7 +406,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>90</height>
@@ -428,7 +428,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>80</height>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui
index d01d74bf..20d5e373 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui
+++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui
@@ -72,7 +72,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -150,7 +150,7 @@
<property name="name">
<cstring>year_spin</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>60</width>
<height>0</height>
@@ -161,7 +161,7 @@
<property name="name">
<cstring>month_spin</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
@@ -172,7 +172,7 @@
<property name="name">
<cstring>day_spin</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>60</width>
<height>0</height>
@@ -189,7 +189,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
index 9669719c..05d33f86 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
@@ -191,12 +191,12 @@ PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, co
PhoneticButton *butt = new PhoneticButton(text, phoneticbox, this);
connect (butt, TQT_SIGNAL(clicked()), butt, TQT_SLOT(slotClicked()) );
TQString tip = i18n("Unicode name: ");
- tip += TQString::tqfromLatin1(uni_ref->tqunicodename);
+ tip += TQString::fromLatin1(uni_ref->tqunicodename);
tip += "\n";
tip += i18n("Describing the sound of the character", "Sound: ");
tip += i18n(uni_ref->audible);
butt->setFont(ipafont);
- butt->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+ butt->setSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed));
int sz = TQMAX(14, int(1.7*ipafont.pointSize()));
butt->setMaximumSize(TQSize (sz, sz));
gbox->addWidget( butt, vert, horiz, AlignCenter );
@@ -208,7 +208,7 @@ PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, co
}
++uni_ref;
}
- resize(tqsizeHint());
+ resize(sizeHint());
}
diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui
index 8c1e580b..6da8f42a 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui
+++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui
@@ -229,7 +229,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>80</width>
<height>20</height>
diff --git a/kvoctrain/kvoctrain/kva_header.cpp b/kvoctrain/kvoctrain/kva_header.cpp
index eee43d99..9b76f721 100644
--- a/kvoctrain/kvoctrain/kva_header.cpp
+++ b/kvoctrain/kvoctrain/kva_header.cpp
@@ -53,7 +53,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
header_m->insertItem(SmallIconSet("sort_num"), i18n(SORT_NUM), (header << 16) | IDH_SORT_COL_NUM);
connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
- connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
+ connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
header_m->exec(TQPoint (x, y));
return;
@@ -90,7 +90,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
(header << 16) | (i << (16+8)) | IDH_SET_LANG);
}
connect (langs_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetHeaderProp(int)));
- connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
+ connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
header_m = new TQPopupMenu();
@@ -143,7 +143,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
}
header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL);
connect (query_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
- connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
+ connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
for (int i = 1; i < (int) doc->numLangs(); i++) {
// show pixmap and long name if available
int j;
@@ -168,7 +168,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
header_m->insertItem(i18n("E&xamples"), (header << 16) | IDH_START_EXAMPLE);
header_m->insertItem(i18n("&Paraphrase"), (header << 16) | IDH_START_PARAPHRASE);
connect (multiple_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
- connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
+ connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
header_m->insertSeparator();
header_m->insertItem(SmallIconSet("sort_incr"), i18n(SORT_ALPHA), (header+KV_EXTRA_COLS << 16) | IDH_SORT_COL_ALPHA);
@@ -176,7 +176,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
}
connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
- connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
+ connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
header_m->exec(TQPoint(x, y));
}
@@ -226,7 +226,7 @@ void kvoctrainApp::slotSetHeaderProp (int header_and_id) /*FOLD00*/
}
-void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/
+void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
{
int header1 = (header_and_cmd >> 16) & 0xFF;
int header2 = header_and_cmd >> (16+8);
diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp
index 9bef423d..9610355b 100644
--- a/kvoctrain/kvoctrain/kva_init.cpp
+++ b/kvoctrain/kvoctrain/kva_init.cpp
@@ -187,7 +187,7 @@ void kvoctrainApp::initActions()
vocabAppendLanguage = new KSelectAction(i18n("&Append Language"), "insert_table_col", 0, actionCollection(), "vocab_append_language");
connect(vocabAppendLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabAppendLanguage()));
connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotAppendLang(int)));
- connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeadertqStatus(int)));
+ connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderStatus(int)));
vocabSetLanguage = new KSelectAction(i18n("Set &Language"), "set_language", 0, actionCollection(), "vocab_set_language");
connect(vocabSetLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabSetLanguage()));
@@ -195,7 +195,7 @@ void kvoctrainApp::initActions()
vocabRemoveLanguage = new KSelectAction(i18n("&Remove Language"), "delete_table_col", 0, actionCollection(), "vocab_remove_language");
connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabRemoveLanguage()));
connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderCallBack(int)));
- connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeadertqStatus(int)));
+ connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderStatus(int)));
vocabDocumentProperties = new KAction(i18n("Document &Properties"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties");
vocabDocumentProperties->setWhatsThis(i18n("Edit document properties"));
@@ -245,7 +245,7 @@ void kvoctrainApp::initActions()
//connect(actionCollection(), TQT_SIGNAL(actionHighlighted(KAction *, bool)), this, TQT_SLOT(slotActionHighlighted(KAction *, bool)));
if (!initialGeometrySet())
- resize( TQSize(550, 400).expandedTo(tqminimumSizeHint()));
+ resize( TQSize(550, 400).expandedTo(minimumSizeHint()));
setupGUI(ToolBar | Keys | StatusBar | Create);
setAutoSaveSettings();
@@ -255,7 +255,7 @@ void kvoctrainApp::initActions()
learn_menu = (TQPopupMenu*) child( "learning", "KPopupMenu" );
connect(learn_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
- connect(learn_menu, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
+ connect(learn_menu, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
connect(learn_menu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowLearn()));
}
diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp
index 1469c354..2a106dd8 100644
--- a/kvoctrain/kvoctrain/kvoctrain.cpp
+++ b/kvoctrain/kvoctrain/kvoctrain.cpp
@@ -1150,7 +1150,7 @@ void kvoctrainApp::aboutToShowLearn()
header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL);
connect (query_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
- connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
+ connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
for (int i = 1; i < (int) doc->numLangs(); i++) {
// show pixmap and long name if available
@@ -1178,11 +1178,11 @@ void kvoctrainApp::aboutToShowLearn()
header_m->insertItem(i18n("&Paraphrase"), (header << 16) | IDH_START_PARAPHRASE);
connect (multiple_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
- connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
+ connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
}
connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
- connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
+ connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
TQString id = header == 0 ? doc->getOriginalIdent()
: doc->getIdent(header);
@@ -1264,7 +1264,7 @@ void kvoctrainApp::aboutToShowVocabSetLanguage()
}
connect (langs_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetHeaderProp(int)));
- connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
+ connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
if (header == 0)
set_m->insertItem(i18n("&Original"), langs_m, (2 << 16) | IDH_NULL);
diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h
index bf1ea6ea..7fa8203d 100644
--- a/kvoctrain/kvoctrain/kvoctrain.h
+++ b/kvoctrain/kvoctrain/kvoctrain.h
@@ -146,7 +146,7 @@ public:
// void slotSearchClip();
void slotSetHeaderProp (int header_and_id);
void slotHeaderCallBack (int cmd_and_id);
- void slotHeadertqStatus (int cmd_and_id);
+ void slotHeaderStatus (int cmd_and_id);
void slotHeaderMenu(int header, int x, int y);
/** append language to table */
void slotAppendLang(int header);
diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp
index c41de57b..e5259f31 100644
--- a/kvoctrain/kvoctrain/kvoctraintable.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintable.cpp
@@ -424,10 +424,10 @@ void KVocTrainTable::paintCell(TQPainter * p, int row, int col, const TQRect & c
}
TQPen pen( p->pen() );
- int gridColor = tqstyle().tqstyleHint( TQStyle::SH_Table_GridLineColor, this );
+ int gridColor = tqstyle().styleHint( TQStyle::SH_Table_GridLineColor, this );
if (gridColor != -1) {
const TQPalette &pal = palette();
- if (cg != tqcolorGroup()
+ if (cg != colorGroup()
&& cg != pal.disabled()
&& cg != pal.inactive())
p->setPen(cg.mid());
diff --git a/kvoctrain/kvoctrain/kvoctraintableitem.cpp b/kvoctrain/kvoctrain/kvoctraintableitem.cpp
index d4bc0343..34b00912 100644
--- a/kvoctrain/kvoctrain/kvoctraintableitem.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintableitem.cpp
@@ -75,7 +75,7 @@ TQWidget *KVocTrainTableItem::createEditor() const
statebox->insertItem (i18n("state of a row", "Active, Not in Query"));
statebox->insertItem (i18n("state of a row", "In Query"));
statebox->insertItem (i18n("state of a row", "Inactive"));
- TQSize sz = statebox->tqsizeHint();
+ TQSize sz = statebox->sizeHint();
sz.setHeight(table()->rowHeight(row()));
statebox->setMinimumSize(sz);
if (!m_doc->getEntry(row())->isActive() )
diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui
index 6aaf00a9..2bcb18e5 100644
--- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui
@@ -122,7 +122,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>390</width>
<height>60</height>
diff --git a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
index 3b108143..7e67c425 100644
--- a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
@@ -66,9 +66,9 @@ bool QueryDlgBase::verifyField(TQLineEdit *field, const TQString &really)
if (!field->isEnabled() )
return true;
- TQColorGroup u_normal = field->tqcolorGroup();
+ TQColorGroup u_normal = field->colorGroup();
u_normal.setColor(TQColorGroup::Text, TQColor(0xff, 0x00, 0x00));
- TQColorGroup k_normal = field->tqcolorGroup();
+ TQColorGroup k_normal = field->colorGroup();
k_normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x80, 0x00));
TQPalette known_pal( field->palette());
@@ -107,7 +107,7 @@ void QueryDlgBase::resetField(TQLineEdit *field)
{
if (!field->isEnabled() )
return;
- TQColorGroup normal = field->tqcolorGroup();
+ TQColorGroup normal = field->colorGroup();
normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x00, 0x00));
TQPalette pal( field->palette());
@@ -132,9 +132,9 @@ bool QueryDlgBase::verifyField(TQMultiLineEdit *field, const TQString &really, b
{
if (!field->isEnabled())
return true;
- TQColorGroup u_normal = field->tqcolorGroup();
+ TQColorGroup u_normal = field->colorGroup();
u_normal.setColor(TQColorGroup::Text, TQColor(0xff, 0x00, 0x00));
- TQColorGroup k_normal = field->tqcolorGroup();
+ TQColorGroup k_normal = field->colorGroup();
k_normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x80, 0x00));
TQPalette known_pal( field->palette());
@@ -195,7 +195,7 @@ void QueryDlgBase::resetField(TQMultiLineEdit *field)
{
if (!field->isEnabled() )
return;
- TQColorGroup normal = field->tqcolorGroup();
+ TQColorGroup normal = field->colorGroup();
normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x00, 0x00));
TQPalette pal( field->palette());
@@ -221,9 +221,9 @@ void QueryDlgBase::verifyButton(TQRadioButton *radio, bool is_ok, TQWidget *widg
if (!radio->isEnabled() )
return;
- TQColorGroup u_normal = radio->tqcolorGroup();
+ TQColorGroup u_normal = radio->colorGroup();
u_normal.setColor(TQColorGroup::Foreground, TQColor(0xff, 0x00, 0x00));
- TQColorGroup k_normal = radio->tqcolorGroup();
+ TQColorGroup k_normal = radio->colorGroup();
k_normal.setColor(TQColorGroup::Foreground, TQColor(0x00, 0x80, 0x00));
TQPalette known_pal( radio->palette());
@@ -273,7 +273,7 @@ void QueryDlgBase::resetButton(TQRadioButton *radio, TQWidget *widget2)
{
if (!radio->isEnabled() )
return;
- TQColorGroup normal = radio->tqcolorGroup();
+ TQColorGroup normal = radio->colorGroup();
normal.setColor(TQColorGroup::Foreground, TQColor(0x00, 0x00, 0x00));
TQPalette pal(radio->palette());
diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
index e767775c..efc2a136 100644
--- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
@@ -60,7 +60,7 @@ TQStringList RandomQueryDlg::extractTranslations (TQString trans)
TQRegExp regex (regexp);
if ( regex.search (trans) >= 0 )
{
- translations = regex.tqcapturedTexts();
+ translations = regex.capturedTexts();
translations.remove (translations.at (0));
break;
}
@@ -77,7 +77,7 @@ TQStringList RandomQueryDlg::extractTranslations (TQString trans)
TQRegExp regex (regexp);
if ( regex.search (trans) >= 0 )
{
- translations = regex.tqcapturedTexts();
+ translations = regex.capturedTexts();
translations.remove (translations.at (0));
break;
}
@@ -95,7 +95,7 @@ TQStringList RandomQueryDlg::extractTranslations (TQString trans)
TQRegExp regex (regexp);
if ( regex.search (trans) >= 0 )
{
- translations = regex.tqcapturedTexts();
+ translations = regex.capturedTexts();
translations.remove (translations.at (0));
break;
}
@@ -113,7 +113,7 @@ TQStringList RandomQueryDlg::extractTranslations (TQString trans)
TQRegExp regex (regexp);
if ( regex.search (trans) >= 0 )
{
- translations = regex.tqcapturedTexts();
+ translations = regex.capturedTexts();
translations.remove (translations.at (0));
break;
}
@@ -168,7 +168,7 @@ RandomQueryDlg::RandomQueryDlg(
for ( i = 0; i < fields; i ++ )
{
transCombos.append (new TQComboBox (false, mw->TranslationFrame, TQCString ("transCombo") + TQCString().setNum (i)));
- transCombos.at(i) -> tqsetSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transCombos.at(i) -> sizePolicy().hasHeightForWidth()));
+ transCombos.at(i) -> setSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transCombos.at(i) -> sizePolicy().hasHeightForWidth()));
transCombos.at(i) -> setEditable (true);
transCombos.at(i) -> setInsertionPolicy (TQComboBox::NoInsertion);
transCombos.at(i) -> setDuplicatesEnabled (false);
@@ -182,7 +182,7 @@ RandomQueryDlg::RandomQueryDlg(
for ( i = 0; i < fields; i ++ )
{
transFields.append (new TQLineEdit (mw->TranslationFrame, TQCString ("transField") + TQCString().setNum (i)));
- transFields.at(i) -> tqsetSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transFields.at(i) -> sizePolicy().hasHeightForWidth()));
+ transFields.at(i) -> setSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transFields.at(i) -> sizePolicy().hasHeightForWidth()));
vb->addWidget(transFields.at(i));
connect (transFields.at(i), TQT_SIGNAL (textChanged (const TQString&)), TQT_SLOT (slotTransChanged (const TQString&)));
connect (transFields.at(i), TQT_SIGNAL (lostFocus()), TQT_SLOT (slotTransLostFocus()));
@@ -202,7 +202,7 @@ RandomQueryDlg::RandomQueryDlg(
if ( split && kv_doc -> numEntries() >= 500 )
{
pdlg = new ProgressDlg (TQString(), TQString(), kapp -> makeStdCaption (i18n("Loading Random Query")));
- pdlg -> resize (pdlg -> width(), pdlg -> tqminimumSize().height());
+ pdlg -> resize (pdlg -> width(), pdlg -> minimumSize().height());
pdlg -> show();
kapp -> processEvents();
}
@@ -650,7 +650,7 @@ void RandomQueryDlg::keyPressEvent( TQKeyEvent *e )
for ( uint i = 0; i < vocabulary.count(); i ++ )
{
TQString trans (vocabulary[i]);
- if ( (e -> key() == Key_F5 && trans.tqstartsWith (curText, false)
+ if ( (e -> key() == Key_F5 && trans.startsWith (curText, false)
|| e -> key() == Key_F6 && trans.contains (curText, false)) )
combo -> insertItem (trans);
}
diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui
index 8b84c852..b28cc0b6 100644
--- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui
@@ -190,7 +190,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>450</width>
<height>40</height>
diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
index eb88a5f2..d23be59d 100644
--- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
@@ -109,7 +109,7 @@ void SimpleQueryDlg::setQuery(QueryType _querytype,
mw->instructionLabel->setText(i18n("Enter the synonym:"));
setCaption (i18n("Synonym Training"));
answerstring = exp->getSynonym(column);
- mw->queryField->tqsetAlignment(TQt::AlignVCenter);
+ mw->queryField->setAlignment(TQt::AlignVCenter);
mw->queryField->setText(column == 0 ? exp->getOriginal() : exp->getTranslation(column));
setQueryFieldWordwrap();
}
@@ -327,9 +327,9 @@ void SimpleQueryDlg::setQueryFieldWordwrap()
int w = fm.width(mw->queryField->text());
int w2 = mw->width();
if (w > w2)
- mw->queryField->tqsetAlignment(TQt::AlignVCenter | TQt::WordBreak);
+ mw->queryField->setAlignment(TQt::AlignVCenter | TQt::WordBreak);
else
- mw->queryField->tqsetAlignment(TQt::AlignVCenter);
+ mw->queryField->setAlignment(TQt::AlignVCenter);
}
diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
index c39377c7..b03c17ab 100644
--- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
@@ -106,7 +106,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>300</width>
<height>16</height>
diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui
index 0ca0d685..4c0832cc 100644
--- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui
@@ -516,7 +516,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>390</width>
<height>16</height>
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui
index db44fed9..8e797879 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui
+++ b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui
@@ -205,7 +205,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui
index e1fcff46..a9e4130e 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui
@@ -70,7 +70,7 @@
<property name="name">
<cstring>StatListView</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>500</width>
<height>0</height>
diff --git a/kwordquiz/src/dlglanguagebase.ui b/kwordquiz/src/dlglanguagebase.ui
index 10d6c095..3a1fdeee 100644
--- a/kwordquiz/src/dlglanguagebase.ui
+++ b/kwordquiz/src/dlglanguagebase.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>120</height>
@@ -53,7 +53,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -127,7 +127,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -156,7 +156,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -224,7 +224,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/kwordquiz/src/dlgrcbase.ui b/kwordquiz/src/dlgrcbase.ui
index 6a06876b..459265e7 100644
--- a/kwordquiz/src/dlgrcbase.ui
+++ b/kwordquiz/src/dlgrcbase.ui
@@ -12,7 +12,7 @@
<height>156</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>150</height>
diff --git a/kwordquiz/src/dlgsortbase.ui b/kwordquiz/src/dlgsortbase.ui
index c9c4ed7b..28275fe8 100644
--- a/kwordquiz/src/dlgsortbase.ui
+++ b/kwordquiz/src/dlgsortbase.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>170</height>
diff --git a/kwordquiz/src/dlgspecchar.cpp b/kwordquiz/src/dlgspecchar.cpp
index af521fd1..26e9e5cb 100644
--- a/kwordquiz/src/dlgspecchar.cpp
+++ b/kwordquiz/src/dlgspecchar.cpp
@@ -42,7 +42,7 @@ void DlgSpecChar::initDialog(const TQChar &_chr, const TQString &_font, bool /*_
charSelect = new KCharSelect( page, "", _font, _chr, t);
connect(charSelect, TQT_SIGNAL(doubleClicked()),this, TQT_SLOT(slotDoubleClicked()));
- charSelect->resize( charSelect->tqsizeHint() );
+ charSelect->resize( charSelect->sizeHint() );
charSelect->enableFontCombo( false );
grid->addWidget( charSelect, 0, 0 );
diff --git a/kwordquiz/src/flashviewbase.ui b/kwordquiz/src/flashviewbase.ui
index a6eca621..71e9ff6f 100644
--- a/kwordquiz/src/flashviewbase.ui
+++ b/kwordquiz/src/flashviewbase.ui
@@ -26,7 +26,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>30</height>
@@ -43,7 +43,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -60,7 +60,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -225,7 +225,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>30</height>
@@ -314,7 +314,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -382,7 +382,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -413,7 +413,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -481,7 +481,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp
index b370f36c..1d058e36 100644
--- a/kwordquiz/src/kwordquiz.cpp
+++ b/kwordquiz/src/kwordquiz.cpp
@@ -304,7 +304,7 @@ void KWordQuizApp::initActions()
updateSpecialCharIcons();
if (!initialGeometrySet())
- resize( TQSize(650, 500).expandedTo(tqminimumSizeHint()));
+ resize( TQSize(650, 500).expandedTo(minimumSizeHint()));
setupGUI(ToolBar | Keys | StatusBar | Create);
setAutoSaveSettings();
diff --git a/kwordquiz/src/multipleviewbase.ui b/kwordquiz/src/multipleviewbase.ui
index 4e25f0c3..89974e50 100644
--- a/kwordquiz/src/multipleviewbase.ui
+++ b/kwordquiz/src/multipleviewbase.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -50,7 +50,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
@@ -117,7 +117,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -155,7 +155,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -183,7 +183,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
@@ -322,7 +322,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -390,7 +390,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -421,7 +421,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -489,7 +489,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -569,7 +569,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
@@ -636,7 +636,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -674,7 +674,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -702,7 +702,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -730,7 +730,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -758,7 +758,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
@@ -794,7 +794,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -832,7 +832,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
@@ -902,7 +902,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
diff --git a/kwordquiz/src/prefcardappearancebase.ui b/kwordquiz/src/prefcardappearancebase.ui
index 3ac9e381..44f61ecf 100644
--- a/kwordquiz/src/prefcardappearancebase.ui
+++ b/kwordquiz/src/prefcardappearancebase.ui
@@ -34,13 +34,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>175</width>
<height>100</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>175</width>
<height>100</height>
@@ -480,7 +480,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>400</width>
<height>20</height>
diff --git a/kwordquiz/src/prefcharacterbase.ui b/kwordquiz/src/prefcharacterbase.ui
index a9c63062..d3d92f0d 100644
--- a/kwordquiz/src/prefcharacterbase.ui
+++ b/kwordquiz/src/prefcharacterbase.ui
@@ -12,7 +12,7 @@
<height>356</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>300</width>
<height>350</height>
@@ -299,7 +299,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>220</width>
<height>30</height>
@@ -324,7 +324,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>50</height>
@@ -355,7 +355,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>31</height>
diff --git a/kwordquiz/src/prefeditorbase.ui b/kwordquiz/src/prefeditorbase.ui
index 67b096a4..dc2de3ba 100644
--- a/kwordquiz/src/prefeditorbase.ui
+++ b/kwordquiz/src/prefeditorbase.ui
@@ -12,7 +12,7 @@
<height>256</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>250</height>
@@ -113,7 +113,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>81</height>
diff --git a/kwordquiz/src/prefquizbase.ui b/kwordquiz/src/prefquizbase.ui
index 79f570db..2f7f333c 100644
--- a/kwordquiz/src/prefquizbase.ui
+++ b/kwordquiz/src/prefquizbase.ui
@@ -12,7 +12,7 @@
<height>356</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>300</width>
<height>350</height>
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>31</height>
@@ -162,7 +162,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>70</height>
diff --git a/kwordquiz/src/qaviewbase.ui b/kwordquiz/src/qaviewbase.ui
index 9be1bee1..c13262da 100644
--- a/kwordquiz/src/qaviewbase.ui
+++ b/kwordquiz/src/qaviewbase.ui
@@ -50,7 +50,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -110,7 +110,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -141,7 +141,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -259,7 +259,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -300,7 +300,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
@@ -367,7 +367,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -405,7 +405,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
@@ -472,7 +472,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -510,7 +510,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -538,7 +538,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
@@ -668,7 +668,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>32</height>
@@ -704,7 +704,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -756,7 +756,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -792,7 +792,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
diff --git a/kwordquiz/src/wqprintdialogpage.cpp b/kwordquiz/src/wqprintdialogpage.cpp
index 25d5b79b..bedfc51c 100644
--- a/kwordquiz/src/wqprintdialogpage.cpp
+++ b/kwordquiz/src/wqprintdialogpage.cpp
@@ -37,7 +37,7 @@ WQPrintDialogPage::WQPrintDialogPage(TQWidget *parent, const char *name )
g->tqlayout()->setSpacing( 6 );
g->tqlayout()->setMargin( 11 );
TQGridLayout * v = new TQGridLayout( g->tqlayout() );
- v->tqsetAlignment( TQt::AlignTop );
+ v->setAlignment( TQt::AlignTop );
rb0 = new TQRadioButton(i18n("Vocabulary &list"), g );
v->addWidget( rb0, 0, 0 );
diff --git a/libtdeedu/extdate/extcalendarsystemgregorian.cpp b/libtdeedu/extdate/extcalendarsystemgregorian.cpp
index 0b167ce9..fc3fe51a 100644
--- a/libtdeedu/extdate/extcalendarsystemgregorian.cpp
+++ b/libtdeedu/extdate/extcalendarsystemgregorian.cpp
@@ -294,7 +294,7 @@ int ExtCalendarSystemGregorian::weekDayOfPray() const
TQString ExtCalendarSystemGregorian::calendarName() const
{
- return TQString::tqfromLatin1("gregorian");
+ return TQString::fromLatin1("gregorian");
}
bool ExtCalendarSystemGregorian::isLunar() const
diff --git a/libtdeedu/extdate/extdatepicker.cpp b/libtdeedu/extdate/extdatepicker.cpp
index 2b267d8e..62186fde 100644
--- a/libtdeedu/extdate/extdatepicker.cpp
+++ b/libtdeedu/extdate/extdatepicker.cpp
@@ -98,7 +98,7 @@ ExtDatePicker::ExtDatePicker(TQWidget *parent, ExtDate dt, const char *name, WFl
ExtDatePicker::ExtDatePicker( TQWidget *parent, const char *name )
: TQFrame(parent,name)
{
- init( ExtDate::tqcurrentDate() );
+ init( ExtDate::currentDate() );
}
void ExtDatePicker::init( const ExtDate &dt )
@@ -166,17 +166,17 @@ void ExtDatePicker::init( const ExtDate &dt )
if ( TQApplication::reverseLayout() )
{
- yearForward->setIconSet(BarIconSet(TQString::tqfromLatin1("2leftarrow")));
- yearBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("2rightarrow")));
- monthForward->setIconSet(BarIconSet(TQString::tqfromLatin1("1leftarrow")));
- monthBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("1rightarrow")));
+ yearForward->setIconSet(BarIconSet(TQString::fromLatin1("2leftarrow")));
+ yearBackward->setIconSet(BarIconSet(TQString::fromLatin1("2rightarrow")));
+ monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow")));
+ monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow")));
}
else
{
- yearForward->setIconSet(BarIconSet(TQString::tqfromLatin1("2rightarrow")));
- yearBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("2leftarrow")));
- monthForward->setIconSet(BarIconSet(TQString::tqfromLatin1("1rightarrow")));
- monthBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("1leftarrow")));
+ yearForward->setIconSet(BarIconSet(TQString::fromLatin1("2rightarrow")));
+ yearBackward->setIconSet(BarIconSet(TQString::fromLatin1("2leftarrow")));
+ monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow")));
+ monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow")));
}
connect(table, TQT_SIGNAL(dateChanged(const ExtDate&)), TQT_SLOT(dateChangedSlot(const ExtDate&)));
connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot()));
@@ -386,7 +386,7 @@ ExtDatePicker::selectYearClicked()
KPopupFrame* popup = new KPopupFrame(this);
ExtDateInternalYearSelector* picker = new ExtDateInternalYearSelector(popup);
// -----
- picker->resize(picker->tqsizeHint());
+ picker->resize(picker->sizeHint());
popup->setMainWidget(picker);
connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int)));
picker->setFocus();
@@ -446,13 +446,13 @@ ExtDatePicker::lineEnterPressed()
void
ExtDatePicker::todayButtonClicked()
{
- setDate(ExtDate::tqcurrentDate());
+ setDate(ExtDate::currentDate());
}
TQSize
-ExtDatePicker::tqsizeHint() const
+ExtDatePicker::sizeHint() const
{
- return TQWidget::tqsizeHint();
+ return TQWidget::sizeHint();
}
void
@@ -512,7 +512,7 @@ ExtDatePicker::setCloseButton( bool enable )
TQToolTip::add(d->closeButton, i18n("Close"));
d->closeButton->setPixmap( SmallIcon("remove") );
connect( d->closeButton, TQT_SIGNAL( clicked() ),
- tqtopLevelWidget(), TQT_SLOT( close() ) );
+ topLevelWidget(), TQT_SLOT( close() ) );
}
else {
delete d->closeButton;
diff --git a/libtdeedu/extdate/extdatepicker.h b/libtdeedu/extdate/extdatepicker.h
index 794ccea6..f8295dfe 100644
--- a/libtdeedu/extdate/extdatepicker.h
+++ b/libtdeedu/extdate/extdatepicker.h
@@ -62,7 +62,7 @@ public:
* initially.
**/
ExtDatePicker(TQWidget *parent=0,
- ExtDate=ExtDate::tqcurrentDate(),
+ ExtDate=ExtDate::currentDate(),
const char *name=0);
/** The usual constructor. The given date will be displayed
@@ -92,7 +92,7 @@ public:
* size hint, try adding 28 to each of the reported numbers of
* pixels.
**/
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
/**
* Sets the date.
@@ -138,7 +138,7 @@ public:
/**
* By calling this method with @p enable = true, ExtDatePicker will show
* a little close-button in the upper button-row. Clicking the
- * close-button will cause the ExtDatePicker's tqtopLevelWidget()'s close()
+ * close-button will cause the ExtDatePicker's topLevelWidget()'s close()
* method being called. This is mostly useful for toplevel datepickers
* without a window manager decoration.
* @see hasCloseButton
diff --git a/libtdeedu/extdate/extdatetbl.cpp b/libtdeedu/extdate/extdatetbl.cpp
index 55458417..b3dc27bd 100644
--- a/libtdeedu/extdate/extdatetbl.cpp
+++ b/libtdeedu/extdate/extdatetbl.cpp
@@ -124,7 +124,7 @@ ExtDateTable::ExtDateTable(TQWidget *parent, ExtDate date_, const char* name, WF
if(!date_.isValid())
{
kdDebug() << "ExtDateTable ctor: WARNING: Given date is invalid, using current date." << endl;
- date_=ExtDate::tqcurrentDate();
+ date_=ExtDate::currentDate();
}
setFocusPolicy( TQ_StrongFocus );
setNumRows(7); // 6 weeks max + headline
@@ -204,7 +204,7 @@ ExtDateTable::paintCell(TQPainter *painter, int row, int col)
normalday=false;
TQBrush brushTitle();
- TQBrush brushInvertTitle(tqcolorGroup().base());
+ TQBrush brushInvertTitle(colorGroup().base());
TQColor titleColor(isEnabled()?( KGlobalSettings::activeTitleColor() ):( KGlobalSettings::inactiveTitleColor() ) );
TQColor textColor(isEnabled()?( KGlobalSettings::activeTextColor() ):( KGlobalSettings::inactiveTextColor() ) );
if (!normalday)
@@ -221,7 +221,7 @@ ExtDateTable::paintCell(TQPainter *painter, int row, int col)
}
painter->drawText(0, 0, w, h-1, AlignCenter,
d->calendar->weekDayName(daynum, true), -1, &rect);
- painter->setPen(tqcolorGroup().text());
+ painter->setPen(colorGroup().text());
painter->moveTo(0, h-1);
painter->lineTo(w-1, h-1);
// ----- draw the weekday:
@@ -238,7 +238,7 @@ ExtDateTable::paintCell(TQPainter *painter, int row, int col)
// � painting a day of the previous month or
// � painting a day of the following month
// TODO: don't hardcode gray here! Use a color with less contrast to the background than normal text.
- painter->setPen( tqcolorGroup().mid() );
+ painter->setPen( colorGroup().mid() );
// painter->setPen(gray);
} else { // paint a day of the current month
if ( d->useCustomColors )
@@ -263,9 +263,9 @@ ExtDateTable::paintCell(TQPainter *painter, int row, int col)
}
painter->setPen( mode->fgColor );
} else
- painter->setPen(tqcolorGroup().text());
+ painter->setPen(colorGroup().text());
} else //if ( firstWeekDay < 4 ) // <- this doesn' make sense at all!
- painter->setPen(tqcolorGroup().text());
+ painter->setPen(colorGroup().text());
}
pen=painter->pen();
@@ -276,19 +276,19 @@ ExtDateTable::paintCell(TQPainter *painter, int row, int col)
if( ((offset+dy) == (pos+1)) && hasFocus())
{
// draw the currently selected date
- painter->setPen(tqcolorGroup().highlight());
- painter->setBrush(tqcolorGroup().highlight());
- pen=TQPen(tqcolorGroup().highlightedText());
+ painter->setPen(colorGroup().highlight());
+ painter->setBrush(colorGroup().highlight());
+ pen=TQPen(colorGroup().highlightedText());
} else {
painter->setBrush(paletteBackgroundColor());
painter->setPen(paletteBackgroundColor());
-// painter->setBrush(tqcolorGroup().base());
-// painter->setPen(tqcolorGroup().base());
+// painter->setBrush(colorGroup().base());
+// painter->setPen(colorGroup().base());
}
- if ( pCellDate == ExtDate::tqcurrentDate() )
+ if ( pCellDate == ExtDate::currentDate() )
{
- painter->setPen(tqcolorGroup().text());
+ painter->setPen(colorGroup().text());
}
if ( paintRect ) painter->drawRect(0, 0, w, h);
@@ -347,7 +347,7 @@ ExtDateTable::keyPressEvent( TQKeyEvent *e )
setDate(date.addDays(1));
return;
case Key_N:
- setDate(ExtDate::tqcurrentDate());
+ setDate(ExtDate::currentDate());
return;
case Key_Return:
case Key_Enter:
@@ -390,7 +390,7 @@ ExtDateTable::setFontSize(int size)
maxCell.setHeight(TQMAX(maxCell.height(), rect.height()));
}
// ----- compare with a real wide number and add some space:
- rect=metrics.boundingRect(TQString::tqfromLatin1("88"));
+ rect=metrics.boundingRect(TQString::fromLatin1("88"));
maxCell.setWidth(TQMAX(maxCell.width()+2, rect.width()));
maxCell.setHeight(TQMAX(maxCell.height()+4, rect.height()));
}
@@ -519,14 +519,14 @@ void ExtDateTable::focusOutEvent( TQFocusEvent *e )
}
TQSize
-ExtDateTable::tqsizeHint() const
+ExtDateTable::sizeHint() const
{
if(maxCell.height()>0 && maxCell.width()>0)
{
return TQSize(maxCell.width()*numCols()+2*frameWidth(),
(maxCell.height()+2)*numRows()+2*frameWidth());
} else {
- kdDebug() << "ExtDateTable::tqsizeHint: obscure failure - " << endl;
+ kdDebug() << "ExtDateTable::sizeHint: obscure failure - " << endl;
return TQSize(-1, -1);
}
}
@@ -677,7 +677,7 @@ ExtDateInternalMonthPicker::ExtDateInternalMonthPicker
}
TQSize
-ExtDateInternalMonthPicker::tqsizeHint() const
+ExtDateInternalMonthPicker::sizeHint() const
{
return TQSize((max.width()+6)*numCols()+2*frameWidth(),
(max.height()+6)*numRows()+2*frameWidth());
diff --git a/libtdeedu/extdate/extdatetbl.h b/libtdeedu/extdate/extdatetbl.h
index fbbc880b..de55408c 100644
--- a/libtdeedu/extdate/extdatetbl.h
+++ b/libtdeedu/extdate/extdatetbl.h
@@ -101,7 +101,7 @@ public:
/**
* The size hint.
*/
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
/**
* Return the result. 0 means no selection (reject()), 1..12 are the
* months.
@@ -278,7 +278,7 @@ public:
* The constructor.
*/
ExtDateTable(TQWidget *parent=0,
- ExtDate date=ExtDate::tqcurrentDate(),
+ ExtDate date=ExtDate::currentDate(),
const char* name=0, WFlags f=0);
/**
@@ -291,9 +291,9 @@ public:
* To save some time, the size of the largest used cell content is
* calculated in each paintCell() call, since all calculations have
* to be done there anyway. The size is stored in maxCell. The
- * tqsizeHint() simply returns a multiple of maxCell.
+ * sizeHint() simply returns a multiple of maxCell.
*/
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
/**
* Set the font size of the date table.
*/
diff --git a/libtdeedu/extdate/extdatetime.cpp b/libtdeedu/extdate/extdatetime.cpp
index d8984eee..fa87a85f 100644
--- a/libtdeedu/extdate/extdatetime.cpp
+++ b/libtdeedu/extdate/extdatetime.cpp
@@ -377,7 +377,7 @@ int ExtDate::daysTo( const ExtDate & a_date) const
return a_date.jd() - jd();
}
-ExtDate ExtDate::tqcurrentDate(Qt::TimeSpec ts)
+ExtDate ExtDate::currentDate(Qt::TimeSpec ts)
{
time_t a_current_time;
struct tm a_current_time_tm;
@@ -559,7 +559,7 @@ int ExtDate::dayOfYear(int y, int m, int d)
A ExtDateTime object is typically created either by giving a date
and time explicitly in the constructor, or by using the static
- function tqcurrentDateTime(), which returns a ExtDateTime object set
+ function currentDateTime(), which returns a ExtDateTime object set
to the system clock's time. The date and time can be changed with
setDate() and setTime(). A datetime can also be set using the
setTime_t() function, which takes a POSIX-standard "number of
@@ -933,7 +933,7 @@ int ExtDateTime::daysTo( const ExtDateTime &dt ) const
Example:
\code
- ExtDateTime dt = ExtDateTime::tqcurrentDateTime();
+ ExtDateTime dt = ExtDateTime::currentDateTime();
ExtDateTime xmas( ExtDate(dt.date().year(),12,24), TQTime(17,00) );
kdDebug( ) << "There are " << dt.secsTo(xmas) << " seconds to Christmas" << endl;
\endcode
@@ -1023,28 +1023,28 @@ bool ExtDateTime::operator>=( const ExtDateTime &dt ) const
Returns the current datetime, as reported by the system clock.
- \sa ExtDate::tqcurrentDate(), TQTime::currentTime()
+ \sa ExtDate::currentDate(), TQTime::currentTime()
*/
-ExtDateTime ExtDateTime::tqcurrentDateTime()
+ExtDateTime ExtDateTime::currentDateTime()
{
- return tqcurrentDateTime( Qt::LocalTime );
+ return currentDateTime( Qt::LocalTime );
}
/*!
Returns the current datetime, as reported by the system clock, for the
TimeSpec \a ts. The default TimeSpec is LocalTime.
- \sa ExtDate::tqcurrentDate(), TQTime::currentTime(), Qt::TimeSpec
+ \sa ExtDate::currentDate(), TQTime::currentTime(), Qt::TimeSpec
*/
-ExtDateTime ExtDateTime::tqcurrentDateTime( Qt::TimeSpec ts )
+ExtDateTime ExtDateTime::currentDateTime( Qt::TimeSpec ts )
{
ExtDateTime dt;
- dt.setDate( ExtDate::tqcurrentDate(ts) );
+ dt.setDate( ExtDate::currentDate(ts) );
TQTime t = t.currentTime(ts);
if ( t.hour()==0 && t.minute()==0 ) // midnight or right after?
- dt.setDate( ExtDate::tqcurrentDate(ts) ); // fetch date again
+ dt.setDate( ExtDate::currentDate(ts) ); // fetch date again
dt.setTime( t );
return dt;
}
@@ -1099,7 +1099,7 @@ ExtDateTime ExtDateTime::fromString( const TQString& s, Qt::DateFormat f )
TQTime time;
TQString sd = s;
int hour, minute, second;
- int pivot = s.find( TQRegExp(TQString::tqfromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) );
+ int pivot = s.find( TQRegExp(TQString::fromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) );
if ( pivot != -1 ) {
hour = s.mid( pivot, 2 ).toInt();
minute = s.mid( pivot+3, 2 ).toInt();
diff --git a/libtdeedu/extdate/extdatetime.h b/libtdeedu/extdate/extdatetime.h
index 0ebe324f..479d1fae 100644
--- a/libtdeedu/extdate/extdatetime.h
+++ b/libtdeedu/extdate/extdatetime.h
@@ -88,7 +88,7 @@ public:
bool operator>( const ExtDate &d ) const { return m_jd > d.jd(); }
bool operator>=( const ExtDate &d ) const { return m_jd >= d.jd(); }
- static ExtDate tqcurrentDate( Qt::TimeSpec ts = Qt::LocalTime );
+ static ExtDate currentDate( Qt::TimeSpec ts = Qt::LocalTime );
#ifndef TQT_NO_DATESTRING
static ExtDate fromString( const TQString &s );
static ExtDate fromString( const TQString &s, Qt::DateFormat f );
@@ -162,8 +162,8 @@ public:
bool operator>( const ExtDateTime &dt ) const;
bool operator>=( const ExtDateTime &dt ) const;
- static ExtDateTime tqcurrentDateTime();
- static ExtDateTime tqcurrentDateTime( Qt::TimeSpec );
+ static ExtDateTime currentDateTime();
+ static ExtDateTime currentDateTime( Qt::TimeSpec );
#ifndef TQT_NO_DATESTRING
static ExtDateTime fromString( const TQString &s );
static ExtDateTime fromString( const TQString &s, Qt::DateFormat f );
diff --git a/libtdeedu/extdate/extdatetimeedit.cpp b/libtdeedu/extdate/extdatetimeedit.cpp
index 796bd858..2d75c12a 100644
--- a/libtdeedu/extdate/extdatetimeedit.cpp
+++ b/libtdeedu/extdate/extdatetimeedit.cpp
@@ -266,7 +266,7 @@ public:
{
int fw = 0;
if ( frm )
- fw = style.tqpixelMetric(TQStyle::PM_DefaultFrameWidth);
+ fw = style.pixelMetric(TQStyle::PM_DefaultFrameWidth);
parag->truncate( 0 );
parag->append( txt );
@@ -433,9 +433,9 @@ void ExtDateTimeEditor::paintEvent( TQPaintEvent * )
TQSharedDoubleBuffer buffer( this );
const TQBrush &bg =
- tqcolorGroup().brush( isEnabled() ? TQColorGroup::Base : TQColorGroup::Background );
+ colorGroup().brush( isEnabled() ? TQColorGroup::Base : TQColorGroup::Background );
buffer.painter()->fillRect( 0, 0, width(), height(), bg );
- d->paint( txt, hasFocus(), *buffer.painter(), tqcolorGroup(), rect(),
+ d->paint( txt, hasFocus(), *buffer.painter(), colorGroup(), rect(),
tqstyle() );
buffer.end();
}
@@ -740,9 +740,9 @@ public:
with a date, e.g.
\code
- ExtDateEdit *dateEdit = new ExtDateEdit( ExtDate::tqcurrentDate(), this );
- dateEdit->setRange( ExtDate::tqcurrentDate().addDays( -365 ),
- ExtDate::tqcurrentDate().addDays( 365 ) );
+ ExtDateEdit *dateEdit = new ExtDateEdit( ExtDate::currentDate(), this );
+ dateEdit->setRange( ExtDate::currentDate().addDays( -365 ),
+ ExtDate::currentDate().addDays( 365 ) );
dateEdit->setOrder( ExtDateEdit::MDY );
dateEdit->setAutoAdvance( TRUE );
\endcode
@@ -856,7 +856,7 @@ void ExtDateEdit::init()
d->max = ExtDate( 50000, 12, 31 );
d->changed = FALSE;
- tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
+ setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
refcount++;
}
@@ -970,11 +970,11 @@ void ExtDateEdit::resizeEvent( TQResizeEvent * )
/*! \reimp
*/
-TQSize ExtDateEdit::tqsizeHint() const
+TQSize ExtDateEdit::sizeHint() const
{
constPolish();
TQFontMetrics fm( font() );
- int fw = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this );
+ int fw = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, this );
int h = TQMAX( fm.lineSpacing(), 14 ) + 2;
int w = 2 + fm.width( '9' ) * 8 + fm.width( d->ed->separator() ) * 2
+ d->controls->upRect().width() + fw * 4;
@@ -985,9 +985,9 @@ TQSize ExtDateEdit::tqsizeHint() const
/*! \reimp
*/
-TQSize ExtDateEdit::tqminimumSizeHint() const
+TQSize ExtDateEdit::minimumSizeHint() const
{
- return tqsizeHint();
+ return sizeHint();
}
@@ -1268,7 +1268,7 @@ void ExtDateEdit::setDay( int day )
If the date property is not valid, the editor displays all zeroes
and ExtDateEdit::date() will return an invalid date. It is strongly
recommended that the editor is given a default date value (e.g.
- tqcurrentDate()). That way, attempts to set the date property to an
+ currentDate()). That way, attempts to set the date property to an
invalid date will fail.
When changing the date property, if the date is less than
@@ -1314,8 +1314,8 @@ ExtDate ExtDateEdit::date() const
bool ExtDateEdit::outOfRange( int y, int m, int d ) const
{
if ( ExtDate::isValid( y, m, d ) ) {
- ExtDate tqcurrentDate( y, m, d );
- if ( tqcurrentDate > maxValue() || tqcurrentDate < minValue() ) {
+ ExtDate currentDate( y, m, d );
+ if ( currentDate > maxValue() || currentDate < minValue() ) {
//## outOfRange should set overwrite?
return TRUE;
}
@@ -1475,7 +1475,7 @@ void ExtDateEdit::fix()
changed = TRUE;
}
- int currentYear = ExtDate::tqcurrentDate().year();
+ int currentYear = ExtDate::currentDate().year();
int year = d->y;
/* No longer valid for extended dates
if ( year < 100 ) {
@@ -1764,7 +1764,7 @@ public:
// d->max = TQTime( 23, 59, 59 );
// d->changed = FALSE;
//
-// tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
+// setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
//
// refcount++;
// }
@@ -2187,12 +2187,12 @@ public:
// if ( lAM )
// txt = *lAM;
// else
-// txt = TQString::tqfromLatin1( "AM" );
+// txt = TQString::fromLatin1( "AM" );
// } else {
// if ( lPM )
// txt = *lPM;
// else
-// txt = TQString::tqfromLatin1( "PM" );
+// txt = TQString::fromLatin1( "PM" );
// }
// break;
// default:
@@ -2430,11 +2430,11 @@ public:
//
// /*! \reimp
// */
-// TQSize TQTimeEdit::tqsizeHint() const
+// TQSize TQTimeEdit::sizeHint() const
// {
// constPolish();
// TQFontMetrics fm( font() );
-// int fw = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this );
+// int fw = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, this );
// int h = fm.lineSpacing() + 2;
// int w = 2 + fm.width( '9' ) * 6 + fm.width( d->ed->separator() ) * 2 +
// d->controls->upRect().width() + fw * 4;
@@ -2442,7 +2442,7 @@ public:
// if ( lAM )
// w += fm.width( *lAM ) + 4;
// else
-// w += fm.width( TQString::tqfromLatin1( "AM" ) ) + 4;
+// w += fm.width( TQString::fromLatin1( "AM" ) ) + 4;
// }
//
// return TQSize( w, TQMAX(h + fw * 2,20) ).expandedTo( TQApplication::globalStrut() );
@@ -2450,9 +2450,9 @@ public:
//
// /*! \reimp
// */
-// TQSize TQTimeEdit::tqminimumSizeHint() const
+// TQSize TQTimeEdit::minimumSizeHint() const
// {
-// return tqsizeHint();
+// return sizeHint();
// }
//
// /*!
@@ -2507,9 +2507,9 @@ public:
It is recommended that the ExtDateTimeEdit is initialised with a
datetime, e.g.
\code
- ExtDateTimeEdit *dateTimeEdit = new ExtDateTimeEdit( ExtDateTime::tqcurrentDateTime(), this );
- dateTimeEdit->dateEdit()->setRange( ExtDateTime::tqcurrentDate(),
- ExtDateTime::tqcurrentDate().addDays( 7 ) );
+ ExtDateTimeEdit *dateTimeEdit = new ExtDateTimeEdit( ExtDateTime::currentDateTime(), this );
+ dateTimeEdit->dateEdit()->setRange( ExtDateTime::currentDate(),
+ ExtDateTime::currentDate().addDays( 7 ) );
\endcode
Here we've created a new ExtDateTimeEdit set to the current date and
time, and set the date to have a minimum date of now and a maximum
@@ -2573,8 +2573,8 @@ ExtDateTimeEdit::~ExtDateTimeEdit()
void ExtDateTimeEdit::resizeEvent( TQResizeEvent * )
{
- int dw = de->tqsizeHint().width();
- int tw = te->tqsizeHint().width();
+ int dw = de->sizeHint().width();
+ int tw = te->sizeHint().width();
int w = width();
int h = height();
int extra = w - ( dw + tw );
@@ -2593,10 +2593,10 @@ void ExtDateTimeEdit::resizeEvent( TQResizeEvent * )
/*! \reimp
*/
-TQSize ExtDateTimeEdit::tqminimumSizeHint() const
+TQSize ExtDateTimeEdit::minimumSizeHint() const
{
- TQSize dsh = de->tqminimumSizeHint();
- TQSize tsh = te->tqminimumSizeHint();
+ TQSize dsh = de->minimumSizeHint();
+ TQSize tsh = te->minimumSizeHint();
return TQSize( dsh.width() + tsh.width(),
TQMAX( dsh.height(), tsh.height() ) );
}
@@ -2615,17 +2615,17 @@ void ExtDateTimeEdit::init()
connect( te, TQT_SIGNAL( valueChanged( const TQTime& ) ),
this, TQT_SLOT( newValue( const TQTime& ) ) );
setFocusProxy( de );
- tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
+ setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
}
/*! \reimp
*/
-TQSize ExtDateTimeEdit::tqsizeHint() const
+TQSize ExtDateTimeEdit::sizeHint() const
{
constPolish();
- TQSize dsh = de->tqsizeHint();
- TQSize tsh = te->tqsizeHint();
+ TQSize dsh = de->sizeHint();
+ TQSize tsh = te->sizeHint();
return TQSize( dsh.width() + tsh.width(),
TQMAX( dsh.height(), tsh.height() ) );
}
diff --git a/libtdeedu/extdate/extdatetimeedit.h b/libtdeedu/extdate/extdatetimeedit.h
index 4a2aaa16..13520923 100644
--- a/libtdeedu/extdate/extdatetimeedit.h
+++ b/libtdeedu/extdate/extdatetimeedit.h
@@ -82,8 +82,8 @@ public:
YMD /**< Year-Month-Day, also the default */,
YDM /**< Year-Day-Month @deprecated Included for completeness. */ };
- TQSize tqsizeHint() const;
- TQSize tqminimumSizeHint() const;
+ TQSize sizeHint() const;
+ TQSize minimumSizeHint() const;
public slots:
virtual void setDate( const ExtDate& date );
@@ -169,8 +169,8 @@ private:
// TQTimeEdit( const TQTime& time, TQWidget* parent=0, const char* name=0 );
// ~TQTimeEdit();
//
-// TQSize tqsizeHint() const;
-// TQSize tqminimumSizeHint() const;
+// TQSize sizeHint() const;
+// TQSize minimumSizeHint() const;
//
// public slots:
// virtual void setTime( const TQTime& time );
@@ -242,8 +242,8 @@ public:
const char* name=0 );
~ExtDateTimeEdit();
- TQSize tqsizeHint() const;
- TQSize tqminimumSizeHint() const;
+ TQSize sizeHint() const;
+ TQSize minimumSizeHint() const;
public slots:
virtual void setDateTime( const ExtDateTime & dt );
diff --git a/libtdeedu/extdate/extdatewidget.cpp b/libtdeedu/extdate/extdatewidget.cpp
index f1c7269b..041b0d76 100644
--- a/libtdeedu/extdate/extdatewidget.cpp
+++ b/libtdeedu/extdate/extdatewidget.cpp
@@ -36,7 +36,7 @@ public:
ExtDateWidgetSpinBox(int min, int max, TQWidget *parent)
: TQSpinBox(min, max, 1, parent)
{
- editor()->tqsetAlignment(AlignRight);
+ editor()->setAlignment(AlignRight);
}
};
@@ -56,7 +56,7 @@ public:
ExtDateWidget::ExtDateWidget( TQWidget *parent, const char *name )
: TQWidget( parent, name )
{
- init(ExtDate::tqcurrentDate());
+ init(ExtDate::currentDate());
setDate(ExtDate());
}
diff --git a/libtdeedu/extdate/test_extdate.cc b/libtdeedu/extdate/test_extdate.cc
index 63b2120b..d70d3e94 100644
--- a/libtdeedu/extdate/test_extdate.cc
+++ b/libtdeedu/extdate/test_extdate.cc
@@ -277,16 +277,16 @@ void test6()
void test7()
{
std::cout << "Express the current date:\n" << std::endl;
- TQDate q = TQDate::tqcurrentDate(TQt::LocalTime);
- ExtDate e = ExtDate::tqcurrentDate(TQt::TimeSpec(TQt::LocalTime));
+ TQDate q = TQDate::currentDate(TQt::LocalTime);
+ ExtDate e = ExtDate::currentDate(TQt::TimeSpec(TQt::LocalTime));
std::cout << "TQt::LocalTime :: ExtDate : " << e.toString().local8Bit() << " TQDate : "
<< q.toString().local8Bit() << std::endl;
- q = TQDate::tqcurrentDate(TQt::UTC);
- e = ExtDate::tqcurrentDate(TQt::UTC);
+ q = TQDate::currentDate(TQt::UTC);
+ e = ExtDate::currentDate(TQt::UTC);
std::cout << "TQt::UTC :: ExtDate : " << e.toString().local8Bit() << " TQDate : "
<< q.toString().local8Bit() << std::endl;
- q = TQDate::tqcurrentDate();
- e = ExtDate::tqcurrentDate();
+ q = TQDate::currentDate();
+ e = ExtDate::currentDate();
std::cout << "<default> :: ExtDate : " << e.toString().local8Bit() << " TQDate : "
<< q.toString().local8Bit() << std::endl;
std::cout << "--------------------" << std::endl;
@@ -311,8 +311,8 @@ void test8() {
void test9() {
std::cout << "TQDateTime : ExtDateTime: \n" << std::endl;
- TQDateTime q = TQDateTime::tqcurrentDateTime();
- ExtDateTime e = ExtDateTime::tqcurrentDateTime();
+ TQDateTime q = TQDateTime::currentDateTime();
+ ExtDateTime e = ExtDateTime::currentDateTime();
std::cout << q.toString().local8Bit() << " : " << e.toString().local8Bit() << std::endl;
std::cout << "--------------------" << std::endl;
diff --git a/libtdeedu/extdate/testwidget.cpp b/libtdeedu/extdate/testwidget.cpp
index a6489cce..0267ddeb 100644
--- a/libtdeedu/extdate/testwidget.cpp
+++ b/libtdeedu/extdate/testwidget.cpp
@@ -39,8 +39,8 @@ TestWidget::TestWidget( TQWidget *p=0, const char *name=0 ) : KMainWindow( p, na
edpEdit = new KLineEdit(w);
edpEdit->setReadOnly( TRUE );
- kdw = new KDateWidget( TQDate::tqcurrentDate(), w );
- edw = new ExtDateWidget( ExtDate::tqcurrentDate(), w );
+ kdw = new KDateWidget( TQDate::currentDate(), w );
+ edw = new ExtDateWidget( ExtDate::currentDate(), w );
glay->addWidget( kdpLabel, 0, 0 );
glay->addWidget( edpLabel, 0, 1 );